Merge 9dcabdc972 into c6e6679d42

Merge pull request #245 from nonno-cicala/master
Fix Fedora
2026-08-25 01:05:36 +02:00 · 2026-07-29 18:57:51 +02:00 · 2026-07-29 10:48:16 -05:00 · 2026-07-29 10:46:57 -05:00 · 2026-07-29 10:46:21 -05:00 · 2026-07-06 14:43:04 +09:00
7 changed files with 41 additions and 12 deletions
@@ -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
@@ -9,6 +9,12 @@ certbot_auto_renew_options: "--quiet"
 certbot_testmode: false
 certbot_hsts: false

+certbot_renewal_hook_post: ""
+certbot_renewal_hook_pre: ""
+certbot_renewal_hook_deploy: ""
+certbot_renewal_hook_post_filename: "post.sh"
+certbot_renewal_hook_pre_filename: "pre.sh"
+certbot_renewal_hook_deploy_filename: "deploy.sh"

 # Parameters used when creating new Certbot certs.
 certbot_create_if_missing: false
@@ -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

@@ -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

@@ -29,5 +29,7 @@
  loop_control:
    loop_var: cert_item

+- import_tasks: setup-hooks.yml
+
 - import_tasks: renew-cron.yml
  when: certbot_auto_renew
@@ -9,3 +9,4 @@
  shell: |
    dnf config-manager --set-enabled crb
  changed_when: false
+  when: ansible_distribution != 'Fedora'
@@ -0,0 +1,30 @@
+---
+- name: Ensure renewal hook directories exist
+  file:
+    path: "/etc/letsencrypt/renewal-hooks/{{ item }}"
+    state: directory
+  with_items:
+    - post
+    - pre
+    - deploy
+
+- name: Create post-renewal hook
+  copy:
+    content: "{{ certbot_renewal_hook_post }}"
+    dest: "/etc/letsencrypt/renewal-hooks/post/{{ certbot_renewal_hook_post_filename }}"
+    mode: "0755"
+  when: certbot_renewal_hook_post != ""
+
+- name: Create pre-renewal hook
+  copy:
+    content: "{{ certbot_renewal_hook_pre }}"
+    dest: "/etc/letsencrypt/renewal-hooks/pre/{{ certbot_renewal_hook_pre_filename }}"
+    mode: "0755"
+  when: certbot_renewal_hook_pre != ""
+
+- name: Create deploy-renewal hook
+  copy:
+    content: "{{ certbot_renewal_hook_deploy }}"
+    dest: "/etc/letsencrypt/renewal-hooks/deploy/{{ certbot_renewal_hook_deploy_filename }}"
+    mode: "0755"
+  when: certbot_renewal_hook_deploy != ""
Author	SHA1	Message	Date
Niyazi Gokberk GunduzandGitHub	7edbddcb31	Merge `9dcabdc972` into `c6e6679d42`	2026-07-29 18:57:51 +02:00
Jeff GeerlingandGitHub	c6e6679d42	Merge pull request #245 from nonno-cicala/master Fix Fedora	2026-07-29 10:48:16 -05:00
Jeff GeerlingandGitHub	1e5a11fd99	Merge pull request #254 from 93jun/fix-ci-conflict-markers Remove CI conflict markers	2026-07-29 10:46:57 -05:00
Jeff GeerlingandGitHub	7e659d14bc	Merge pull request #249 from mcvic1rj/fix-certbot5 Update to support how certbot 5.5 displays domains	2026-07-29 10:46:21 -05:00
93jun	5ad5bd94bf	Remove CI conflict markers	2026-07-06 14:43:04 +09:00
Ryan McVicar	261cf7aac5	Update to support how certbot 5.5 displays domains	2026-04-28 15:14:35 -04:00
Simone Scanzoni	01a8ac6f90	Fix Fedora	2026-01-25 04:03:27 +01:00
Niyazi Gokberk Gunduz	9dcabdc972	Define renewal hook variables in defaults/main.yml	2024-05-16 11:13:22 +02:00
Niyazi Gokberk Gunduz	b9415db0f0	Enhance certbot role to support configurable renewal hooks - Added variables for pre, post, and deploy renewal hooks in defaults/main.yml. - Created a new task file tasks/setup-hooks.yml to manage the hooks setup. - Included setup-hooks.yml in tasks/main.yml to ensure hooks are created if specified.	2024-05-16 10:48:43 +02:00