Merge pull request #1155 from holta/openvpn-rapid-support

OpenVPN rapid support improved per @jvonau recommendation

roles/1-prep/tasks/main.yml

@@ -43,6 +43,12 @@
   # has no "when: XXXXX_install" flag
   tags: base, sshd
 
+- name: IIAB-ADMIN
+  include_role:
+    name: iiab-admin
+  # has no "when: XXXXX_install" flag
+  tags: base, iiab-admin
+
 - name: OPENVPN
   include_role:
     name: openvpn

roles/3-base-server/tasks/main.yml

@@ -9,12 +9,6 @@
   # has no "when: XXXXX_install" flag
   tags: base, httpd
 
-- name: IIAB-ADMIN
-  include_role:
-    name: iiab-admin
-  # has no "when: XXXXX_install" flag
-  tags: base, iiab-admin
-
 - name: MYSQL
   include_role:
     name: mysql

roles/iiab-admin/README.rst

@@ -1,5 +1,16 @@
+.. |ss| raw:: html
+
+   <strike>
+
+.. |se| raw:: html
+
+   </strike>
+
+.. |nbsp| unicode:: 0xA0
+   :trim:
+
 =================
-IIAB Admin README
+iiab-admin README
 =================
 
 This role is home to a number of administrative playbooks.  Those implemented are:
@@ -10,7 +21,7 @@ Add Administrative User
 * Add the iiab-admin user and password
 * N.B. to create password hash use python -c 'import crypt; print crypt.crypt("<plaintext>", "$6$<salt>")'
 * Make a sudoer
-* Add /root/.ssh and dummy authorized_keys file as placeholder
+* |ss| Add /root/.ssh and dummy authorized_keys file as placeholder |se| |nbsp| (moved to playbook roles/sshd)
 * Force password for sudoers
 
 Add Packages for Remote Access