forked from GNUsocial/gnu-social
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
This commit is contained in:
commit
f8c34711b4
|
@ -0,0 +1,52 @@
|
||||||
|
#!/usr/bin/env php
|
||||||
|
<?php
|
||||||
|
/*
|
||||||
|
* 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/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Utility script to get a list of daemons that should run, based on the
|
||||||
|
* current configuration. This is used by startdaemons.sh to determine what
|
||||||
|
* it should and shouldn't start up. The output is a list of space-separated
|
||||||
|
* daemon names.
|
||||||
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
# Abort if called from a web server
|
||||||
|
if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
|
||||||
|
print "This script must be run from the command line\n";
|
||||||
|
exit();
|
||||||
|
}
|
||||||
|
|
||||||
|
define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
|
||||||
|
define('LACONICA', true);
|
||||||
|
|
||||||
|
require_once(INSTALLDIR . '/lib/common.php');
|
||||||
|
|
||||||
|
if(common_config('xmpp','enabled')) {
|
||||||
|
echo "xmppdaemon.php jabberqueuehandler.php publicqueuehandler.php ";
|
||||||
|
echo "xmppconfirmhandler.php ";
|
||||||
|
}
|
||||||
|
if(common_config('memcached','enabled')) {
|
||||||
|
echo "memcachedqueuehandler.php ";
|
||||||
|
}
|
||||||
|
echo "ombqueuehandler.php ";
|
||||||
|
echo "twitterqueuehandler.php ";
|
||||||
|
echo "facebookqueuehandler.php ";
|
||||||
|
echo "pingqueuehandler.php ";
|
||||||
|
echo "inboxqueuehandler.php ";
|
||||||
|
echo "smsqueuehandler.php ";
|
|
@ -21,11 +21,9 @@
|
||||||
# Note that the 'maildaemon' needs to run as a mail filter.
|
# Note that the 'maildaemon' needs to run as a mail filter.
|
||||||
|
|
||||||
DIR=`dirname $0`
|
DIR=`dirname $0`
|
||||||
|
DAEMONS=`php $DIR/getvaliddaemons.php`
|
||||||
|
|
||||||
for f in xmppdaemon.php jabberqueuehandler.php publicqueuehandler.php \
|
for f in $DAEMONS; do
|
||||||
xmppconfirmhandler.php smsqueuehandler.php ombqueuehandler.php \
|
|
||||||
twitterqueuehandler.php facebookqueuehandler.php pingqueuehandler.php \
|
|
||||||
memcachedqueuehandler.php inboxqueuehandler.php; do
|
|
||||||
|
|
||||||
echo -n "Starting $f...";
|
echo -n "Starting $f...";
|
||||||
php $DIR/$f
|
php $DIR/$f
|
||||||
|
|
|
@ -25,7 +25,7 @@ DIR=`php $SDIR/getpiddir.php`
|
||||||
|
|
||||||
for f in jabberhandler ombhandler publichandler smshandler pinghandler \
|
for f in jabberhandler ombhandler publichandler smshandler pinghandler \
|
||||||
xmppconfirmhandler xmppdaemon twitterhandler facebookhandler \
|
xmppconfirmhandler xmppdaemon twitterhandler facebookhandler \
|
||||||
memcachedhandler inboxhandler; do
|
memcachehandler inboxhandler; do
|
||||||
|
|
||||||
FILES="$DIR/$f.*.pid"
|
FILES="$DIR/$f.*.pid"
|
||||||
for ff in "$FILES" ; do
|
for ff in "$FILES" ; do
|
||||||
|
|
|
@ -842,23 +842,6 @@ text-transform:lowercase;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
.notice-data {
|
|
||||||
position:absolute;
|
|
||||||
top:18px;
|
|
||||||
right:0;
|
|
||||||
min-height:50px;
|
|
||||||
margin-bottom:4px;
|
|
||||||
}
|
|
||||||
.notice .entry-content .notice-data dt {
|
|
||||||
display:none;
|
|
||||||
}
|
|
||||||
|
|
||||||
.notice-data a {
|
|
||||||
display:block;
|
|
||||||
outline:none;
|
|
||||||
}
|
|
||||||
|
|
||||||
.notice-options {
|
.notice-options {
|
||||||
padding-left:2%;
|
padding-left:2%;
|
||||||
float:left;
|
float:left;
|
||||||
|
@ -1036,6 +1019,8 @@ padding-right:30px;
|
||||||
.hentry .entry-content p {
|
.hentry .entry-content p {
|
||||||
margin-bottom:18px;
|
margin-bottom:18px;
|
||||||
}
|
}
|
||||||
|
.system_notice ul,
|
||||||
|
.instructions ul,
|
||||||
.hentry entry-content ol,
|
.hentry entry-content ol,
|
||||||
.hentry .entry-content ul {
|
.hentry .entry-content ul {
|
||||||
list-style-position:inside;
|
list-style-position:inside;
|
||||||
|
@ -1160,9 +1145,6 @@ clear:both;
|
||||||
margin-bottom:0;
|
margin-bottom:0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.instructions ul {
|
|
||||||
list-style-position:inside;
|
|
||||||
}
|
|
||||||
.instructions p,
|
.instructions p,
|
||||||
.instructions ul {
|
.instructions ul {
|
||||||
margin-bottom:18px;
|
margin-bottom:18px;
|
||||||
|
|
Loading…
Reference in New Issue