projects
/
prosody.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0e6b0e8
)
prosody, prosodyctl: Allow setting CFG_* variables via Lua interpreter before loading...
author
Matthew Wild
<mwild1@gmail.com>
Fri, 18 Mar 2016 10:24:46 +0000
(10:24 +0000)
committer
Matthew Wild
<mwild1@gmail.com>
Fri, 18 Mar 2016 10:24:46 +0000
(10:24 +0000)
prosody
patch
|
blob
|
history
prosodyctl
patch
|
blob
|
history
diff --git
a/prosody
b/prosody
index 6a3b50db1c72e66548f637165911b568534e6918..9cc32cee4a740a85bbf76aad88d78b7a08cd98f7 100755
(executable)
--- a/
prosody
+++ b/
prosody
@@
-11,10
+11,10
@@
-- Will be modified by configure script if run --
-- 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");
-- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
diff --git
a/prosodyctl
b/prosodyctl
index a748345699ee5b9c408d6eb6402a8f2ad7930f65..7c8659fb09d3aacb511adf8ec0d5ac3d455492f2 100755
(executable)
--- a/
prosodyctl
+++ b/
prosodyctl
@@
-11,10
+11,10
@@
-- Will be modified by configure script if run --
-- 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");
-- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --