diff options
| author | Thomas Backlund <tmb@mageia.org> | 2015-10-20 10:34:27 +0300 |
|---|---|---|
| committer | Thomas Backlund <tmb@mageia.org> | 2015-10-20 10:34:27 +0300 |
| commit | a1dd14788b11a13ecbace190bd85da053bd729b2 (patch) | |
| tree | 0e3df2a5b8491c6a499df6fee37bf99c7641b9bc /modules | |
| parent | 964cab623d85d877d2b420867446d8f7ad8125ba (diff) | |
| download | puppet-a1dd14788b11a13ecbace190bd85da053bd729b2.tar puppet-a1dd14788b11a13ecbace190bd85da053bd729b2.tar.gz puppet-a1dd14788b11a13ecbace190bd85da053bd729b2.tar.bz2 puppet-a1dd14788b11a13ecbace190bd85da053bd729b2.tar.xz puppet-a1dd14788b11a13ecbace190bd85da053bd729b2.zip | |
lint fixes for openldap
Diffstat (limited to 'modules')
5 files changed, 5 insertions, 10 deletions
diff --git a/modules/openldap/lib/puppet/parser/functions/get_ldap_servers.rb b/modules/openldap/lib/puppet/parser/functions/get_ldap_servers.rb index 204da558..0d620926 100644 --- a/modules/openldap/lib/puppet/parser/functions/get_ldap_servers.rb +++ b/modules/openldap/lib/puppet/parser/functions/get_ldap_servers.rb @@ -1,11 +1,11 @@ # return a list of all ldap servers declared module Puppet::Parser::Functions - newfunction(:get_ldap_servers, :type => :rvalue) do |args| + newfunction(:get_ldap_servers, :type => :rvalue) do |args| Puppet::Parser::Functions.autoloader.loadall res = ["master"] - - function_list_exported_ressources(['Openldap::Exported_slave']).each { |i| - res << "slave-#{i}" + + function_list_exported_ressources(['Openldap::Exported_slave']).each { |i| + res << "slave-#{i}" } res.map! { |x| "ldap-#{x}." + lookupvar("domain") } return res diff --git a/modules/openldap/manifests/slave_instance.pp b/modules/openldap/manifests/slave_instance.pp index a12771a3..0d66d607 100644 --- a/modules/openldap/manifests/slave_instance.pp +++ b/modules/openldap/manifests/slave_instance.pp @@ -6,5 +6,3 @@ define openldap::slave_instance($rid) { rid => $rid, } } - - diff --git a/modules/openldap/templates/mandriva-dit-access.conf b/modules/openldap/templates/mandriva-dit-access.conf index b0073420..f9b7a98d 100644 --- a/modules/openldap/templates/mandriva-dit-access.conf +++ b/modules/openldap/templates/mandriva-dit-access.conf @@ -193,4 +193,3 @@ access to dn.sub="ou=KDEConfig,<%= dc_suffix %>" # last one access to dn.subtree="<%= dc_suffix %>" attrs=entry,uid,cn by users read - diff --git a/modules/openldap/templates/slapd.syncrepl.conf b/modules/openldap/templates/slapd.syncrepl.conf index bfa01d79..2bfe7d50 100644 --- a/modules/openldap/templates/slapd.syncrepl.conf +++ b/modules/openldap/templates/slapd.syncrepl.conf @@ -7,6 +7,5 @@ syncrepl rid=<%= rid %> binddn="cn=syncuser-<%= hostname%>,ou=System Accounts,<%= dc_suffix %>" credentials=<%= sync_password %> tls_reqcert=never - -updateref ldaps://ldap-master.<%= domain %>:636 +updateref ldaps://ldap-master.<%= domain %>:636 diff --git a/modules/openldap/templates/slapd.test.conf b/modules/openldap/templates/slapd.test.conf index 355efb8e..8befa55a 100644 --- a/modules/openldap/templates/slapd.test.conf +++ b/modules/openldap/templates/slapd.test.conf @@ -7,4 +7,3 @@ authz-regexp "gidNumber=0\\\+uidNumber=0,cn=peercred,cn=external,cn=auth" "cn=manager,dc=test_ldap" # force ssl security ssf=56 - |