Changeset 10524 in genesis


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • tools/gformat.py

    r10521 r10524  
    505505# Hybrid Configuration
    506506#
    507 captive_portal_interfaces="{{ autogen_dhcp_interfaces }}"
    508 externalif="{{ externalif }}"
     507captive_portal_interfaces="{{ autogen_dhcp_interfaces|default('none', true) }}"
     508externalif="{{ externalif|default('vr0', true) }}"
    509509masterip="{{ masterip }}"
    510510
    511511pf_rules="/etc/pf.hybrid.conf"
     512pf_flags_hybrid="-D ext_if=$externalif -D ext_if_net=$externalif:network -D captive_portal_interfaces=$captive_portal_interfaces -D masterip=$masterip"
    512513{% if service_ileiden -%}
    513514# Service iLeiden
    514515service_ileiden="yes"
    515 pf_flags="-D ext_if=${externalif:-'vr0'} -D captive_portal_interfaces=${captive_portal_interfaces:-'none'} -D masterip=$masterip -D publicnat=80,443"
     516pf_flags="$pf_flags_hybrid -D publicnat=80,443"
    516517{% else -%}
    517 pf_flags="-D ext_if=${externalif:-'vr0'} -D captive_portal_interfaces=${captive_portal_interfaces:-'none'} -D masterip=$masterip -D publicnat=0"
     518pf_flags="$pf_flags_hybrid -D publicnat=0"
    518519{% endif -%}
    519520
Note: See TracChangeset for help on using the changeset viewer.