commit e15f5aaf10e69c8080aab5e28f5c351ee90fd941
author Skyler Grey <minion@clicks.codes> Wed Oct 25 17:13:43 2023 +0000
committer Samuel Shuert <coded@clicks.codes> Wed Oct 25 13:17:16 2023 -0400
tree be68d13ea69745f6151e7df59f7d2463d6289fac
parent 8006dab7fe6f1ba9a4db7187b794f76e9f54660b

Update nginx routes to fix www aliases

Helpers change I2e0a505df9c150376d90b0957c6fdf31faee8ac4 added www aliases to
everything, but we already had www aliases for clicks.codes. This commit removes
that, as well as adding the missing www aliases for nextcloud and privatebin
(which could not be added in https://git.clicks.codes/c/Clicks/NixHelpers/+/161
as nextcloud and privatebin were not created with our helpers)

Change-Id: Ib2f42f86e09eefd386beab238e2266bf12ca90aa
Reviewed-on: https://git.clicks.codes/c/Clicks/NixFiles/+/163
Reviewed-by: Samuel Shuert <coded@clicks.codes>
Tested-by: Skyler Grey <minion@clicks.codes>

flake.lock

diff --git a/flake.lock b/flake.lock
index fd8bd0d..62a44d6 100644
--- a/flake.lock
+++ b/flake.lock
@@ -59,11 +59,11 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1698014047,
-        "narHash": "sha256-UkFM0AMx5876howd1rTBxJKt/J9TioxkRBRaE/3VXMg=",
+        "lastModified": 1698219444,
+        "narHash": "sha256-1f9tDt+1AcP6qnY4rhNJMlKVbHf3J+DfGVFsQUEThxw=",
         "ref": "refs/heads/main",
-        "rev": "06e9c2b007673ff27fa3620c17644e8ba8f33ced",
-        "revCount": 15,
+        "rev": "64d1d305816c81380dd0924fa8c6810f67a78992",
+        "revCount": 16,
         "type": "git",
         "url": "https://git.clicks.codes/Clicks/NixHelpers"
       },

helpers

diff --git a/helpers b/helpers
index 06e9c2b..64d1d30 160000
--- a/helpers
+++ b/helpers
@@ -1 +1 @@
-Subproject commit 06e9c2b007673ff27fa3620c17644e8ba8f33ced
+Subproject commit 64d1d305816c81380dd0924fa8c6810f67a78992

modules/nginx-routes.nix

diff --git a/modules/nginx-routes.nix b/modules/nginx-routes.nix
index 4b56fc3..a7eb810 100644
--- a/modules/nginx-routes.nix
+++ b/modules/nginx-routes.nix
@@ -7,8 +7,6 @@
     (Host "testing.coded.codes" (ReverseProxy "SamuelDesktop.local:3000"))
     (Hosts [ "kavita.coded.codes" "reading.coded.codes" ]
       (ReverseProxy "127.0.0.1:5000"))
-    (Host "www.clicks.codes"
-      (RedirectPermanent "https://clicks.codes$request_uri"))
     (Host "clicks.codes" (ReverseProxy "127.0.0.1:3000"))
     (Host "passwords.clicks.codes" (ReverseProxy "127.0.0.1:8452"))
     (Host "login.clicks.codes" (ReverseProxy "127.0.0.1:9083"))
@@ -81,12 +79,20 @@
     (Aliases "nextcloud.clicks.codes" [
       "cloud.clicks.codes"
       "docs.clicks.codes"
+      "www.cloud.clicks.codes"
+      "www.docs.clicks.codes"
+      "www.nextcloud.clicks.codes"
     ])
     (Aliases "privatebin" [
       "paste.clicks.codes"
       "paste.coded.codes"
       "paste.thecoded.prof"
       "paste.hopescaramels.com"
+      "www.paste.clicks.codes"
+      "www.paste.coded.codes"
+      "www.paste.thecoded.prof"
+      "www.paste.hopescaramels.com"
+      "www.privatebin.clicks.codes"
     ])
   ];
   clicks.nginx.streams = with helpers.nginx; [