Update flake.lock

{goldman} fix missing network config
Revert "Merge pull request 'Actually use user module' (#191 ) from fix_malobeo_user into master"
2026-10-01 04:02:27 +00:00 · 2026-09-30 16:03:17 +02:00 · 2026-09-30 15:55:31 +02:00 · 2026-09-30 08:28:55 +02:00 · 2026-09-30 08:28:55 +02:00 · 2026-09-30 08:28:55 +02:00
14 changed files with 319 additions and 51 deletions
@@ -29,11 +29,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1768143854,
-        "narHash": "sha256-E5/kyPz4zAZn/lZdvqlF83jMgCWNxmqYjjWuadngCbk=",
+        "lastModified": 1788076475,
+        "narHash": "sha256-sD4UyILWAhk7aexE3YpDOdb71ZEeL+1/+LV05XIWCBo=",
        "owner": "kirelagin",
        "repo": "dns.nix",
-        "rev": "a97cf4156e9f044fe4bed5be531061000dfabb07",
+        "rev": "4710a34f2c36e7a0d634d7ba8fe2499d75f012a2",
        "type": "github"
      },
      "original": {
@@ -78,6 +78,29 @@
        "type": "github"
      }
    },
+    "gatekeeper": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs-unstable"
+        ],
+        "pyproject-build-systems": "pyproject-build-systems",
+        "pyproject-nix": "pyproject-nix",
+        "uv2nix": "uv2nix"
+      },
+      "locked": {
+        "lastModified": 1786463371,
+        "narHash": "sha256-OgyMTerUYMCCRgxF3h0y9bzLa2FJ9m0SwSCtSDzj1Do=",
+        "ref": "refs/heads/master",
+        "rev": "25ecbbf375f9e84c2de2753f2372c63f7207afe1",
+        "revCount": 128,
+        "type": "git",
+        "url": "https://git.dynamicdiscord.de/malobeo/gatekeeper"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://git.dynamicdiscord.de/malobeo/gatekeeper"
+      }
+    },
    "home-manager": {
      "inputs": {
        "nixpkgs": [
@@ -85,11 +108,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1781319724,
-        "narHash": "sha256-ZGuxexEMo4Xv28KJ0dX/m/PHN4oZIOnxHZpNTyrvx4M=",
+        "lastModified": 1790742243,
+        "narHash": "sha256-kaNo6xHiL31AbNNEreG0OTKf4j6Cxlo5bPawjX7lnbQ=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "8355f0a16b2dbb06a97959a918af5b239bbe05ae",
+        "rev": "e5fcd298a00f08b6e8390baf04aa8edb62203070",
        "type": "github"
      },
      "original": {
@@ -126,11 +149,11 @@
        "spectrum": "spectrum"
      },
      "locked": {
-        "lastModified": 1781389237,
-        "narHash": "sha256-Ne1/E5XNUq0gleaQz0vW5R4xf/0h/uEZ+bOW1aNjeQk=",
+        "lastModified": 1790526615,
+        "narHash": "sha256-33a6iTG1uFv12/zV8yo5VvdpftMNQms6TIHhMCVN6zE=",
        "owner": "astro",
        "repo": "microvm.nix",
-        "rev": "6ad601df0a07d9855c5e8f9b81135ecaf7c287eb",
+        "rev": "81f70a2002254f75b572fc34c55e7df16e9bb176",
        "type": "github"
      },
      "original": {
@@ -180,11 +203,11 @@
        "nixpkgs": "nixpkgs_2"
      },
      "locked": {
-        "lastModified": 1781622756,
-        "narHash": "sha256-JrPh4M6S7aPsEE9tOENuZrxC6o2szSLlK+t4+nLke9s=",
+        "lastModified": 1790722812,
+        "narHash": "sha256-XwFt1uLyaBCQU1/nUeGqeBnqNXPVgGRnz20YVYdmF6Y=",
        "owner": "NixOS",
        "repo": "nixos-hardware",
-        "rev": "08018c72174a4df5657f8d94178ac69fb9c243e5",
+        "rev": "06f9ecaea5f64b6ff61cf42cb32f21621c4fa14a",
        "type": "github"
      },
      "original": {
@@ -212,11 +235,11 @@
    },
    "nixpkgs-unstable": {
      "locked": {
-        "lastModified": 1781577229,
-        "narHash": "sha256-lrp67w8AulE9Ks53n27I45ADSzbOCn4H+CNW1Ck8B+8=",
+        "lastModified": 1790689126,
+        "narHash": "sha256-ilerN1WLSvF+HMjziC/Wv99J5y02maDH+6hZPwsORKg=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "567a49d1913ce81ac6e9582e3553dd90a955875f",
+        "rev": "b4fd65b198c599cbe814fcb9f42d25d021595ec9",
        "type": "github"
      },
      "original": {
@@ -228,11 +251,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1767892417,
-        "narHash": "sha256-8bW3q88CEg2u4hSP66Vf4lpbLonHz7hqDNBMcCY7E9U=",
-        "rev": "3497aa5c9457a9d88d71fa93a4a8368816fbeeba",
+        "lastModified": 1789546076,
+        "narHash": "sha256-vWkSk5bbfTqdtMoSgD9FshACO8JCvXTFi+3cqEp0mH0=",
+        "rev": "b1b875982b17dabde9b4a37f3e229e74913e6db3",
        "type": "tarball",
-        "url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre924538.3497aa5c9457/nixexprs.tar.xz"
+        "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1074753.b1b875982b17/nixexprs.tar.xz"
      },
      "original": {
        "type": "tarball",
@@ -241,11 +264,11 @@
    },
    "nixpkgs_3": {
      "locked": {
-        "lastModified": 1781216227,
-        "narHash": "sha256-9mUW6gNwoN2SWc/l0fW4svPNOulXLl8ijqKyeSOGgJE=",
+        "lastModified": 1790750587,
+        "narHash": "sha256-VfjaoJ1Uyb7JZTrBgE5Jf2nhjtQPmD9KOd19HJwmZwM=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "a0374025a863d007d98e3297f6aa46cc3141c2f0",
+        "rev": "78e9c786dc08cd4f3420c2395cd977206a9b1da2",
        "type": "github"
      },
      "original": {
@@ -255,11 +278,62 @@
        "type": "github"
      }
    },
+    "pyproject-build-systems": {
+      "inputs": {
+        "nixpkgs": [
+          "gatekeeper",
+          "nixpkgs"
+        ],
+        "pyproject-nix": [
+          "gatekeeper",
+          "pyproject-nix"
+        ],
+        "uv2nix": [
+          "gatekeeper",
+          "uv2nix"
+        ]
+      },
+      "locked": {
+        "lastModified": 1776659114,
+        "narHash": "sha256-qapCOQmR++yZSY43dzrp3wCrkOTLpod+ONtJWBk6iKU=",
+        "owner": "pyproject-nix",
+        "repo": "build-system-pkgs",
+        "rev": "ffaa2161dd5d63e0e94591f86b54fc239660fb2e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "pyproject-nix",
+        "repo": "build-system-pkgs",
+        "type": "github"
+      }
+    },
+    "pyproject-nix": {
+      "inputs": {
+        "nixpkgs": [
+          "gatekeeper",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1778901413,
+        "narHash": "sha256-GSKXTAnFqRAMlZkJrIPcQMYf+lpMr66K3i60mB9STvc=",
+        "owner": "pyproject-nix",
+        "repo": "pyproject.nix",
+        "rev": "a228447c3e179d477c1b6246ef3efa8cfe3c469a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "pyproject-nix",
+        "repo": "pyproject.nix",
+        "type": "github"
+      }
+    },
    "root": {
      "inputs": {
        "disko": "disko",
        "dns": "dns",
        "ep3-bs": "ep3-bs",
+        "gatekeeper": "gatekeeper",
        "home-manager": "home-manager",
        "mfsync": "mfsync",
        "microvm": "microvm",
@@ -280,11 +354,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1780547341,
-        "narHash": "sha256-Gq8KNx5A7hBB3uGJaj6eQfLDIz5YdLu92gqBcvHvoUo=",
+        "lastModified": 1790498116,
+        "narHash": "sha256-rs9meAYxW3zzrh43yaW7htrqCD+X9+pupDPHN86fumI=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "9ed65852b6257fbeae4355bc24ecfea307ca759a",
+        "rev": "5efb5a6f4f5ab192817d28557dd4d650fa14d866",
        "type": "github"
      },
      "original": {
@@ -296,11 +370,11 @@
    "spectrum": {
      "flake": false,
      "locked": {
-        "lastModified": 1778940603,
-        "narHash": "sha256-voSM8dZNlaOWN3kbYFky+FNY6fFQOEw0xF+ZMpZKkCQ=",
+        "lastModified": 1786032750,
+        "narHash": "sha256-+Ba/kIn5BjvV7PN8bWOo7RoqgTY/Yv2M7qeMf3wS2Ag=",
        "ref": "refs/heads/main",
-        "rev": "367dd227f539267eae2b62770b4c17b88ac8c1f1",
-        "revCount": 1265,
+        "rev": "77d2389874bb092b8dbf05ecc5b1030372e80e98",
+        "revCount": 1417,
        "type": "git",
        "url": "https://spectrum-os.org/git/spectrum"
      },
@@ -461,6 +535,31 @@
        "type": "github"
      }
    },
+    "uv2nix": {
+      "inputs": {
+        "nixpkgs": [
+          "gatekeeper",
+          "nixpkgs"
+        ],
+        "pyproject-nix": [
+          "gatekeeper",
+          "pyproject-nix"
+        ]
+      },
+      "locked": {
+        "lastModified": 1779269674,
+        "narHash": "sha256-P1LHCRdYpdtHAEzuEsNHrI6d9mVPl5a2fyFDZGHNVbI=",
+        "owner": "pyproject-nix",
+        "repo": "uv2nix",
+        "rev": "69aec536f6d1acc415ed2e20299312802aba98c6",
+        "type": "github"
+      },
+      "original": {
+        "owner": "pyproject-nix",
+        "repo": "uv2nix",
+        "type": "github"
+      }
+    },
    "zineshop": {
      "inputs": {
        "nixpkgs": [
@@ -37,6 +37,11 @@
      inputs.nixpkgs.follows = "nixpkgs";
    };

+    gatekeeper = {
+      url = "git+https://git.dynamicdiscord.de/malobeo/gatekeeper";
+      inputs.nixpkgs.follows = "nixpkgs-unstable";
+    };
+
    nixos-generators = {
      url = "github:nix-community/nixos-generators";
      inputs.nixpkgs.follows = "nixpkgs";
@@ -315,14 +315,16 @@ in
      };
    };

-    virtualHosts."www.rm16bleibt.org" = {
+    virtualHosts."rm16bleibt.org" = {
      forceSSL = true;
      enableACME = true;
      locations."/" = {
-        proxyPass = "http://${hosts.malobeo.hosts.wordpress.network.address}:80";
-        recommendedProxySettings = true;
+        proxyPass = "http://${hosts.malobeo.hosts.wordpress.network.address}";
        extraConfig = ''
          proxy_set_header Host $host;
+          proxy_set_header X-Real-IP $remote_addr;
+          proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+          proxy_set_header X-Forwarded-Host $host;
          proxy_set_header X-Forwarded-Port 443;
          proxy_set_header X-Forwarded-Proto https;
        '';
@@ -12,7 +12,7 @@
      ${pkgs.curl}/bin/curl --fail --silent --show-error "https://njal.la/update/?h=cloud.malobeo.org&k="$KEYCLOUD"&auto"
      ${pkgs.curl}/bin/curl --fail --silent --show-error "https://njal.la/update/?h=zines.malobeo.org&k="$KEYZINES"&auto"
      ${pkgs.curl}/bin/curl --fail --silent --show-error "https://njal.la/update/?h=antamap.malobeo.org&k="$KEYANATAMAP"&auto"
-      ${pkgs.curl}/bin/curl --fail --silent --show-error "https://njal.la/update/?h=www.rm16bleibt.org&k="$KEYRM16"&auto"
+      ${pkgs.curl}/bin/curl --fail --silent --show-error "https://njal.la/update/?h=rm16bleibt.org&k="$KEYRM16"&auto"
    '';
    serviceConfig = {
      Type = "oneshot";
@@ -4,6 +4,7 @@ shop_auth: ENC[AES256_GCM,data:0NDIRjmGwlSFls12sCb5OlgyGTCHpPQIjycEJGhYlZsWKhEYX
 njalacloud: ENC[AES256_GCM,data:sp79Ij1vd9pQZuPUR1phmw==,iv:AWKZoOfBA/n16pWQCfA0dZmH1KajCztnLvYItoZZbgA=,tag:BIUrobBoO96pxUz1sjIYIw==,type:str]
 njalazines: ENC[AES256_GCM,data:fnObUEnXYvdj9HtkZNzXVA==,iv:0Zj2n2we9w4fj/n7e1ayd9XgFEMAGCHk4QLTu1IlRnQ=,tag:zeOLAB0oE6XbxqdqhdRNxw==,type:str]
 njalaantamap: ENC[AES256_GCM,data:nUc+E7HNbW0EDclzNDV6+w==,iv:H8nqeuOrvvu8O8QhGWkBkYWAQXwkBehf/jU6u/grs1A=,tag:mqX6jn47DyeSuk8xzG0e/Q==,type:str]
+njalarm16: ENC[AES256_GCM,data:Uo/TBNgyvH7EGSJb7ZQUBw==,iv:YDGjr9w9YceiDGJAtNIAPltxaR5pfpEYswu33WtAiQQ=,tag:PtlbcggOHgb1vIb7KBV0hg==,type:str]
 njala_api_key: ENC[AES256_GCM,data:ohSVzQUvFjia/s9WceqnZCdLyk3N1Lm2BCBmXeBlkWD2dyrohKCnd9GiJ499IORpuYcOXyM=,iv:Uczk8op5mgqe8gefxgU9YuTqOsYvjzHCKvzA7GDsgio=,tag:XA7JRq/LsGkpHcQSO36Whg==,type:str]
 sops:
    age:
@@ -25,8 +26,8 @@ sops:
            SKFx7MXcjFRLKS2Ij12V8ftjL3Uod6be5zoMibkxK19KmXY/514Jww==
            -----END AGE ENCRYPTED FILE-----
          recipient: age1ljpdczmg5ctqyeezn739hv589fwhssjjnuqf7276fqun6kc62v3qmhkd0c
-    lastmodified: "2026-08-28T12:19:14Z"
-    mac: ENC[AES256_GCM,data:TnElCRaL/b238clfFVEq+Ot1lwg5MLMchCkmhi5PmADRn2exA42Zeq5v1M/IM5sHt4xEyFLn5R/88Y49DAfehRFwu6rddV+3lnFV40k2rWRtMfQOUXSrCd7lGxZdFbMU0eIXF5jaATFbcP0wO03FohNA69/u6kNsS0y0jK3vuLQ=,iv:xPeNXUIavVYFfAv1fs5TXCHXmvnXQDs4mJZMHOX7qG8=,tag:85hrBTKMh1ckTtXpOxj5lg==,type:str]
+    lastmodified: "2026-09-14T12:42:34Z"
+    mac: ENC[AES256_GCM,data:cOv94thIsHzpsiYnJAP2R/RZIkkdr+NHQuO5jCMxWssFu5WcWzeXC9mbYe0RAhY0Hx+tUHJsEG5SQqRaudpbGH9aYLC+5jkVaURXSYd5FIv+I8aUrBsZtpVrE7NJwo+S3+PAgpOUCO4w0bBFsmAWvgpEQSWIcndnkZvvwF2GtrU=,iv:pupuBdJsZTLY246yanDPdgDlRm2oOZprERy3uNdY7E4=,tag:9c1IAKpXBb2KhI1N6M7hOA==,type:str]
    pgp:
        - created_at: "2025-02-11T18:32:49Z"
          enc: |-
@@ -0,0 +1,93 @@
+{ config, pkgs, inputs, modulesPath, ... }:
+
+let
+  sshKeys = import ../ssh_keys.nix;
+in
+{
+  networking.hostName = "goldman"; # Define your hostname.
+  nixpkgs.hostPlatform = { system = "aarch64-linux"; };
+  
+  imports =
+    [ 
+      inputs.gatekeeper.nixosModules.gatekeeper
+      ../modules/malobeo_user.nix
+      #inputs.nixos-hardware.nixosModules.raspberry-pi-3
+      (modulesPath + "/profiles/minimal.nix")
+      #(modulesPath + "/installer/sd-card/sd-image.nix")
+    ];
+
+  fileSystems."/" =
+    { device = "/dev/disk/by-label/NIXOS_SD";
+      fsType = "ext4";
+    };
+
+  #Try to reduce size
+  documentation.man.enable = false;
+  documentation.nixos.enable = false;
+
+  services.openssh.enable = true;
+  services.openssh.ports = [ 22 ];
+  services.openssh.settings.PasswordAuthentication = false;
+  services.openssh.settings.PermitRootLogin = "prohibit-password";
+  users.users.root.openssh.authorizedKeys.keys = sshKeys.admins;
+
+  # Use the extlinux boot loader. (NixOS wants to enable GRUB by default)
+  boot.loader.grub.enable = false;
+
+  # Enables the generation of /boot/extlinux/extlinux.conf
+  boot.loader.generic-extlinux-compatible.enable = true;
+
+  networking.dhcpcd.enable = true;
+
+  # Set your time zone.
+  time.timeZone = "Europe/Berlin";
+
+  services.mosquitto = {
+    enable = true;
+    listeners = [{
+      acl = [ "pattern readwrite #" ];
+      omitPasswordAuth = true;
+      settings.allow_anonymous = true;
+    }];
+  };
+
+  services = {
+    gatekeeper = {
+      enable = true;
+      envFile = pkgs.writeText "env" ''
+        MIFARE_APP_MASTER_KEY="7b195adb892073c9e34ebe7e0ca28b2b"
+        MIFARE_ACL_READ_BASE_KEY="741a50f2b189cc9f151e0600f50a6e1a"
+        MIFARE_ACL_WRITE_BASE_KEY="f1aa99f81cca268de98d422ee0ccb65c"
+        SECRET_KEY="8b14d0b447bff7efa24d5019cc59a999786e31f6f865173bbd642bf18de5ad85"
+        MQTT_HOST = "localhost"
+        MQTT_PORT = "1883"
+      '';
+      mock = "False";
+    };
+  };
+
+  environment.systemPackages = with pkgs; [
+    htop
+    wget
+    git
+    pciutils
+    gpio-utils
+    nix-tree
+    lgpio
+  ];
+
+  services.avahi = {
+    enable = true;
+    nssmdns4 = true;
+    publish = {
+      enable = true;
+      addresses = true;
+      userServices = true;
+    };
+  };
+
+  networking.firewall.allowedTCPPorts = [ 80 443 1883];
+
+  system.stateVersion = "23.05";
+}
+
@@ -77,6 +77,17 @@ in
          nameservers = [ "192.168.1.1" "1.1.1.1" ];
        };
      };
+
+      goldman = {
+        type = "rpi";
+        network = {
+          local = true;
+          hostId = "16";
+          address = "192.168.1.106";
+          gateway = "192.168.1.1";
+          nameservers = [ "192.168.1.1" "1.1.1.1" ];
+        };
+      };
  
      durruti = {
        type = "microvm";
@@ -72,7 +72,7 @@ in
          mtu = 1340; #seems to be necessary to proxypass nginx traffic through vpn
          address = [ "${myPeer.address}/24" ];
          autostart = cfg.autostart;
-          dns = [peers.ns1.address];
+          #dns = [peers.ns1.address "1.1.1.1"]; #currently broken, see commit message
          listenPort = mkIf (myPeer.role == "server") myPeer.listenPort;

          # This allows the wireguard server to route your traffic to the internet and hence be like a VPN
@@ -17,6 +17,7 @@ in
    ../modules/sshd.nix
    ../modules/minimal_tools.nix
    ../modules/autoupdate.nix
+    inputs.self.nixosModules.malobeo.vpn
  ];

  networking.firewall = {
@@ -25,6 +26,14 @@ in
    allowedUDPPorts = [ 53 ];
  };

+  sops.defaultSopsFile = ./secrets.yaml;
+  sops.secrets.wg_private = {};
+  services.malobeo.vpn = {
+    enable = true;
+    name = "ns1";
+    privateKeyFile = config.sops.secrets.wg_private.path;
+  };
+
  services.bind = {
    enable = true;
    forwarders = [
@@ -7,11 +7,21 @@ let
 in
 {
  sops.defaultSopsFile = ./secrets.yaml;
+
  sops.secrets = {
    grafana_smtp = {
      owner = "grafana";
      group = "grafana";
    };
+
+    # Contains private targets for blackbox monitoring
+    # It is used below in the blackbox-http-private0 job
+    # More of these can be created such as private1, private2, ...
+    private0_blackbox_config = {
+      owner = "prometheus";
+      group = "prometheus";
+      path = "/var/lib/prometheus2/private0.json";
+    };
  };

  networking = {
@@ -108,6 +118,10 @@ in
    retentionTime = "1y";
    port = 9001;

+    # We have to disable the checks since we use file_sd_configs provided through
+    # sops secrets. These are not available during buildtime which leads to errors during the check
+    checkConfig = false;
+
    exporters.blackbox = {
      enable = true;
      configFile = ./blackbox.yaml;
@@ -133,6 +147,35 @@ in
            "https://zines.malobeo.org"
           ];
        }];
+
+        relabel_configs = [
+          {
+            source_labels = ["__address__"];
+            target_label = "__param_target";
+          }
+          {
+            source_labels = ["__param_target"];
+            target_label = "instance";
+          }
+          {
+            target_label = "__address__";
+            replacement = "127.0.0.1:9115";
+          }
+        ];
+      }
+      {
+        job_name = "blackbox-http-private0";
+        metrics_path = "/probe";
+        params = {
+          module = ["http_2xx"];
+        };
+        file_sd_configs = [
+          {
+            files = [ 
+              config.sops.secrets.private0_blackbox_config.path
+            ];
+          }
+        ];
        relabel_configs = [
          {
            source_labels = ["__address__"];
@@ -1,9 +1,9 @@
 grafana_admin: ENC[AES256_GCM,data:zO7Tfmo=,iv:xa456cUb14VjJPEKClqGJiYR7cSsjQPIld+O2E0YNM8=,tag:dFgGtqMYhg4uweoLZPu48Q==,type:str]
 grafana_smtp: ENC[AES256_GCM,data:xndLMw==,iv:0P4INbDD2/Teo8Dv6lIfLhXvNAkcneEDCeB5OAY25wI=,tag:ilE0Noleb+uL5gqF4bU70w==,type:str]
+private0_blackbox_config: ENC[AES256_GCM,data:Q7Ll0GFtCEgCKsq2rE4/qLZwo4F+8HAkWFDrc0zz7GvWR29q88rm6P3YqiGpuHo5nGoxanJPxV0ucNV4dA9CRuH6kx1B3WONUd97BSjSY0iVjVMtGhBVNdRGl3i9q9+vTsfXT7jEY5kmEQ1uUMjC+3h5r3J6s6JlVAwxdA==,iv:V4nOZYipocrZjZ9L7Kv/QZEftVwu4yIRoiff5H5Gl4M=,tag:5RCh2ra+5sBEbxLe604m8w==,type:str]
 sops:
    age:
-        - recipient: age18jn5mrfs4gqrnv0e2sxsgh3kq4sgxx39hwr8z7mz9kt7wlgaasjqlr88ng
-          enc: |
+        - enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBPMXlEbWlabzVUNlRkVFFC
            ZktpQUx2alRNN01qYmhFYnhMRDBkYmFRdzNnCi9YbjBDUlRhc1kwVjZWY0NGZERQ
@@ -11,8 +11,8 @@ sops:
            eDFDVStZS0o0WVh4cmJPa2o3eWNseGMKc0ydK8/2Gzxe2IYG96saVosJTrRcWizR
            lcMbsh8mKlVCt5Fx9EQOtj50ylOGk2h2Itk4uLYG4UAySDU/Aw3iQw==
            -----END AGE ENCRYPTED FILE-----
-        - recipient: age1ljpdczmg5ctqyeezn739hv589fwhssjjnuqf7276fqun6kc62v3qmhkd0c
-          enc: |
+          recipient: age18jn5mrfs4gqrnv0e2sxsgh3kq4sgxx39hwr8z7mz9kt7wlgaasjqlr88ng
+        - enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB1QmsxNERCclRBeFo0WGZ1
            OGlHTGxDMURsWXdDRXpoUk10S0JpeGk2QURvCjBkaVFHTHo1eGtKbERPWmhNZEpL
@@ -20,8 +20,9 @@ sops:
            QXZwTVd5NnNSdUxRSzNLMHk2SWYxVnMKZyZvZV5qhJj4KATFV2eh9aN9XMbSQL7i
            kRGQI9y5ADv6UsLh/y+rWe0xF4BPOGF0xL8JUnHfTy/RsKfhB3aTYQ==
            -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2026-01-24T17:01:57Z"
-    mac: ENC[AES256_GCM,data:KySo9sJgOLBPtxQZ1gXY8aCmCHbn44aiLKiK1mGziKsBoPkBdEivCT7dDQ1tXQj9wz3gly6raS4FEmR6ikcbtAE2EN86cDLNuu9sSiW2OYiJRe5iZvet2veqtA00K7TtPZgAX+ccsUE5iy0W55bu+kpK3J8MPNy3LUK0EbSKW8I=,iv:7BQKCNyWe4azTelyKlV6XvvgPIrspVbwITyycsW/c44=,tag:1XbSxju44GCKcGw8Ln9iuQ==,type:str]
+          recipient: age1ljpdczmg5ctqyeezn739hv589fwhssjjnuqf7276fqun6kc62v3qmhkd0c
+    lastmodified: "2026-09-21T11:52:54Z"
+    mac: ENC[AES256_GCM,data:rgxYGqsksR8vTznjod8nB9sukqRpHTNuH1hdFCUr7HnE67fojNpz3WzOQvl8Su3JK+8Kj2fe9EodQT9VUkMiSywwSw30M9j3aaXlKj798PEIHDhJBWKhkMrQDyaTMla1Lrp5PuGHDdTQ/vmPNUyeQu3XitfcAma6SdX3e9w1J0s=,iv:Je5Fu9f7NPG/to5t+qOVMV195rwbITPy4JsOjouxiLU=,tag:BhlRWoreptzqYCe29/kXdg==,type:str]
    pgp:
        - created_at: "2026-01-24T17:01:26Z"
          enc: |-
@@ -62,4 +63,4 @@ sops:
            -----END PGP MESSAGE-----
          fp: aef8d6c7e4761fc297cda833df13aebb1011b5d4
    unencrypted_suffix: _unencrypted
-    version: 3.11.0
+    version: 3.13.3
@@ -1,9 +1,9 @@
 grafana_admin: ENC[AES256_GCM,data:c+ZnOyxSXrG4eiK8ETKHheadiSz98LLHYwxb,iv:Ut2qFD2p6OmKDWjLMjFxyISxzTdJpZpgIB7obW5bgkY=,tag:HdayzjXQ1Zc7w9ITLzKLxA==,type:str]
 grafana_smtp: ENC[AES256_GCM,data:gOER9SzqRACIWe3PchyKguX3RdW6xhSZDzLd727CK1w=,iv:KDOyXGYGXnUu92hvt6eBqI8zeKP+JRDsF8Ir5X/9TDk=,tag:wRexcIJp8XEURKcZnHCRtQ==,type:str]
+private0_blackbox_config: ENC[AES256_GCM,data:seiw3jvNucIn8NfmYkOt9hxr17OgmydCzTSOfpmDsdL0sD8ZZ4cty0vO63f+cPzU5uWKDYOwCmFL1Rg+vefJFoXGGIHi0hjd4JNAADW3TJ5YMu91fHoB+0ikQcKsRdD8vAs3PjteohlvjBh3IuhHLcIk6NeE09yqBcHpVHbU0/Q1HUVF7gpO/4LK0V2FmJ3HTiWvo4qZNa3T,iv:OJuiotdqVT8ASeKj4Pa8RLn7TGze2O8ICwVB3BmLybk=,tag:fynrBmQOphqzwprhx0MYlA==,type:str]
 sops:
    age:
-        - recipient: age1ljpdczmg5ctqyeezn739hv589fwhssjjnuqf7276fqun6kc62v3qmhkd0c
-          enc: |
+        - enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBWdVhpdTdJNnh5VCtmNHh5
            M1ZTKzk1WlVYYmRWKzJxd1ZUTi9IMW1ta1VvCjVZQVQ1K1lFeC9QZkI2MGZXNk81
@@ -11,8 +11,8 @@ sops:
            NmRNSit1TkRRbUFQNzUvYThUczAxRzAKvpDK4R7m/GpfOzM4nU5vSYDXZGUy4D+c
            xouTxOguMdId8GiKb1AJnVv2q/YYdr2M9yA/FpKn7kBfuQw/Hrj1rg==
            -----END AGE ENCRYPTED FILE-----
-        - recipient: age1hq75x3dpnfqat9sgtfjf8lep49qvkdgza3xwp7ugft3kd74pdfnqfsmmdn
-          enc: |
+          recipient: age1ljpdczmg5ctqyeezn739hv589fwhssjjnuqf7276fqun6kc62v3qmhkd0c
+        - enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA0bEhCQitwNVpYSHRJOEMr
            ZnZLQ3lELzdtREVpSHVGd3BHZ3p6WU9BK3lFCkFlYXNsa2JWZmZFVjRmK3BTejc1
@@ -20,8 +20,9 @@ sops:
            VnRIYVVIZktISENseEVLVWlsenFhcVkKvj8i349iNX2YNL5G0w7F9IuW/5ZRP6Z7
            XC8TrYzCSOEOXt5nMnZg2yQUJHi6Qq8Wu2e2KV7Cd9J8Q/39dRv2cg==
            -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2026-01-24T16:52:54Z"
-    mac: ENC[AES256_GCM,data:BoJwPldIVZf2NZALbeMTq6DvuBMwOwyvmr5UjsPvQrdbbzYjLTl5dplkhT6QRHPDCFDT4Ibd1UfJ8pQYRkGdO2EjlUyuk3hvAYdR+PUmVz8afFE07sNsGw2EDGVHmsFjUVHLT69YqXtGpVNTW6KjqYuRhz/Ik0wEZLxzDSiy86c=,iv:TQU0si/AYaMpShF4l3CzUN3qajQpE0ZWa7mLOqhRP00=,tag:Oyapkoo4+Q7x08m6RTXfcQ==,type:str]
+          recipient: age1hq75x3dpnfqat9sgtfjf8lep49qvkdgza3xwp7ugft3kd74pdfnqfsmmdn
+    lastmodified: "2026-09-21T11:52:44Z"
+    mac: ENC[AES256_GCM,data:5/3fCS1QFmy4kHDCDklR+EwY/VPcb73pOI+rxDj44qlrR+1aRni97ZxdnvlfERy/Hkgsbk5UIKkj9+xMTcCW6Dqp1/zLf1YIL/xF1JVBIxBCVfNxWeS5XDsC0rORwgGi+BuRT4AuRdg2gu1cPwpbyJifpupNl9sOcaFcoctZ4NU=,iv:d2OQk8AIgHyQDOevKeeXi4sQStJF5KMky2ySwxmJrQs=,tag:KIkBsJlaGze4i43OoiXSVg==,type:str]
    pgp:
        - created_at: "2026-01-24T18:05:47Z"
          enc: |-
@@ -62,4 +63,4 @@ sops:
            -----END PGP MESSAGE-----
          fp: aef8d6c7e4761fc297cda833df13aebb1011b5d4
    unencrypted_suffix: _unencrypted
-    version: 3.11.0
+    version: 3.13.3
@@ -19,7 +19,9 @@ in
    useDHCP = false;
  };

+  disabledModules = [ "services/web-apps/pretalx.nix" ];
  imports = [
+    "${inputs.nixpkgs-unstable}/nixos/modules/services/web-apps/pretalx.nix"
    self.nixosModules.malobeo.metrics
    self.nixosModules.malobeo.users
    ../modules/sshd.nix
@@ -78,6 +80,7 @@ in
      config.sops.secrets.pretalx_smtp.path
    ];
    settings = {
+      redis.session = false;
      locale = {
        language_code = "de";
      };
@@ -80,7 +80,7 @@ in {

  services.nginx = {
    enable = true;
-    virtualHosts."rm16bleibt.org" = {
+    virtualHosts."_" = {
      #serverName = "rm16bleibt.org";
      root = "/var/lib/wordpress/rm16bleibt.org";
      extraConfig = ''
Author	SHA1	Message	Date
malobot	5dfc527315	Update flake.lock Hydra callback / on_pr (pull_request) Successful in 1h7m0s Details Hydra callback / on_push (pull_request) Skipped Details	2026-10-01 04:02:27 +00:00
ahtlon	0270b6ed11	{goldman} fix missing network config Check flake syntax / flake-check (push) Successful in 36m9s Details Hydra callback / on_pr (push) Skipped Details Hydra callback / on_push (push) Skipped Details	2026-09-30 16:03:17 +02:00
ahtlon	02a929a56d	Revert "Merge pull request 'Actually use user module' (#191 ) from fix_malobeo_user into master" This reverts commit `e9c5da2710`, reversing changes made to `3d50e3d00c`. The user.nix module generates hostkeys under /etc/ssh/hostname which breaks sops encryption for legacy	2026-09-30 15:55:31 +02:00
ahtlon	f981d6e7a0	Merge pull request 'add goldman, the rpi that runs gatekeeper' (#165 ) from gatekeeper_raspi into master Hydra callback / on_pr (push) Skipped Details Hydra callback / on_push (push) Skipped Details Check flake syntax / flake-check (push) Failing after 26m33s Details Reviewed-on: #165	2026-09-30 08:28:55 +02:00
ahtlon	5d9ca52386	Add mosquitto	2026-09-30 08:28:55 +02:00
ahtlon	ddc2499722	Update gatekeeper	2026-09-30 08:28:55 +02:00
ahtlon	33eb968705	Fix gatekeeper missing the key	2026-09-30 08:28:55 +02:00
ahtlon	d01d0c4875	fix flake check	2026-09-30 08:28:55 +02:00
ahtlon	c26813c2b8	add goldman, the rpi that runs gatekeeper	2026-09-30 08:28:55 +02:00
ahtlon	e9c5da2710	Merge pull request 'Actually use user module' (#191 ) from fix_malobeo_user into master Hydra callback / on_pr (push) Skipped Details Hydra callback / on_push (push) Skipped Details Check flake syntax / flake-check (push) Failing after 7m15s Details Reviewed-on: #191 Reviewed-by: ahtlon <8+ahtlon@noreply.git.dynamicdiscord.de>	2026-09-29 17:05:50 +02:00
kalipso	50cae2c29b	[nextcloud] fix missing inputs Check flake syntax / flake-check (push) Successful in 9m19s Details Hydra callback / on_push (pull_request) Skipped Details Hydra callback / on_pr (pull_request) Failing after 40s Details	2026-09-22 11:32:40 +02:00
kalipso	c2e3686be1	[refactor] inputs.self -> inputs.malobeo Hydra callback / on_push (pull_request) Skipped Details Hydra callback / on_pr (pull_request) Failing after 41s Details Check flake syntax / flake-check (push) Failing after 3m39s Details if imported in external projects `inputs.self` will point to the external resource instead of malobeo leading to errors. therefore all occurences of inputs.self got replaces with inputs.malobeo	2026-09-22 10:53:42 +02:00
kalipso	a1ba8775f4	[machines] disable deprecated malobeo user Hydra callback / on_push (pull_request) Skipped Details Hydra callback / on_pr (pull_request) Failing after 44s Details Check flake syntax / flake-check (push) Failing after 7m55s Details	2026-09-21 17:24:51 +02:00
kalipso	3d50e3d00c	[overwatch] fix target job name Check flake syntax / flake-check (push) Successful in 12m41s Details	2026-09-21 13:53:16 +02:00
kalipso	2adc19297b	[overwatch] add new blackbox target private0 Hydra callback / on_pr (push) Skipped Details Hydra callback / on_push (push) Skipped Details Check flake syntax / flake-check (push) Failing after 7m18s Details This allows configuring blackbox monitoring of domains provided through sops secrets. If new targets should be added we can add private1, private2, ...	2026-09-21 13:36:03 +02:00
ahtlon	bf77664a3f	Merge pull request 'Automatic Nixpkgs update' (#176 ) from nixpkgs_bump_20260901 into master Hydra callback / on_pr (push) Skipped Details Hydra callback / on_push (push) Skipped Details Check flake syntax / flake-check (push) Failing after 7m13s Details Reviewed-on: #176	2026-09-16 15:09:20 +02:00
ahtlon	00efceadb5	[pretalx] fix eval by pulling service file from unstable	2026-09-16 15:09:20 +02:00
ahtlon	40d90d8ecc	Update again	2026-09-16 15:09:20 +02:00
malobot	144fe5becd	Update flake.lock	2026-09-16 15:09:20 +02:00
kalipso	8b3bcaed14	[fanny] disable wp basic auth Hydra callback / on_pr (push) Skipped Details Hydra callback / on_push (push) Skipped Details Check flake syntax / flake-check (push) Failing after 7m12s Details	2026-09-14 20:09:02 +02:00
kalipso	c0d5244002	[fanny] forward https proto to wp to prevent insecure warnings Hydra callback / on_pr (push) Skipped Details Hydra callback / on_push (push) Skipped Details Check flake syntax / flake-check (push) Failing after 7m23s Details	2026-09-14 20:01:47 +02:00
kalipso	8b0206d19f	[fanny] disable recommended proxy settings for wp Hydra callback / on_push (push) Skipped Details Hydra callback / on_pr (push) Skipped Details Check flake syntax / flake-check (push) Failing after 7m16s Details	2026-09-14 19:40:41 +02:00
kalipso	f8b68f2432	[fanny] add tmp pw - this is not secure Hydra callback / on_pr (push) Skipped Details Hydra callback / on_push (push) Skipped Details Check flake syntax / flake-check (push) Successful in 10m45s Details	2026-09-14 19:10:34 +02:00
kalipso	a4a69c85b8	[fanny] update header, rm wp port Hydra callback / on_pr (push) Skipped Details Hydra callback / on_push (push) Skipped Details Check flake syntax / flake-check (push) Failing after 7m23s Details	2026-09-14 19:08:11 +02:00
kalipso	3226f6cc2c	[wordpress] nginx use virtualHost wildcard Hydra callback / on_pr (push) Skipped Details Hydra callback / on_push (push) Skipped Details Check flake syntax / flake-check (push) Failing after 7m16s Details	2026-09-14 18:57:09 +02:00
kalipso	d60b5b6093	[fanny] try proxy settings Hydra callback / on_pr (push) Skipped Details Hydra callback / on_push (push) Skipped Details Check flake syntax / flake-check (push) Failing after 7m21s Details	2026-09-14 18:44:51 +02:00
kalipso	ca79ed7f98	[fanny] dont forward port/proto for wp Hydra callback / on_pr (push) Skipped Details Hydra callback / on_push (push) Skipped Details Check flake syntax / flake-check (push) Successful in 19m40s Details	2026-09-14 18:23:10 +02:00
kalipso	abaa51335d	[fanny] rm wwww	2026-09-14 17:36:25 +02:00
ahtlon	f5fa620213	[wordpress] remove www Hydra callback / on_push (push) Skipped Details Hydra callback / on_pr (push) Skipped Details Check flake syntax / flake-check (push) Failing after 19m5s Details	2026-09-14 17:13:26 +02:00
ahtlon	b8ef55faea	[wireguard] disable dns for now Hydra callback / on_pr (push) Skipped Details Hydra callback / on_push (push) Skipped Details Check flake syntax / flake-check (push) Failing after 7m28s Details problem is wg-quick sets the systemd-resolve dns domain to ~, which routes all queries over that network and ns1 was not jet connected	2026-09-14 16:41:07 +02:00
ahtlon	3635e27a5a	[ns1] start wireguard on ns1 Hydra callback / on_pr (push) Skipped Details Hydra callback / on_push (push) Skipped Details Check flake syntax / flake-check (push) Failing after 1m50s Details also add fallback dns to all vpn clients	2026-09-14 15:59:16 +02:00
kalipso	48387f85ea	[wordpress] fix virtual host Check flake syntax / flake-check (push) Failing after 1s Details Hydra callback / on_pr (push) Skipped Details Hydra callback / on_push (push) Skipped Details	2026-09-14 15:56:10 +02:00
kalipso	23122047f2	[fanny] update secrets Check flake syntax / flake-check (push) Successful in 24m6s Details	2026-09-14 14:52:10 +02:00
kalipso	44604dbe01	Merge pull request 'wordpress' (#189 ) from wordpress into master Check flake syntax / flake-check (push) Failing after 1s Details Hydra callback / on_pr (push) Skipped Details Hydra callback / on_push (push) Skipped Details	2026-09-14 14:43:48 +02:00