aboutsummaryrefslogtreecommitdiffstats
path: root/prosodyctl
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2016-03-18 10:24:46 +0000
committerMatthew Wild <mwild1@gmail.com>2016-03-18 10:24:46 +0000
commitf08c656122365df6972963d01bd925e9cc530ddc (patch)
treebe3dacb0605734b65c3f18fd1e5eead19bcadcdb /prosodyctl
parent3af54d9302cae389beec6c3ce3270f3b783d2fbd (diff)
downloadprosody-f08c656122365df6972963d01bd925e9cc530ddc.tar.gz
prosody-f08c656122365df6972963d01bd925e9cc530ddc.zip
prosody, prosodyctl: Allow setting CFG_* variables via Lua interpreter before loading Prosody. Fixes #308.
Diffstat (limited to 'prosodyctl')
-rwxr-xr-xprosodyctl8
1 files changed, 4 insertions, 4 deletions
diff --git a/prosodyctl b/prosodyctl
index a7483456..7c8659fb 100755
--- a/prosodyctl
+++ b/prosodyctl
@@ -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");
-- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --