From 711f2f1c64739039e0889a73bfd8041551e247d1 Mon Sep 17 00:00:00 2001
From: June <june@jsts.xyz>
Date: Sun, 1 Mar 2026 20:08:49 +0100
Subject: [PATCH] certbot(role): don't use certbot__version_spec anymore as its
 not used

---
 docs/create-new-web-service-vm.md                  |  1 -
 inventories/chaosknoten/host_vars/acmedns.yaml     |  1 -
 inventories/chaosknoten/host_vars/ccchoir.yaml     |  1 -
 inventories/chaosknoten/host_vars/eh22-wiki.yaml   |  1 -
 inventories/chaosknoten/host_vars/grafana.yaml     |  1 -
 inventories/chaosknoten/host_vars/keycloak.yaml    |  1 -
 inventories/chaosknoten/host_vars/lists.yaml       |  1 -
 inventories/chaosknoten/host_vars/mumble.yaml      |  1 -
 inventories/chaosknoten/host_vars/netbox.yaml      |  1 -
 inventories/chaosknoten/host_vars/ntfy.yaml        |  1 -
 inventories/chaosknoten/host_vars/onlyoffice.yaml  |  1 -
 inventories/chaosknoten/host_vars/pad.yaml         |  1 -
 inventories/chaosknoten/host_vars/pretalx.yaml     |  1 -
 inventories/chaosknoten/host_vars/spaceapiccc.yaml |  1 -
 inventories/chaosknoten/host_vars/sunders.yaml     |  1 -
 inventories/chaosknoten/host_vars/tickets.yaml     |  1 -
 inventories/chaosknoten/host_vars/wiki.yaml        |  1 -
 inventories/chaosknoten/host_vars/zammad.yaml      |  1 -
 inventories/external/host_vars/status.yaml         |  1 -
 inventories/z9/host_vars/dooris.yaml               |  1 -
 inventories/z9/host_vars/light.yaml                |  3 ---
 roles/certbot/meta/argument_specs.yaml             |  9 ---------
 roles/certbot/tasks/main/install.yaml              | 10 +---------
 roles/nextcloud/meta/main.yaml                     |  1 -
 24 files changed, 1 insertion(+), 42 deletions(-)

