diff options
| author | Dan Fandrich <danf@mageia.org> | 2024-11-20 15:36:06 -0800 |
|---|---|---|
| committer | Dan Fandrich <danf@mageia.org> | 2024-11-20 15:36:06 -0800 |
| commit | 727145ed50d60655590c0199656c2378d32bfffc (patch) | |
| tree | 3a95f1ba2f64656879be8c857470155c7bde398d /modules/catdap | |
| parent | 7766681f7ef95a3ad7e6c7c1a26f829ec02d776b (diff) | |
| download | puppet-727145ed50d60655590c0199656c2378d32bfffc.tar puppet-727145ed50d60655590c0199656c2378d32bfffc.tar.gz puppet-727145ed50d60655590c0199656c2378d32bfffc.tar.bz2 puppet-727145ed50d60655590c0199656c2378d32bfffc.tar.xz puppet-727145ed50d60655590c0199656c2378d32bfffc.zip | |
Use @ when accessing variables in templates
Access without the @ symbol is the older method and is discouraged.
This take leaves alone accesses of variables that are defined within the
template, which don't seem to allow an @.
This is the second batch of files.
Diffstat (limited to 'modules/catdap')
| -rw-r--r-- | modules/catdap/templates/catdap_local.yml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/modules/catdap/templates/catdap_local.yml b/modules/catdap/templates/catdap_local.yml index b23ee46c..d982b40b 100644 --- a/modules/catdap/templates/catdap_local.yml +++ b/modules/catdap/templates/catdap_local.yml @@ -6,15 +6,15 @@ ldap_account = "cn=catdap-#{hostname},ou=System Accounts,#{dc_suffix}" organisation: Mageia apptitle: Mageia Identity Management -emailfrom: noreply@<%= domain %> +emailfrom: noreply@<%= @domain %> Model::Proxy: - base: ou=People,<%= dc_suffix %> + base: ou=People,<%= @dc_suffix %> dn: <%= ldap_account %> password: <%= scope.lookupvar("catdap::ldap_password") %> Model::User: - base: <%= dc_suffix %> + base: <%= @dc_suffix %> host: <%= ldap_server %> start_tls: 1 @@ -26,8 +26,8 @@ authentication: ldap_server: <%= ldap_server %> binddn: <%= ldap_account %> bindpw: <%= scope.lookupvar("catdap::ldap_password") %> - user_basedn: ou=People,<%= dc_suffix %> - role_basedn: <%= dc_suffix %> + user_basedn: ou=People,<%= @dc_suffix %> + role_basedn: <%= @dc_suffix %> register: login_regex: ^[a-z][a-z0-9]*$ |