summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--krebs/3modules/retiolum.nix4
-rw-r--r--krebs/3modules/tinc_graphs.nix2
-rw-r--r--lass/2configs/retiolum.nix2
-rw-r--r--shared/1systems/wolf.nix4
-rw-r--r--shared/2configs/base.nix2
-rw-r--r--tv/2configs/retiolum.nix2
6 files changed, 8 insertions, 8 deletions
diff --git a/krebs/3modules/retiolum.nix b/krebs/3modules/retiolum.nix
index a80c510a5..0bd815211 100644
--- a/krebs/3modules/retiolum.nix
+++ b/krebs/3modules/retiolum.nix
@@ -50,9 +50,9 @@ let
default =
filterAttrs (_: h: hasAttr tinc.config.netname h.nets) config.krebs.hosts;
description = ''
- Hosts to generate <literal>config.krebs.retiolum.hostsPackage</literal>.
+ Hosts to generate <literal>config.krebs.tinc.retiolum.hostsPackage</literal>.
Note that these hosts must have a network named
- <literal>config.krebs.retiolum.netname</literal>.
+ <literal>config.krebs.tinc.retiolum.netname</literal>.
'';
};
diff --git a/krebs/3modules/tinc_graphs.nix b/krebs/3modules/tinc_graphs.nix
index 0f1bae090..d783ba03b 100644
--- a/krebs/3modules/tinc_graphs.nix
+++ b/krebs/3modules/tinc_graphs.nix
@@ -23,7 +23,7 @@ let
hostsPath = mkOption {
type = types.str;
description = "Path to Hosts directory";
- default = "${config.krebs.retiolum.hostsPackage}";
+ default = "${config.krebs.tinc.retiolum.hostsPackage}";
};
network = mkOption {
diff --git a/lass/2configs/retiolum.nix b/lass/2configs/retiolum.nix
index 89e0f217a..eba40532d 100644
--- a/lass/2configs/retiolum.nix
+++ b/lass/2configs/retiolum.nix
@@ -12,7 +12,7 @@
};
};
- krebs.retiolum = {
+ krebs.tinc.retiolum = {
enable = true;
connectTo = [
"prism"
diff --git a/shared/1systems/wolf.nix b/shared/1systems/wolf.nix
index 180510066..3818cf2c5 100644
--- a/shared/1systems/wolf.nix
+++ b/shared/1systems/wolf.nix
@@ -15,14 +15,14 @@ in
../2configs/shared-buildbot.nix
../2configs/cgit-mirror.nix
../2configs/repo-sync.nix
- # ../2configs/graphite.nix
+ ../2configs/graphite.nix
];
# use your own binary cache, fallback use cache.nixos.org (which is used by
# apt-cacher-ng in first place)
# local discovery in shackspace
nixpkgs.config.packageOverrides = pkgs: { tinc = pkgs.tinc_pre; };
- krebs.retiolum.extraConfig = "TCPOnly = yes";
+ krebs.tinc.retiolum.extraConfig = "TCPOnly = yes";
services.grafana = {
enable = true;
addr = "0.0.0.0";
diff --git a/shared/2configs/base.nix b/shared/2configs/base.nix
index a92a0df35..5aa5897d7 100644
--- a/shared/2configs/base.nix
+++ b/shared/2configs/base.nix
@@ -3,7 +3,7 @@
with config.krebs.lib;
{
krebs.enable = true;
- krebs.retiolum.enable = true;
+ krebs.tinc.retiolum.enable = true;
# TODO rename shared user to "krebs"
krebs.build.user = mkDefault config.krebs.users.shared;
diff --git a/tv/2configs/retiolum.nix b/tv/2configs/retiolum.nix
index f79454157..7179be570 100644
--- a/tv/2configs/retiolum.nix
+++ b/tv/2configs/retiolum.nix
@@ -3,7 +3,7 @@
with config.krebs.lib;
{
- krebs.retiolum = {
+ krebs.tinc.retiolum = {
enable = true;
connectTo = filter (ne config.krebs.build.host.name) [
"gum"