Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

contrib/meshwizard: Better formatting

Browse source
This commit is contained in:
Manuel Munz 2011-10-26 13:55:24 +00:00
parent 5654bb7ef6
commit a4a9314651
8 changed files with 65 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_dhcp.sh
View file

@ -18,8 +18,8 @@ config_load dhcp
config_foreach handle_dnsmasq dhcp config_foreach handle_dnsmasq dhcp
uci batch << EOF uci batch << EOF
set dhcp.${netrenamed}dhcp="dhcp" set dhcp.${netrenamed}dhcp="dhcp"
set dhcp.${netrenamed}dhcp.interface="${netrenamed}dhcp" set dhcp.${netrenamed}dhcp.interface="${netrenamed}dhcp"
EOF EOF
set_defaults "dhcp_" dhcp.${netrenamed}dhcp set_defaults "dhcp_" dhcp.${netrenamed}dhcp

6
contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_dnsmasq.sh
View file

@ -13,8 +13,10 @@ handle_dhcp() {
config_load dhcp config_load dhcp
config_foreach handle_dhcp dnsmasq config_foreach handle_dhcp dnsmasq
uci set dhcp.dnsmasq.local="/$profile_suffix/" uci batch << EOF
uci set dhcp.dnsmasq.domain="$profile_suffix" set dhcp.dnsmasq.local="/$profile_suffix/"
set dhcp.dnsmasq.domain="$profile_suffix"
EOF
config_get addnhosts dnsmasq addnhosts config_get addnhosts dnsmasq addnhosts
if [ -z "${addnhosts/\var\/etc\/hosts.olsr/}" ]; then if [ -z "${addnhosts/\var\/etc\/hosts.olsr/}" ]; then

10
contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_firewall.sh
View file

@ -48,11 +48,11 @@ handle_fwzone() {
config_foreach handle_fwzone zone config_foreach handle_fwzone zone
uci batch << EOF uci batch << EOF
set firewall.zone_freifunk="zone" set firewall.zone_freifunk="zone"
set firewall.zone_freifunk.name="freifunk" set firewall.zone_freifunk.name="freifunk"
set firewall.zone_freifunk.input="$zone_freifunk_input" set firewall.zone_freifunk.input="$zone_freifunk_input"
set firewall.zone_freifunk.forward="$zone_freifunk_forward" set firewall.zone_freifunk.forward="$zone_freifunk_forward"
set firewall.zone_freifunk.output="$zone_freifunk_output" set firewall.zone_freifunk.output="$zone_freifunk_output"
EOF EOF
uci_commitverbose "Setup firewall zones" firewall uci_commitverbose "Setup firewall zones" firewall

19
contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_network.sh
View file

@ -12,10 +12,11 @@ ipaddr=$(uci get meshwizard.netconfig.$net\_ip4addr)
[ -z "$interface_netmask" ] && interface netmask="255.255.0.0" [ -z "$interface_netmask" ] && interface netmask="255.255.0.0"
uci batch << EOF uci batch << EOF
set network.$netrenamed="interface" set network.$netrenamed="interface"
set network.$netrenamed.proto="static" set network.$netrenamed.proto="static"
set network.$netrenamed.ipaddr="$ipaddr" set network.$netrenamed.ipaddr="$ipaddr"
EOF EOF
set_defaults "interface_" network.$netrenamed set_defaults "interface_" network.$netrenamed
uci_commitverbose "Setup interface $netrenamed" network uci_commitverbose "Setup interface $netrenamed" network
@ -61,12 +62,12 @@ if [ "$net_dhcp" == 1 ]; then
uci set network.${netrenamed}dhcp.interface="$netrenamed" uci set network.${netrenamed}dhcp.interface="$netrenamed"
fi fi
uci batch << EOF uci batch <<- EOF
set network.${netrenamed}dhcp.proto=static set network.${netrenamed}dhcp.proto=static
set network.${netrenamed}dhcp.ipaddr="$START" set network.${netrenamed}dhcp.ipaddr="$START"
set network.${netrenamed}dhcp.netmask="$NETMASK" set network.${netrenamed}dhcp.netmask="$NETMASK"
uci_commitverbose "Setup interface for ${netrenamed}dhcp" network uci_commitverbose "Setup interface for ${netrenamed}dhcp" network
EOF EOF
fi fi

12
contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_olsrd.sh
View file

@ -37,12 +37,12 @@ else
suffix=".olsr" suffix=".olsr"
fi fi
uci batch << EOF uci batch << EOF
set olsrd.olsrd_nameservice=LoadPlugin set olsrd.olsrd_nameservice=LoadPlugin
set olsrd.olsrd_nameservice.library="olsrd_nameservice.so.0.3" set olsrd.olsrd_nameservice.library="olsrd_nameservice.so.0.3"
set olsrd.olsrd_nameservice.latlon_file="/var/run/latlon.js" set olsrd.olsrd_nameservice.latlon_file="/var/run/latlon.js"
set olsrd.olsrd_nameservice.hosts_file="/var/etc/hosts.olsr" set olsrd.olsrd_nameservice.hosts_file="/var/etc/hosts.olsr"
set olsrd.olsrd_nameservice.sighup_pid_file="/var/run/dnsmasq.pid" set olsrd.olsrd_nameservice.sighup_pid_file="/var/run/dnsmasq.pid"
set olsrd.olsrd_nameservice.suffix="$suffix" set olsrd.olsrd_nameservice.suffix="$suffix"
EOF EOF
uci_commitverbose "Setup olsr nameservice plugin" olsrd uci_commitverbose "Setup olsr nameservice plugin" olsrd

8
contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_splash.sh
View file

@ -25,9 +25,11 @@ if [ "$dhcp_range" == 1 ]; then
config_load luci_splash config_load luci_splash
config_foreach handle_splash iface config_foreach handle_splash iface
uci set luci_splash.${netrenamed}dhcp="iface" uci batch <<- EOF
uci set luci_splash.${netrenamed}dhcp.network="${netrenamed}dhcp" set luci_splash.${netrenamed}dhcp="iface"
uci set luci_splash.${netrenamed}dhcp.zone="freifunk" set luci_splash.${netrenamed}dhcp.network="${netrenamed}dhcp"
set luci_splash.${netrenamed}dhcp.zone="freifunk"
EOF
uci_commitverbose "Setup dhcpsplash for ${netrenamed}dhcp" luci_splash uci_commitverbose "Setup dhcpsplash for ${netrenamed}dhcp" luci_splash
/etc/init.d/luci_splash enable /etc/init.d/luci_splash enable

38
contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_wan_static.sh
View file

@ -21,28 +21,28 @@ uci delete meshwizard.wan && uci commit meshwizard
# Firewall rules to allow incoming ssh and web # Firewall rules to allow incoming ssh and web
if [ "$wan_allowssh" == 1 ]; then if [ "$wan_allowssh" == 1 ]; then
uci batch << EOF uci batch <<- EOF
set firewall.wanssh=rule set firewall.wanssh=rule
set firewall.wanssh.src=wan set firewall.wanssh.src=wan
set firewall.wanssh.target=ACCEPT set firewall.wanssh.target=ACCEPT
set firewall.wanssh.proto=tcp set firewall.wanssh.proto=tcp
set firewall.wanssh.dest_port=22 set firewall.wanssh.dest_port=22
EOF EOF
uci_commitverbose "Allow incoming connections to port 22 (ssh) on wan" firewall uci_commitverbose "Allow incoming connections to port 22 (ssh) on wan" firewall
fi fi
if [ "$wan_allowweb" == 1 ]; then if [ "$wan_allowweb" == 1 ]; then
uci batch << EOF uci batch <<- EOF
set firewall.wanweb=rule set firewall.wanweb=rule
set firewall.wanweb.src=wan set firewall.wanweb.src=wan
set firewall.wanweb.target=ACCEPT set firewall.wanweb.target=ACCEPT
set firewall.wanweb.proto=tcp set firewall.wanweb.proto=tcp
set firewall.wanweb.dest_port=80 set firewall.wanweb.dest_port=80
set firewall.wanwebhttps=rule set firewall.wanwebhttps=rule
set firewall.wanwebhttps.src=wan set firewall.wanwebhttps.src=wan
set firewall.wanwebhttps.target=ACCEPT set firewall.wanwebhttps.target=ACCEPT
set firewall.wanwebhttps.proto=tcp set firewall.wanwebhttps.proto=tcp
set firewall.wanwebhttps.dest_port=443 set firewall.wanwebhttps.dest_port=443
EOF EOF
uci_commitverbose "Allow incoming connections to port 80 and 443 (http and https) on wan" firewall uci_commitverbose "Allow incoming connections to port 80 and 443 (http and https) on wan" firewall
fi fi

28
contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_wifi.sh
View file

@ -35,8 +35,8 @@ if [ -z "$channel" -o "$channel" == "default" ]; then
fi fi
uci batch << EOF uci batch << EOF
set wireless.${net}.type="$type" set wireless.${net}.type="$type"
set wireless.${net}.channel="$channel" set wireless.${net}.channel="$channel"
EOF EOF
uci_commitverbose "Setup wifi device for $netrenamed" wireless uci_commitverbose "Setup wifi device for $netrenamed" wireless
@ -69,10 +69,10 @@ if [ "$profile_ssid_scheme" == "addchannel" ]; then
fi fi
uci batch << EOF uci batch << EOF
set wireless.$net\_iface.device="${net}" set wireless.$net\_iface.device="${net}"
set wireless.$net\_iface.network="$netrenamed" set wireless.$net\_iface.network="$netrenamed"
set wireless.$net\_iface.ssid="$ssid" set wireless.$net\_iface.ssid="$ssid"
set wireless.$net\_iface.bssid="$bssid" set wireless.$net\_iface.bssid="$bssid"
EOF EOF
uci_commitverbose "Setup wifi interface for $netrenamed" wireless uci_commitverbose "Setup wifi interface for $netrenamed" wireless
@ -80,14 +80,14 @@ uci_commitverbose "Setup wifi interface for $netrenamed" wireless
## VAP ## VAP
ip4addr="$(uci get meshwizard.netconfig.$net\_ip4addr)" ip4addr="$(uci get meshwizard.netconfig.$net\_ip4addr)"
if [ "$type" == "atheros" -a "$vap" == 1 ]; then if [ "$type" == "atheros" -a "$vap" == 1 ]; then
uci batch << EOF uci batch <<- EOF
set wireless.$net\_iface_dhcp="wifi-iface" set wireless.$net\_iface_dhcp="wifi-iface"
set wireless.$net\_iface_dhcp.device="$net" set wireless.$net\_iface_dhcp.device="$net"
set wireless.$net\_iface_dhcp.mode="ap" set wireless.$net\_iface_dhcp.mode="ap"
set wireless.$net\_iface_dhcp.encryption="none" set wireless.$net\_iface_dhcp.encryption="none"
set wireless.$net\_iface_dhcp.network="${netrenamed}dhcp" set wireless.$net\_iface_dhcp.network="${netrenamed}dhcp"
set wireless.$net\_iface_dhcp.ssid="FF-AP-$ip4addr" set wireless.$net\_iface_dhcp.ssid="FF-AP-$ip4addr"
EOF EOF
uci_commitverbose "Setup VAP interface for $netrenamed" wireless uci_commitverbose "Setup VAP interface for $netrenamed" wireless
fi fi