fix timezone configurationHEADmaster

8 files changed, 19 insertions, 8 deletions

diff --git a/roles/core/base/tasks/Debian.yml b/roles/core/base/tasks/Debian.yml
index 4d2abc17..43f1876e 100644
--- a/roles/core/base/tasks/Debian.yml
+++ b/roles/core/base/tasks/Debian.yml
@@ -156,6 +156,15 @@
     state: "{{ base_enable_fstrim | ternary('started', 'stopped') }}"
     enabled: "{{ base_enable_fstrim }}"
 
+- name: configure timezone
+  timezone:
+    name: "{{ base_timezone }}"
+  register: etc_localtime
+
+- name: make sure legacy /etc/timezone is in sync with /etc/localtime
+  when: etc_localtime is changed
+  command: dpkg-reconfigure -f noninteractive tzdata
+
 - name: remove cloud-init bullshit
   loop:
   - /var/log/cloud-init.log
diff --git a/roles/core/base/tasks/OpenBSD.yml b/roles/core/base/tasks/OpenBSD.yml
index fbc06379..7ff4f324 100644
--- a/roles/core/base/tasks/OpenBSD.yml
+++ b/roles/core/base/tasks/OpenBSD.yml
@@ -13,3 +13,7 @@
   openbsd_pkg:
     name: "{{ base_packages_extra }}"
     state: present
+
+- name: configure timezone
+  timezone:
+    name: "{{ base_timezone }}"
diff --git a/roles/core/base/tasks/main.yml b/roles/core/base/tasks/main.yml
index fe4a396c..a70bc7ad 100644
--- a/roles/core/base/tasks/main.yml
+++ b/roles/core/base/tasks/main.yml
@@ -34,7 +34,3 @@
   copy:
     src: "{{ global_files_dir }}/common/htoprc"
     dest: "{{ item }}/.config/htop/"
-
-- name: configure timezone
-  timezone:
-    name: "{{ base_timezone }}"
diff --git a/roles/installer/debian/preseed/defaults/main.yml b/roles/installer/debian/preseed/defaults/main.yml
index 1a8b5b67..ffc9521c 100644
--- a/roles/installer/debian/preseed/defaults/main.yml
+++ b/roles/installer/debian/preseed/defaults/main.yml
@@ -10,7 +10,7 @@ debian_preseed_locales:
 debian_preseed_keyboard_layout: de
 debian_preseed_keyboard_variant: nodeadkeys
 
-debian_preseed_timezone: Europe/Vienna
+debian_preseed_timezone: "{{ base_timezone | default('Europe/Vienna') }}"
 
 # debian_preseed_force_net_ifnames_policy: path
 debian_preseed_no_netplan: no
diff --git a/roles/installer/openbsd/autoinstall/defaults/main.yml b/roles/installer/openbsd/autoinstall/defaults/main.yml
index b166c191..4d8fd865 100644
--- a/roles/installer/openbsd/autoinstall/defaults/main.yml
+++ b/roles/installer/openbsd/autoinstall/defaults/main.yml
@@ -14,3 +14,5 @@ obsd_autoinstall_file_sets:
   #- xfont
   #- xserv
   #- xshare
+
+obsd_autoinstall_timezone: "{{ base_timezone | default('Europe/Vienna') }}"
diff --git a/roles/installer/openbsd/autoinstall/templates/auto_install.conf.j2 b/roles/installer/openbsd/autoinstall/templates/auto_install.conf.j2
index 8c28d6e6..10fa17be 100644
--- a/roles/installer/openbsd/autoinstall/templates/auto_install.conf.j2
+++ b/roles/installer/openbsd/autoinstall/templates/auto_install.conf.j2
@@ -23,7 +23,7 @@ Setup a user = no
 Start sshd(8) by default = yes
 Allow root ssh login = prohibit-password
 
-What timezone are you in = Europe/Vienna
+What timezone are you in = {{ obsd_autoinstall_timezone }}
 
 Location of sets = cd0
 Pathname to the sets = /
diff --git a/roles/installer/raspios/image/defaults/main.yml b/roles/installer/raspios/image/defaults/main.yml
index 3f6ab3a3..35a76e38 100644
--- a/roles/installer/raspios/image/defaults/main.yml
+++ b/roles/installer/raspios/image/defaults/main.yml
@@ -13,5 +13,5 @@ raspios_keep_boot_dir_mounted: no
 #     line: 'dtparam=i2c_vc=on'
 
 raspios_locale: en_US.UTF-8
-raspios_timezone: Europe/Vienna
+raspios_timezone: "{{ base_timezone | default('Europe/Vienna') }}"
 raspios_keyboard_layout: de
diff --git a/roles/installer/ubuntu/autoinstall/defaults/main.yml b/roles/installer/ubuntu/autoinstall/defaults/main.yml
index 50a35ae1..16d08a19 100644
--- a/roles/installer/ubuntu/autoinstall/defaults/main.yml
+++ b/roles/installer/ubuntu/autoinstall/defaults/main.yml
@@ -6,7 +6,7 @@ ubuntu_autoinstall_locale: en_US
 ubuntu_autoinstall_keyboard_layout: de
 ubuntu_autoinstall_keyboard_variant: nodeadkeys
 
-ubuntu_autoinstall_timezone: Europe/Vienna
+ubuntu_autoinstall_timezone: "{{ base_timezone | default('Europe/Vienna') }}"
 
 # ubuntu_autoinstall_kernel_image:
 ubuntu_autoinstall_virtual_machine: no