Mercurial > prosody-hg

diff prosody @ 7297:b34a42a10c9f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
prosody, prosodyctl: Allow setting CFG_* variables via Lua interpreter before loading Prosody. Fixes #308.
author Matthew Wild <mwild1@gmail.com>
date Fri, 18 Mar 2016 10:24:46 +0000
parents a22d6a46d2ed
children a5a080c12c96 f8b81a82e8b6
line wrap: on
line diff
--- a/prosody	Thu Mar 17 23:15:08 2016 +0000
+++ b/prosody	Fri Mar 18 10:24:46 2016 +0000
@@ -11,10 +11,10 @@
 
 -- Will be modified by configure script if run --
 
-CFG_SOURCEDIR=os.getenv("PROSODY_SRCDIR");
-CFG_CONFIGDIR=os.getenv("PROSODY_CFGDIR");
-CFG_PLUGINDIR=os.getenv("PROSODY_PLUGINDIR");
-CFG_DATADIR=os.getenv("PROSODY_DATADIR");
+CFG_SOURCEDIR=CFG_SOURCEDIR or os.getenv("PROSODY_SRCDIR");
+CFG_CONFIGDIR=CFG_CONFIGDIR or os.getenv("PROSODY_CFGDIR");
+CFG_PLUGINDIR=CFG_PLUGINDIR or os.getenv("PROSODY_PLUGINDIR");
+CFG_DATADIR=CFG_DATADIR or os.getenv("PROSODY_DATADIR");
 
 -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --