certbot(role): don't use certbot__version_spec anymore as its not used
All checks were successful
/ Ansible Lint (push) Successful in 8m7s
All checks were successful
/ Ansible Lint (push) Successful in 8m7s
This commit is contained in:
parent
165487884c
commit
711f2f1c64
24 changed files with 1 additions and 42 deletions
|
|
@ -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:
|
Make `inventories/chaosknoten/host_var/example.yaml` look like this:
|
||||||
```yaml
|
```yaml
|
||||||
certbot__version_spec: ""
|
|
||||||
certbot__acme_account_email_address: le-admin@hamburg.ccc.de
|
certbot__acme_account_email_address: le-admin@hamburg.ccc.de
|
||||||
certbot__certificate_domains:
|
certbot__certificate_domains:
|
||||||
- "example.hamburg.ccc.de"
|
- "example.hamburg.ccc.de"
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,6 @@ docker_compose__configuration_files:
|
||||||
content: "{{ lookup('ansible.builtin.template', 'resources/chaosknoten/acmedns/docker_compose/index.html.j2') }}"
|
content: "{{ lookup('ansible.builtin.template', 'resources/chaosknoten/acmedns/docker_compose/index.html.j2') }}"
|
||||||
docker_compose__pull: missing
|
docker_compose__pull: missing
|
||||||
|
|
||||||
certbot__version_spec: ""
|
|
||||||
certbot__acme_account_email_address: le-admin@hamburg.ccc.de
|
certbot__acme_account_email_address: le-admin@hamburg.ccc.de
|
||||||
certbot__certificate_domains:
|
certbot__certificate_domains:
|
||||||
# - "spaceapi.ccc.de" # after DNS has been adjusted
|
# - "spaceapi.ccc.de" # after DNS has been adjusted
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
docker_compose__compose_file_content: "{{ lookup('ansible.builtin.template', 'resources/chaosknoten/ccchoir/docker_compose/compose.yaml.j2') }}"
|
docker_compose__compose_file_content: "{{ lookup('ansible.builtin.template', 'resources/chaosknoten/ccchoir/docker_compose/compose.yaml.j2') }}"
|
||||||
docker_compose__configuration_files: [ ]
|
docker_compose__configuration_files: [ ]
|
||||||
|
|
||||||
certbot__version_spec: ""
|
|
||||||
certbot__acme_account_email_address: le-admin@hamburg.ccc.de
|
certbot__acme_account_email_address: le-admin@hamburg.ccc.de
|
||||||
certbot__certificate_domains:
|
certbot__certificate_domains:
|
||||||
- "ccchoir.de"
|
- "ccchoir.de"
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,6 @@ nginx__configurations:
|
||||||
- name: eh22.easterhegg.eu
|
- name: eh22.easterhegg.eu
|
||||||
content: "{{ lookup('ansible.builtin.file', 'resources/chaosknoten/eh22-wiki/nginx/eh22.easterhegg.eu.conf') }}"
|
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__acme_account_email_address: j+letsencrypt-ccchh@jsts.xyz
|
||||||
certbot__certificate_domains:
|
certbot__certificate_domains:
|
||||||
- "eh22.easterhegg.eu"
|
- "eh22.easterhegg.eu"
|
||||||
|
|
|
||||||
|
|
@ -25,7 +25,6 @@ docker_compose__configuration_files:
|
||||||
- name: ntfy-alertmanager-fux
|
- name: ntfy-alertmanager-fux
|
||||||
content: "{{ lookup('ansible.builtin.template', 'resources/chaosknoten/grafana/docker_compose/ntfy-alertmanager-fux.j2') }}"
|
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__acme_account_email_address: le-admin@hamburg.ccc.de
|
||||||
certbot__certificate_domains:
|
certbot__certificate_domains:
|
||||||
- "grafana.hamburg.ccc.de"
|
- "grafana.hamburg.ccc.de"
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
docker_compose__compose_file_content: "{{ lookup('ansible.builtin.template', 'resources/chaosknoten/keycloak/docker_compose/compose.yaml.j2') }}"
|
docker_compose__compose_file_content: "{{ lookup('ansible.builtin.template', 'resources/chaosknoten/keycloak/docker_compose/compose.yaml.j2') }}"
|
||||||
docker_compose__configuration_files: [ ]
|
docker_compose__configuration_files: [ ]
|
||||||
|
|
||||||
certbot__version_spec: ""
|
|
||||||
certbot__acme_account_email_address: j+letsencrypt-ccchh@jsts.xyz
|
certbot__acme_account_email_address: j+letsencrypt-ccchh@jsts.xyz
|
||||||
certbot__certificate_domains:
|
certbot__certificate_domains:
|
||||||
- "id.hamburg.ccc.de"
|
- "id.hamburg.ccc.de"
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,6 @@ docker_compose__configuration_files:
|
||||||
content: "{{ lookup('ansible.builtin.file', 'resources/chaosknoten/lists/docker_compose/settings_local.py') }}"
|
content: "{{ lookup('ansible.builtin.file', 'resources/chaosknoten/lists/docker_compose/settings_local.py') }}"
|
||||||
docker_compose__files: resources/chaosknoten/lists/docker_compose/files
|
docker_compose__files: resources/chaosknoten/lists/docker_compose/files
|
||||||
|
|
||||||
certbot__version_spec: ""
|
|
||||||
certbot__acme_account_email_address: j+letsencrypt-ccchh@jsts.xyz
|
certbot__acme_account_email_address: j+letsencrypt-ccchh@jsts.xyz
|
||||||
certbot__certificate_domains:
|
certbot__certificate_domains:
|
||||||
- "lists.hamburg.ccc.de"
|
- "lists.hamburg.ccc.de"
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,3 @@
|
||||||
certbot__version_spec: ""
|
|
||||||
certbot__acme_account_email_address: j+letsencrypt-ccchh@jsts.xyz
|
certbot__acme_account_email_address: j+letsencrypt-ccchh@jsts.xyz
|
||||||
certbot__certificate_domains:
|
certbot__certificate_domains:
|
||||||
- "mumble.hamburg.ccc.de"
|
- "mumble.hamburg.ccc.de"
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,6 @@ nginx__configurations:
|
||||||
- name: netbox.hamburg.ccc.de
|
- name: netbox.hamburg.ccc.de
|
||||||
content: "{{ lookup('ansible.builtin.file', 'resources/chaosknoten/netbox/nginx/netbox.hamburg.ccc.de.conf') }}"
|
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__acme_account_email_address: j+letsencrypt-ccchh@jsts.xyz
|
||||||
certbot__certificate_domains:
|
certbot__certificate_domains:
|
||||||
- "netbox.hamburg.ccc.de"
|
- "netbox.hamburg.ccc.de"
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,6 @@ docker_compose__configuration_files:
|
||||||
- name: server.yml
|
- name: server.yml
|
||||||
content: "{{ lookup('ansible.builtin.template', 'resources/chaosknoten/ntfy/docker_compose/server.yaml.j2') }}"
|
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__acme_account_email_address: le-admin@hamburg.ccc.de
|
||||||
certbot__certificate_domains:
|
certbot__certificate_domains:
|
||||||
- "ntfy.hamburg.ccc.de"
|
- "ntfy.hamburg.ccc.de"
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,6 @@ nginx__configurations:
|
||||||
- name: onlyoffice.hamburg.ccc.de
|
- name: onlyoffice.hamburg.ccc.de
|
||||||
content: "{{ lookup('ansible.builtin.file', 'resources/chaosknoten/onlyoffice/nginx/onlyoffice.hamburg.ccc.de.conf') }}"
|
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__acme_account_email_address: j+letsencrypt-ccchh@jsts.xyz
|
||||||
certbot__certificate_domains:
|
certbot__certificate_domains:
|
||||||
- "onlyoffice.hamburg.ccc.de"
|
- "onlyoffice.hamburg.ccc.de"
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
docker_compose__compose_file_content: "{{ lookup('ansible.builtin.template', 'resources/chaosknoten/pad/docker_compose/compose.yaml.j2') }}"
|
docker_compose__compose_file_content: "{{ lookup('ansible.builtin.template', 'resources/chaosknoten/pad/docker_compose/compose.yaml.j2') }}"
|
||||||
docker_compose__configuration_files: [ ]
|
docker_compose__configuration_files: [ ]
|
||||||
|
|
||||||
certbot__version_spec: ""
|
|
||||||
certbot__acme_account_email_address: le-admin@hamburg.ccc.de
|
certbot__acme_account_email_address: le-admin@hamburg.ccc.de
|
||||||
certbot__certificate_domains:
|
certbot__certificate_domains:
|
||||||
- "pad.hamburg.ccc.de"
|
- "pad.hamburg.ccc.de"
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
docker_compose__compose_file_content: "{{ lookup('ansible.builtin.template', 'resources/chaosknoten/pretalx/docker_compose/compose.yaml.j2') }}"
|
docker_compose__compose_file_content: "{{ lookup('ansible.builtin.template', 'resources/chaosknoten/pretalx/docker_compose/compose.yaml.j2') }}"
|
||||||
docker_compose__configuration_files: [ ]
|
docker_compose__configuration_files: [ ]
|
||||||
|
|
||||||
certbot__version_spec: ""
|
|
||||||
certbot__acme_account_email_address: le-admin@hamburg.ccc.de
|
certbot__acme_account_email_address: le-admin@hamburg.ccc.de
|
||||||
certbot__certificate_domains:
|
certbot__certificate_domains:
|
||||||
- "pretalx.hamburg.ccc.de"
|
- "pretalx.hamburg.ccc.de"
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,6 @@ docker_compose__compose_file_content: "{{ lookup('ansible.builtin.template', 're
|
||||||
docker_compose__build: never
|
docker_compose__build: never
|
||||||
docker_compose__pull: never
|
docker_compose__pull: never
|
||||||
|
|
||||||
certbot__version_spec: ""
|
|
||||||
certbot__acme_account_email_address: le-admin@hamburg.ccc.de
|
certbot__acme_account_email_address: le-admin@hamburg.ccc.de
|
||||||
certbot__certificate_domains:
|
certbot__certificate_domains:
|
||||||
- "spaceapi.ccc.de"
|
- "spaceapi.ccc.de"
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,5 @@
|
||||||
docker_compose__compose_file_content: "{{ lookup('ansible.builtin.template', 'resources/chaosknoten/sunders/docker_compose/compose.yaml.j2') }}"
|
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__acme_account_email_address: le-admin@hamburg.ccc.de
|
||||||
certbot__certificate_domains:
|
certbot__certificate_domains:
|
||||||
- "sunders.hamburg.ccc.de"
|
- "sunders.hamburg.ccc.de"
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,6 @@ docker_compose__configuration_files:
|
||||||
- name: pretix.cfg
|
- name: pretix.cfg
|
||||||
content: "{{ lookup('ansible.builtin.template', 'resources/chaosknoten/tickets/docker_compose/pretix.cfg.j2') }}"
|
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__acme_account_email_address: le-admin@hamburg.ccc.de
|
||||||
certbot__certificate_domains:
|
certbot__certificate_domains:
|
||||||
- "tickets.hamburg.ccc.de"
|
- "tickets.hamburg.ccc.de"
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,6 @@ nginx__configurations:
|
||||||
- name: wiki.hamburg.ccc.de
|
- name: wiki.hamburg.ccc.de
|
||||||
content: "{{ lookup('ansible.builtin.file', 'resources/chaosknoten/wiki/nginx/wiki.hamburg.ccc.de.conf') }}"
|
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__acme_account_email_address: j+letsencrypt-ccchh@jsts.xyz
|
||||||
certbot__certificate_domains:
|
certbot__certificate_domains:
|
||||||
- "wiki.ccchh.net"
|
- "wiki.ccchh.net"
|
||||||
|
|
|
||||||
|
|
@ -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__env_file_content: "{{ lookup('ansible.builtin.template', 'resources/chaosknoten/zammad/docker_compose/.env.j2') }}"
|
||||||
docker_compose__configuration_files: [ ]
|
docker_compose__configuration_files: [ ]
|
||||||
|
|
||||||
certbot__version_spec: ""
|
|
||||||
certbot__acme_account_email_address: le-admin@hamburg.ccc.de
|
certbot__acme_account_email_address: le-admin@hamburg.ccc.de
|
||||||
certbot__certificate_domains:
|
certbot__certificate_domains:
|
||||||
- "zammad.hamburg.ccc.de"
|
- "zammad.hamburg.ccc.de"
|
||||||
|
|
|
||||||
1
inventories/external/host_vars/status.yaml
vendored
1
inventories/external/host_vars/status.yaml
vendored
|
|
@ -19,7 +19,6 @@ nginx__configurations:
|
||||||
- name: http_handler
|
- name: http_handler
|
||||||
content: "{{ lookup('ansible.builtin.file', 'resources/external/status/nginx/http_handler.conf') }}"
|
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__acme_account_email_address: le-admin@hamburg.ccc.de
|
||||||
certbot__certificate_domains:
|
certbot__certificate_domains:
|
||||||
- "status.hamburg.ccc.de"
|
- "status.hamburg.ccc.de"
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
docker_compose__compose_file_content: "{{ lookup('ansible.builtin.template', 'resources/z9/dooris/docker_compose/compose.yaml.j2') }}"
|
docker_compose__compose_file_content: "{{ lookup('ansible.builtin.template', 'resources/z9/dooris/docker_compose/compose.yaml.j2') }}"
|
||||||
docker_compose__configuration_files: [ ]
|
docker_compose__configuration_files: [ ]
|
||||||
|
|
||||||
certbot__version_spec: ""
|
|
||||||
certbot__acme_account_email_address: le-admin@hamburg.ccc.de
|
certbot__acme_account_email_address: le-admin@hamburg.ccc.de
|
||||||
certbot__certificate_domains:
|
certbot__certificate_domains:
|
||||||
- "dooris.ccchh.net"
|
- "dooris.ccchh.net"
|
||||||
|
|
|
||||||
|
|
@ -59,7 +59,6 @@ nginx__configurations:
|
||||||
- name: http_handler
|
- name: http_handler
|
||||||
content: "{{ lookup('ansible.builtin.file', 'resources/z9/dooris/nginx/http_handler.conf') }}"
|
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__acme_account_email_address: le-admin@hamburg.ccc.de
|
||||||
certbot__certificate_domains:
|
certbot__certificate_domains:
|
||||||
- "light-werkstatt.ccchh.net"
|
- "light-werkstatt.ccchh.net"
|
||||||
|
|
@ -67,5 +66,3 @@ certbot__certificate_domains:
|
||||||
- "light.z9.ccchh.net"
|
- "light.z9.ccchh.net"
|
||||||
certbot__new_cert_commands:
|
certbot__new_cert_commands:
|
||||||
- "systemctl reload nginx.service"
|
- "systemctl reload nginx.service"
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,15 +1,6 @@
|
||||||
argument_specs:
|
argument_specs:
|
||||||
main:
|
main:
|
||||||
options:
|
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:
|
certbot__acme_account_email_address:
|
||||||
description: The E-Mail address to give to certbot for the ACME account.
|
description: The E-Mail address to give to certbot for the ACME account.
|
||||||
type: str
|
type: str
|
||||||
|
|
|
||||||
|
|
@ -6,14 +6,6 @@
|
||||||
|
|
||||||
- name: make sure the `certbot` package is installed
|
- name: make sure the `certbot` package is installed
|
||||||
ansible.builtin.apt:
|
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
|
name: certbot
|
||||||
selection: hold
|
state: present
|
||||||
become: true
|
become: true
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,6 @@
|
||||||
dependencies:
|
dependencies:
|
||||||
- role: certbot
|
- role: certbot
|
||||||
vars:
|
vars:
|
||||||
certbot__version_spec: "{{ nextcloud__certbot_version_spec }}"
|
|
||||||
certbot__acme_account_email_address: "{{ nextcloud__certbot_acme_account_email_address }}"
|
certbot__acme_account_email_address: "{{ nextcloud__certbot_acme_account_email_address }}"
|
||||||
certbot__certificate_domains:
|
certbot__certificate_domains:
|
||||||
- "{{ nextcloud__fqdn }}"
|
- "{{ nextcloud__fqdn }}"
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue