p12 moved into playbooks

algo

@@ -1,12 +1,5 @@
 #!/bin/sh
 
-p12_export_password () {
-  echo -n "
-Enter the password for p12 certificates (default: vpn):
-: "
-  read -s P  
-  P=${P:-vpn}
-}
 
 algo_provisioning () {
   echo -n "
@@ -29,14 +22,11 @@ Enter the number of your desired provider
     *) exit 1 ;;
   esac
   
-  p12_export_password
+  ansible-playbook "${CLOUD}.yml"
-  
-  ansible-playbook "${CLOUD}.yml" -e easyrsa_p12_export_password=${P}
 }
   
 user_management () {
-  p12_export_password
+  ansible-playbook users.yml
-  ansible-playbook users.yml -e easyrsa_p12_export_password=${P}
 }
 
 case "$1" in

digitalocean.yml

@@ -59,6 +59,11 @@
     default: "Y"
     private: no
     
+  - name: "easyrsa_p12_export_password"
+    prompt: "Enter the password for p12 certificates:\n"
+    default: "vpn"
+    private: yes    
+
   roles:
     - cloud-digitalocean
 

ec2.yml

@@ -67,6 +67,11 @@
       default: "Y"
       private: no
       
+    - name: "easyrsa_p12_export_password"
+      prompt: "Enter the password for p12 certificates:\n"
+      default: "vpn"
+      private: yes      
+
   roles:
     - cloud-ec2
 

gce.yml

@@ -63,6 +63,11 @@
     default: "Y"
     private: no
     
+  - name: "easyrsa_p12_export_password"
+    prompt: "Enter the password for p12 certificates:\n"
+    default: "vpn"
+    private: yes
+
   roles:
     - cloud-gce
 

non-cloud.yml

@@ -23,6 +23,11 @@
       default: "Y"
       private: no
       
+    - name: "easyrsa_p12_export_password"
+      prompt: "Enter the password for p12 certificates:\n"
+      default: "vpn"
+      private: yes         
+
   tasks:
     - name: Add the server to the vpn-host group
       add_host:
@@ -32,6 +37,7 @@
         ansible_python_interpreter: "/usr/bin/python2.7"
         dns_enabled: "{{ dns_enabled }}"
         auditd_enabled: " {{ auditd_enabled }}"
+        easyrsa_p12_export_password: "{{ easyrsa_p12_export_password }}"
 
     - name: Wait for SSH to become available
       local_action: "wait_for port=22 host={{ server_ip }} timeout=320"

roles/cloud-digitalocean/tasks/main.yml

@@ -33,6 +33,7 @@
     do_droplet_id: "{{ do.droplet.id }}"
     dns_enabled: "{{ dns_enabled }}"
     auditd_enabled: " {{ auditd_enabled }}"
+    easyrsa_p12_export_password: "{{ easyrsa_p12_export_password }}"
 
 - name: Wait for SSH to become available
   local_action: "wait_for port=22 host={{ do.droplet.ip_address }} timeout=320"

roles/cloud-ec2/tasks/main.yml

@@ -71,6 +71,7 @@
     ansible_python_interpreter: "/usr/bin/python2.7"
     dns_enabled: "{{ dns_enabled }}"
     auditd_enabled: " {{ auditd_enabled }}"
+    easyrsa_p12_export_password: "{{ easyrsa_p12_export_password }}"
   with_items: "{{ ec2.instances }}"
 
 - name: Wait for SSH to become available

roles/cloud-gce/tasks/main.yml

@@ -22,6 +22,7 @@
     ansible_python_interpreter: "/usr/bin/python2.7"
     dns_enabled: "{{ dns_enabled }}"
     auditd_enabled: " {{ auditd_enabled }}"
+    easyrsa_p12_export_password: "{{ easyrsa_p12_export_password }}"
 
 - name: Firewall configured
   local_action:

users.yml

@@ -15,6 +15,11 @@
       default: "root"
       private: no
       
+    - name: "easyrsa_p12_export_password"
+      prompt: "Enter the password for p12 certificates:\n"
+      default: "vpn"
+      private: yes      
+
   tasks:
     - name: Add the server to the vpn-host group
       add_host:
@@ -22,6 +27,7 @@
         groupname: vpn-host
         ansible_ssh_user: "{{ server_user }}"
         ansible_python_interpreter: "/usr/bin/python2.7"
+        easyrsa_p12_export_password: "{{ easyrsa_p12_export_password }}"
 
     - name: Wait for SSH to become available
       local_action: "wait_for port=22 host={{ server_ip }} timeout=320"