Faidon Liambotis has submitted this change and it was merged.

Change subject: certs: inline certificate::<ca> classes to ::base
......................................................................


certs: inline certificate::<ca> classes to ::base

We don't really need all those different classes anymore.

Change-Id: I8a1cecfed4b26be189defa5a2316740a94127ff2
---
M manifests/certs.pp
1 file changed, 0 insertions(+), 31 deletions(-)

Approvals:
  Faidon Liambotis: Looks good to me, approved
  BBlack: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/manifests/certs.pp b/manifests/certs.pp
index 0b72e94..ffe071b 100644
--- a/manifests/certs.pp
+++ b/manifests/certs.pp
@@ -4,14 +4,6 @@
 ) {
 
     require certificates::base
-    require certificates::rapidssl_ca
-    require certificates::rapidssl_ca_2
-    require certificates::rapidssl_sha256_ca_G3
-    require certificates::digicert_ca
-    require certificates::digicert_sha2_ca
-    require certificates::globalsign_ca
-    require certificates::wmf_ca
-    require certificates::wmf_ca_2014_2017
 
     sslcert::certificate { $name:
         group  => $group,
@@ -32,51 +24,28 @@
 
 class certificates::base {
     include ::sslcert
-}
 
-class certificates::wmf_ca {
     sslcert::ca { 'wmf-ca':
         source  => 'puppet:///files/ssl/wmf-ca.crt',
     }
-}
-
-class certificates::wmf_ca_2014_2017 {
     sslcert::ca { 'wmf_ca_2014_2017':
         source  => "puppet:///files/ssl/wmf_ca_2014_2017.crt",
     }
-}
-
-class certificates::rapidssl_ca {
     sslcert::ca { 'RapidSSL_CA':
         source  => 'puppet:///files/ssl/RapidSSL_CA.crt',
     }
-}
-
-class certificates::rapidssl_ca_2 {
     sslcert::ca { 'RapidSSL_CA_2':
         source  => 'puppet:///files/ssl/RapidSSL_CA_2.crt',
     }
-}
-
-class certificates::rapidssl_sha256_ca_G3 {
     sslcert::ca { 'RapidSSL_SHA256_CA_-_G3':
         source  => 'puppet:///files/ssl/RapidSSL_SHA256_CA_-_G3.crt',
     }
-}
-
-class certificates::digicert_ca {
     sslcert::ca { 'DigiCertHighAssuranceCA-3':
         source  => 'puppet:///files/ssl/DigiCertHighAssuranceCA-3.crt',
     }
-}
-
-class certificates::digicert_sha2_ca {
     sslcert::ca { 'DigiCertSHA2HighAssuranceServerCA':
         source => 'puppet:///files/ssl/DigiCertSHA2HighAssuranceServerCA.crt',
     }
-}
-
-class certificates::globalsign_ca {
     sslcert::ca { 'GlobalSign_CA':
         source  => 'puppet:///files/ssl/GlobalSign_CA.crt',
     }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8a1cecfed4b26be189defa5a2316740a94127ff2
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: BBlack <[email protected]>
Gerrit-Reviewer: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to