Andrew Bogott has submitted this change and it was merged.
Change subject: Fix Labs ldap/ssh for Debian
......................................................................
Fix Labs ldap/ssh for Debian
The os_version() checks there really mean "newer SSH".
Change-Id: Ieee4d2537f765875868f4f4556768f191ba44579
---
M modules/ldap/manifests/client.pp
M modules/ssh/templates/sshd_config.erb
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ldap/manifests/client.pp b/modules/ldap/manifests/client.pp
index 9603327..dea87f1 100644
--- a/modules/ldap/manifests/client.pp
+++ b/modules/ldap/manifests/client.pp
@@ -172,7 +172,7 @@
}
if $::realm == 'labs' {
- if os_version('ubuntu >= trusty') {
+ if os_version('debian >= jessie || ubuntu >= trusty') {
# The 'ldapkeys' tool is called during login ssh via
AuthorizedKeysCommand. It
# returns public keys from ldap for the specified username.
file { '/usr/local/sbin/ldapkeys':
diff --git a/modules/ssh/templates/sshd_config.erb
b/modules/ssh/templates/sshd_config.erb
index 208414a..c00c5f8 100644
--- a/modules/ssh/templates/sshd_config.erb
+++ b/modules/ssh/templates/sshd_config.erb
@@ -105,7 +105,7 @@
<% if @realm == "labs" then %>
Banner /etc/ssh/sshd_banner
-<% if @lsbdistcodename == 'trusty'%>
+<% if scope.function_os_version(['debian >= jessie || ubuntu >= trusty']) %>
AuthorizedKeysCommand /usr/local/sbin/ldapkeys
AuthorizedKeysCommandUser ldapkeys
<% end %>
--
To view, visit https://gerrit.wikimedia.org/r/179084
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ieee4d2537f765875868f4f4556768f191ba44579
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
