Ryan Lane has uploaded a new change for review.
https://gerrit.wikimedia.org/r/74319
Change subject: Explicitly disable php for uploads directory
......................................................................
Explicitly disable php for uploads directory
Change-Id: Iee857dab35fc825f0873d761277649242b3fd06e
---
M templates/apache/sites/wikitech.wikimedia.org.erb
1 file changed, 28 insertions(+), 24 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/19/74319/1
diff --git a/templates/apache/sites/wikitech.wikimedia.org.erb
b/templates/apache/sites/wikitech.wikimedia.org.erb
index 81fa690..5586f2b 100644
--- a/templates/apache/sites/wikitech.wikimedia.org.erb
+++ b/templates/apache/sites/wikitech.wikimedia.org.erb
@@ -6,19 +6,19 @@
<VirtualHost *:80>
ServerAdmin [email protected]
- ServerName <%= controller_hostname %>
+ ServerName <%= controller_hostname %>
DocumentRoot /var/www
<Directory />
Options FollowSymLinks
AllowOverride None
</Directory>
- <Directory /var/www/>
- Options Indexes FollowSymLinks MultiViews
- AllowOverride None
- Order allow,deny
- allow from all
- </Directory>
+ <Directory /var/www/>
+ Options Indexes FollowSymLinks MultiViews
+ AllowOverride None
+ Order allow,deny
+ allow from all
+ </Directory>
RewriteEngine on
RewriteCond %{SERVER_PORT} !^443$
@@ -38,38 +38,42 @@
ServerAdmin [email protected]
ServerName <%= controller_hostname %>
- SSLEngine on
- SSLCertificateFile /etc/ssl/certs/<%= certificate %>.pem
- SSLCertificateKeyFile /etc/ssl/private/<%= certificate %>.key
+ SSLEngine on
+ SSLCertificateFile /etc/ssl/certs/<%= certificate %>.pem
+ SSLCertificateKeyFile /etc/ssl/private/<%= certificate %>.key
RedirectMatch ^/$ https://<%= controller_hostname %>/wiki/
RewriteEngine on
RewriteRule ^/view/(.*)$ https://<%= controller_hostname %>/wiki/$1
[L,R]
RewriteCond %{HTTP_HOST} !^<%= controller_hostname.gsub(%r[\.],'\\.')
%> [NC]
- RewriteRule ^/(.*) https://<%= controller_hostname %>/$1 [L,R]
+ RewriteRule ^/(.*) https://<%= controller_hostname %>/$1 [L,R]
DocumentRoot /var/www
<Directory />
Options FollowSymLinks
AllowOverride None
</Directory>
- <Directory /var/www/>
- Options Indexes FollowSymLinks MultiViews
- AllowOverride None
- Order allow,deny
- allow from all
- </Directory>
+ <Directory /var/www/>
+ Options Indexes FollowSymLinks MultiViews
+ AllowOverride None
+ Order allow,deny
+ allow from all
+ </Directory>
+ <Directory /srv/org/wikimedia/controller/wikis/images>
+ php_flag engine off
+ </Directory>
- Alias /w /srv/org/wikimedia/controller/wikis/w
- Alias /wiki /srv/org/wikimedia/controller/wikis/w/index.php
- Alias /dumps /a/backup/public
+ Alias /w/images /srv/org/wikimedia/controller/wikis/images
+ Alias /w /srv/org/wikimedia/controller/wikis/w
+ Alias /wiki /srv/org/wikimedia/controller/wikis/w/index.php
+ Alias /dumps /a/backup/public
<% if realm == "labs" %>
# Add additional wikis for development
- Alias /w2 /srv/org/wikimedia/controller/wikis/w2
- Alias /wiki2 /srv/org/wikimedia/controller/wikis/w2/index.php
- Alias /w3 /srv/org/wikimedia/controller/wikis/w3
- Alias /wiki3 /srv/org/wikimedia/controller/wikis/w3/index.php
+ Alias /w2 /srv/org/wikimedia/controller/wikis/w2
+ Alias /wiki2 /srv/org/wikimedia/controller/wikis/w2/index.php
+ Alias /w3 /srv/org/wikimedia/controller/wikis/w3
+ Alias /wiki3 /srv/org/wikimedia/controller/wikis/w3/index.php
<% end %>
--
To view, visit https://gerrit.wikimedia.org/r/74319
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iee857dab35fc825f0873d761277649242b3fd06e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ryan Lane <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
