Dzahn has submitted this change and it was merged. Change subject: annualreport: add Apache site for 15.wp.org ......................................................................
annualreport: add Apache site for 15.wp.org Add Apache site on bromine along with annual report 2014 to make 15.wikipedia.org work for annual report 2015. Bug:T599 Change-Id: I73a9ec635cea179bff0f01efe0b8ce6b64c01265 --- A modules/annualreport/files/15.wikipedia.org M modules/annualreport/manifests/init.pp 2 files changed, 29 insertions(+), 1 deletion(-) Approvals: jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/modules/annualreport/files/15.wikipedia.org b/modules/annualreport/files/15.wikipedia.org new file mode 100644 index 0000000..0afc3ad --- /dev/null +++ b/modules/annualreport/files/15.wikipedia.org @@ -0,0 +1,24 @@ +# vim: filetype=apache +# https://15.wikipedia.org (T599) + +<VirtualHost *:80> + ServerAdmin n...@wikimedia.org + ServerName 15.wikipedia.org + + DocumentRoot /srv/org/wikimedia/annualreport/2015 + + ErrorLog /var/log/apache2/error.log + LogLevel warn + CustomLog /var/log/apache2/access.log combined + + RewriteEngine On + RewriteCond %{HTTP:X-Forwarded-Proto} !https + RewriteRule ^/(.*)$ https://%{HTTP_HOST}%{REQUEST_URI} [R=301,E=ProtoRedirect] + Header always merge Vary X-Forwarded-Proto + Header always set Strict-Transport-Security "max-age=31536000" + + <Directory /srv/org/wikimedia/annualreport/2015> + Require all granted + </Directory> + +</VirtualHost> diff --git a/modules/annualreport/manifests/init.pp b/modules/annualreport/manifests/init.pp index 7fa01b9..bce73e2 100644 --- a/modules/annualreport/manifests/init.pp +++ b/modules/annualreport/manifests/init.pp @@ -1,5 +1,5 @@ # sets up the WMF annual report site - https://annual.wikimedia.org/ -# T599 +# T599 - https://15.wikipedia.org (aka. annual report 2015) class annualreport { include ::apache @@ -16,6 +16,10 @@ source => 'puppet:///modules/annualreport/annual.wikimedia.org', } + apache::site { '15.wikipedia.org': + source => 'puppet:///modules/annualreport/15.wikipedia.org', + } + git::clone { 'wikimedia/annualreport': ensure => 'present', directory => '/srv/org/wikimedia/annualreport', -- To view, visit https://gerrit.wikimedia.org/r/263652 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I73a9ec635cea179bff0f01efe0b8ce6b64c01265 Gerrit-PatchSet: 3 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn <dz...@wikimedia.org> Gerrit-Reviewer: Dzahn <dz...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
