summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--krebs/3modules/iptables.nix6
-rw-r--r--krebs/3modules/tv/default.nix4
-rw-r--r--tv/3modules/iptables.nix6
3 files changed, 10 insertions, 6 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;
};
diff --git a/tv/3modules/iptables.nix b/tv/3modules/iptables.nix
index 803ed6fbf..56861dc74 100644
--- a/tv/3modules/iptables.nix
+++ b/tv/3modules/iptables.nix
@@ -57,8 +57,8 @@ let {
networking.firewall.enable = false;
systemd.services.tv-iptables = {
- description = "tv-iptables";
- wantedBy = [ "network-pre.target" ];
+ wantedBy = [ "sysinit.target" ];
+ wants = [ "network-pre.target" ];
before = [ "network-pre.target" ];
after = [ "systemd-modules-load.service" ];
@@ -79,6 +79,8 @@ let {
ip6tables-restore < ${rules 6}
'';
};
+
+ unitConfig.DefaultDependencies = false;
};
};