forgejo: initial runner configuration

flake.lock

@@ -9,11 +9,11 @@
         "poetry2nix": "poetry2nix"
       },
       "locked": {
-        "lastModified": 1714117615,
+        "lastModified": 1710843969,
         "narHash": "sha256-Ilu7j7tihFI0jtnsQS+7H0SZX4C61NZHaV/7fJ39t/E=",
         "owner": "fsr",
         "repo": "course-management",
-        "rev": "9e5ab11788b926a9a26d2aaa0e0958c3c5865cc9",
+        "rev": "07b173b4ea458e5a08b3aa9ec677153c08657c98",
         "type": "github"
       },
       "original": {
@@ -145,11 +145,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1716170277,
+        "lastModified": 1711854532,
-        "narHash": "sha256-fCAiox/TuzWGVaAz16PxrR4Jtf9lN5dwWL2W74DS0yI=",
+        "narHash": "sha256-JPStavwlT7TfxxiXHk6Q7sbNxtnXAIjXQJMLO0KB6M0=",
         "owner": "nix-community",
         "repo": "nix-index-database",
-        "rev": "e0638db3db43b582512a7de8c0f8363a162842b9",
+        "rev": "2844b5f3ad3b478468151bd101370b9d8ef8a3a7",
         "type": "github"
       },
       "original": {
@@ -160,11 +160,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1716361217,
+        "lastModified": 1712168706,
-        "narHash": "sha256-mzZDr00WUiUXVm1ujBVv6A0qRd8okaITyUp4ezYRgc4=",
+        "narHash": "sha256-XP24tOobf6GGElMd0ux90FEBalUtw6NkBSVh/RlA6ik=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "46397778ef1f73414b03ed553a3368f0e7e33c2f",
+        "rev": "1487bdea619e4a7a53a4590c475deabb5a9d1bfb",
         "type": "github"
       },
       "original": {
@@ -176,11 +176,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1716061101,
+        "lastModified": 1711819797,
-        "narHash": "sha256-H0eCta7ahEgloGIwE/ihkyGstOGu+kQwAiHvwVoXaA0=",
+        "narHash": "sha256-tNeB6emxj74Y6ctwmsjtMlzUMn458sBmwnD35U5KIM4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e7cc61784ddf51c81487637b3031a6dd2d6673a2",
+        "rev": "2b4e3ca0091049c6fbb4908c66b05b77eaef9f0c",
         "type": "github"
       },
       "original": {
@@ -192,11 +192,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1716509168,
+        "lastModified": 1712163089,
-        "narHash": "sha256-4zSIhSRRIoEBwjbPm3YiGtbd8HDWzFxJjw5DYSDy1n8=",
+        "narHash": "sha256-Um+8kTIrC19vD4/lUCN9/cU9kcOsD1O1m+axJqQPyMM=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "bfb7a882678e518398ce9a31a881538679f6f092",
+        "rev": "fd281bd6b7d3e32ddfa399853946f782553163b5",
         "type": "github"
       },
       "original": {
@@ -286,11 +286,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1716400300,
+        "lastModified": 1711855048,
-        "narHash": "sha256-0lMkIk9h3AzOHs1dCL9RXvvN4PM8VBKb+cyGsqOKa4c=",
+        "narHash": "sha256-HxegAPnQJSC4cbEbF4Iq3YTlFHZKLiNTk8147EbLdGg=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "b549832718b8946e875c016a4785d204fcfc2e53",
+        "rev": "99b1e37f9fc0960d064a7862eb7adfb92e64fa10",
         "type": "github"
       },
       "original": {
@@ -386,11 +386,11 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1713958148,
+        "lastModified": 1709622318,
-        "narHash": "sha256-8PDNi/dgoI2kyM7uSiU4eoLBqUKoA+3TXuz+VWmuCOc=",
+        "narHash": "sha256-bTscF0366xtoIXgH7Zq+Mn0mpX3w4h/2xKpHiYMyLNc=",
         "owner": "nix-community",
         "repo": "nixos-vscode-server",
-        "rev": "fc900c16efc6a5ed972fb6be87df018bcf3035bc",
+        "rev": "d0ed9b8cf1f0a71f110df9119489ab047e0726bd",
         "type": "github"
       },
       "original": {

flake.nix

@@ -83,14 +83,12 @@
             ./modules/hedgedoc.nix
             ./modules/padlist.nix
             ./modules/nextcloud.nix
-            ./modules/keycloak.nix
-            ./modules/monitoring.nix
             ./modules/vaultwarden.nix
             ./modules/forgejo
             ./modules/kanboard.nix
             ./modules/zammad.nix
             ./modules/decisions.nix
-            # ./modules/struktur-bot.nix
+            ./modules/struktur-bot.nix
             {
               nixpkgs.overlays = [ self.overlays.default ];
               sops.defaultSopsFile = ./secrets/quitte.yaml;
@@ -108,6 +106,7 @@
             ./hosts/tomate/configuration.nix
             ./modules/core/base.nix
             ./modules/core/zsh.nix
+            ./modules/core/fail2ban.nix
             ./modules/core/sssd.nix
             {
               sops.defaultSopsFile = ./secrets/tomate.yaml;

hosts/quitte/configuration.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ config, ... }:
 
 {
   imports =
@@ -7,27 +7,11 @@
       ./network.nix
     ];
 
-  boot.loader.systemd-boot = {
+  boot.loader.systemd-boot.enable = true;
-    enable = true;
-    extraInstallCommands = ''
-      ${pkgs.coreutils}/bin/cp -r /boot/* /boot2
-    '';
-  };
   # boot.kernelParams = [ "video=VGA-1:1024x768@30" ];
   boot.loader.efi.canTouchEfiVariables = true;
   boot.supportedFilesystems = [ "zfs" ];
-  # boot.kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;
+  boot.kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;
-  # Pin Kernel Version as 6.6.28 has a broken networking driver
-  boot.kernelPackages = pkgs.linuxPackagesFor (pkgs.linux_6_6.override {
-    argsOverride = rec {
-      src = pkgs.fetchurl {
-        url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz";
-        sha256 = "sha256-Y55QBg48jyPtAXyxDP6sxrqI/1WDgSu3aFm0zGoSgpE=";
-      };
-      version = "6.6.27";
-      modDirVersion = "6.6.27";
-    };
-  });
 
   services.zfs = {
     trim.enable = true;
@@ -53,6 +37,9 @@
       value = "10000";
     }
   ];
+  # Enable the OpenSSH daemon.
+  services.openssh.enable = true;
+  services.openssh.settings.PermitRootLogin = "yes";
 
   systemd = {
     services.nix-daemon.serviceConfig = {

hosts/quitte/hardware-configuration.nix

@@ -10,41 +10,41 @@
   boot.kernelModules = [ "kvm-amd" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" = {
+  fileSystems."/" =
-    device = "rpool/nixos/root";
+    {
-    fsType = "zfs";
+      device = "rpool/nixos/root";
-  };
+      fsType = "zfs";
+    };
 
-  fileSystems."/home" = {
+  fileSystems."/home" =
-    device = "rpool/nixos/home";
+    {
-    fsType = "zfs";
+      device = "rpool/nixos/home";
-  };
+      fsType = "zfs";
+    };
 
-  fileSystems."/nix" = {
+  fileSystems."/nix" =
-    device = "rpool/nixos/nixnew";
+    {
-    fsType = "zfs";
+      device = "rpool/nixos/nixnew";
-  };
+      fsType = "zfs";
+    };
 
-  fileSystems."/var/lib" = {
+  fileSystems."/var/lib" =
-    device = "rpool/nixos/var/lib";
+    {
-    fsType = "zfs";
+      device = "rpool/nixos/var/lib";
-  };
+      fsType = "zfs";
+    };
 
-  fileSystems."/var/log" = {
+  fileSystems."/var/log" =
-    device = "rpool/nixos/var/log";
+    {
-    fsType = "zfs";
+      device = "rpool/nixos/var/log";
-  };
+      fsType = "zfs";
+    };
 
-  fileSystems."/boot" = {
+  fileSystems."/boot" =
-    device = "/dev/disk/by-uuid/3278-8D00";
+    {
-    fsType = "vfat";
+      device = "/dev/disk/by-uuid/3278-8D00";
-    options = [ "nofail" ];
+      fsType = "vfat";
-  };
+    };
-  fileSystems."/boot2" = {
-    device = "/dev/disk/by-uuid/3366-F71E";
-    fsType = "vfat";
-    options = [ "nofail" ];
-  };
 
   swapDevices = [ ];
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";

hosts/tomate/configuration.nix

@@ -8,7 +8,6 @@
   imports =
     [
       # Include the results of the hardware scan.
-      ./network.nix
       ./hardware-configuration.nix
     ];
 
@@ -16,6 +15,8 @@
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
 
+  networking.hostName = "tomate"; # Define your hostname.
+  networking.nftables.enable = true;
 
   nix = {
     settings = {
@@ -28,6 +29,9 @@
     };
   };
 
+  # Enable networking
+  networking.networkmanager.enable = true;
+
   # Set your time zone.
   time.timeZone = "Europe/Berlin";
 

hosts/tomate/network.nix

@@ -1,40 +0,0 @@
-{ config, ... }:
-{
-  sops.secrets.ifsr-apb-auth = { };
-  networking = {
-    domain = "ifsr.de";
-    hostName = "tomate";
-    useNetworkd = true;
-    nftables.enable = true;
-    # Radius authentification
-    supplicant."enp3s0" = {
-      driver = "wired";
-      configFile.path = config.sops.secrets.ifsr-apb-auth.path;
-    };
-  };
-
-  services.resolved = {
-    enable = true;
-    fallbackDns = [ "9.9.9.9" ];
-  };
-
-  systemd.network = {
-    enable = true;
-
-    networks."10-wired-default" = {
-      matchConfig.Name = "enp3s0";
-
-      address = [ "141.30.86.196/26" ];
-      routes = [
-        {
-          routeConfig.Gateway = "141.30.86.193";
-        }
-      ];
-      networkConfig = {
-        DNS = "141.30.1.1";
-        LLDP = true;
-        EmitLLDP = "nearest-bridge";
-      };
-    };
-  };
-}

modules/core/base.nix

@@ -29,13 +29,7 @@
   };
 
   # Enable the OpenSSH daemon.
-  services.openssh = {
+  services.openssh.enable = true;
-    enable = true;
-    settings = {
-      PermitRootLogin = "yes";
-      PasswordAuthentication = false;
-    };
-  };
   programs.mosh.enable = true;
 
   # vs code server

modules/core/default.nix

@@ -7,7 +7,6 @@
     ./initrd-ssh.nix
     ./mysql.nix
     ./nginx.nix
-    ./podman.nix
     ./postgres.nix
     ./sssd.nix
     ./zsh.nix

modules/core/initrd-ssh.nix

@@ -6,14 +6,13 @@
 { config, ... }:
 {
   boot.initrd = {
-    availableKernelModules = [ "mlx5_core" ];
     systemd = {
       enable = true;
       network = {
         enable = true;
         networks."10-wired-default" = config.systemd.network.networks."10-wired-default";
       };
-      users.root.shell = "/bin/systemd-tty-ask-password-agent";
+      users.root.shell = "/bin/zfs load-key rpool/nixos";
     };
     network = {
       enable = true;

modules/core/nginx.nix

@@ -7,14 +7,10 @@
         ({ name, ... }: {
           enableACME = true;
           forceSSL = true;
-          # enable http3 for all hosts
-          quic = true;
-          http3 = true;
           # split up nginx access logs per vhost
           extraConfig = ''
             access_log /var/log/nginx/${name}_access.log;
             error_log /var/log/nginx/${name}_error.log;
-            add_header Alt-Svc 'h3=":443"; ma=86400';
           '';
         })
       );
@@ -26,7 +22,6 @@
     networking.firewall.allowedUDPPorts = [ 443 ];
     services.nginx = {
       enable = true;
-      package = pkgs.nginxQuic;
       additionalModules = [ pkgs.nginxModules.pam ];
       recommendedProxySettings = true;
       recommendedGzipSettings = true;

modules/core/podman.nix

@@ -1,26 +0,0 @@
-{ config, pkgs, ... }:
-{
-  # From: https://nixos.wiki/wiki/Podman
-  virtualisation.containers.enable = true;
-  virtualisation = {
-    podman = {
-      enable = true;
-
-      # Create a `docker` alias for podman, to use it as a drop-in replacement
-      dockerCompat = true;
-
-      # Required for containers under podman-compose to be able to talk to each other.
-      defaultNetwork.settings.dns_enabled = true;
-    };
-  };
-  virtualisation.oci-containers.backend = "podman";
-
-
-  # Useful otherdevelopment tools
-  environment.systemPackages = with pkgs; [
-    dive # look into docker image layers
-    podman-tui # status of containers in the terminal
-    #docker-compose # start group of containers for dev
-    #podman-compose # start group of containers for dev
-  ];
-}

modules/core/postgres.nix

@@ -8,9 +8,7 @@
       "directus_ese"
       "course-management"
       "git"
-      "grafana"
       "hedgedoc"
-      "keycloak"
       "matrix-synapse"
       "mautrix-telegram"
       "mediawiki"

modules/core/zsh.nix

@@ -1,6 +1,5 @@
 { lib, pkgs, ... }:
 {
-  users.users.root.shell = pkgs.zsh;
   programs.command-not-found.enable = false;
   programs.nix-index-database.comma.enable = true;
   environment.systemPackages = with pkgs; [

modules/decisions.nix

@@ -6,14 +6,14 @@ in
   sops.secrets."decisions_env" = { };
   virtualisation.oci-containers = {
     containers.decisions = {
-      image = "ghcr.io/fsr/decisions";
+      image = "decisions";
       volumes = [
         "/var/lib/nextcloud/data/root/files/FSR/protokolle:/protokolle:ro"
       ];
-      extraOptions = [ "--network=host" ];
       environmentFiles = [
         config.sops.secrets."decisions_env".path
       ];
+      extraOptions = [ "--network=host" ];
     };
   };
 
@@ -25,6 +25,11 @@ in
     };
   };
 
+  services.portunus.dex.oidcClients = [{
+    id = "decisions";
+    callbackURL = "https://decisions.ifsr.de/auth";
+  }];
+
   systemd.timers."decisions-to-db" = {
     wantedBy = [ "timers.target" ];
     timerConfig = {

modules/kanboard.nix

@@ -1,33 +1,65 @@
-{ config, pkgs, ... }:
+{ pkgs, config, lib, ... }:
 let
   domain = "kanboard.${config.networking.domain}";
   domain_short = "kb.${config.networking.domain}";
+  user = "kanboard";
+  group = "kanboard";
 in
 {
-  sops.secrets."kanboard_env" = { };
+  users.users.${user} = {
-  
+    group = group;
-  virtualisation.oci-containers = {
+    isSystemUser = true;
-    containers.kanboard = {
+  };
-      image = "ghcr.io/kanboard/kanboard:v1.2.36";
+  users.groups.${group} = { };
-      volumes = [
+
-        "kanboard_data:/var/www/app/data"
+  services.phpfpm.pools.kanboard = {
-        "kanboard_plugins:/var/www/app/plugins"
+    user = "kanboard";
-      ];
+    group = "kanboard";
-      ports = [ "127.0.0.1:8045:80" ];
+    settings = {
-      environmentFiles = [
+      "listen.owner" = config.services.nginx.user;
-        config.sops.secrets."kanboard_env".path
+      "pm" = "dynamic";
-      ];
+      "pm.max_children" = 32;
+      "pm.max_requests" = 500;
+      "pm.start_servers" = 2;
+      "pm.min_spare_servers" = 2;
+      "pm.max_spare_servers" = 5;
+      "php_admin_value[error_log]" = "stderr";
+      "php_admin_flag[log_errors]" = true;
+      "catch_workers_output" = true;
     };
+    phpEnv."PATH" = lib.makeBinPath [ pkgs.php ];
   };
 
+
+
+  services.nginx.enable = true;
   services.nginx = {
     virtualHosts."${domain_short}" = {
       locations."/".return = "301 $scheme://${domain}$request_uri";
     };
 
     virtualHosts."${domain}" = {
-      locations."/" = {
+      root = "/srv/web/kanboard";
-        proxyPass = "http://127.0.0.1:8045";
+      extraConfig = ''
+        index index.html index.php;
+      '';
+
+      locations = {
+        "/" = {
+          tryFiles = "$uri $uri/ =404";
+        };
+        "~ \.php$" = {
+          extraConfig = ''
+            try_files $uri =404;
+            fastcgi_pass unix:${config.services.phpfpm.pools.kanboard.socket};
+            fastcgi_split_path_info ^(.+\.php)(/.+)$;
+            fastcgi_index index.php;
+            include ${pkgs.nginx}/conf/fastcgi_params;
+            include ${pkgs.nginx}/conf/fastcgi.conf;
+            fastcgi_param SCRIPT_FILENAME $document_root/$fastcgi_script_name;
+          '';
+        };
+        "/data".return = "403";
       };
     };
   };

modules/keycloak.nix

@@ -1,34 +0,0 @@
-{ config, nixpkgs-unstable, ... }:
-let
-  domain = "sso.${config.networking.domain}";
-in
-{
-  sops.secrets."keycloak/db" = { };
-  services.keycloak = {
-    enable = true;
-    # we use unstable as the release in stable is insecure
-    package = nixpkgs-unstable.legacyPackages.x86_64-linux.keycloak;
-    settings = {
-      http-port = 8086;
-      https-port = 19000;
-      hostname = domain;
-      proxy = "edge";
-    };
-    # The module requires a password for the DB and works best with its own DB config
-    # Does an automatic Postgresql configuration
-    database = {
-      passwordFile = config.sops.secrets."keycloak/db".path;
-    };
-    initialAdminPassword = "plschangeme";
-  };
-  services.nginx.virtualHosts."${domain}" = {
-    locations."/" = {
-      proxyPass = "http://127.0.0.1:${toString config.services.keycloak.settings.http-port}";
-      extraConfig = ''
-        proxy_buffer_size 128k;
-        proxy_buffers 4 256k;
-        proxy_busy_buffers_size 256k;
-      '';
-    };
-  };
-}

modules/ldap/default.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, nixpkgs-unstable, system, ... }:
+{ config, lib, pkgs, nixpkgs-unstable, system, ... }:
 let
   domain = "auth.${config.networking.domain}";
   seedSettings = {
@@ -55,6 +55,7 @@ in
   sops.secrets = {
     "portunus/admin-password".owner = config.services.portunus.user;
     "portunus/search-password".owner = config.services.portunus.user;
+    "dex/environment".owner = config.systemd.services.dex.serviceConfig.User;
   };
 
   services.portunus = {
@@ -71,6 +72,8 @@ in
 
     inherit domain seedSettings;
     port = 8681;
+    dex.enable = true;
+
     ldap = {
       suffix = "dc=ifsr,dc=de";
       searchUserName = "search";
@@ -81,6 +84,30 @@ in
     };
   };
 
+  services.dex.settings = {
+    oauth2.skipApprovalScreen = true;
+    frontend = {
+      issuer = "iFSR Schliboleth";
+      logoURL = "https://wiki.ifsr.de/images/3/3b/LogoiFSR.png";
+      theme = "dark";
+    };
+  };
+
+  systemd.services.dex.serviceConfig = {
+    DynamicUser = lib.mkForce false;
+    EnvironmentFile = config.sops.secrets."dex/environment".path;
+    StateDirectory = "dex";
+    User = "dex";
+  };
+
+  users = {
+    users.dex = {
+      group = "dex";
+      isSystemUser = true;
+    };
+    groups.dex = { };
+  };
+
   security.pam.services.sshd.makeHomeDir = true;
 
   services.nginx = {
@@ -88,12 +115,13 @@ in
     virtualHosts."${config.services.portunus.domain}" = {
       locations = {
         "/".proxyPass = "http://localhost:${toString config.services.portunus.port}";
+        "/dex".proxyPass = "http://localhost:${toString config.services.portunus.dex.port}";
       };
     };
   };
   networking.firewall = {
     extraInputRules = ''
-      ip saddr { 141.30.86.192/26, 141.76.100.128/25, 141.30.30.169, 10.88.0.1/16 } tcp dport 636 accept comment "Allow ldaps access from office nets and podman"
+      ip saddr { 141.30.86.192/26, 141.76.100.128/25 } tcp dport 636 accept comment "Allow ldaps access from office nets"
     '';
   };
 }

modules/mail/mailman.nix

@@ -66,14 +66,6 @@
     ensureDatabases = [ "mailman" "mailman-web" ];
   };
   services.nginx.virtualHosts."lists.${config.networking.domain}" = {
-    locations."/accounts/signup" = {
-      extraConfig = ''
-        allow 141.30.0.0/16;
-        allow 141.76.0.0/16;
-        deny all;
-        uwsgi_pass unix:/run/mailman-web.socket;
-      '';
-    };
     locations."/robots.txt" = {
       extraConfig = ''
         add_header  Content-Type  text/plain;

modules/monitoring.nix

@@ -1,98 +0,0 @@
-{ config, ... }:
-let
-  domain = "monitoring.${config.networking.domain}";
-in
-{
-  sops.secrets."grafana/oidc_secret" = {
-    owner = "grafana";
-  };
-  # grafana configuration
-  services.grafana = {
-    enable = true;
-    settings = {
-      server = {
-        inherit domain;
-        http_addr = "127.0.0.1";
-        http_port = 2342;
-        root_url = "https://monitoring.ifsr.de";
-      };
-      database = {
-        type = "postgres";
-        user = "grafana";
-        host = "/run/postgresql";
-      };
-      "auth.generic_oauth" = {
-        enabled = true;
-        name = "iFSR";
-        allow_sign_up = true;
-        client_id = "grafana";
-        client_secret = "$__file{${config.sops.secrets."grafana/oidc_secret".path}}";
-        scopes = "openid email profile offline_access roles";
-
-        email_attribute_path = "email";
-        login_attribute_path = "username";
-        name_attribute_path = "full_name";
-
-        auth_url = "https://sso.ifsr.de/realms/internal/protocol/openid-connect/auth";
-        token_url = "https://sso.ifsr.de/realms/internal/protocol/openid-connect/token";
-        api_url = "https://sso.ifsr.de/realms/internal/protocol/openid-connect/userinfo";
-        role_attribute_path = "contains(roles[*], 'admin') && 'Admin' || contains(roles[*], 'editor') && 'Editor' || 'Viewer'";
-
-      };
-
-    };
-
-
-  };
-
-  services.postgresql = {
-    enable = true;
-    ensureUsers = [
-      {
-        name = "grafana";
-        ensureDBOwnership = true;
-      }
-    ];
-    ensureDatabases = [ "grafana" ];
-  };
-
-  services.prometheus = {
-    enable = true;
-    port = 9001;
-    exporters = {
-      node = {
-        enable = true;
-        enabledCollectors = [ "systemd" ];
-        port = 9002;
-      };
-      postfix = {
-        enable = true;
-        port = 9003;
-      };
-    };
-    scrapeConfigs = [
-      {
-        job_name = "node";
-        static_configs = [{
-          targets = [ "127.0.0.1:${toString config.services.prometheus.exporters.node.port}" ];
-        }];
-        scrape_interval = "15s";
-      }
-      {
-        job_name = "postfix";
-        static_configs = [{
-          targets = [ "127.0.0.1:${toString config.services.prometheus.exporters.postfix.port}" ];
-        }];
-        # scrape_interval = "60s";
-      }
-    ];
-  };
-
-  # nginx reverse proxy
-  services.nginx.virtualHosts.${domain} = {
-    locations."/" = {
-      proxyPass = "http://localhost:${toString config.services.grafana.settings.server.http_port}";
-      proxyWebsockets = true;
-    };
-  };
-}

modules/nix-serve.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, ... }:
 let
   domain = "cache.${config.networking.domain}";
 in
@@ -6,7 +6,6 @@ in
   sops.secrets."nix-serve/key" = { };
   services.nix-serve = {
     enable = true;
-    package = pkgs.nix-serve-ng;
     secretKeyFile = config.sops.secrets."nix-serve/key".path;
     port = 5002;
   };

modules/padlist.nix

@@ -46,4 +46,10 @@ in
       };
     };
   };
+
+  services.portunus.dex.oidcClients = [{
+    id = "padlist";
+    callbackURL = "https://list.pad.ifsr.de/callback.php";
+  }];
+
 }

modules/struktur-bot.nix

@@ -1,7 +1,7 @@
 { config, pkgs, ... }:
 {
   sops.secrets."strukturbot_env" = { };
-  # virtualisation.docker.daemon.settings.dns = [ "141.30.1.1" "141.76.14.1" ];
+  virtualisation.docker.daemon.settings.dns = [ "141.30.1.1" "141.76.14.1" ];
   virtualisation.oci-containers = {
     containers.struktur-bot = {
       image = "struktur-bot";

modules/web/crimecampus.nix

@@ -1,7 +0,0 @@
-{ config, pkgs, ... }:
-let
-  domain = "cc.${config.networking.domain}";
-in
-{
-    services.nginx.virtualHosts."${domain}".root = "/srv/web/regex";
-}

modules/web/default.nix

@@ -1,7 +1,6 @@
 { ... }:
 {
   imports = [
-    ./crimecampus.nix
     ./ifsrde.nix
     ./ese.nix
     ./infoscreen.nix

modules/web/ese.nix

@@ -7,12 +7,14 @@ in
   sops.secrets."directus_env" = { };
   environment.systemPackages = [ pkgs.nodejs_21 ];
   virtualisation.oci-containers = {
+    backend = "docker";
     containers.directus-ese = {
       image = "directus/directus:latest";
       volumes = [
         "/srv/web/directus-ese/uploads:/directus/uploads"
         "/srv/web/directus-ese/database:/directus/database"
       ];
+      ports = [ "127.0.0.1:8055:8055" ];
       extraOptions = [ "--network=host" ];
       environment = {
         "DB_CLIENT" = "pg";
@@ -20,14 +22,6 @@ in
         "DB_PORT" = "5432";
         "DB_DATABASE" = "directus_ese";
         "DB_USER" = "directus_ese";
-        "PUBLIC_URL" = "https://directus-ese.ifsr.de";
-        "AUTH_PROVIDERS"="keycloak";
-        "AUTH_KEYCLOAK_DRIVER" = "openid";
-        "AUTH_KEYCLOAK_CLIENT_ID" = "directus-ese";
-        "AUTH_KEYCLOAK_ISSUER_URL" = "https://sso.ifsr.de/realms/internal/.well-known/openid-configuration";
-        "AUTH_KEYCLOAK_IDENTIFIER_KEY" = "email";
-        "AUTH_KEYCLOAK_ALLOW_PUBLIC_REGISTRATION"="true";
-        "AUTH_KEYCLOAK_DEFAULT_ROLE_ID"="a6b7a1b6-a6fa-442c-87fd-e37c2a16424b";
       };
       environmentFiles = [
         config.sops.secrets."directus_env".path

modules/web/fsrewsp.nix

@@ -58,7 +58,6 @@ in
             include ${pkgs.nginx}/conf/fastcgi_params;
             include ${pkgs.nginx}/conf/fastcgi.conf;
             fastcgi_param SCRIPT_FILENAME $document_root/$fastcgi_script_name;
-            fastcgi_param HTTP_HOST $host;
           '';
         };
         "~ \.log$".return = "403";

modules/web/ifsrde.nix

@@ -60,7 +60,6 @@ in
         "~ ^/cmd(/?[^\\n|\\r]*)$".return = "301 https://pad.ifsr.de$1";
         "/bbb".return = "301 https://bbb.tu-dresden.de/b/fsr-58o-tmf-yy6";
         "/kpp".return = "301 https://kpp.ifsr.de";
-        "/sso".return = "301 https://sso.ifsr.de/realms/internal/account";
         # security
         "~* /(\.git|cache|bin|logs|backup|tests)/.*$".return = "403";
         # deny running scripts inside core system folders
@@ -73,4 +72,9 @@ in
       };
     };
   };
+
+  services.portunus.dex.oidcClients = [{
+    id = "grav";
+    callbackURL = "https://ifsr.de/admin/task:callback.oauth2";
+  }];
 }

modules/web/nightline.nix

@@ -55,7 +55,6 @@ in
             include ${pkgs.nginx}/conf/fastcgi_params;
             include ${pkgs.nginx}/conf/fastcgi.conf;
             fastcgi_param SCRIPT_FILENAME $document_root/$fastcgi_script_name;
-            fastcgi_param HTTP_HOST $host;
           '';
         };
         "~ \.log$".return = "403";

modules/wiki/fsr.nix

@@ -63,12 +63,11 @@ in
         # Auth
         # https://www.mediawiki.org/wiki/Extension:PluggableAuth
         # https://www.mediawiki.org/wiki/Extension:OpenID_Connect
-        $wgOpenIDConnect_MigrateUsersByEmail = true;
         $wgPluggableAuth_EnableLocalLogin = true;
         $wgPluggableAuth_Config["iFSR Login"] = [
           "plugin" => "OpenIDConnect",
           "data" => [
-            "providerURL" => "https://sso.ifsr.de/realms/internal",
+            "providerURL" => "${config.services.portunus.domain}/dex",
             "clientID" => "wiki",
             "clientsecret" => file_get_contents('${config.sops.secrets."mediawiki/oidc_secret".path}'),
           ],
@@ -95,6 +94,11 @@ in
       };
     };
 
+    portunus.dex.oidcClients = [{
+      id = "wiki";
+      callbackURL = "https://${domain}/Spezial:PluggableAuthLogin";
+    }];
+
     nginx = {
       recommendedProxySettings = true;
       virtualHosts.${domain} = {

overlays/default.nix

@@ -1,7 +1,6 @@
 _final: prev:
 let
   inherit (prev) fetchurl;
-  inherit (prev) fetchFromGitHub;
 in
 {
   # AGDSN is running an outdated version that we have to comply to
@@ -12,17 +11,5 @@ in
       sha256 = "sha256-3w+FJezbo4DnS1N8pxrfO3WWWT8CGJtZqw6//IXMyN4=";
     };
   }));
-  # (hopefully) fix systemd journal reading
-  prometheus-postfix-exporter = prev.prometheus-postfix-exporter.overrideAttrs (_old: {
-    patches = [
-      ./prometheus-postfix-exporter/0001-cleanup-also-catch-milter-reject.patch
-    ];
-    src = fetchFromGitHub {
-      owner = "adangel";
-      repo = "postfix_exporter";
-      rev = "414ac12ee63415eede46cb3084d755a6da6fba23";
-      hash = "sha256-m1kVaO3N7XC1vtnxXX9kMiEFPmZuoopRUYgA7gQzP8w=";
-    };
-  });
 
 }

overlays/prometheus-postfix-exporter/0001-cleanup-also-catch-milter-reject.patch

@@ -1,25 +0,0 @@
-From f4c5dd5628c873981b2d6d6b8f3bbf036b9fd724 Mon Sep 17 00:00:00 2001
-From: Rouven Seifert <rouven.seifert@ifsr.de>
-Date: Thu, 2 May 2024 11:20:27 +0200
-Subject: [PATCH] cleanup: also catch milter-reject
-
----
- postfix_exporter.go | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/postfix_exporter.go b/postfix_exporter.go
-index f20d99c..676d767 100644
---- a/postfix_exporter.go
-+++ b/postfix_exporter.go
-@@ -335,6 +335,8 @@ func (e *PostfixExporter) CollectFromLogLine(line string) {
- 				e.cleanupProcesses.Inc()
- 			} else if strings.Contains(remainder, ": reject: ") {
- 				e.cleanupRejects.Inc()
-+			} else if strings.Contains(remainder, ": milter-reject: ") {
-+				e.cleanupRejects.Inc()
- 			} else {
- 				e.addToUnsupportedLine(line, subprocess, level)
- 			}
--- 
-2.44.0
-

secrets/tomate.yaml

@@ -4,7 +4,6 @@ print:
     smtp-password: ENC[AES256_GCM,data:XoaLiEpqAdKapeS9YoBfh2w7HFuTCV9rHIciH+qUbhHcdsgVpnPMsSlC,iv:WxfP5d2K9soJPoRPuS6O6PbNvo4TBQjPGiV0e+a501Q=,tag:ZsTdR+b/oYFAYz/MN73PFg==,type:str]
 sssd:
     env: ENC[AES256_GCM,data:9IbU7uaElmemQHVUvsM88hcyNl3WFehgQeLZPtUxt2Sd0IECm8qNkQhWJ4kuvoBnQsdsUrFm/0QuW7AfDFOeE7FxMxg0,iv:dyzsYHlqClWbfzsoJ36iYjaXWpidB1ZqHXI7RP7js2Y=,tag:97FMOeVwAEy8Ka79uZKC8Q==,type:str]
-ifsr-apb-auth: ENC[AES256_GCM,data:hxJOvRbgjB//YU3wy04P7yrQbV0Ggoi18wQxwy4hHgbXizTHbmlfiZ/MstITrZQ6qEPVBEW41/iGU3DO2Cg2ofpWvFU5Gr8FM1AC9DKq8SppLGqzel1mEejPfrh4RbQUMe0zZlc/YfhCah5sM0oPnBQNg8bPpveEO+5/bRq5S24jkkv7w6/AAS8tGvjALVf/g95jsCrQO2MYg9jCCEkdhORU0bowGD8cjTr6wnPkNhwzn5tiKoPn6eH6TFBkqNC+Q/5E+os10i9F1c3z/sv8Snrcl7V5higqrQekhEvGRDmax/4lE8Yb3AoxC/2M4/+9x+OPi0JUkkhC6rghETXpmYkuaD7E8+eEtLeSbiJPlPijq2HTtbtsHcSoMUdoGO8644TVe/jDxaEe54p9OWEFjRRpONijQKsfH3wENlUXmqDQDLfMSpoANxIHMh+RmRzktGIvTgvs6rlKXsWp7/gggFVxdM/5QPbE3pUvGr+JPWz4,iv:6c1HxYGrItPwKzAnQ0zUvO3TSejVZ/aWF9zs99ufzl4=,tag:fELOskceJWKmkm74MCsfoA==,type:str]
 sops:
     kms: []
     gcp_kms: []
@@ -20,8 +19,8 @@ sops:
             TXVrMHZCNU5zOG5hVnNkdEoxcTZqWXMKA9eG1zM6HeLAAOpIo8Z5+5KD4Z5P3rdc
             kE8sUXHD3d8SMmSKcTYe6gGVzFuw0xxnMb/AmjAQosvDFTQsWy1sTw==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-04-16T08:58:21Z"
+    lastmodified: "2024-01-29T13:36:12Z"
-    mac: ENC[AES256_GCM,data:2aOOVZK7kshJFBWphvW/BqRUXht4p80Q15nGJNA1EbjT05f3tYdrr8QuM5Xd1vJO07rgmokWv4XwbzodRIwqidEXD5xuJ1v+kHC/jJnO3yrBKY7kVMHkia2Wq00bcN/iwdW6G6AP5D4HQbmFNo+rLHyjIVwPvtu9jutKpz12NH0=,iv:YCBX2gSEmiUa6HrHi0VEcRGWDJrXGajD8ZbOZcppFnM=,tag:FK2E4hukl8oL5aZNTCQESA==,type:str]
+    mac: ENC[AES256_GCM,data:CnoH4KmYy72E0L+X7SHYXrFH6z0KhRhfYXmIO8HnPlkYnwKXDeAYezv4kL3ItZG+8pnmbFdoyHxxVMT6rWtV//x16YPMI0zhwIEBs67ZxM+gzeei4fniktolydKmlXUgbtWw3/y3OtxzAn9Dne2LPz7CwN/imGOTgrWFYGWRhtU=,iv:gcurHYWPSijYRlt9FoutrGInWDOfSkjrNqwU6jxiHDk=,tag:qWhpQ9vLuuihOzJeOGYEog==,type:str]
     pgp:
         - created_at: "2024-02-29T15:23:28Z"
           enc: |-