summaryrefslogtreecommitdiffstats
path: root/shared
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2016-07-22 13:22:13 +0200
committertv <tv@krebsco.de>2016-07-22 13:22:13 +0200
commit45c62ec4d3ec61ba593657676f5a09d47622564e (patch)
tree7937fbefaddc5e0168e44ab1d6e355c42192d7e8 /shared
parent8b58e6e6e25e38586f3cc8879aa0444d4fdf6f0d (diff)
parent0bd78c3b0de0fa79322e9031f45dcc62abd094d1 (diff)
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'shared')
-rw-r--r--shared/1systems/test-all-krebs-modules.nix2
-rw-r--r--shared/1systems/wolf.nix4
-rw-r--r--shared/2configs/base.nix2
-rw-r--r--shared/2configs/repo-sync.nix2
4 files changed, 5 insertions, 5 deletions
diff --git a/shared/1systems/test-all-krebs-modules.nix b/shared/1systems/test-all-krebs-modules.nix
index 2034071f0..60d5f3252 100644
--- a/shared/1systems/test-all-krebs-modules.nix
+++ b/shared/1systems/test-all-krebs-modules.nix
@@ -38,7 +38,7 @@ in {
};
nginx.enable = true;
realwallpaper.enable = true;
- retiolum.enable = true;
+ tinc.retiolum.enable = true;
retiolum-bootstrap.enable = true;
tinc_graphs.enable = true;
urlwatch.enable = true;
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/shared/2configs/repo-sync.nix b/shared/2configs/repo-sync.nix
index d1d9ab3f8..753b0f473 100644
--- a/shared/2configs/repo-sync.nix
+++ b/shared/2configs/repo-sync.nix
@@ -17,7 +17,7 @@ with lib;
mirror.url = mirror;
};
lassulus = {
- origin.url = http://cgit.cloudkrebs/stockholm ;
+ origin.url = http://cgit.prism/stockholm ;
mirror.url = mirror;
};
"@latest" = {