Changeset 13305 in genesis


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

Reverting lvrouted -z implementation, since it does not seems to stabalize.

Related-To: beheer#968

File:
1 edited

Legend:

Unmodified
Added
Removed
  • tools/gformat.py

    r13303 r13305  
    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
    753764  captive_portal_interfaces="{{ autogen_dhcp_interfaces|join(',')|default('none', true) }}"
    754765  externalif="{{ externalif|default('vr0', true) }}"
     
    776787    pf_flags="-D ext_if=$externalif -D ext_if_net=$externalif:network -D masterip=$masterip"
    777788    pf_flags="$pf_flags -D publicnat=0"
    778     lvrouted_flags="$lvrouted_flags"
     789    lvrouted_flags="$lvrouted_flags -z `make_list "$list_ileiden_proxies" ","`"
    779790    named_setfib="1"
    780791    tinyproxy_setfib="1"
     
    785796    pf_rules="/etc/pf.node.conf"
    786797    pf_flags=""
    787     lvrouted_flags="$lvrouted_flags"
     798    lvrouted_flags="$lvrouted_flags -z `make_list "$list_ileiden_proxies" ","`"
    788799  {% endif %}
    789800  {% if service_concentrator %}
     
    823834#
    824835
     836# iLeiden Proxies {{ autogen_ileiden_proxies_names }}
     837list_ileiden_proxies="{{ autogen_ileiden_proxies_ips }}"
     838# normal Proxies {{ autogen_normal_proxies_names }}
     839list_normal_proxies="{{ autogen_normal_proxies_ips }}"
     840
    825841captive_portal_interfaces="{{ autogen_dhcp_interfaces|join(',') }}"
    826842
    827 lvrouted_flags="-u -s s00p3rs3kr3t -m 28"
     843lvrouted_flags="-u -s s00p3rs3kr3t -m 28 -z $list_ileiden_proxies"
    828844{% endif %}
    829845
Note: See TracChangeset for help on using the changeset viewer.