Jgreen has submitted this change and it was merged. Change subject: add redirect for blog.wikimedia.org for RT 8039, also clean up sloppy formatting ......................................................................
add redirect for blog.wikimedia.org for RT 8039, also clean up sloppy formatting Change-Id: I157abf9d57a8ffd62691c2c014f33fcc63e9db6d --- M files/apache/sites/blog.wikimedia.org 1 file changed, 107 insertions(+), 106 deletions(-) Approvals: Jgreen: Verified; Looks good to me, approved diff --git a/files/apache/sites/blog.wikimedia.org b/files/apache/sites/blog.wikimedia.org index fbafd6c..47e9c57 100644 --- a/files/apache/sites/blog.wikimedia.org +++ b/files/apache/sites/blog.wikimedia.org @@ -5,133 +5,134 @@ # vim: filetype=apache NameVirtualHost *:443 + <VirtualHost *:81> - ServerAdmin [email protected] - ServerName blog.wikimedia.org + ServerAdmin [email protected] + ServerName blog.wikimedia.org + RewriteEngine On + RewriteRule ^/blog/(.*) http://blog.wikimedia.org/$1 [R] + RewriteRule ^/category/(.*) http://blog.wikimedia.org/c/$1 [R] + + # RT 8039 + RewriteRule ^/2014/07/29/wikimedia-foundation-now-accepts-bitcoin(.*) /2014/07/30/wikimedia-foundation-now-accepts-bitcoin$1 [R] + + DocumentRoot /srv/org/wikimedia/blog/ + + <Directory /> + Options FollowSymLinks + AllowOverride None + </Directory> + + <Directory /srv/org/wikimedia/blog/> + Options Indexes FollowSymLinks MultiViews + #AllowOverride None + Order allow,deny + allow from all + + # For WordPress RewriteEngine On - RewriteRule ^/blog/(.*) http://blog.wikimedia.org/$1 [R] - RewriteRule ^/category/(.*) http://blog.wikimedia.org/c/$1 [R] + RewriteBase / + RewriteCond %{REQUEST_FILENAME} !-f + RewriteCond %{REQUEST_FILENAME} !-d + RewriteRule . /index.php [L] + </Directory> - - DocumentRoot /srv/org/wikimedia/blog/ - <Directory /> - Options FollowSymLinks - AllowOverride None - </Directory> - <Directory /srv/org/wikimedia/blog/> - Options Indexes FollowSymLinks MultiViews - #AllowOverride None - Order allow,deny - allow from all + <Directory /srv/org/wikimedia/blog/wp-content/uploads/> + php_flag engine off + </Directory> - # For WordPress - RewriteEngine On - RewriteBase / - RewriteCond %{REQUEST_FILENAME} !-f - RewriteCond %{REQUEST_FILENAME} !-d - RewriteRule . /index.php [L] + ErrorLog /var/log/apache2/error.log + LogLevel warn - </Directory> - <Directory /srv/org/wikimedia/blog/wp-content/uploads/> - php_flag engine off - </Directory> - - 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 On - + CustomLog /var/log/apache2/access.log combined + ServerSignature On </VirtualHost> + <VirtualHost *:443> - ServerAdmin [email protected] - ServerName blog.wikimedia.org + ServerAdmin [email protected] + ServerName blog.wikimedia.org + RewriteEngine On + RewriteRule ^/blog/(.*) http://blog.wikimedia.org/$1 [R] + RewriteRule ^/category/(.*) http://blog.wikimedia.org/c/$1 [R] + # RT 8039 + RewriteRule ^/2014/07/29/wikimedia-foundation-now-accepts-bitcoin(.*) /2014/07/30/wikimedia-foundation-now-accepts-bitcoin$1 [R] + + DocumentRoot /srv/org/wikimedia/blog/ + + SSLEngine on + SSLProtocol -ALL +SSLv3 +TLSv1 + SSLCipherSuite AES128-GCM-SHA256:RC4-SHA:RC4-MD5:DES-CBC3-SHA:AES128-SHA:AES256-SHA + SSLHonorCipherOrder on + SSLCertificateFile /etc/ssl/certs/blog.wikimedia.org.pem + SSLCertificateKeyFile /etc/ssl/private/blog.wikimedia.org.key + SSLCACertificatePath /etc/ssl/certs/ + + <Directory /> + Options FollowSymLinks + AllowOverride None + </Directory> + + <Directory /srv/org/wikimedia/blog/> + Options Indexes FollowSymLinks MultiViews + AllowOverride None + Order allow,deny + allow from all + + # For WordPress RewriteEngine On - RewriteRule ^/blog/(.*) http://blog.wikimedia.org/$1 [R] - RewriteRule ^/category/(.*) http://blog.wikimedia.org/c/$1 [R] + RewriteBase / + RewriteCond %{REQUEST_FILENAME} !-f + RewriteCond %{REQUEST_FILENAME} !-d + RewriteRule . /index.php [L] + </Directory> - DocumentRoot /srv/org/wikimedia/blog/ + <Directory /srv/org/wikimedia/blog/wp-content/uploads/> + php_flag engine off + </Directory> - SSLEngine on - SSLProtocol -ALL +SSLv3 +TLSv1 - SSLCipherSuite AES128-GCM-SHA256:RC4-SHA:RC4-MD5:DES-CBC3-SHA:AES128-SHA:AES256-SHA - SSLHonorCipherOrder on - SSLCertificateFile /etc/ssl/certs/blog.wikimedia.org.pem - SSLCertificateKeyFile /etc/ssl/private/blog.wikimedia.org.key - SSLCACertificatePath /etc/ssl/certs/ - - <Directory /> - Options FollowSymLinks - AllowOverride None - </Directory> - <Directory /srv/org/wikimedia/blog/> - Options Indexes FollowSymLinks MultiViews - AllowOverride None - Order allow,deny - allow from all - - # For WordPress - RewriteEngine On - RewriteBase / - RewriteCond %{REQUEST_FILENAME} !-f - RewriteCond %{REQUEST_FILENAME} !-d - RewriteRule . /index.php [L] - - </Directory> - <Directory /srv/org/wikimedia/blog/wp-content/uploads/> - php_flag engine off - </Directory> - - 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 On - + ErrorLog /var/log/apache2/error.log + LogLevel warn + CustomLog /var/log/apache2/access.log combined + ServerSignature On </VirtualHost> + <VirtualHost *:81> ServerAdmin [email protected] ServerName techblog.wikimedia.org ServerAlias communityblog.wikimedia.org globalblog.wikimedia.org blog.wikimediafoundation.org - RewriteEngine On - RewriteRule ^/feed/(.*) http://blog.wikimedia.org/c/technology/feed/$1 [R=301] - RewriteRule ^/category/(.*) http://blog.wikimedia.org/c/$1 [R=301] - RewriteRule ^/20(.*) http://blog.wikimedia.org/20$1 [R=301] - RewriteRule ^/wp-content/(.*) http://blog.wikimedia.org/wp-content/$1 [R=301] - RewriteCond %{HTTP_HOST} ^communityblog.wikimedia.org - RewriteRule ^/$ http://blog.wikimedia.org/c/community/ [R=301] - RewriteCond %{HTTP_HOST} ^techblog.wikimedia.org - RewriteRule ^/$ http://blog.wikimedia.org/c/technology/ [R=301] - RewriteCond %{HTTP_HOST} ^globalblog.wikimedia.org - RewriteRule ^/$ http://blog.wikimedia.org/c/global/ [R=301] - RewriteCond %{HTTP_HOST} ^blog.wikimediafoundation.org - RewriteRule ^/$ http://blog.wikimedia.org/ [R=301] + + RewriteEngine On + RewriteRule ^/feed/(.*) http://blog.wikimedia.org/c/technology/feed/$1 [R=301] + RewriteRule ^/category/(.*) http://blog.wikimedia.org/c/$1 [R=301] + RewriteRule ^/20(.*) http://blog.wikimedia.org/20$1 [R=301] + RewriteRule ^/wp-content/(.*) http://blog.wikimedia.org/wp-content/$1 [R=301] + RewriteCond %{HTTP_HOST} ^communityblog.wikimedia.org + RewriteRule ^/$ http://blog.wikimedia.org/c/community/ [R=301] + RewriteCond %{HTTP_HOST} ^techblog.wikimedia.org + RewriteRule ^/$ http://blog.wikimedia.org/c/technology/ [R=301] + RewriteCond %{HTTP_HOST} ^globalblog.wikimedia.org + RewriteRule ^/$ http://blog.wikimedia.org/c/global/ [R=301] + RewriteCond %{HTTP_HOST} ^blog.wikimediafoundation.org + RewriteRule ^/$ http://blog.wikimedia.org/ [R=301] </VirtualHost> <VirtualHost *:443> ServerAdmin [email protected] ServerName techblog.wikimedia.org + ServerAlias blog.wikimediafoundation.org - SSLEngine on - SSLCertificateFile /etc/ssl/certs/techblog.wikimedia.org.pem - SSLCertificateKeyFile /etc/ssl/private/techblog.wikimedia.org.key - SSLCACertificatePath /etc/ssl/certs/ + SSLEngine on + SSLCertificateFile /etc/ssl/certs/techblog.wikimedia.org.pem + SSLCertificateKeyFile /etc/ssl/private/techblog.wikimedia.org.key + SSLCACertificatePath /etc/ssl/certs/ - ServerAlias blog.wikimediafoundation.org - RewriteEngine On - RewriteRule ^/feed/(.*) https://blog.wikimedia.org/c/technology/feed/$1 [R=301] - RewriteRule ^/category/(.*) https://blog.wikimedia.org/c/$1 [R=301] - RewriteRule ^/20(.*) https://blog.wikimedia.org/20$1 [R=301] - RewriteRule ^/wp-content/(.*) https://blog.wikimedia.org/wp-content/$1 [R=301] - RewriteCond %{HTTP_HOST} ^techblog.wikimedia.org - RewriteRule ^/$ https://blog.wikimedia.org/c/technology/ [R=301] - -</VirtualHost> \ No newline at end of file + RewriteEngine On + RewriteRule ^/feed/(.*) https://blog.wikimedia.org/c/technology/feed/$1 [R=301] + RewriteRule ^/category/(.*) https://blog.wikimedia.org/c/$1 [R=301] + RewriteRule ^/20(.*) https://blog.wikimedia.org/20$1 [R=301] + RewriteRule ^/wp-content/(.*) https://blog.wikimedia.org/wp-content/$1 [R=301] + RewriteCond %{HTTP_HOST} ^techblog.wikimedia.org + RewriteRule ^/$ https://blog.wikimedia.org/c/technology/ [R=301] +</VirtualHost> -- To view, visit https://gerrit.wikimedia.org/r/150688 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I157abf9d57a8ffd62691c2c014f33fcc63e9db6d Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Jgreen <[email protected]> Gerrit-Reviewer: Jgreen <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
