Moved ejabberd initialization check loop inside the if statement, since we only have to check for it in the first startup
svn path=/nixos/branches/upstart-0.6/; revision=18464
This commit is contained in:
parent
9b000b3dcf
commit
dd0f8b36d5
@ -88,6 +88,8 @@ in
|
|||||||
|
|
||||||
${if cfg.loadDumps == [] then "" else
|
${if cfg.loadDumps == [] then "" else
|
||||||
''
|
''
|
||||||
|
if [ "$initialize" = "1" ]
|
||||||
|
then
|
||||||
# Wait until the ejabberd server is available for use
|
# Wait until the ejabberd server is available for use
|
||||||
count=0
|
count=0
|
||||||
while ! ejabberdctl --config-dir ${cfg.confDir} --logs ${cfg.logsDir} --spool ${cfg.spoolDir} status
|
while ! ejabberdctl --config-dir ${cfg.confDir} --logs ${cfg.logsDir} --spool ${cfg.spoolDir} status
|
||||||
@ -103,8 +105,6 @@ in
|
|||||||
sleep 1
|
sleep 1
|
||||||
done
|
done
|
||||||
|
|
||||||
if [ "$initialize" = "1" ]
|
|
||||||
then
|
|
||||||
${concatMapStrings (dump:
|
${concatMapStrings (dump:
|
||||||
''
|
''
|
||||||
echo "Importing dump: ${dump}"
|
echo "Importing dump: ${dump}"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user