ejabberd: Manual merge from parameterize branch

ejabberd/templates/ejabberd-backup.erb

@@ -25,7 +25,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-DESTDIR="<%= @ejabberd_backup_datadir %>"
+DESTDIR="<%= @datadir %>"
 
 if [ ! -d ${DESTDIR} ]; then
     echo "ERR: ejabberd backup directory [${DESTDIR}] does not exist" 1>&2

ejabberd/templates/ejabberd.cfg.erb

@@ -89,8 +89,8 @@ override_acls.
 %% You can define one or several, for example:
 %% {hosts, ["example.net", "example.com", "example.org"]}.
 %%
-<% @ejabberd_hosts.map! { |host| '"%s"' % host } -%>
-{hosts, [<%= @ejabberd_hosts.join(", ") %>]}.
+<% @hosts.map! { |host| '"%s"' % host } -%>
+{hosts, [<%= @hosts.join(", ") %>]}.
 
 %%
 %% route_subdomains: Delegate subdomains to other XMPP servers.
@@ -213,25 +213,25 @@ override_acls.
 %%%.   ==============
 %%%'   AUTHENTICATION
 
-<% if @ejabberd_auth.is_a?(Array) -%>
-{auth_method, [<%= @ejabberd_auth.join(", ") %>]}.
+<% if @auth.is_a?(Array) -%>
+{auth_method, [<%= @auth.join(", ") %>]}.
 <% else -%>
-{auth_method, <%= @ejabberd_auth %>}.
+{auth_method, <%= @auth %>}.
 <% end -%>
-<% if @ejabberd_extauth -%>
-{extauth_program, "<%= @ejabberd_extauth %>"}.
+<% if @extauth -%>
+{extauth_program, "<%= @extauth %>"}.
 <% end -%>
-<% if @ejabberd_ldap_server -%>
-<% @ejabberd_ldap_server.map! { |server| '"%s"' % server } -%>
-{ldap_servers, [<%= @ejabberd_ldap_server.join(", ") %>]}.
-{ldap_base, "<%= @ejabberd_ldap_basedn %>"}.
-{ldap_encrypt, <%= @ejabberd_ldap_encrypt %>}.
-{ldap_port, <%= @ejabberd_ldap_port %>}.
-{ldap_uids, [{"<%= @ejabberd_ldap_uidattr %>", "%u"}]}.
+<% if @ldap_server -%>
+<% @ldap_server.map! { |server| '"%s"' % server } -%>
+{ldap_servers, [<%= @ldap_server.join(", ") %>]}.
+{ldap_base, "<%= @ldap_basedn %>"}.
+{ldap_encrypt, <%= @ldap_encrypt %>}.
+{ldap_port, <%= @ldap_port %>}.
+{ldap_uids, [{"<%= @ldap_uid %>", "%u"}]}.
 {ldap_filter, "(!(loginShell=/sbin/nologin))"}.
-<%   if @ejabberd_ldap_binddn -%>
-{ldap_rootdn, "<%= @ejabberd_ldap_binddn %>"}.
-{ldap_password, "<%= @ejabberd_ldap_bindpw %>"}.
+<%   if @ldap_rootdn and @ldap_password -%>
+{ldap_rootdn, "<%= @ldap_rootdn %>"}.
+{ldap_password, "<%= @ldap_password %>"}.
 <%   end -%>
 <% end -%>
 
@@ -391,7 +391,7 @@ override_acls.
 %%
 %%{acl, admin, {user, "aleksey", "localhost"}}.
 %%{acl, admin, {user, "ermine", "example.org"}}.
-<% @ejabberd_admin.each do |admin|
+<% @admins.each do |admin|
 user, host = admin.split("@") -%>
 {acl, admin, {user, "<%= user %>", "<%= host %>"}}.
 <% end -%>
@@ -429,7 +429,7 @@ user, host = admin.split("@") -%>
 %%%'   ACCESS RULES
 
 %% Maximum number of simultaneous sessions allowed for a single user:
-{access, max_user_sessions, [{100, all}]}.
+{access, max_user_sessions, [{1000, all}]}.
 
 %% Maximum number of offline messages that users can have:
 {access, max_user_offline_messages, [{5000, admin}, {100, all}]}.
@@ -554,29 +554,26 @@ user, host = admin.split("@") -%>
 		  {max_users, 1000},
 		  {max_user_conferences, 2500},
 		  {default_room_options,
-		    [ 
+		    [
 		      {allow_user_invites, true},
 		      {anonymous, false},
 		      {public, false},
-<% if @ejabberd_muclog_datadir -%>
-		      {logging, true}
+<% if @muclog_datadir -%>
+		      {logging, true},
 <% else -%>
-		      {logging, false}
+		      {logging, false},
 <% end -%>
+		      {max_users, 1000}
 		    ]
 		  }
 		 ]},
   %%{mod_muc_log,[]},
-<% if @ejabberd_muclog_datadir -%>
+<% if @muclog_datadir -%>
   {mod_muc_log,  [
-		  {access_log, muc},
-		  {outdir, "<%= @ejabberd_muclog_datadir %>"},
-		  {dirtype, subdirs},
-<% if @ejabberd_muclog_format -%>
-		  {file_format, <%= @ejabberd_muclog_format %>},
-<% end -%>
-		  {cssfile, false},
-		  {top_link, {"/jabber-logs/", "Back to Logs"}}
+		  {access_log, muc_admin},
+		  {file_format, <%= @muclog_format %>},
+		  {outdir, "<%= @muclog_datadir %>"},
+		  {timezone, universal}
 		 ]},
 <% end -%>
   {mod_offline,  [{access_max_user_messages, max_user_offline_messages}]},