From 6c4d35c9fe018e87ed94b63e574a17a1e2139e74 Mon Sep 17 00:00:00 2001 From: Bladesy Date: Tue, 17 Dec 2024 21:42:32 +0000 Subject: [PATCH] fix: centralise with one ssl certificate --- modules/sv1.nix | 36 ++++++++++++++++++++++-------------- packages/default.nix | 1 + packages/my-site/default.nix | 2 ++ 3 files changed, 25 insertions(+), 14 deletions(-) create mode 100644 packages/my-site/default.nix diff --git a/modules/sv1.nix b/modules/sv1.nix index e9cf914..36aa488 100644 --- a/modules/sv1.nix +++ b/modules/sv1.nix @@ -202,20 +202,28 @@ }; nginx = { enable = true; - virtualHosts."gitea.dylanblades.com" = { - forceSSL = true; - enableACME = true; - locations."/" = { - proxyPass = "http://localhost:3000"; - extraConfig = '' - client_max_body_size 512M; - proxy_set_header Connection $http_connection; - proxy_set_header Upgrade $http_upgrade; - 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; - ''; + virtualHosts = { + "dylanblades.com" = { + forceSSL = true; + enableACME = true; + serverAliases = ["*.dylanblades.com"]; + root = pkgs.my-site; + }; + "gitea.dylanblades.com" = { + forceSSL = true; + useACMEHost = true; + locations."/" = { + proxyPass = "http://localhost:3000"; + extraConfig = '' + client_max_body_size 512M; + proxy_set_header Connection $http_connection; + proxy_set_header Upgrade $http_upgrade; + 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; + ''; + }; }; }; }; diff --git a/packages/default.nix b/packages/default.nix index 20fc436..aad8295 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -1,3 +1,4 @@ {pkgs}: { my-vim = pkgs.callPackage ./my-vim {}; + my-site = pkgs.callPackage ./my-site {}; } diff --git a/packages/my-site/default.nix b/packages/my-site/default.nix new file mode 100644 index 0000000..50b1ec5 --- /dev/null +++ b/packages/my-site/default.nix @@ -0,0 +1,2 @@ +{writeTextDir}: +writeTextDir "index.html" "my-site"