summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xscripts/startdaemons.sh16
-rwxr-xr-xscripts/stopdaemons.sh28
2 files changed, 9 insertions, 35 deletions
diff --git a/scripts/startdaemons.sh b/scripts/startdaemons.sh
index 8c054417d..6cb010800 100755
--- a/scripts/startdaemons.sh
+++ b/scripts/startdaemons.sh
@@ -1,6 +1,7 @@
#!/bin/sh
# Laconica - a distributed open-source microblogging tool
+
# Copyright (C) 2008, Controlez-Vous, Inc.
#
# This program is free software: you can redistribute it and/or modify
@@ -16,13 +17,14 @@
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-# This program tries to start the daemons for Laconica. Note that the 'maildaemon' needs to run as a mail filter.
+# This program tries to start the daemons for Laconica.
+# Note that the 'maildaemon' needs to run as a mail filter.
export INSTALLDIR=$1
-/sbin/start-stop-daemon -S --exec $INSTALLDIR/scripts/xmppdaemon.php -b -m --pidfile=/var/run/xmppdaemon.pid
-/sbin/start-stop-daemon -S --exec $INSTALLDIR/scripts/xmppqueuehandler.php -b -m --pidfile=/var/run/xmppqueuehandler.pid
-/sbin/start-stop-daemon -S --exec $INSTALLDIR/scripts/publicqueuehandler.php -b -m --pidfile=/var/run/publicqueuehandler.pid
-/sbin/start-stop-daemon -S --exec $INSTALLDIR/scripts/xmppconfirmhandler.php -b -m --pidfile=/var/run/xmppconfirmhandler.pid
-/sbin/start-stop-daemon -S --exec $INSTALLDIR/scripts/smsqueuehandler.php -b -m --pidfile=/var/run/smsqueuehandler.pid
-/sbin/start-stop-daemon -S --exec $INSTALLDIR/scripts/ombqueuehandler.php -b -m --pidfile=/var/run/ombqueuehandler.pid
+for f in xmppdaemon.php xmppqueuehandler.php publicqueuehandler.php \
+ xmppconfirmhandler.php smsqueuehandler.php ombqueuehandler.php; do
+
+ php $INSTALLDIR/scripts/$f;
+
+done
diff --git a/scripts/stopdaemons.sh b/scripts/stopdaemons.sh
deleted file mode 100755
index 6814101cb..000000000
--- a/scripts/stopdaemons.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-
-# Laconica - a distributed open-source microblogging tool
-# Copyright (C) 2008, Controlez-Vous, Inc.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-# This program tries to start the daemons for Laconica. Note that the 'maildaemon' needs to run as a mail filter.
-
-export INSTALLDIR=$1
-
-/sbin/start-stop-daemon -K -m --pidfile=/var/run/xmppdaemon.pid
-/sbin/start-stop-daemon -K -m --pidfile=/var/run/xmppqueuehandler.pid
-/sbin/start-stop-daemon -K -m --pidfile=/var/run/publicqueuehandler.pid
-/sbin/start-stop-daemon -K -m --pidfile=/var/run/xmppconfirmhandler.pid
-/sbin/start-stop-daemon -K -m --pidfile=/var/run/smsqueuehandler.pid
-/sbin/start-stop-daemon -K -m --pidfile=/var/run/ombqueuehandler.pid