Merge branch 'processone:master' into master

4 files changed, 76 insertions, 0 deletions

diff --git a/rel/setup-dev.sh b/rel/setup-dev.sh
new file mode 100755
index 000000000..8040f3dd0
--- /dev/null
+++ b/rel/setup-dev.sh
@@ -0,0 +1,28 @@
+echo -n "===> Preparing dev configuration files: "
+
+PWD_DIR=`pwd`
+REL_DIR=$PWD_DIR/_build/dev/rel/ejabberd/
+CON_DIR=$REL_DIR/etc/ejabberd/
+
+[ -z "$REL_DIR_TEMP" ] && REL_DIR_TEMP=$REL_DIR
+CON_DIR_TEMP=$REL_DIR_TEMP/etc/ejabberd/
+BIN_DIR_TEMP=$REL_DIR_TEMP/bin/
+
+cd $CON_DIR_TEMP
+
+sed -i "s|# certfiles:|certfiles:\n  - $CON_DIR/cert.pem|g" ejabberd.yml.example
+sed -i "s|certfiles:|ca_file: $CON_DIR/ca.pem\ncertfiles:|g" ejabberd.yml.example
+sed -i 's|^acl:$|acl:\n  admin: [user: admin]|g' ejabberd.yml.example
+[ ! -f "$CON_DIR/ejabberd.yml" ] \
+    && echo -n "ejabberd.yml " \
+    && mv ejabberd.yml.example ejabberd.yml
+
+sed -i "s|#' POLL|EJABBERD_BYPASS_WARNINGS=true\n\n#' POLL|g" ejabberdctl.cfg.example
+[ ! -f "$CON_DIR/ejabberdctl.cfg" ] \
+    && echo -n "ejabberdctl.cfg " \
+    && mv ejabberdctl.cfg.example ejabberdctl.cfg
+
+echo ""
+echo "===> Some example ways to start this ejabberd dev:"
+echo "     _build/dev/rel/ejabberd/bin/ejabberd console"
+echo "     _build/dev/rel/ejabberd/bin/ejabberdctl live"
diff --git a/rel/sys.config b/rel/sys.config
new file mode 100644
index 000000000..ff6f0f368
--- /dev/null
+++ b/rel/sys.config
@@ -0,0 +1,2 @@
+[{ejabberd, [{config, "etc/ejabberd/ejabberd.yml"},
+             {log_path, "var/log/ejabberd/ejabberd.log"}]}].
diff --git a/rel/vm.args b/rel/vm.args
new file mode 100644
index 000000000..29858b0dc
--- /dev/null
+++ b/rel/vm.args
@@ -0,0 +1,32 @@
+## Name of the node
+-sname ejabberd@localhost
+
+## Cookie for distributed erlang
+#-setcookie ejabberd
+
+-mnesia dir \"var/lib/ejabberd\"
+
+## Heartbeat management; auto-restarts VM if it dies or becomes unresponsive
+## (Disabled by default..use with caution!)
+##-heart
+
+## Enable kernel poll and a few async threads
+##+K true
+##+A 5
+
+## Increase number of concurrent ports/sockets
+##-env ERL_MAX_PORTS 4096
+
+## Tweak GC to run more often
+##-env ERL_FULLSWEEP_AFTER 10
+
+# +B [c | d | i]
+# Option c makes Ctrl-C interrupt the current shell instead of invoking the emulator break
+# handler. Option d (same as specifying +B without an extra option) disables the break handler. # Option i makes the emulator ignore any break signal.
+# If option c is used with oldshell on Unix, Ctrl-C will restart the shell process rather than
+# interrupt it.
+# Disable the emulator break handler
+# it easy to accidentally type ctrl-c when trying
+# to reach for ctrl-d. ctrl-c on a live node can
+# have very undesirable results
+##+Bi
diff --git a/rel/vm.args.mix b/rel/vm.args.mix
new file mode 100644
index 000000000..711bd3189
--- /dev/null
+++ b/rel/vm.args.mix
@@ -0,0 +1,14 @@
+## Customize flags given to the VM: https://erlang.org/doc/man/erl.html
+## -mode/-name/-sname/-setcookie are configured via env vars, do not set them here
+
+-boot ../releases/<%= @version %>/start_clean
+-boot_var RELEASE_LIB ../lib
+
+## Number of dirty schedulers doing IO work (file, sockets, and others)
+##+SDio 5
+
+## Increase number of concurrent ports/sockets
+##+Q 65536
+
+## Tweak GC to run more often
+##-env ERL_FULLSWEEP_AFTER 10