Changeset 10599 in genesis


Ignore:
Timestamp:
Apr 26, 2012, 6:47:13 PM (13 years ago)
Author:
rick
Message:

Get rid of all the /usr based binary hacking. Please do mind that the make_list
is an function defined in /etc/rc.conf and is thus custom for node configuration.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • tools/gformat.py

    r10597 r10599  
    517517  # Hybrid Configuration
    518518  #
    519   list_ileiden_proxies=`cat <<EOF | awk '{ print $1 }' | tr '\\n' ','
     519  list_ileiden_proxies="
    520520  {% for item in autogen_ileiden_proxies -%}
    521521    {{ "%-16s"|format(item.masterip) }} # {{ item.autogen_realname }}
    522522  {% endfor -%}
    523   EOF`
    524   list_normal_proxies=`cat <<EOF | awk '{ print $1 }' | tr '\\n' ','
     523  "
     524  list_normal_proxies="
    525525  {% for item in autogen_normal_proxies -%}
    526526    {{ "%-16s"|format(item.masterip) }} # {{ item.autogen_realname }}
    527527  {% endfor -%}
    528   EOF`
     528  "
    529529
    530530  captive_portal_interfaces="{{ autogen_dhcp_interfaces|default('none', true) }}"
     
    546546    pf_flags="-D ext_if=$externalif -D ext_if_net=$externalif:network -D masterip=$masterip"
    547547    pf_flags="$pf_flags -D ext_if_gw=${ext_if_gw:-"{{ gateway|default('127.127.127.127') }}"}"
    548     lvrouted_flags="$lvrouted_flags -z $list_ileiden_proxies"
     548    lvrouted_flags="$lvrouted_flags -z `make_list "$list_ileiden_proxies" ","`"
    549549  {% else %}
    550550    pf_rules="/etc/pf.node.conf"
Note: See TracChangeset for help on using the changeset viewer.