Merge branch 'master' of https://github.com/iiab/iiab

roles/openvpn/tasks/main.yml

@@ -32,7 +32,7 @@
 # being used (instead of the full key) as an abbreviated regexp for now.
 # A backslash in front of each plus sign (+) would also work.
 
-- name: Remove ssh public keys (if openvpn_install is False)
+- name: Remove those ssh public keys (if openvpn_install is False)
   lineinfile:
     regexp: "{{ item }}"
     path: /root/.ssh/authorized_keys
@@ -44,27 +44,17 @@
     - "tUM4hl009fbXY4Yy3bAadWL1CquVrZmKfBBWhyhz8zLD6TQ== ghunt@ip-192-168-123-123.ec2.internal$"
     - "heOMXXNU6skxdPh2fcHh0bzQcaCSQ== holt@crank$"
 
-- name: Create the directory for OpenVPN keys
+- name: "Create 3 directories for: OpenVPN keys, scripts & up_wan"
   file:
-    dest: /etc/openvpn/keys
+    path: "{{ item }}"
     state: directory
     owner: root
     group: root
     mode: 0755
-
-- name: Create the directory for scripts
-  file:
-    dest: /etc/openvpn/scripts
-    state: directory
-    owner: root
-    group: root
-    mode: 0755
-
-# Comment out in future?  Might still be relevant for CentOS but unused for ~2 years as of August 2018:
-- name: Create folder /usr/lib/iiab (not on path) for iiab executable up_wan
-  file:
-    path: /usr/lib/iiab
-    state: directory
+  with_items:
+    - /etc/openvpn/keys
+    - /etc/openvpn/scripts
+    - /usr/lib/iiab    # For executable up_wan.  Comment out in future?  Might still be relevant for CentOS but unused for ~2 years as of August 2018.
 
 - name: Configure OpenVPN (BACKS UP FILES IF CHANGED)
   template:
@@ -96,16 +86,6 @@
     # Buggy & rarely used as of August 2018:
     #- { src: 'iiab-vpn.j2', dest: '/usr/bin/iiab-vpn', mode: '0755' }
 
-#- name: Save openvpn_handle variable into /etc/iiab/openvpn_handle (BACKS UP FILE IF CHANGED)
-#  template:
-#    src: openvpn_handle.j2
-#    dest: /etc/iiab/openvpn_handle
-#    owner: root
-#    group: root
-#    mode: 0644
-#    backup: yes
-#  when: openvpn_handle is defined
-
 # up_wan was being installed twice (also above) and was unused for ~2 years
 # as of August 2018: (see 15-openvpn below)
 #- name: Put up_wan in place (debuntu)
@@ -121,9 +101,9 @@
   template:
     src: 15-openvpn
     dest: /etc/NetworkManager/dispatcher.d/
-  when: not is_debuntu
+  when: not is_debuntu    # SHOULD THIS CONDITION ACT ON THE PRESENCE OF NETWORKMANAGER?  e.g. some Ubuntu's use NM, others don't.
 
-# Was buggy & unused for ~2 years as of August 2018:
+# Was obsolete/unused for ~2 years as of August 2018: (replaced by /etc/openvpn/xscenet.conf)
 #- name: Check for manually configured OpenVPN tunnel
 #  stat:
 #    path: /etc/openvpn/iiab-vpn.conf