Changeset 10190 in genesis

Timestamp:

Mar 17, 2012, 12:15:14 PM (13 years ago)

Author:

richardvm

Message:

seperate hybrid from proxy of node

File:

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

tools/gformat.py

@@ -294 +294 @@
 {% endif -%}
 
-{% if nodetype == "Proxy" or nodetype == "Hybrid" %}
+{% if nodetype == "Proxy" %}
 #
 # PROXY Configuration
@@ -310 +310 @@
 
 internalif="{{ internalif }}"
-{% if vpnif -%}
-  vpnif="{{ vpnif }}"\n
-{% endif -%}
 
 # PROXY iLeiden Configuration
@@ -339 +336 @@
 # Hybrid Node
 #
+{% if internalroute -%}
+static_routes="wleiden"
+route_wleiden="-net 172.16.0.0/12 {{ internalroute }}"
+{% endif -%}
+
+{% if gateway -%}
+defaultrouter="{{ gateway }}"
+{% else -%}
+#defaultrouter="NOTSET"
+{% endif -%}
+
+internalif="{{ internalif }}"
+{% if vpnif -%}
+  vpnif="{{ vpnif }}"\n
+{% endif -%}
+
+lvrouted_enable="{{ autogen_ileiden_enable }}"
 lvrouted_flags="-u -s s00p3rs3kr3t -m 28"
+
+gateway_enable="{{ autogen_ileiden_enable }}"
+
+ileiden_enable="{{ autogen_ileiden_enable }}"
+firewall_enable="{{ autogen_ileiden_enable }}"
+firewall_script="/etc/ipfw.sh"
 
 captive_portal_whitelist=""
 captive_portal_interfaces="{{ autogen_dhcp_interfaces }}"
 {% endif %}
-
 
 """).render(datadump)