Faidon Liambotis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/215349
Change subject: base: certificates::base -> base::certificates
......................................................................
base: certificates::base -> base::certificates
Our CA configuration really belongs to "base", move it there.
Change-Id: If02035349b654058361de83ff40ba5f3fbfeee12
---
M manifests/certs.pp
R modules/base/files/ca/DigiCertHighAssuranceCA-3.crt
R modules/base/files/ca/GlobalSign_CA.crt
R modules/base/files/ca/RapidSSL_CA.crt
R modules/base/files/ca/RapidSSL_CA_2.crt
R modules/base/files/ca/RapidSSL_SHA256_CA_-_G3.crt
R modules/base/files/ca/wmf-ca.crt
R modules/base/files/ca/wmf-labs.crt
R modules/base/files/ca/wmf_ca_2014_2017.crt
A modules/base/manifests/certificates.pp
M modules/base/manifests/init.pp
11 files changed, 30 insertions(+), 30 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/49/215349/1
diff --git a/manifests/certs.pp b/manifests/certs.pp
index ffe071b..73cd4fa 100644
--- a/manifests/certs.pp
+++ b/manifests/certs.pp
@@ -3,7 +3,7 @@
$privatekey=true,
) {
- require certificates::base
+ require base::certificates
sslcert::certificate { $name:
group => $group,
@@ -19,34 +19,5 @@
sslcert::chainedcert { $name:
group => $group,
- }
-}
-
-class certificates::base {
- include ::sslcert
-
- sslcert::ca { 'wmf-ca':
- source => 'puppet:///files/ssl/wmf-ca.crt',
- }
- sslcert::ca { 'wmf_ca_2014_2017':
- source => "puppet:///files/ssl/wmf_ca_2014_2017.crt",
- }
- sslcert::ca { 'RapidSSL_CA':
- source => 'puppet:///files/ssl/RapidSSL_CA.crt',
- }
- sslcert::ca { 'RapidSSL_CA_2':
- source => 'puppet:///files/ssl/RapidSSL_CA_2.crt',
- }
- sslcert::ca { 'RapidSSL_SHA256_CA_-_G3':
- source => 'puppet:///files/ssl/RapidSSL_SHA256_CA_-_G3.crt',
- }
- sslcert::ca { 'DigiCertHighAssuranceCA-3':
- source => 'puppet:///files/ssl/DigiCertHighAssuranceCA-3.crt',
- }
- sslcert::ca { 'DigiCertSHA2HighAssuranceServerCA':
- source => 'puppet:///files/ssl/DigiCertSHA2HighAssuranceServerCA.crt',
- }
- sslcert::ca { 'GlobalSign_CA':
- source => 'puppet:///files/ssl/GlobalSign_CA.crt',
}
}
diff --git a/files/ssl/DigiCertHighAssuranceCA-3.crt
b/modules/base/files/ca/DigiCertHighAssuranceCA-3.crt
similarity index 100%
rename from files/ssl/DigiCertHighAssuranceCA-3.crt
rename to modules/base/files/ca/DigiCertHighAssuranceCA-3.crt
diff --git a/files/ssl/GlobalSign_CA.crt
b/modules/base/files/ca/GlobalSign_CA.crt
similarity index 100%
rename from files/ssl/GlobalSign_CA.crt
rename to modules/base/files/ca/GlobalSign_CA.crt
diff --git a/files/ssl/RapidSSL_CA.crt b/modules/base/files/ca/RapidSSL_CA.crt
similarity index 100%
rename from files/ssl/RapidSSL_CA.crt
rename to modules/base/files/ca/RapidSSL_CA.crt
diff --git a/files/ssl/RapidSSL_CA_2.crt
b/modules/base/files/ca/RapidSSL_CA_2.crt
similarity index 100%
rename from files/ssl/RapidSSL_CA_2.crt
rename to modules/base/files/ca/RapidSSL_CA_2.crt
diff --git a/files/ssl/RapidSSL_SHA256_CA_-_G3.crt
b/modules/base/files/ca/RapidSSL_SHA256_CA_-_G3.crt
similarity index 100%
rename from files/ssl/RapidSSL_SHA256_CA_-_G3.crt
rename to modules/base/files/ca/RapidSSL_SHA256_CA_-_G3.crt
diff --git a/files/ssl/wmf-ca.crt b/modules/base/files/ca/wmf-ca.crt
similarity index 100%
rename from files/ssl/wmf-ca.crt
rename to modules/base/files/ca/wmf-ca.crt
diff --git a/files/ssl/wmf-labs.crt b/modules/base/files/ca/wmf-labs.crt
similarity index 100%
rename from files/ssl/wmf-labs.crt
rename to modules/base/files/ca/wmf-labs.crt
diff --git a/files/ssl/wmf_ca_2014_2017.crt
b/modules/base/files/ca/wmf_ca_2014_2017.crt
similarity index 100%
rename from files/ssl/wmf_ca_2014_2017.crt
rename to modules/base/files/ca/wmf_ca_2014_2017.crt
diff --git a/modules/base/manifests/certificates.pp
b/modules/base/manifests/certificates.pp
new file mode 100644
index 0000000..879880d
--- /dev/null
+++ b/modules/base/manifests/certificates.pp
@@ -0,0 +1,28 @@
+class base::certificates {
+ include ::sslcert
+
+ sslcert::ca { 'wmf-ca':
+ source => 'puppet:///modules/base/ca/wmf-ca.crt',
+ }
+ sslcert::ca { 'wmf_ca_2014_2017':
+ source => "puppet:///modules/base/ca/wmf_ca_2014_2017.crt",
+ }
+ 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 { 'DigiCertHighAssuranceCA-3':
+ source => 'puppet:///modules/base/ca/DigiCertHighAssuranceCA-3.crt',
+ }
+ sslcert::ca { 'DigiCertSHA2HighAssuranceServerCA':
+ source =>
'puppet:///modules/base/ca/DigiCertSHA2HighAssuranceServerCA.crt',
+ }
+ sslcert::ca { 'GlobalSign_CA':
+ source => 'puppet:///modules/base/ca/GlobalSign_CA.crt',
+ }
+}
diff --git a/modules/base/manifests/init.pp b/modules/base/manifests/init.pp
index 6e06399..61dab3b 100644
--- a/modules/base/manifests/init.pp
+++ b/modules/base/manifests/init.pp
@@ -67,6 +67,7 @@
include base::environment
include base::phaste
include base::screenconfig
+ include base::certificates
include ssh::client
include ssh::server
include role::salt::minions
--
To view, visit https://gerrit.wikimedia.org/r/215349
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If02035349b654058361de83ff40ba5f3fbfeee12
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits