summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorevoskuil <eric@voskuil.org>2014-03-16 22:17:10 (GMT)
committer evoskuil <eric@voskuil.org>2014-03-16 22:17:10 (GMT)
commit338f878146b33217b19616ac9504f7e44b0e591c (patch)
tree341ec9459c7f261baa40c8931e882f81ba6b5518
parente626e1c1ca44fb2c5dfa5a0285e82b7504827624 (diff)
parent26c4702836c1294212981d546a07abc65cd44129 (diff)
Merge pull request #9 from evoskuil/master
Resolution for issues #6, #7 & #8.
-rwxr-xr-x[-rw-r--r--]scripts/init.d/obworker2
-rw-r--r--scripts/setup.sh27
2 files changed, 17 insertions, 12 deletions
diff --git a/scripts/init.d/obworker b/scripts/init.d/obworker
index 9b22a61..766d159 100644..100755
--- a/scripts/init.d/obworker
+++ b/scripts/init.d/obworker
@@ -14,7 +14,7 @@
DAEMON=/usr/local/bin/obworker
DAEMON_ARGS=
DAEMON_NAME=obworker
-DAEMON_USER=obworker
+DAEMON_USER=ob
PIDFILE=/var/run/$DAEMON_NAME.pid
#set -x
diff --git a/scripts/setup.sh b/scripts/setup.sh
index 97bc750..67a8bb0 100644
--- a/scripts/setup.sh
+++ b/scripts/setup.sh
@@ -1,23 +1,28 @@
#!/bin/bash
#
-# Designed for a fairly Debian standard.
+# Script to setup obworker and obbalancer daemons, required for an Obelisk node.
#
-# Compatible with Fedora standard too.
-#
-# Debian | Fedora
+# For Debian, Ubuntu or Fedora GNU/Linux distributions.
#
-# Script to setup obworker an obbalancer daemons.
+# Requires sudo.
#
-# Requires previous instalation of libbitcoin, libwallet and obelisk.
+# Requires previous installation of libbitcoin, libwallet and obelisk IN DEFAULT LOCATIONS.
# Download and execute the install-sx.sh:
# <wget http://sx.dyne.org/install-sx.sh>
# And run:
# <sudo bash install-sx.sh>
-# If you are setting up a oblisk node you need to run this script to create and configure
-# obworker and obbalancer daemons.
#
-#
+# To execute this script, run:
+# <sudo bash setup.sh>
+#
+#
set -e
+echo
+echo " [+] Welcome to Obelisk worker and balancer daemon setup."
+echo " IMPORTANT: This script requires previous installation of"
+echo " libbitcoin, libwallet and obelisk IN DEFAULT LOCATIONS."
+echo
+sleep 0.3
if [ `id -u` = "0" ]; then
SOURCE=/usr/local/src/obelisk-git/scripts
WORKER=/etc/obelisk/worker.cfg
@@ -49,13 +54,13 @@ config_logfiles(){
else
echo " ERROR: --> You need to have installed libbitcoin, sx and obelisk before run this script."
echo " Read the header of this script:"
- echo " <cat /user/local/src/obelist-git/scripts/setup.sh>"
+ echo " <cat $SOURCE/setup.sh>"
echo
fi
}
config_logrotate(){
- ln -sf $SOURCE/logrotate.sh /etc/logrotate.d/logrotate.sh
+ ln -sf $SOURCE/logrotate.sh /etc/logrotate.d/
}
up_limits(){