summaryrefslogtreecommitdiffstats
path: root/lass
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2017-09-16 18:38:03 +0200
committertv <tv@krebsco.de>2017-09-16 18:38:03 +0200
commit23fcf1c4e92aee18625380eb4cbcab4023098a58 (patch)
tree2deff673c3c6b03ad65ae15eba2f5a8199f03476 /lass
parentb28dabfc0720578b46fd7664b233a12666fbca0c (diff)
parentde16ae2a12145901c3d9e2efef062b161b9448e3 (diff)
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'lass')
-rw-r--r--lass/1systems/prism/config.nix16
-rw-r--r--lass/2configs/git.nix3
2 files changed, 19 insertions, 0 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";