From 9841e402e2692a6eb37d5a5b89a53474168af590 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Fri, 10 Dec 2021 10:13:49 +0100
Subject: wiki.r: listen on localhost, fix http redirect

---
 krebs/2configs/wiki.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'krebs/2configs/wiki.nix')

diff --git a/krebs/2configs/wiki.nix b/krebs/2configs/wiki.nix
index e7faca1f..aa694826 100644
--- a/krebs/2configs/wiki.nix
+++ b/krebs/2configs/wiki.nix
@@ -29,6 +29,7 @@ in
 {
   services.gollum = {
     enable = true;
+    address = "::";
     extraConfig = ''
       Gollum::Hook.register(:post_commit, :hook_id) do |committer, sha1|
         system('${pushCgit}')
@@ -45,12 +46,13 @@ in
     virtualHosts."wiki.r" = {
       enableACME = true;
       addSSL = true;
-      locations."/".extraConfig = ''
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection "upgrade";
-        proxy_set_header Host $host;
-        proxy_pass http://127.0.0.1:${toString config.services.gollum.port};
-      '';
+      locations."/" = {
+        proxyPass = "http://[::]:${toString config.services.gollum.port}";
+        proxyWebsockets = true;
+        extraConfig = ''
+          proxy_set_header Host $host;
+        '';
+      };
     };
   };
 
-- 
cgit v1.2.3


From 6b59b7972a901dcbb3cb5c1aeac4616a5a94ba7b Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Fri, 10 Dec 2021 18:09:44 +0100
Subject: wiki: listen gollum on localhost only

---
 krebs/2configs/wiki.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'krebs/2configs/wiki.nix')

diff --git a/krebs/2configs/wiki.nix b/krebs/2configs/wiki.nix
index aa694826..40d946f7 100644
--- a/krebs/2configs/wiki.nix
+++ b/krebs/2configs/wiki.nix
@@ -29,7 +29,7 @@ in
 {
   services.gollum = {
     enable = true;
-    address = "::";
+    address = "::1";
     extraConfig = ''
       Gollum::Hook.register(:post_commit, :hook_id) do |committer, sha1|
         system('${pushCgit}')
@@ -47,7 +47,7 @@ in
       enableACME = true;
       addSSL = true;
       locations."/" = {
-        proxyPass = "http://[::]:${toString config.services.gollum.port}";
+        proxyPass = "http://[::1]:${toString config.services.gollum.port}";
         proxyWebsockets = true;
         extraConfig = ''
           proxy_set_header Host $host;
-- 
cgit v1.2.3