Changeset 7501

Timestamp:

09/21/11 18:43:38 (20 months ago)

Author:

soma

Message:

contrib/meshwizard: Cleanup and add ssid_scheme option

Location:

luci/trunk/contrib/package/meshwizard/files/usr/bin/meshwizard

Files:

• functions.sh (modified) (2 diffs)
• helpers/setup_dhcp.sh (modified) (1 diff)
• helpers/setup_dnsmasq.sh (modified) (1 diff)
• helpers/setup_firewall.sh (modified) (6 diffs)
• helpers/setup_freifunk.sh (modified) (2 diffs)
• helpers/setup_network.sh (modified) (4 diffs)
• helpers/setup_olsrd.sh (modified) (7 diffs)
• helpers/setup_splash.sh (modified) (1 diff)
• helpers/setup_system.sh (modified) (1 diff)
• helpers/setup_wifi.sh (modified) (4 diffs)
• wizard.sh (modified) (5 diffs)

luci/trunk/contrib/package/meshwizard/files/usr/bin/meshwizard/functions.sh

@@ -13 +13 @@
 }
 
+# Takes 2 arguments
+# $1 = text to be displayed in the output for this section
+# $2 = section (optional)
+uci_commitverbose() {
+    echo "+ $1"
+    uci changes $2 | while read line; do
+        echo "    $line"
+    done
+    uci commit $2
+}
+
 set_defaults() {
     for def in $(env |grep "^$1"); do
         option=${def/$1/}
         uci set $2.$option
-        echo "    ${option/=/: }"
     done
 }
@@ -29 +39 @@
 section_rename() {
     uci -q rename $1.$2=$3 && msg_rename $1.$2 $1.$3 || msg_rename_error $1.2 $1.$3
-}
-
-msg_start() {
-    echo "  Starting configuration of $1"
 }
 

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

@@ -24 +24 @@
 uci batch << EOF
 set dhcp.${netrenamed}dhcp="dhcp"
-set dhcp.${netrenamed}dhcp.leasetime="${dhcp_leasetime}"
-set dhcp.${netrenamed}dhcp.force="1"
+set dhcp.${netrenamed}dhcp.leasetime="$dhcp_leasetime"
+set dhcp.${netrenamed}dhcp.force="$dhcp_force"
 set dhcp.${netrenamed}dhcp.interface="${netrenamed}dhcp"
 EOF
 
-echo "    leasetime: ${dhcp_leasetime}
-    interface: ${netrenamed}dhcp"
+uci_commitverbose "Setup DHCP for $netrenamed" dhcp
 

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

@@ -14 +14 @@
 config_foreach handle_dhcp dnsmasq
 
-echo "    + Setup dnsmasq"
-
 uci set dhcp.dnsmasq.local="/$profile_suffix/"
 uci set dhcp.dnsmasq.domain="$profile_suffix"
-
-echo "    local: /$profile_suffix/
-    domain: $profile_suffix"
 
 config_get addnhosts dnsmasq addnhosts
 if [ -z "${addnhosts/\var\/etc\/hosts.olsr/}" ]; then
     uci add_list dhcp.dnsmasq.addnhosts="/var/etc/hosts.olsr"
-    echo "    addnhosts: /var/etc/hosts.olsr"
 fi
 
-uci commit
-
+uci_commitverbose "Setup dnsmasq" dhcp

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

@@ -20 +20 @@
     fi
 }
-config_foreach handle_zonewan zone && echo "    + Enable local_restrict for zone wan"
+config_foreach handle_zonewan zone && uci_commitverbose "Enable local_restrict for zone wan" firewall
 
 # Delete old firewall zone for freifunk
@@ -70 +70 @@
 # setup freifunk firewall zone
 
-echo "    + Setup firewall zone."
-
 # add $netrenamed and if needed ${netrenamed}dhcp to the networks for this zone
 config_get network zone_freifunk network
@@ -94 +92 @@
 EOF
 
-echo "    network: $network
-    input: $zone_freifunk_input
-    forward: $zone_freifunk_forward
-    output: $zone_freifunk_output"
+uci_commitverbose "Setup freifunk firewall zone" firewall
 
 # Usually we need to setup masquerading for lan, except lan is an olsr interface or has an olsr hna
