diff options
Diffstat (limited to 'krebs')
| -rw-r--r-- | krebs/2configs/shack/muell_mail.nix | 2 | ||||
| -rw-r--r-- | krebs/2configs/shack/prometheus/server.nix | 7 | ||||
| -rw-r--r-- | krebs/3modules/rtorrent.nix | 24 |
3 files changed, 19 insertions, 14 deletions
diff --git a/krebs/2configs/shack/muell_mail.nix b/krebs/2configs/shack/muell_mail.nix index a41dbc977..5ae80d780 100644 --- a/krebs/2configs/shack/muell_mail.nix +++ b/krebs/2configs/shack/muell_mail.nix @@ -6,7 +6,7 @@ let url = "https://git.shackspace.de/rz/muell_mail"; rev = "861ec25ab22797d8961efb32e72d79e113aa9f0f"; sha256 = "sha256:18cw95zbr7isv4cw80cbpd84n5z208fwh5390i6j10jkn398mjq2"; - }) {}; + }) { mkYarnPackage = pkgs.yarn2nix-moretea.mkYarnPackage; }; home = "/var/lib/muell_mail"; cfg = toString <secrets/shack/muell_mail.js>; in { diff --git a/krebs/2configs/shack/prometheus/server.nix b/krebs/2configs/shack/prometheus/server.nix index 12f757e89..7f6f38610 100644 --- a/krebs/2configs/shack/prometheus/server.nix +++ b/krebs/2configs/shack/prometheus/server.nix @@ -28,7 +28,6 @@ "-storage.local.index-cache-size.label-name-to-label-values 2097152" "-storage.local.index-cache-size.label-pair-to-fingerprints 41943040" ]; - alertmanagerURL = [ "http://localhost:9093" ]; rules = [ '' ALERT node_down @@ -161,6 +160,12 @@ ]; } ]; + alertmanagers = [ + { scheme = "http"; + path_prefix = "/"; + static_configs = [ { targets = [ "localhost:9093" ]; } ]; + } + ]; alertmanager = { enable = true; listenAddress = "0.0.0.0"; diff --git a/krebs/3modules/rtorrent.nix b/krebs/3modules/rtorrent.nix index 09e552010..d59569317 100644 --- a/krebs/3modules/rtorrent.nix +++ b/krebs/3modules/rtorrent.nix @@ -333,18 +333,18 @@ let rutorrent-imp = { services.phpfpm = { # phpfpm does not have an enable option - poolConfigs = { - rutorrent = '' - user = ${nginx-user} - group = ${nginx-group} - listen = ${fpm-socket} - listen.owner = ${nginx-user} - listen.group = ${nginx-group} - pm = dynamic - pm.max_children = 5 - pm.start_servers = 2 - pm.min_spare_servers = 1 - pm.max_spare_servers = 3 + pools.rutorrent = { + user = nginx-user; + group = nginx-group; + listen = fpm-socket; + settings = { + "pm" = "dynamic"; + "pm.max_children" = 5; + "pm.start_servers" = 2; + "pm.min_spare_servers" = 1; + "pm.max_spare_servers" = 3; + }; + extraConfig = '' chdir = / php_admin_value[error_log] = 'stderr' php_admin_flag[log_errors] = on |