Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'ni/master'

Browse Source
This commit is contained in:
lassulus 2017-03-14 21:14:25 +01:00
commit 9f64932809
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
krebs/3modules/iptables.nix
View File

@ -68,8 +68,8 @@ let
networking.firewall.enable = false; networking.firewall.enable = false;
systemd.services.krebs-iptables = { systemd.services.krebs-iptables = {
description = "krebs-iptables"; wantedBy = [ "sysinit.target" ];
wantedBy = [ "network-pre.target" ]; wants = [ "network-pre.target" ];
before = [ "network-pre.target" ]; before = [ "network-pre.target" ];
after = [ "systemd-modules-load.service" ]; after = [ "systemd-modules-load.service" ];
@ -85,6 +85,8 @@ let
Restart = "always"; Restart = "always";
ExecStart = startScript; ExecStart = startScript;
}; };
unitConfig.DefaultDependencies = false;
}; };
}; };

4
krebs/3modules/tv/default.nix
View File

@ -224,8 +224,8 @@ with import <stockholm/lib>;
internet = { internet = {
ip4.addr = "188.68.36.196"; ip4.addr = "188.68.36.196";
aliases = [ aliases = [
"cgit.ni.i"
"ni.i" "ni.i"
"cgit.ni.i"
]; ];
ssh.port = 11423; ssh.port = 11423;
}; };
@ -360,8 +360,8 @@ with import <stockholm/lib>;
gg23 = { gg23 = {
ip4.addr = "10.23.1.38"; ip4.addr = "10.23.1.38";
aliases = [ aliases = [
"cache.xu.gg23"
"xu.gg23" "xu.gg23"
"cache.xu.gg23"
]; ];
ssh.port = 11423; ssh.port = 11423;
}; };

6
tv/3modules/iptables.nix
View File

@ -57,8 +57,8 @@ let {
networking.firewall.enable = false; networking.firewall.enable = false;
systemd.services.tv-iptables = { systemd.services.tv-iptables = {
description = "tv-iptables"; wantedBy = [ "sysinit.target" ];
wantedBy = [ "network-pre.target" ]; wants = [ "network-pre.target" ];
before = [ "network-pre.target" ]; before = [ "network-pre.target" ];
after = [ "systemd-modules-load.service" ]; after = [ "systemd-modules-load.service" ];
@ -79,6 +79,8 @@ let {
ip6tables-restore < ${rules 6} ip6tables-restore < ${rules 6}
''; '';
}; };
unitConfig.DefaultDependencies = false;
}; };
}; };