Nemo bis has uploaded a new change for review. https://gerrit.wikimedia.org/r/227079
Change subject: Redirect wiki.toolserver.org to www.mediawiki.org ...................................................................... Redirect wiki.toolserver.org to www.mediawiki.org All the pages were imported with Toolserver: prefix. Smarter redirects can be considered later for actions other than view etc. The domain doesn't currently have a valid certificate, no HTTPS. Also fixed a comment in www.toolserver.org.erb. Bug: T62220 Change-Id: I687e7e258ead92f397efae80ce300a146b69f004 --- A templates/apache/sites/wiki.toolserver.org.erb M templates/apache/sites/www.toolserver.org.erb 2 files changed, 30 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/79/227079/1 diff --git a/templates/apache/sites/wiki.toolserver.org.erb b/templates/apache/sites/wiki.toolserver.org.erb new file mode 100644 index 0000000..c8dfb36 --- /dev/null +++ b/templates/apache/sites/wiki.toolserver.org.erb @@ -0,0 +1,29 @@ +##################################################################### +### THIS FILE IS MANAGED BY PUPPET +### puppet:///templates/apache/sites/wiki.toolserver.org.erb +##################################################################### +# vim: filetype=apache + +<VirtualHost *:80> + ServerAdmin n...@wikimedia.org + ServerName wiki.toolserver.org + + DocumentRoot /does/not/exist + <Directory /> + Options FollowSymLinks + AllowOverride None + </Directory> + + RewriteEngine on + RewriteRule ^/view/(.*)$ https://www.mediawiki.org/wiki/Toolserver:$1 [L,R] + + 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 + ServerSignature Off + +</VirtualHost> \ No newline at end of file diff --git a/templates/apache/sites/www.toolserver.org.erb b/templates/apache/sites/www.toolserver.org.erb index 1b92e29..07ca699 100644 --- a/templates/apache/sites/www.toolserver.org.erb +++ b/templates/apache/sites/www.toolserver.org.erb @@ -1,6 +1,6 @@ ##################################################################### ### THIS FILE IS MANAGED BY PUPPET -### puppet:///templates/apache/sites/wikitech.wikimedia.org +### puppet:///templates/apache/sites/www.toolserver.org.erb ##################################################################### # vim: filetype=apache -- To view, visit https://gerrit.wikimedia.org/r/227079 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I687e7e258ead92f397efae80ce300a146b69f004 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Nemo bis <federicol...@tiscali.it> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
