Changeset 13305 in genesis for tools

Timestamp:

Jul 26, 2015, 11:42:47 PM (9 years ago)

Author:

rick

Message:

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

Related-To: beheer#968

File:

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

tools/gformat.py

@@ -751 +751 @@
   # Hybrid Configuration
   #
+  list_ileiden_proxies="
+  {% for item in autogen_ileiden_proxies -%}
+    {{ "%-16s"|format(item.masterip) }} # {{ item.autogen_realname }}
+  {% endfor -%}
+  "
+  list_normal_proxies="
+  {% for item in autogen_normal_proxies -%}
+    {{ "%-16s"|format(item.masterip) }} # {{ item.autogen_realname }}
+  {% endfor -%}
+  "
+
   captive_portal_interfaces="{{ autogen_dhcp_interfaces|join(',')|default('none', true) }}"
   externalif="{{ externalif|default('vr0', true) }}"
@@ -776 +787 @@
     pf_flags="-D ext_if=$externalif -D ext_if_net=$externalif:network -D masterip=$masterip"
     pf_flags="$pf_flags -D publicnat=0"
-    lvrouted_flags="$lvrouted_flags"
+    lvrouted_flags="$lvrouted_flags -z `make_list "$list_ileiden_proxies" ","`"
     named_setfib="1"
     tinyproxy_setfib="1"
@@ -785 +796 @@
     pf_rules="/etc/pf.node.conf"
     pf_flags=""
-    lvrouted_flags="$lvrouted_flags"
+    lvrouted_flags="$lvrouted_flags -z `make_list "$list_ileiden_proxies" ","`"
   {% endif %}
   {% if service_concentrator %}
@@ -823 +834 @@
 #
 
+# iLeiden Proxies {{ autogen_ileiden_proxies_names }}
+list_ileiden_proxies="{{ autogen_ileiden_proxies_ips }}"
+# normal Proxies {{ autogen_normal_proxies_names }}
+list_normal_proxies="{{ autogen_normal_proxies_ips }}"
+
 captive_portal_interfaces="{{ autogen_dhcp_interfaces|join(',') }}"
 
-lvrouted_flags="-u -s s00p3rs3kr3t -m 28"
+lvrouted_flags="-u -s s00p3rs3kr3t -m 28 -z $list_ileiden_proxies"
 {% endif %}