Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/173251
Change subject: role::ci::website::labs
......................................................................
role::ci::website::labs
Used to configure Apache, Jenkins and Gerrit.
The gerrit package is outdated but we still need the basic logic it
provides.
Change-Id: Ibd8dc5ce1d966b1547ec5af56470f0a283e0c857
---
M manifests/role/ci.pp
M modules/contint/manifests/website/labs.pp
2 files changed, 18 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/51/173251/1
diff --git a/manifests/role/ci.pp b/manifests/role/ci.pp
index 461504a..c843cba 100644
--- a/manifests/role/ci.pp
+++ b/manifests/role/ci.pp
@@ -471,3 +471,15 @@
zuul_git_dir => $role::zuul::configuration::zuul_git_dir,
}
}
+
+class role::ci::website::labs {
+
+ system::role { 'role::ci::website::labs': description => 'CI Website
(labs)' }
+
+ include contint::website::labs
+ include ::jenkins
+
+ package { 'gerrit':
+ ensure => present,
+ }
+}
diff --git a/modules/contint/manifests/website/labs.pp
b/modules/contint/manifests/website/labs.pp
index 7695851..cea1a0f 100644
--- a/modules/contint/manifests/website/labs.pp
+++ b/modules/contint/manifests/website/labs.pp
@@ -1,7 +1,12 @@
class contint::website::labs {
- # The contint dev instance also has Gerrit
+ # Need to send Vary: X-Forwarded-Proto since most sites are forced to HTTPS
+ # and behind a varnish cache. See also bug 60822
+ include ::apache::mod::headers
+
+ # The contint dev instance also has Gerrit/Jenkins
include contint::proxy_gerrit
+ include contint::proxy_jenkins
apache::site { 'integrationlabs':
content => template('contint/apache/integration.wmflabs.org.erb'),
--
To view, visit https://gerrit.wikimedia.org/r/173251
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibd8dc5ce1d966b1547ec5af56470f0a283e0c857
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
