Changeset 10524 in genesis

Timestamp:

Apr 17, 2012, 8:48:39 AM (13 years ago)

Author:

rick

Message:

Makes it crystal clear which part belong to which function.

File:

• tools/gformat.py (modified) (1 diff)

tools/gformat.py

@@ -505 +505 @@
 # Hybrid Configuration
 #
-captive_portal_interfaces="{{ autogen_dhcp_interfaces }}"
-externalif="{{ externalif }}"
+captive_portal_interfaces="{{ autogen_dhcp_interfaces|default('none', true) }}"
+externalif="{{ externalif|default('vr0', true) }}"
 masterip="{{ masterip }}"
 
 pf_rules="/etc/pf.hybrid.conf"
+pf_flags_hybrid="-D ext_if=$externalif -D ext_if_net=$externalif:network -D captive_portal_interfaces=$captive_portal_interfaces -D masterip=$masterip"
 {% if service_ileiden -%}
 # Service iLeiden
 service_ileiden="yes"
-pf_flags="-D ext_if=${externalif:-'vr0'} -D captive_portal_interfaces=${captive_portal_interfaces:-'none'} -D masterip=$masterip -D publicnat=80,443"
+pf_flags="$pf_flags_hybrid -D publicnat=80,443"
 {% else -%}
-pf_flags="-D ext_if=${externalif:-'vr0'} -D captive_portal_interfaces=${captive_portal_interfaces:-'none'} -D masterip=$masterip -D publicnat=0"
+pf_flags="$pf_flags_hybrid -D publicnat=0"
 {% endif -%}