From 28441393eb1fe79e00d7c110b51462cd699f6862 Mon Sep 17 00:00:00 2001
From: Adrian Kummerlaender
Date: Thu, 10 Jun 2021 18:36:24 +0200
Subject: Fix nginx, cgit config

---
 host/software/server/website.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'host/software/server/website.nix')

diff --git a/host/software/server/website.nix b/host/software/server/website.nix
index a5f65fb..00473df 100644
--- a/host/software/server/website.nix
+++ b/host/software/server/website.nix
@@ -7,6 +7,8 @@
     shell        = pkgs.fish;
   };
 
+  services.nginx.user = "public";
+
   systemd.services.nginx.serviceConfig.ProtectHome = false;
 
   # `public` generates websites using their custom derivations via `nix-build`
@@ -27,11 +29,11 @@
       '';
     };
 
-    proxy = target: {
-      proxyPass  = target;
+    proxy = server: target: {
+      proxyPass = server;
       extraConfig = ''
         expires off;
-        proxy_set_header Host code.kummerlaender.eu;
+        return ${target};
       '';
     };
   in {
@@ -47,9 +49,9 @@
 
     "pkgs.kummerlaender.eu" = default {
       "/".root = "/home/public/pkgs/result";
-      "/nixexprs.tar.gz"  = proxy "http://code.kummerlaender.eu/pkgs/snapshot/master.tar.gz";
-      "/nixexprs.tar.xz"  = proxy "http://code.kummerlaender.eu/pkgs/snapshot/master.tar.xz";
-      "/nixexprs.tar.bz2" = proxy "http://code.kummerlaender.eu/pkgs/snapshot/master.tar.bz2";
+      "/nixexprs.tar.gz"  = proxy "http://code.kummerlaender.eu" "http://code.kummerlaender.eu/pkgs/snapshot/master.tar.gz";
+      "/nixexprs.tar.xz"  = proxy "http://code.kummerlaender.eu" "http://code.kummerlaender.eu/pkgs/snapshot/master.tar.xz";
+      "/nixexprs.tar.bz2" = proxy "http://code.kummerlaender.eu" "http://code.kummerlaender.eu/pkgs/snapshot/master.tar.bz2";
     };
 
     "literatelb.org"      = let
-- 
cgit v1.2.3