additional functions

deploy.yml

@@ -25,7 +25,6 @@
       tags: [ 'digitalocean', 'ec2', 'gce' ]
 
   roles:
-    - { role: common, tags: [ 'vpn' ] }
     - { role: security, tags: [ 'security' ] }
     - { role: proxy, tags: [ 'proxy', 'adblock' ] }
     - { role: dns_adblocking, tags: ['dns', 'adblock' ] }

roles/cloud-ec2/tasks/main.yml

@@ -69,11 +69,6 @@
     groupname: vpn-host
     ansible_ssh_user: ubuntu
     ansible_python_interpreter: "/usr/bin/python2.7"
-    dns_enabled: "{{ dns_enabled }}"
-    proxy_enabled: "{{ proxy_enabled }}"
-    ssh_tunneling_enabled: "{{ ssh_tunneling_enabled }}"
-    security_enabled: "{{ security_enabled }}"
-    auditd_enabled: " {{ auditd_enabled }}"
     easyrsa_p12_export_password: "{{ easyrsa_p12_export_password }}"
     cloud_provider: ec2
     ipv6_support: no

roles/cloud-gce/tasks/main.yml

@@ -20,11 +20,6 @@
     groups: vpn-host
     ansible_ssh_user: ubuntu
     ansible_python_interpreter: "/usr/bin/python2.7"
-    dns_enabled: "{{ dns_enabled }}"
-    proxy_enabled: "{{ proxy_enabled }}"
-    ssh_tunneling_enabled: "{{ ssh_tunneling_enabled }}"
-    auditd_enabled: " {{ auditd_enabled }}"
-    security_enabled: "{{ security_enabled }}"
     easyrsa_p12_export_password: "{{ easyrsa_p12_export_password }}"
     cloud_provider: gce
     ipv6_support: no

roles/dns_adblocking/meta/main.yml

@@ -0,0 +1,4 @@
+---
+
+dependencies:
+  - { role: common }

roles/logging/meta/main.yml

@@ -0,0 +1,4 @@
+---
+
+dependencies:
+  - { role: common }

roles/proxy/meta/main.yml

@@ -0,0 +1,4 @@
+---
+
+dependencies:
+  - { role: common }

roles/security/meta/main.yml

@@ -0,0 +1,4 @@
+---
+
+dependencies:
+  - { role: common }

roles/ssh_tunneling/meta/main.yml

@@ -0,0 +1,4 @@
+---
+
+dependencies:
+  - { role: common }

roles/vpn/handlers/main.yml

@@ -6,6 +6,9 @@
 
 - name: restart apparmor
   service: name=apparmor state=restarted
+  
+- name: save iptables
+  shell: service netfilter-persistent save
 
 - name: congrats
   debug:

roles/vpn/meta/main.yml

@@ -0,0 +1,4 @@
+---
+
+dependencies:
+  - { role: common }