Changeset 10564 in genesis

Timestamp:

Apr 23, 2012, 7:50:26 PM (13 years ago)

Author:

rick

Message:

The captive_portal_interfaces variable in hybrid means something different than
the traditional one (due to the fact that we use a different firewall). To
avoid confusion remove the old one from the hybrid views.

Fixes: nodefactory#130

While here, fix and error in the comment, as recursive diff is needed to parse
all directories.

File:

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

tools/gformat.py

@@ -470 +470 @@
 #
 captive_portal_whitelist=""
-captive_portal_interfaces="{{ autogen_dhcp_interfaces }}"
 # iLeiden Proxies {{ autogen_ileiden_proxies_names }}
 list_ileiden_proxies="{{ autogen_ileiden_proxies }}"
@@ -550 +549 @@
 # NODE iLeiden Configuration
 #
+captive_portal_interfaces="{{ autogen_dhcp_interfaces }}"
 
 {% if tproxy -%}
@@ -1064 +1064 @@
   $ ./gformat.py static /tmp/post
   VIEW differences and VERIFY all are OK:
-  $ diff -uI 'Generated' -r /tmp/pre /tmp/post
+  $ diff -urI 'Generated' -r /tmp/pre /tmp/post
 """
   exit(0)