Andrew Bogott has submitted this change and it was merged. Change subject: contint: Move integration site to wikimedia.org ......................................................................
contint: Move integration site to wikimedia.org * Update main apache conf: - integration.wikimedia.org as ServerName instead of ServerAlias - SSL certificate for star.wikimedia instead of star.mediawiki * Set up redirect from (http,https)://integration.mediawiki.org * Set up redirect from http://integration.wikimedia.org Bug: 40697 Change-Id: I531ea5bcfe31b96e3eafd47fee5080f8aaf86121 --- M manifests/role/zuul.pp M modules/contint/files/apache/integration.mediawiki.org A modules/contint/files/apache/integration.wikimedia.org M modules/contint/manifests/website.pp 4 files changed, 92 insertions(+), 123 deletions(-) Approvals: Andrew Bogott: Looks good to me, approved Hashar: Checked; Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/manifests/role/zuul.pp b/manifests/role/zuul.pp index 4a63f93..cd5647c 100644 --- a/manifests/role/zuul.pp +++ b/manifests/role/zuul.pp @@ -41,14 +41,14 @@ system_role { "role::zuul::production": description => "Zuul on production" } zuulwikimedia::instance { "zuul-production": - jenkins_server => 'https://integration.mediawiki.org/ci', + jenkins_server => 'https://integration.wikimedia.org/ci', jenkins_user => 'zuul-bot', gerrit_server => 'manganese.wikimedia.org', gerrit_user => 'jenkins-bot', # Not enabled yet but we need a pattern anyway: - #url_pattern => 'http://integration.mediawiki.org/zuulreport/{change.number}/{change.patchset}/{pipeline.name}/{job.name}/{build.number}', - url_pattern => 'http://integration.mediawiki.org/ci/job/{job.name}/{build.number}/console', - status_url => 'http://integration.mediawiki.org/zuul/status', + #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', push_change_refs => false } diff --git a/modules/contint/files/apache/integration.mediawiki.org b/modules/contint/files/apache/integration.mediawiki.org index 100d542..a1104de 100644 --- a/modules/contint/files/apache/integration.mediawiki.org +++ b/modules/contint/files/apache/integration.mediawiki.org @@ -7,127 +7,16 @@ NameVirtualHost *:443 <VirtualHost *:80> ServerName integration.mediawiki.org - ServerAlias integration.wikimedia.org - ServerAdmin [email protected] - DocumentRoot /srv/org/mediawiki/integration - - ErrorLog /var/log/apache2/error.log - - # Possible values include: debug, info, notice, warn, error, crit, - # alert, emerg. - LogLevel warn - - CustomLog /var/log/apache2/access.log combined - - <Directory /> - Order Deny,Allow - AllowOverride All - </Directory> - - <Directory /srv/org/mediawiki/integration> - Options FollowSymLinks - AllowOverride All - Order allow,deny - allow from all - </Directory> - - <Directory /srv/org/mediawiki/integration/*Mobile/nightly/> - Options +Indexes - IndexOptions FancyIndexing - IndexOptions SuppressIcon - IndexOptions SuppressRules - IndexOptions SuppressDescription - IndexOptions SuppressHTMLPreamble - IndexOptions HTMLTable - IndexOptions VersionSort - IndexOptions NameWidth=* - - ServerSignature Off - - IndexStyleSheet "../../nightly.css" - HeaderName "HEADER.html" - ReadmeName "README.html" - IndexIgnore "*.html" ".." - </Directory> - - # Generic nightly builds, no specific HTML there - <Directory /srv/org/mediawiki/integration/nightly/> - Options +Indexes - IndexOptions FancyIndexing - IndexOptions SuppressDescription - IndexOptions HTMLTable - IndexOptions VersionSort - IndexOptions NameWidth=* - </Directory> - - <Directory /srv/org/mediawiki/integration/nightly/mediawiki/core> - IndexOrderDefault Descending Date - </Directory> - - # Force Jenkins request through HTTPS - RewriteEngine on - RewriteCond %{HTTPS} off - RewriteCond %{REQUEST_URI} ^/ci - RewriteRule ^/ci/ https://%{HTTP_HOST}%{REQUEST_URI} - + Redirect permanent / https://integration.wikimedia.org/ </VirtualHost> <VirtualHost *:443> ServerName integration.mediawiki.org - ServerAdmin [email protected] - - DocumentRoot /srv/org/mediawiki/integration SSLEngine on SSLCertificateFile /etc/ssl/certs/star.mediawiki.org.pem SSLCertificateKeyFile /etc/ssl/private/star.mediawiki.org.key SSLCACertificateFile /etc/ssl/certs/RapidSSL_CA.pem - ErrorLog /var/log/apache2/error.log - - # Possible values include: debug, info, notice, warn, error, crit, - # alert, emerg. - LogLevel warn - - CustomLog /var/log/apache2/access.log combined - - <Directory /> - Order Deny,Allow - AllowOverride All - </Directory> - - <Directory /srv/org/mediawiki/integration> - Options FollowSymLinks - AllowOverride All - Order allow,deny - allow from all - </Directory> - - <Directory /srv/org/mediawiki/integration/*Mobile/nightly/> - Options +Indexes - IndexOptions FancyIndexing - IndexOptions SuppressIcon - IndexOptions SuppressRules - IndexOptions SuppressDescription - IndexOptions SuppressHTMLPreamble - IndexOptions HTMLTable - IndexOptions VersionSort - IndexOptions NameWidth=* - - ServerSignature Off - - HeaderName "HEADER.html" - ReadmeName "README.html" - IndexIgnore "*.html" ".." - </Directory> - - # Generic nightly builds, no specific HTML there - <Directory /srv/org/mediawiki/integration/nightly/> - Options +Indexes - IndexOptions FancyIndexing - IndexOptions SuppressDescription - IndexOptions HTMLTable - IndexOptions VersionSort - IndexOptions NameWidth=* - </Directory> + 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 new file mode 100644 index 0000000..d6547e3 --- /dev/null +++ b/modules/contint/files/apache/integration.wikimedia.org @@ -0,0 +1,78 @@ +##################################################################### +### THIS FILE IS MANAGED BY PUPPET +### puppet:///files/apache/sites/integration.wikimedia.org +##################################################################### +# vim: filetype=apache + +NameVirtualHost *:443 +<VirtualHost *:80> + ServerName integration.wikimedia.org + + # Force Jenkins request through HTTPS + Redirect permanent / https://integration.wikimedia.org/ +</VirtualHost> + +<VirtualHost *:443> + ServerName integration.wikimedia.org + ServerAdmin [email protected] + + DocumentRoot /srv/org/wikimedia/integration + + 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 + + ErrorLog /var/log/apache2/error.log + + # Possible values include: debug, info, notice, warn, error, crit, + # alert, emerg. + LogLevel warn + + CustomLog /var/log/apache2/access.log combined + + <Directory /> + Order Deny,Allow + AllowOverride All + </Directory> + + <Directory /srv/org/wikimedia/integration> + Options FollowSymLinks + AllowOverride All + Order allow,deny + allow from all + </Directory> + + <Directory /srv/org/wikimedia/integration/*Mobile/nightly/> + Options +Indexes + IndexOptions FancyIndexing + IndexOptions SuppressIcon + IndexOptions SuppressRules + IndexOptions SuppressDescription + IndexOptions SuppressHTMLPreamble + IndexOptions HTMLTable + IndexOptions VersionSort + IndexOptions NameWidth=* + + ServerSignature Off + + IndexStyleSheet "../../nightly.css" + HeaderName "HEADER.html" + ReadmeName "README.html" + IndexIgnore "*.html" ".." + </Directory> + + # Generic nightly builds, no specific HTML there + <Directory /srv/org/wikimedia/integration/nightly/> + Options +Indexes + IndexOptions FancyIndexing + IndexOptions SuppressDescription + IndexOptions HTMLTable + IndexOptions VersionSort + IndexOptions NameWidth=* + </Directory> + + <Directory /srv/org/wikimedia/integration/nightly/mediawiki/core> + IndexOrderDefault Descending Date + </Directory> +</VirtualHost> diff --git a/modules/contint/manifests/website.pp b/modules/contint/manifests/website.pp index bb9cba7..f4d83f7 100644 --- a/modules/contint/manifests/website.pp +++ b/modules/contint/manifests/website.pp @@ -12,13 +12,13 @@ group => 'jenkins', } - file { '/srv/org/mediawiki': + file { '/srv/org/wikimedia': ensure => directory, mode => '0775', owner => 'jenkins', group => 'jenkins', } - file { '/srv/org/mediawiki/integration': + file { '/srv/org/wikimedia/integration': ensure => directory, mode => '0775', owner => 'jenkins', @@ -32,15 +32,17 @@ group => 'jenkins', } - # Apache configuration for integration.mediawiki.org - file { '/etc/apache2/sites-available/integration.mediawiki.org': + # Apache configuration for integration.wikimedia.org + file { '/etc/apache2/sites-available/integration.wikimedia.org': mode => '0444', owner => 'root', group => 'root', - source => 'puppet:///modules/contint/apache/integration.mediawiki.org', + source => 'puppet:///modules/contint/apache/integration.wikimedia.org', } apache_site { 'integration.mediawiki.org': - name => 'integration.mediawiki.org' + # Make sure the old configuration does not conflict + ensure => absent, + name => 'integration.mediawiki.org', } file { '/srv/org/wikimedia': -- To view, visit https://gerrit.wikimedia.org/r/53513 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I531ea5bcfe31b96e3eafd47fee5080f8aaf86121 Gerrit-PatchSet: 13 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Krinkle <[email protected]> Gerrit-Reviewer: Andrew Bogott <[email protected]> Gerrit-Reviewer: Demon <[email protected]> Gerrit-Reviewer: Faidon <[email protected]> Gerrit-Reviewer: Hashar <[email protected]> Gerrit-Reviewer: Krinkle <[email protected]> Gerrit-Reviewer: Reedy <[email protected]> Gerrit-Reviewer: jenkins-bot _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
