new install

Author: magcode

bootstate/install-bootstate.sh

@@ -1,42 +1,68 @@
 #!/bin/sh
 #
-echo "Installing bootstate ..."
+
+TARGET="$1"
+if [ -z "$TARGET" ]; then
+    echo "Usage: $0 <TARGET>"
+    exit 1
+fi
+
+echo "Installing mPower bootstate ... to $TARGET"
+
+WORK_DIR=`mktemp -d -p "$DIR"`
+SSH_PARAMS="-o PubkeyAcceptedKeyTypes=+ssh-rsa -o KexAlgorithms=+diffie-hellman-group1-sha1 -o HostKeyAlgorithms=+ssh-dss -o Ciphers=+aes256-cbc -o StrictHostKeyChecking=accept-new"   
+SCP_PARAMS="$SSH_PARAMS"
 
 scriptdir=/var/etc/persistent/bootstate
+applyscript="$scriptdir/apply-bootstate.sh"
+
+ssh $SSH_PARAMS ubnt@$TARGET "mkdir -p $scriptdir"
+wget -q https://raw.githubusercontent.com/magcode/mpower-tools/master/bootstate/apply-bootstate.sh -O $WORK_DIR/apply-bootstate.sh
+scp $SCP_PARAMS $WORK_DIR/apply-bootstate.sh ubnt@$TARGET:$scriptdir
+ssh $SSH_PARAMS ubnt@$TARGET "chmod 755 $applyscript"
 
-mkdir -p $scriptdir
 config="$scriptdir/bootstate.cfg"
-applyscript="$scriptdir/apply-bootstate.sh"
-poststartscript="sleep 60; $applyscript"
-poststart=/etc/persistent/rc.poststart
 
-wget --no-check-certificate -q https://raw.githubusercontent.com/magcode/mpower-tools/master/bootstate/apply-bootstate.sh -O $applyscript
-chmod 775 $applyscript
 
-if [ ! -f $config ]; then
-    echo "$config not found, creating it ..."
-    export PORTS=`cat /etc/board.inc | grep feature_power | sed -e 's/.*\([0-9]\+\);/\1/'`
-    touch $config
+
+if ssh $SSH_PARAMS ubnt@$TARGET "test -f '$config'" 2>/dev/null; then
+    echo "$config exists, not touching"
+else
+    PORTS=`ssh $SSH_PARAMS ubnt@$TARGET "cat /etc/board.inc | grep feature_power | sed -e 's/.*\([0-9]\+\);/\1/'" 2>/dev/null`
+    echo "Found $PORTS ports"
+
+    ssh $SSH_PARAMS ubnt@$TARGET "touch $config"
     for i in $(seq $PORTS)
     do
-        echo "vpower.$i.relay=on" >> $config
+        ssh $SSH_PARAMS ubnt@$TARGET "echo 'vpower.$i.relay=on' >> $config"
     done
+    echo "Config file created: $config"
 fi
 
-if [ ! -f $poststart ]; then
+
+
+poststart=/etc/persistent/rc.poststart
+poststartscript="sleep 60; $applyscript"
+
+
+# create poststart file if not exists
+
+if ssh $SSH_PARAMS ubnt@$TARGET "test -f '$poststart'" 2>/dev/null; then
+    echo "$poststart exists already"
+else
     echo "$poststart not found, creating it ..."
-    touch $poststart
-    echo "#!/bin/sh" >> $poststart
-    chmod 755 $poststart
+    ssh $SSH_PARAMS ubnt@$TARGET "echo '#!/bin/sh' >> $poststart"
+    ssh $SSH_PARAMS ubnt@$TARGET "chmod 755 $poststart"
 fi
 
-if grep -q "$poststartscript" "$poststart"; then
-   echo "Found $poststart entry. File will not be changed"
+# add entry to poststart file if not exists
+if ssh $SSH_PARAMS ubnt@$TARGET "grep -q '$poststartscript' '$poststart'" 2>/dev/null; then
+    echo "Found startscript entry. File will not be changed"
 else
-   echo "Adding start command to $poststart"
-   echo -e "$poststartscript" >> $poststart
+    echo "Adding start command to $poststart"
+    ssh $SSH_PARAMS ubnt@$TARGET "echo -e '$poststartscript' >> $poststart"
 fi
 
-echo "Done!"
-cfgmtd -w -p /etc/
+ssh $SSH_PARAMS ubnt@$TARGET "cfgmtd -w -p /etc/"
+
 echo "Adapt your settings in '$config' and call '$applyscript' afterwards."

mqtt/client/install-client.sh

@@ -12,7 +12,7 @@ LOCALDIR="/var/etc/persistent/mqtt"
 LOCALSCRIPTDIR=$LOCALDIR/client
 BASEURL="https://raw.githubusercontent.com/magcode/mpower-tools/master/mqtt"
 SSH_PARAMS="-o PubkeyAcceptedKeyTypes=+ssh-rsa -o KexAlgorithms=+diffie-hellman-group1-sha1 -o HostKeyAlgorithms=+ssh-dss -o Ciphers=+aes256-cbc -o StrictHostKeyChecking=accept-new"   
-SCP_PARAMS="-O $SSH_PARAMS"
+SCP_PARAMS="$SSH_PARAMS"
 
 echo "Installing mPower MQTT v2 ... to $TARGET"
 wget --no-check-certificate -q $BASEURL/libmosquitto.so.1?raw=true -O $WORK_DIR/libmosquitto.so.1

mqtt/client/readme.md

@@ -7,19 +7,23 @@ Use at your own risk!
 
 # Installation
 
-**Attention! Automated installation using the script below is broken at the moment. You need to copy files manually**
-
-(Reason is most likely because the mpower firmware/wget does not support newer TLS/SLL protocols required by github.)
+A linux system is required to install the MQTT client into your mPower.
+First add your public key to the mPower device.
+```
+ssh-copy-id -o KexAlgorithms=+diffie-hellman-group1-sha1 -o Ciphers=+aes256-cbc -o HostKeyAlgorithms=+ssh-dss -i ~/.ssh/id_rsa ubnt@<mpowerhost>
+```
 
-Use a SSH client and connect to your mPower device.
-Internet access is required to use the automated installation process. If you don't have internet access you need to perform all steps of [install-client.sh](https://github.com/magcode/mpower-tools/blob/master/mqtt/client/install-client.sh) manually.
+If that works fine, execute the following commands on your linux machine:
+```
+wget -q https://raw.githubusercontent.com/magcode/mpower-tools/refs/heads/master/mqtt/client/install-client.sh
+chmod 777 install-client.sh
+./install-client.sh <mpowerhost>
+```
 
-Enter the following commands
+Now SSH into your mPower, change `mqtt.cfg`, `mpower-pub.cfg`, `led.cfg` and "save"
 
 ```
-mkdir /var/etc/persistent/mqtt
-wget --no-check-certificate -q https://raw.githubusercontent.com/magcode/mpower-tools/master/mqtt/client/install-client.sh -O /var/etc/persistent/mqtt/install-client.sh;chmod 755 /var/etc/persistent/mqtt/install-client.sh;/var/etc/persistent/mqtt/install-client.sh
-
+ssh <mpowerhost>
 save
 reboot
 ```