summaryrefslogtreecommitdiffstats
path: root/lass
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2019-09-25 21:50:44 +0200
committerlassulus <lassulus@lassul.us>2019-09-25 21:50:44 +0200
commitea7aa76e0e07f81b8bd0f5184ef3c088697c2a90 (patch)
tree19649d01a57d3ec4d8ce1165771be4201feb0401 /lass
parent2b53aaa1784f431696f0685d304000b04e1a4874 (diff)
parent7050df8789e7e7bfff93dabdcb3897ec6611cb1a (diff)
Merge remote-tracking branch 'ni/master'
Diffstat (limited to 'lass')
-rw-r--r--lass/1systems/prism/config.nix27
1 files changed, 27 insertions, 0 deletions
diff --git a/lass/1systems/prism/config.nix b/lass/1systems/prism/config.nix
index 845cf943c..a586807ef 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>