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

Fix & Revision to PR #1148 (OpenVPN rapid start during installs)

roles/1-prep/tasks/main.yml

@@ -37,6 +37,12 @@
   set_fact:
     uuid: "{{ stored_uuid.stdout_lines[0] }}"
 
+- name: SSHD
+  include_role:
+    name: sshd
+  # has no "when: XXXXX_install" flag
+  tags: base, sshd
+
 - name: OPENVPN
   include_role:
     name: openvpn

roles/4-server-options/tasks/main.yml

@@ -3,13 +3,6 @@
 - name: ...IS BEGINNING ==================================
   command: echo
 
-# MANDATORY SO PERHAPS THIS BELONGS IN 3-BASE-SERVER ?
-- name: SSHD
-  include_role:
-    name: sshd
-  # has no "when: XXXXX_install" flag
-  tags: base, sshd
-
 - name: Installing dnsmasq
   include_tasks: roles/network/tasks/dnsmasq.yml
   when: dnsmasq_install

roles/sshd/tasks/main.yml

@@ -1,18 +1,40 @@
 - name: Disable root login with password
-  lineinfile: dest=/etc/ssh/sshd_config
+  lineinfile:
-              regexp='^PermitRootLogin'
+    dest: /etc/ssh/sshd_config
-              line='PermitRootLogin without-password'
+    regexp: '^PermitRootLogin'
-              state=present
+    line: 'PermitRootLogin without-password'
+    state: present
 #TODO: use handler to reload ssh
 
-- name: Enable sshd
+- name: Create root .ssh
-  service: name={{ sshd_service }}
+  file:
-           enabled=yes
+    path: /root/.ssh
-           state=started
+    owner: root
+    group: root
+    mode: 0700
+    state: directory
+  when: sshd_enabled
+
+- name: Install dummy root keys as placeholder
+  copy:
+    src: dummy_authorized_keys
+    dest: /root/.ssh/authorized_keys
+    owner: root
+    group: root
+    mode: 0600
+    force: no
+  when: sshd_enabled
+
+- name: Enable & start sshd
+  service:
+    name: "{{ sshd_service }}"
+    enabled: yes
+    state: started
   when: sshd_enabled
 
 - name: Disable sshd
-  service: name={{ sshd_service }}
+  service:
-           enabled=no
+    name: "{{ sshd_service }}"
-           state=stopped
+    enabled: no
+    state: stopped
   when: not sshd_enabled