Fix iptables rule
Eelco Dolstra committed
Jun 7, 2013 at 17:48 UTC
ff480f221840a3eba879ef5ae37a7a170a72504c
2 files changed
+6
-12
delft/delft-webserver.nix
+1
-9
@@ -57,9 +57,7 @@ let
57
58
in
59
60
-rec {
61
- require = [ ];
62
-
60
+{
61
services = {
62
63
httpd = {
@@ -273,12 +271,6 @@ rec {
271
];
272
};
273
276
- zabbixAgent.enable = true;
277
-
278
- zabbixServer.enable = true;
279
- zabbixServer.dbServer = "wendy";
280
- zabbixServer.dbPassword = import ./zabbix-password.nix;
281
-
274
};
275
276
environment.systemPackages = [ zabbixMail ];
delft/wendy.nix
+5
-3
@@ -141,15 +141,13 @@ in
141
firewall.allowedUDPPorts = [ 53 67 ];
142
firewall.extraCommands =
143
''
144
- ip46tables -A nixos-fw -p tcp --dport 5432 -s 192.168.1.25 -j nixos-fw-accept
144
+ iptables -A nixos-fw -p tcp --dport 5432 -i internal -j nixos-fw-accept
145
'';
146
147
nat.enable = true;
148
nat.internalIPs = "192.168.1.0/22";
149
nat.externalInterface = "external";
150
nat.externalIP = myIP;
151
-
152
-
151
};
152
153
jobs.dnsmasq =
@@ -193,4 +191,8 @@ in
191
systemd.services.httpd.serviceConfig.CPUShares = 1000;
192
systemd.services.httpd.serviceConfig.MemoryLimit = "1500M";
193
systemd.services.httpd.serviceConfig.ControlGroupAttribute = [ "memory.memsw.limit_in_bytes 1500M" ];
194
+
195
+ services.zabbixServer.enable = true;
196
+ services.zabbixServer.dbServer = "wendy";
197
+ services.zabbixServer.dbPassword = import ./zabbix-password.nix;
198
}