diff --git a/group-all.yml b/group-all.yml
index 2d95128..8d06a78 100644
--- a/group-all.yml
+++ b/group-all.yml
@@ -1,7 +1,6 @@
---
-# tasks for all hosts
-
-- hosts: all
+- name: Tasks for all hosts
+ hosts: all
become: true
vars:
@@ -15,20 +14,20 @@
tasks:
- name: Update and clean package cache
- apt:
+ ansible.builtin.apt:
update_cache: true
cache_valid_time: 3600
autoclean: true
changed_when: false
- name: Ensure unattended-upgrades is installed and up to date
- apt:
+ ansible.builtin.apt:
name: unattended-upgrades
state: present
- name: Setup unattended-upgrades
- include_role:
- name: hifis.unattended_upgrades
+ ansible.builtin.include_role:
+ name: hifis.toolkit.unattended_upgrades
vars:
unattended_origins_patterns:
- "origin=*"
diff --git a/group-docker_host.yml b/group-docker_host.yml
index 08cfb2c..10a4e36 100644
--- a/group-docker_host.yml
+++ b/group-docker_host.yml
@@ -1,15 +1,18 @@
---
-- hosts: docker_host
+- name: Tasks for docker hosts
+ hosts: docker_host
become: true
roles:
- role: netz39.host_docker
-- hosts: docker_host:&location_space
+- name: Tasks for docker hosts at location space
+ hosts: docker_host:&location_space
become: true
roles:
- role: lespocky.telegraf_docker_in_docker
+ when: (ansible_architecture == "x86_64")
vars:
tdid_conf_dir: "/etc/telegraf"
tdid_influxdb_org: "{{ influxdb_org }}"
diff --git a/group-k3s.yml b/group-k3s.yml
index 22c521d..96917bf 100644
--- a/group-k3s.yml
+++ b/group-k3s.yml
@@ -1,5 +1,6 @@
---
-- hosts: k3s
+- name: Tasks for kubernetes hosts
+ hosts: k3s
become: true
tasks:
diff --git a/group-proxmox.yml b/group-proxmox.yml
index 6ec32bb..d95a857 100644
--- a/group-proxmox.yml
+++ b/group-proxmox.yml
@@ -1,5 +1,6 @@
---
-- hosts: proxmox
+- name: Tasks for virtual machines on proxmox host
+ hosts: proxmox
become: true
tasks:
diff --git a/group_vars/docker_host/vars.yml b/group_vars/docker_host/vars.yml
index 5be6933..0a27306 100644
--- a/group_vars/docker_host/vars.yml
+++ b/group_vars/docker_host/vars.yml
@@ -1,3 +1,3 @@
---
docker_data_root: "/srv/docker"
-docker_cron_image_prune: true
+docker_image_prune: true
diff --git a/host-beaker.yml b/host-beaker.yml
index ba571fa..4eb5817 100644
--- a/host-beaker.yml
+++ b/host-beaker.yml
@@ -1,5 +1,6 @@
---
-- hosts: beaker.n39.eu
+- name: Setup things on host 'beaker' (proxmox server im space)
+ hosts: beaker.n39.eu
become: true
vars:
@@ -9,7 +10,7 @@
tasks:
- - name: enable proxmox gui login for admin users
+ - name: Enable proxmox gui login for admin users
ansible.builtin.lineinfile:
path: /etc/pve/user.cfg
regexp: "^user:{{ item.logname }}@pam"
@@ -18,7 +19,7 @@
state: present
loop: "{{ users }}"
- - name: configure proxmox admin group
+ - name: Configure proxmox admin group
ansible.builtin.lineinfile:
path: /etc/pve/user.cfg
regexp: "^group:Admins:"
diff --git a/host-hobbes.yml b/host-hobbes.yml
index af2ec88..618d07f 100644
--- a/host-hobbes.yml
+++ b/host-hobbes.yml
@@ -1,5 +1,6 @@
---
-- hosts: hobbes.n39.eu
+- name: Setup things on host 'hobbes' (raspberry pi for kiosk screen)
+ hosts: hobbes.n39.eu
become: true
vars:
diff --git a/host-holmium.yml b/host-holmium.yml
index 006f314..948f705 100644
--- a/host-holmium.yml
+++ b/host-holmium.yml
@@ -1,5 +1,6 @@
---
-- hosts: holmium.n39.eu
+- name: Setup things on host 'holmium' (http ingress vm)
+ hosts: holmium.n39.eu
become: true
vars:
diff --git a/host-krypton.yml b/host-krypton.yml
index d35bc2c..2efdf68 100644
--- a/host-krypton.yml
+++ b/host-krypton.yml
@@ -1,5 +1,6 @@
---
-- hosts: krypton.n39.eu
+- name: Setup things on host 'krypton' (ldap vm)
+ hosts: krypton.n39.eu
become: true
vars:
@@ -32,13 +33,13 @@
tasks:
# - name: Setup dehydrated challenge endpoint for {{ openldap_domain }}
- # include_role:
+ # ansible.builtin.include_role:
# name: setup-http-dehydrated
# vars:
# site_name: "{{ openldap_domain }}"
- name: Ensure openLDAP directories are present.
- file:
+ ansible.builtin.file:
path: "{{ item.path }}"
mode: "0755"
state: directory
@@ -49,7 +50,7 @@
- path: "{{ dehydrated_certs_dir }}/{{ openldap_domain }}"
- name: Ensure container for openLDAP is running.
- docker_container:
+ community.docker.docker_container:
name: openLDAP
image: osixia/openldap:1.5.0
detach: yes
@@ -114,7 +115,7 @@
- name: Ensure container for entities validation service is running
- docker_container:
+ community.docker.docker_container:
name: entities_validation_svc
image: netz39/entities_validation_svc:v1.0.4
pull: true
@@ -127,7 +128,7 @@
TZ: "{{ timezone }}"
- name: Setup proxy site entities-validation.svc.n39.eu
- include_role:
+ ansible.builtin.include_role:
name: setup_http_site_proxy
vars:
site_name: entities-validation.svc.n39.eu
diff --git a/host-oganesson.yml b/host-oganesson.yml
index ed2e5a0..a4cc596 100644
--- a/host-oganesson.yml
+++ b/host-oganesson.yml
@@ -1,5 +1,6 @@
---
-- hosts: oganesson.n39.eu
+- name: Setup things on host 'oganesson' (ssh jump host vm)
+ hosts: oganesson.n39.eu
become: true
vars:
diff --git a/host-platon.yml b/host-platon.yml
index b16bb93..21027c4 100644
--- a/host-platon.yml
+++ b/host-platon.yml
@@ -1,5 +1,6 @@
---
-- hosts: platon.n39.eu
+- name: Setup things on host 'platon' (raspberry pi for entrance door)
+ hosts: platon.n39.eu
become: true
vars:
ansible_python_interpreter: /usr/bin/python3
@@ -63,7 +64,7 @@
owner: root
group: root
mode: '0644'
- notify: restart mosquitto
+ notify: Restart mosquitto service
### Sesam for SSH access
@@ -245,7 +246,7 @@
owner: root
group: root
mode: "0644"
- notify: restart rsyslog
+ notify: Restart rsyslog
### Asterisk
@@ -258,7 +259,7 @@
owner: root
group: root
mode: "0644"
- notify: restart asterisk
+ notify: Restart asterisk
- name: Set up extensions for asterisk
# This uses the variables gatekeeper_user and door_open_command
@@ -268,14 +269,14 @@
owner: root
group: root
mode: "0644"
- notify: restart asterisk
+ notify: Restart asterisk
- name: Ensure asterisk is in the right groups
ansible.builtin.user:
name: asterisk
groups: audio,i2c,gpio
append: yes
- notify: restart asterisk
+ notify: Restart asterisk
# Asterisk now executes shell scripts with reduced privileges, so we need to
# use sudo for I2C access.
@@ -304,20 +305,20 @@
handlers:
- - name: restart mosquitto
- service:
+ - name: Restart mosquitto service
+ ansible.builtin.service:
name: mosquitto
state: restarted
enabled: yes
- - name: restart rsyslog
- service:
+ - name: Restart rsyslog
+ ansible.builtin.service:
name: rsyslog
state: restarted
enabled: yes
- - name: restart asterisk
- service:
+ - name: Restart asterisk
+ ansible.builtin.service:
name: asterisk
state: restarted
enabled: yes
diff --git a/host-plumbum.yml b/host-plumbum.yml
index e0c3433..19875f6 100644
--- a/host-plumbum.yml
+++ b/host-plumbum.yml
@@ -1,5 +1,6 @@
---
-- hosts: plumbum.n39.eu
+- name: Setup things on host 'plumbum' (nfs server)
+ hosts: plumbum.n39.eu
become: true
roles:
diff --git a/host-pottwal.yml b/host-pottwal.yml
index e8074d6..c6b97ad 100644
--- a/host-pottwal.yml
+++ b/host-pottwal.yml
@@ -1,5 +1,6 @@
---
-- hosts: pottwal.n39.eu
+- name: Setup things on host 'pottwal' (the big docker container host)
+ hosts: pottwal.n39.eu
become: true
roles:
@@ -54,7 +55,7 @@
# If port 2222 is changed here, it must also be adapted
# in the forgejo config file (see application volume)!!
- name: Setup the docker container for forgejo
- docker_container:
+ community.docker.docker_container:
name: forgejo
image: "{{ forgejo_image }}"
pull: true
@@ -80,7 +81,7 @@
tags: ["forgejo"]
- name: Setup proxy site "{{ forgejo_domain_name }}"
- include_role:
+ ansible.builtin.include_role:
name: setup_http_site_proxy
vars:
site_name: "{{ forgejo_domain_name }}"
@@ -88,7 +89,7 @@
tags: ["forgejo"]
- name: Ensure apt-cacher container is running
- docker_container:
+ community.docker.docker_container:
name: apt_cacher_ng
image: mrtux/apt-cacher-ng:latest
pull: true
@@ -101,7 +102,7 @@
TZ: "{{ timezone }}"
- name: Setup docker network
- docker_network:
+ community.docker.docker_network:
name: shlinknet
state: present
internal: true
@@ -117,7 +118,7 @@
- shlink
- name: Ensure shlink database container is running
- docker_container:
+ community.docker.docker_container:
name: shlinkdb
image: postgres:16.8-alpine
pull: true
@@ -137,7 +138,7 @@
- shlink
- name: Ensure container for shlink is running
- docker_container:
+ community.docker.docker_container:
name: shlink
image: "{{ shlink_image }}"
pull: true
@@ -166,7 +167,7 @@
- shlink
- name: Setup proxy site {{ shlink_domain_name }}
- include_role:
+ ansible.builtin.include_role:
name: setup_http_site_proxy
vars:
site_name: "{{ shlink_domain_name }}"
@@ -183,7 +184,7 @@
msg: "prosody data dir is missing, please restore from the backup!"
when: not prosody_dir.stat.exists
- - name: Ensure prosody config dir exists
+ - name: Ensure prosody main config dir exists
ansible.builtin.file:
path: "{{ prosody_config_dir }}"
state: directory
@@ -203,7 +204,7 @@
state: directory
mode: 0755
- - name: Ensure prosody certs dir exists
+ - name: Ensure prosody conf.d dir exists
ansible.builtin.file:
path: "{{ prosody_config_dir }}/conf.d"
state: directory
@@ -234,7 +235,7 @@
- Restart prosody
- name: Ensure container for prosody XMPP server is running
- docker_container:
+ community.docker.docker_container:
name: prosody
image: "{{ prosody_image }}"
pull: true
@@ -256,7 +257,7 @@
- name: Ensure container for static XMPP website is running
- docker_container:
+ community.docker.docker_container:
name: jabber-static-website
image: "{{ prosody_web_image }}"
pull: true
@@ -276,7 +277,7 @@
- name: Setup proxy site {{ prosody_domain_name }}
# point to static website for now
- include_role:
+ ansible.builtin.include_role:
name: setup_http_site_proxy
vars:
site_name: "{{ prosody_domain_name }}"
@@ -298,7 +299,7 @@
- hedgedoc
- name: Ensure the hedgedoc directories exist
- file:
+ ansible.builtin.file:
path: "{{ item.path }}"
mode: "{{ item.mode }}"
state: directory
@@ -311,7 +312,7 @@
- hedgedoc
- name: Setup docker network
- docker_network:
+ community.docker.docker_network:
name: hedgedocnet
state: present
internal: true
@@ -319,7 +320,7 @@
- hedgedoc
- name: Install HedgeDoc database container
- docker_container:
+ community.docker.docker_container:
name: hedgedocdb
image: "{{ hedgedoc_db_image }}"
pull: true
@@ -339,7 +340,7 @@
- hedgedoc
- name: Ensure container for hedgedoc is running
- docker_container:
+ community.docker.docker_container:
name: hedgedoc
image: "{{ hedgedoc_image }}"
pull: true
@@ -371,7 +372,7 @@
- hedgedoc
- name: Setup proxy site "{{ hedgedoc_domain_name }}"
- include_role:
+ ansible.builtin.include_role:
name: setup_http_site_proxy
vars:
site_name: "{{ hedgedoc_domain_name }}"
@@ -380,7 +381,7 @@
- hedgedoc
- name: Ensure the influxdb directories exist
- file:
+ ansible.builtin.file:
path: "{{ item }}"
mode: 0700
state: directory
@@ -390,7 +391,7 @@
- "{{ data_dir }}/influxdb/cfg"
- name: Ensure container for influxdb is running
- docker_container:
+ community.docker.docker_container:
name: influxdb
image: "{{ influxdb_image }}"
pull: true
@@ -410,7 +411,7 @@
- "{{ data_dir }}/influxdb/cfg:/etc/influxdb2"
- name: Setup proxy site {{ influxdb_domain_name }}
- include_role:
+ ansible.builtin.include_role:
name: setup_http_site_proxy
vars:
site_name: "{{ influxdb_domain_name }}"
@@ -435,7 +436,7 @@
- redmine
- name: Setup Redmine docker network
- docker_network:
+ community.docker.docker_network:
name: redminenet
state: present
internal: true
@@ -443,7 +444,7 @@
- redmine
- name: Setup Redmine MySQL container
- docker_container:
+ community.docker.docker_container:
name: redminedb
image: "{{ redmine_mysql_image }}"
pull: true
@@ -463,7 +464,7 @@
- redmine
- name: Setup Redmine container
- docker_container:
+ community.docker.docker_container:
name: redmine
image: "{{ redmine_image }}"
pull: true
@@ -489,7 +490,7 @@
- redmine
- name: Setup proxy site "{{ redmine_domain_name }}"
- include_role:
+ ansible.builtin.include_role:
name: setup_http_site_proxy
vars:
site_name: "{{ redmine_domain_name }}"
@@ -498,7 +499,7 @@
- redmine
- name: Ensure the uptime-kuma directories exist
- file:
+ ansible.builtin.file:
path: "{{ item }}"
mode: "0755"
state: directory
@@ -508,7 +509,7 @@
- uptimekuma
- name: Ensure container for uptime-kuma is running
- docker_container:
+ community.docker.docker_container:
name: uptime-kuma
image: "{{ uptimekuma_image }}"
pull: true
@@ -525,7 +526,7 @@
- uptimekuma
- name: Setup proxy site "{{ uptimekuma_domain_name }}"
- include_role:
+ ansible.builtin.include_role:
name: setup_http_site_proxy
vars:
site_name: "{{ uptimekuma_domain_name }}"
@@ -534,7 +535,7 @@
- uptimekuma
- name: Ensure the grafana directories exist
- file:
+ ansible.builtin.file:
path: "{{ item.path }}"
owner: "{{ item.owner | default('root') }}"
mode: "{{ item.mode }}"
@@ -551,7 +552,7 @@
- grafana
- name: Ensure container for grafana is running
- docker_container:
+ community.docker.docker_container:
name: grafana
image: "{{ grafana_image }}"
pull: true
@@ -572,7 +573,7 @@
- grafana
- name: Setup proxy site "{{ grafana_domain_name }}"
- include_role:
+ ansible.builtin.include_role:
name: setup_http_site_proxy
vars:
site_name: "{{ grafana_domain_name }}"
@@ -582,7 +583,7 @@
- grafana
- name: Ensure the homebox directories exist
- file:
+ ansible.builtin.file:
path: "{{ item.path }}"
owner: "{{ item.owner | default('root') }}"
mode: "{{ item.mode }}"
@@ -596,7 +597,7 @@
- homebox
- name: Ensure container for homebox is running
- docker_container:
+ community.docker.docker_container:
name: homebox
image: "{{ homebox_image }}"
pull: true
@@ -616,7 +617,7 @@
- homebox
- name: Setup proxy site {{ homebox_domain_name }}
- include_role:
+ ansible.builtin.include_role:
name: setup_http_site_proxy
vars:
site_name: "{{ homebox_domain_name }}"
@@ -626,7 +627,7 @@
- homebox
- name: Setup proxy site spaceapi.n39.eu
- template:
+ ansible.builtin.template:
src: templates/pottwal/spaceapi-apache-site.j2
dest: /etc/apache2/sites-available/spaceapi.n39.eu.conf
mode: "0644"
@@ -637,12 +638,13 @@
tags:
- spaceapi
+ # Renovate configuration is sourced from `renovate.json` in each repository
- name: Ensure renovate bot cronjob is present
ansible.builtin.template:
src: templates/pottwal/renovate-cron.j2
dest: /etc/cron.hourly/renovate-bot
mode: "0700"
- notify: reload cron
+ notify: Reload cron
tags:
- renovate
@@ -654,14 +656,14 @@
restart: yes
- name: Restart apache2
- service:
+ ansible.builtin.service:
name: apache2
state: restarted
- - name: reload cron
+ - name: Reload cron
ansible.builtin.shell:
cmd: service cron reload
# Use the shell call because the task sometimes has problems finding the service state
- # service:
+ # ansible.builtin.service:
# name: cron
# state: restarted
diff --git a/host-radon.yml b/host-radon.yml
index 4fd6c4f..6131bd4 100644
--- a/host-radon.yml
+++ b/host-radon.yml
@@ -1,5 +1,6 @@
---
-- hosts: radon.n39.eu
+- name: Setup things on host 'radon' (services for space automation)
+ hosts: radon.n39.eu
become: true
vars:
@@ -7,7 +8,7 @@
data_dir: "/srv/data"
- mosquitto_image: eclipse-mosquitto:2.0.20
+ mosquitto_image: eclipse-mosquitto:2.0.21
mosquitto_data: "{{ data_dir }}/mosquitto"
nodered_image: nodered/node-red:3.0.1-1-18
@@ -37,7 +38,7 @@
tasks:
- name: Ensure the mosquitto directories exist
- file:
+ ansible.builtin.file:
path: "{{ item }}"
mode: 0755
state: directory
@@ -49,16 +50,16 @@
- mosquitto
- name: Make sure mosquitto config is there
- template:
+ ansible.builtin.template:
src: "templates/mosquitto.conf.j2"
dest: "{{ mosquitto_data }}/config/mosquitto.conf"
mode: 0644
- notify: restart mosquitto
+ notify: Restart mosquitto container
tags:
- mosquitto
- name: Ensure mosquitto is running
- docker_container:
+ community.docker.docker_container:
name: mosquitto
image: "{{ mosquitto_image }}"
pull: true
@@ -88,7 +89,7 @@
when: not nodered_dir.stat.exists
- name: Ensure nodered is running
- docker_container:
+ community.docker.docker_container:
name: nodered
image: "{{ nodered_image }}"
pull: true
@@ -108,7 +109,7 @@
restart_policy: unless-stopped
- name: Setup proxy site nodered.n39.eu
- include_role:
+ ansible.builtin.include_role:
name: setup_http_site_proxy
vars:
site_name: "nodered.n39.eu"
@@ -129,7 +130,7 @@
- rabbitmq
- name: Ensure rabbitmq docker container is running
- docker_container:
+ community.docker.docker_container:
name: rabbitmq
image: "{{ rabbitmq_image }}"
ports:
@@ -150,7 +151,7 @@
- rabbitmq
- name: Setup proxy site rabbitmq.n39.eu
- include_role:
+ ansible.builtin.include_role:
name: setup_http_site_proxy
vars:
site_name: "rabbitmq.n39.eu"
@@ -159,7 +160,7 @@
- rabbitmq
- name: Ensure Power Meter Pulse Gateway for 19i room is running
- docker_container:
+ community.docker.docker_container:
name: pwr-meter-pulse-gw-19i
image: "{{ pwr_meter_pulse_gw_image }}"
ports:
@@ -177,7 +178,7 @@
restart_policy: unless-stopped
- name: Setup proxy site pwr-meter-pulse-gw-19i.svc.n39.eu
- include_role:
+ ansible.builtin.include_role:
name: setup_http_site_proxy
vars:
site_name: "pwr-meter-pulse-gw-19i.svc.n39.eu"
@@ -185,7 +186,7 @@
- name: Setup docker container for BrotherQL Web UI printer
- docker_container:
+ community.docker.docker_container:
name: brotherql-web
image: dersimn/brother_ql_web:2.1.9-alpine
pull: true
@@ -201,7 +202,7 @@
- labelprinter
- name: Setup proxy site labelprinter.n39.eu
- include_role:
+ ansible.builtin.include_role:
name: setup_http_site_proxy
vars:
site_name: labelprinter.n39.eu
@@ -210,9 +211,9 @@
- labelprinter
- name: Setup docker container for Grafana Screenshots
- docker_container:
+ community.docker.docker_container:
name: grafana-screenshot
- image: mrtux/grafana-screenshot:0.1.1
+ image: mrtux/grafana-screenshot:0.1.3
pull: true
restart_policy: unless-stopped
detach: yes
@@ -226,8 +227,8 @@
- grafana-screenshot
handlers:
- - name: restart mosquitto
- docker_container:
+ - name: Restart mosquitto container
+ community.docker.docker_container:
name: mosquitto
state: started
restart: yes
diff --git a/host-tau.yml b/host-tau.yml
index 64c7c56..e204b4d 100644
--- a/host-tau.yml
+++ b/host-tau.yml
@@ -1,5 +1,6 @@
---
-- hosts: tau.netz39.de
+- name: Setup things on host 'tau' (vserver for wiki etc.)
+ hosts: tau.netz39.de
become: true
vars:
@@ -25,7 +26,7 @@
tasks:
- name: Setup docker network
- docker_network:
+ community.docker.docker_network:
name: dockernet
driver: bridge
ipam_config:
@@ -34,7 +35,7 @@
state: present
- name: Setup Dehydrated
- include_role:
+ ansible.builtin.include_role:
name: 24367dfa.dehydrated
vars:
dehydrated_contact_email: "{{ server_admin }}"
@@ -51,14 +52,14 @@
deploy_challenge_hook: "/bin/systemctl restart apache2"
- name: Setup proxy site testredmine.netz39.de
- include_role:
+ ansible.builtin.include_role:
name: setup_http_site_proxy
vars:
site_name: testredmine.netz39.de
proxy_port: 9004
- name: Setup phpmyadmin
- docker_container:
+ community.docker.docker_container:
name: phpmyadmin
state: started
image: phpmyadmin:5.2
@@ -75,7 +76,7 @@
- 9001:80
- name: Setup proxy site mysql.adm.netz39.de
- include_role:
+ ansible.builtin.include_role:
name: setup_http_site_proxy
vars:
site_name: mysql.adm.netz39.de
@@ -85,20 +86,20 @@
- name: Check if Docker Registry auth dir exists
ansible.builtin.stat:
path: "{{ data_dir }}/registry/auth"
- register: docker_dir
- - name: Fail if docker registry data dir does not exist
+ register: docker_registry_auth_dir
+ - name: Fail if Docker Registry auth dir does not exist
ansible.builtin.fail:
msg: "Docker Registry auth dir is missing, please restore from the backup!"
- when: not docker_dir.stat.exists
+ when: not docker_registry_auth_dir.stat.exists
- name: Ensure the Docker Registry data directory exists
# This may not be part of the backup
- file:
+ ansible.builtin.file:
path: "{{ data_dir }}/registry/data"
state: directory
mode: "0755"
- name: Setup Docker Registry Container
- docker_container:
+ community.docker.docker_container:
name: registry
image: registry:2
pull: true
@@ -117,7 +118,7 @@
- "{{ data_dir }}/registry/auth:/auth:rw"
- name: Setup proxy site for the Docker Registry
- include_role:
+ ansible.builtin.include_role:
name: setup_http_site_proxy
vars:
site_name: "{{ docker_registry_domain }}"
@@ -146,7 +147,7 @@
- dokuwiki
- name: Setup Dokuwiki Container
- docker_container:
+ community.docker.docker_container:
name: dokuwiki
image: "{{ dokuwiki_image }}"
pull: true
@@ -165,7 +166,7 @@
- dokuwiki
- name: Setup proxy site for Dokuwiki
- include_role:
+ ansible.builtin.include_role:
name: setup_http_site_proxy
vars:
site_name: "{{ dokuwiki_domain }}"
@@ -175,7 +176,7 @@
- name: Setup container for secondary FFMD DNS
- docker_container:
+ community.docker.docker_container:
name: bind9-md-freifunk-net
image: ffmd/bind9-md-freifunk-net:v2022122301
pull: true
@@ -190,7 +191,7 @@
- ffmd-dns
- name: Setup forwarding for Discord invite
- include_role:
+ ansible.builtin.include_role:
name: setup_http_site_forward
vars:
site_name: "{{ discord_invite_domain }}"
diff --git a/host-unicorn.yml b/host-unicorn.yml
index a6fe8d5..374cd32 100644
--- a/host-unicorn.yml
+++ b/host-unicorn.yml
@@ -1,6 +1,7 @@
---
# this is for a dedicated vm just hosting the unifi controller.
-- hosts: unicorn.n39.eu
+- name: Setup things on host 'unicorn' (vm for ubiquiti unifi controller)
+ hosts: unicorn.n39.eu
become: true
vars:
ansible_python_interpreter: /usr/bin/python3
@@ -11,7 +12,7 @@
tasks:
- name: Setup the docker container for unifi-controller
- docker_container:
+ community.docker.docker_container:
name: unifi-controller
image: jacobalberty/unifi:v9.0.114
state: started
diff --git a/host-wittgenstein.yml b/host-wittgenstein.yml
index 1676da0..dd9aae6 100644
--- a/host-wittgenstein.yml
+++ b/host-wittgenstein.yml
@@ -1,12 +1,9 @@
---
-- hosts: wittgenstein.n39.eu
+- name: Setup things on host 'wittgenstein' (raspberry pi for ampel and spaceapi)
+ hosts: wittgenstein.n39.eu
become: true
roles:
- - role: netz39.host_docker
- vars:
- docker_data_root: "/srv/docker"
- docker_cron_image_prune: true
- role: apache
- role: apache_letsencrypt # Uses configuration from dehydrated setup
- role: 24367dfa.dehydrated
@@ -133,7 +130,7 @@
### Space API
- name: Setup the SpaceAPI Docker container
- docker_container:
+ community.docker.docker_container:
name: spaceapi
image: "{{ spaceapi_image }}"
pull: true
@@ -152,7 +149,7 @@
- spaceapi
- name: Setup the Ampel Controller Docker container
- docker_container:
+ community.docker.docker_container:
name: ampelcontroller
image: "{{ ampelcontroller_image }}"
pull: true
diff --git a/host_vars/pottwal.n39.eu/vars.yml b/host_vars/pottwal.n39.eu/vars.yml
index 0bc87a4..854fb67 100644
--- a/host_vars/pottwal.n39.eu/vars.yml
+++ b/host_vars/pottwal.n39.eu/vars.yml
@@ -12,11 +12,11 @@ cleanuri_amqp_vhost: "/cleanuri"
forgejo_host_port: 9091
forgejo_ssh_port: 2222
forgejo_domain_name: git.n39.eu
-forgejo_image: codeberg.org/forgejo/forgejo:10.0.1
+forgejo_image: codeberg.org/forgejo/forgejo:10.0.3
shlink_host_port: 8083
shlink_domain_name: sl.n39.eu
-shlink_image: shlinkio/shlink:4.4.5
+shlink_image: shlinkio/shlink:4.4.6
shlink_initial_api_key: "{{ vault_shlink_initial_api_key }}"
shlink_postgres_password: "{{ vault_shlink_postgres_password }}"
@@ -28,7 +28,7 @@ hedgedoc_postgres_password: "{{ vault_hedgedoc_postgres_password }}"
redmine_host_port: 8087
redmine_domain_name: redmine.n39.eu
-redmine_image: redmine:6.0.3
+redmine_image: redmine:6.0.4
redmine_mysql_image: mysql:9.2
redmine_database: redmine
redmine_database_password: "{{ vault_redmine_database_password }}"
@@ -52,14 +52,14 @@ uptimekuma_image: louislam/uptime-kuma:1.23.16
grafana_host_port: 8089
grafana_domain_name: grafana.n39.eu
-grafana_image: grafana/grafana:11.5.2
+grafana_image: grafana/grafana:11.6.0
grafana_admin_password: "{{ vault_grafana_admin_password }}"
homebox_host_port: 8092
homebox_domain_name: inventory.n39.eu
homebox_image: ghcr.io/hay-kot/homebox:v0.10.3
-renovate_image: renovate/renovate:39.180.2
+renovate_image: renovate/renovate:39.220.1
renovate_forgejo_pat: "{{ vault_renovate_forgejo_pat }}"
renovate_github_pat: "{{ vault_renovate_github_pat }}"
renovate_git_user: "Renovate Bot <accounts+renovatebot@netz39.de>"
diff --git a/host_vars/wittgenstein.n39.eu/vars.yml b/host_vars/wittgenstein.n39.eu/vars.yml
index 6bca558..2cebfa5 100644
--- a/host_vars/wittgenstein.n39.eu/vars.yml
+++ b/host_vars/wittgenstein.n39.eu/vars.yml
@@ -11,7 +11,7 @@ spaceapi_image: netz39/spaceapi-service:0.1.1
spaceapi_topic_status: "Netz39/SpaceAPI/isOpen"
spaceapi_topic_lastchange: "Netz39/SpaceAPI/lastchange"
-ampelcontroller_image: netz39/ampel-controller:0.1.0
+ampelcontroller_image: netz39/ampel-controller:0.2.0
topic_lever_state: "Netz39/Things/StatusSwitch/Lever/State"
topic_door_events: "Netz39/Things/Door/Events"
topic_traffic_light: "Netz39/Things/Ampel/Light"
diff --git a/inventory.yml b/inventory.yml
index 76a969d..9220b95 100644
--- a/inventory.yml
+++ b/inventory.yml
@@ -30,6 +30,7 @@ all:
radon.n39.eu:
tau.netz39.de:
unicorn.n39.eu:
+ wittgenstein.n39.eu:
proxmox:
hosts:
holmium.n39.eu:
diff --git a/renovate.json b/renovate.json
index b70eae7..ec350d4 100644
--- a/renovate.json
+++ b/renovate.json
@@ -15,8 +15,10 @@
],
"packageRules": [
{
+ "matchDatasources": ["docker"],
"matchPackageNames": ["renovate/renovate"],
- "schedule": [ "on friday" ]
+ "schedule": [ "before 1am on friday" ],
+ "automerge": true
}
]
}
diff --git a/requirements.yml b/requirements.yml
index ab7caae..769e481 100644
--- a/requirements.yml
+++ b/requirements.yml
@@ -1,13 +1,11 @@
---
roles:
- - src: hifis.unattended_upgrades
- version: v3.2.1
- name: adriagalin.timezone
src: git+https://github.com/adriagalin/ansible.timezone.git
version: 4.0.0
- name: 24367dfa.dehydrated
src: git+https://github.com/24367dfa/ansible-role-dehydrated.git
- version: 2.0.0
+ version: 2.1.0
- name: penguineer.dehydrated_cron
src: https://github.com/penguineer/ansible-role-dehydrated_cron.git
version: v1.1.0
@@ -15,11 +13,14 @@ roles:
src: git+https://github.com/maz3max/ble-keykeeper-role.git
version: v1.1.0
- src: lespocky.telegraf_docker_in_docker
- version: v0.2.1
+ version: v0.2.2
- name: netz39.host_docker
src: git+https://github.com/netz39/ansible-role-host-docker.git
- version: v0.4.0
+ version: v0.5.0
collections:
- name: community.grafana
version: 2.1.0
+ # for role 'hifis.toolkit.unattended_upgrades'
+ - name: hifis.toolkit
+ version: 5.3.0
diff --git a/roles/apache/handlers/main.yml b/roles/apache/handlers/main.yml
index e307af9..126d33e 100644
--- a/roles/apache/handlers/main.yml
+++ b/roles/apache/handlers/main.yml
@@ -1,6 +1,6 @@
# Handlers for role apache
---
-- name: restart apache2
- service:
+- name: Restart apache2
+ ansible.builtin.service:
name: apache2
state: restarted
diff --git a/roles/apache/tasks/main.yml b/roles/apache/tasks/main.yml
index 6bfa4da..67928af 100644
--- a/roles/apache/tasks/main.yml
+++ b/roles/apache/tasks/main.yml
@@ -1,12 +1,12 @@
---
- name: Ensure Apache2 and modules are installed and up to date
- apt:
+ ansible.builtin.apt:
name:
- apache2
state: present
- name: Ensure necessary modules are enabled
- apache2_module:
+ community.general.apache2_module:
name: "{{ item }}"
state: present
with_items:
@@ -23,7 +23,7 @@
mode: "0644"
owner: root
group: root
- notify: restart apache2
+ notify: Restart apache2
- name: Add symlink to enable configuration
ansible.builtin.file:
@@ -32,4 +32,4 @@
state: link
owner: root
group: root
- notify: restart apache2
+ notify: Restart apache2
diff --git a/roles/apache_letsencrypt/handlers/main.yml b/roles/apache_letsencrypt/handlers/main.yml
index abf4ea1..b2cf41c 100644
--- a/roles/apache_letsencrypt/handlers/main.yml
+++ b/roles/apache_letsencrypt/handlers/main.yml
@@ -1,6 +1,6 @@
# Handlers for role apache_letsencrypt
---
-- name: restart apache2
- service:
+- name: Restart apache2
+ ansible.builtin.service:
name: apache2
state: restarted
diff --git a/roles/apache_letsencrypt/tasks/main.yml b/roles/apache_letsencrypt/tasks/main.yml
index 6acb952..1294f2d 100644
--- a/roles/apache_letsencrypt/tasks/main.yml
+++ b/roles/apache_letsencrypt/tasks/main.yml
@@ -7,7 +7,7 @@
mode: "0644"
owner: root
group: root
- notify: restart apache2
+ notify: Restart apache2
- name: Add symlink to enable configuration
ansible.builtin.file:
@@ -17,4 +17,4 @@
mode: "0644"
owner: root
group: root
- notify: restart apache2
+ notify: Restart apache2
diff --git a/roles/cleanuri/defaults/main.yml b/roles/cleanuri/defaults/main.yml
index c81ad6f..73422b8 100644
--- a/roles/cleanuri/defaults/main.yml
+++ b/roles/cleanuri/defaults/main.yml
@@ -19,7 +19,7 @@ cleanuri_amqp_canonizer: "canonizer"
cleanuri_amqp_retrieval: "extractor"
# Docker images
-cleanuri_image_webui: mrtux/cleanuri-webui:0.2.1
-cleanuri_image_apigateway: mrtux/cleanuri-apigateway:0.3.1
-cleanuri_image_canonizer: mrtux/cleanuri-canonizer:0.5.0
-cleanuri_image_extractor: mrtux/cleanuri-extractor:0.5.0
+cleanuri_image_webui: mrtux/cleanuri-webui:0.2.2
+cleanuri_image_apigateway: mrtux/cleanuri-apigateway:0.3.2
+cleanuri_image_canonizer: mrtux/cleanuri-canonizer:0.5.3
+cleanuri_image_extractor: mrtux/cleanuri-extractor:0.5.3
diff --git a/roles/cleanuri/tasks/main.yml b/roles/cleanuri/tasks/main.yml
index 9490a6f..33aeb9b 100644
--- a/roles/cleanuri/tasks/main.yml
+++ b/roles/cleanuri/tasks/main.yml
@@ -1,7 +1,7 @@
# Tasks for the cleanuri role
---
- name: Ensure CleanURI WebUI is running
- docker_container:
+ community.docker.docker_container:
name: cleanuri-webui
image: "{{ cleanuri_image_webui }}"
pull: true
@@ -15,7 +15,7 @@
REACT_APP_API_GATEWAY: "https://{{ cleanuri_api_domain }}"
- name: Setup proxy site for the CleanURI WebUI
- include_role:
+ ansible.builtin.include_role:
name: setup_http_site_proxy
vars:
site_name: "{{ cleanuri_ui_domain }}"
@@ -23,7 +23,7 @@
- name: Ensure CleanURI API Gateway is running
- docker_container:
+ community.docker.docker_container:
name: cleanuri-apigateway
image: "{{ cleanuri_image_apigateway }}"
pull: true
@@ -42,7 +42,7 @@
GATEWAY_TASK_RK: "{{ cleanuri_amqp_canonizer }}"
- name: Ensure CleanURI Canonizer is running
- docker_container:
+ community.docker.docker_container:
name: cleanuri-canonizer
image: "{{ cleanuri_image_canonizer }}"
pull: true
@@ -59,7 +59,7 @@
EXTRACTOR_TASK_RK: "{{ cleanuri_amqp_retrieval }}"
- name: Ensure CleanURI Extractor is running
- docker_container:
+ community.docker.docker_container:
name: cleanuri-extractor
image: "{{ cleanuri_image_extractor }}"
pull: true
@@ -76,7 +76,7 @@
- name: Setup proxy site the CleanURI API Gateway
- include_role:
+ ansible.builtin.include_role:
name: setup_http_site_proxy
vars:
site_name: "{{ cleanuri_api_domain }}"
diff --git a/roles/dd24_dyndns_cron/handlers/main.yml b/roles/dd24_dyndns_cron/handlers/main.yml
index 49c802c..10ded8f 100644
--- a/roles/dd24_dyndns_cron/handlers/main.yml
+++ b/roles/dd24_dyndns_cron/handlers/main.yml
@@ -1,6 +1,6 @@
# handlers file for cron-dd24-dyndns
---
-- name: reload cron
+- name: Reload cron
ansible.builtin.shell:
cmd: service cron reload
warn: no
diff --git a/roles/dd24_dyndns_cron/tasks/main.yml b/roles/dd24_dyndns_cron/tasks/main.yml
index 5060260..da32fbd 100644
--- a/roles/dd24_dyndns_cron/tasks/main.yml
+++ b/roles/dd24_dyndns_cron/tasks/main.yml
@@ -1,6 +1,6 @@
---
- name: Make sure cron and curl are installed
- apt:
+ ansible.builtin.apt:
name:
- cron
- curl
@@ -13,6 +13,6 @@
owner: root
group: root
mode: "0644"
- notify: reload cron
+ notify: Reload cron
# There is ansible.builtin.cron, but this makes configuration much
# more complicated, so we stick to the template.
diff --git a/roles/desec_dyndns_cron/handlers/main.yml b/roles/desec_dyndns_cron/handlers/main.yml
index 76bb1a9..8017c9d 100644
--- a/roles/desec_dyndns_cron/handlers/main.yml
+++ b/roles/desec_dyndns_cron/handlers/main.yml
@@ -1,6 +1,6 @@
# handlers file for desec_dyndns_cron
---
-- name: reload cron
+- name: Reload cron
ansible.builtin.shell:
cmd: service cron reload
warn: no
diff --git a/roles/desec_dyndns_cron/tasks/main.yml b/roles/desec_dyndns_cron/tasks/main.yml
index d389fb7..eb164d0 100644
--- a/roles/desec_dyndns_cron/tasks/main.yml
+++ b/roles/desec_dyndns_cron/tasks/main.yml
@@ -1,6 +1,6 @@
---
- name: Make sure cron and curl are installed
- apt:
+ ansible.builtin.apt:
name:
- cron
- curl
@@ -13,6 +13,6 @@
owner: root
group: root
mode: "0644"
- notify: reload cron
+ notify: Reload cron
# There is ansible.builtin.cron, but this makes configuration much
# more complicated, so we stick to the template.
diff --git a/roles/nfs_host/handlers/main.yml b/roles/nfs_host/handlers/main.yml
index 4cdcec5..860a11c 100644
--- a/roles/nfs_host/handlers/main.yml
+++ b/roles/nfs_host/handlers/main.yml
@@ -1,3 +1,3 @@
---
-- name: reload nfs
- command: 'exportfs -ra'
+- name: Reload nfs
+ ansible.builtin.command: 'exportfs -ra'
diff --git a/roles/nfs_host/tasks/main.yml b/roles/nfs_host/tasks/main.yml
index a6423ff..4ad14c0 100644
--- a/roles/nfs_host/tasks/main.yml
+++ b/roles/nfs_host/tasks/main.yml
@@ -14,7 +14,7 @@
state: present
fs_type: ext4
-- name: ensure nfs mountpoints exist
+- name: Ensure nfs mountpoints exist
ansible.builtin.file:
path: "{{ item.directory }}"
state: directory
@@ -30,11 +30,11 @@
fstype: ext4
state: present
-- name: template /etc/exports
+- name: Put /etc/exports in place from template
ansible.builtin.template:
src: templates/exports.j2
dest: "/etc/exports"
- notify: reload nfs
+ notify: Reload nfs
- name: Ensure nfs is running.
ansible.builtin.service: "name=nfs-kernel-server state=started enabled=yes"
diff --git a/roles/nginx_https_ingress/handlers/main.yml b/roles/nginx_https_ingress/handlers/main.yml
index 53aebbb..2a16ea6 100644
--- a/roles/nginx_https_ingress/handlers/main.yml
+++ b/roles/nginx_https_ingress/handlers/main.yml
@@ -1,7 +1,7 @@
# Handlers für nginx-https-proxy
---
-- name: restart nginx
- service:
+- name: Restart nginx
+ ansible.builtin.service:
name: nginx
state: restarted
enabled: yes
diff --git a/roles/nginx_https_ingress/tasks/main.yml b/roles/nginx_https_ingress/tasks/main.yml
index b922472..e824733 100644
--- a/roles/nginx_https_ingress/tasks/main.yml
+++ b/roles/nginx_https_ingress/tasks/main.yml
@@ -18,7 +18,7 @@
# for SSL passthrough.
- name: Add nginx apt-key
- apt_key:
+ ansible.builtin.apt_key:
url: https://nginx.org/keys/nginx_signing.key
state: present
@@ -56,7 +56,7 @@
owner: root
group: root
mode: '0644'
- notify: restart nginx
+ notify: Restart nginx
- name: Create directory for dehydrated forwardings
ansible.builtin.file:
@@ -74,7 +74,7 @@
group: root
mode: '0644'
loop: "{{ ingress }}"
- notify: restart nginx
+ notify: Restart nginx
- name: Setup nginx configuration
# Note the order here: The nginx configuration _needs_ he dehydrated-hosts
@@ -86,4 +86,4 @@
owner: root
group: root
mode: '0644'
- notify: restart nginx
+ notify: Restart nginx
diff --git a/roles/setup_http_site_forward/handlers/main.yml b/roles/setup_http_site_forward/handlers/main.yml
index 670471f..47e5060 100644
--- a/roles/setup_http_site_forward/handlers/main.yml
+++ b/roles/setup_http_site_forward/handlers/main.yml
@@ -1,5 +1,5 @@
---
-- name: restart apache2
- service:
+- name: Restart apache2
+ ansible.builtin.service:
name: apache2
state: restarted
diff --git a/roles/setup_http_site_forward/tasks/main.yml b/roles/setup_http_site_forward/tasks/main.yml
index cac1779..7d0dff9 100644
--- a/roles/setup_http_site_forward/tasks/main.yml
+++ b/roles/setup_http_site_forward/tasks/main.yml
@@ -1,12 +1,12 @@
---
- name: Add or update Apache2 site
- template:
+ ansible.builtin.template:
src: templates/apache-docker-forward-site.j2
dest: /etc/apache2/sites-available/{{ site_name }}.conf
- notify: restart apache2
+ notify: Restart apache2
- name: Activate Apache2 site
- command: a2ensite {{ site_name }}
+ ansible.builtin.command: a2ensite {{ site_name }}
args:
creates: /etc/apache2/sites-enabled/{{ site_name }}.conf
- notify: restart apache2
+ notify: Restart apache2
diff --git a/roles/setup_http_site_proxy/handlers/main.yml b/roles/setup_http_site_proxy/handlers/main.yml
index 670471f..47e5060 100644
--- a/roles/setup_http_site_proxy/handlers/main.yml
+++ b/roles/setup_http_site_proxy/handlers/main.yml
@@ -1,5 +1,5 @@
---
-- name: restart apache2
- service:
+- name: Restart apache2
+ ansible.builtin.service:
name: apache2
state: restarted
diff --git a/roles/setup_http_site_proxy/tasks/main.yml b/roles/setup_http_site_proxy/tasks/main.yml
index c1f52d2..c50d016 100644
--- a/roles/setup_http_site_proxy/tasks/main.yml
+++ b/roles/setup_http_site_proxy/tasks/main.yml
@@ -1,13 +1,13 @@
---
- name: Add or update Apache2 site
- template:
+ ansible.builtin.template:
src: templates/apache-docker-proxy-site.j2
dest: /etc/apache2/sites-available/{{ site_name }}.conf
mode: "0644"
- notify: restart apache2
+ notify: Restart apache2
- name: Activate Apache2 site
- command: a2ensite {{ site_name }}
+ ansible.builtin.command: a2ensite {{ site_name }}
args:
creates: /etc/apache2/sites-enabled/{{ site_name }}.conf
- notify: restart apache2
+ notify: Restart apache2
diff --git a/roles/users/handlers/main.yml b/roles/users/handlers/main.yml
index 372d62a..04184af 100644
--- a/roles/users/handlers/main.yml
+++ b/roles/users/handlers/main.yml
@@ -1,3 +1,3 @@
---
- name: Update aliases
- shell: which newaliases && newaliases || true
+ ansible.builtin.shell: which newaliases && newaliases || true
diff --git a/roles/users/tasks/main.yml b/roles/users/tasks/main.yml
index 15fa0fc..3291b35 100644
--- a/roles/users/tasks/main.yml
+++ b/roles/users/tasks/main.yml
@@ -1,12 +1,12 @@
---
- name: Ensure sudo is installed
- package:
+ ansible.builtin.package:
name:
- sudo
state: present
- name: Configure group sudo for sudoers without password
- lineinfile:
+ ansible.builtin.lineinfile:
path: /etc/sudoers
state: present
regexp: '^%sudo\s'
@@ -14,7 +14,7 @@
validate: /usr/sbin/visudo -cf %s
- name: Add users | create users' shell and home dir
- user:
+ ansible.builtin.user:
name: "{{ item.logname }}"
shell: /bin/bash
createhome: yes
@@ -22,7 +22,7 @@
with_items: "{{ users }}"
- name: Add authorized keys for user
- authorized_key:
+ ansible.posix.authorized_key:
user: "{{ item.0.logname }}"
key: "{{ item.1 }}"
state: present
@@ -32,7 +32,7 @@
- skip_missing: true
- name: Place user in sudo group
- user:
+ ansible.builtin.user:
name: "{{ item.logname }}"
groups: [sudo]
append: yes
@@ -40,12 +40,12 @@
with_items: "{{ users }}"
- name: Check if /etc/aliases exists
- stat:
+ ansible.builtin.stat:
path: /etc/aliases
register: aliases
- name: Set system email alias
- lineinfile:
+ ansible.builtin.lineinfile:
path: /etc/aliases
state: present
regexp: "^{{ item.logname }}:"
diff --git a/setup-ssh.yml b/setup-ssh.yml
index e5297a3..58fcbcd 100644
--- a/setup-ssh.yml
+++ b/setup-ssh.yml
@@ -1,21 +1,21 @@
---
-- name: configure local ssh to access n39 hosts
+- name: Configure local ssh to access n39 hosts
hosts: localhost
tasks:
- - name: ensure {{ lookup('env', 'HOME') }}/.ssh/config.d/ dir is present
+ - name: Ensure $HOME/.ssh/config.d/ dir is present
ansible.builtin.file:
path: "{{ lookup('env', 'HOME') }}/.ssh/config.d/"
state: directory
delegate_to: localhost
- - name: template ssh config for access to internal systems
+ - name: Put ssh config for access to n39 internal systems in place
ansible.builtin.template:
src: templates/ssh_config.j2
dest: "{{ lookup('env', 'HOME') }}/.ssh/config.d/n39_config"
delegate_to: localhost
- - name: ensure that n39 access config is included
+ - name: Ensure that n39 access config is included
ansible.builtin.lineinfile:
path: ~/.ssh/config
insertbefore: BOF