diff options
| author | lassulus <lass@aidsballs.de> | 2016-10-20 21:19:26 +0200 |
|---|---|---|
| committer | lassulus <lass@aidsballs.de> | 2016-10-20 21:19:26 +0200 |
| commit | 5cfe3f414097a16dfa84cd52739689e08b7fa0b3 (patch) | |
| tree | 81ef0820be1d91961f18f2e75e2d9172bf865093 /shared | |
| parent | 51a9fb2dccf6996e1f4fe6f795076ebc6bc71d25 (diff) | |
| parent | f47bab7f710b7c8a282c3a3c38affc8a0bc30cc9 (diff) | |
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'shared')
| -rw-r--r-- | shared/2configs/cgit-mirror.nix | 2 | ||||
| -rw-r--r-- | shared/2configs/collectd-base.nix | 2 | ||||
| -rw-r--r-- | shared/2configs/default.nix | 2 | ||||
| -rw-r--r-- | shared/2configs/graphite.nix | 2 | ||||
| -rw-r--r-- | shared/2configs/shack-drivedroid.nix | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/shared/2configs/cgit-mirror.nix b/shared/2configs/cgit-mirror.nix index d9241a2b5..a3860a0ef 100644 --- a/shared/2configs/cgit-mirror.nix +++ b/shared/2configs/cgit-mirror.nix @@ -1,6 +1,6 @@ { config, lib, pkgs, ... }: -with config.krebs.lib; +with import <stockholm/lib>; let rules = with git; singleton { user = [ wolf-repo-sync ]; diff --git a/shared/2configs/collectd-base.nix b/shared/2configs/collectd-base.nix index 9c63dcd20..fd6016d4f 100644 --- a/shared/2configs/collectd-base.nix +++ b/shared/2configs/collectd-base.nix @@ -1,7 +1,7 @@ { config, lib, pkgs, ... }: # TODO: krebs.collectd.plugins -with config.krebs.lib; +with import <stockholm/lib>; let connect-time-cfg = with pkgs; writeText "collectd-connect-time.conf" '' LoadPlugin python diff --git a/shared/2configs/default.nix b/shared/2configs/default.nix index f5377db94..cae2bc814 100644 --- a/shared/2configs/default.nix +++ b/shared/2configs/default.nix @@ -1,6 +1,6 @@ { config, lib, pkgs, ... }: -with config.krebs.lib; +with import <stockholm/lib>; { krebs.enable = true; krebs.tinc.retiolum.enable = true; diff --git a/shared/2configs/graphite.nix b/shared/2configs/graphite.nix index bfa2b2966..8a1238466 100644 --- a/shared/2configs/graphite.nix +++ b/shared/2configs/graphite.nix @@ -5,7 +5,7 @@ # TODO: krebs.graphite.minimal.enable # TODO: configure firewall -with config.krebs.lib; +with import <stockholm/lib>; { imports = [ ]; diff --git a/shared/2configs/shack-drivedroid.nix b/shared/2configs/shack-drivedroid.nix index 6133ccc99..3581f9e96 100644 --- a/shared/2configs/shack-drivedroid.nix +++ b/shared/2configs/shack-drivedroid.nix @@ -1,5 +1,5 @@ { pkgs, lib, config, ... }: -with config.krebs.lib; +with import <stockholm/lib>; let repodir = "/var/srv/drivedroid"; srepodir = shell.escape repodir; |