Merge pull request #146 from scottsb/patch-1

Ensure snapd is started immediately

.github/stale.yml

@@ -12,7 +12,6 @@ onlyLabels: []
 
 # Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
 exemptLabels:
-  - bug
   - pinned
   - security
   - planned

.github/workflows/ci.yml

@@ -53,10 +53,9 @@ jobs:
           - distro: debian10
             playbook: converge.yml
             experimental: false
-          # Source install started failing recently.
-          # - distro: centos7
-          #   playbook: playbook-source-install.yml
-          #   experimental: false
+          - distro: centos7
+            playbook: playbook-source-install.yml
+            experimental: false
 
           - distro: centos7
             playbook: playbook-snap-install.yml

.yamllint

@@ -3,7 +3,7 @@ extends: default
 
 rules:
   line-length:
-    max: 180
+    max: 120
     level: warning
 
 ignore: |

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

@@ -16,7 +16,6 @@
     src: /var/lib/snapd/snap
     dest: /snap
     state: link
-  when: ansible_os_family != "Debian"
 
 - name: Update snap after install.
   shell: snap install core; snap refresh core

tasks/setup-RedHat.yml

@@ -7,9 +7,7 @@
       name: dnf-plugins-core
       state: present
 
-  - block:
-
-      - name: Enable DNF module for CentOS 8.3+.
+  - name: Enable DNF module for CentOS 8+.
     shell: |
       dnf config-manager --set-enabled powertools
     args:
@@ -17,18 +15,6 @@
     register: dnf_module_enable
     changed_when: false
 
-        when: ansible_facts['distribution_version'] is version('8.3', '>=')
-
-      - name: Enable DNF module for CentOS 8.0–8.2.
-        shell: |
-          dnf config-manager --set-enabled PowerTools
-        args:
-          warn: false
-        register: dnf_module_enable
-        changed_when: false
-
-    when: ansible_facts['distribution_version'] is version('8.2', '<=')
-
   when:
     - ansible_distribution == 'CentOS'
     - ansible_distribution_major_version | int >= 8

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 %}