diff options
| author | Badlop <badlop@process-one.net> | 2022-04-25 12:46:48 +0200 |
|---|---|---|
| committer | Badlop <badlop@process-one.net> | 2022-05-02 13:17:53 +0200 |
| commit | 45c7fbb5ae3760073691dd25745ba415283d920c (patch) | |
| tree | 1c87b385a7a55a371b963dbad30561d498d5c314 /rel | |
| parent | Set default ejabberd version number when not using git (diff) | |
Switch "make rel" and "make dev" to paths: conf, database, logs
Diffstat (limited to 'rel')
| -rw-r--r-- | rel/reltool.config.script | 12 | ||||
| -rwxr-xr-x | rel/setup-dev.sh | 4 | ||||
| -rw-r--r-- | rel/sys.config | 4 | ||||
| -rw-r--r-- | rel/vm.args | 2 |
4 files changed, 11 insertions, 11 deletions
diff --git a/rel/reltool.config.script b/rel/reltool.config.script index 523cf9c76..ac3f5c7cb 100644 --- a/rel/reltool.config.script +++ b/rel/reltool.config.script @@ -88,15 +88,15 @@ Sys = [{lib_dirs, []}, end, OTPApps). Overlay = [ - {mkdir, "var/log/ejabberd"}, - {mkdir, "var/lib/ejabberd"}, - {mkdir, "etc/ejabberd"}, + {mkdir, "logs"}, + {mkdir, "database"}, + {mkdir, "conf"}, {mkdir, "doc"}, {template, "files/erl", "\{\{erts_vsn\}\}/bin/erl"}, {template, "../ejabberdctl.template", "bin/ejabberdctl"}, - {copy, "../ejabberdctl.cfg.example", "etc/ejabberd/ejabberdctl.cfg"}, - {copy, "../ejabberd.yml.example", "etc/ejabberd/ejabberd.yml"}, - {copy, "../inetrc", "etc/ejabberd/inetrc"}, + {copy, "../ejabberdctl.cfg.example", "conf/ejabberdctl.cfg"}, + {copy, "../ejabberd.yml.example", "conf/ejabberd.yml"}, + {copy, "../inetrc", "conf/inetrc"}, {copy, "files/install_upgrade.escript", "bin/install_upgrade.escript"} ], diff --git a/rel/setup-dev.sh b/rel/setup-dev.sh index 8040f3dd0..79171ffe0 100755 --- a/rel/setup-dev.sh +++ b/rel/setup-dev.sh @@ -2,10 +2,10 @@ echo -n "===> Preparing dev configuration files: " PWD_DIR=`pwd` REL_DIR=$PWD_DIR/_build/dev/rel/ejabberd/ -CON_DIR=$REL_DIR/etc/ejabberd/ +CON_DIR=$REL_DIR/conf/ [ -z "$REL_DIR_TEMP" ] && REL_DIR_TEMP=$REL_DIR -CON_DIR_TEMP=$REL_DIR_TEMP/etc/ejabberd/ +CON_DIR_TEMP=$REL_DIR_TEMP/conf/ BIN_DIR_TEMP=$REL_DIR_TEMP/bin/ cd $CON_DIR_TEMP diff --git a/rel/sys.config b/rel/sys.config index ff6f0f368..26b0d0c61 100644 --- a/rel/sys.config +++ b/rel/sys.config @@ -1,2 +1,2 @@ -[{ejabberd, [{config, "etc/ejabberd/ejabberd.yml"}, - {log_path, "var/log/ejabberd/ejabberd.log"}]}]. +[{ejabberd, [{config, "conf/ejabberd.yml"}, + {log_path, "logs/ejabberd.log"}]}]. diff --git a/rel/vm.args b/rel/vm.args index 29858b0dc..6301f464d 100644 --- a/rel/vm.args +++ b/rel/vm.args @@ -4,7 +4,7 @@ ## Cookie for distributed erlang #-setcookie ejabberd --mnesia dir \"var/lib/ejabberd\" +-mnesia dir \"database\" ## Heartbeat management; auto-restarts VM if it dies or becomes unresponsive ## (Disabled by default..use with caution!) |