Index: tools/gformat.py
===================================================================
--- tools/gformat.py	(revision 10234)
+++ tools/gformat.py	(revision 10238)
@@ -304,8 +304,4 @@
 # PROXY Configuration
 #
-{% if internalroute -%}
-static_routes="wleiden"
-route_wleiden="-net 172.16.0.0/12 {{ internalroute }}"
-{% endif -%}
 
 {% if gateway -%}
@@ -318,11 +314,20 @@
 
 # PROXY iLeiden Configuration
+ileiden_enable="{{ autogen_ileiden_enable }}"
+gateway_enable="{{ autogen_ileiden_enable }}"
+pf_enable="yes"
+pf2_enable="yes"
+{% if autogen_ileiden_enable == "yes" -%}
+pf_flags="-D ext_if={{ externalif }} -D int_if={{ internalif }} -D publicnat={80,443}"
 lvrouted_enable="{{ autogen_ileiden_enable }}"
 lvrouted_flags="-u -s s00p3rs3kr3t -m 28"
-ileiden_enable="{{ autogen_ileiden_enable }}"
-gateway_enable="{{ autogen_ileiden_enable }}"
-pf_enable="{{ autogen_ileiden_enable }}"
-pf_flags="-D ext_if={{ externalif }} -D int_if={{ internalif }} -D publicnat={80,443}"
-pf2_enable="{{ autogen_ileiden_enable }}"
+{% else -%}
+pf_flags="-D ext_if={{ externalif }} -D int_if={{ internalif }} -D publicnat={0}"
+{% if internalroute -%}
+static_routes="wleiden"
+route_wleiden="-net 172.16.0.0/12 {{ internalroute }}"
+{% endif -%}
+{% endif -%}
+
 {% endif -%}