From f637ae9ea84565b6e7c5ff9406e97b52f86681ce Mon Sep 17 00:00:00 2001 From: sinavir Date: Sat, 8 Jun 2024 17:46:37 +0200 Subject: [PATCH] fixup! feat: Upgrade machines to nixos-24.05 --- machines/web01/castopod-head-proxy.nix | 33 -------------------------- machines/web01/castopod.nix | 2 +- patches/default.nix | 15 ++++++++++++ 3 files changed, 16 insertions(+), 34 deletions(-) delete mode 100644 machines/web01/castopod-head-proxy.nix diff --git a/machines/web01/castopod-head-proxy.nix b/machines/web01/castopod-head-proxy.nix deleted file mode 100644 index baacfca..0000000 --- a/machines/web01/castopod-head-proxy.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ config, lib, ... }: -let - cfg = config.services.castopod; - fpm = config.services.phpfpm.pools.castopod; -in -{ - services.nginx = { - resolver.addresses = [ "127.0.0.53" ]; - virtualHosts."${cfg.localDomain}" = { - - locations."@force_get" = { - extraConfig = lib.mkForce '' - recursive_error_pages on; - proxy_method GET; - proxy_pass https://podcasts.dgnum.eu/$request_uri; - ''; - }; - - locations."~ .php$" = { - extraConfig = lib.mkForce '' - error_page 550 = @force_get; - if ($request_method = HEAD) { return 550; } - fastcgi_intercept_errors on; - fastcgi_index index.php; - fastcgi_pass unix:${fpm.socket}; - try_files $uri =404; - fastcgi_read_timeout 3600; - fastcgi_send_timeout 3600; - ''; - }; - }; - }; -} diff --git a/machines/web01/castopod.nix b/machines/web01/castopod.nix index 20d57c1..c237148 100644 --- a/machines/web01/castopod.nix +++ b/machines/web01/castopod.nix @@ -8,7 +8,7 @@ in enable = true; localDomain = host; environmentFile = config.age.secrets.castopod-environment_file.path; - maxUploadSize = 512; + maxUploadSize = "512M"; settings = { "email.fromEmail" = "noreply@infra.dgnum.eu"; "email.SMTPHost" = "kurisu.lahfa.xyz"; diff --git a/patches/default.nix b/patches/default.nix index 0338c4c..637d43c 100644 --- a/patches/default.nix +++ b/patches/default.nix @@ -6,6 +6,21 @@ let in { + "nixos-24.05" = [ + # netbox qrcode plugin + { + _type = "commit"; + sha = "ae4bf4c110378ebacb3989c9533726859cfebbfa"; + hash = "sha256-SgHhW9HCkDQsxT3eG4P9q68c43e3sbDHRY9qs7oSt8o="; + } + + netboxAgent + + { + id = "275165"; + hash = "sha256-9a26V3Pi8yLD3N9+mC1kvJoruxRTp/qOHapnt6VX7pw="; + } + ]; "nixos-23.11" = [ # netbox module {