coren has submitted this change and it was merged.
Change subject: dynamicproxy: Make proxy depend on cert being installed
......................................................................
dynamicproxy: Make proxy depend on cert being installed
Change-Id: Id277550f10bfea533c01fb87afcfeb1a476f6e3a
---
M manifests/role/labsproxy.pp
M modules/toollabs/manifests/proxy.pp
2 files changed, 8 insertions(+), 6 deletions(-)
Approvals:
coren: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/labsproxy.pp b/manifests/role/labsproxy.pp
index 886ce1c..437c237 100644
--- a/manifests/role/labsproxy.pp
+++ b/manifests/role/labsproxy.pp
@@ -19,7 +19,8 @@
class { '::dynamicproxy':
ssl_certificate_name => 'star.wmflabs.org',
set_xff => true,
- resolver => '10.68.16.1'
+ resolver => '10.68.16.1',
+ require => Install_certificate['star.wmflabs.org']
}
include dynamicproxy::api
}
diff --git a/modules/toollabs/manifests/proxy.pp
b/modules/toollabs/manifests/proxy.pp
index f0d130a..42e4d9d 100644
--- a/modules/toollabs/manifests/proxy.pp
+++ b/modules/toollabs/manifests/proxy.pp
@@ -2,14 +2,15 @@
class toollabs::proxy inherits toollabs {
include toollabs::infrastructure
+ install_certificate { 'star.wmflabs.org':
+ privatekey => false
+ }
+
class { '::dynamicproxy':
luahandler => 'urlproxy',
resolver => '10.68.16.1', # eqiad DNS resolver
- ssl_certificate_name => 'star.wmflabs.org'
- }
-
- install_certificate { 'star.wmflabs.org':
- privatekey => false
+ ssl_certificate_name => 'star.wmflabs.org',
+ require => Install_certificate['star.wmflabs.org']
}
package { 'python-redis':
--
To view, visit https://gerrit.wikimedia.org/r/135434
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id277550f10bfea533c01fb87afcfeb1a476f6e3a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda <yuvipa...@gmail.com>
Gerrit-Reviewer: coren <mpellet...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
