summaryrefslogtreecommitdiffstats
path: root/tv
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2016-06-30 01:05:21 +0200
committertv <tv@krebsco.de>2016-06-30 01:08:07 +0200
commit2f65d9c19752a808bc49a8e6bf675ae6b6916a3c (patch)
tree45982851c9bb2d9c9ff38d6e5ed6512c8185457c /tv
parent716a2fc6e842ff051df6de1999b5b97780f2d2cd (diff)
tv: use tinc_pre
Diffstat (limited to 'tv')
-rw-r--r--tv/1systems/mu.nix2
-rw-r--r--tv/1systems/wu.nix2
-rw-r--r--tv/1systems/xu.nix2
-rw-r--r--tv/2configs/retiolum.nix3
4 files changed, 5 insertions, 4 deletions
diff --git a/tv/1systems/mu.nix b/tv/1systems/mu.nix
index 06da15ecc..ec208a0bd 100644
--- a/tv/1systems/mu.nix
+++ b/tv/1systems/mu.nix
@@ -76,7 +76,7 @@ with config.krebs.lib;
environment.systemPackages = with pkgs; [
slock
- tinc
+ tinc_pre
iptables
vim
gimp
diff --git a/tv/1systems/wu.nix b/tv/1systems/wu.nix
index cebd7c9e4..6bb544371 100644
--- a/tv/1systems/wu.nix
+++ b/tv/1systems/wu.nix
@@ -153,7 +153,7 @@ with config.krebs.lib;
environment.systemPackages = with pkgs; [
ethtool
- tinc
+ tinc_pre
iptables
#jack2
];
diff --git a/tv/1systems/xu.nix b/tv/1systems/xu.nix
index 6ba7ab327..a3a242c46 100644
--- a/tv/1systems/xu.nix
+++ b/tv/1systems/xu.nix
@@ -163,7 +163,7 @@ with config.krebs.lib;
environment.systemPackages = with pkgs; [
ethtool
- tinc
+ tinc_pre
iptables
#jack2
diff --git a/tv/2configs/retiolum.nix b/tv/2configs/retiolum.nix
index ec3508d90..6e05b1489 100644
--- a/tv/2configs/retiolum.nix
+++ b/tv/2configs/retiolum.nix
@@ -1,4 +1,4 @@
-{ config, lib, ... }:
+{ config, lib, pkgs, ... }:
with config.krebs.lib;
@@ -12,6 +12,7 @@ with config.krebs.lib;
"cd"
"ire"
];
+ tincPackage = pkgs.tinc_pre;
};
tv.iptables.input-internet-accept-tcp = singleton "tinc";
}
[cgit] Unable to lock slot /tmp/cgit/12100000.lock: No such file or directory (2)