From 91688324ce8804eb253bc47b3e27e8e8f1ae5ee1 Mon Sep 17 00:00:00 2001 From: Jack Ivanov Date: Sun, 28 Aug 2016 23:19:41 +0300 Subject: [PATCH] additional functions --- deploy.yml | 1 - roles/cloud-ec2/tasks/main.yml | 5 ----- roles/cloud-gce/tasks/main.yml | 5 ----- roles/dns_adblocking/meta/main.yml | 4 ++++ roles/logging/meta/main.yml | 4 ++++ roles/proxy/meta/main.yml | 4 ++++ roles/security/meta/main.yml | 4 ++++ roles/ssh_tunneling/meta/main.yml | 4 ++++ roles/vpn/handlers/main.yml | 3 +++ roles/vpn/meta/main.yml | 4 ++++ 10 files changed, 27 insertions(+), 11 deletions(-) create mode 100644 roles/dns_adblocking/meta/main.yml create mode 100644 roles/logging/meta/main.yml create mode 100644 roles/proxy/meta/main.yml create mode 100644 roles/security/meta/main.yml create mode 100644 roles/ssh_tunneling/meta/main.yml create mode 100644 roles/vpn/meta/main.yml diff --git a/deploy.yml b/deploy.yml index d69ed68..e6bcc9d 100644 --- a/deploy.yml +++ b/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' ] } diff --git a/roles/cloud-ec2/tasks/main.yml b/roles/cloud-ec2/tasks/main.yml index 1bfb382..6e1a9b0 100644 --- a/roles/cloud-ec2/tasks/main.yml +++ b/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 diff --git a/roles/cloud-gce/tasks/main.yml b/roles/cloud-gce/tasks/main.yml index f96690d..07ce08b 100644 --- a/roles/cloud-gce/tasks/main.yml +++ b/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 diff --git a/roles/dns_adblocking/meta/main.yml b/roles/dns_adblocking/meta/main.yml new file mode 100644 index 0000000..325ccd9 --- /dev/null +++ b/roles/dns_adblocking/meta/main.yml @@ -0,0 +1,4 @@ +--- + +dependencies: + - { role: common } \ No newline at end of file diff --git a/roles/logging/meta/main.yml b/roles/logging/meta/main.yml new file mode 100644 index 0000000..325ccd9 --- /dev/null +++ b/roles/logging/meta/main.yml @@ -0,0 +1,4 @@ +--- + +dependencies: + - { role: common } \ No newline at end of file diff --git a/roles/proxy/meta/main.yml b/roles/proxy/meta/main.yml new file mode 100644 index 0000000..325ccd9 --- /dev/null +++ b/roles/proxy/meta/main.yml @@ -0,0 +1,4 @@ +--- + +dependencies: + - { role: common } \ No newline at end of file diff --git a/roles/security/meta/main.yml b/roles/security/meta/main.yml new file mode 100644 index 0000000..325ccd9 --- /dev/null +++ b/roles/security/meta/main.yml @@ -0,0 +1,4 @@ +--- + +dependencies: + - { role: common } \ No newline at end of file diff --git a/roles/ssh_tunneling/meta/main.yml b/roles/ssh_tunneling/meta/main.yml new file mode 100644 index 0000000..325ccd9 --- /dev/null +++ b/roles/ssh_tunneling/meta/main.yml @@ -0,0 +1,4 @@ +--- + +dependencies: + - { role: common } \ No newline at end of file diff --git a/roles/vpn/handlers/main.yml b/roles/vpn/handlers/main.yml index a3c10f7..a8e921a 100644 --- a/roles/vpn/handlers/main.yml +++ b/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: diff --git a/roles/vpn/meta/main.yml b/roles/vpn/meta/main.yml new file mode 100644 index 0000000..325ccd9 --- /dev/null +++ b/roles/vpn/meta/main.yml @@ -0,0 +1,4 @@ +--- + +dependencies: + - { role: common } \ No newline at end of file