Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/54466
Change subject: Apache conf for https://zuul.wikimedia.org ...................................................................... Apache conf for https://zuul.wikimedia.org We are going to create a new shinny portal for the Zuul gatekeeper. That will eventually be a bit shinnier than the plain text output currently available at http://integration.mediawiki.org/zuul/status The new plain text URL will be: https://zuul.wikimedia.org/status * create a zuul.wikimedia.org virtual host * HTTPS by default * back compatibility redirects from integration.mediawiki.org and integration.wikimedia.org. Note they will not work yet since the proxy_zuul intercept the queries before the virtual hosts. I will fix that in a future commit. * Make sure we have Apache mod_proxy and mod_proxy_http since the Zuul RewriteRule uses [P]. * update Zuul configuration to use the new plain text URL by editing the role class. Change-Id: I9b0932b07901b8ae4ee45f7960ff34eb958f04ac --- M manifests/role/zuul.pp M modules/contint/files/apache/integration.mediawiki.org M modules/contint/files/apache/integration.wikimedia.org A modules/contint/files/apache/zuul.wikimedia.org M modules/contint/manifests/website.pp 5 files changed, 55 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/66/54466/1 diff --git a/manifests/role/zuul.pp b/manifests/role/zuul.pp index cd5647c..38fa24a 100644 --- a/manifests/role/zuul.pp +++ b/manifests/role/zuul.pp @@ -48,7 +48,7 @@ # Not enabled yet but we need a pattern anyway: #url_pattern => 'https://integration.wikimedia.org/zuulreport/{change.number}/{change.patchset}/{pipeline.name}/{job.name}/{build.number}', url_pattern => 'https://integration.wikimedia.org/ci/job/{job.name}/{build.number}/console', - status_url => 'https://integration.wikimedia.org/zuul/status', + status_url => 'https://zuul.wikimedia.org/status', push_change_refs => false } diff --git a/modules/contint/files/apache/integration.mediawiki.org b/modules/contint/files/apache/integration.mediawiki.org index 28bf24a..81e1491 100644 --- a/modules/contint/files/apache/integration.mediawiki.org +++ b/modules/contint/files/apache/integration.mediawiki.org @@ -8,8 +8,12 @@ <VirtualHost *:80> ServerName integration.mediawiki.org + # Back compatibility for the good old status URL: + Redirect permanent /zuul/status https://zuul.wikimedia.org/status + Redirect permanent / https://integration.wikimedia.org/ </VirtualHost> + <VirtualHost *:443> ServerName integration.mediawiki.org @@ -18,5 +22,8 @@ SSLCertificateKeyFile /etc/ssl/private/star.mediawiki.org.key SSLCACertificateFile /etc/ssl/certs/RapidSSL_CA.pem + # Back compatibility for the good old status URL: + Redirect permanent /zuul/status https://zuul.wikimedia.org/status + Redirect permanent / https://integration.wikimedia.org/ </VirtualHost> diff --git a/modules/contint/files/apache/integration.wikimedia.org b/modules/contint/files/apache/integration.wikimedia.org index 94e5e49..a775efa 100644 --- a/modules/contint/files/apache/integration.wikimedia.org +++ b/modules/contint/files/apache/integration.wikimedia.org @@ -8,6 +8,9 @@ <VirtualHost *:80> ServerName integration.wikimedia.org + # Back compatibility for the good old status URL: + Redirect permanent /zuul/status https://zuul.wikimedia.org/status + # Force Jenkins request through HTTPS Redirect permanent / https://integration.wikimedia.org/ </VirtualHost> @@ -23,6 +26,9 @@ SSLCertificateKeyFile /etc/ssl/private/star.wikimedia.org.key SSLCACertificateFile /etc/ssl/certs/RapidSSL_CA.pem + # Back compatibility for the good old status URL: + Redirect permanent /zuul/status https://zuul.wikimedia.org/status + ErrorLog /var/log/apache2/error.log # Possible values include: debug, info, notice, warn, error, crit, diff --git a/modules/contint/files/apache/zuul.wikimedia.org b/modules/contint/files/apache/zuul.wikimedia.org new file mode 100644 index 0000000..94a6130 --- /dev/null +++ b/modules/contint/files/apache/zuul.wikimedia.org @@ -0,0 +1,32 @@ +##################################################################### +### THIS FILE IS MANAGED BY PUPPET +### puppet:///modules/contint/apaches/zuul.wikimedia.org +##################################################################### +# vim: filetype=apache + +NameVirtualHost *:443 +<VirtualHost *:80> + ServerName zuul.wikimedia.org + Redirect permanent / https://zuul.wikimedia.org/ +</VirtualHost> + +<VirtualHost *:443> + ServerName zuul.wikimedia.org + ServerAdmin [email protected] + + SSLEngine on + SSLCertificateFile /etc/ssl/certs/star.wikimedia.org.pem + SSLCertificateKeyFile /etc/ssl/private/star.wikimedia.org.key + SSLCACertificateFile /etc/ssl/certs/RapidSSL_CA.pem + + DocumentRoot /srv/org/wikimedia/zuul + + ErrorLog ${APACHE_LOG_DIR}/zuul.wikimedia.org-error.log + LogLevel warn + CustomLog ${APACHE_LOG_DIR}/zuul.wikimedia.org-access.log combined + + # Direct access to Zuul daemon + RewriteEngine on + RewriteRule ^/status$ http://127.0.0.1:8001/status [P] + RewriteRule ^/status.json$ http://127.0.0.1:8001/status.json [P] +</VirtualHost> diff --git a/modules/contint/manifests/website.pp b/modules/contint/manifests/website.pp index 1dbcf60..f1481ea 100644 --- a/modules/contint/manifests/website.pp +++ b/modules/contint/manifests/website.pp @@ -4,6 +4,15 @@ # https://doc.mediawiki.org/ class contint::website { + # Zuul Apache configuration file requires mod_proxy & mod_proxy_http + include contint::proxy_common + + # https://zuul.wikimedia.org/ + apache_site { 'zuul.wikimedia.org': + name => 'zuul.wikimedia.org', + } + Class['contint::proxy_common'] -> apache_site['zuul.wikimedia.org'] + # This is mostly to get the files properly setup file { '/srv/org': ensure => directory, -- To view, visit https://gerrit.wikimedia.org/r/54466 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9b0932b07901b8ae4ee45f7960ff34eb958f04ac 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
