Merge pull request #146 from scottsb/patch-1

Ensure snapd is started immediately

defaults/main.yml

@@ -21,12 +21,6 @@ certbot_create_command: >-
   {{ certbot_script }} certonly --standalone --noninteractive --agree-tos
   --email {{ cert_item.email | default(certbot_admin_email) }}
   -d {{ cert_item.domains | join(',') }}
-  {{ '--pre-hook /etc/letsencrypt/renewal-hooks/pre/stop_services'
-    if certbot_create_standalone_stop_services
-  else '' }}
-  {{ '--post-hook /etc/letsencrypt/renewal-hooks/post/start_services'
-    if certbot_create_standalone_stop_services
-  else '' }}
 
 certbot_create_standalone_stop_services:
   - nginx

tasks/create-cert-standalone.yml

@@ -4,39 +4,20 @@
     path: /etc/letsencrypt/live/{{ cert_item.domains | first | replace('*.', '') }}/cert.pem
   register: letsencrypt_cert
 
-- name: Ensure pre and post hook folders exist.
-  file:
-    path: /etc/letsencrypt/renewal-hooks/{{ item }}
-    state: directory
-    mode: 0755
-    owner: root
-    group: root
-  with_items:
-    - pre
-    - post
-
-- name: Create pre hook to stop services.
-  template:
-    src: stop_services.j2
-    dest: /etc/letsencrypt/renewal-hooks/pre/stop_services
-    owner: root
-    group: root
-    mode: 0750
-  when:
-    - certbot_create_standalone_stop_services is defined
-    - certbot_create_standalone_stop_services
-
-- name: Create post hook to start services.
-  template:
-    src: start_services.j2
-    dest: /etc/letsencrypt/renewal-hooks/post/start_services
-    owner: root
-    group: root
-    mode: 0750
-  when:
-    - certbot_create_standalone_stop_services is defined
-    - certbot_create_standalone_stop_services
+- name: Stop services to allow certbot to generate a cert.
+  service:
+    name: "{{ item }}"
+    state: stopped
+  when: not letsencrypt_cert.stat.exists
+  with_items: "{{ certbot_create_standalone_stop_services }}"
 
 - name: Generate new certificate if one doesn't exist.
   command: "{{ certbot_create_command }}"
   when: not letsencrypt_cert.stat.exists
+
+- name: Start services after cert has been generated.
+  service:
+    name: "{{ item }}"
+    state: started
+  when: not letsencrypt_cert.stat.exists
+  with_items: "{{ certbot_create_standalone_stop_services }}"

tasks/install-with-snap.yml

@@ -9,6 +9,7 @@
   systemd:
     name: snapd.socket
     enabled: true
+    state: started
 
 - name: Enable classic snap support.
   file:

templates/start_services.j2

@@ -1,15 +0,0 @@
-#!/bin/bash
-# {{ ansible_managed }}
-
-{% for item in certbot_create_standalone_stop_services %}
-echo "starting service {{ item }}"
-{% if ansible_service_mgr == 'systemd' %}
-systemctl start {{ item }}
-{% elif ansible_service_mgr == 'upstart' %}
-initctl start {{ item }}
-{% elif ansible_service_mgr == 'openrc' %}
-rc-service {{ item }} start
-{% else %}
-service {{ item }} start
-{% endif %}
-{% endfor %}

templates/stop_services.j2

@@ -1,15 +0,0 @@
-#!/bin/bash
-# {{ ansible_managed }}
-
-{% for item in certbot_create_standalone_stop_services %}
-echo "stopping service {{ item }}"
-{% if ansible_service_mgr == 'systemd' %}
-systemctl stop {{ item }}
-{% elif ansible_service_mgr == 'upstart' %}
-initctl stop {{ item }}
-{% elif ansible_service_mgr == 'openrc' %}
-rc-service {{ item }} stop
-{% else %}
-service {{ item }} stop
-{% endif %}
-{% endfor %}