summaryrefslogtreecommitdiffstats
path: root/krebs/3modules
diff options
context:
space:
mode:
authorlassulus <lass@lassul.us>2017-03-14 21:14:25 +0100
committerlassulus <lass@lassul.us>2017-03-14 21:14:25 +0100
commit9f64932809b47fd5656b3cb385582ecb81d46d13 (patch)
treeddfe9e32f6a7df02c7fc8dc1f05cf6acba4dff32 /krebs/3modules
parent7c6bf8f43739950a6888ebfe78e17ea3b87f9182 (diff)
parentdf2ee4e726a784548faf8a9957bd0444c5cd0f71 (diff)
Merge remote-tracking branch 'ni/master'
Diffstat (limited to 'krebs/3modules')
-rw-r--r--krebs/3modules/iptables.nix6
-rw-r--r--krebs/3modules/tv/default.nix4
2 files changed, 6 insertions, 4 deletions
diff --git a/krebs/3modules/iptables.nix b/krebs/3modules/iptables.nix
index 09b493c20..d64ed86de 100644
--- a/krebs/3modules/iptables.nix
+++ b/krebs/3modules/iptables.nix
@@ -68,8 +68,8 @@ let
networking.firewall.enable = false;
systemd.services.krebs-iptables = {
- description = "krebs-iptables";
- wantedBy = [ "network-pre.target" ];
+ wantedBy = [ "sysinit.target" ];
+ wants = [ "network-pre.target" ];
before = [ "network-pre.target" ];
after = [ "systemd-modules-load.service" ];
@@ -85,6 +85,8 @@ let
Restart = "always";
ExecStart = startScript;
};
+
+ unitConfig.DefaultDependencies = false;
};
};
diff --git a/krebs/3modules/tv/default.nix b/krebs/3modules/tv/default.nix
index d44c322aa..3f00f30c2 100644
--- a/krebs/3modules/tv/default.nix
+++ b/krebs/3modules/tv/default.nix
@@ -224,8 +224,8 @@ with import <stockholm/lib>;
internet = {
ip4.addr = "188.68.36.196";
aliases = [
- "cgit.ni.i"
"ni.i"
+ "cgit.ni.i"
];
ssh.port = 11423;
};
@@ -360,8 +360,8 @@ with import <stockholm/lib>;
gg23 = {
ip4.addr = "10.23.1.38";
aliases = [
- "cache.xu.gg23"
"xu.gg23"
+ "cache.xu.gg23"
];
ssh.port = 11423;
};