diff options
| author | nin <nineinchnade@gmail.com> | 2017-09-14 22:57:46 +0200 |
|---|---|---|
| committer | nin <nineinchnade@gmail.com> | 2017-09-14 22:57:46 +0200 |
| commit | 56054fe431aca35119df307f2098f823fc03d1e9 (patch) | |
| tree | 052c12e402d95ea2bf9b4a8c466480e7d59bf3ce /lass | |
| parent | 036bd54f3142ba05409b742a809c3082176e4596 (diff) | |
| parent | de16ae2a12145901c3d9e2efef062b161b9448e3 (diff) | |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'lass')
| -rw-r--r-- | lass/1systems/prism/config.nix | 16 | ||||
| -rw-r--r-- | lass/2configs/git.nix | 3 | ||||
| -rw-r--r-- | lass/source.nix | 2 |
3 files changed, 20 insertions, 1 deletions
diff --git a/lass/1systems/prism/config.nix b/lass/1systems/prism/config.nix index b3f547452..5983456b3 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; diff --git a/lass/2configs/git.nix b/lass/2configs/git.nix index 61a352bde..7bce93ae1 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"; diff --git a/lass/source.nix b/lass/source.nix index 52b0d99f2..01631bef1 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>; |