added system.d service & script for custom ip range

2 files changed, 16 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f7ce0370f42c..b011a3d9366f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = skywire
 	pkgdesc = TESTNET Skywire: Building a New Internet. Skycoin.net
-	pkgver = autogenerated
-	pkgrel = 1
+	pkgver = 20190505.773_4cc9fd85
+	pkgrel = 2
 	url = https://github.com/skycoin/skywire
 	arch = any
 	makedepends = dep
diff --git a/PKGBUILD b/PKGBUILD
index 97e17fc3426d..7b9515d2252e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,9 +4,9 @@ projectname=skycoin
 pkgname=skywire
 pkgname1=skywire
 pkgdesc="TESTNET Skywire: Building a New Internet. Skycoin.net"
-pkgver='autogenerated'
+pkgver=20190505.773_4cc9fd85
 pkggopath="github.com/$projectname/$pkgname1"
-pkgrel=1
+pkgrel=2
 arch=('any')
 url="https://${pkggopath}"
 license=()
@@ -87,10 +87,16 @@ go install \
   echo -e '#!/bin/bash \n #launch skywire node with nohup \n export GOBIN=/usr/lib/skycoin/go/bin \n export GOPATH=/usr/lib/skycoin/go \n nohup skywire-node -connect-manager -manager-address 127.0.0.1:5998 -manager-web 127.0.0.1:8000 -discovery-address discovery.skycoin.net:5999-034b1cd4ebad163e457fb805b3ba43779958bba49f2c5e1e8b062482904bacdb68 -address :5000 -web-port :6001 > /dev/null 2>&1 &cd / > /dev/null 2>&1 &sleep 3 \n echo "skywire-node has started"' > $pkgname1-node-nohup
   chmod +x $pkgname1-node-nohup
 	#edit the following script for the IP of your manager; default is the official setup with manager at 192.168.0.2
-  echo -e '#!/bin/bash \n #launch skywire official node with nohup \n GOBIN=/usr/lib/skycoin/go/bin \n export GOPATH=/usr/lib/skycoin/go \n nohup skywire-node -connect-manager -manager-address 192.168.0.2:5998 -manager-web 192.168.0.2:8000 -discovery-address discovery.skycoin.net:5999-034b1cd4ebad163e457fb805b3ba43779958bba49f2c5e1e8b062482904bacdb68 -address :5000 -web-port :6001 > /dev/null 2>&1 &cd / > /dev/null 2>&1 &sleep 3 \n echo "skywire-node has started"' > $pkgname1-node-miner
+  echo -e '#!/bin/bash \n #launch skywire official node with nohup \n export GOBIN=/usr/lib/skycoin/go/bin \n export GOPATH=/usr/lib/skycoin/go \n nohup skywire-node -connect-manager -manager-address 192.168.0.2:5998 -manager-web 192.168.0.2:8000 -discovery-address discovery.skycoin.net:5999-034b1cd4ebad163e457fb805b3ba43779958bba49f2c5e1e8b062482904bacdb68 -address :5000 -web-port :6001 > /dev/null 2>&1 &cd / > /dev/null 2>&1 &sleep 3 \n echo "skywire-node has started"' > $pkgname1-node-miner
   chmod +x $pkgname1-node-miner
   echo -e '#!/bin/bash \n #launch skywire qubes node with nohup \n export GOBIN=/usr/lib/skycoin/go/bin \n export GOPATH=/usr/lib/skycoin/go \n nohup skywire-node -connect-manager -manager-address 10.137.0.16:5998 -manager-web 10.137.0.16:8000 -discovery-address discovery.skycoin.net:5999-034b1cd4ebad163e457fb805b3ba43779958bba49f2c5e1e8b062482904bacdb68 -address :5000 -web-port :6001 > /dev/null 2>&1 &cd / > /dev/null 2>&1 &sleep 3 \n echo "skywire-node has started"' > $pkgname1-node-qubes
   chmod +x $pkgname1-node-qubes
