Changeset 7792

Show
Ignore:
Timestamp:
10/26/11 14:55:24 (20 months ago)
Author:
soma
Message:

contrib/meshwizard: Better formatting

Location:
luci/trunk/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers
Files:
8 modified

Legend:

Unmodified
Added
Removed

  • luci/trunk/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_dhcp.sh

    r7610 r7792  
    1919 
    2020uci batch << EOF 
    21 set dhcp.${netrenamed}dhcp="dhcp" 
    22 set dhcp.${netrenamed}dhcp.interface="${netrenamed}dhcp" 
     21    set dhcp.${netrenamed}dhcp="dhcp" 
     22    set dhcp.${netrenamed}dhcp.interface="${netrenamed}dhcp" 
    2323EOF 
    2424 

  • luci/trunk/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_dnsmasq.sh

    r7501 r7792  
    1414config_foreach handle_dhcp dnsmasq 
    1515 
    16 uci set dhcp.dnsmasq.local="/$profile_suffix/" 
    17 uci set dhcp.dnsmasq.domain="$profile_suffix" 
     16uci batch << EOF 
     17    set dhcp.dnsmasq.local="/$profile_suffix/" 
     18    set dhcp.dnsmasq.domain="$profile_suffix" 
     19EOF 
    1820 
    1921config_get addnhosts dnsmasq addnhosts 

  • luci/trunk/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_firewall.sh

    r7778 r7792  
    4949 
    5050uci batch << EOF 
    51 set firewall.zone_freifunk="zone" 
    52 set firewall.zone_freifunk.name="freifunk" 
    53 set firewall.zone_freifunk.input="$zone_freifunk_input" 
    54 set firewall.zone_freifunk.forward="$zone_freifunk_forward" 
    55 set firewall.zone_freifunk.output="$zone_freifunk_output" 
     51    set firewall.zone_freifunk="zone" 
     52    set firewall.zone_freifunk.name="freifunk" 
     53    set firewall.zone_freifunk.input="$zone_freifunk_input" 
     54    set firewall.zone_freifunk.forward="$zone_freifunk_forward" 
     55    set firewall.zone_freifunk.output="$zone_freifunk_output" 
    5656EOF 
    5757 

  • luci/trunk/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_network.sh

    r7791 r7792  
    1313 
    1414uci batch << EOF 
    15 set network.$netrenamed="interface" 
    16 set network.$netrenamed.proto="static" 
    17 set network.$netrenamed.ipaddr="$ipaddr" 
     15    set network.$netrenamed="interface" 
     16    set network.$netrenamed.proto="static" 
     17    set network.$netrenamed.ipaddr="$ipaddr" 
    1818EOF 
     19 
    1920set_defaults "interface_" network.$netrenamed 
    2021uci_commitverbose "Setup interface $netrenamed" network 
    … …  
    6263    fi 
    6364 
    64     uci batch << EOF 
    65     set network.${netrenamed}dhcp.proto=static 
    66     set network.${netrenamed}dhcp.ipaddr="$START" 
    67     set network.${netrenamed}dhcp.netmask="$NETMASK" 
    68     uci_commitverbose  "Setup interface for ${netrenamed}dhcp" network 
    69 EOF 
     65    uci batch <<- EOF 
     66        set network.${netrenamed}dhcp.proto=static 
     67        set network.${netrenamed}dhcp.ipaddr="$START" 
     68        set network.${netrenamed}dhcp.netmask="$NETMASK" 
     69        uci_commitverbose  "Setup interface for ${netrenamed}dhcp" network 
     70    EOF 
    7071 
    7172fi 

  • luci/trunk/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_olsrd.sh

    r7778 r7792  
    3838fi 
    3939uci batch << EOF 
    40 set olsrd.olsrd_nameservice=LoadPlugin 
    41 set olsrd.olsrd_nameservice.library="olsrd_nameservice.so.0.3" 
    42 set olsrd.olsrd_nameservice.latlon_file="/var/run/latlon.js" 
    43 set olsrd.olsrd_nameservice.hosts_file="/var/etc/hosts.olsr" 
    44 set olsrd.olsrd_nameservice.sighup_pid_file="/var/run/dnsmasq.pid" 
    45 set olsrd.olsrd_nameservice.suffix="$suffix" 
     40    set olsrd.olsrd_nameservice=LoadPlugin 
     41    set olsrd.olsrd_nameservice.library="olsrd_nameservice.so.0.3" 
     42    set olsrd.olsrd_nameservice.latlon_file="/var/run/latlon.js" 
     43    set olsrd.olsrd_nameservice.hosts_file="/var/etc/hosts.olsr" 
     44    set olsrd.olsrd_nameservice.sighup_pid_file="/var/run/dnsmasq.pid" 
     45    set olsrd.olsrd_nameservice.suffix="$suffix" 
    4646EOF 
    4747 

  • luci/trunk/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_splash.sh

    r7778 r7792  
    2626    config_foreach handle_splash iface 
    2727 
    28     uci set luci_splash.${netrenamed}dhcp="iface" 
    29     uci set luci_splash.${netrenamed}dhcp.network="${netrenamed}dhcp" 
    30     uci set luci_splash.${netrenamed}dhcp.zone="freifunk" 
     28    uci batch <<- EOF 
     29        set luci_splash.${netrenamed}dhcp="iface" 
     30        set luci_splash.${netrenamed}dhcp.network="${netrenamed}dhcp" 
     31        set luci_splash.${netrenamed}dhcp.zone="freifunk" 
     32    EOF 
    3133 
    3234    uci_commitverbose "Setup dhcpsplash for ${netrenamed}dhcp" luci_splash 

  • luci/trunk/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_wan_static.sh

    r7791 r7792  
    2222 
    2323if [ "$wan_allowssh" == 1 ]; then 
    24     uci batch << EOF 
    25 set firewall.wanssh=rule 
    26 set firewall.wanssh.src=wan 
    27 set firewall.wanssh.target=ACCEPT 
    28 set firewall.wanssh.proto=tcp 
    29 set firewall.wanssh.dest_port=22 
    30 EOF 
     24    uci batch <<- EOF 
     25        set firewall.wanssh=rule 
     26        set firewall.wanssh.src=wan 
     27        set firewall.wanssh.target=ACCEPT 
     28        set firewall.wanssh.proto=tcp 
     29        set firewall.wanssh.dest_port=22 
     30    EOF 
    3131    uci_commitverbose "Allow incoming connections to port 22 (ssh) on wan" firewall 
    3232fi 
    3333 
    3434if [ "$wan_allowweb" == 1 ]; then 
    35     uci batch << EOF 
    36 set firewall.wanweb=rule 
    37 set firewall.wanweb.src=wan 
    38 set firewall.wanweb.target=ACCEPT 
    39 set firewall.wanweb.proto=tcp 
    40 set firewall.wanweb.dest_port=80 
    41 set firewall.wanwebhttps=rule 
    42 set firewall.wanwebhttps.src=wan 
    43 set firewall.wanwebhttps.target=ACCEPT 
    44 set firewall.wanwebhttps.proto=tcp 
    45 set firewall.wanwebhttps.dest_port=443 
    46 EOF 
     35    uci batch <<- EOF 
     36        set firewall.wanweb=rule 
     37        set firewall.wanweb.src=wan 
     38        set firewall.wanweb.target=ACCEPT 
     39        set firewall.wanweb.proto=tcp 
     40        set firewall.wanweb.dest_port=80 
     41        set firewall.wanwebhttps=rule 
     42        set firewall.wanwebhttps.src=wan 
     43        set firewall.wanwebhttps.target=ACCEPT 
     44        set firewall.wanwebhttps.proto=tcp 
     45        set firewall.wanwebhttps.dest_port=443 
     46    EOF 
    4747    uci_commitverbose "Allow incoming connections to port 80 and 443 (http and https) on wan" firewall 
    4848fi 

  • luci/trunk/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_wifi.sh

    r7610 r7792  
    3636 
    3737uci batch << EOF 
    38 set wireless.${net}.type="$type" 
    39 set wireless.${net}.channel="$channel" 
     38    set wireless.${net}.type="$type" 
     39    set wireless.${net}.channel="$channel" 
    4040EOF 
    4141 
    … …  
    7070 
    7171uci batch << EOF 
    72 set wireless.$net\_iface.device="${net}" 
    73 set wireless.$net\_iface.network="$netrenamed" 
    74 set wireless.$net\_iface.ssid="$ssid" 
    75 set wireless.$net\_iface.bssid="$bssid" 
     72    set wireless.$net\_iface.device="${net}" 
     73    set wireless.$net\_iface.network="$netrenamed" 
     74    set wireless.$net\_iface.ssid="$ssid" 
     75    set wireless.$net\_iface.bssid="$bssid" 
    7676EOF 
    7777 
    … …  
    8181ip4addr="$(uci get meshwizard.netconfig.$net\_ip4addr)" 
    8282if [ "$type" == "atheros" -a "$vap" == 1 ]; then 
    83     uci batch << EOF 
    84 set wireless.$net\_iface_dhcp="wifi-iface" 
    85 set wireless.$net\_iface_dhcp.device="$net" 
    86 set wireless.$net\_iface_dhcp.mode="ap" 
    87 set wireless.$net\_iface_dhcp.encryption="none" 
    88 set wireless.$net\_iface_dhcp.network="${netrenamed}dhcp" 
    89 set wireless.$net\_iface_dhcp.ssid="FF-AP-$ip4addr" 
    90 EOF 
     83    uci batch <<- EOF 
     84        set wireless.$net\_iface_dhcp="wifi-iface" 
     85        set wireless.$net\_iface_dhcp.device="$net" 
     86        set wireless.$net\_iface_dhcp.mode="ap" 
     87        set wireless.$net\_iface_dhcp.encryption="none" 
     88        set wireless.$net\_iface_dhcp.network="${netrenamed}dhcp" 
     89        set wireless.$net\_iface_dhcp.ssid="FF-AP-$ip4addr" 
     90    EOF 
    9191    uci_commitverbose "Setup VAP interface for $netrenamed" wireless 
    9292fi