v1.0.4

MDSLab · Jun 1, 2017 · e9f43e2 · e9f43e2
1 parent 837ca51
commit e9f43e2
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/etc/init.d/s4t-lightning-rod_ubu14 b/etc/init.d/s4t-lightning-rod_ubu14
@@ -4,7 +4,7 @@ export NODE_PATH=/usr/local/lib/node_modules:$NODE_PATH
 
 NAME=lightning-rod
 FOLDER=/usr/local/lib/node_modules/iotronic-lightning-rod
-DAEMON=/usr/local/lib/node_modules/iotronic-lightning-rod/lr-server.js
+DAEMON=$FOLDER/lr-server.js
 DESC=lightning-rod
 LOGFILE="/var/log/iotronic/lightning-rod.log"
 PIDFILE="/var/run/s4t-lightning-rod.pid"

diff --git a/etc/systemd/system/s4t-lightning-rod.service b/etc/systemd/system/s4t-lightning-rod.service
@@ -13,7 +13,7 @@ WorkingDirectory=/usr/lib/node_modules/iotronic-lightning-rod
 Environment="NODE_PATH=/usr/lib/node_modules"
 Environment="IOTRONIC_HOME=/var/lib/iotronic"
 Environment="LIGHTNINGROD_HOME="
-ExecStart=/usr/bin/node $LIGHTNINGROD_HOME/lightning-rod.js
+ExecStart=/usr/bin/node ${LIGHTNINGROD_HOME}/lightning-rod.js
 Restart=always
 
 [Install]

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "iotronic-lightning-rod",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "Implementation of the Lightning-rod, the Stack4Things node-side probe (this version works with the standalone version of IoTronic) http://stack4things.unime.it/",
   "main": "lightning-rod.js",
   "directories": {

diff --git a/scripts/lr_configure.sh b/scripts/lr_configure.sh
@@ -27,6 +27,7 @@ if [ "$DEVICE" = "server" ]; then
 
         cp /usr/local/lib/node_modules/iotronic-lightning-rod/etc/init.d/s4t-lightning-rod_ubu14 /etc/init.d/lightning-rod
         chmod +x /etc/init.d/lightning-rod
+        chmod +x /usr/local/lib/node_modules/iotronic-lightning-rod/lr-server.js
 
     elif [ "$DISTRO" = "16.04" ]; then
 
@@ -35,6 +36,7 @@ if [ "$DEVICE" = "server" ]; then
         /usr/bin/npm install -g https://github.com/PlayNetwork/node-statvfs/tarball/v3.0.0
 
         cp /usr/lib/node_modules/iotronic-lightning-rod/etc/systemd/system/s4t-lightning-rod.service /etc/systemd/system/lightning-rod.service
+        sed -i "s/Environment=\"LIGHTNINGROD_HOME=\"/Environment=\"LIGHTNINGROD_HOME=\/usr\/lib\/node_modules\/iotronic-lightning-rod\"/g" /etc/systemd/system/lightning-rod.service
         chmod +x /etc/systemd/system/lightning-rod.service
         systemctl daemon-reload
 
@@ -45,6 +47,7 @@ fi
 
 if [ "$DEVICE" = "raspberry_pi" ]; then
     cp /usr/lib/node_modules/iotronic-lightning-rod/etc/systemd/system/s4t-lightning-rod.service /etc/systemd/system/lightning-rod.service
+    sed -i "s/Environment=\"LIGHTNINGROD_HOME=\"/Environment=\"LIGHTNINGROD_HOME=\/usr\/lib\/node_modules\/iotronic-lightning-rod\"/g" /etc/systemd/system/lightning-rod.service
     chmod +x /etc/systemd/system/lightning-rod.service
     systemctl daemon-reload
 fi