Merge branch 'master' into streisand_ipv6

.travis.yml

@@ -16,7 +16,6 @@ env:
  - RUN="ci" SITE="tests/site_vars/openvpn.yml"
  - RUN="ci" SITE="tests/site_vars/shadowsocks.yml"
  - RUN="ci" SITE="tests/site_vars/ssh.yml"
- - RUN="ci" SITE="tests/site_vars/cloudflared.yml"
  - RUN="ci" SITE="random"
 
 before_install:
@@ -26,7 +25,7 @@ before_install:
  - sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 762E3157
 
 install:
- - pip install ansible==2.8.0
+ - pip install ansible==2.8.4
  - pip install urllib3 yamllint
  - ansible --version
 

ansible.cfg

@@ -17,5 +17,7 @@ local_tmp = $HOME/.ansible/tmp
 # connections even after the OpenSSH daemon has started.
 timeout = 100
 
+library=library
+
 [ssh_connection]
 pipelining = True

global_vars/default-site.yml

@@ -9,10 +9,11 @@
 # nodes for the authorized_keys file.
 streisand_ssh_private_key: "~/.ssh/id_rsa"
 
-vpn_clients: 5
+vpn_clients: 10
 
 streisand_ipv6_enabled: no
 
+streisand_ad_blocking_enabled: no
 streisand_openconnect_enabled: yes
 streisand_openvpn_enabled: yes
 streisand_shadowsocks_enabled: yes

global_vars/integration/test-site.yml

@@ -13,6 +13,7 @@ streisand_client_test: true
 streisand_ipv6_enabled: no
 
 # Only services with corresponding tests are enabled.
+streisand_ad_blocking_enabled: yes
 streisand_shadowsocks_enabled: yes
 streisand_ssh_forward_enabled: yes
 streisand_openvpn_enabled: yes

global_vars/noninteractive/amazon-site.yml

@@ -12,10 +12,11 @@ confirmation: true
 # This will be added to the AWS console and given the name streisand-ssh.
 streisand_ssh_private_key: "~/.ssh/id_rsa"
 
-vpn_clients: 5
+vpn_clients: 10
 
 streisand_ipv6_enabled: no
 
+streisand_ad_blocking_enabled: no
 streisand_openconnect_enabled: yes
 streisand_openvpn_enabled: yes
 streisand_shadowsocks_enabled: yes

global_vars/noninteractive/azure-site.yml

@@ -12,10 +12,11 @@ confirmation: true
 # The SSH private key that Ansible will use to connect to the Streisand node.
 streisand_ssh_private_key: "~/.ssh/id_rsa"
 
-vpn_clients: 5
+vpn_clients: 10
 
 streisand_ipv6_enabled: no
 
+streisand_ad_blocking_enabled: no
 streisand_openconnect_enabled: yes
 streisand_openvpn_enabled: yes
 streisand_shadowsocks_enabled: yes

global_vars/noninteractive/digitalocean-site.yml

@@ -16,10 +16,11 @@ confirmation: true
 # given to it referenced below in the do_ssh_name variable.
 streisand_ssh_private_key: "~/.ssh/id_rsa"
 
-vpn_clients: 5
+vpn_clients: 10
 
 streisand_ipv6_enabled: no
 
+streisand_ad_blocking_enabled: no
 streisand_openconnect_enabled: yes
 streisand_openvpn_enabled: yes
 streisand_shadowsocks_enabled: yes

global_vars/noninteractive/google-site.yml

@@ -11,10 +11,11 @@ confirmation: true
 # The SSH private key that Ansible will use to connect to the Streisand node.
 streisand_ssh_private_key: "~/.ssh/id_rsa"
 
-vpn_clients: 5
+vpn_clients: 10
 
 streisand_ipv6_enabled: no
 
+streisand_ad_blocking_enabled: no
 streisand_openconnect_enabled: yes
 streisand_openvpn_enabled: yes
 streisand_shadowsocks_enabled: yes

global_vars/noninteractive/linode-site.yml

@@ -10,10 +10,11 @@ confirmation: true
 # The SSH private key that Ansible will use to connect to the Streisand node.
 streisand_ssh_private_key: "~/.ssh/id_rsa"
 
-vpn_clients: 5
+vpn_clients: 10
 
 streisand_ipv6_enabled: no
 
+streisand_ad_blocking_enabled: no
 streisand_openconnect_enabled: yes
 streisand_openvpn_enabled: yes
 streisand_shadowsocks_enabled: yes

global_vars/noninteractive/local-site.yml

@@ -11,10 +11,11 @@ confirmation: true
 # Change this to the location of a key on the local system.
 streisand_ssh_private_key: "~/.ssh/id_rsa"
 
-vpn_clients: 5
+vpn_clients: 10
 
 streisand_ipv6_enabled: no
 
+streisand_ad_blocking_enabled: no
 streisand_openconnect_enabled: yes
 streisand_openvpn_enabled: yes
 streisand_shadowsocks_enabled: yes

global_vars/noninteractive/rackspace-site.yml

@@ -10,10 +10,11 @@ confirmation: true
 # The SSH private key that Ansible will use to connect to the Streisand node.
 streisand_ssh_private_key: "~/.ssh/id_rsa"
 
-vpn_clients: 5
+vpn_clients: 10
 
 streisand_ipv6_enabled: no
 
+streisand_ad_blocking_enabled: no
 streisand_openconnect_enabled: yes
 streisand_openvpn_enabled: yes
 streisand_shadowsocks_enabled: yes