From 50fadb45e21f50d3af4aaad7eca1f3f72dcc1210 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Tue, 13 Aug 2024 22:38:40 +0200 Subject: [PATCH] common: define TZ in base server configs, remove heretical host-specific configuration --- common/base-server.nix | 2 ++ hosts/buildbot/default.nix | 2 -- hosts/fodwatch/default.nix | 2 -- hosts/gerrit01/default.nix | 2 -- hosts/git/default.nix | 2 -- hosts/meta01/default.nix | 2 -- hosts/public01/default.nix | 2 -- 7 files changed, 2 insertions(+), 12 deletions(-) diff --git a/common/base-server.nix b/common/base-server.nix index c3f0251..5206fea 100644 --- a/common/base-server.nix +++ b/common/base-server.nix @@ -55,4 +55,6 @@ "en_US.UTF-8/UTF-8" "fr_FR.UTF-8/UTF-8" ]; + + time.timeZone = "UTC"; } diff --git a/hosts/buildbot/default.nix b/hosts/buildbot/default.nix index ffc07c0..52df6eb 100755 --- a/hosts/buildbot/default.nix +++ b/hosts/buildbot/default.nix @@ -9,8 +9,6 @@ # TODO: make it the default networking.domain = "infra.forkos.org"; - time.timeZone = "Europe/Paris"; - bagel.sysadmin.enable = true; # Buildbot is proxied. bagel.raito.v6-proxy-awareness.enable = true; diff --git a/hosts/fodwatch/default.nix b/hosts/fodwatch/default.nix index 93f4864..52d15c5 100755 --- a/hosts/fodwatch/default.nix +++ b/hosts/fodwatch/default.nix @@ -8,8 +8,6 @@ networking.hostName = "fodwatch"; networking.domain = "infra.forkos.org"; - time.timeZone = "Europe/Paris"; - bagel.sysadmin.enable = true; # Fodwatch will be proxied. bagel.raito.v6-proxy-awareness.enable = true; diff --git a/hosts/gerrit01/default.nix b/hosts/gerrit01/default.nix index 7dc7de9..a9c48b4 100755 --- a/hosts/gerrit01/default.nix +++ b/hosts/gerrit01/default.nix @@ -9,8 +9,6 @@ # TODO: make it the default networking.domain = "infra.forkos.org"; - time.timeZone = "Europe/Paris"; - bagel.sysadmin.enable = true; # Gerrit is proxied. bagel.raito.v6-proxy-awareness.enable = true; diff --git a/hosts/git/default.nix b/hosts/git/default.nix index 4399485..57c917a 100644 --- a/hosts/git/default.nix +++ b/hosts/git/default.nix @@ -8,8 +8,6 @@ in networking.hostName = "git"; networking.domain = "infra.forkos.org"; - time.timeZone = "Europe/Paris"; - bagel.sysadmin.enable = true; # Forgejo will be proxied. bagel.raito.v6-proxy-awareness.enable = true; diff --git a/hosts/meta01/default.nix b/hosts/meta01/default.nix index 21c02f5..a5abb80 100755 --- a/hosts/meta01/default.nix +++ b/hosts/meta01/default.nix @@ -2,8 +2,6 @@ networking.hostName = "meta01"; networking.domain = "infra.forkos.org"; - time.timeZone = "Europe/Paris"; - bagel.sysadmin.enable = true; # netbox is proxied. bagel.raito.v6-proxy-awareness.enable = true; diff --git a/hosts/public01/default.nix b/hosts/public01/default.nix index ffbce98..d1d3798 100755 --- a/hosts/public01/default.nix +++ b/hosts/public01/default.nix @@ -9,8 +9,6 @@ # TODO: make it the default networking.domain = "infra.forkos.org"; - time.timeZone = "Europe/Paris"; - bagel.sysadmin.enable = true; # Buildbot is proxied. bagel.raito.v6-proxy-awareness.enable = true;