aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Vigier <boklm@mageia.org>2011-08-21 12:22:27 +0000
committerNicolas Vigier <boklm@mageia.org>2011-08-21 12:22:27 +0000
commitcdb5d5f293e097f472320a7718c18f8ff18162f0 (patch)
tree95751ba56d9832e16354748dee7c47908ac8d01e
parent9b0eab0b661c79263d0d30001428b8ccc46287c9 (diff)
downloadpuppet-cdb5d5f293e097f472320a7718c18f8ff18162f0.tar
puppet-cdb5d5f293e097f472320a7718c18f8ff18162f0.tar.gz
puppet-cdb5d5f293e097f472320a7718c18f8ff18162f0.tar.bz2
puppet-cdb5d5f293e097f472320a7718c18f8ff18162f0.tar.xz
puppet-cdb5d5f293e097f472320a7718c18f8ff18162f0.zip
move ldap-sshkey2file.py to openssh module (where it is used)
-rw-r--r--modules/openssh/manifests/init.pp2
-rwxr-xr-xmodules/openssh/templates/ldap-sshkey2file.py (renamed from modules/restrictshell/templates/ldap-sshkey2file.py)0
2 files changed, 1 insertions, 1 deletions
diff --git a/modules/openssh/manifests/init.pp b/modules/openssh/manifests/init.pp
index 8c929d79..44561ee0 100644
--- a/modules/openssh/manifests/init.pp
+++ b/modules/openssh/manifests/init.pp
@@ -84,7 +84,7 @@ class openssh {
owner => root,
group => root,
mode => 755,
- content => template("restrictshell/ldap-sshkey2file.py"),
+ content => template("openssh/ldap-sshkey2file.py"),
require => Package['python-ldap']
}
cron { 'sshkey2file':
diff --git a/modules/restrictshell/templates/ldap-sshkey2file.py b/modules/openssh/templates/ldap-sshkey2file.py
index af29a203..af29a203 100755
--- a/modules/restrictshell/templates/ldap-sshkey2file.py
+++ b/modules/openssh/templates/ldap-sshkey2file.py