aboutsummaryrefslogtreecommitdiffstats
path: root/modules/restrictshell
diff options
context:
space:
mode:
authorMichael Scherer <misc@mageia.org>2010-11-20 11:52:54 +0000
committerMichael Scherer <misc@mageia.org>2010-11-20 11:52:54 +0000
commitcd6351ab1212d5dea85db326113c887065b1efd6 (patch)
tree65c1f714456ce8ec15ff71eca0106f903dbc2e52 /modules/restrictshell
parentc173069efea53f72fc7c6a758f8eebe772464a6f (diff)
downloadpuppet-cd6351ab1212d5dea85db326113c887065b1efd6.tar
puppet-cd6351ab1212d5dea85db326113c887065b1efd6.tar.gz
puppet-cd6351ab1212d5dea85db326113c887065b1efd6.tar.bz2
puppet-cd6351ab1212d5dea85db326113c887065b1efd6.tar.xz
puppet-cd6351ab1212d5dea85db326113c887065b1efd6.zip
- do not let file with passwords to be world readable
( even if being readable by apache is not good either, but needed as the password is used by apache ) - use ldaps for sympa - use the 2 new facter macro and remove the version copied everywhere - remove hardcoded domain in bugzilla and others
Diffstat (limited to 'modules/restrictshell')
-rwxr-xr-xmodules/restrictshell/templates/ldap-sshkey2file.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/modules/restrictshell/templates/ldap-sshkey2file.py b/modules/restrictshell/templates/ldap-sshkey2file.py
index 9668973d..ec5afc8e 100755
--- a/modules/restrictshell/templates/ldap-sshkey2file.py
+++ b/modules/restrictshell/templates/ldap-sshkey2file.py
@@ -9,9 +9,7 @@ try:
except ImportError, e:
print "Please install python-ldap before running this program"
sys.exit(1)
-<%
-dc_suffix = 'dc=' + domain.gsub('.',',dc=')
-%>
+
basedn="<%= dc_suffix %>"
peopledn="ou=people,%s" % basedn
uris=['ldap://ldap.<%= domain %>']