Merge pull request #192 from fapdash/patch-1

Run hooks only for standalone mode

.github/workflows/ci.yml

@@ -74,7 +74,7 @@ jobs:
           python-version: '3.x'
 
       - name: Install test dependencies.
-        run: pip3 install ansible molecule[docker] docker
+        run: pip3 install ansible molecule molecule-plugins[docker] docker
 
       - name: Run Molecule tests.
         run: molecule test

.yamllint

@@ -5,6 +5,9 @@ rules:
   line-length:
     max: 180
     level: warning
+  indentation:
+    spaces: 2
+    indent-sequences: consistent
 
 ignore: |
   .github/stale.yml

README.md

@@ -20,7 +20,7 @@ Controls how Certbot is installed. Available options are 'package', 'snap', and
     certbot_auto_renew_user: "{{ ansible_user | default(lookup('env', 'USER')) }}"
     certbot_auto_renew_hour: "3"
     certbot_auto_renew_minute: "30"
-    certbot_auto_renew_options: "--quiet --no-self-upgrade"
+    certbot_auto_renew_options: "--quiet"
 
 By default, this role configures a cron job to run under the provided user account at the given hour and minute, every day. The defaults run `certbot renew` (or `certbot-auto renew`) via cron every day at 03:30:00 by the user you use in your Ansible playbook. It's preferred that you set a custom user/hour/minute so the renewal is during a low-traffic period and done by a non-root user account.
 

defaults/main.yml

@@ -4,7 +4,7 @@ certbot_auto_renew: true
 certbot_auto_renew_user: "{{ ansible_user | default(lookup('env', 'USER')) }}"
 certbot_auto_renew_hour: "3"
 certbot_auto_renew_minute: "30"
-certbot_auto_renew_options: "--quiet --no-self-upgrade"
+certbot_auto_renew_options: "--quiet"
 
 certbot_testmode: false
 certbot_hsts: false
@@ -37,10 +37,10 @@ certbot_create_command: >-
   {{ cert_item.webroot | default(certbot_webroot) if certbot_create_method == 'webroot' else '' }}
   -d {{ cert_item.domains | join(',') }}
   {{ '--pre-hook /etc/letsencrypt/renewal-hooks/pre/stop_services'
-    if certbot_create_standalone_stop_services
+    if certbot_create_standalone_stop_services and certbot_create_method == 'standalone'
   else '' }}
   {{ '--post-hook /etc/letsencrypt/renewal-hooks/post/start_services'
-    if certbot_create_standalone_stop_services
+    if certbot_create_standalone_stop_services and certbot_create_method == 'standalone'
   else '' }}
 
 certbot_create_standalone_stop_services:

molecule/default/molecule.yml

@@ -1,4 +1,5 @@
 ---
+role_name_check: 1
 dependency:
   name: galaxy
 driver:
@@ -8,7 +9,8 @@ platforms:
     image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest"
     command: ${MOLECULE_DOCKER_COMMAND:-""}
     volumes:
-      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
+    cgroupns_mode: host
     privileged: true
     pre_build_image: true
 provisioner:

tasks/setup-RedHat.yml

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