From c4acc32addc9839c38b5f7c092c2bf55718c7747 Mon Sep 17 00:00:00 2001
From: Christoph <ckubu@oopen.de>
Date: Fri, 7 Aug 2026 11:43:28 +0200
Subject: [PATCH] feat: update apt upgrade tasks to conditionally refresh cache
 based on apt_update variable

---
 host_vars/server23.warenform.de/server23-common.yml    | 5 +++++
 roles/ansible_dependencies-bookworm/tasks/main.yml     | 2 +-
 roles/ansible_dependencies-bullseye/tasks/main.yml     | 2 +-
 roles/ansible_dependencies-trixie/tasks/main.yml       | 2 +-
 roles/ansible_dependencies-ubuntu-noble/tasks/main.yml | 2 +-
 roles/ansible_dependencies/tasks/main.yml              | 2 +-
 roles/common/tasks/apt.yml                             | 4 +++-
 roles/common/tasks/caching-nameserver.yml              | 2 +-
 8 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/host_vars/server23.warenform.de/server23-common.yml b/host_vars/server23.warenform.de/server23-common.yml
index 5913b85..64775cd 100644
--- a/host_vars/server23.warenform.de/server23-common.yml
+++ b/host_vars/server23.warenform.de/server23-common.yml
@@ -238,6 +238,11 @@ cron_user_special_time_entries:
 
 cron_user_entries:
 
+  - name: "Check load on thi machine"
+    minute: '*/5'
+    hour: '*'
+    job: /root/bin/monitoring/check_webservice_load.sh
+
   - name: "Check if SSH service is running. Restart service if needed."
     minute: '*/5'
     hour: '*'
diff --git a/roles/ansible_dependencies-bookworm/tasks/main.yml b/roles/ansible_dependencies-bookworm/tasks/main.yml
index 5b23824..25ccc69 100644
--- a/roles/ansible_dependencies-bookworm/tasks/main.yml
+++ b/roles/ansible_dependencies-bookworm/tasks/main.yml
@@ -29,7 +29,7 @@
 - name: apt upgrade
   apt:
     upgrade: "{{ apt_upgrade_type }}"
-    update_cache: true
+    update_cache: "{{ not (apt_update | default(true) | bool) }}"
     dpkg_options: "{{ apt_upgrade_dpkg_options | join(',') }}"
   when: apt_upgrade|bool
   tags:
diff --git a/roles/ansible_dependencies-bullseye/tasks/main.yml b/roles/ansible_dependencies-bullseye/tasks/main.yml
index 2e522a8..6a06e17 100644
--- a/roles/ansible_dependencies-bullseye/tasks/main.yml
+++ b/roles/ansible_dependencies-bullseye/tasks/main.yml
@@ -32,7 +32,7 @@
 - name: apt upgrade
   apt:
     upgrade: "{{ apt_upgrade_type }}"
-    update_cache: true
+    update_cache: "{{ not (apt_update | default(true) | bool) }}"
     dpkg_options: "{{ apt_upgrade_dpkg_options | join(',') }}"
   when: apt_upgrade|bool
   tags:
diff --git a/roles/ansible_dependencies-trixie/tasks/main.yml b/roles/ansible_dependencies-trixie/tasks/main.yml
index 5c3510a..5811e71 100644
--- a/roles/ansible_dependencies-trixie/tasks/main.yml
+++ b/roles/ansible_dependencies-trixie/tasks/main.yml
@@ -56,7 +56,7 @@
 - name: Upgrade packages
   ansible.builtin.apt:
     upgrade: "{{ apt_upgrade_type | default('safe') }}"
-    update_cache: true
+    update_cache: "{{ not (apt_update | default(true) | bool) }}"
     dpkg_options: "{{ (apt_upgrade_dpkg_options | default(['force-confdef','force-confold'])) | join(',') }}"
   when: (apt_upgrade | default(false)) | bool
   tags: [ansible-dependencies]
diff --git a/roles/ansible_dependencies-ubuntu-noble/tasks/main.yml b/roles/ansible_dependencies-ubuntu-noble/tasks/main.yml
index e01ece5..6092c83 100644
--- a/roles/ansible_dependencies-ubuntu-noble/tasks/main.yml
+++ b/roles/ansible_dependencies-ubuntu-noble/tasks/main.yml
@@ -32,7 +32,7 @@
 - name: apt upgrade
   apt:
     upgrade: "{{ apt_upgrade_type }}"
-    update_cache: true
+    update_cache: "{{ not (apt_update | default(true) | bool) }}"
     dpkg_options: "{{ apt_upgrade_dpkg_options | join(',') }}"
   when: apt_upgrade|bool
   tags:
diff --git a/roles/ansible_dependencies/tasks/main.yml b/roles/ansible_dependencies/tasks/main.yml
index 2981dc8..b065027 100644
--- a/roles/ansible_dependencies/tasks/main.yml
+++ b/roles/ansible_dependencies/tasks/main.yml
@@ -32,7 +32,7 @@
 - name: apt upgrade
   apt:
     upgrade: "{{ apt_upgrade_type }}"
-    update_cache: true
+    update_cache: "{{ not (apt_update | default(true) | bool) }}"
     dpkg_options: "{{ apt_upgrade_dpkg_options | join(',') }}"
   when: apt_upgrade|bool
   tags:
diff --git a/roles/common/tasks/apt.yml b/roles/common/tasks/apt.yml
index 77d9b77..1666b4c 100644
--- a/roles/common/tasks/apt.yml
+++ b/roles/common/tasks/apt.yml
@@ -196,7 +196,9 @@
 - name: (apt.yml) apt upgrade
   ansible.builtin.apt:
     upgrade: "{{ apt_upgrade_type }}"
-    update_cache: true
+    # Cache refresh happens in the apt update task above.
+    # Keep fallback refresh only if apt_update is disabled.
+    update_cache: "{{ not (apt_update | bool) }}"
     dpkg_options: "{{ apt_upgrade_dpkg_options | join(',') }}"
   when: apt_upgrade|bool
   tags:
diff --git a/roles/common/tasks/caching-nameserver.yml b/roles/common/tasks/caching-nameserver.yml
index 6a260b6..461af73 100644
--- a/roles/common/tasks/caching-nameserver.yml
+++ b/roles/common/tasks/caching-nameserver.yml
@@ -28,7 +28,7 @@
 - name: (caching-nameserver.yml) upgrade
   ansible.builtin.apt:
     upgrade: "{{ apt_upgrade_type }}"
-    update_cache: true
+    update_cache: "{{ not (apt_update | bool) }}"
     dpkg_options: "{{ apt_upgrade_dpkg_options | join(',') }}"
   when:
     - ansible_facts["distribution"] == "Debian"