Author: urkud
Date: Wed Feb 16 21:03:14 2011
New Revision: 25996
URL: https://svn.nixos.org/websvn/nix/?rev=25996&sc=1
Log:
ejabberd: tabs->spaces, remove trailing whitespace
Modified:
nixos/trunk/modules/services/networking/ejabberd.nix
Modified: nixos/trunk/modules/services/networking/ejabberd.nix
==============================================================================
--- nixos/trunk/modules/services/networking/ejabberd.nix Wed Feb 16
16:48:34 2011 (r25995)
+++ nixos/trunk/modules/services/networking/ejabberd.nix Wed Feb 16
21:03:14 2011 (r25996)
@@ -13,9 +13,9 @@
###### interface
options = {
-
+
services.ejabberd = {
-
+
enable = mkOption {
default = false;
description = "Whether to enable ejabberd server";
@@ -44,12 +44,12 @@
loadDumps = mkOption {
default = [];
description = "Configuration dump that should be loaded on the first
startup";
- example = [ ./myejabberd.dump ];
+ example = [ ./myejabberd.dump ];
};
};
-
+
};
-
+
###### implementation
@@ -61,10 +61,10 @@
startOn = "started network-interfaces";
stopOn = "stopping network-interfaces";
-
- environment = {
- PATH =
"$PATH:${pkgs.ejabberd}/sbin:${pkgs.ejabberd}/bin:${pkgs.coreutils}/bin:${pkgs.bash}/bin:${pkgs.gnused}/bin";
- };
+
+ environment = {
+ PATH =
"$PATH:${pkgs.ejabberd}/sbin:${pkgs.ejabberd}/bin:${pkgs.coreutils}/bin:${pkgs.bash}/bin:${pkgs.gnused}/bin";
+ };
preStart =
''
@@ -73,31 +73,31 @@
if ! test -d ${cfg.spoolDir}
then
- initialize=1
+ initialize=1
cp -av ${pkgs.ejabberd}/var/lib/ejabberd /var/lib
fi
-
+
if ! test -d ${cfg.confDir}
- then
- mkdir -p ${cfg.confDir}
- cp ${pkgs.ejabberd}/etc/ejabberd/* ${cfg.confDir}
- sed -e 's|{hosts, \["localhost"\]}.|{hosts,
\[${cfg.virtualHosts}\]}.|' ${pkgs.ejabberd}/etc/ejabberd/ejabberd.cfg >
${cfg.confDir}/ejabberd.cfg
- fi
-
- ejabberdctl --config-dir ${cfg.confDir} --logs ${cfg.logsDir}
--spool ${cfg.spoolDir} start
-
- ${if cfg.loadDumps == [] then "" else
- ''
- if [ "$initialize" = "1" ]
- then
- # Wait until the ejabberd server is available for use
+ then
+ mkdir -p ${cfg.confDir}
+ cp ${pkgs.ejabberd}/etc/ejabberd/* ${cfg.confDir}
+ sed -e 's|{hosts, \["localhost"\]}.|{hosts,
\[${cfg.virtualHosts}\]}.|' ${pkgs.ejabberd}/etc/ejabberd/ejabberd.cfg >
${cfg.confDir}/ejabberd.cfg
+ fi
+
+ ejabberdctl --config-dir ${cfg.confDir} --logs ${cfg.logsDir}
--spool ${cfg.spoolDir} start
+
+ ${if cfg.loadDumps == [] then "" else
+ ''
+ if [ "$initialize" = "1" ]
+ then
+ # Wait until the ejabberd server is available for use
count=0
while ! ejabberdctl --config-dir ${cfg.confDir} --logs
${cfg.logsDir} --spool ${cfg.spoolDir} status
do
if [ $count -eq 30 ]
then
echo "Tried 30 times, giving up..."
- exit 1
+ exit 1
fi
echo "Ejabberd daemon not yet started. Waiting for 1
second..."
@@ -105,31 +105,31 @@
sleep 1
done
- ${concatMapStrings (dump:
- ''
- echo "Importing dump: ${dump}"
-
- if [ -f ${dump} ]
- then
- ejabberdctl --config-dir ${cfg.confDir} --logs
${cfg.logsDir} --spool ${cfg.spoolDir} load ${dump}
- elif [ -d ${dump} ]
- then
- for i in ${dump}/ejabberd-dump/*
- do
- ejabberdctl --config-dir ${cfg.confDir} --logs
${cfg.logsDir} --spool ${cfg.spoolDir} load $i
- done
- fi
- '') cfg.loadDumps}
- fi
- ''}
+ ${concatMapStrings (dump:
+ ''
+ echo "Importing dump: ${dump}"
+
+ if [ -f ${dump} ]
+ then
+ ejabberdctl --config-dir ${cfg.confDir} --logs
${cfg.logsDir} --spool ${cfg.spoolDir} load ${dump}
+ elif [ -d ${dump} ]
+ then
+ for i in ${dump}/ejabberd-dump/*
+ do
+ ejabberdctl --config-dir ${cfg.confDir} --logs
${cfg.logsDir} --spool ${cfg.spoolDir} load $i
+ done
+ fi
+ '') cfg.loadDumps}
+ fi
+ ''}
'';
postStop =
- ''
+ ''
ejabberdctl --config-dir ${cfg.confDir} --logs ${cfg.logsDir}
--spool ${cfg.spoolDir} stop
'';
};
};
-
+
}
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