-
-echo "    + Setup masquerading rules"
 
 handle_interface() {
@@ -122 +115 @@
 currms=$(uci -q get firewall.zone_freifunk.masq_src)
 if [ ! "$no_masq_lan" == "1" ]; then
-    uci set firewall.zone_freifunk.masq="1" && echo "    Enabled masquerading." || echo -e "\033[1mWarning:\033[0m: Could not enable masquerading."
+    uci set firewall.zone_freifunk.masq="1"
     [ -z "$(echo $currms |grep lan)" ] && uci add_list firewall.zone_freifunk.masq_src="lan"
 fi
@@ -138 +131 @@
 done
 
+uci_commitverbose "Setup masquerading rules" firewall
+
 # Rules, Forwardings, advanced config and includes
 # Clear firewall configuration
-
-echo "    + Setup rules, forwardings, advanced config and includes."
 
 for config in freifunk profile_$community; do
@@ -159 +152 @@
 done
 
-uci commit
+uci_commitverbose "Setup rules, forwardings, advanced config and includes." firewall

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

@@ -2 +2 @@
 # Sets values in /etc/config/freifunk
 
-. /etc/functions.sh
 . $dir/functions.sh
 
@@ -12 +11 @@
 fi
 
+uci_commitverbose "/etc/init.d/freifunk config" freifunk
 

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

@@ -15 +15 @@
 ipaddr=$(uci get meshwizard.netconfig.$net\_ip4addr)
 [ -z "$ipaddr" ] && msg_missing_value meshwizard $net\_ip4addr
-
 [ -z "$interface_netmask" ] && interface netmask="255.255.0.0"
 
@@ -26 +25 @@
 EOF
 
-echo "    IP address: $ipaddr"
-echo "    Netmask   : $interface_netmask"
+uci_commitverbose "Setup interface $netrenamed" network
 
 # setup dhcp alias/interface
@@ -69 +67 @@
 
     if [ "$vap" == 1 ]; then
-        echo "    + Setup interface ${netrenamed}dhcp."
         uci set network.${netrenamed}dhcp=interface
     else
-        echo "    + Setup alias interface ${netrenamed}dhcp."
         uci set network.${netrenamed}dhcp=alias
         uci set network.${netrenamed}dhcp.interface="$netrenamed"
@@ -83 +79 @@
 EOF
 
-    echo "    interface: $net
-    ipaddr: $START
-    netmask: $NETMASK"
-
 fi
 
-uci commit
+uci_commitverbose  "Setup interface for ${netrenamed}dhcp" network

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

@@ -6 +6 @@
 
 . /etc/functions.sh
-
 . $dir/functions.sh
 
@@ -25 +24 @@
 # Setup new InterfaceDefaults
 
-echo "    + Setup InterfaceDefaults"
 uci set olsrd.InterfaceDefaults=InterfaceDefaults
 set_defaults "olsr_interfacedefaults_" olsrd.InterfaceDefaults
+uci_commitverbose "Setup olsr interface defaults" olsrd
 
 # Delete old interface for $netrenamed
@@ -45 +44 @@
 # Setup new interface for $netrenamed
 
-echo "    + Setup Interface"
+uci set olsrd.$netrenamed=Interface
+set_defaults "olsr_interface_" olsrd.$net
+uci set olsrd.$netrenamed.interface="$netrenamed"
 
-uci set olsrd.$netrenamed=Interface
-
-set_defaults "olsr_interface_" olsrd.$net
-
-uci set olsrd.$netrenamed.interface="$netrenamed"
-echo "    interface: $netrenamed"
+uci_commitverbose "Setup olsr interface for $netrenamed." olsrd
 
 # If dhcp-network is inside the mesh_network then add HNA for it
@@ -64 +60 @@
 
 if [ "$dhcpinmesh" == 1 ]; then
-    echo "    + Setting up HNA"
     uci set olsrd.${netrenamed}clients="Hna4"
     eval $(sh $dir/helpers/ipcalc-cidr.sh $dhcprange)
     uci set olsrd.${netrenamed}clients.netaddr="$NETWORK"
     uci set olsrd.${netrenamed}clients.netmask="$NETMASK"
-    echo "    netaddr: $NETWORK"
-    echo "    natmask: $NETMASK"
+    uci_commitverbose "Setup HNA for network $dhcprange" olsrd
 fi
 
@@ -76 +70 @@
 # Delete nameservice, dyngw and httpinfo plugins
 
-echo "    + Configure Plugins"
 handle_plugin() {
         config_get library "$1" library
@@ -106 +99 @@
 EOF
 
-echo "    Nameservice Plugin configured."
+uci_commitverbose "Setup olsr nameservice plugin" olsrd
 
 # Setup dyngw_plain
@@ -118 +111 @@
 
 if [ "$sharenet" == 1 ]; then
-    echo "    + Setup dyngw_plain"
     uci set olsrd.dyngw_plain=LoadPlugin
     uci set olsrd.dyngw_plain.ignore=0
     uci set olsrd.dyngw_plain.library="olsrd_dyn_gw_plain.so.0.4"
+    uci_commitverbose "Setup olsrd_dyngw_plain plugin"
 fi
 
-uci commit

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

@@ -28 +28 @@
 EOF
 
-echo "    network: ${netrenamed}dhcp"
-
-uci commit
+uci_commitverbose "Setup dhcpsplash for ${netrenamed}dhcp" luci_splash
 
 /etc/init.d/luci_splash enable

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

@@ -2 +2 @@
 # Sets values from /etc/config/freifunk and/or the community profile in /etc/config/system
 
+. $dir/functions.sh
+
 if [ -n "$(env | grep '^system_')" ]; then
-    echo "++++ Setup system"
     env | grep "^system_" | sed "s/system_/uci set system.system./g" | while read line; do
         eval $line
-        echo "    $line"
     done
 fi
 
-uci commit system
+uci_commitverbose "System config" system

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

@@ -8 +8 @@
 
 ##### wifi-device #####
-
-echo "    + Setup wifi-device"
 
 # Get the type before we delete the wifi-device
@@ -46 +44 @@
 EOF
 
-echo "    Type: $type"
-echo "    Channel: $channel"
+uci_commitverbose "Setup wifi device for $netrenamed" wireless
 
 ##### wifi iface
-
-echo "    + Setup wifi-iface"
 
 # Delete old wifi-iface for $net
@@ -76 +71 @@
 # overwrite defaults
 bssid="$($dir/helpers/gen_bssid.sh $channel $community)"
+ssid="$profile_ssid"
+if [ "$profile_ssid_scheme" == "addchannel" ]; then
+    ssid="$ssid - ch$channel"
+fi
+
 uci batch << EOF
 set wireless.$net\_iface.device="${net}"
 set wireless.$net\_iface.network="$netrenamed"
-set wireless.$net\_iface.ssid="$profile_ssid - ch$channel"
+set wireless.$net\_iface.ssid="$ssid"
 set wireless.$net\_iface.bssid="$bssid"
 EOF
 
-echo "    device: $net
-    network: $netrenamed
-    ssid: $profile_ssid - ch$channel
-    bssid: $bssid"
+uci_commitverbose "Setup wifi interface for $netrenamed" wireless
 
 ## VAP
@@ -99 +96 @@
 set wireless.$net\_iface_dhcp.ssid="FF-AP-$ip4addr"
 EOF
-    echo "    + Setting up VAP interface for $net
-    device: $net
-    network: ${netrenamed}dhcp
-    ssid: AP-$profile_ssid-$ip4addr"
+    uci_commitverbose "Setup VAP interface for $netrenamed" wireless
 fi
 
-uci commit

luci/trunk/contrib/package/meshwizard/files/usr/bin/meshwizard/wizard.sh

@@ -4 +4 @@
 
 . /etc/functions.sh
+
+echo "
+Meshwizard 0.0.3
+"
 
 # config
@@ -11 +15 @@
 
 # Rename wifi interfaces
-    echo "++++ Renaming wifi-devices in /etc/config/meshwizard"
+    echo "+ Renaming wifi-devices in /etc/config/meshwizard"
     $dir/helpers/rename-wifi.sh
 
 # Firstboot/initial config
-    echo "++++ Initial config"
+    echo "+ Initial config"
     $dir/helpers/initial_config.sh
 
@@ -33 +37 @@
 [ -z "$networks" ] && echo "Error: No networks to setup could be found in /etc/config/meshwizard, aborting now." && exit 1
 
-echo "+++ wizard 0.0.2 +++
-Community=$community
-Network(s)=$networks"
+echo "    Community=$community
+    Network(s)=$networks"
 
 # Read default values (first from /etc/config/freifunk, then from /etc/config/profile_$community,
@@ -46 +49 @@
 done < /tmp/meshwizard.tmp
 
-# dnsmasq
-    echo "++++ dnsmasq config"
-    $dir/helpers/setup_dnsmasq.sh
-
-# system
-    echo "++++ system config"
-    $dir/helpers/setup_system.sh
-
-# freifunk
-    echo "++++ /etc/config/freifunk config"
-        $dir/helpers/setup_freifunk.sh
+$dir/helpers/setup_dnsmasq.sh
+$dir/helpers/setup_system.sh
+$dir/helpers/setup_freifunk.sh
 
 # Configure found networks
@@ -64 +59 @@
     export netrenamed
 
-    echo "++++ Configure interface $net"
-
-    config="network"
-    echo "$(msg_start $config)"
     $dir/helpers/setup_network.sh $net
-
-    config="wireless"
-    echo "$(msg_start $config)"
     $dir/helpers/setup_wifi.sh $net
-
-    config="OLSRd"
-    echo "$(msg_start $config)"
     $dir/helpers/setup_olsrd.sh $net
 
     net_dhcp=$(uci -q get meshwizard.netconfig.${net}_dhcp)
     if [ "$net_dhcp" == 1 ]; then
-        config="DHCP"
-        echo "$(msg_start $config)"
         $dir/helpers/setup_dhcp.sh $net
     fi
 
-    config="luci_splash"
-    echo "$(msg_start $config)"
     $dir/helpers/setup_splash.sh $net
-
-    config="firewall"
-    echo "$(msg_start $config)"
     $dir/helpers/setup_firewall.sh $net
-
-    echo "  Configuration of $net finished."
 done