summaryrefslogtreecommitdiff
path: root/templates/vhosts/php_mediawiki/partial.erb
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2015-04-17 15:32:01 -0400
committerMicah Anderson <micah@riseup.net>2015-04-17 15:32:01 -0400
commit36fd84c3d17355afa05b519764c37a3e45efc40d (patch)
treec6f5dbc4651875a147607c788b37c5c973573330 /templates/vhosts/php_mediawiki/partial.erb
parentffa03fb9f13bcd78b7e22f47b224c5a7244328ef (diff)
parent8074127b8d8913314c90c3fe6131d078a858f7b6 (diff)
Merge remote-tracking branch 'immerda/master'
Diffstat (limited to 'templates/vhosts/php_mediawiki/partial.erb')
-rw-r--r--templates/vhosts/php_mediawiki/partial.erb11
1 files changed, 1 insertions, 10 deletions
diff --git a/templates/vhosts/php_mediawiki/partial.erb b/templates/vhosts/php_mediawiki/partial.erb
index cf30f5f..1ed6ee3 100644
--- a/templates/vhosts/php_mediawiki/partial.erb
+++ b/templates/vhosts/php_mediawiki/partial.erb
@@ -1,16 +1,7 @@
-<% if run_mode == 'fcgid' -%>
+<% if @run_mode == 'fcgid' -%>
RewriteEngine On
RewriteCond %{DOCUMENT_ROOT}/%{REQUEST_FILENAME} !-f
RewriteCond %{DOCUMENT_ROOT}/%{REQUEST_FILENAME} !-d
RewriteRule ^/?index.php/(.*)$ /index.php?title=$1 [PT,L,QSA]
<% end -%>
<%= scope.function_template(['apache/vhosts/php/partial.erb']) %>
- <Directory "<%= documentroot %>/typo3/">
- RewriteEngine on
-
- # Rewrite URLs to https that go for the admin area
- RewriteCond %{REMOTE_ADDR} !^127\.[0-9]+\.[0-9]+\.[0-9]+$
- RewriteCond %{HTTPS} !=on
- RewriteCond %{REQUEST_URI} (.*/typo3/.*)
- RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} [R]
- </Directory>