projects
/
prosody.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
configmanager: Switch back to returning 'ok' to signal config load success - fixes...
[prosody.git]
/
prosody
diff --git
a/prosody
b/prosody
index 7bc075d746a0de6890f12507a8aaa76fb9ea1b3c..061f3781ee53904846b623a70999b0f76f18588f 100755
(executable)
--- a/
prosody
+++ b/
prosody
@@
-7,6
+7,8
@@
-- COPYING file in the source package for more information.
--
-- COPYING file in the source package for more information.
--
+-- prosody - main executable for Prosody XMPP server
+
-- Will be modified by configure script if run --
CFG_SOURCEDIR=os.getenv("PROSODY_SRCDIR");
-- Will be modified by configure script if run --
CFG_SOURCEDIR=os.getenv("PROSODY_SRCDIR");
@@
-286,7
+288,6
@@
function load_secondary_libraries()
--- Load and initialise core modules
require "util.import"
require "util.xmppstream"
--- Load and initialise core modules
require "util.import"
require "util.xmppstream"
- require "core.xmlhandlers"
require "core.rostermanager"
require "core.hostmanager"
require "core.modulemanager"
require "core.rostermanager"
require "core.hostmanager"
require "core.modulemanager"