From 6c260f6fc47059af8ae6ffa25ce954ac0e8d813c Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sat, 11 Jan 2020 20:51:33 +0100
Subject: l websites lassulus: fix /tinc locaton

---
 lass/2configs/websites/lassulus.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'lass/2configs/websites/lassulus.nix')

diff --git a/lass/2configs/websites/lassulus.nix b/lass/2configs/websites/lassulus.nix
index f04f312d..248334be 100644
--- a/lass/2configs/websites/lassulus.nix
+++ b/lass/2configs/websites/lassulus.nix
@@ -47,7 +47,8 @@ in {
       alias ${pkgs.writeText "prism.wg" config.krebs.hosts.prism.nets.wiregrill.wireguard.pubkey};
     '';
     locations."/tinc/".extraConfig = ''
-      alias ${config.krebs.tinc_graphs.workingDir}/external;
+      index index.html;
+      alias ${config.krebs.tinc_graphs.workingDir}/external/;
     '';
     locations."= /krebspage".extraConfig = ''
       default_type "text/html";
-- 
cgit v1.2.3


From fd542aa6919fa07f543da1aa7d451ba606ff0027 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sat, 11 Jan 2020 20:51:53 +0100
Subject: l websites lassulus: rename pubkeys

---
 lass/2configs/websites/lassulus.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lass/2configs/websites/lassulus.nix')

diff --git a/lass/2configs/websites/lassulus.nix b/lass/2configs/websites/lassulus.nix
index 248334be..aa3a4862 100644
--- a/lass/2configs/websites/lassulus.nix
+++ b/lass/2configs/websites/lassulus.nix
@@ -61,10 +61,10 @@ in {
     in ''
       alias ${initscript};
     '';
-    locations."= /pub".extraConfig = ''
+    locations."= /blue.pub".extraConfig = ''
       alias ${pkgs.writeText "pub" config.krebs.users.lass.pubkey};
     '';
-    locations."= /pub1".extraConfig = ''
+    locations."= /mors.pub".extraConfig = ''
       alias ${pkgs.writeText "pub" config.krebs.users.lass-mors.pubkey};
     '';
   };
-- 
cgit v1.2.3


From 666af374b4aefef7375e88bc31768cadabf77773 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sat, 11 Jan 2020 20:53:03 +0100
Subject: l websites lassulus: add blog user to nginx group

---
 lass/2configs/websites/lassulus.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lass/2configs/websites/lassulus.nix')

diff --git a/lass/2configs/websites/lassulus.nix b/lass/2configs/websites/lassulus.nix
index aa3a4862..901fecfb 100644
--- a/lass/2configs/websites/lassulus.nix
+++ b/lass/2configs/websites/lassulus.nix
@@ -94,6 +94,7 @@ in {
 
   users.users.blog = {
     uid = genid_uint31 "blog";
+    group = "nginx";
     description = "lassul.us blog deployment";
     home = "/srv/http/lassul.us";
     useDefaultShell = true;
-- 
cgit v1.2.3