diff options
| author | Sarven Capadisli <csarven@controlyourself.ca> | 2009-05-01 00:16:25 +0000 |
|---|---|---|
| committer | Sarven Capadisli <csarven@controlyourself.ca> | 2009-05-01 00:16:25 +0000 |
| commit | d30df0790818d77b81ee8b271b9bd8ebe3063ee7 (patch) | |
| tree | d3a9b32815252caabcf16f593fbf4e2080cff93f /scripts/startdaemons.sh | |
| parent | f798d1ea430d25c2f4a60179c65b39b1257a5340 (diff) | |
| parent | b79fef307481b36b4d04dbabb54e3f6d9edf6896 (diff) | |
Merge branch '0.7.x' into 0.8.x
Resolved Conflicts:
lib/queuehandler.php
lib/util.php
theme/base/css/display.css
Diffstat (limited to 'scripts/startdaemons.sh')
| -rwxr-xr-x | scripts/startdaemons.sh | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/scripts/startdaemons.sh b/scripts/startdaemons.sh index c3729761d..3869e95c4 100755 --- a/scripts/startdaemons.sh +++ b/scripts/startdaemons.sh @@ -21,10 +21,9 @@ # Note that the 'maildaemon' needs to run as a mail filter. DIR=`dirname $0` +DAEMONS=`php $DIR/getvaliddaemons.php` -for f in xmppdaemon.php jabberqueuehandler.php publicqueuehandler.php \ - xmppconfirmhandler.php smsqueuehandler.php ombqueuehandler.php \ - twitterqueuehandler.php facebookqueuehandler.php pingqueuehandler.php; do +for f in $DAEMONS; do echo -n "Starting $f..."; php $DIR/$f |