From 05a3b25228d22943e42e3c492d0329415e549266 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Isma=C3=ABl=20Bouya?= Date: Sat, 24 Oct 2020 10:45:32 +0200 Subject: [PATCH] Configuration modifications --- .envrc | 2 ++ environments/immae-eu.nix | 4 ++-- modules/private/monitoring/objects_tiboqorl-fr.nix | 1 + modules/private/system.nix | 2 +- modules/private/system/eldiron.nix | 4 ++-- modules/private/websites/default.nix | 2 +- modules/private/websites/tools/git/mantisbt.nix | 1 + 7 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.envrc b/.envrc index 8aa086a..9741a31 100644 --- a/.envrc +++ b/.envrc @@ -9,3 +9,5 @@ PATH_add $(expand_path nixops/scripts) use nix watch_file $(expand_path nix/sources.json) + +clean_nix_shell diff --git a/environments/immae-eu.nix b/environments/immae-eu.nix index 4ceee82..4df42aa 100644 --- a/environments/immae-eu.nix +++ b/environments/immae-eu.nix @@ -11,7 +11,7 @@ let duply # calendar/contacts - abook khard khal cadaver vdirsyncer pal + abook khard khal cadaver vdirsyncerStable pal # computing boinctui @@ -59,7 +59,7 @@ let # nagnu # messaging/forums/news - flrn slrn + #flrn slrn telegram-cli telegram-history-dump telegramircd weechat profanity newsboat irssi diff --git a/modules/private/monitoring/objects_tiboqorl-fr.nix b/modules/private/monitoring/objects_tiboqorl-fr.nix index 97b7f7b..c3851b5 100644 --- a/modules/private/monitoring/objects_tiboqorl-fr.nix +++ b/modules/private/monitoring/objects_tiboqorl-fr.nix @@ -7,6 +7,7 @@ let use = "external-passive-service"; contact_groups = "tiboqorl"; freshness_threshold = "450"; + notification_interval = "240"; retry_interval = "1"; servicegroups = "webstatus-resources"; host_name = hostFQDN; diff --git a/modules/private/system.nix b/modules/private/system.nix index 6b4ef6e..6fc0ecd 100644 --- a/modules/private/system.nix +++ b/modules/private/system.nix @@ -73,7 +73,7 @@ ]; }; - users.mutableUsers = false; + users.mutableUsers = lib.mkDefault false; environment.etc.cnagios.source = "${pkgs.cnagios}/share/doc/cnagios"; environment.systemPackages = [ diff --git a/modules/private/system/eldiron.nix b/modules/private/system/eldiron.nix index 04cfb76..15ddd40 100644 --- a/modules/private/system/eldiron.nix +++ b/modules/private/system/eldiron.nix @@ -43,13 +43,13 @@ services.zfs = { autoScrub = { - enable = true; + enable = false; }; }; networking = { hostId = "8262ca33"; # generated with head -c4 /dev/urandom | od -A none -t x4 firewall.enable = true; - # 176.9.151.89 declared in nixops -> infra / tools + # FIXME: on next reboot, remove the /27 and the localCommands interfaces."eth0".ipv4.addresses = pkgs.lib.attrsets.mapAttrsToList (n: ips: { address = ips.ip4; prefixLength = 32; }) diff --git a/modules/private/websites/default.nix b/modules/private/websites/default.nix index 90a8c1a..ddfab9a 100644 --- a/modules/private/websites/default.nix +++ b/modules/private/websites/default.nix @@ -246,7 +246,7 @@ in production.enable = true; }; - emilia.moodle.enable = true; + emilia.moodle.enable = false; florian = { app.enable = true; diff --git a/modules/private/websites/tools/git/mantisbt.nix b/modules/private/websites/tools/git/mantisbt.nix index a74d76e..9996d23 100644 --- a/modules/private/websites/tools/git/mantisbt.nix +++ b/modules/private/websites/tools/git/mantisbt.nix @@ -62,6 +62,7 @@ rec { AllowOverride All + SetEnvIf Authorization "(.*)" HTTP_AUTHORIZATION=$1 Options FollowSymlinks Require all granted -- 2.41.0