rename observer initscript
diff --git a/Dockerfile b/Dockerfile
index 09a5eb3..1d1fd25 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -87,7 +87,7 @@
# Get XOS
ADD xos /opt/xos
-ADD observer-initscript /etc/init.d/plstackobserver
+ADD observer-initscript /etc/init.d/xosobserver
RUN chmod +x /opt/xos/scripts/opencloud
RUN /opt/xos/scripts/opencloud genkeys
diff --git a/observer-initscript b/observer-initscript
old mode 100644
new mode 100755
index 5f8cf0d..d1466b2
--- a/observer-initscript
+++ b/observer-initscript
@@ -6,21 +6,21 @@
# Source function library.
. /etc/init.d/functions
-[ -f /etc/sysconfig/plstackobserver ] && . /etc/sysconfig/plstackobserver
+[ -f /etc/sysconfig/xosobserver ] && . /etc/sysconfig/xosobserver
-plstackobserver=${NODEMANAGER-"python /opt/xos/xos-observer.py -d"}
+xosobserver=${NODEMANAGER-"python /opt/xos/xos-observer.py -d"}
prog="OpenCloud Observer"
-pidfile=${PIDFILE-/var/run/plstackobserver.pid}
+pidfile=${PIDFILE-/var/run/xosobserver.pid}
RETVAL=0
function start() {
- action $"Starting $prog: " daemon --pidfile=$pidfile --check=plstackobserver $plstackobserver "$@"
+ action $"Starting $prog: " daemon --pidfile=$pidfile --check=xosobserver $xosobserver "$@"
}
function stop() {
- action $"Stopping $prog: " killproc -p $pidfile plstackobserver
+ action $"Stopping $prog: " killproc -p $pidfile xosobserver
}
case "$1" in
@@ -31,7 +31,7 @@
stop
;;
status)
- status -p $pidfile plstackobserver
+ status -p $pidfile xosobserver
RETVAL=$?
;;
restart|reload)
@@ -46,13 +46,13 @@
restartverbose)
shift
stop
- $plstackobserver $verboseoptions "$@"
+ $xosobserver $verboseoptions "$@"
;;
restartdebug)
shift
stop
echo "Restarting with $debugoptions $@ .."
- $plstackobserver $debugoptions "$@"
+ $xosobserver $debugoptions "$@"
;;
*)
echo $"Usage: $0 {start|stop|status|restart|condrestart|restartdebug [-d]}"
diff --git a/xos.spec b/xos.spec
index da627c0..2931d00 100644
--- a/xos.spec
+++ b/xos.spec
@@ -89,10 +89,10 @@
rm -rf %{buildroot}/opt/xos
# don't copy symbolic links (they are handled in %post)
rsync -rptgoD ./xos %{buildroot}/opt/.
-cp observer-initscript %{buildroot}/etc/init.d/plstackobserver
+cp observer-initscript %{buildroot}/etc/init.d/xosobserver
find %{buildroot}/opt/xos -type f -print | sed "s@^$RPM_BUILD_ROOT@@g" > %{_tmppath}/tmp-filelist
-echo /etc/init.d/plstackobserver >> %{_tmppath}/tmp-filelist
+echo /etc/init.d/xosobserver >> %{_tmppath}/tmp-filelist
# remove config files from the file list (see %config below)
cat > %{_tmppath}/config-files << "EOF"