summaryrefslogtreecommitdiffstats
path: root/makefu/1systems/pornocauster.nix
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 /makefu/1systems/pornocauster.nix
parent8b58e6e6e25e38586f3cc8879aa0444d4fdf6f0d (diff)
parent0bd78c3b0de0fa79322e9031f45dcc62abd094d1 (diff)
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'makefu/1systems/pornocauster.nix')
-rw-r--r--makefu/1systems/pornocauster.nix10
1 files changed, 5 insertions, 5 deletions
diff --git a/makefu/1systems/pornocauster.nix b/makefu/1systems/pornocauster.nix
index 2ab030916..b683e5630 100644
--- a/makefu/1systems/pornocauster.nix
+++ b/makefu/1systems/pornocauster.nix
@@ -38,8 +38,9 @@
#../2configs/wordpress.nix
../2configs/nginx/public_html.nix
+ ../2configs/tinc/retiolum.nix
# temporary modules
- # ../2configs/temp/share-samba.nix
+ ../2configs/temp/share-samba.nix
# ../2configs/temp/elkstack.nix
# ../2configs/temp/sabnzbd.nix
];
@@ -69,10 +70,9 @@
krebs.build.host = config.krebs.hosts.pornocauster;
krebs.hosts.omo.nets.retiolum.via.ip4.addr = "192.168.1.11";
- krebs.retiolum = {
- enable = true;
- connectTo = [ "omo" "gum" "prism" ];
- };
+
+ krebs.tinc.retiolum.connectTo = [ "omo" "gum" "prism" ];
+
networking.extraHosts = ''
192.168.1.11 omo.local
'';