From f1c3ecffe261a150fc64541d0f05011bb9b621c0 Mon Sep 17 00:00:00 2001
From: Rouven Seifert <rouven@rfive.de>
Date: Sun, 16 Jun 2024 18:29:36 +0200
Subject: [PATCH] upstream loose changes on quitte

---
 modules/decisions.nix   | 2 +-
 modules/monitoring.nix  | 7 +++++++
 modules/web/ese.nix     | 2 +-
 modules/web/userdir.nix | 1 +
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/modules/decisions.nix b/modules/decisions.nix
index a95bd85..565f020 100644
--- a/modules/decisions.nix
+++ b/modules/decisions.nix
@@ -36,7 +36,7 @@ in
   systemd.services."decisions-to-db" = {
     script = ''
       set -eu
-      ${pkgs.docker}/bin/docker exec decisions python tex_to_db.py
+      ${pkgs.podman}/bin/podman exec decisions python tex_to_db.py
     '';
     serviceConfig = {
       Type = "oneshot";
diff --git a/modules/monitoring.nix b/modules/monitoring.nix
index e277876..3166ba4 100644
--- a/modules/monitoring.nix
+++ b/modules/monitoring.nix
@@ -85,6 +85,13 @@ in
         }];
         # scrape_interval = "60s";
       }
+      {
+        job_name = "rspamd";
+        static_configs = [{
+          targets = [ "rspamd.ifsr.de:11334" ];
+        }];
+        scrape_interval = "15s";
+      }
     ];
   };
 
diff --git a/modules/web/ese.nix b/modules/web/ese.nix
index 780ad13..e3a78ca 100644
--- a/modules/web/ese.nix
+++ b/modules/web/ese.nix
@@ -69,7 +69,7 @@ in
     };
     virtualHosts."${domain}" = {
       locations."= /" = {
-        return = "301 /2023/";
+        return = "301 /2024/";
       };
       locations."/" = {
         root = "/srv/web/ese/served";
diff --git a/modules/web/userdir.nix b/modules/web/userdir.nix
index ad40959..25f5bfa 100644
--- a/modules/web/userdir.nix
+++ b/modules/web/userdir.nix
@@ -56,6 +56,7 @@ in
         display_errors=0
         post_max_size = 40M
         upload_max_filesize = 40M
+        extension=sysvsem.so
       '';
     };
   };