BBlack has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/384888 )
Change subject: acme_tiny: sync with upstream
......................................................................
acme_tiny: sync with upstream
This syncs us with all changes since our last update, which
amounts to a single line diff for OpenSSL 1.1 compat (similar to
our change in acme-setup earlier).
Change-Id: If5adcc12f0b70a931a81bb89a09a2145f56b7374
---
M modules/letsencrypt/files/acme_tiny.py
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
BBlack: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/letsencrypt/files/acme_tiny.py
b/modules/letsencrypt/files/acme_tiny.py
index 626afa1..4e9a6e1 100644
--- a/modules/letsencrypt/files/acme_tiny.py
+++ b/modules/letsencrypt/files/acme_tiny.py
@@ -91,7 +91,7 @@
if proc.returncode != 0:
raise IOError("Error loading {0}: {1}".format(csr, err))
domains = set([])
- common_name = re.search(r"Subject:.*? CN=([^\s,;/]+)", out.decode('utf8'))
+ common_name = re.search(r"Subject:.*? CN\s?=\s?([^\s,;/]+)",
out.decode('utf8'))
if common_name is not None:
domains.add(common_name.group(1))
subject_alt_names = re.search(r"X509v3 Subject Alternative Name: \n
+([^\n]+)\n", out.decode('utf8'), re.MULTILINE|re.DOTALL)
--
To view, visit https://gerrit.wikimedia.org/r/384888
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If5adcc12f0b70a931a81bb89a09a2145f56b7374
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <bbl...@wikimedia.org>
Gerrit-Reviewer: BBlack <bbl...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
