Changeset 13303 in genesis


Ignore:
Timestamp:
Jul 26, 2015, 9:03:47 PM (8 years ago)
Author:
rick
Message:

Removing old fixed IP configuration used by lvrouted and replacing with the new '-z' feature.

Related-To: beheer#968

File:
1 edited

Legend:

Unmodified
Added
Removed
  • tools/gformat.py

    r13279 r13303  
    751751  # Hybrid Configuration
    752752  #
    753   list_ileiden_proxies="
    754   {% for item in autogen_ileiden_proxies -%}
    755     {{ "%-16s"|format(item.masterip) }} # {{ item.autogen_realname }}
    756   {% endfor -%}
    757   "
    758   list_normal_proxies="
    759   {% for item in autogen_normal_proxies -%}
    760     {{ "%-16s"|format(item.masterip) }} # {{ item.autogen_realname }}
    761   {% endfor -%}
    762   "
    763 
    764753  captive_portal_interfaces="{{ autogen_dhcp_interfaces|join(',')|default('none', true) }}"
    765754  externalif="{{ externalif|default('vr0', true) }}"
     
    787776    pf_flags="-D ext_if=$externalif -D ext_if_net=$externalif:network -D masterip=$masterip"
    788777    pf_flags="$pf_flags -D publicnat=0"
    789     lvrouted_flags="$lvrouted_flags -z `make_list "$list_ileiden_proxies" ","`"
     778    lvrouted_flags="$lvrouted_flags"
    790779    named_setfib="1"
    791780    tinyproxy_setfib="1"
     
    796785    pf_rules="/etc/pf.node.conf"
    797786    pf_flags=""
    798     lvrouted_flags="$lvrouted_flags -z `make_list "$list_ileiden_proxies" ","`"
     787    lvrouted_flags="$lvrouted_flags"
    799788  {% endif %}
    800789  {% if service_concentrator %}
     
    834823#
    835824
    836 # iLeiden Proxies {{ autogen_ileiden_proxies_names }}
    837 list_ileiden_proxies="{{ autogen_ileiden_proxies_ips }}"
    838 # normal Proxies {{ autogen_normal_proxies_names }}
    839 list_normal_proxies="{{ autogen_normal_proxies_ips }}"
    840 
    841825captive_portal_interfaces="{{ autogen_dhcp_interfaces|join(',') }}"
    842826
    843 lvrouted_flags="-u -s s00p3rs3kr3t -m 28 -z $list_ileiden_proxies"
     827lvrouted_flags="-u -s s00p3rs3kr3t -m 28"
    844828{% endif %}
    845829
Note: See TracChangeset for help on using the changeset viewer.