move NAME to _start_stop

diff --git a/init.d/_start_stop b/init.d/_start_stop
index b189a83..009eaed 100755 (executable)
--- a/init.d/_start_stop
+++ b/init.d/_start_stop
@@ -1,4 +1,5 @@
 BACKGROUND=1
+NAME=`basename $0`
 
 _start_stop() {
 

diff --git a/init.d/s1-create_user b/init.d/s1-create_user
index a674258..04b6268 100755 (executable)
--- a/init.d/s1-create_user
+++ b/init.d/s1-create_user
@@ -1,6 +1,5 @@
 #!/bin/sh
 
-NAME=s1-create_user
 DAEMON="gearman -n -f create_user -w ./gearman/create_user"
 
 . /srv/cloudstore/init.d/_start_stop

diff --git a/init.d/s1-rsync-piper b/init.d/s1-rsync-piper
index 1292177..cc41a26 100755 (executable)
--- a/init.d/s1-rsync-piper
+++ b/init.d/s1-rsync-piper
@@ -1,6 +1,5 @@
 #!/bin/sh
 
-NAME=s1-rsync-piper
 DAEMON="./rsync-piper.pl s1"
 
 . /srv/cloudstore/init.d/_start_stop

diff --git a/init.d/s1-send_file b/init.d/s1-send_file
index add641b..5807c26 100755 (executable)
--- a/init.d/s1-send_file
+++ b/init.d/s1-send_file
@@ -1,6 +1,5 @@
 #!/bin/sh
 
-NAME=s1-send_file
 DAEMON="./gearman/send_file.pl"
 
 . /srv/cloudstore/init.d/_start_stop

diff --git a/init.d/s1-stunnel b/init.d/s1-stunnel
index 20f4813..fa3c849 100755 (executable)
--- a/init.d/s1-stunnel
+++ b/init.d/s1-stunnel
@@ -3,7 +3,6 @@
 . /srv/cloudstore/init.d/_start_stop
 BACKGROUND=0
 
-NAME=s1-stunnel
 DAEMON="/usr/bin/stunnel -d 213.186.16.27:443 -r 6501 -P /tmp/$NAME.pid -o /tmp/$NAME.log -p /etc/ssl/rsync1.maxxo.com.pem"
 
 _start_stop $*

diff --git a/init.d/s1-stunnel-client b/init.d/s1-stunnel-client
index ff6eef7..0f92179 100755 (executable)
--- a/init.d/s1-stunnel-client
+++ b/init.d/s1-stunnel-client
@@ -3,7 +3,6 @@
 . /srv/cloudstore/init.d/_start_stop
 BACKGROUND=0
 
-NAME=s1-stunnel-client
 DAEMON="/usr/bin/stunnel -c -d localhost:12345 -r 213.186.16.27:443 -P /tmp/$NAME.pid -o /tmp/$NAME.log -p /etc/ssl/rsync1.maxxo.com.pem"
 
 _start_stop $*

diff --git a/init.d/s1-tracker b/init.d/s1-tracker
index c49211e..dedda4d 100755 (executable)
--- a/init.d/s1-tracker
+++ b/init.d/s1-tracker
@@ -2,7 +2,6 @@
 
 eval export `grep s1 /var/lib/extrausers/group | cut -d: -f4`
 
-NAME=`basename $0`
 DAEMON="/srv/cloudstore/bin/opentracker -i $tracker_ip -p $tracker_port -s 9696"
 
 . /srv/cloudstore/init.d/_start_stop

diff --git a/init.d/s1-transmission b/init.d/s1-transmission
index 95f3813..903de7f 100755 (executable)
--- a/init.d/s1-transmission
+++ b/init.d/s1-transmission
@@ -1,6 +1,5 @@
 #!/bin/sh
 
-NAME=`basename $0`
 export ZSLICE=rsync1/s1
 DAEMON="./gearman/transmission.pl"
 

diff --git a/init.d/s1-zfs b/init.d/s1-zfs
index 4acdd3d..ecb4164 100755 (executable)
--- a/init.d/s1-zfs
+++ b/init.d/s1-zfs
@@ -1,6 +1,5 @@
 #!/bin/sh
 
-NAME=s1-zfs
 DAEMON="./gearman/zfs.pl"
 
 export ZSLICE=rsync1/s1