| Server (ports, hosts) => (confLine_in (uname, rule); confLine_in_v6 (uname, rule))
| LocalServer ports => (insertConfLine (uname, ruleNode, Client (ports, ["127.0.0.1/8"]));
insertConfLine (uname, ruleNode, Server (ports, ["127.0.0.1/8"]));
- insertConfLine (uname, ruleNode, Client (ports, [":::1"]));
- insertConfLine (uname, ruleNode, Server (ports, [":::1"])))
+ insertConfLine (uname, ruleNode, Client (ports, ["::1"]));
+ insertConfLine (uname, ruleNode, Server (ports, ["::1"])))
| ProxiedServer ports => if (fn FirewallNode r => r) ruleNode = Slave.hostname () then
(insertConfLine (uname, ruleNode, Server (ports, ["$WEBNODES"]));
insertConfLine (uname, ruleNode, Client (ports, [fwnode_domain ruleNode])))
val nodeFermRules = generateNodeFermRules rules
fun write_tcp_in_conf_preamble outf =
- (* no ipv6 support yet, but use @ipfilter() in ferm to prepare *)
TextIO.output (outf, String.concat ["@def $WEBNODES = @ipfilter((",
- (String.concatWith " " (List.map (fn (_, ip) => ip)
- (List.filter (fn (node, _) => List.exists (fn (n) => n = node) (List.map (fn (node, _) => node) (Config.Apache.webNodes_all @ Config.Apache.webNodes_admin)))
+ (String.concatWith " " (List.map (fn (_, ip, ipv6) => ip ^ " " ^ "[" ^ ipv6 ^ "]")
+ (List.filter (fn (node, _, _) => List.exists (fn (n) => n = node) (List.map (fn (node, _) => node) (Config.Apache.webNodes_all @ Config.Apache.webNodes_admin)))
Config.nodeIps))),
"));\n\n"])