[MediaWiki-commits] [Gerrit] operations/puppet[production]: Also handle systemd in keyholder script

[Muehlenhoff (Code Review)]

Muehlenhoff has submitted this change and it was merged.

Change subject: Also handle systemd in keyholder script
..


Also handle systemd in keyholder script

ssh-add in jessie only lists "rsa w/o comment" in the key list, see
https://bugzilla.mindrot.org/show_bug.cgi?id=2306 for details.
This got fixed in openssh 6.8 and while the fix is simple, we don't
want to maintain a patched openssh for such a minor detail.

Bug: T144578

Change-Id: I815ae9e5245e3c075e97f7ad0014df674f2ab30a
---
M modules/keyholder/files/keyholder
1 file changed, 6 insertions(+), 1 deletion(-)

Approvals:
  Hashar: Looks good to me, but someone else must approve
  Muehlenhoff: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/keyholder/files/keyholder 
b/modules/keyholder/files/keyholder
index 7ad7fb3..3929816 100755
--- a/modules/keyholder/files/keyholder
+++ b/modules/keyholder/files/keyholder
@@ -47,7 +47,12 @@
   status)
 prefers_root
 for service in agent proxy; do
-  /sbin/status "keyholder-${service}" || continue
+  if [ -x "/sbin/status" ]; then # upstart
+  /sbin/status "keyholder-${service}" || continue
+  elif [ -x "/bin/systemctl" ]; then  # systemd
+  echo -e "keyholder-${service}: \c"
+  /bin/systemctl is-active "keyholder-${service}" || continue
+  fi
   [ -r "/run/keyholder/${service}.sock" ] || continue
   SSH_AUTH_SOCK="/run/keyholder/${service}.sock" /usr/bin/ssh-add -l | sed 
's/^/- /'
 done

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I815ae9e5245e3c075e97f7ad0014df674f2ab30a
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff 
Gerrit-Reviewer: 20after4 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Dduvall 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Muehlenhoff 
Gerrit-Reviewer: Thcipriani 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Also handle systemd in keyholder script

[Muehlenhoff (Code Review)]

Muehlenhoff has uploaded a new change for review.

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

Change subject: Also handle systemd in keyholder script
..

Also handle systemd in keyholder script

Bug: T144578

Change-Id: I815ae9e5245e3c075e97f7ad0014df674f2ab30a
---
M modules/keyholder/files/keyholder
1 file changed, 5 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/93/310793/1

diff --git a/modules/keyholder/files/keyholder 
b/modules/keyholder/files/keyholder
index 7ad7fb3..b6dab41 100755
--- a/modules/keyholder/files/keyholder
+++ b/modules/keyholder/files/keyholder
@@ -47,7 +47,11 @@
   status)
 prefers_root
 for service in agent proxy; do
-  /sbin/status "keyholder-${service}" || continue
+  if [ -x "/sbin/status" ]; then # upstart
+  /sbin/status "keyholder-${service}" || continue
+  elif [ -x "/bin/systemctl" ]; then  # systemd
+  /bin/systemctl --quiet is-active "keyholder-${service}" || continue
+  fi
   [ -r "/run/keyholder/${service}.sock" ] || continue
   SSH_AUTH_SOCK="/run/keyholder/${service}.sock" /usr/bin/ssh-add -l | sed 
's/^/- /'
 done

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I815ae9e5245e3c075e97f7ad0014df674f2ab30a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff 

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