diff options
author | tv <tv@krebsco.de> | 2018-11-14 09:31:06 +0100 |
---|---|---|
committer | tv <tv@krebsco.de> | 2018-11-14 09:31:06 +0100 |
commit | a2ac22b31e2e6eb74469a56759e027a723eeffac (patch) | |
tree | c7291ef586d287255d7f259981602d3f2abe11fd /lass/1systems/archprism | |
parent | f2ca6be6a73df133d127b5b3efe100ff9a3cbd9b (diff) | |
parent | af869d56c49e94357232588756b27703054456e0 (diff) |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'lass/1systems/archprism')
-rw-r--r-- | lass/1systems/archprism/config.nix | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/lass/1systems/archprism/config.nix b/lass/1systems/archprism/config.nix index e6eddf8b2..6706914b5 100644 --- a/lass/1systems/archprism/config.nix +++ b/lass/1systems/archprism/config.nix @@ -57,13 +57,6 @@ 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 "dritter"; isNormalUser = true; @@ -109,26 +102,6 @@ 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> |