Changeset 10748 in genesis

Timestamp:

May 9, 2012, 5:18:18 PM (13 years ago)

Author:

rick

Message:

Setup for boxes which are _only_ incoming portforward and NAT units.

File:

• tools/gformat.py (modified) (4 diffs)

tools/gformat.py

@@ -99 +99 @@
   gfile = os.path.join(NODE_DIR,item,'wleiden.yaml')
 
-  # Use some boring defaults
   datadump = {}
   f = open(gfile, 'r')
   datadump.update(yaml.load(f,Loader=Loader))
   if datadump['nodetype'] == 'Hybrid':
-    defaults = { 'service_proxy_normal' : False, 'service_proxy_ileiden' : False, 'service_accesspoint' : True }
+    # Some values are defined implicitly
+    if datadump.has_key('rdr_rules') and datadump['rdr_rules'] and not datadump.has_key('service_incoming_rdr'):
+      datadump['service_incoming_rdr'] = True
+    # Use some boring defaults
+    defaults = { 
+      'service_proxy_normal' : False, 
+      'service_proxy_ileiden' : False, 
+      'service_accesspoint' : True, 
+      'service_incoming_rdr' : False 
+    }
     for (key,value) in defaults.iteritems():
       if not datadump.has_key(key):
@@ -560 +568 @@
   service_proxy_normal="{{ service_proxy_normal|yesorno }}"
   service_accesspoint="{{ service_accesspoint|yesorno }}"
+  service_incoming_rdr="{{ service_incoming_rdr|yesorno }}"
   #
 
@@ -566 +575 @@
     pf_flags="-D ext_if=$externalif -D ext_if_net=$externalif:network -D masterip=$masterip"
     pf_flags="$pf_flags -D publicnat=80,443"
-  {% elif service_proxy_normal %}
+  {% elif service_proxy_normal or service_incoming_rdr %}
     pf_rules="/etc/pf.hybrid.conf"
     pf_flags="-D ext_if=$externalif -D ext_if_net=$externalif:network -D masterip=$masterip"
@@ -849 +858 @@
 {% if service_proxy_ileiden -%} 
  - iLeiden Proxy
+{% endif -%}
+{% if service_incoming_rdr -%} 
+ - Incoming port redirects
 {% endif %}
 Interlinks:\n