[MediaWiki-commits] [Gerrit] certs: replace require by collector ordering - change (operations/puppet)

2015-06-10 Thread Faidon Liambotis (Code Review) 
Faidon Liambotis has submitted this change and it was merged.

Change subject: certs: replace require by collector ordering
..


certs: replace require by collector ordering

Change-Id: I6d999199d1a6da5727ad374f8a1f2b27a5ab6936
---
M manifests/certs.pp
M modules/base/manifests/certificates.pp
2 files changed, 3 insertions(+), 3 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 af09b3a..e3effe9 100644
--- a/manifests/certs.pp
+++ b/manifests/certs.pp
@@ -2,9 +2,6 @@
 $group = 'ssl-cert',
 $privatekey=true,
 ) {
-
-require base::certificates
-
 sslcert::certificate { $name:
 group  = $group,
 source = puppet:///files/ssl/${name}.crt,
diff --git a/modules/base/manifests/certificates.pp 
b/modules/base/manifests/certificates.pp
index 2f41aec..7d8723c 100644
--- a/modules/base/manifests/certificates.pp
+++ b/modules/base/manifests/certificates.pp
@@ -22,4 +22,7 @@
 sslcert::ca { 'GlobalSign_Organization_Validation_CA_-_SHA256_-_G2':
 source  = 
'puppet:///modules/base/ca/GlobalSign_Organization_Validation_CA_-_SHA256_-_G2.crt',
 }
+
+# install all CAs before generating certificates
+Sslcert::Ca | | - Sslcert::Certificate| |
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6d999199d1a6da5727ad374f8a1f2b27a5ab6936
Gerrit-PatchSet: 10
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: BBlack bbl...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] certs: replace require by collector ordering - change (operations/puppet)

2015-06-02 Thread Faidon Liambotis (Code Review) 
Faidon Liambotis has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/215352

Change subject: certs: replace require by collector ordering
..

certs: replace require by collector ordering

This is untested, hope it works :)

Change-Id: I6d999199d1a6da5727ad374f8a1f2b27a5ab6936
---
M manifests/certs.pp
M modules/base/manifests/certificates.pp
2 files changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/52/215352/1

diff --git a/manifests/certs.pp b/manifests/certs.pp
index af09b3a..e3effe9 100644
--- a/manifests/certs.pp
+++ b/manifests/certs.pp
@@ -2,9 +2,6 @@
 $group = 'ssl-cert',
 $privatekey=true,
 ) {
-
-require base::certificates
-
 sslcert::certificate { $name:
 group  = $group,
 source = puppet:///files/ssl/${name}.crt,
diff --git a/modules/base/manifests/certificates.pp 
b/modules/base/manifests/certificates.pp
index 879880d..b4b6e94 100644
--- a/modules/base/manifests/certificates.pp
+++ b/modules/base/manifests/certificates.pp
@@ -25,4 +25,7 @@
 sslcert::ca { 'GlobalSign_CA':
 source  = 'puppet:///modules/base/ca/GlobalSign_CA.crt',
 }
+
+# install all CAs before generating certificates
+Sslcert::Ca | | - Sslcert::Chainedcert| |
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6d999199d1a6da5727ad374f8a1f2b27a5ab6936
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits