Remove Flash policy stuff
Eelco Dolstra committed
Jun 7, 2013 at 17:39 UTC
03cd27c9328cda42525348ec4c65c71d4f4430fa
3 files changed
+2
-12
delft/cartman.nix
+1
-7
@@ -145,12 +145,8 @@ rec {
145
146
extraHosts = "192.168.1.5 cartman";
147
148
- firewall.allowedTCPPorts = [ 80 443 843 10051 5999 ];
148
+ firewall.allowedTCPPorts = [ 80 443 10051 5999 ];
149
firewall.allowedUDPPorts = [ 53 67 ];
150
- firewall.extraCommands =
151
- ''
152
- ip46tables -I nixos-fw-accept -p tcp --dport 843 --syn -j LOG --log-level info --log-prefix "POLICY REQUEST: "
153
- '';
150
151
nat.enable = true;
152
nat.internalIPs = "192.168.1.0/22";
@@ -482,8 +478,6 @@ rec {
478
zabbixServer.dbServer = "wendy";
479
zabbixServer.dbPassword = import ./zabbix-password.nix;
480
485
- flashpolicyd.enable = true;
486
-
481
};
482
483
# Needed for the Nixpkgs mirror script.
delft/delft-webserver.nix
-2
@@ -279,8 +279,6 @@ rec {
279
zabbixServer.dbServer = "wendy";
280
zabbixServer.dbPassword = import ./zabbix-password.nix;
281
282
- flashpolicyd.enable = true;
283
-
282
};
283
284
environment.systemPackages = [ zabbixMail ];
delft/wendy.nix
+1
-3
@@ -115,7 +115,6 @@ in
115
ACTION=="add", SUBSYSTEM=="net", ATTR{address}=="f0:4d:a2:40:1b:c0", NAME="internal"
116
'';
117
118
-
118
networking = {
119
hostName = "wendy";
120
domain = "buildfarm";
@@ -138,11 +137,10 @@ in
137
138
extraHosts = "192.168.1.26 wendy";
139
141
- firewall.allowedTCPPorts = [ 80 443 843 10051 5999 ];
140
+ firewall.allowedTCPPorts = [ 80 443 10051 5999 ];
141
firewall.allowedUDPPorts = [ 53 67 ];
142
firewall.extraCommands =
143
''
145
- ip46tables -I nixos-fw-accept -p tcp --dport 843 --syn -j LOG --log-level info --log-prefix "POLICY REQUEST: "
144
ip46tables -A nixos-fw -p tcp --dport 5432 -s 192.168.1.25 -j nixos-fw-accept
145
'';
146