Changeset 10112 in genesis for tools

Timestamp:

Mar 11, 2012, 2:21:20 PM (13 years ago)

Author:

rick

Message:

Included iLeiden proxy configuration into default proxy settings.

File:

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

tools/gformat.py

@@ -270 +270 @@
 def generate_rc_conf_local(datadump):
   """ Generate configuration file '/etc/rc.conf.local' """
-  datadump['ileiden_enable'] = 'yes' if datadump['ileiden'] else 'no'
+  datadump['autogen_ileiden_enable'] = 'yes' if datadump['ileiden'] else 'no'
+
+  ileiden_proxies = []
+  for proxy in get_proxylist():
+    proxydump = get_yaml(proxy)
+    if proxydump['ileiden']:
+      ileiden_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])
 
   output = generate_header("#");
@@ -303 +311 @@
 
 # PROXY iLeiden Configuration
-ileiden_enable="{{ ileiden_enable }}"
-gateway_enable="{{ ileiden_enable }}"
-firewall_enable="{{ ileiden_enable }}"
+lvrouted_enable="{{ autogen_ileiden_enable }}"
+lvrouted_flags="-u -s s00p3rs3kr3t -m 28"
+ileiden_enable="{{ autogen_ileiden_enable }}"
+gateway_enable="{{ autogen_ileiden_enable }}"
+firewall_enable="{{ autogen_ileiden_enable }}"
 firewall_script="/etc/ipfw.sh"
-firewall_nat_enable="{{ ileiden_enable }}"
+firewall_nat_enable="{{ autogen_ileiden_enable }}"
 {% endif -%}
 
 {% if nodetype == "CNode" %} 
+#
 # NODE iLeiden Configuration
+#
+# iLeiden Proxies {{ autogen_ileiden_proxies_names }}
+lvrouted_flags="-u -s s00p3rs3kr3t -m 28 -z {{ autogen_ileiden_proxies }}"
+
 captive_portal_whitelist=""
 captive_portal_interfaces="{{ autogen_dhcp_interfaces }}"