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

Updated all templates to use instance variables

Browse source
This commit is contained in:
Ossi Salmi 2013-05-05 00:07:55 +03:00
parent a0c854d3c0
commit dc51af1ca2
113 changed files with 527 additions and 522 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ldap/templates/ldap.conf.erb
View file

@ -5,6 +5,6 @@
# See ldap.conf(5) for details
# This file should be world readable but not world writable.
BASE <%= ldap_basedn %>
URI <% ldap_server.each do |uri| %><%= uri %> <% end %>
BASE <%= @ldap_basedn %>
URI <% @ldap_server.each do |uri| %><%= uri %> <% end %>
TLS_REQCERT never

4
ldap/templates/login.conf.erb
View file

@ -118,7 +118,7 @@ end
ldap:\
:auth=-ldap:\
<%= servers -%>
:x-ldap-basedn=<%= ldap_basedn %>:\
:x-ldap-basedn=<%= @ldap_basedn %>:\
:x-ldap-filter=(&(objectclass=posixAccount)(uid=%u)):\
:umask=<%= ldap_login_umask %>:\
:umask=<%= @ldap_login_umask %>:\
:tc=default:

4
ldap/templates/slapd-acl.conf.erb
View file

@ -1,7 +1,7 @@
# database replication
access to *
by dn="uid=replicator,cn=config,<%= name %>" read
by dn="uid=replicator,cn=config,<%= @name %>" read
by * break
# allow everyone to get naming context
@ -9,7 +9,7 @@ access to dn.base=""
by * read
# allow everyone to get directory root object
access to dn.base="<%= name %>"
access to dn.base="<%= @name %>"
by * read
# schema browsing requires authentication

44
ldap/templates/slapd-database.conf.erb
View file

@ -1,25 +1,25 @@
#######################################################################
# Database <%= name %> config
# Database <%= @name %> config
#######################################################################
database hdb
suffix "<%= name %>"
suffix "<%= @name %>"
checkpoint 1024 15
rootdn "cn=manager,<%= name %>"
rootdn "cn=manager,<%= @name %>"
<% if has_variable?("ldap_server_modules") -%>
<% ldap_server_modules.each do |name| -%>
<% if @ldap_server_modules -%>
<% @ldap_server_modules.each do |name| -%>
overlay <%= name %>
<% end -%>
<% end -%>
<% moduleoptions.each do |name| -%>
<% @moduleoptions.each do |name| -%>
<%= name.split("=")[0] %> <%= name.split("=")[1] %>
<% end -%>
overlay ppolicy
ppolicy_default cn=pwdPolicy,cn=config,<%= name %>
ppolicy_default cn=pwdPolicy,cn=config,<%= @name %>
ppolicy_hash_cleartext
ppolicy_use_lockout
password-hash {CRYPT}
@ -32,15 +32,15 @@ syncprov-sessionlog 100
# The database directory MUST exist prior to running slapd AND
# should only be accessible by the slapd and slap tools.
# Mode 700 recommended.
directory /srv/ldap/<%= name %>
directory /srv/ldap/<%= @name %>
<% if master != "" -%>
<% if @master != "" -%>
# replication
syncrepl rid=<%= rid_real %>
provider=<%= master %>
syncrepl rid=<%= @rid_real %>
provider=<%= @master %>
type=refreshAndPersist
retry="10 10 60 +"
searchbase="<%= name %>"
searchbase="<%= @name %>"
filter="(objectClass=*)"
scope="sub"
sizelimit=500000
@ -48,25 +48,25 @@ syncrepl rid=<%= rid_real %>
schemachecking="off"
bindmethod="simple"
tls_reqcert="never"
binddn="uid=replicator,cn=config,<%= name %>"
credentials="<%= syncpw %>"
updateref <%= master %>
binddn="uid=replicator,cn=config,<%= @name %>"
credentials="<%= @syncpw %>"
updateref <%= @master %>
<% end -%>
# include acl and index configs
include <%= scope.lookupvar('ldap::server::config') %>/slapd.conf.d/acl.<%= name %>.conf
include <%= scope.lookupvar('ldap::server::config') %>/slapd.conf.d/index.<%= name %>.conf
include <%= scope.lookupvar('ldap::server::config') %>/slapd.conf.d/acl.<%= @name %>.conf
include <%= scope.lookupvar('ldap::server::config') %>/slapd.conf.d/index.<%= @name %>.conf
# map local users connecting via ldapi:///
sasl-regexp "gidNumber=([^,]+)+uidNumber=0,cn=peercred,cn=external,cn=auth"
"cn=manager,<%= name %>"
"cn=manager,<%= @name %>"
sasl-regexp "gidNumber=([^,]+)+uidNumber=([^,]+),cn=peercred,cn=external,cn=auth"
ldap:///<%= name %>??sub?(&(uidNumber=$2)(objectClass=posixAccount))
ldap:///<%= @name %>??sub?(&(uidNumber=$2)(objectClass=posixAccount))
# map sasl authenticated users
sasl-regexp "uid=(.*),cn=plain,cn=auth"
ldap:///<%= name %>??sub?(&(uid=$1)(objectClass=posixAccount))
ldap:///<%= @name %>??sub?(&(uid=$1)(objectClass=posixAccount))
sasl-regexp "uid=(.*),cn=login,cn=auth"
ldap:///<%= name %>??sub?(&(uid=$1)(objectClass=posixAccount))
ldap:///<%= @name %>??sub?(&(uid=$1)(objectClass=posixAccount))
sasl-regexp "uid=(.*),cn=gssapi,cn=auth"
ldap:///<%= name %>??sub?(&(uid=$1)(|(objectClass=posixAccount)(objectClass=krb5Principal)))
ldap:///<%= @name %>??sub?(&(uid=$1)(|(objectClass=posixAccount)(objectClass=krb5Principal)))

8
ldap/templates/slapd.conf.erb
View file

@ -24,15 +24,15 @@ argsfile <%= scope.lookupvar('ldap::server::rundir') %>/slapd.args
# overlay modules to load
<% if scope.lookupvar('ldap::server::modulepath') != '' -%>
modulepath <%= modulepath %>
modulepath <%= @modulepath %>
moduleload ppolicy.la
moduleload syncprov.la
<% if ['Ubuntu','Debian'].index(operatingsystem) -%>
<% if ['Ubuntu','Debian'].index(@operatingsystem) -%>
moduleload back_hdb.la
moduleload back_monitor.la
<% end -%>
<% if has_variable?('ldap_server_modules') -%>
<% ldap_server_modules.each do |name| -%>
<% if @ldap_server_modules -%>
<% @ldap_server_modules.each do |name| -%>
moduleload <%= name %>.la
<% end -%>
<% end -%>