proxy prompts enabled #70

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:

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' }

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' }

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' }

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

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

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