From 79d3b77de129530f893071390781a6ab137a2113 Mon Sep 17 00:00:00 2001
From: Mickael Remond <mremond@process-one.net>
Date: Wed, 2 Sep 2015 11:38:16 +0200
Subject: [PATCH 1/3] Update mix.exs to comply with exrm release system

---
 mix.exs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mix.exs b/mix.exs
index dee119971..57330c04a 100644
--- a/mix.exs
+++ b/mix.exs
@@ -15,7 +15,9 @@ defmodule Ejabberd.Mixfile do
 
   def application do
     [mod: {:ejabberd_app, []},
-     applications: [:kernel, :stdlib]]
+     applications: [:ssl],
+     included_applications: [:p1_logger,:p1_yaml,:p1_tls,:p1_xml,:p1_stringprep,:p1_zlib,:p1_cache_tab,:mnesia,:p1_utils,
+                             :p1_iconv,:esip,:p1_stun,:ehyperloglog,:p1_mysql,:p1_pgsql,:eredis]]
   end
   
   defp erlc_options do

From e179727a0e1846b0e3e24a04fc199d82e6b73366 Mon Sep 17 00:00:00 2001
From: Mickael Remond <mremond@process-one.net>
Date: Wed, 2 Sep 2015 12:48:19 +0200
Subject: [PATCH 2/3] ignore ejabberd release result directory

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 21f8cfada..eb54d51e6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,3 +41,4 @@ XmppAddr.hrl
 /test/*.beam
 /logs/
 /priv/sql
+/rel/ejabberd

From 4ae7c81cfa044e8a44b3ece13d11818a48c9a3b2 Mon Sep 17 00:00:00 2001
From: Mickael Remond <mremond@process-one.net>
Date: Wed, 2 Sep 2015 12:49:19 +0200
Subject: [PATCH 3/3] Allow building ejabberd with Elixir mix and building and
 ejabberd OTP release

---
 config/config.exs | 10 ++++++++++
 mix.exs           |  3 ++-
 2 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 config/config.exs

diff --git a/config/config.exs b/config/config.exs
new file mode 100644
index 000000000..8b68e8dbf
--- /dev/null
+++ b/config/config.exs
@@ -0,0 +1,10 @@
+use Mix.Config
+
+# This is standard path in the context of ejabberd release
+config :ejabberd,
+  file: "running-config/ejabberd.yml",
+  log_path: 'log/ejabberd.log'
+ 
+# Customize Mnesia directory:
+config :mnesia,
+  dir: 'mnesiadb/'
diff --git a/mix.exs b/mix.exs
index 57330c04a..99e00b0d8 100644
--- a/mix.exs
+++ b/mix.exs
@@ -41,7 +41,8 @@ defmodule Ejabberd.Mixfile do
         {:ehyperloglog, git: "https://github.com/vaxelfel/eHyperLogLog"},
         {:p1_mysql, git: "https://github.com/processone/mysql"},
         {:p1_pgsql, git: "https://github.com/processone/pgsql"},
-        {:eredis, git: "https://github.com/wooga/eredis"}
+        {:eredis, git: "https://github.com/wooga/eredis"},
+        {:exrm, "~> 0.19.2"}
      ]
   end
 end