Paladox has uploaded a new change for review.
https://gerrit.wikimedia.org/r/215779
Change subject: Reverting a test to see if gerrit irc bots start working again
......................................................................
Reverting a test to see if gerrit irc bots start working again
Change-Id: I43087d26985b82eed787ae6fbdd9078e8857eff9
---
R modules/base/files/ca/DigiCert_High_Assurance_CA-3.crt
R modules/base/files/ca/GeoTrust_Global_CA.crt
R modules/base/files/ca/GlobalSign_Organization_Validation_CA_-_SHA256_-_G2.crt
M modules/base/manifests/certificates.pp
M modules/gerrit/templates/gerrit.config.erb
5 files changed, 25 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/79/215779/1
diff --git a/modules/base/files/ca/DigiCertHighAssuranceCA-3.crt
b/modules/base/files/ca/DigiCert_High_Assurance_CA-3.crt
similarity index 100%
rename from modules/base/files/ca/DigiCertHighAssuranceCA-3.crt
rename to modules/base/files/ca/DigiCert_High_Assurance_CA-3.crt
diff --git a/modules/base/files/ca/RapidSSL_CA_2.crt
b/modules/base/files/ca/GeoTrust_Global_CA.crt
similarity index 100%
rename from modules/base/files/ca/RapidSSL_CA_2.crt
rename to modules/base/files/ca/GeoTrust_Global_CA.crt
diff --git a/modules/base/files/ca/GlobalSign_CA.crt
b/modules/base/files/ca/GlobalSign_Organization_Validation_CA_-_SHA256_-_G2.crt
similarity index 100%
rename from modules/base/files/ca/GlobalSign_CA.crt
rename to
modules/base/files/ca/GlobalSign_Organization_Validation_CA_-_SHA256_-_G2.crt
diff --git a/modules/base/manifests/certificates.pp
b/modules/base/manifests/certificates.pp
index 879880d..84ee219 100644
--- a/modules/base/manifests/certificates.pp
+++ b/modules/base/manifests/certificates.pp
@@ -10,19 +10,37 @@
sslcert::ca { 'RapidSSL_CA':
source => 'puppet:///modules/base/ca/RapidSSL_CA.crt',
}
- sslcert::ca { 'RapidSSL_CA_2':
- source => 'puppet:///modules/base/ca/RapidSSL_CA_2.crt',
- }
sslcert::ca { 'RapidSSL_SHA256_CA_-_G3':
source => 'puppet:///modules/base/ca/RapidSSL_SHA256_CA_-_G3.crt',
}
+ sslcert::ca { 'GeoTrust_Global_CA':
+ source => 'puppet:///modules/base/ca/GeoTrust_Global_CA.crt',
+ }
+ sslcert::ca { 'DigiCert_High_Assurance_CA-3':
+ source =>
'puppet:///modules/base/ca/DigiCert_High_Assurance_CA-3.crt',
+ }
+ sslcert::ca { 'DigiCert_SHA2_High_Assurance_Server_CA':
+ source =>
'puppet:///modules/base/ca/DigiCert_SHA2_High_Assurance_Server_CA.crt',
+ }
+ sslcert::ca { 'GlobalSign_Organization_Validation_CA_-_SHA256_-_G2':
+ source =>
'puppet:///modules/base/ca/GlobalSign_Organization_Validation_CA_-_SHA256_-_G2.crt',
+ }
+
+ # FIXME: remove after a while
+ sslcert::ca { 'GlobalSign_CA':
+ ensure => absent,
+ require =>
Sslcert::Ca['GlobalSign_Organization_Validation_CA_-_SHA256_-_G2'],
+ }
sslcert::ca { 'DigiCertHighAssuranceCA-3':
- source => 'puppet:///modules/base/ca/DigiCertHighAssuranceCA-3.crt',
+ ensure => absent,
+ require => Sslcert::Ca['DigiCert_High_Assurance_CA-3'],
}
sslcert::ca { 'DigiCertSHA2HighAssuranceServerCA':
- source =>
'puppet:///modules/base/ca/DigiCertSHA2HighAssuranceServerCA.crt',
+ ensure => absent,
+ require => Sslcert::Ca['DigiCert_SHA2_High_Assurance_Server_CA'],
}
- sslcert::ca { 'GlobalSign_CA':
- source => 'puppet:///modules/base/ca/GlobalSign_CA.crt',
+ sslcert::ca { 'RapidSSL_CA_2':
+ ensure => absent,
+ require => Sslcert::Ca['GeoTrust_Global_CA'],
}
}
diff --git a/modules/gerrit/templates/gerrit.config.erb
b/modules/gerrit/templates/gerrit.config.erb
index c01406c..974d31e 100644
--- a/modules/gerrit/templates/gerrit.config.erb
+++ b/modules/gerrit/templates/gerrit.config.erb
@@ -78,9 +78,6 @@
[commentlink "bugzilla"]
match = "\\b[bB][uU][gG]\\:?\\s+#?(\\d+)\\b"
link = https://bugzilla.wikimedia.org/$1
-[commentlink "phabricator"]
- match = "\\b[bB][uU][gG]\\:?\\s+#?(T\\d+)\\b"
- link = https://phabricator.wikimedia.org/$1
[commentlink "codereview"]
match = \\br(\\d+)\\b
link = https://phabricator.wikimedia.org/rSVN$1
--
To view, visit https://gerrit.wikimedia.org/r/215779
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I43087d26985b82eed787ae6fbdd9078e8857eff9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Paladox <thomasmulhall...@yahoo.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
