tmakinen/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'puppet3'

Browse source 
Conflicts:
	ntpd/templates/ntp.conf.erb
	wiki/templates/collab-wsgi.conf.erb
This commit is contained in:
Ossi Salmi 2013-05-24 10:10:57 +03:00
commit 49a8ae3004
112 changed files with 522 additions and 517 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ejabberd/templates/ejabberd-backup.erb
View file

@ -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="<%= @ejabberd_backup_datadir %>"
if [ ! -d ${DESTDIR} ]; then
echo "ERR: ejabberd backup directory [${DESTDIR}] does not exist" 1>&2

34
ejabberd/templates/ejabberd.cfg.erb
View file

@ -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(", ") %>]}.
<% @ejabberd_hosts.map! { |host| '"%s"' % host } -%>
{hosts, [<%= @ejabberd_hosts.join(", ") %>]}.
%%
%% route_subdomains: Delegate subdomains to other XMPP servers.
@ -213,18 +213,18 @@ override_acls.
%%%. ==============
%%%' AUTHENTICATION
<% if ejabberd_auth.is_a?(Array) -%>
{auth_method, [<%= ejabberd_auth.join(", ") %>]}.
<% if @ejabberd_auth.is_a?(Array) -%>
{auth_method, [<%= @ejabberd_auth.join(", ") %>]}.
<% else -%>
{auth_method, <%= ejabberd_auth %>}.
{auth_method, <%= @ejabberd_auth %>}.
<% end -%>
<% if has_variable?("ejabberd_extauth") -%>
{extauth_program, "<%= ejabberd_extauth %>"}.
<% if @ejabberd_extauth -%>
{extauth_program, "<%= @ejabberd_extauth %>"}.
<% end -%>
<% if has_variable?("ejabberd_ldap_server") -%>
<% ejabberd_ldap_server.map! { |server| '"%s"' % server } -%>
{ldap_servers, [<%= ejabberd_ldap_server.join(", ") %>]}.
{ldap_base, "<%= ejabberd_ldap_basedn %>"}.
<% if @ejabberd_ldap_server -%>
<% @ejabberd_ldap_server.map! { |server| '"%s"' % server } -%>
{ldap_servers, [<%= @ejabberd_ldap_server.join(", ") %>]}.
{ldap_base, "<%= @ejabberd_ldap_basedn %>"}.
{ldap_encrypt, tls}.
{ldap_port, 636}.
{ldap_uids, [{"uid", "%u"}]}.
@ -387,7 +387,7 @@ override_acls.
%%
%%{acl, admin, {user, "aleksey", "localhost"}}.
%%{acl, admin, {user, "ermine", "example.org"}}.
<% ejabberd_admin.each do |admin|
<% @ejabberd_admin.each do |admin|
user, host = admin.split("@") -%>
{acl, admin, {user, "<%= user %>", "<%= host %>"}}.
<% end -%>
@ -554,7 +554,7 @@ user, host = admin.split("@") -%>
{allow_user_invites, true},
{anonymous, false},
{public, false},
<% if has_variable?("ejabberd_muclog_datadir") -%>
<% if @ejabberd_muclog_datadir -%>
{logging, true}
<% else -%>
{logging, false}
@ -563,13 +563,13 @@ user, host = admin.split("@") -%>
}
]},
%%{mod_muc_log,[]},
<% if has_variable?("ejabberd_muclog_datadir") -%>
<% if @ejabberd_muclog_datadir -%>
{mod_muc_log, [
{access_log, muc},
{outdir, "<%= ejabberd_muclog_datadir %>"},
{outdir, "<%= @ejabberd_muclog_datadir %>"},
{dirtype, subdirs},
<% if has_variable?("ejabberd_muclog_format") -%>
{file_format, <%= ejabberd_muclog_format %>},
<% if @ejabberd_muclog_format -%>
{file_format, <%= @ejabberd_muclog_format %>},
<% end -%>
{cssfile, false},
{top_link, {"/jabber-logs/", "Back to Logs"}}