From 71ad2f570e3605e2630d888b793be22d0f308cfb Mon Sep 17 00:00:00 2001 From: Evgeniy Ivanov Date: Sun, 21 Aug 2016 19:57:52 +0300 Subject: [PATCH] proxy prompts enabled #70 --- digitalocean.yml | 11 ++++++++--- ec2.yml | 9 +++++++-- gce.yml | 9 +++++++-- non-cloud.yml | 10 ++++++++-- roles/cloud-digitalocean/tasks/main.yml | 1 + roles/cloud-ec2/tasks/main.yml | 1 + roles/cloud-gce/tasks/main.yml | 1 + 7 files changed, 33 insertions(+), 9 deletions(-) diff --git a/digitalocean.yml b/digitalocean.yml index f2f3d4f..4dbc3c9 100644 --- a/digitalocean.yml +++ b/digitalocean.yml @@ -50,9 +50,14 @@ private: no - name: "dns_enabled" - prompt: "Do you want to use a local DNS resolver to block ads while surfing? (Y or N):\n" + prompt: "Do you want to install a local DNS resolver to block ads while surfing? (Y or N):\n" default: "Y" private: no + + - name: "proxy_enabled" + prompt: "Do you want to install a proxy to block ads and decrease traffic usage while surfing? (Y or N):\n" + default: "Y" + private: no - name: "auditd_enabled" prompt: "Do you want to use auditd ? (Y or N):\n" @@ -120,9 +125,9 @@ roles: - common - security - - proxy - vpn - - { role: dns_adblocking , when: dns_enabled is defined and dns_enabled == "Y" } + - { role: proxy, when: proxy_enabled is defined and proxy_enabled == "Y" } + - { role: dns_adblocking, when: dns_enabled is defined and dns_enabled == "Y" } - { role: logging, when: auditd_enabled is defined and auditd_enabled == 'Y' } handlers: diff --git a/ec2.yml b/ec2.yml index f880d0f..d88296e 100644 --- a/ec2.yml +++ b/ec2.yml @@ -58,7 +58,12 @@ private: no - name: "dns_enabled" - prompt: "Do you want to use a local DNS resolver to block ads while surfing? (Y or N):\n" + prompt: "Do you want to install a local DNS resolver to block ads while surfing? (Y or N):\n" + default: "Y" + private: no + + - name: "proxy_enabled" + prompt: "Do you want to install a proxy to block ads and decrease traffic usage while surfing? (Y or N):\n" default: "Y" private: no @@ -91,7 +96,7 @@ roles: - common - security - - proxy - vpn + - { role: proxy, when: proxy_enabled is defined and proxy_enabled == "Y" } - { role: dns_adblocking , when: dns_enabled is defined and dns_enabled == "Y" } - { role: logging, when: auditd_enabled is defined and auditd_enabled == 'Y' } diff --git a/gce.yml b/gce.yml index 3c8e9f7..6f1b452 100644 --- a/gce.yml +++ b/gce.yml @@ -54,7 +54,12 @@ private: no - name: "dns_enabled" - prompt: "Do you want to use a local DNS resolver to block ads while surfing? (Y or N):\n" + prompt: "Do you want to install a local DNS resolver to block ads while surfing? (Y or N):\n" + default: "Y" + private: no + + - name: "proxy_enabled" + prompt: "Do you want to install a proxy to block ads and decrease traffic usage while surfing? (Y or N):\n" default: "Y" private: no @@ -87,7 +92,7 @@ roles: - common - security - - proxy - vpn + - { role: proxy, when: proxy_enabled is defined and proxy_enabled == "Y" } - { role: dns_adblocking , when: dns_enabled is defined and dns_enabled == "Y" } - { role: logging, when: auditd_enabled is defined and auditd_enabled == 'Y' } diff --git a/non-cloud.yml b/non-cloud.yml index 1623a55..0aca4fc 100644 --- a/non-cloud.yml +++ b/non-cloud.yml @@ -15,7 +15,12 @@ private: no - name: "dns_enabled" - prompt: "Do you want to use a local DNS resolver to block ads while surfing? (Y or N):\n" + prompt: "Do you want to install a local DNS resolver to block ads while surfing? (Y or N):\n" + default: "Y" + private: no + + - name: "proxy_enabled" + prompt: "Do you want to install a proxy to block ads and decrease traffic usage while surfing? (Y or N):\n" default: "Y" private: no @@ -41,6 +46,7 @@ ansible_ssh_user: "{{ server_user }}" ansible_python_interpreter: "/usr/bin/python2.7" dns_enabled: "{{ dns_enabled }}" + proxy_enabled: "{{ proxy_enabled }}" auditd_enabled: " {{ auditd_enabled }}" easyrsa_p12_export_password: "{{ easyrsa_p12_export_password }}" IP_subject: "{{ IP_subject }}" @@ -63,7 +69,7 @@ roles: - common - security - - proxy - vpn + - { role: proxy, when: proxy_enabled is defined and proxy_enabled == "Y" } - { role: dns_adblocking , when: dns_enabled is defined and dns_enabled == "Y" } - { role: logging, when: auditd_enabled is defined and auditd_enabled == 'Y' } diff --git a/roles/cloud-digitalocean/tasks/main.yml b/roles/cloud-digitalocean/tasks/main.yml index 7bdee8b..a7d5273 100644 --- a/roles/cloud-digitalocean/tasks/main.yml +++ b/roles/cloud-digitalocean/tasks/main.yml @@ -32,6 +32,7 @@ do_access_token: "{{ do_access_token }}" do_droplet_id: "{{ do.droplet.id }}" dns_enabled: "{{ dns_enabled }}" + proxy_enabled: "{{ proxy_enabled }}" auditd_enabled: " {{ auditd_enabled }}" easyrsa_p12_export_password: "{{ easyrsa_p12_export_password }}" cloud_provider: digitalocean diff --git a/roles/cloud-ec2/tasks/main.yml b/roles/cloud-ec2/tasks/main.yml index dd65753..13b897e 100644 --- a/roles/cloud-ec2/tasks/main.yml +++ b/roles/cloud-ec2/tasks/main.yml @@ -70,6 +70,7 @@ ansible_ssh_user: ubuntu ansible_python_interpreter: "/usr/bin/python2.7" dns_enabled: "{{ dns_enabled }}" + proxy_enabled: "{{ proxy_enabled }}" auditd_enabled: " {{ auditd_enabled }}" easyrsa_p12_export_password: "{{ easyrsa_p12_export_password }}" cloud_provider: ec2 diff --git a/roles/cloud-gce/tasks/main.yml b/roles/cloud-gce/tasks/main.yml index 4ab0ee2..4bddb27 100644 --- a/roles/cloud-gce/tasks/main.yml +++ b/roles/cloud-gce/tasks/main.yml @@ -21,6 +21,7 @@ ansible_ssh_user: ubuntu ansible_python_interpreter: "/usr/bin/python2.7" dns_enabled: "{{ dns_enabled }}" + proxy_enabled: "{{ proxy_enabled }}" auditd_enabled: " {{ auditd_enabled }}" easyrsa_p12_export_password: "{{ easyrsa_p12_export_password }}" cloud_provider: gce