diff options
author | makefu <github@syntax-fehler.de> | 2017-09-04 09:05:06 +0200 |
---|---|---|
committer | makefu <github@syntax-fehler.de> | 2017-09-04 09:05:06 +0200 |
commit | 729549d15464e57e41fd143450c36274cedc84fa (patch) | |
tree | c28cfa3576c601f7f665cebc7721ef3a08311792 /lass/1systems/prism/config.nix | |
parent | 848acb85ccecbe25987bf6da45a96fc4eaaa74e9 (diff) | |
parent | fcf59a00e2ab675cb171cbe4f21b8df73836d144 (diff) |
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'lass/1systems/prism/config.nix')
-rw-r--r-- | lass/1systems/prism/config.nix | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/lass/1systems/prism/config.nix b/lass/1systems/prism/config.nix index 5d05ae399..b3f547452 100644 --- a/lass/1systems/prism/config.nix +++ b/lass/1systems/prism/config.nix @@ -39,9 +39,10 @@ in { <stockholm/lass/2configs/monitoring/monit-alarms.nix> <stockholm/lass/2configs/paste.nix> <stockholm/lass/2configs/syncthing.nix> - <stockholm/lass/2configs/coders-irc.nix> + <stockholm/lass/2configs/reaktor-coders.nix> <stockholm/lass/2configs/ciko.nix> <stockholm/lass/2configs/container-networking.nix> + <stockholm/lass/2configs/reaktor-krebs.nix> { lass.pyload.enable = true; } @@ -244,10 +245,6 @@ in { OnUnitInactiveSec = "2min"; RandomizedDelaySec = "2min"; }; - krebs.repo-sync.repos.nixpkgs.timerConfig = { - OnBootSec = "90min"; - OnUnitInactiveSec = "24h"; - }; } { lass.usershadow = { @@ -298,6 +295,22 @@ in { localAddress = "10.233.2.2"; }; } + { + #kaepsele + containers.kaepsele = { + config = { ... }: { + services.openssh.enable = true; + users.users.root.openssh.authorizedKeys.keys = with config.krebs.users; [ + lass.pubkey + tv.pubkey + ]; + }; + enableTun = true; + privateNetwork = true; + hostAddress = "10.233.2.3"; + localAddress = "10.233.2.4"; + }; + } ]; krebs.build.host = config.krebs.hosts.prism; |