Fixes + Housekeeping (#558)

Reviewed-on: #558
Co-authored-by: Michael Grote <michael.grote@posteo.de>
Co-committed-by: Michael Grote <michael.grote@posteo.de>

group_vars/all.yml

@@ -64,8 +64,6 @@
     - name: deye
     - name: timesync
   munin_node_plugins:
-    - name: timesync
-      src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/systemd/timesync_status
     - name: systemd_status
       src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/systemd/systemd_status
     - name: systemd_mem

group_vars/docker.yml

@@ -98,3 +98,17 @@
   apt_packages_extra:
     - bc # für munin plugins
     - jq # für munin plugins
+
+  ### mgrote.apt_manage_sources
+  repos_override: # mit docker-repos
+    - deb [arch=amd64] https://download.docker.com/linux/ubuntu jammy stable
+    - "deb http://de.archive.ubuntu.com/ubuntu/ {{ ansible_distribution_release }} main restricted"
+    - "deb http://de.archive.ubuntu.com/ubuntu/ {{ ansible_distribution_release }}-updates main restricted"
+    - "deb http://de.archive.ubuntu.com/ubuntu/ {{ ansible_distribution_release }} universe"
+    - "deb http://de.archive.ubuntu.com/ubuntu/ {{ ansible_distribution_release }}-updates universe"
+    - "deb http://de.archive.ubuntu.com/ubuntu/ {{ ansible_distribution_release }} multiverse"
+    - "deb http://de.archive.ubuntu.com/ubuntu/ {{ ansible_distribution_release }}-updates multiverse"
+    - "deb http://de.archive.ubuntu.com/ubuntu/ {{ ansible_distribution_release }}-backports main restricted universe multiverse"
+    - "deb http://security.ubuntu.com/ubuntu {{ ansible_distribution_release }}-security main restricted"
+    - "deb http://security.ubuntu.com/ubuntu {{ ansible_distribution_release }}-security universe"
+    - "deb http://security.ubuntu.com/ubuntu {{ ansible_distribution_release }}-security multiverse"

host_vars/pbs.grote.lan.yml

@@ -9,8 +9,8 @@
     - name: standard
       schedule: "sat 18:15"
       store: zfs_backup
-      keep_last: 3
-      keep_hourly: 12
+      keep_last: 1
+      keep_hourly: 3
       keep_daily: 3
 
 

roles/geerlingguy.docker/tasks/setup-Debian.yml

@@ -44,10 +44,3 @@
   shell: >
     curl -sSL {{ docker_apt_gpg_key }} | apt-key add -
   when: add_repository_key is failed and docker_add_repo | bool
-
-- name: Add Docker repository.
-  apt_repository:
-    repo: "{{ docker_apt_repository }}"
-    state: present
-    update_cache: true
-  when: docker_add_repo | bool