Changeset 10367 in genesis

Timestamp:

Apr 7, 2012, 10:13:29 AM (13 years ago)

Author:

rick

Message:

Listing of both normal and ieldien proxies, as discussed at techniek@

File:

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

tools/gformat.py

@@ -337 +337 @@
 
   ileiden_proxies = []
+  normal_proxies = []
   for proxy in get_proxylist():
     proxydump = get_yaml(proxy)
     if proxydump['ileiden']:
       ileiden_proxies.append(proxydump)
+    else:
+      normal_proxies.append(proxydump)
   datadump['autogen_ileiden_proxies'] = ','.join([x['masterip'] for x in ileiden_proxies])
   datadump['autogen_ileiden_proxies_names'] = ','.join([x['autogen_item'] for x in ileiden_proxies])
+  datadump['autogen_normal_proxies'] = ','.join([x['masterip'] for x in normal_proxies])
+  datadump['autogen_normal_proxies_names'] = ','.join([x['autogen_item'] for x in normal_proxies])
 
   output = generate_header("#");
@@ -393 +398 @@
 #
 # iLeiden Proxies {{ autogen_ileiden_proxies_names }}
-lvrouted_flags="-u -s s00p3rs3kr3t -m 28 -z {{ autogen_ileiden_proxies }}"
+list_ileiden_proxies="{{ autogen_ileiden_proxies }}"
+# normal Proxies {{ autogen_normal_proxies_names }}
+list_normal_proxies="{{ autogen_normal_proxies }}"
+
+lvrouted_flags="-u -s s00p3rs3kr3t -m 28 -z $list_ileiden_proxies"
 {% endif %}
 {% if vpnif -%}