X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/8216c9239d3ddbca9c7b6f39c671fc3c4ff3df01..1b2a50a03b5beaf0d4f2e126bee875b6f66fc1bd:/cookbooks/mediawiki/templates/default/apache.erb

diff --git a/cookbooks/mediawiki/templates/default/apache.erb b/cookbooks/mediawiki/templates/default/apache.erb
index 0c9dd3f3c..16f97362d 100644
--- a/cookbooks/mediawiki/templates/default/apache.erb
+++ b/cookbooks/mediawiki/templates/default/apache.erb
@@ -30,7 +30,7 @@
   RedirectMatch 301 ^/api\.php$                   /w/api.php
   RedirectMatch 301 ^/opensearch_desc\.php$       /w/opensearch_desc.php
 
-  Alias /wiki <%= @mediawiki[:directory] %>/index.php
+  Alias /wiki <%= @directory %>/w/index.php
 
   #Support /pagename -> /wiki/pagename
   RewriteEngine on
@@ -51,18 +51,18 @@
     Require all granted
   </Directory>
 
-  <Directory <%= @mediawiki[:directory] %>/images/>
+  <Directory <%= @directory %>/w/images/>
     # No php execution in the upload area
     php_admin_flag engine off
     Options -ExecCGI -Includes -Indexes
     AllowOverride None
     AddType text/plain .html .htm .shtml
-<% if @mediawiki[:private] -%>
+<% if @private -%>
     Require all denied
 <% end -%>
   </Directory>
 
-  <Directory <%= @mediawiki[:directory] %>/images/thumb/>
+  <Directory <%= @directory %>/w/images/thumb/>
     RewriteEngine on
 
     RewriteCond %{REQUEST_FILENAME} !-f
@@ -82,15 +82,15 @@
     RewriteRule ^archive/[0-9a-f]/[0-9a-f][0-9a-f]/([^/]+)/([0-9]+)px-.*$ /w/thumb.php?f=$1&width=$2&archived=1 [L,QSA,B]
   </Directory>
 
-  <Directory <%= @mediawiki[:directory] %>/maintenance/>
+  <Directory <%= @directory %>/w/maintenance/>
     Require all denied
   </Directory>
 
-  <Files <%= @mediawiki[:directory] %>/LocalSettings.php>
+  <Files <%= @directory %>/w/LocalSettings.php>
     Require all denied
   </Files>
 
-  <Directory <%= @mediawiki[:directory] %>/cache/>
+  <Directory <%= @directory %>/w/cache/>
     Options -ExecCGI -Includes -Indexes
     AllowOverride None
     AddType text/plain .html .htm .shtml
@@ -109,7 +109,7 @@
     Require all denied
   </Files>
 </VirtualHost>
-<% if @mediawiki[:enable_ssl] -%>
+<% if @ssl_enabled -%>
 <VirtualHost *:443>
   ServerName <%= @name %>
 <% @aliases.each do |alias_name| -%>
@@ -142,7 +142,7 @@
   RedirectMatch 301 ^/api\.php$                   /w/api.php
   RedirectMatch 301 ^/opensearch_desc\.php$       /w/opensearch_desc.php
 
-  Alias /wiki <%= @mediawiki[:directory] %>/index.php
+  Alias /wiki <%= @directory %>/w/index.php
 
   #Support /pagename -> /wiki/pagename
   RewriteEngine on
@@ -163,17 +163,17 @@
     Require all granted
   </Directory>
 
-  <Directory <%= @mediawiki[:directory] %>/images/>
+  <Directory <%= @directory %>/w/images/>
     # No php execution in the upload area
     php_admin_flag engine off
     Options -ExecCGI -Includes -Indexes
     AllowOverride None
-<% if @mediawiki[:private] -%>
+<% if @private -%>
     Require all denied
 <% end -%>
   </Directory>
 
-  <Directory <%= @mediawiki[:directory] %>/images/thumb/>
+  <Directory <%= @directory %>/w/images/thumb/>
     RewriteEngine on
 
     RewriteCond %{REQUEST_FILENAME} !-f
@@ -185,22 +185,22 @@
     RewriteRule ^archive/[0-9a-f]/[0-9a-f][0-9a-f]/([^/]+)/([0-9]+)px-.*$ /w/thumb.php?f=$1&width=$2&archived=1 [L,QSA,B]
   </Directory>
 
-  <Directory <%= @mediawiki[:directory] %>/maintenance/>
+  <Directory <%= @directory %>/w/maintenance/>
     Require all denied
   </Directory>
 
-  <Files <%= @mediawiki[:directory] %>/LocalSettings.php>
+  <Files <%= @directory %>/w/LocalSettings.php>
     Require all denied
   </Files>
 
-  <Directory <%= @mediawiki[:directory] %>/images/>
+  <Directory <%= @directory %>/w/images/>
     Options -ExecCGI -Includes -Indexes
     AllowOverride None
     AddType text/plain .html .htm .shtml
     php_admin_flag engine off
   </Directory>
 
-  <Directory <%= @mediawiki[:directory] %>/cache/>
+  <Directory <%= @directory %>/w/cache/>
     Options -ExecCGI -Includes -Indexes
     AllowOverride None
     AddType text/plain .html .htm .shtml