aboutsummaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorThomas Backlund <tmb@mageia.org>2019-09-16 12:23:37 +0300
committerThomas Backlund <tmb@mageia.org>2019-09-16 12:23:37 +0300
commitf70d7c82601c1991b674d717039af8a415b1a5e4 (patch)
tree4c023f4683a34f6ff63cfa47893a09d32851570e /modules
parent1828e05dfcfbdf85a5681b45d078271173ac48ea (diff)
downloadpuppet-f70d7c82601c1991b674d717039af8a415b1a5e4.tar
puppet-f70d7c82601c1991b674d717039af8a415b1a5e4.tar.gz
puppet-f70d7c82601c1991b674d717039af8a415b1a5e4.tar.bz2
puppet-f70d7c82601c1991b674d717039af8a415b1a5e4.tar.xz
puppet-f70d7c82601c1991b674d717039af8a415b1a5e4.zip
openssh: fix up python2-ldap deps for mga7
Diffstat (limited to 'modules')
-rw-r--r--modules/openssh/manifests/ssh_keys_from_ldap.pp4
1 files changed, 4 insertions, 0 deletions
diff --git a/modules/openssh/manifests/ssh_keys_from_ldap.pp b/modules/openssh/manifests/ssh_keys_from_ldap.pp
index a344cb36..e155ddf6 100644
--- a/modules/openssh/manifests/ssh_keys_from_ldap.pp
+++ b/modules/openssh/manifests/ssh_keys_from_ldap.pp
@@ -10,7 +10,11 @@ if versioncmp($::lsbdistrelease, '7') < 0 {
$ldap_servers = get_ldap_servers()
mga_common::local_script { 'ldap-sshkey2file.py':
content => template('openssh/ldap-sshkey2file.py'),
+if versioncmp($::lsbdistrelease, '7') < 0 {
+ require => Package['python2-ldap']
+} else {
require => Package['python-ldap']
+}
}
cron { 'sshkey2file':