diff --git a/docs/create-new-web-service-vm.md b/docs/create-new-web-service-vm.md
index f6ccf4a..b91d9fa 100644
--- a/docs/create-new-web-service-vm.md
+++ b/docs/create-new-web-service-vm.md
@@ -59,7 +59,6 @@ From here, we go into the details of the web service that you want to configure.
 
 Make `inventories/chaosknoten/host_var/example.yaml` look like this:
 ```yaml
-certbot__version_spec: ""
 certbot__acme_account_email_address: le-admin@hamburg.ccc.de
 certbot__certificate_domains:
   - "example.hamburg.ccc.de"
diff --git a/inventories/chaosknoten/host_vars/acmedns.yaml b/inventories/chaosknoten/host_vars/acmedns.yaml
index 364aa9a..5c9cf56 100644
--- a/inventories/chaosknoten/host_vars/acmedns.yaml
+++ b/inventories/chaosknoten/host_vars/acmedns.yaml
@@ -9,7 +9,6 @@ docker_compose__configuration_files:
     content: "{{ lookup('ansible.builtin.template', 'resources/chaosknoten/acmedns/docker_compose/index.html.j2') }}"
 docker_compose__pull: missing
 
-certbot__version_spec: ""
 certbot__acme_account_email_address: le-admin@hamburg.ccc.de
 certbot__certificate_domains:
   # - "spaceapi.ccc.de" # after DNS has been adjusted
diff --git a/inventories/chaosknoten/host_vars/ccchoir.yaml b/inventories/chaosknoten/host_vars/ccchoir.yaml
index 93e49b0..7b7d572 100644
--- a/inventories/chaosknoten/host_vars/ccchoir.yaml
+++ b/inventories/chaosknoten/host_vars/ccchoir.yaml
@@ -1,7 +1,6 @@
 docker_compose__compose_file_content: "{{ lookup('ansible.builtin.template', 'resources/chaosknoten/ccchoir/docker_compose/compose.yaml.j2') }}"
 docker_compose__configuration_files: [ ]
 
-certbot__version_spec: ""
 certbot__acme_account_email_address: le-admin@hamburg.ccc.de
 certbot__certificate_domains:
   - "ccchoir.de"
diff --git a/inventories/chaosknoten/host_vars/eh22-wiki.yaml b/inventories/chaosknoten/host_vars/eh22-wiki.yaml
index 4b7ce47..5e0ca52 100644
--- a/inventories/chaosknoten/host_vars/eh22-wiki.yaml
+++ b/inventories/chaosknoten/host_vars/eh22-wiki.yaml
@@ -3,7 +3,6 @@ nginx__configurations:
   - name: eh22.easterhegg.eu
     content: "{{ lookup('ansible.builtin.file', 'resources/chaosknoten/eh22-wiki/nginx/eh22.easterhegg.eu.conf') }}"
 
-certbot__version_spec: ""
 certbot__acme_account_email_address: j+letsencrypt-ccchh@jsts.xyz
 certbot__certificate_domains:
   - "eh22.easterhegg.eu"
diff --git a/inventories/chaosknoten/host_vars/grafana.yaml b/inventories/chaosknoten/host_vars/grafana.yaml
index b87a198..f259ad7 100644
--- a/inventories/chaosknoten/host_vars/grafana.yaml
+++ b/inventories/chaosknoten/host_vars/grafana.yaml
@@ -25,7 +25,6 @@ docker_compose__configuration_files:
   - name: ntfy-alertmanager-fux
     content: "{{ lookup('ansible.builtin.template', 'resources/chaosknoten/grafana/docker_compose/ntfy-alertmanager-fux.j2') }}"
 
-certbot__version_spec: ""
 certbot__acme_account_email_address: le-admin@hamburg.ccc.de
 certbot__certificate_domains:
   - "grafana.hamburg.ccc.de"
diff --git a/inventories/chaosknoten/host_vars/keycloak.yaml b/inventories/chaosknoten/host_vars/keycloak.yaml
index a8fbc99..c288da5 100644
--- a/inventories/chaosknoten/host_vars/keycloak.yaml
+++ b/inventories/chaosknoten/host_vars/keycloak.yaml
@@ -1,7 +1,6 @@
 docker_compose__compose_file_content: "{{ lookup('ansible.builtin.template', 'resources/chaosknoten/keycloak/docker_compose/compose.yaml.j2') }}"
 docker_compose__configuration_files: [ ]
 
-certbot__version_spec: ""
 certbot__acme_account_email_address: j+letsencrypt-ccchh@jsts.xyz
 certbot__certificate_domains:
   - "id.hamburg.ccc.de"
diff --git a/inventories/chaosknoten/host_vars/lists.yaml b/inventories/chaosknoten/host_vars/lists.yaml
index 99acde3..0e53178 100644
--- a/inventories/chaosknoten/host_vars/lists.yaml
+++ b/inventories/chaosknoten/host_vars/lists.yaml
@@ -4,7 +4,6 @@ docker_compose__configuration_files:
     content: "{{ lookup('ansible.builtin.file', 'resources/chaosknoten/lists/docker_compose/settings_local.py') }}"
 docker_compose__files: resources/chaosknoten/lists/docker_compose/files
 
-certbot__version_spec: ""
 certbot__acme_account_email_address: j+letsencrypt-ccchh@jsts.xyz
 certbot__certificate_domains:
   - "lists.hamburg.ccc.de"
diff --git a/inventories/chaosknoten/host_vars/mumble.yaml b/inventories/chaosknoten/host_vars/mumble.yaml
index 3f3a06e..fe44b17 100644
--- a/inventories/chaosknoten/host_vars/mumble.yaml
+++ b/inventories/chaosknoten/host_vars/mumble.yaml
@@ -1,4 +1,3 @@
-certbot__version_spec: ""
 certbot__acme_account_email_address: j+letsencrypt-ccchh@jsts.xyz
 certbot__certificate_domains:
   - "mumble.hamburg.ccc.de"
diff --git a/inventories/chaosknoten/host_vars/netbox.yaml b/inventories/chaosknoten/host_vars/netbox.yaml
index 2c68c17..8982a22 100644
--- a/inventories/chaosknoten/host_vars/netbox.yaml
+++ b/inventories/chaosknoten/host_vars/netbox.yaml
@@ -8,7 +8,6 @@ nginx__configurations:
   - name: netbox.hamburg.ccc.de
     content: "{{ lookup('ansible.builtin.file', 'resources/chaosknoten/netbox/nginx/netbox.hamburg.ccc.de.conf') }}"
 
-certbot__version_spec: ""
 certbot__acme_account_email_address: j+letsencrypt-ccchh@jsts.xyz
 certbot__certificate_domains:
   - "netbox.hamburg.ccc.de"
diff --git a/inventories/chaosknoten/host_vars/ntfy.yaml b/inventories/chaosknoten/host_vars/ntfy.yaml
index 2d68bfa..0cc9433 100644
--- a/inventories/chaosknoten/host_vars/ntfy.yaml
+++ b/inventories/chaosknoten/host_vars/ntfy.yaml
@@ -3,7 +3,6 @@ docker_compose__configuration_files:
   - name: server.yml
     content: "{{ lookup('ansible.builtin.template', 'resources/chaosknoten/ntfy/docker_compose/server.yaml.j2') }}"
 
-certbot__version_spec: ""
 certbot__acme_account_email_address: le-admin@hamburg.ccc.de
 certbot__certificate_domains:
   - "ntfy.hamburg.ccc.de"
diff --git a/inventories/chaosknoten/host_vars/onlyoffice.yaml b/inventories/chaosknoten/host_vars/onlyoffice.yaml
index aa39788..51308d4 100644
--- a/inventories/chaosknoten/host_vars/onlyoffice.yaml
+++ b/inventories/chaosknoten/host_vars/onlyoffice.yaml
@@ -3,7 +3,6 @@ nginx__configurations:
   - name: onlyoffice.hamburg.ccc.de
     content: "{{ lookup('ansible.builtin.file', 'resources/chaosknoten/onlyoffice/nginx/onlyoffice.hamburg.ccc.de.conf') }}"
 
-certbot__version_spec: ""
 certbot__acme_account_email_address: j+letsencrypt-ccchh@jsts.xyz
 certbot__certificate_domains:
   - "onlyoffice.hamburg.ccc.de"
diff --git a/inventories/chaosknoten/host_vars/pad.yaml b/inventories/chaosknoten/host_vars/pad.yaml
index 6625415..ecb8a27 100644
--- a/inventories/chaosknoten/host_vars/pad.yaml
+++ b/inventories/chaosknoten/host_vars/pad.yaml
@@ -1,7 +1,6 @@
 docker_compose__compose_file_content: "{{ lookup('ansible.builtin.template', 'resources/chaosknoten/pad/docker_compose/compose.yaml.j2') }}"
 docker_compose__configuration_files: [ ]
 
-certbot__version_spec: ""
 certbot__acme_account_email_address: le-admin@hamburg.ccc.de
 certbot__certificate_domains:
   - "pad.hamburg.ccc.de"
diff --git a/inventories/chaosknoten/host_vars/pretalx.yaml b/inventories/chaosknoten/host_vars/pretalx.yaml
index 3bdad13..12610b6 100644
--- a/inventories/chaosknoten/host_vars/pretalx.yaml
+++ b/inventories/chaosknoten/host_vars/pretalx.yaml
@@ -1,7 +1,6 @@
 docker_compose__compose_file_content: "{{ lookup('ansible.builtin.template', 'resources/chaosknoten/pretalx/docker_compose/compose.yaml.j2') }}"
 docker_compose__configuration_files: [ ]
 
-certbot__version_spec: ""
 certbot__acme_account_email_address: le-admin@hamburg.ccc.de
 certbot__certificate_domains:
   - "pretalx.hamburg.ccc.de"
diff --git a/inventories/chaosknoten/host_vars/spaceapiccc.yaml b/inventories/chaosknoten/host_vars/spaceapiccc.yaml
index 3689be7..0a894e8 100644
--- a/inventories/chaosknoten/host_vars/spaceapiccc.yaml
+++ b/inventories/chaosknoten/host_vars/spaceapiccc.yaml
@@ -2,7 +2,6 @@ docker_compose__compose_file_content: "{{ lookup('ansible.builtin.template', 're
 docker_compose__build: never
 docker_compose__pull: never
 
-certbot__version_spec: ""
 certbot__acme_account_email_address: le-admin@hamburg.ccc.de
 certbot__certificate_domains:
   - "spaceapi.ccc.de"
diff --git a/inventories/chaosknoten/host_vars/sunders.yaml b/inventories/chaosknoten/host_vars/sunders.yaml
index b3d50d8..4563a46 100644
--- a/inventories/chaosknoten/host_vars/sunders.yaml
+++ b/inventories/chaosknoten/host_vars/sunders.yaml
@@ -1,6 +1,5 @@
 docker_compose__compose_file_content: "{{ lookup('ansible.builtin.template', 'resources/chaosknoten/sunders/docker_compose/compose.yaml.j2') }}"
 
-certbot__version_spec: ""
 certbot__acme_account_email_address: le-admin@hamburg.ccc.de
 certbot__certificate_domains:
   - "sunders.hamburg.ccc.de"
diff --git a/inventories/chaosknoten/host_vars/tickets.yaml b/inventories/chaosknoten/host_vars/tickets.yaml
index 7a36bb6..63fa90f 100644
--- a/inventories/chaosknoten/host_vars/tickets.yaml
+++ b/inventories/chaosknoten/host_vars/tickets.yaml
@@ -3,7 +3,6 @@ docker_compose__configuration_files:
   - name: pretix.cfg
     content: "{{ lookup('ansible.builtin.template', 'resources/chaosknoten/tickets/docker_compose/pretix.cfg.j2') }}"
 
-certbot__version_spec: ""
 certbot__acme_account_email_address: le-admin@hamburg.ccc.de
 certbot__certificate_domains:
   - "tickets.hamburg.ccc.de"
diff --git a/inventories/chaosknoten/host_vars/wiki.yaml b/inventories/chaosknoten/host_vars/wiki.yaml
index 3d5fbb9..716547d 100644
--- a/inventories/chaosknoten/host_vars/wiki.yaml
+++ b/inventories/chaosknoten/host_vars/wiki.yaml
@@ -5,7 +5,6 @@ nginx__configurations:
   - name: wiki.hamburg.ccc.de
     content: "{{ lookup('ansible.builtin.file', 'resources/chaosknoten/wiki/nginx/wiki.hamburg.ccc.de.conf') }}"
 
-certbot__version_spec: ""
 certbot__acme_account_email_address: j+letsencrypt-ccchh@jsts.xyz
 certbot__certificate_domains:
   - "wiki.ccchh.net"
diff --git a/inventories/chaosknoten/host_vars/zammad.yaml b/inventories/chaosknoten/host_vars/zammad.yaml
index 65ea352..8a0e795 100644
--- a/inventories/chaosknoten/host_vars/zammad.yaml
+++ b/inventories/chaosknoten/host_vars/zammad.yaml
@@ -2,7 +2,6 @@ docker_compose__compose_file_content: "{{ lookup('ansible.builtin.file', 'resour
 docker_compose__env_file_content: "{{ lookup('ansible.builtin.template', 'resources/chaosknoten/zammad/docker_compose/.env.j2') }}"
 docker_compose__configuration_files: [ ]
 
-certbot__version_spec: ""
 certbot__acme_account_email_address: le-admin@hamburg.ccc.de
 certbot__certificate_domains:
   - "zammad.hamburg.ccc.de"
diff --git a/inventories/external/host_vars/status.yaml b/inventories/external/host_vars/status.yaml
index c2c26b3..9af1eaa 100644
--- a/inventories/external/host_vars/status.yaml
+++ b/inventories/external/host_vars/status.yaml
@@ -19,7 +19,6 @@ nginx__configurations:
   - name: http_handler
     content: "{{ lookup('ansible.builtin.file', 'resources/external/status/nginx/http_handler.conf') }}"
 
-certbot__version_spec: ""
 certbot__acme_account_email_address: le-admin@hamburg.ccc.de
 certbot__certificate_domains:
   - "status.hamburg.ccc.de"
diff --git a/inventories/z9/host_vars/dooris.yaml b/inventories/z9/host_vars/dooris.yaml
index 8ae5287..3bfd55d 100644
--- a/inventories/z9/host_vars/dooris.yaml
+++ b/inventories/z9/host_vars/dooris.yaml
@@ -1,7 +1,6 @@
 docker_compose__compose_file_content: "{{ lookup('ansible.builtin.template', 'resources/z9/dooris/docker_compose/compose.yaml.j2') }}"
 docker_compose__configuration_files: [ ]
 
-certbot__version_spec: ""
 certbot__acme_account_email_address: le-admin@hamburg.ccc.de
 certbot__certificate_domains:
   - "dooris.ccchh.net"
diff --git a/inventories/z9/host_vars/light.yaml b/inventories/z9/host_vars/light.yaml
index 0c7e11d..a5957e2 100644
--- a/inventories/z9/host_vars/light.yaml
+++ b/inventories/z9/host_vars/light.yaml
@@ -59,7 +59,6 @@ nginx__configurations:
   - name: http_handler
     content: "{{ lookup('ansible.builtin.file', 'resources/z9/dooris/nginx/http_handler.conf') }}"
 
-certbot__version_spec: ""
 certbot__acme_account_email_address: le-admin@hamburg.ccc.de
 certbot__certificate_domains:
   - "light-werkstatt.ccchh.net"
@@ -67,5 +66,3 @@ certbot__certificate_domains:
   - "light.z9.ccchh.net"
 certbot__new_cert_commands:
   - "systemctl reload nginx.service"
-
-
diff --git a/roles/certbot/meta/argument_specs.yaml b/roles/certbot/meta/argument_specs.yaml
index 5e2da33..b2b3f32 100644
--- a/roles/certbot/meta/argument_specs.yaml
+++ b/roles/certbot/meta/argument_specs.yaml
@@ -1,15 +1,6 @@
 argument_specs:
   main:
     options:
-      certbot__version_spec:
-        description: >-
-          The version specification to use for installing the `certbot` package.
-          The provided version specification will be used like the following:
-          `cerbot={{ certbot__version_spec }}*`. This makes it possible to e.g.
-          specify until a minor version (like `1.3.`) and then have patch
-          versions be installed automatically (like `1.3.1` and so on).
-        type: str
-        required: true
       certbot__acme_account_email_address:
         description: The E-Mail address to give to certbot for the ACME account.
         type: str
diff --git a/roles/certbot/tasks/main/install.yaml b/roles/certbot/tasks/main/install.yaml
index 895ef81..40ccf75 100644
--- a/roles/certbot/tasks/main/install.yaml
+++ b/roles/certbot/tasks/main/install.yaml
@@ -6,14 +6,6 @@
 
 - name: make sure the `certbot` package is installed
   ansible.builtin.apt:
-    name: certbot={{ certbot__version_spec }}*
-    state: present
-    allow_change_held_packages: true
-    update_cache: true
-  become: true
-
-- name: apt-mark hold `certbot`
-  ansible.builtin.dpkg_selections:
     name: certbot
-    selection: hold
+    state: present
   become: true
diff --git a/roles/nextcloud/meta/main.yaml b/roles/nextcloud/meta/main.yaml
index 34f476a..2e71e8f 100644
--- a/roles/nextcloud/meta/main.yaml
+++ b/roles/nextcloud/meta/main.yaml
@@ -2,7 +2,6 @@
 dependencies:
   - role: certbot
     vars:
-      certbot__version_spec: "{{ nextcloud__certbot_version_spec }}"
       certbot__acme_account_email_address: "{{ nextcloud__certbot_acme_account_email_address }}"
       certbot__certificate_domains:
         - "{{ nextcloud__fqdn }}"