diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2020-10-24 10:45:32 +0200 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2020-10-24 10:45:32 +0200 |
commit | 05a3b25228d22943e42e3c492d0329415e549266 (patch) | |
tree | d941094fd9e70ddc18e4d8315f80b5cbf45853dd /modules | |
parent | 6b6db4e26a03928a3327f0c3622c3c807b7ecde9 (diff) | |
download | Nix-05a3b25228d22943e42e3c492d0329415e549266.tar.gz Nix-05a3b25228d22943e42e3c492d0329415e549266.tar.zst Nix-05a3b25228d22943e42e3c492d0329415e549266.zip |
Configuration modifications
Diffstat (limited to 'modules')
-rw-r--r-- | modules/private/monitoring/objects_tiboqorl-fr.nix | 1 | ||||
-rw-r--r-- | modules/private/system.nix | 2 | ||||
-rw-r--r-- | modules/private/system/eldiron.nix | 4 | ||||
-rw-r--r-- | modules/private/websites/default.nix | 2 | ||||
-rw-r--r-- | modules/private/websites/tools/git/mantisbt.nix | 1 |
5 files changed, 6 insertions, 4 deletions
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 | |||
7 | use = "external-passive-service"; | 7 | use = "external-passive-service"; |
8 | contact_groups = "tiboqorl"; | 8 | contact_groups = "tiboqorl"; |
9 | freshness_threshold = "450"; | 9 | freshness_threshold = "450"; |
10 | notification_interval = "240"; | ||
10 | retry_interval = "1"; | 11 | retry_interval = "1"; |
11 | servicegroups = "webstatus-resources"; | 12 | servicegroups = "webstatus-resources"; |
12 | host_name = hostFQDN; | 13 | 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 @@ | |||
73 | ]; | 73 | ]; |
74 | }; | 74 | }; |
75 | 75 | ||
76 | users.mutableUsers = false; | 76 | users.mutableUsers = lib.mkDefault false; |
77 | 77 | ||
78 | environment.etc.cnagios.source = "${pkgs.cnagios}/share/doc/cnagios"; | 78 | environment.etc.cnagios.source = "${pkgs.cnagios}/share/doc/cnagios"; |
79 | environment.systemPackages = [ | 79 | 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 @@ | |||
43 | 43 | ||
44 | services.zfs = { | 44 | services.zfs = { |
45 | autoScrub = { | 45 | autoScrub = { |
46 | enable = true; | 46 | enable = false; |
47 | }; | 47 | }; |
48 | }; | 48 | }; |
49 | networking = { | 49 | networking = { |
50 | hostId = "8262ca33"; # generated with head -c4 /dev/urandom | od -A none -t x4 | 50 | hostId = "8262ca33"; # generated with head -c4 /dev/urandom | od -A none -t x4 |
51 | firewall.enable = true; | 51 | firewall.enable = true; |
52 | # 176.9.151.89 declared in nixops -> infra / tools | 52 | # FIXME: on next reboot, remove the /27 and the localCommands |
53 | interfaces."eth0".ipv4.addresses = | 53 | interfaces."eth0".ipv4.addresses = |
54 | pkgs.lib.attrsets.mapAttrsToList | 54 | pkgs.lib.attrsets.mapAttrsToList |
55 | (n: ips: { address = ips.ip4; prefixLength = 32; }) | 55 | (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 | |||
246 | production.enable = true; | 246 | production.enable = true; |
247 | }; | 247 | }; |
248 | 248 | ||
249 | emilia.moodle.enable = true; | 249 | emilia.moodle.enable = false; |
250 | 250 | ||
251 | florian = { | 251 | florian = { |
252 | app.enable = true; | 252 | 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 { | |||
62 | </FilesMatch> | 62 | </FilesMatch> |
63 | 63 | ||
64 | AllowOverride All | 64 | AllowOverride All |
65 | SetEnvIf Authorization "(.*)" HTTP_AUTHORIZATION=$1 | ||
65 | Options FollowSymlinks | 66 | Options FollowSymlinks |
66 | Require all granted | 67 | Require all granted |
67 | </Directory> | 68 | </Directory> |