diff options
| author | Dan Fandrich <danf@mageia.org> | 2024-10-04 21:44:50 -0700 |
|---|---|---|
| committer | Dan Fandrich <danf@mageia.org> | 2024-10-04 21:48:08 -0700 |
| commit | f5b2645d869b76598c18527d388ed76719c06bdd (patch) | |
| tree | 659f3ee719b437817a02db4a31dbd37a65972412 /modules/openssh/templates | |
| parent | ae1976228660588902a904f7509a106b790531cb (diff) | |
| download | puppet-f5b2645d869b76598c18527d388ed76719c06bdd.tar puppet-f5b2645d869b76598c18527d388ed76719c06bdd.tar.gz puppet-f5b2645d869b76598c18527d388ed76719c06bdd.tar.bz2 puppet-f5b2645d869b76598c18527d388ed76719c06bdd.tar.xz puppet-f5b2645d869b76598c18527d388ed76719c06bdd.zip | |
Revert "Use @ when accessing variables in templates"
Variables defined within a template can't be accessed with @. This
change needs to be reworked to eliminate those cases.
This reverts commits 2c7da665 and ae197622.
Diffstat (limited to 'modules/openssh/templates')
| -rwxr-xr-x | modules/openssh/templates/ldap-sshkey2file.py | 10 | ||||
| -rw-r--r-- | modules/openssh/templates/sshd_config | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/modules/openssh/templates/ldap-sshkey2file.py b/modules/openssh/templates/ldap-sshkey2file.py index e59545b3..6718b053 100755 --- a/modules/openssh/templates/ldap-sshkey2file.py +++ b/modules/openssh/templates/ldap-sshkey2file.py @@ -15,18 +15,18 @@ except ImportError: print("Please install python-ldap before running this program") sys.exit(1) -basedn = "<%= @dc_suffix %>" +basedn = "<%= dc_suffix %>" peopledn = f"ou=people,{basedn}" <%- ldap_servers.map! { |l| "'ldaps://#{l}'" } -%> -uris = [<%= @ldap_servers.join(", ") %>] +uris = [<%= ldap_servers.join(", ") %>] random.shuffle(uris) uri = " ".join(uris) timeout = 5 -binddn = f"cn=<%= @fqdn %>,ou=Hosts,{basedn}" -ldap_secret_file = "<%= @ldap_pwfile %>" -nslcd_conf_file = "<%= @nslcd_conf_file %>" +binddn = f"cn=<%= fqdn %>,ou=Hosts,{basedn}" +ldap_secret_file = "<%= ldap_pwfile %>" +nslcd_conf_file = "<%= nslcd_conf_file %>" # filter out disabled accounts also # too bad uidNumber doesn't support >= filters objfilter = "(&(objectClass=inetOrgPerson)(objectClass=ldapPublicKey)(objectClass=posixAccount)(sshPublicKey=*))" diff --git a/modules/openssh/templates/sshd_config b/modules/openssh/templates/sshd_config index 31a9e1f7..43c3f9c5 100644 --- a/modules/openssh/templates/sshd_config +++ b/modules/openssh/templates/sshd_config @@ -124,7 +124,7 @@ UsePrivilegeSeparation yes # override default of no subsystems <% if scope.function_versioncmp([lsbdistrelease, '6']) < 0 -%> -Subsystem sftp <%= @path_to_sftp %>/sftp-server +Subsystem sftp <%= path_to_sftp %>/sftp-server <% else %> Subsystem sftp /usr/libexec/openssh/sftp-server <% end %> |