+#script to set a custom manager IP address at runtime
+	echo -e '#!/bin/bash \n #launch skywire official node with nohup and a custom IP \n read -p "Skywire Manager IP:" SKYMGRIP  \n echo "Skywire manager set to $SKYMGRIP" \n export GOBIN=/usr/lib/skycoin/go/bin \n export GOPATH=/usr/lib/skycoin/go \n nohup skywire-node -connect-manager -manager-address $SKYMGRIP:5998 -manager-web $SKYMGRIP:8000 -discovery-address discovery.skycoin.net:5999-034b1cd4ebad163e457fb805b3ba43779958bba49f2c5e1e8b062482904bacdb68 -address :5000 -web-port :6001 > /dev/null 2>&1 &cd / > /dev/null 2>&1 &sleep 3 \n echo "skywire-node has started"' > $pkgname1-node-setip
+ chmod +x $pkgname1-node-setip
+#script to set a custom manager IP address at boot to be used with the system.d service.
+	echo -e '#!/bin/bash \n #launch skywire official node with nohup and a custom IP \n export GOBIN=/usr/lib/skycoin/go/bin \n export GOPATH=/usr/lib/skycoin/go \n nohup skywire-node -connect-manager -manager-address $SKYMGRIP:5998 -manager-web $SKYMGRIP:8000 -discovery-address discovery.skycoin.net:5999-034b1cd4ebad163e457fb805b3ba43779958bba49f2c5e1e8b062482904bacdb68 -address :5000 -web-port :6001 > /dev/null 2>&1 &cd / > /dev/null 2>&1 &sleep 3 \n echo "skywire-node has started"' > $pkgname1-node-envip
+	chmod +x $pkgname1-node-envip
 	echo -e '#!/bin/bash \n #halt skywire \n sudo killall skywire-node \n sudo killall skywire-manager \n \n echo "skywire halted"' > $pkgname1-halt
 	chmod +x $pkgname1-halt
 
@@ -100,6 +106,10 @@ go install \
   cd $srcdir/go
 	echo -e '[Unit] \n Description=Skywire Manager Node service \n	After=network.target \n After=network-online.target \n \n	[Service] \n Type=oneshot \n	ExecStart=/usr/bin/skywire \n	RemainAfterExit=yes \n ExecStop=/usr/bin/skywire-halt \n	TryExec=/usr/bin/skywire \n \n [Install] \n	WantedBy=multi-user.target ' > $pkgname1-manager.service
 	echo -e '[Unit] \n Description=Skywire Node service \n	After=network.target \n After=network-online.target \n \n	[Service] \n Type=oneshot \n	ExecStart=/usr/bin/skywire-node-miner \n	RemainAfterExit=yes \n ExecStop=/usr/bin/skywire-halt \n	TryExec=/usr/bin/skywire \n \n [Install] \n	WantedBy=multi-user.target ' > $pkgname1-node.service
+#use the following system.d service for a custom manager IP address;$ echo SKYMGRIP=<IP of skywire manager> >> .bashrc
+#this service file points to skywire-node-env
+	echo -e '[Unit] \n Description=Skywire Node service \n	After=network.target \n After=network-online.target \n \n	[Service] \n Type=oneshot \n	ExecStart=/usr/bin/skywire-node-envip \n	RemainAfterExit=yes \n ExecStop=/usr/bin/skywire-halt \n	TryExec=/usr/bin/skywire \n \n [Install] \n	WantedBy=multi-user.target ' > $pkgname1-node-envip.service
+
 }
 
 package() {
@@ -139,4 +149,5 @@ done
 #install the system.d service
 install -Dm644 $srcdir/go/$pkgname1-manager.service ${pkgdir}/usr/lib/systemd/system/$pkgname1-manager.service
 install -Dm644 $srcdir/go/$pkgname1-node.service ${pkgdir}/usr/lib/systemd/system/$pkgname1-node.service
+install -Dm644 $srcdir/go/$pkgname1-node.service ${pkgdir}/usr/lib/systemd/system/$pkgname1-node-envip.service
 }