Skip to content

Commit

Permalink
Add packaging support for contributed modules
Browse files Browse the repository at this point in the history
This is a preliminary version that is tested to work with the packaging
branch of ejabberd-modules repository

This version lacks automatic configuration include at runtime
  • Loading branch information
Christophe Romain committed Mar 11, 2015
1 parent a0fafc3 commit f776220
Show file tree
Hide file tree
Showing 5 changed files with 506 additions and 0 deletions.
8 changes: 8 additions & 0 deletions ejabberd.yml.example
Original file line number Diff line number Diff line change
Expand Up @@ -652,6 +652,14 @@ modules:
## mod_echo:
## host: "mirror.localhost"

##
## Enable modules management via ejabberdctl for installation and
## uninstallation of public/private contributed modules
## (enabled by default)
##

allow_contrib_modules: true

### Local Variables:
### mode: yaml
### End:
Expand Down
10 changes: 10 additions & 0 deletions ejabberdctl.cfg.example
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,16 @@
#
#EJABBERD_CONFIG_PATH=/etc/ejabberd/ejabberd.yml

#.
#' CONTRIB_MODULES_PATH: contributed ejabberd modules path
#
# Specify the full path to the contributed ejabberd modules. If the path is not
# defined, ejabberd will use ~/.ejabberd-modules in home of user running ejabberd.
#
# Default: $HOME/.ejabberd-modules
#
#CONTRIB_MODULES_PATH=/opt/ejabberd-modules

#.
#'
# vim: foldmarker=#',#. foldmethod=marker:
4 changes: 4 additions & 0 deletions include/jlib.hrl
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,11 @@
%%%----------------------------------------------------------------------

-include("ns.hrl").
-ifdef(NO_EXT_LIB).
-include("xml.hrl").
-else.
-include_lib("p1_xml/include/xml.hrl").
-endif.

-define(STANZA_ERROR(Code, Type, Condition),
#xmlel{name = <<"error">>,
Expand Down
1 change: 1 addition & 0 deletions src/ejabberd_app.erl
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ start(normal, _Args) ->
ejabberd_commands:init(),
ejabberd_admin:start(),
gen_mod:start(),
ext_mod:start(),
ejabberd_config:start(),
set_loglevel_from_config(),
acl:start(),
Expand Down
Loading

0 comments on commit f776220

Please sign in to comment.