RobH has uploaded a new change for review.
https://gerrit.wikimedia.org/r/53629
Change subject: pushing the updated unified certificate
......................................................................
pushing the updated unified certificate
Change-Id: Ib05576d40215707568e0cbd61f5e246ecaa1bcf1
---
M files/ssl/unified.wikimedia.org.pem
M manifests/protoproxy.pp
2 files changed, 43 insertions(+), 41 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/29/53629/1
diff --git a/files/ssl/unified.wikimedia.org.pem
b/files/ssl/unified.wikimedia.org.pem
index 7c715e6..1f616c8 100644
--- a/files/ssl/unified.wikimedia.org.pem
+++ b/files/ssl/unified.wikimedia.org.pem
@@ -1,5 +1,5 @@
-----BEGIN CERTIFICATE-----
-MIIJoTCCCImgAwIBAgIQCw1czjLIHBW+XCBbDd3M3jANBgkqhkiG9w0BAQUFADBm
+MIIKCTCCCPGgAwIBAgIQByTuqXxV8ldeKIukzPIOjjANBgkqhkiG9w0BAQUFADBm
MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
d3cuZGlnaWNlcnQuY29tMSUwIwYDVQQDExxEaWdpQ2VydCBIaWdoIEFzc3VyYW5j
ZSBDQS0zMB4XDTEyMTAyMjAwMDAwMFoXDTE2MDEyMDEyMDAwMFoweTELMAkGA1UE
@@ -11,44 +11,46 @@
IXivkun3u7EuzoxME/nMmN7whnbQ2JIDGM8LcfsDPjFKyVywtu3Ry8YqHRw+h3be
tKaKdGzBYQQA7tDmydIGu/yJuxnmBmAyLztoE0Y4iH04/NyhIzzRfiDOkI7g99Ky
tRrDYdgY4xPqLFTo8qVaTD1CRwa0stPdz79UWRmEn9k5P02GWdfxHvRvYh2Wk8eo
-53rJIypXfA+65W7vbWvq16MFAgMBAAGjggY2MIIGMjAfBgNVHSMEGDAWgBRQ6nOJ
+53rJIypXfA+65W7vbWvq16MFAgMBAAGjggaeMIIGmjAfBgNVHSMEGDAWgBRQ6nOJ
2yn7EI+e5QEg1N55mUiD9zAdBgNVHQ4EFgQUvwEkt6ooB6QGZazDQAb+1ljDE0Mw
-ggMJBgNVHREEggMAMIIC/IIPKi53aWtpcGVkaWEub3Jngg13aWtpcGVkaWEub3Jn
-gg13aWtpYm9va3Mub3Jngg9tLndpa2lib29rcy5vcmeCDyoud2lraWJvb2tzLm9y
-Z4IRKi5tLndpa2lib29rcy5vcmeCDHdpa2lkYXRhLm9yZ4IObS53aWtpZGF0YS5v
-cmeCDioud2lraWRhdGEub3JnghAqLm0ud2lraWRhdGEub3Jngg13aWtpbWVkaWEu
-b3Jngg9tLndpa2ltZWRpYS5vcmeCDyoud2lraW1lZGlhLm9yZ4IRKi5tLndpa2lt
-ZWRpYS5vcmeCF3dpa2ltZWRpYWZvdW5kYXRpb24ub3JnghltLndpa2ltZWRpYWZv
-dW5kYXRpb24ub3JnghkqLndpa2ltZWRpYWZvdW5kYXRpb24ub3JnghsqLm0ud2lr
-aW1lZGlhZm91bmRhdGlvbi5vcmeCDHdpa2luZXdzLm9yZ4IObS53aWtpbmV3cy5v
-cmeCDioud2lraW5ld3Mub3JnghAqLm0ud2lraW5ld3Mub3Jngg13aWtpcXVvdGUu
-b3Jngg9tLndpa2lxdW90ZS5vcmeCDyoud2lraXF1b3RlLm9yZ4IRKi5tLndpa2lx
-dW90ZS5vcmeCDndpa2lzb3VyY2Uub3JnghBtLndpa2lzb3VyY2Uub3JnghAqLndp
-a2lzb3VyY2Uub3JnghIqLm0ud2lraXNvdXJjZS5vcmeCD3dpa2l2ZXJzaXR5Lm9y
-Z4IRbS53aWtpdmVyc2l0eS5vcmeCESoud2lraXZlcnNpdHkub3JnghMqLm0ud2lr
-aXZlcnNpdHkub3Jngg53aWtpdm95YWdlLm9yZ4IQbS53aWtpdm95YWdlLm9yZ4IQ
-Ki53aWtpdm95YWdlLm9yZ4ISKi5tLndpa2l2b3lhZ2Uub3Jngg53aWt0aW9uYXJ5
-Lm9yZ4IQbS53aWt0aW9uYXJ5Lm9yZ4IQKi53aWt0aW9uYXJ5Lm9yZ4ISKi5tLndp
-a3Rpb25hcnkub3JnMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcD
-AQYIKwYBBQUHAwIwYQYDVR0fBFowWDAqoCigJoYkaHR0cDovL2NybDMuZGlnaWNl
-cnQuY29tL2NhMy1nMTkuY3JsMCqgKKAmhiRodHRwOi8vY3JsNC5kaWdpY2VydC5j
-b20vY2EzLWcxOS5jcmwwggHEBgNVHSAEggG7MIIBtzCCAbMGCWCGSAGG/WwBATCC
-AaQwOgYIKwYBBQUHAgEWLmh0dHA6Ly93d3cuZGlnaWNlcnQuY29tL3NzbC1jcHMt
-cmVwb3NpdG9yeS5odG0wggFkBggrBgEFBQcCAjCCAVYeggFSAEEAbgB5ACAAdQBz
-AGUAIABvAGYAIAB0AGgAaQBzACAAQwBlAHIAdABpAGYAaQBjAGEAdABlACAAYwBv
-AG4AcwB0AGkAdAB1AHQAZQBzACAAYQBjAGMAZQBwAHQAYQBuAGMAZQAgAG8AZgAg
-AHQAaABlACAARABpAGcAaQBDAGUAcgB0ACAAQwBQAC8AQwBQAFMAIABhAG4AZAAg
-AHQAaABlACAAUgBlAGwAeQBpAG4AZwAgAFAAYQByAHQAeQAgAEEAZwByAGUAZQBt
-AGUAbgB0ACAAdwBoAGkAYwBoACAAbABpAG0AaQB0ACAAbABpAGEAYgBpAGwAaQB0
-AHkAIABhAG4AZAAgAGEAcgBlACAAaQBuAGMAbwByAHAAbwByAGEAdABlAGQAIABo
-AGUAcgBlAGkAbgAgAGIAeQAgAHIAZQBmAGUAcgBlAG4AYwBlAC4wewYIKwYBBQUH
-AQEEbzBtMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5jb20wRQYI
-KwYBBQUHMAKGOWh0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9EaWdpQ2VydEhp
-Z2hBc3N1cmFuY2VDQS0zLmNydDAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3DQEBBQUA
-A4IBAQAD+DbfJPjxm6bQtlcaFu3sfYVWQfj6d9yUNe5wmhN1Vyz+3s+jtUoZdBnG
-2vkAyNuAuyY7el5pDrsmOuB3o1OPZIRlsAHq9BjFpUFCBn/dTeYvQOQOX7IMReXr
-Kb9GvqqWhCJxTQvaXlohZOPJCEFoWvHOzbBfPa3dlmYGagCfj1Qv1iSDzurzr5CC
-xw4RZZL7JFYnIVrcZOAObzQDUc0zhWPVyTboAEfnYdC+RmRYVLmLqfL2Ie6Lf6A3
-a117NI5/oBlJOFW9gox7M5ffKHePRucHDPe4wyDmq/616vOvIqpKXJNfrthVHdf/
-tKrDD7oinyKaFlfcHPHVyppZLeg7
+ggNxBgNVHREEggNoMIIDZIIPKi53aWtpcGVkaWEub3Jngg13aWtpcGVkaWEub3Jn
+gg9tLndpa2lwZWRpYS5vcmeCESoubS53aWtpcGVkaWEub3Jngg13aWtpYm9va3Mu
+b3Jngg9tLndpa2lib29rcy5vcmeCDyoud2lraWJvb2tzLm9yZ4IRKi5tLndpa2li
+b29rcy5vcmeCDHdpa2lkYXRhLm9yZ4IObS53aWtpZGF0YS5vcmeCDioud2lraWRh
+dGEub3JnghAqLm0ud2lraWRhdGEub3Jngg13aWtpbWVkaWEub3Jngg9tLndpa2lt
+ZWRpYS5vcmeCDyoud2lraW1lZGlhLm9yZ4IRKi5tLndpa2ltZWRpYS5vcmeCF3dp
+a2ltZWRpYWZvdW5kYXRpb24ub3JnghltLndpa2ltZWRpYWZvdW5kYXRpb24ub3Jn
+ghkqLndpa2ltZWRpYWZvdW5kYXRpb24ub3JnghsqLm0ud2lraW1lZGlhZm91bmRh
+dGlvbi5vcmeCDHdpa2luZXdzLm9yZ4IObS53aWtpbmV3cy5vcmeCDioud2lraW5l
+d3Mub3JnghAqLm0ud2lraW5ld3Mub3Jngg13aWtpcXVvdGUub3Jngg9tLndpa2lx
+dW90ZS5vcmeCDyoud2lraXF1b3RlLm9yZ4IRKi5tLndpa2lxdW90ZS5vcmeCDndp
+a2lzb3VyY2Uub3JnghBtLndpa2lzb3VyY2Uub3JnghAqLndpa2lzb3VyY2Uub3Jn
+ghIqLm0ud2lraXNvdXJjZS5vcmeCD3dpa2l2ZXJzaXR5Lm9yZ4IRbS53aWtpdmVy
+c2l0eS5vcmeCESoud2lraXZlcnNpdHkub3JnghMqLm0ud2lraXZlcnNpdHkub3Jn
+gg53aWtpdm95YWdlLm9yZ4IQbS53aWtpdm95YWdlLm9yZ4IQKi53aWtpdm95YWdl
+Lm9yZ4ISKi5tLndpa2l2b3lhZ2Uub3Jngg53aWt0aW9uYXJ5Lm9yZ4IQbS53aWt0
+aW9uYXJ5Lm9yZ4IQKi53aWt0aW9uYXJ5Lm9yZ4ISKi5tLndpa3Rpb25hcnkub3Jn
+gg1tZWRpYXdpa2kub3Jngg8qLm1lZGlhd2lraS5vcmeCD20ubWVkaWF3aWtpLm9y
+Z4IRKi5tLm1lZGlhd2lraS5vcmcwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQG
+CCsGAQUFBwMBBggrBgEFBQcDAjBhBgNVHR8EWjBYMCqgKKAmhiRodHRwOi8vY3Js
+My5kaWdpY2VydC5jb20vY2EzLWcyMC5jcmwwKqAooCaGJGh0dHA6Ly9jcmw0LmRp
+Z2ljZXJ0LmNvbS9jYTMtZzIwLmNybDCCAcQGA1UdIASCAbswggG3MIIBswYJYIZI
+AYb9bAEBMIIBpDA6BggrBgEFBQcCARYuaHR0cDovL3d3dy5kaWdpY2VydC5jb20v
+c3NsLWNwcy1yZXBvc2l0b3J5Lmh0bTCCAWQGCCsGAQUFBwICMIIBVh6CAVIAQQBu
+AHkAIAB1AHMAZQAgAG8AZgAgAHQAaABpAHMAIABDAGUAcgB0AGkAZgBpAGMAYQB0
+AGUAIABjAG8AbgBzAHQAaQB0AHUAdABlAHMAIABhAGMAYwBlAHAAdABhAG4AYwBl
+ACAAbwBmACAAdABoAGUAIABEAGkAZwBpAEMAZQByAHQAIABDAFAALwBDAFAAUwAg
+AGEAbgBkACAAdABoAGUAIABSAGUAbAB5AGkAbgBnACAAUABhAHIAdAB5ACAAQQBn
+AHIAZQBlAG0AZQBuAHQAIAB3AGgAaQBjAGgAIABsAGkAbQBpAHQAIABsAGkAYQBi
+AGkAbABpAHQAeQAgAGEAbgBkACAAYQByAGUAIABpAG4AYwBvAHIAcABvAHIAYQB0
+AGUAZAAgAGgAZQByAGUAaQBuACAAYgB5ACAAcgBlAGYAZQByAGUAbgBjAGUALjB7
+BggrBgEFBQcBAQRvMG0wJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmRpZ2ljZXJ0
+LmNvbTBFBggrBgEFBQcwAoY5aHR0cDovL2NhY2VydHMuZGlnaWNlcnQuY29tL0Rp
+Z2lDZXJ0SGlnaEFzc3VyYW5jZUNBLTMuY3J0MAwGA1UdEwEB/wQCMAAwDQYJKoZI
+hvcNAQEFBQADggEBAB9ursMdWKCOKytcZnaxEo5HDMt8DALL7stH2gIDzT2AJC3T
+1C2w9kZs4ck+ZgPfhaPHlStHRG83/VyzMvEnMWU9ErbrQV3Yw852VPPZF9qg3BDR
+II6FI3zRBBF0zZ9EB6IuQTa2QNL1w7cQUWlyRN3edaVaT1MFi4904u2Q2KeFriPp
+++jP0tX3YWmqgFOuXIX4QfZsrMQa1yRKtz/1fA0GPRHK+6lP61xpgkMMXmQJOdu8
+ifrxJMTON7H1eA5JSdfBm29lyvs3AqUMyb0xTCnl1BOZzxel/KrMsi48rZju4sB5
+fgarsxY/bPnrptsyxl5YPeskRUqr/WvEhxDczDI=
-----END CERTIFICATE-----
diff --git a/manifests/protoproxy.pp b/manifests/protoproxy.pp
index 3288654..11c0ef5 100644
--- a/manifests/protoproxy.pp
+++ b/manifests/protoproxy.pp
@@ -240,7 +240,7 @@
"esams" => [ "91.198.174.232", "[2620:0:862:ed1a::8]" ]
},
proxy_server_name => '*.mediawiki.org',
- proxy_server_cert_name => 'star.mediawiki.org',
+ proxy_server_cert_name => 'unified.wikimedia.org',
proxy_backend => {
"pmtpa" => { "primary" => "10.2.1.25" },
"eqiad" => { "primary" => "10.2.2.25" },
--
To view, visit https://gerrit.wikimedia.org/r/53629
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib05576d40215707568e0cbd61f5e246ecaa1bcf1
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: RobH <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits