diff --git a/flake.lock b/flake.lock index 90e22b49..6b277103 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1746728054, - "narHash": "sha256-eDoSOhxGEm2PykZFa/x9QG5eTH0MJdiJ9aR00VAofXE=", + "lastModified": 1768920986, + "narHash": "sha256-CNzzBsRhq7gg4BMBuTDObiWDH/rFYHEuDRVOwCcwXw4=", "owner": "nix-community", "repo": "disko", - "rev": "ff442f5d1425feb86344c028298548024f21256d", + "rev": "de5708739256238fb912c62f03988815db89ec9a", "type": "github" }, "original": { @@ -21,6 +21,27 @@ "type": "github" } }, + "dns": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1768143854, + "narHash": "sha256-E5/kyPz4zAZn/lZdvqlF83jMgCWNxmqYjjWuadngCbk=", + "owner": "kirelagin", + "repo": "dns.nix", + "rev": "a97cf4156e9f044fe4bed5be531061000dfabb07", + "type": "github" + }, + "original": { + "owner": "kirelagin", + "repo": "dns.nix", + "type": "github" + } + }, "ep3-bs": { "inputs": { "nixpkgs": [ @@ -43,15 +64,12 @@ } }, "flake-utils": { - "inputs": { - "systems": "systems_3" - }, "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "lastModified": 1614513358, + "narHash": "sha256-LakhOx3S1dRjnh0b5Dg3mbZyH0ToC9I8Y2wKSkBaTzU=", "owner": "numtide", "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "rev": "5466c5bbece17adaab2d82fae80b46e807611bf3", "type": "github" }, "original": { @@ -102,18 +120,17 @@ }, "microvm": { "inputs": { - "flake-utils": "flake-utils", "nixpkgs": [ "nixpkgs" ], "spectrum": "spectrum" }, "locked": { - "lastModified": 1764549796, - "narHash": "sha256-Mswg665P92EoHkBwCwPr/7bdnj04g2Qfb+t02ZEYTHA=", + "lastModified": 1772055583, + "narHash": "sha256-iPIm1orqkhsxqju6EVODOrV1BmyA5HNTZ8a1o812bFM=", "owner": "astro", "repo": "microvm.nix", - "rev": "030d055e877cc13d7525b39f434150226d5e4482", + "rev": "f6dcfb7c16cc3775536c825dc0698d4ede13d063", "type": "github" }, "original": { @@ -145,11 +162,11 @@ ] }, "locked": { - "lastModified": 1764234087, - "narHash": "sha256-NHF7QWa0ZPT8hsJrvijREW3+nifmF2rTXgS2v0tpcEA=", + "lastModified": 1769813415, + "narHash": "sha256-nnVmNNKBi1YiBNPhKclNYDORoHkuKipoz7EtVnXO50A=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "032a1878682fafe829edfcf5fdfad635a2efe748", + "rev": "8946737ff703382fda7623b9fab071d037e897d5", "type": "github" }, "original": { @@ -160,11 +177,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1764440730, - "narHash": "sha256-ZlJTNLUKQRANlLDomuRWLBCH5792x+6XUJ4YdFRjtO4=", + "lastModified": 1771969195, + "narHash": "sha256-qwcDBtrRvJbrrnv1lf/pREQi8t2hWZxVAyeMo7/E9sw=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "9154f4569b6cdfd3c595851a6ba51bfaa472d9f3", + "rev": "41c6b421bdc301b2624486e11905c9af7b8ec68e", "type": "github" }, "original": { @@ -192,11 +209,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1764517877, - "narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=", + "lastModified": 1771848320, + "narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c", + "rev": "2fc6539b481e1d2569f25f8799236694180c0993", "type": "github" }, "original": { @@ -208,11 +225,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1764522689, - "narHash": "sha256-SqUuBFjhl/kpDiVaKLQBoD8TLD+/cTUzzgVFoaHrkqY=", + "lastModified": 1771903837, + "narHash": "sha256-sdaqdnsQCv3iifzxwB22tUwN/fSHoN7j2myFW5EIkGk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8bb5646e0bed5dbd3ab08c7a7cc15b75ab4e1d0f", + "rev": "e764fc9a405871f1f6ca3d1394fb422e0a0c3951", "type": "github" }, "original": { @@ -225,6 +242,7 @@ "root": { "inputs": { "disko": "disko", + "dns": "dns", "ep3-bs": "ep3-bs", "home-manager": "home-manager", "mfsync": "mfsync", @@ -246,11 +264,11 @@ ] }, "locked": { - "lastModified": 1764483358, - "narHash": "sha256-EyyvCzXoHrbL467YSsQBTWWg4sR96MH1sPpKoSOelB4=", + "lastModified": 1772048434, + "narHash": "sha256-/wA0OaH6kZ/pFA+nXR/tvg5oupOmEDmMS5us79JT60o=", "owner": "Mic92", "repo": "sops-nix", - "rev": "5aca6ff67264321d47856a2ed183729271107c9c", + "rev": "334daa7c273dd8bf7a0cd370e4e16022b64e55e9", "type": "github" }, "original": { @@ -335,21 +353,6 @@ "type": "github" } }, - "systems_5": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "tasklist": { "inputs": { "nixpkgs": [ @@ -408,7 +411,7 @@ }, "utils_3": { "inputs": { - "systems": "systems_4" + "systems": "systems_3" }, "locked": { "lastModified": 1731533236, @@ -426,7 +429,7 @@ }, "utils_4": { "inputs": { - "systems": "systems_5" + "systems": "systems_4" }, "locked": { "lastModified": 1731533236, diff --git a/flake.nix b/flake.nix index 90300a61..decbc2c8 100644 --- a/flake.nix +++ b/flake.nix @@ -13,6 +13,11 @@ disko.url = "github:nix-community/disko/latest"; disko.inputs.nixpkgs.follows = "nixpkgs"; + dns = { + url = "github:kirelagin/dns.nix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + utils = { url = "github:numtide/flake-utils"; }; diff --git a/machines/.sops.yaml b/machines/.sops.yaml index ffb8e6b3..dd7e698e 100644 --- a/machines/.sops.yaml +++ b/machines/.sops.yaml @@ -15,6 +15,7 @@ keys: - &machine_fanny age136sz3lzhxf74ryruvq34d4tmmxnezkqkgu6zqa3dm582c22fgejqagrqxk - &machine_nextcloud age1g084sl230x94mkd2wq92s03mw0e8mnpjdjfx9uzaxw6psm8neyzqqwpnqe - &machine_vaultwarden age1zs9puemeevc5kt84w9d2mc5396w0t9p60qxymkpatwvwxunzs5usmxr3an + - &machine_pretalx age1y04q8n7mgk82c87rfddm0u72h0ny6sfzktjsk0cc3gu93kezudfqdp9v9g #this dummy key is used for testing. - &machine_dummy age18jn5mrfs4gqrnv0e2sxsgh3kq4sgxx39hwr8z7mz9kt7wlgaasjqlr88ng creation_rules: @@ -105,6 +106,14 @@ creation_rules: age: - *admin_atlan - *machine_vaultwarden + - path_regex: pretalx/secrets.yaml$ + key_groups: + - pgp: + - *admin_kalipso + - *admin_kalipso_dsktp + age: + - *admin_atlan + - *machine_pretalx - path_regex: .*/secrets/.* key_groups: - pgp: diff --git a/machines/durruti/configuration.nix b/machines/durruti/configuration.nix index e86456ac..f0573d08 100644 --- a/machines/durruti/configuration.nix +++ b/machines/durruti/configuration.nix @@ -29,7 +29,6 @@ with lib; enable = true; enablePromtail = true; logNginx = true; - lokiHost = "10.0.0.14"; }; services.malobeo-tasklist.enable = true; diff --git a/machines/durruti/host_config.nix b/machines/durruti/host_config.nix index 229b2389..46beee96 100644 --- a/machines/durruti/host_config.nix +++ b/machines/durruti/host_config.nix @@ -43,20 +43,6 @@ in }; }; - services.nginx.virtualHosts."cloud.malobeo.org" = { - forceSSL = true; - enableACME= true; - locations."/" = { - proxyPass = "http://10.0.0.10"; - extraConfig = '' - client_max_body_size 10G; - client_body_timeout 3600s; - send_timeout 3600s; - fastcgi_buffers 64 4K; - ''; - }; - }; - services.nginx.virtualHosts."keys.malobeo.org" = { forceSSL = true; enableACME= true; @@ -67,7 +53,6 @@ in }; }; - services.nginx.virtualHosts."grafana.malobeo.org" = { forceSSL = true; enableACME= true; @@ -78,6 +63,16 @@ in }; }; + services.nginx.virtualHosts."events.malobeo.org" = { + forceSSL = true; + enableACME= true; + locations."/" = { + proxyPass = "http://10.0.0.10"; + extraConfig = '' + ''; + }; + }; + services.nginx.virtualHosts."tasklist.malobeo.org" = { forceSSL = true; enableACME= true; @@ -88,24 +83,6 @@ in }; }; - - services.nginx.virtualHosts."zines.malobeo.org" = { - forceSSL = true; - enableACME= true; - locations."/" = { - proxyPass = "http://10.0.0.10"; - extraConfig = '' - client_body_in_file_only clean; - client_body_buffer_size 32K; - - client_max_body_size 500M; - - sendfile on; - send_timeout 300s; - ''; - }; - }; - services.nginx.virtualHosts."status.malobeo.org" = { forceSSL = true; enableACME= true; diff --git a/machines/fanny/configuration.nix b/machines/fanny/configuration.nix index 1617b5bf..f2cc70d8 100644 --- a/machines/fanny/configuration.nix +++ b/machines/fanny/configuration.nix @@ -2,11 +2,13 @@ let sshKeys = import ../ssh_keys.nix; peers = import ../modules/malobeo/peers.nix; + hosts = import ../hosts.nix {}; in { sops.defaultSopsFile = ./secrets.yaml; sops.secrets.wg_private = {}; sops.secrets.shop_auth = {}; + sops.secrets.njala_api_key = {}; imports = [ # Include the results of the hardware scan. @@ -21,6 +23,7 @@ in inputs.self.nixosModules.malobeo.metrics inputs.self.nixosModules.malobeo.users inputs.self.nixosModules.malobeo.backup + ./dyndns.nix ]; virtualisation.vmVariantWithDisko = { @@ -34,7 +37,7 @@ in enable = true; enablePromtail = true; logNginx = true; - lokiHost = "10.0.0.14"; + lokiHost = hosts.malobeo.hosts.overwatch.network.address; }; malobeo.autoUpdate = { @@ -128,7 +131,13 @@ in privateKeyFile = config.sops.secrets.wg_private.path; }; - services.malobeo.microvm.enableHostBridge = true; + services.malobeo.microvm = { + enableHostBridge = true; + interface = "enp1s0"; + gateway = "192.168.1.1"; + address = "192.168.1.103/24"; + }; + services.malobeo.microvm.deployHosts = [ "overwatch" "infradocs" @@ -136,6 +145,7 @@ in "durruti" "zineshop" "vaultwarden" + "pretalx" ]; networking = { @@ -146,7 +156,17 @@ in }; firewall = { - allowedTCPPorts = [ 80 ]; + allowedTCPPorts = [ 80 443 ]; + }; + }; + + security.acme = { + acceptTerms = true; + defaults.email = "malobeo@systemli.org"; + defaults = { + dnsProvider = "njalla"; + credentialsFile = config.sops.secrets.njala_api_key.path; + dnsPropagationCheck = false; }; }; @@ -154,16 +174,34 @@ in enable = true; virtualHosts."docs.malobeo.org" = { locations."/" = { - proxyPass = "http://10.0.0.11:9000"; + proxyPass = "http://${hosts.malobeo.hosts.infradocs.network.address}:9000"; extraConfig = '' proxy_set_header Host $host; ''; }; }; - virtualHosts."cloud.malobeo.org" = { + virtualHosts."cloud.hq.malobeo.org" = { + forceSSL = true; + enableACME = true; + acmeRoot = null; locations."/" = { - proxyPass = "http://10.0.0.13"; + proxyPass = "http://${hosts.malobeo.hosts.nextcloud.network.address}"; + extraConfig = '' + proxy_set_header Host $host; + client_max_body_size ${inputs.self.nixosConfigurations.nextcloud.config.services.nextcloud.maxUploadSize}; + client_body_timeout 3600s; + send_timeout 3600s; + fastcgi_buffers 64 4K; + ''; + }; + }; + + virtualHosts."cloud.malobeo.org" = { + forceSSL = true; + enableACME = true; + locations."/" = { + proxyPass = "http://${hosts.malobeo.hosts.nextcloud.network.address}"; extraConfig = '' proxy_set_header Host $host; client_max_body_size ${inputs.self.nixosConfigurations.nextcloud.config.services.nextcloud.maxUploadSize}; @@ -176,7 +214,7 @@ in virtualHosts."keys.malobeo.org" = { locations."/" = { - proxyPass = "http://10.0.0.16"; + proxyPass = "http://${hosts.malobeo.hosts.vaultwarden.network.address}"; extraConfig = '' proxy_set_header Host $host; ''; @@ -185,7 +223,16 @@ in virtualHosts."grafana.malobeo.org" = { locations."/" = { - proxyPass = "http://10.0.0.14"; + proxyPass = "http://${hosts.malobeo.hosts.overwatch.network.address}"; + extraConfig = '' + proxy_set_header Host $host; + ''; + }; + }; + + virtualHosts."events.malobeo.org" = { + locations."/" = { + proxyPass = "http://${hosts.malobeo.hosts.pretalx.network.address}"; extraConfig = '' proxy_set_header Host $host; ''; @@ -194,19 +241,38 @@ in virtualHosts."tasklist.malobeo.org" = { locations."/" = { - proxyPass = "http://10.0.0.5:8080"; + proxyPass = "http://${hosts.malobeo.hosts.durruti.network.address}:8080"; extraConfig = '' proxy_set_header Host $host; ''; }; }; - virtualHosts."zines.malobeo.org" = { - # created with: nix-shell --packages apacheHttpd --run 'htpasswd -B -c foo.txt malobeo' - # then content of foo.txt put into sops - # basicAuthFile = config.sops.secrets.shop_auth.path; + virtualHosts."zines.hq.malobeo.org" = { + forceSSL = true; + enableACME = true; + acmeRoot = null; locations."/" = { - proxyPass = "http://10.0.0.15:8080"; + proxyPass = "http://${hosts.malobeo.hosts.zineshop.network.address}:8080"; + extraConfig = '' + proxy_set_header Host $host; + + client_body_in_file_only clean; + client_body_buffer_size 32K; + + client_max_body_size 50M; + + sendfile on; + send_timeout 300s; + ''; + }; + }; + + virtualHosts."zines.malobeo.org" = { + forceSSL = true; + enableACME = true; + locations."/" = { + proxyPass = "http://${hosts.malobeo.hosts.zineshop.network.address}:8080"; extraConfig = '' proxy_set_header Host $host; diff --git a/machines/fanny/dummy.yaml b/machines/fanny/dummy.yaml index 1edbe771..77c62bd7 100644 --- a/machines/fanny/dummy.yaml +++ b/machines/fanny/dummy.yaml @@ -1,9 +1,8 @@ wg_private: ENC[AES256_GCM,data:YEmIfgtyHE9msYijva0Ye2w7shVmYBPZ3mcKRF7Cy20xa6yHEUQ0kC2OWnM=,iv:ouK6fHcrxrEtsmiPmtCz9Ca8Ec1algOifrgZSBNHi74=,tag:524e/SQt++hwVyeWruCsLg==,type:str] +njala_api_key: ENC[AES256_GCM,data:uEzx7KeI7ZZP63Igu5vHmuvASVxJai8bezM40UZVobQMr7r6opjnVTc0BPyIGfnG2mx/6Bo=,iv:lch04oGn6bkqtBGVzYlz6B97FGXlGOoxkiT1IplSxm4=,tag:bzXx2jSqFBv1hgJO1r5i+w==,type:str] +njalacloud: ENC[AES256_GCM,data:Xg85D9LMMYd8po8vrpxHZA==,iv:L5Gsm3bX61WW1PAdWswFNrScFoBipS2qDGU7iTubt1U=,tag:M2PCfE1h4IkW/iFq8XeIrA==,type:str] +njalazines: ENC[AES256_GCM,data:ooDRj4HqKVFrgRyzgFGQjg==,iv:9X8r1eY+6FqXv19mO0uMRd5A2tpvtmT11P77t9BQaCk=,tag:4BE55c8x66/UxyTCpCmdUg==,type:str] sops: - kms: [] - gcp_kms: [] - azure_kv: [] - hc_vault: [] age: - recipient: age18jn5mrfs4gqrnv0e2sxsgh3kq4sgxx39hwr8z7mz9kt7wlgaasjqlr88ng enc: | @@ -23,8 +22,8 @@ sops: NjJ5cFdTVS9NZmVWMjcrcHo2WDZEZDgKiDwkuUn90cDmidwYGZBb5qp+4R1HafV0 vMQfjT9GrwB5K/O1GumOmvbzLNhvO2vRZJhfVHzyHLzQK64abQgF5Q== -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-01-19T22:46:09Z" - mac: ENC[AES256_GCM,data:eU3SIqAGrgbO2tz4zH1tgYcif7oe5j+/wmdYl2xXXI+D6IhiKrTJGvzE3rd3ElEpb+Bg0UQId952U2Ut0yPTfxGLtdlbJA66CmhLAksByoJ8lOXUcp/qDyA4yMRSuwYG2v7uF2crvue9fyRfZ7hl7abE/Q7Z2UjOKqhSZC5cO3U=,iv:NmCVvtBWZRzhpr5nMLy+98VuQZWoUms7xFSxq8PMvBA=,tag:UWjA7oqoNWh4wb0myNg7FA==,type:str] + lastmodified: "2026-02-20T19:26:21Z" + mac: ENC[AES256_GCM,data:D8ZOgcDCY+I2rFc6+GSRj53QjnhZP0oz5wPgG2x4dOfVRWYMEgR2pnb/IIF95Dq0XR6ja9PLgw42PfdI1dS7vITb1jW5IExcnkB/Pa/RjB3GFeXPFTV6QCAQcK9cLct6yhB/pPbHdt8qHQt7kddiN162RlMHDyR6BAh4gO0Rf3w=,iv:f1RWrxbqNNUdANDR6V+OFuEYJ2ZLVde+5GTcFmSXYSQ=,tag:IBEdkSEz/w4Rxwb6uSBpTw==,type:str] pgp: - created_at: "2025-01-19T22:45:26Z" enc: |- @@ -65,4 +64,4 @@ sops: -----END PGP MESSAGE----- fp: aef8d6c7e4761fc297cda833df13aebb1011b5d4 unencrypted_suffix: _unencrypted - version: 3.9.2 + version: 3.11.0 diff --git a/machines/fanny/dyndns.nix b/machines/fanny/dyndns.nix new file mode 100644 index 00000000..0e1a9257 --- /dev/null +++ b/machines/fanny/dyndns.nix @@ -0,0 +1,25 @@ +{pkgs, ...}: +{ + sops.secrets.njalacloud = {}; + sops.secrets.njalazines = {}; + systemd.services."dyndns" = { + script = '' + KEYCLOUD=$(cat /run/secrets/njalacloud) + KEYZINES=$(cat /run/secrets/njalazines) + ${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" + ''; + serviceConfig = { + Type = "oneshot"; + User = "root"; + }; + }; + systemd.timers."dyndns" = { + wantedBy = ["timers.target"]; + timerConfig = { + OnBootSec = "100s"; + OnUnitActiveSec = "10m"; + Unit = "dyndns.service"; + }; + }; +} diff --git a/machines/fanny/secrets.yaml b/machines/fanny/secrets.yaml index fba35acc..8aa3e94c 100644 --- a/machines/fanny/secrets.yaml +++ b/machines/fanny/secrets.yaml @@ -1,11 +1,10 @@ wg_private: ENC[AES256_GCM,data:kFuLzZz9lmtUccQUIYiXvJRf7WBg5iCq1xxCiI76J3TaIBELqgbEmUtPR4g=,iv:0S0uzX4OVxQCKDOl1zB6nDo8152oE7ymBWdVkPkKlro=,tag:gg1n1BsnjNPikMBNB60F5Q==,type:str] shop_cleartext: ENC[AES256_GCM,data:sifpX/R6JCcNKgwN2M4Dbflgnfs5CqB8ez5fULPohuFS6k36BLemWzEk,iv:1lRYausj7V/53sfSO9UnJ2OC/Si94JXgIo81Ld74BE8=,tag:5osQU/67bvFeUGA90BSiIA==,type:str] shop_auth: ENC[AES256_GCM,data:0NDIRjmGwlSFls12sCb5OlgyGTCHpPQIjycEJGhYlZsWKhEYXV2u3g1RHMkF8Ny913jarjf0BgwSq5pBD9rgPL9t8X8=,iv:3jgCv/Gg93Mhdm4eYzwF9QrK14QL2bcC4wwSajCA88o=,tag:h8dhMK46hABv9gYW4johkA==,type:str] +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] +njala_api_key: ENC[AES256_GCM,data:ohSVzQUvFjia/s9WceqnZCdLyk3N1Lm2BCBmXeBlkWD2dyrohKCnd9GiJ499IORpuYcOXyM=,iv:Uczk8op5mgqe8gefxgU9YuTqOsYvjzHCKvzA7GDsgio=,tag:XA7JRq/LsGkpHcQSO36Whg==,type:str] sops: - kms: [] - gcp_kms: [] - azure_kv: [] - hc_vault: [] age: - recipient: age136sz3lzhxf74ryruvq34d4tmmxnezkqkgu6zqa3dm582c22fgejqagrqxk enc: | @@ -25,8 +24,8 @@ sops: QVZyNWVOMTh3ejBha21Qb2xCRkFERGMKH9nMQUoS5bGcLUx2T1dOmKd9jshttTrP SKFx7MXcjFRLKS2Ij12V8ftjL3Uod6be5zoMibkxK19KmXY/514Jww== -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-04-14T10:34:55Z" - mac: ENC[AES256_GCM,data:vcDXtTi0bpqhHnL6XanJo+6a8f5LAE628HazDVaNO34Ll3eRyhi95eYGXQDDkVk2WUn9NJ5oCMPltnU82bpLtskzTfQDuXHaPZJq5gtOuMH/bAKrY0dfShrdyx71LkA4AFlcI1P5hchpbyY1FK3iqe4D0miBv+Q8lCMgQMVrfxI=,iv:1lMzH899K0CnEtm16nyq8FL/aCkSYJVoj7HSKCyUnPg=,tag:mEbkmFNg5VZtSKqq80NrCw==,type:str] + lastmodified: "2026-02-20T19:25:05Z" + mac: ENC[AES256_GCM,data:g+bFYqJN1X8F52tpIO60S2WKxLG27ZrP399fsfE6o7rPtIMimZou/4oUo7i+kpNtygEuCr3+suP8TPas4x5zMXhRjnjJuwJwL/NwdciHZU0O3rPJgucCEWqr9OdAtxezDM9c2vv+jzqZxWT9t0fIpB9RxO5oy1pHZs0RCgjAJR4=,iv:v6RdTMeQUxSdjIVNFbx2HtxCsdVgFTQTzMXS5Fj62is=,tag:pLoZMBRIXYElO5rY+xX9zg==,type:str] pgp: - created_at: "2025-02-11T18:32:49Z" enc: |- @@ -67,4 +66,4 @@ sops: -----END PGP MESSAGE----- fp: aef8d6c7e4761fc297cda833df13aebb1011b5d4 unencrypted_suffix: _unencrypted - version: 3.9.4 + version: 3.11.0 diff --git a/machines/hosts.nix b/machines/hosts.nix index 666d14bd..e194ed10 100644 --- a/machines/hosts.nix +++ b/machines/hosts.nix @@ -1,90 +1,112 @@ { ... }: +let + createMaloNet = hostId: mac: { + local = true; + hostId = hostId; + address = "192.168.1.${hostId}"; + gateway = "192.168.1.1"; + nameservers = [ "192.168.1.1" "1.1.1.1" ]; #setting ns1 as nameserver + mac = mac; + }; + + createOffsiteNet = hostId: mac: { + local = false; + hostId = hostId; + address = "10.0.0.${hostId}"; + gateway = "10.0.0.1"; + nameservers = [ "1.1.1.1" ]; + mac = mac; + }; +in { + #TODO: fix local 192.168.1.0/24 addresses they are just palceholders! malobeo = { hosts = { louise = { type = "host"; + network = { + local = true; + hostId = "11"; + address = "192.168.1.101"; + }; }; bakunin = { type = "host"; + network = { + local = true; + hostId = "12"; + address = "192.168.1.102"; + }; }; - + fanny = { type = "host"; + network = { + local = true; + hostId = "13"; + address = "192.168.1.103"; + }; }; - + lucia = { type = "rpi"; + network = { + local = true; + hostId = "15"; + address = "192.168.1.105"; + }; }; - + durruti = { type = "microvm"; - network = { - address = "10.0.0.5"; - mac = "52:DA:0D:F9:EF:F9"; - }; + network = createMaloNet "5" "52:DA:0D:F9:EF:F9"; }; - + vpn = { type = "microvm"; - network = { - address = "10.0.0.10"; - mac = "D0:E5:CA:F0:D7:E6"; - }; + network = createOffsiteNet "10" "52:DA:0D:F9:EF:E6"; }; - + infradocs = { type = "microvm"; - network = { - address = "10.0.0.11"; - mac = "D0:E5:CA:F0:D7:E7"; - }; + network = createMaloNet "11" "52:DA:0D:F9:EF:E7"; }; - + uptimekuma = { type = "microvm"; - network = { - address = "10.0.0.12"; - mac = "D0:E5:CA:F0:D7:E8"; - }; + network = createOffsiteNet "12" "52:DA:0D:F9:EF:E8"; }; - + nextcloud = { type = "microvm"; - network = { - address = "10.0.0.13"; - mac = "D0:E5:CA:F0:D7:E9"; - }; + network = createMaloNet "13" "52:DA:0D:F9:EF:E9"; }; - + overwatch = { type = "microvm"; - network = { - address = "10.0.0.14"; - mac = "D0:E5:CA:F0:D7:E0"; - }; + network = createMaloNet "14" "52:DA:0D:F9:EF:E0"; }; - + zineshop = { type = "microvm"; - network = { - address = "10.0.0.15"; - mac = "D0:E5:CA:F0:D7:F1"; - }; + network = createMaloNet "15" "52:DA:0D:F9:EF:F1"; }; vaultwarden = { type = "microvm"; - network = { - address = "10.0.0.16"; - mac = "D0:E5:CA:F0:D7:F2"; - }; + network = createMaloNet "16" "D0:E5:CA:F0:D7:F2"; }; - testvm = { - type = "host"; + ns1 = { + type = "microvm"; + network = createMaloNet "17" "52:DA:0D:F9:EF:F3"; + }; + + pretalx = { + type = "microvm"; + network = createMaloNet "18" "52:DA:0D:F9:EF:F4"; }; }; }; diff --git a/machines/infradocs/configuration.nix b/machines/infradocs/configuration.nix index d1cc2fae..7064a96e 100644 --- a/machines/infradocs/configuration.nix +++ b/machines/infradocs/configuration.nix @@ -19,7 +19,6 @@ with lib; enable = true; enablePromtail = true; logNginx = true; - lokiHost = "10.0.0.14"; }; system.stateVersion = "22.11"; # Did you read the comment? diff --git a/machines/louise/configuration.nix b/machines/louise/configuration.nix index 52158797..73c375bf 100644 --- a/machines/louise/configuration.nix +++ b/machines/louise/configuration.nix @@ -42,6 +42,7 @@ mpv vlc simple-scan + bitwarden-desktop ]; }; diff --git a/machines/modules/host_builder.nix b/machines/modules/host_builder.nix index 14fac786..2460343e 100644 --- a/machines/modules/host_builder.nix +++ b/machines/modules/host_builder.nix @@ -43,7 +43,7 @@ rec { ]; defaultModules = baseModules; - makeMicroVM = hostName: ipv4Addr: macAddr: modules: [ + makeMicroVM = hostName: network: modules: [ { microvm = { hypervisor = "cloud-hypervisor"; @@ -83,7 +83,7 @@ rec { { type = "tap"; id = "vm-${hostName}"; - mac = "${macAddr}"; + mac = "${network.mac}"; } ]; }; @@ -93,9 +93,9 @@ rec { systemd.network.networks."20-lan" = { matchConfig.Type = "ether"; networkConfig = { - Address = [ "${ipv4Addr}/24" ]; - Gateway = "10.0.0.1"; - DNS = ["1.1.1.1"]; + Address = [ "${network.address}/24" ]; + Gateway = "${network.gateway}"; + DNS = network.nameservers; DHCP = "no"; }; }; @@ -165,6 +165,16 @@ rec { }); }; + systemd.network.networks."20-lan" = pkgs.lib.mkForce { + matchConfig.Type = "ether"; + networkConfig = { + Address = [ "10.0.0.${hosts.malobeo.hosts.${hostname}.network.hostId}/24" ]; + Gateway = "10.0.0.1"; + DNS = [ "1.1.1.1" ]; + DHCP = "no"; + }; + }; + boot.isContainer = pkgs.lib.mkForce false; services.timesyncd.enable = false; users.users.root.password = ""; @@ -210,8 +220,7 @@ rec { specialArgs.self = self; config = { imports = (makeMicroVM "${name}" - "${hosts.malobeo.hosts.${name}.network.address}" - "${hosts.malobeo.hosts.${name}.network.mac}" [ + hosts.malobeo.hosts.${name}.network [ ../${name}/configuration.nix (vmMicroVMOverwrites name { withNetworking = true; @@ -250,7 +259,7 @@ rec { modules = (if (settings.type != "microvm") then defaultModules ++ [ ../${host}/configuration.nix ] else - makeMicroVM "${host}" "${settings.network.address}" "${settings.network.mac}" [ + makeMicroVM "${host}" settings.network [ inputs.microvm.nixosModules.microvm ../${host}/configuration.nix ]); diff --git a/machines/modules/malobeo/metrics.nix b/machines/modules/malobeo/metrics.nix index c5f320b4..9c74b102 100644 --- a/machines/modules/malobeo/metrics.nix +++ b/machines/modules/malobeo/metrics.nix @@ -1,6 +1,7 @@ { config, lib, pkgs, ... }: let cfg = config.malobeo.metrics; + hosts = import ../../hosts.nix {}; in { options.malobeo.metrics = { @@ -21,7 +22,7 @@ in }; lokiHost = lib.mkOption { type = lib.types.str; - default = "10.0.0.14"; + default = hosts.malobeo.hosts.overwatch.network.address; description = "Address of loki host"; }; }; diff --git a/machines/modules/malobeo/microvm_host.nix b/machines/modules/malobeo/microvm_host.nix index b11881a5..805255e5 100644 --- a/machines/modules/malobeo/microvm_host.nix +++ b/machines/modules/malobeo/microvm_host.nix @@ -14,6 +14,32 @@ in description = lib.mdDoc "Setup bridge device for microvms."; }; + testHost = mkOption { + default = false; + type = types.bool; + description = lib.mdDoc "Enable when the host is used for development and testing using run-vm"; + }; + + interface = mkOption { + default = "eno1"; + type = types.str; + }; + + gateway = mkOption { + default = "10.0.0.1"; + type = types.str; + }; + + address = mkOption { + default = "10.0.0.1/24"; + type = types.str; + }; + + dns = mkOption { + default = [ "1.1.1.1" ]; + type = types.listOf types.str; + }; + enableHostBridgeUnstable = mkOption { default = false; type = types.bool; @@ -47,14 +73,31 @@ in systemd.network = mkIf (cfg.enableHostBridge || cfg.enableHostBridgeUnstable) { enable = true; - # create a bride device that all the microvms will be connected to - netdevs."10-microvm".netdevConfig = { - Kind = "bridge"; - Name = "microvm"; + networks."10-lan" = { + matchConfig.Name = ["vm-*"] ++ (if !cfg.testHost then [ "${cfg.interface}" ] else [ ]); + networkConfig = { + Bridge = "malobeo0"; + }; }; - - networks."10-microvm" = { - matchConfig.Name = "microvm"; + + netdevs."malobeo0" = { + netdevConfig = { + Name = "malobeo0"; + Kind = "bridge"; + }; + }; + + networks."10-lan-bridge" = if !cfg.testHost then { + matchConfig.Name = "malobeo0"; + networkConfig = { + Address = [ "${cfg.address}" ]; + Gateway = "${cfg.gateway}"; + DNS = cfg.dns; + IPv6AcceptRA = true; + }; + linkConfig.RequiredForOnline = "routable"; + } else { + matchConfig.Name = "malobeo0"; networkConfig = { DHCPServer = true; IPv6SendRA = true; @@ -65,12 +108,6 @@ in { Address = "10.0.0.1/24"; } ]; }; - - # connect the vms to the bridge - networks."11-microvm" = { - matchConfig.Name = "vm-*"; - networkConfig.Bridge = "microvm"; - }; }; microvm.vms = @@ -81,7 +118,7 @@ in # under nixosConfigurations flake = inputs.malobeo; # Specify from where to let `microvm -u` update later on - updateFlake = "git+https://git.dynamicdiscord.de/kalipso/infrastructure"; + updateFlake = "git+https://git.dynamicdiscord.de/malobeo/infrastructure"; }; }; in builtins.listToAttrs (map mapperFunc cfg.deployHosts); diff --git a/machines/modules/malobeo/zones.nix b/machines/modules/malobeo/zones.nix new file mode 100644 index 00000000..218ae79b --- /dev/null +++ b/machines/modules/malobeo/zones.nix @@ -0,0 +1,41 @@ +{ inputs }: + +let + vpnNS = "vpn"; + localNS = "hq"; + peers = import ./peers.nix; + hosts = ((import ../../hosts.nix ) {}).malobeo.hosts; + +in +{ + SOA = { + nameServer = "ns1"; + adminEmail = "admin@malobeo.org"; + serial = 2019030801; + }; + useOrigin = false; + + NS = [ + "ns1.malobeo.org." + ]; + + subdomains = { + ns1 = { + A = [ hosts.ns1.network.address ]; + }; + + ${localNS} = { + A = [ hosts.fanny.network.address ]; + subdomains = builtins.mapAttrs (name: value: if value.network.local == true then { + A = [ value.network.address ]; + } else {}) hosts; + }; + + ${vpnNS} = { + A = [ peers.vpn.address ]; + subdomains = builtins.mapAttrs (name: value: if value.role != "server" then { + A = [ value.address ]; + } else {}) peers; + }; + }; +} diff --git a/machines/nextcloud/configuration.nix b/machines/nextcloud/configuration.nix index baccf2a0..1929f053 100644 --- a/machines/nextcloud/configuration.nix +++ b/machines/nextcloud/configuration.nix @@ -2,6 +2,9 @@ with lib; +let + hosts = import ../hosts.nix {}; +in { sops.defaultSopsFile = ./secrets.yaml; sops.secrets = { @@ -28,7 +31,6 @@ with lib; enable = true; enablePromtail = true; logNginx = true; - lokiHost = "10.0.0.14"; }; services.postgresqlBackup = { @@ -59,8 +61,8 @@ with lib; }; }; settings = { - trusted_domains = ["10.0.0.13"]; - trusted_proxies = [ "10.0.0.1" ]; + trusted_domains = [ "cloud.malobeo.org" "cloud.hq.malobeo.org" ]; + trusted_proxies = [ hosts.malobeo.hosts.fanny.network.address ]; "maintenance_window_start" = "1"; "default_phone_region" = "DE"; }; diff --git a/machines/ns1/configuration.nix b/machines/ns1/configuration.nix new file mode 100644 index 00000000..7721eea0 --- /dev/null +++ b/machines/ns1/configuration.nix @@ -0,0 +1,52 @@ +{ config, self, lib, inputs, pkgs, ... }: + +with lib; +with inputs; + +let + dns = inputs.dns; +in +{ + networking = { + hostName = mkDefault "ns1"; + useDHCP = false; + }; + + imports = [ + ../modules/malobeo_user.nix + ../modules/sshd.nix + ../modules/minimal_tools.nix + ../modules/autoupdate.nix + ]; + + networking.firewall = { + enable = true; + allowedTCPPorts = [ 53 ]; + allowedUDPPorts = [ 53 ]; + }; + + services.bind = { + enable = true; + forwarders = [ + "1.1.1.1" + "1.0.0.1" + ]; + + cacheNetworks = [ + "127.0.0.0/24" + "10.0.0.0/24" + "192.168.1.0/24" + "10.100.0.0/24" + ]; + + zones = { + "malobeo.org" = { + master = true; + file = pkgs.writeText "zone-malobeo.org" (dns.lib.toString "malobeo.org" (import ../modules/malobeo/zones.nix { inherit inputs; })); + }; + }; + }; + + system.stateVersion = "22.11"; # Did you read the comment? +} + diff --git a/machines/overwatch/configuration.nix b/machines/overwatch/configuration.nix index 62847ab2..06cac148 100644 --- a/machines/overwatch/configuration.nix +++ b/machines/overwatch/configuration.nix @@ -2,6 +2,9 @@ with lib; +let + hosts = import ../hosts.nix {}; +in { sops.defaultSopsFile = ./secrets.yaml; sops.secrets = { @@ -29,7 +32,6 @@ with lib; enable = true; enablePromtail = true; logNginx = false; - lokiHost = "10.0.0.14"; }; services.grafana = { @@ -121,31 +123,43 @@ with lib; { job_name = "durruti"; static_configs = [{ - targets = [ "10.0.0.5:9002" ]; + targets = [ "${hosts.malobeo.hosts.durruti.network.address}:9002" ]; }]; } { job_name = "infradocs"; static_configs = [{ - targets = [ "10.0.0.11:9002" ]; + targets = [ "${hosts.malobeo.hosts.infradocs.network.address}:9002" ]; }]; } { job_name = "nextcloud"; static_configs = [{ - targets = [ "10.0.0.13:9002" ]; + targets = [ "${hosts.malobeo.hosts.nextcloud.network.address}:9002" ]; }]; } { job_name = "zineshop"; static_configs = [{ - targets = [ "10.0.0.15:9002" ]; + targets = [ "${hosts.malobeo.hosts.zineshop.network.address}:9002" ]; + }]; + } + { + job_name = "vaultwarden"; + static_configs = [{ + targets = [ "${hosts.malobeo.hosts.vaultwarden.network.address}:9002" ]; + }]; + } + { + job_name = "pretalx"; + static_configs = [{ + targets = [ "${hosts.malobeo.hosts.pretalx.network.address}:9002" ]; }]; } { job_name = "fanny"; static_configs = [{ - targets = [ "10.0.0.1:9002" ]; + targets = [ "${hosts.malobeo.hosts.fanny.network.address}:9002" ]; }]; } # add vpn - check how to reach it first. most probably 10.100.0.1 diff --git a/machines/overwatch/dashboards/node_full.json b/machines/overwatch/dashboards/node_full.json index 7f19c9f1..75776f63 100644 --- a/machines/overwatch/dashboards/node_full.json +++ b/machines/overwatch/dashboards/node_full.json @@ -23750,8 +23750,8 @@ }, { "current": { - "text": "10.0.0.13:9002", - "value": "10.0.0.13:9002" + "text": "192.168.1.13:9002", + "value": "192.168.1.13:9002" }, "datasource": { "type": "prometheus", diff --git a/machines/overwatch/promtail.yaml b/machines/overwatch/promtail.yaml index 8030572f..2d42cbb0 100644 --- a/machines/overwatch/promtail.yaml +++ b/machines/overwatch/promtail.yaml @@ -6,7 +6,7 @@ positions: filename: /tmp/positions.yaml clients: - - url: http://10.0.0.13:3100/loki/api/v1/push + - url: http://192.168.1.13:3100/loki/api/v1/push scrape_configs: diff --git a/machines/pretalx/configuration.nix b/machines/pretalx/configuration.nix new file mode 100644 index 00000000..59f39d9b --- /dev/null +++ b/machines/pretalx/configuration.nix @@ -0,0 +1,99 @@ +{ config, self, lib, pkgs, ... }: + +with lib; + +let + hosts = import ../hosts.nix {}; +in +{ + sops.defaultSopsFile = ./secrets.yaml; + sops.secrets = { + pretalx_smtp = { + owner = "pretalx"; + group = "pretalx"; + }; + }; + + networking = { + hostName = mkDefault "pretalx"; + useDHCP = false; + }; + + imports = [ + self.nixosModules.malobeo.metrics + self.nixosModules.malobeo.users + ../modules/sshd.nix + ../modules/minimal_tools.nix + ../modules/autoupdate.nix + ]; + + malobeo.metrics = { + enable = true; + enablePromtail = true; + logNginx = true; + }; + + malobeo.users = { + admin = true; + }; + + + services.postgresqlBackup = { + enable = true; + }; + + services.nginx = { + enable = true; + commonHttpConfig = /* nginx */ '' + proxy_headers_hash_bucket_size 64; + ''; + virtualHosts = { + "events.malobeo.org" = { + forceSSL = false; + enableACME = false; + }; + }; + }; + + + services.pretalx = { + enable = true; + celery.extraArgs = [ + "--concurrency=${toString config.microvm.vcpu}" + ]; + gunicorn.extraArgs = [ + # https://docs.pretalx.org/administrator/installation/#step-6-starting-pretalx-as-a-service + "--log-level=info" + "--max-requests-jitter=50" + "--max-requests=1200" + "--workers=${toString config.microvm.vcpu}" + + # TODO: 25.11 upstream + "--name=pretalx" + "--preload" + ]; + nginx.domain = "events.malobeo.org"; + environmentFiles = [ + config.sops.secrets.pretalx_smtp.path + ]; + settings = { + locale = { + language_code = "de"; + }; + mail = { + from = "malobot@systemli.org"; + user = "malobot@systemli.org"; + host = "mail.systemli.org"; + port = "465"; + ssl = true; + tls = false; + }; + + }; + }; + + networking.firewall.allowedTCPPorts = [ 80 443 ]; + + system.stateVersion = "22.11"; # Did you read the comment? +} + diff --git a/machines/pretalx/dummy.yaml b/machines/pretalx/dummy.yaml new file mode 100644 index 00000000..c133f3aa --- /dev/null +++ b/machines/pretalx/dummy.yaml @@ -0,0 +1,64 @@ +pretalx_smtp: ENC[AES256_GCM,data:zYnhuulpJAEEacXxpqNG2GEVrV21H0UZfx3sqZaZxWYL2HW6WwFMZ2PeGL8bWCv92+iZ2DGkhg==,iv:kMJLfeQ+9ZZFc6T+HnS64p9BJUy38nXrakAOXdQ0gIU=,tag:l8/eSrcOtt9MLnqcif5v2A==,type:str] +sops: + age: + - recipient: age18jn5mrfs4gqrnv0e2sxsgh3kq4sgxx39hwr8z7mz9kt7wlgaasjqlr88ng + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBNZXExRE14NDF6cnFRSE9G + RjdxV09UMXUvczBQai9GQW5PT2g0eUZhSUVvClRZL1dJVlpKUTArTkhhR2JCV1VG + cktFb21wNDZiZC9oc2l5VS9hdzVhbFUKLS0tIGZZa2Z2R0Nvd3RUbWRHMkFJMjVK + QXdRdkVwSFg2TVRBYU1qWFJ2bE9hWFUK8HuJ9ErFU0yH3QlXl1tnmawNX0fHDOFb + g+DpDYKccGcC6PxNOE/CsftJqGLtFlToYHOYWG18bFjNZawUoaOfLQ== + -----END AGE ENCRYPTED FILE----- + - recipient: age1ljpdczmg5ctqyeezn739hv589fwhssjjnuqf7276fqun6kc62v3qmhkd0c + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA3S0s4UlZuSWc3K3cvTDBR + WEt2L3hYSGRVWHBYbEtoci9rYkJEK1hYSkRZCkM5S25YNGM2Y3R0MG9lWUNJem9P + bnJXbTRFZUpUVmhWVVVqeVhjdDV2SWMKLS0tIEdXbXU0RkJ6ZzBTcTdiZlJPbG83 + RW8zUzBkNjViYnVFY3MyM1ZENmZXVmcK4144dF921EuNaofNhaYw9Yh56KHdfQD/ + vxPkp5jC02Wbb6hjImd+oMUg3jgCbWC4j3Qpvaky8Ig2AaJRhtqlxg== + -----END AGE ENCRYPTED FILE----- + lastmodified: "2026-03-09T11:58:41Z" + mac: ENC[AES256_GCM,data:n11H0rFtXvCeleTKXnQ8tORm3YH11tvjRd/PYSRof8EIUpQ7ZtyVqdYqPZCUuck12LG8hh9+GBBpXIRDhwEJlteC61Vl0syW9bQvCbfETvIgRZsoIZr+mofYHe1twm73sd7YaGzC6xxVm5HZG/qS1LflHah6jFO6NkgQ0GpLPTE=,iv:np3bKJIbVwn96rMBeedLmw6f1him35waUWN6LJ5MLNk=,tag:fs8rmrSkK1REaUKJHxeSbw==,type:str] + pgp: + - created_at: "2026-03-09T11:58:34Z" + enc: |- + -----BEGIN PGP MESSAGE----- + + hQGMA5HdvEwzh/H7AQv/VMIZlsBZPEolTd0yUfHyZ5PRsQDirt4hOuVFGXdKi8tb + Pk+L3y69ynfF+ZJsu41+GdVgaNX58bbdqJfnEgE+k35IrJxYmVlNuUmd5s79rOHQ + b1dn6SdoVrKTAgtrnicO0n0F41XZBSpqP4wKVHigsWgfHkaUUsI+5d/T/2F+VCcS + slhvveCMKNjDlK9sukp5TBiX+xrWTq4QIbMS7L6VSlwHod72bp73o7RV9PgoO4vy + aodYiPmJqDjF0Az7JXdu2UdWJGUYxNWb5jHCT3qpcZyX1kVSmZvcRjxtVVCySFx+ + agcavtdlEV3t8JOOvVmYoxwNOGjDvJ83k6wdueFpoJFE4Z1pHy/XCVCHykmWH/+m + nYADzmg+GiOSrTR2xWEmkesrByOMucYiZngDV3RLuZraE+8PJbqX2aAAip1Ol6AX + eYGCtLw/cXvDM1ngdj/4vaelek/TMLRRmuDyzVHevnqMGhdgAp4Ns6+ihZajSYkK + 4YqUSKOMHrfEwbZgGYGW0lgB4cv1uzPgyufcPWzg8oAS0/2jW6KjZPLIx4SYcp41 + C3BE/osbnyzGhzmabNstFbVmBYF1iK73O/Np2PGj3glBsE7PNMmcDu4ASaEI1nNw + CpOmQCR9jRGi + =6itD + -----END PGP MESSAGE----- + fp: c4639370c41133a738f643a591ddbc4c3387f1fb + - created_at: "2026-03-09T11:58:34Z" + enc: |- + -----BEGIN PGP MESSAGE----- + + hQIMA98TrrsQEbXUAQ//aQNOD855rikMtrXENG/XA5dZeKGaLQAv0kWUHuJbRddn + IB9pW+Y8AgyB6xc9A4oKOKgjT8TCSYvGI6zDchf5tjrvQwmiMlpQouflcjR+UgDy + mANqL2+7GLFVcTuQfRPbEdK54Q78KciQ2bxMeh0WDZ5vV8fCTz+aPsvlNT8AJBcq + BO4dyG1oqCT13ln7g7LoHPn22wAj+H93F8aqyFk6YjgomKRf0j9gAW/NI1w8TIsg + etgMBrn0AupANrADQHAij1zSS+GaK8ZMBVgCoInc9gAQl97ytMLp/eQj4Ll69r+z + JRhFdFDZgP0UIIFurAU5eFixNq8IZnFYvFRGpR/XzAiOh8JfgWUDs5HSLyRcADi9 + XxLsEnTFm1kfoI+lpma0WtlAIXg2WpCoaU3B2kB15T4giVs6LWGmssux5t8uKTFR + DySHvdl9o78zBFPVxhW+j9h04fAeUmCWZYKpnEdFwKpBmGWtnC5rvz22Xwu3Q/wT + HioLzvETqVn+knc/ErR6Axw4A9zeLi1AccJdceVopR7rEq+0DjpLV/zYqwGruQaa + q1qtQIgPf888TKtNgAGSxQ2nUfkMM2oK2cC6r2juhxwbmTFcz6FUV41To9/hCo1c + 1SE4ZiRu7R8i+KFn4K2y6RGRkJo75trJkxuwGvAYuo6gGUmj50EeimFx0rKRddfS + WAH8JPQH6ohAqaA1hdrQRM7lPtwjPCfJW/fUqPHAR5Ytwn9xmt0A+jQYvmubH9dR + UT8OMUOIh2XC2JDYt4P4pFXXODB6WPb3Fdft6S95+vLhx6eHuo7PvVM= + =KkYj + -----END PGP MESSAGE----- + fp: aef8d6c7e4761fc297cda833df13aebb1011b5d4 + unencrypted_suffix: _unencrypted + version: 3.11.0 diff --git a/machines/pretalx/secrets.yaml b/machines/pretalx/secrets.yaml new file mode 100644 index 00000000..2ebf65b1 --- /dev/null +++ b/machines/pretalx/secrets.yaml @@ -0,0 +1,64 @@ +pretalx_smtp: ENC[AES256_GCM,data:Jrgx1/AsgTb1KxtgiTPGRkgtl5EHPWHPde4ItwOHH9lcmakAb1b2n4JP70vF53uuKIfiyCPeVQ==,iv:fcVFgjKSGTaFxC1DAX2Sb6WD/IbJO0s1A63wrQkLWbg=,tag:NjcNwa+6h/boRemEg1j9ng==,type:str] +sops: + age: + - recipient: age1ljpdczmg5ctqyeezn739hv589fwhssjjnuqf7276fqun6kc62v3qmhkd0c + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBxb1dGalUyNzVtYjFFNm9T + a3ord2NSTEE3UkhrTm1TbHdMV3lITHJRLzJvCnAxeUZib0d0dCtUZ0x3NUtsdzdD + SjVYY0Y4MXhGRVZGZTRiNHJHSHNkb0kKLS0tIGtCL0puTDRZcUsrc2VRUU1URERs + Y084Z0tGR3JPZkw5ci9icFVSd051bE0KXaT1mPUBFUorZ/zgYjDyqWGbnHAkcjmZ + KVZJae9HC35+mq9mme7XOH96NX6tq69Hg+TUFoQg1m2Ifz27GKD3bQ== + -----END AGE ENCRYPTED FILE----- + - recipient: age1y04q8n7mgk82c87rfddm0u72h0ny6sfzktjsk0cc3gu93kezudfqdp9v9g + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBWVVJyZFZCTVZhUXN0WFJu + UWU2UWxTY3ErWHVhMGNGU0t3N0c2ekM5a0NvCkVtTDdyeEVMQzY5RUg1NnVZVHd1 + a1U4cytPSjU3K0NaSmJDdk5peHM5emMKLS0tIGhTemxzbjBzNkFILy9QRG53V0lX + dEZTQVpCOUNDSW0yRS9rYkZkVjZPRG8K/Hea01veMQ0Gxo//24PRhDcncYUuExpQ + T4ff4CNXF2vDYDsSIPDlhHdmSRGmoCw00ChCZ8vvIlHl2O86Qmd0Ng== + -----END AGE ENCRYPTED FILE----- + lastmodified: "2026-03-09T11:58:07Z" + mac: ENC[AES256_GCM,data:QWFdEg+I1YUH65qPUQvOwwb7i+X+HYKdhYJiLoku+XcvYq4xFaoBvFTW3eZ/S2i20yK1SQcAVjUe7JQEgZDtqzPdZH6w4YIZJVvQdDMPy99xdXXEZrnW+rHOy60XFS7WiyeUdLA3TQ4+Ec1f2kkQw7MhbDbOoOh0obsvfhtz3OE=,iv:h4Qn/LpayhXCWWsO/nm18Rapz6WXQcjItF9YwyiFJJ0=,tag:bxtQQMNgVyFkHp+pbSP3UQ==,type:str] + pgp: + - created_at: "2026-03-09T11:57:24Z" + enc: |- + -----BEGIN PGP MESSAGE----- + + hQGMA5HdvEwzh/H7AQwAkahLpq8vqQn6N5EyrbC+33Ohl61ZbBPR6NnQaLvU3s+i + WJ3xe7T+LP0jv2C2t//VhYvVNolQ2LBA+yLE3Cvjw6JCyVhu54ZRDJciY2w/wY5J + MN++Bqac6avoEYHkvoN6m1/F8JK46fzgQT7xXFTGix+g1W48aSC70GRZUmsg469p + ZFYbj/mEseG1ICxhZANU2NgRgW7kA/La/fe3/+YE8tkNHSXF2ZevQvluarm7kXT9 + KWani1wMlUMwZoCpwbfNwKpXPL0jW48FJsFIlxPbDrDCkR1gih1PHFVyqd45am9g + Uo0hJ1NOKzm5Cy5c/3xJzaP62UWyNJf+v5VojEg2XfSGqtaZDFQsLK0of5G/XArn + C7k7UbQJqz15rHWPznIppv2h+cTIsVDQcz77es1/qaOQyCMHdYqdkzi5YV7DJBZS + K6PP3Nt77uL4LGRL0vFtBgdhKFtXAAf8lhRfZJcJ2P9BYvaFdRUfjm/r0TNfCref + k2WCesk4F/pQSyB3ofuR0lYBJzlZ3iNpl7DlfyZ6DRZ/+aVFceRf9A8QKtkVmdMt + noqBJfLzhWgVmUUh3DO97mJV5pNOx8238vqVTxWrUqZXjXdXaUDaFUDXvgwg3GOA + N28ZjLy1XA== + =mIVi + -----END PGP MESSAGE----- + fp: c4639370c41133a738f643a591ddbc4c3387f1fb + - created_at: "2026-03-09T11:57:24Z" + enc: |- + -----BEGIN PGP MESSAGE----- + + hQIMA98TrrsQEbXUAQ//cnVHHJEwQn+W8Jkt+jwgnKCgbRutvG3U8hlXizzdk2RI + j6nVPpv2DwuXvX3ktnng8XrmWwXf9rFRRltVs7alenEnHLxiDd5w+WYeH4NCHOFr + +vvFwxNOxzLDj5B2Fjod4El70jUdrP6Mqzy37DPu1Gb2qIUEwdF1LEzM4FMWdeWL + BA0wCJzlTXzdlb0shw7xEsqvmnL11u+aQ8AVU3kgWxSkn0VZJIYYkwegUYfflSIr + wZsNsh8k+wG58f5IVr8SqnzkfxRfJSoxNKWV9dK3a9hJnnD3DUhqnOgvCnPCRKSP + drH+7KxqmNBxqQK3f2iJvgcyLQwyEEqF2Rt6gXwyDByHy3ewupAQD0aQwi5HMWcK + iEUVSQVZ6jRfAIyDs3sBnBHceB9BShFr+NN9eUjKJWm2QD4TdQamnpMLsQGpdZv5 + Lomk9VfdZPNw7DAKJs1oDeBRmhAP/crlOW/ZZho9mewKHr7Htu3VZP812GVupJns + IK9mMnpwAhgCtChcOj/ule9NcA/AWKcrtdAyId11SvjtMO+ZjRFrOCK1wKgIif3p + ogjaK38v/7gy4/8CDyVgru+luNklsRHfZr+BuPGBDDL8M7umXilK+GyGO1CnrjxW + DJXdvMe+u75OsYvGv7eX0tqd+ePanCEoDXxFJbMc2QZigD2kZgq+qRM9CxJ2jCXS + VgEEHybyGrOo5RcJkpk+UQpb2aTMLgFNqkTn0PRQSMFeXVQIt584a9xZs1TQ7ZsT + 5H4jaFXFcS+GG09CORbkf2fkQI2KpaqBAGFct21K2hY17Tpm7kgC + =yGms + -----END PGP MESSAGE----- + fp: aef8d6c7e4761fc297cda833df13aebb1011b5d4 + unencrypted_suffix: _unencrypted + version: 3.11.0 diff --git a/machines/vaultwarden/configuration.nix b/machines/vaultwarden/configuration.nix index 8a437116..cc6a0880 100644 --- a/machines/vaultwarden/configuration.nix +++ b/machines/vaultwarden/configuration.nix @@ -18,10 +18,17 @@ with lib; imports = [ ../modules/malobeo_user.nix ../modules/sshd.nix + inputs.self.nixosModules.malobeo.metrics ]; networking.firewall.allowedTCPPorts = [ 80 ]; + malobeo.metrics = { + enable = true; + enablePromtail = true; + logNginx = true; + }; + services.nginx = { enable = true; virtualHosts."keys.malobeo.org" = { diff --git a/machines/vpn/configuration.nix b/machines/vpn/configuration.nix index f41fcf62..c6d3f0a7 100644 --- a/machines/vpn/configuration.nix +++ b/machines/vpn/configuration.nix @@ -40,19 +40,6 @@ with lib; }; }; - virtualHosts."cloud.malobeo.org" = { - locations."/" = { - proxyPass = "http://10.100.0.101"; - extraConfig = '' - proxy_set_header Host $host; - client_max_body_size ${inputs.self.nixosConfigurations.nextcloud.config.services.nextcloud.maxUploadSize}; - client_body_timeout 3600s; - send_timeout 3600s; - fastcgi_buffers 64 4K; - ''; - }; - }; - virtualHosts."keys.malobeo.org" = { locations."/" = { proxyPass = "http://10.100.0.101"; @@ -71,6 +58,15 @@ with lib; }; }; + virtualHosts."events.malobeo.org" = { + locations."/" = { + proxyPass = "http://10.100.0.101"; + extraConfig = '' + proxy_set_header Host $host; + ''; + }; + }; + virtualHosts."tasklist.malobeo.org" = { locations."/" = { proxyPass = "http://10.100.0.101"; @@ -79,28 +75,6 @@ with lib; ''; }; }; - - virtualHosts."zines.malobeo.org" = { - locations."/" = { - proxyPass = "http://10.100.0.101"; - 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-Proto $scheme; - proxy_set_header Authorization $http_authorization; # Pass the Authorization header - proxy_pass_header Authorization; - - client_body_in_file_only clean; - client_body_buffer_size 32K; - - client_max_body_size 500M; - - sendfile on; - send_timeout 300s; - ''; - }; - }; }; system.stateVersion = "22.11"; # Did you read the comment? diff --git a/machines/zineshop/configuration.nix b/machines/zineshop/configuration.nix index aac419e4..11bb2601 100644 --- a/machines/zineshop/configuration.nix +++ b/machines/zineshop/configuration.nix @@ -20,7 +20,6 @@ with lib; enable = true; enablePromtail = true; logNginx = true; - lokiHost = "10.0.0.14"; }; services.printing.enable = true;