Merge pull request #245 from nonno-cicala/master

Fix Fedora

.github/workflows/ci.yml

@@ -50,16 +50,6 @@ jobs:
           - distro: debian12
             playbook: converge.yml
             experimental: false
-<<<<<<< Updated upstream
-=======
-          - distro: debian10
-            playbook: converge.yml
-            experimental: false
-          # Source install started failing recently.
-          # - distro: centos7
-          #   playbook: playbook-source-install.yml
-          #   experimental: false
->>>>>>> Stashed changes
 
           - distro: rockylinux9
             playbook: playbook-snap-install.yml

README.md

@@ -74,11 +74,6 @@ Services that should be stopped while `certbot` runs it's own standalone server
 
 These services will only be stopped the first time a new cert is generated.
 
-    certbot_pre_hook_template: stop_services.j2
-    certbot_post_hook_template: start_services.j2
-
-If you need to stop and start services in another way, firstly you define these services in `certbot_create_standalone_stop_services` and then you must create your own templates for this mision and set its paths in `certbot_pre_hook_template` and `certbot_post_hook_template`.
-
 ### Snap Installation
 
 Beginning in December 2020, the Certbot maintainers decided to recommend installing Certbot from Snap rather than maintain scripts like `certbot-auto`.

defaults/main.yml

@@ -68,6 +68,3 @@ certbot_keep_updated: true
 
 # Where to put Certbot when installing from source.
 certbot_dir: /opt/certbot
-
-certbot_pre_hook_template: stop_services.j2
-certbot_post_hook_template: start_services.j2

tasks/create-cert-standalone.yml

@@ -21,7 +21,7 @@
 
 - name: Create pre hook to stop services.
   template:
-    src: "{{ certbot_pre_hook_template }}"
+    src: stop_services.j2
     dest: /etc/letsencrypt/renewal-hooks/pre/stop_services
     owner: root
     group: root
@@ -32,7 +32,7 @@
 
 - name: Create post hook to start services.
   template:
-    src: "{{ certbot_post_hook_template }}"
+    src: start_services.j2
     dest: /etc/letsencrypt/renewal-hooks/post/start_services
     owner: root
     group: root
@@ -44,7 +44,7 @@
 - name: Check if domains have changed
   block:
     - name: Register certificate domains
-      shell: "{{ certbot_script }} certificates --cert-name {{ cert_item_name }} | grep Domains | cut -d':' -f2"
+      shell: "{{ certbot_script }} certificates --cert-name {{ cert_item_name }} | grep -E '(Domains|Identifiers)' | cut -d':' -f2"
       changed_when: false
       register: letsencrypt_cert_domains_dirty
 

tasks/create-cert-webroot.yml

@@ -16,7 +16,7 @@
 - name: Check if domains have changed
   block:
     - name: Register certificate domains
-      shell: "{{ certbot_script }} certificates --cert-name {{ cert_item_name }} | grep Domains | cut -d':' -f2"
+      shell: "{{ certbot_script }} certificates --cert-name {{ cert_item_name }} | grep -E '(Domains|Identifiers)' | cut -d':' -f2"
       changed_when: false
       register: letsencrypt_cert_domains_dirty
 

tasks/setup-RedHat.yml

@@ -9,3 +9,4 @@
   shell: |
     dnf config-manager --set-enabled crb
   changed_when: false
+  when: ansible_distribution != 'Fedora'