From 46a3f4c24315836c1d82711d98f4d69be67d883d Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Thu, 7 Sep 2017 10:36:42 +0200
Subject: l nixpkgs: fe46ffc -> d151161

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

(limited to 'lass')

diff --git a/lass/source.nix b/lass/source.nix
index 52b0d99f..01631bef 100644
--- a/lass/source.nix
+++ b/lass/source.nix
@@ -15,7 +15,7 @@ in
         #   87a4615 & 334ac4f
         # + acme permissions for groups
         #   fd7a8f1
-        ref = "fe46ffc";
+        ref = "d151161";
       };
       secrets.file = getAttr builder {
         buildbot = toString <stockholm/lass/2configs/tests/dummy-secrets>;
-- 
cgit v1.2.3


From b01f595289fdcd5b6d4c69b335ea0b3645741189 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sat, 9 Sep 2017 00:21:13 +0200
Subject: l prism.r: add onondaga container

---
 lass/1systems/prism/config.nix | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'lass')

diff --git a/lass/1systems/prism/config.nix b/lass/1systems/prism/config.nix
index b3f54745..5983456b 100644
--- a/lass/1systems/prism/config.nix
+++ b/lass/1systems/prism/config.nix
@@ -311,6 +311,22 @@ in {
         localAddress = "10.233.2.4";
       };
     }
+    {
+      #onondaga
+      containers.onondaga = {
+        config = { ... }: {
+          services.openssh.enable = true;
+          users.users.root.openssh.authorizedKeys.keys = [
+            config.krebs.users.lass.pubkey
+            config.krebs.users.nin.pubkey
+          ];
+        };
+        enableTun = true;
+        privateNetwork = true;
+        hostAddress = "10.233.2.4";
+        localAddress = "10.233.2.5";
+      };
+    }
   ];
 
   krebs.build.host = config.krebs.hosts.prism;
-- 
cgit v1.2.3


From 99cd162f1fc44426ec293b89a24671aab5a9dcf9 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sat, 9 Sep 2017 00:26:09 +0200
Subject: l git: add populate

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

(limited to 'lass')

diff --git a/lass/2configs/git.nix b/lass/2configs/git.nix
index 61a352bd..7bce93ae 100644
--- a/lass/2configs/git.nix
+++ b/lass/2configs/git.nix
@@ -38,6 +38,9 @@ let
       cgit.desc = "nixpkgs fork";
       cgit.section = "configuration";
     };
+    populate = {
+      cgit.section = "software";
+    };
     stockholm = {
       cgit.desc = "take all the computers hostage, they'll love you!";
       cgit.section = "configuration";
-- 
cgit v1.2.3