From 545406b2e2b593dbecbf5dc56558e6361823c098 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Mon, 18 Aug 2008 14:48:55 +0000 Subject: [PATCH] Added support for ejabberd virtualhosts svn path=/nixos/trunk/; revision=12648 --- system/options.nix | 10 ++++++++++ upstart-jobs/ejabberd.nix | 5 ++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/system/options.nix b/system/options.nix index bea68e5283b5..2804e723a607 100644 --- a/system/options.nix +++ b/system/options.nix @@ -1438,6 +1438,16 @@ in default = "/var/log/ejabberd"; description = "Location of the logfile directory of ejabberd"; }; + + confDir = mkOption { + default = "/var/ejabberd"; + description = "Location of the config directory of ejabberd"; + }; + + virtualHosts = mkOption { + default = "\"localhost\""; + description = "Virtualhosts that ejabberd should host. Hostnames are surrounded with doublequotes and separated by commas"; + }; }; jboss = { diff --git a/upstart-jobs/ejabberd.nix b/upstart-jobs/ejabberd.nix index f1f24962a6a3..d2a5084068f2 100644 --- a/upstart-jobs/ejabberd.nix +++ b/upstart-jobs/ejabberd.nix @@ -22,9 +22,12 @@ in then cp -av ${pkgs.ejabberd}/var/lib/ejabberd /var/lib fi + + mkdir -p ${cfg.confDir} + sed -e 's|{hosts, \["localhost"\]}.|{hosts, \[${cfg.virtualHosts}\]}.|' ${pkgs.ejabberd}/etc/ejabberd/ejabberd.cfg > ${cfg.confDir}/ejabberd.cfg end script - respawn ${pkgs.bash}/bin/sh -c 'export PATH=$PATH:${pkgs.ejabberd}/sbin; cd ~; ejabberdctl --logs ${cfg.logsDir} --spool ${cfg.spoolDir} start; sleep 1d' + respawn ${pkgs.bash}/bin/sh -c 'export PATH=$PATH:${pkgs.ejabberd}/sbin; cd ~; ejabberdctl --logs ${cfg.logsDir} --spool ${cfg.spoolDir} --config ${cfg.confDir}/ejabberd.cfg start; sleep 1d' stop script ${pkgs.ejabberd}/sbin/ejabberdctl stop