Changeset 10714 in genesis

Timestamp:

May 7, 2012, 8:59:45 PM (13 years ago)

Author:

rick

Message:

Fill the content of the pf.hybrid.conf.local

rdr_rules is een array van de vorm:

• [src_port, dest_ip, dest_port]

rdr_ip: is de external facing IP waar de rdr_rules (normaal op gelden). Dit is
voornamelijk administratief en moet dus het externe IP zijn voor het geval er

Let wel op dat een (eventuele) router die ertussen zit natuurlijk ook port
forwarding moet instellen.

Related-To: nodefactory#152

Files:

• nodes/HybridRick2/wleiden.yaml (modified) (1 diff)
• tools/gformat.py (modified) (2 diffs)

nodes/HybridRick2/wleiden.yaml

@@ -18 +18 @@
 service_proxy_normal: True
 status    : "up"
+rdr_host: "riff.vanderzwet.net"
+rdr_rules :
+- [9080, '172.17.0.41', 80]
+- [9081, '172.17.0.42', 80]
+- [9082, '172.17.0.43', 80]
+- [9083, '172.17.0.44', 80]
+remote_access: "riff.vanderzwet.net:2022"
 
 

tools/gformat.py

@@ -791 +791 @@
   """ Generate configuration file '/etc/pf.hybrid.conf.local' """
   datadump['autogen_header'] = generate_header("#")
-  datadump['rdr_rules' ] = ('8081', '172.16.4.46', 'http')
   return Template("""\
 {{ autogen_header }}
 
 # Redirect some internal facing services outside (7)
-# rdr on $ext_if inet proto tcp from any to $ext_if port 8081 tag SRV -> 172.16.4.46 port http
-# XXX: Implement
+# INFO: {{ rdr_rules|count }} rdr_rules (outside to internal redirect rules) defined.
+{% for src_port,dest_ip,dest_port in rdr_rules -%}
+rdr on $ext_if inet proto tcp from any to $ext_if port {{ src_port }} tag SRV -> {{ dest_ip }} port {{ dest_port }}
+{% endfor -%}
 """).render(datadump)
 
@@ -855 +856 @@
   iface_keys = [elem for elem in datadump.keys() if elem.startswith('iface_')]
   for key in sorted(set(datadump.keys()) - set(iface_keys)):
-    output += "%-10s: %s\n" % (key, format_yaml_value(datadump[key]))
+    if key == 'rdr_rules':
+      output += '%-10s:\n' % 'rdr_rules'
+      for rdr_rule in datadump[key]:
+        output += '- %s\n' % rdr_rule
+    else:
+      output += "%-10s: %s\n" % (key, format_yaml_value(datadump[key]))
 
   output += "\n\n"