Filippo Giunchedi has submitted this change and it was merged.
Change subject: Do not include public keys in keyholder check
......................................................................
Do not include public keys in keyholder check
Change-Id: I645c1151a05df2e2447e0ff1bf62e9ebe9815878
---
M modules/keyholder/files/check_keyholder
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Filippo Giunchedi: Verified; Looks good to me, approved
diff --git a/modules/keyholder/files/check_keyholder
b/modules/keyholder/files/check_keyholder
index 93f0eb3..448d645 100755
--- a/modules/keyholder/files/check_keyholder
+++ b/modules/keyholder/files/check_keyholder
@@ -5,7 +5,7 @@
configured_keys() {
# Get a sorted list of all key files in /etc/keyholder.d
- /usr/bin/find /etc/keyholder.d -type f 2>/dev/null | /usr/bin/sort
+ /usr/bin/find /etc/keyholder.d -type f -not -name '*.pub' 2>/dev/null |
/usr/bin/sort
}
active_keys() {
--
To view, visit https://gerrit.wikimedia.org/r/290966
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I645c1151a05df2e2447e0ff1bf62e9ebe9815878
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Thcipriani <tcipri...@wikimedia.org>
Gerrit-Reviewer: Filippo Giunchedi <fgiunch...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
