diff options
author | tv <tv@krebsco.de> | 2017-09-05 23:00:23 +0200 |
---|---|---|
committer | tv <tv@krebsco.de> | 2017-09-05 23:00:23 +0200 |
commit | 1436781119f92cbf431db5e817fba765b24d922a (patch) | |
tree | f8ee298cdddd02beab384b047cc1a76bd1bd26c1 /lass/1systems/prism | |
parent | 77e9bd83e2208d1d732ef505e0e996a2440d5d7c (diff) | |
parent | 71d3f53f2bf767cfbb6e941438431d6083f304b9 (diff) |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'lass/1systems/prism')
-rw-r--r-- | lass/1systems/prism/config.nix | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/lass/1systems/prism/config.nix b/lass/1systems/prism/config.nix index 744bae551..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 = { |