Changeset 10521 in genesis for tools

Timestamp:

Apr 17, 2012, 7:40:26 AM (13 years ago)

Author:

rick

Message:

Need the masterip for the NAT rules.

File:

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

tools/gformat.py

@@ -507 +507 @@
 captive_portal_interfaces="{{ autogen_dhcp_interfaces }}"
 externalif="{{ externalif }}"
+masterip="{{ masterip }}"
 
 pf_rules="/etc/pf.hybrid.conf"
@@ -512 +513 @@
 # Service iLeiden
 service_ileiden="yes"
-pf_flags="-D ext_if=${externalif:-'vr0'} -D captive_portal_interfaces=${captive_portal_interfaces:-'none'} -D publicnat=80,443"
+pf_flags="-D ext_if=${externalif:-'vr0'} -D captive_portal_interfaces=${captive_portal_interfaces:-'none'} -D masterip=$masterip -D publicnat=80,443"
 {% else -%}
-pf_flags="-D ext_if=${externalif:-'vr0'} -D captive_portal_interfaces=${captive_portal_interfaces:-'none'} -D publicnat=0"
+pf_flags="-D ext_if=${externalif:-'vr0'} -D captive_portal_interfaces=${captive_portal_interfaces:-'none'} -D masterip=$masterip -D publicnat=0"
 {% endif -%}