summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2016-03-11 02:23:04 +0100
committermakefu <github@syntax-fehler.de>2016-03-11 08:42:27 +0100
commitce98c6d7a3980e1e81e4ecceaec12d29cd25eb36 (patch)
treeb2c4e6e46ca5312d8de73d48cb1de944ea8f8fab
parent1ff4b036cf26944f2452e892db89701f89c6e6b0 (diff)
s 1 wolf: use tinc_pre for local discovery
-rw-r--r--makefu/1systems/darth.nix1
-rw-r--r--makefu/1systems/pornocauster.nix1
-rw-r--r--shared/1systems/wolf.nix3
3 files changed, 5 insertions, 0 deletions
diff --git a/makefu/1systems/darth.nix b/makefu/1systems/darth.nix
index 7dffb71d..7972c620 100644
--- a/makefu/1systems/darth.nix
+++ b/makefu/1systems/darth.nix
@@ -10,6 +10,7 @@ with config.krebs.lib;
krebs.build.host = config.krebs.hosts.darth;
krebs.retiolum.enable = true;
+ nixpkgs.config.packageOverrides = pkgs: { tinc = pkgs.tinc_pre; };
boot.loader.grub.device = "/dev/disk/by-id/ata-ADATA_SSD_S599_64GB_10460000000000000039";
}
diff --git a/makefu/1systems/pornocauster.nix b/makefu/1systems/pornocauster.nix
index 8f09f948..c27bd5df 100644
--- a/makefu/1systems/pornocauster.nix
+++ b/makefu/1systems/pornocauster.nix
@@ -49,6 +49,7 @@
networking.firewall.enable = true;
networking.firewall.allowedTCPPorts = [
25
+ 80
];
krebs.build.host = config.krebs.hosts.pornocauster;
diff --git a/shared/1systems/wolf.nix b/shared/1systems/wolf.nix
index 96691aed..f0323dc2 100644
--- a/shared/1systems/wolf.nix
+++ b/shared/1systems/wolf.nix
@@ -20,6 +20,9 @@ in
# 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; };
+
services.grafana = {
enable = true;
addr = "0.0.0.0";