diff options
| author | makefu <github@syntax-fehler.de> | 2016-10-24 14:14:58 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2016-10-24 14:14:58 +0200 |
| commit | 36cbb3d300eb18330a62ba20e35f80d515f5bc5f (patch) | |
| tree | dedf23acdc5763b59b5853b07dd297b88fb15636 /shared | |
| parent | 3fa63a4f312a885d353177db911f8a52ce7a1e1c (diff) | |
| parent | 08c7671fc51270e582e16cbe49aa896f8bff7685 (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; |