From 7050df8789e7e7bfff93dabdcb3897ec6611cb1a Mon Sep 17 00:00:00 2001
From: nin <nin@c-base.org>
Date: Wed, 25 Sep 2019 19:42:41 +0200
Subject: Revert "remove nin"

This reverts commit 6b08d5aa46adc80d8a1ab4ed1d3e320c61a19f01.
---
 lass/1systems/prism/config.nix | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

(limited to 'lass/1systems/prism/config.nix')

diff --git a/lass/1systems/prism/config.nix b/lass/1systems/prism/config.nix
index 845cf943..a586807e 100644
--- a/lass/1systems/prism/config.nix
+++ b/lass/1systems/prism/config.nix
@@ -65,6 +65,13 @@ with import <stockholm/lib>;
           config.krebs.users.makefu.pubkey
         ];
       };
+      users.users.nin = {
+        uid = genid "nin";
+        isNormalUser = true;
+        openssh.authorizedKeys.keys = [
+          config.krebs.users.nin.pubkey
+        ];
+      };
       users.extraUsers.dritter = {
         uid = genid_uint31 "dritter";
         isNormalUser = true;
@@ -117,6 +124,26 @@ with import <stockholm/lib>;
         localAddress = "10.233.2.2";
       };
     }
+    {
+      #onondaga
+      systemd.services."container@onondaga".reloadIfChanged = mkForce false;
+      containers.onondaga = {
+        config = { ... }: {
+          imports = [ <stockholm/lass/2configs/rebuild-on-boot.nix> ];
+          environment.systemPackages = [ pkgs.git ];
+          services.openssh.enable = true;
+          users.users.root.openssh.authorizedKeys.keys = [
+            config.krebs.users.lass.pubkey
+            config.krebs.users.nin.pubkey
+          ];
+        };
+        autoStart = true;
+        enableTun = true;
+        privateNetwork = true;
+        hostAddress = "10.233.2.5";
+        localAddress = "10.233.2.6";
+      };
+    }
     <stockholm/lass/2configs/exim-smarthost.nix>
     <stockholm/lass/2configs/ts3.nix>
     <stockholm/lass/2configs/privoxy-retiolum.nix>
-- 
cgit v1.2.3


From ee36de2973732362f1abdfb5b6b55db1f17b1316 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Thu, 10 Oct 2019 12:45:19 +0200
Subject: l prism.r: fix HTTP-Spliting vuln

---
 lass/1systems/prism/config.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lass/1systems/prism/config.nix')

diff --git a/lass/1systems/prism/config.nix b/lass/1systems/prism/config.nix
index a586807e..85307574 100644
--- a/lass/1systems/prism/config.nix
+++ b/lass/1systems/prism/config.nix
@@ -379,7 +379,7 @@ with import <stockholm/lib>;
 
       services.nginx.virtualHosts."lassul.us".locations."^~ /transmission".extraConfig = ''
         if ($scheme != "https") {
-          rewrite ^ https://$host$uri permanent;
+          rewrite ^ https://$host$request_uri permanent;
         }
         auth_basic "Restricted Content";
         auth_basic_user_file ${pkgs.writeText "transmission-user-pass" ''
-- 
cgit v1.2.3


From 7fb3248a6c9213f9e93a10e9fbefa6375eff161e Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Thu, 10 Oct 2019 14:27:52 +0200
Subject: l: fix nginx path traversal

---
 lass/1systems/prism/config.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lass/1systems/prism/config.nix')

diff --git a/lass/1systems/prism/config.nix b/lass/1systems/prism/config.nix
index 85307574..13e865c6 100644
--- a/lass/1systems/prism/config.nix
+++ b/lass/1systems/prism/config.nix
@@ -184,7 +184,7 @@ with import <stockholm/lib>;
       imports = [
         <stockholm/lass/2configs/realwallpaper.nix>
       ];
-      services.nginx.virtualHosts."lassul.us".locations."/wallpaper.png".extraConfig = ''
+      services.nginx.virtualHosts."lassul.us".locations."= /wallpaper.png".extraConfig = ''
         alias /var/realwallpaper/realwallpaper.png;
       '';
     }
-- 
cgit v1.2.3