Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/53513
Change subject: Integration: Update index, fix discrepencies, move wikimedia.org
......................................................................
Integration: Update index, fix discrepencies, move wikimedia.org
Index:
* Update phrasing from MediaWiki to Wikimedia.
* Remove old testswarm link.
* Add Zuul status.
Discrepencies:
* http/https conf:
- IndexStyleSheet for mobile nightly.
- IndexOrderDefault for nightly snapshots weren't set on both.
* Zuul:
- url_pattern for jenkins-bot comments was on http, and since
/ci is redirect-enforced to https, this was outputting
urls in Gerrit comments that are always redirects.
Domain:
* Update apache conf.
* Move docroot.
* Set up redirects.
* Fix SSL certificate issue (previously https://integration.wikimedia.org
served with certificate of star.mediawiki.org)
* Remove mentions of doc domain since that isn't even in these files.
Bug: 40697
Change-Id: I531ea5bcfe31b96e3eafd47fee5080f8aaf86121
---
M files/misc/jenkins/index.html
M manifests/misc/contint.pp
M manifests/role/zuul.pp
R modules/contint/files/apache/integration.wikimedia.org
M modules/contint/manifests/website.pp
5 files changed, 83 insertions(+), 72 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/13/53513/1
diff --git a/files/misc/jenkins/index.html b/files/misc/jenkins/index.html
index 8a1a56d..54669ae 100644
--- a/files/misc/jenkins/index.html
+++ b/files/misc/jenkins/index.html
@@ -2,9 +2,8 @@
<html dir="ltr" lang="en-US">
<head>
<meta charset="utf-8">
- <title>MediaWiki Continuous Integration</title>
- <meta name="viewport" content="width=device-width, initial-scale=1.0,
maximum-scale=1.0, user-scalable=no" />
- <style type="text/css">
+ <title>Wikimedia Continuous Integration</title>
+ <style>
body {
margin: 0;
font-size: 14px;
@@ -55,39 +54,37 @@
</head>
<body>
<div>
- <img
src="https://upload.wikimedia.org/wikipedia/commons/3/3d/Mediawiki-logo.png";
class="logo">
+ <img
src="//upload.wikimedia.org/wikipedia/commons/3/3d/Mediawiki-logo.png"
class="logo">
<h1>Welcome!</h1>
- <p>This is our continous integration server for MediaWiki.</p>
- <p>Right now, we are running Jenkins:</p>
+ <p>This the continous integration server for Wikimedia
Foundation projects.</p>
<ul>
- <li><a href="ci/">Jenkins (PHPUnit/PHP)</a></li>
- <li><s>TestSwarm (QUnit/Javascript)</s>, disabled</li>
+ <li><a href="/ci/">Jenkins</a></li>
+ <li><a href="/zuul/status">Zuul status</a></li>
<li>Nightly builds:<br/>
<ul>
<li>
- <a href="nightly/mediawiki/core/">MediaWiki Core</a>
(<a href="nightly/mediawiki/core/mediawiki-latest.zip">latest</a>)
+ <a href="/nightly/mediawiki/core/">MediaWiki core</a>
(<a href="/nightly/mediawiki/core/mediawiki-latest.zip">latest</a>)
</li>
<li>
<a href="/nightly/mobile/android-commons/">Commons</a>
Android application
(github: <a
href="https://github.com/wikimedia/android-commons";>android-commons</a>)
</li>
<li>
- <a href="WikipediaMobile/nightly/">Wikipedia</a>
Android application
+ <a href="/WikipediaMobile/nightly/">Wikipedia</a>
Android application
(github: <a
href="https://github.com/wikimedia/WikipediaMobile";>WikipediaMobile</a>)
</li>
<li>
- <a href="WiktionaryMobile/nightly/">Wiktionary</a>
Android application
+ <a href="/WiktionaryMobile/nightly/">Wiktionary</a>
Android application
(github: <a
href="https://github.com/wikimedia/WiktionaryMobile";>WiktionaryMobile</a>)
</li>
<li>
- <a href="WLMMobile/nightly/">Wikimedia Loves
Monument</a> Android application
+ <a href="/WLMMobile/nightly/">Wikimedia Loves
Monument</a> Android application
(github: <a
href="https://github.com/wikimedia/WLMMobile";>WLMMobile</a>)
</li>
</ul>
</li>
</ul>
- <p>Our tools are available using either HTTP or HTTPS.</p>
- <p>Questions? Comments? Concerns? Contact <em>^demon</em>,
<em>Krinkle</em> or <em>hashar</em> on <a
href="irc://irc.freenode.net/#mediawiki">#mediawiki</a>.</p>
+ <p>Questions? Comments? Concerns? Contact <em>^demon</em>,
<em>Krinkle</em> or <em>hashar</em> on <a
href="irc://irc.freenode.net/#wikimedia-dev">#wikimedia-dev</a>.</p>
</div>
</body>
</html>
diff --git a/manifests/misc/contint.pp b/manifests/misc/contint.pp
index 100cc6c..246f5f7 100644
--- a/manifests/misc/contint.pp
+++ b/manifests/misc/contint.pp
@@ -126,56 +126,56 @@
file {
"/var/lib/jenkins/.git":
mode => 2775, # group sticky bit
- group => "jenkins",
+ group => jenkins,
ensure => directory;
"/var/lib/jenkins/bin":
- owner => "jenkins",
- group => "wikidev",
+ owner => jenkins,
+ group => wikidev,
mode => 0775,
ensure => directory;
# Welcome page
- "/srv/org/mediawiki/integration/index.html":
+ "/srv/org/wikimedia/integration/index.html":
owner => www-data,
group => wikidev,
mode => 0444,
source =>
"puppet:///files/misc/jenkins/index.html";
# Stylesheet used by nightly builds (example:
Wiktionary/Wikipedia mobiles apps)
- "/srv/org/mediawiki/integration/nightly.css":
+ "/srv/org/wikimedia/integration/nightly.css":
owner => www-data,
group => wikidev,
mode => 0444,
source =>
"puppet:///files/misc/jenkins/nightly.css";
- "/srv/org/mediawiki/integration/WikipediaMobile":
+ "/srv/org/wikimedia/integration/WikipediaMobile":
owner => jenkins,
group => wikidev,
mode => 0755,
ensure => directory;
# Copy HTML materials for ./WikipediaMobile/nightly/ :
-
"/srv/org/mediawiki/integration/WikipediaMobile/nightly":
+
"/srv/org/wikimedia/integration/WikipediaMobile/nightly":
owner => jenkins,
group => wikidev,
mode => 0644,
ensure => directory,
source =>
"puppet:///files/misc/jenkins/WikipediaMobile",
recurse => "true";
- "/srv/org/mediawiki/integration/WiktionaryMobile":
+ "/srv/org/wikimedia/integration/WiktionaryMobile":
owner => jenkins,
group => wikidev,
mode => 0755,
ensure => directory;
-
"/srv/org/mediawiki/integration/WiktionaryMobile/nightly":
+
"/srv/org/wikimedia/integration/WiktionaryMobile/nightly":
owner => jenkins,
group => wikidev,
mode => 0644,
ensure => directory,
source =>
"puppet:///files/misc/jenkins/WiktionaryMobile",
recurse => "true";
- "/srv/org/mediawiki/integration/WLMMobile":
+ "/srv/org/wikimedia/integration/WLMMobile":
owner => jenkins,
group => wikidev,
mode => 0755,
ensure => directory;
- "/srv/org/mediawiki/integration/WLMMobile/nightly":
+ "/srv/org/wikimedia/integration/WLMMobile/nightly":
owner => jenkins,
group => wikidev,
mode => 0644,
diff --git a/manifests/role/zuul.pp b/manifests/role/zuul.pp
index 24c16b7..5f74bed 100644
--- a/manifests/role/zuul.pp
+++ b/manifests/role/zuul.pp
@@ -38,14 +38,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.wikimedia.org
similarity index 69%
rename from modules/contint/files/apache/integration.mediawiki.org
rename to modules/contint/files/apache/integration.wikimedia.org
index 100d542..c4a6ce5 100644
--- a/modules/contint/files/apache/integration.mediawiki.org
+++ b/modules/contint/files/apache/integration.wikimedia.org
@@ -1,16 +1,15 @@
#####################################################################
### THIS FILE IS MANAGED BY PUPPET
-### puppet:///files/apache/sites/integration.mediawiki.org
+### puppet:///files/apache/sites/integration.wikimedia.org
#####################################################################
# vim: filetype=apache
NameVirtualHost *:443
<VirtualHost *:80>
- ServerName integration.mediawiki.org
- ServerAlias integration.wikimedia.org
+ ServerName integration.wikimedia.org
ServerAdmin n...@wikimedia.org
- DocumentRoot /srv/org/mediawiki/integration
+ DocumentRoot /srv/org/wikimedia/integration
ErrorLog /var/log/apache2/error.log
@@ -25,14 +24,14 @@
AllowOverride All
</Directory>
- <Directory /srv/org/mediawiki/integration>
+ <Directory /srv/org/wikimedia/integration>
Options FollowSymLinks
AllowOverride All
Order allow,deny
allow from all
</Directory>
- <Directory /srv/org/mediawiki/integration/*Mobile/nightly/>
+ <Directory /srv/org/wikimedia/integration/*Mobile/nightly/>
Options +Indexes
IndexOptions FancyIndexing
IndexOptions SuppressIcon
@@ -52,7 +51,7 @@
</Directory>
# Generic nightly builds, no specific HTML there
- <Directory /srv/org/mediawiki/integration/nightly/>
+ <Directory /srv/org/wikimedia/integration/nightly/>
Options +Indexes
IndexOptions FancyIndexing
IndexOptions SuppressDescription
@@ -61,7 +60,7 @@
IndexOptions NameWidth=*
</Directory>
- <Directory /srv/org/mediawiki/integration/nightly/mediawiki/core>
+ <Directory /srv/org/wikimedia/integration/nightly/mediawiki/core>
IndexOrderDefault Descending Date
</Directory>
@@ -70,17 +69,17 @@
RewriteCond %{HTTPS} off
RewriteCond %{REQUEST_URI} ^/ci
RewriteRule ^/ci/ https://%{HTTP_HOST}%{REQUEST_URI}
-
</VirtualHost>
+
<VirtualHost *:443>
- ServerName integration.mediawiki.org
+ ServerName integration.wikimedia.org
ServerAdmin n...@wikimedia.org
- DocumentRoot /srv/org/mediawiki/integration
+ DocumentRoot /srv/org/wikimedia/integration
SSLEngine on
- SSLCertificateFile /etc/ssl/certs/star.mediawiki.org.pem
- SSLCertificateKeyFile /etc/ssl/private/star.mediawiki.org.key
+ 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
@@ -96,14 +95,14 @@
AllowOverride All
</Directory>
- <Directory /srv/org/mediawiki/integration>
+ <Directory /srv/org/wikimedia/integration>
Options FollowSymLinks
AllowOverride All
Order allow,deny
allow from all
</Directory>
- <Directory /srv/org/mediawiki/integration/*Mobile/nightly/>
+ <Directory /srv/org/wikimedia/integration/*Mobile/nightly/>
Options +Indexes
IndexOptions FancyIndexing
IndexOptions SuppressIcon
@@ -116,13 +115,14 @@
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/>
+ <Directory /srv/org/wikimedia/integration/nightly/>
Options +Indexes
IndexOptions FancyIndexing
IndexOptions SuppressDescription
@@ -130,4 +130,27 @@
IndexOptions VersionSort
IndexOptions NameWidth=*
</Directory>
+
+ <Directory /srv/org/wikimedia/integration/nightly/mediawiki/core>
+ IndexOrderDefault Descending Date
+ </Directory>
+</VirtualHost>
+
+<VirtualHost *:80>
+ ServerName integration.mediawiki.org
+
+ RewriteEngine On
+ RewriteRule ^(.*)$ http://integration.wikimedia.org$1 [R=301,L,NE]
+</VirtualHost>
+
+<VirtualHost *:443>
+ ServerName integration.mediawiki.org
+
+ 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
+
+ RewriteEngine On
+ RewriteRule ^(.*)$ https://integration.wikimedia.org$1 [R=301,L,NE]
</VirtualHost>
diff --git a/modules/contint/manifests/website.pp
b/modules/contint/manifests/website.pp
index 667626a..83f382a 100644
--- a/modules/contint/manifests/website.pp
+++ b/modules/contint/manifests/website.pp
@@ -1,7 +1,5 @@
# Class for website hosted on the continuous integration server
-# https://integration.mediawiki.org/
-# https://doc.wikimedia.org/
-# https://doc.mediawiki.org/
+# https://integration.wikimedia.org
class contint::website {
# This is mostly to get the files properly setup
@@ -12,36 +10,29 @@
group => 'wikidev',
}
- file { '/srv/org/mediawiki':
- ensure => directory,
- mode => '0755',
- owner => 'www-data',
- group => 'wikidev',
- }
- file { '/srv/org/mediawiki/integration':
- ensure => directory,
- mode => '0755',
- owner => 'www-data',
- group => 'wikidev',
- }
-
- # Apache configuration for integration.mediawiki.org
- file { '/etc/apache2/sites-available/integration.mediawiki.org':
- mode => '0444',
- owner => 'root',
- group => 'root',
- source => 'puppet:///modules/contint/apache/integration.mediawiki.org',
- }
- apache_site { 'integration.mediawiki.org':
- name => 'integration.mediawiki.org'
- }
-
file { '/srv/org/wikimedia':
ensure => directory,
mode => '0755',
owner => 'www-data',
group => 'wikidev',
}
+ file { '/srv/org/wikimedia/integration':
+ ensure => directory,
+ mode => '0755',
+ owner => 'www-data',
+ group => 'wikidev',
+ }
+
+ # 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.wikimedia.org',
+ }
+ apache_site { 'integration.wikimedia.org':
+ name => 'integration.wikimedia.org'
+ }
file { '/srv/localhost':
ensure => directory,
--
To view, visit https://gerrit.wikimedia.org/r/53513
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I531ea5bcfe31b96e3eafd47fee5080f8aaf86121
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Krinkle <ttij...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
![https://upload.wikimedia.org/wikipedia/commons/3/3d/Mediawiki-logo.png"](https://upload.wikimedia.org/wikipedia/commons/3/3d/Mediawiki-logo.png"){kind=link}