Yuvipanda has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/217250

Change subject: ssh: Don't look for keys in NFS on non-precise hosts
......................................................................

ssh: Don't look for keys in NFS on non-precise hosts

Bug: T101660
Change-Id: I53c5fb525131efe8e2d31cd6384f88a1ae683c63
---
M modules/ssh/manifests/server.pp
1 file changed, 4 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/50/217250/1

diff --git a/modules/ssh/manifests/server.pp b/modules/ssh/manifests/server.pp
index 2f8a773..6ed4847 100644
--- a/modules/ssh/manifests/server.pp
+++ b/modules/ssh/manifests/server.pp
@@ -20,7 +20,10 @@
         $ssh_authorized_keys_file = $authorized_keys_file
     } else {
         if ($::realm == 'labs') {
-            $ssh_authorized_keys_file ='/etc/ssh/userkeys/%u 
/public/keys/%u/.ssh/authorized_keys'
+            if os_version('ubuntu <= precise') {
+                $ssh_authorized_keys_file ='/etc/ssh/userkeys/%u 
/public/keys/%u/.ssh/authorized_keys'
+            } else {
+                $ssh_authorized_keys_file = '/etc/ssh/userkeys/%u'
         } else {
             $ssh_authorized_keys_file ='/etc/ssh/userkeys/%u 
.ssh/authorized_keys .ssh/authorized_keys2'
         }

-- 
To view, visit https://gerrit.wikimedia.org/r/217250
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I53c5fb525131efe8e2d31cd6384f88a1ae683c63
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda <yuvipa...@gmail.com>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to