Convert mediawiki_site to an LWRP

[chef.git] / cookbooks / mediawiki / templates / default / apache.erb

diff --git a/cookbooks/mediawiki/templates/default/apache.erb b/cookbooks/mediawiki/templates/default/apache.erb
index 40e206d1bbb9ae0c16e9ec2f0de5a4432ef46fd6..16f97362d9777c97e0f60b321d78d3cfebe9456a 100644 (file)
--- 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
@@ -48,16 +48,21 @@
 
   <Directory <%= @directory %>>
     Options -Indexes
+    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 @private -%>
+    Require all denied
+<% end -%>
   </Directory>
 
-  <Directory <%= @mediawiki[:directory] %>/images/thumb/>
+  <Directory <%= @directory %>/w/images/thumb/>
     RewriteEngine on
 
     RewriteCond %{REQUEST_FILENAME} !-f
@@ -77,24 +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/>
-    Order allow,deny
-    Deny from all
+  <Directory <%= @directory %>/w/maintenance/>
+    Require all denied
   </Directory>
 
-  <Files <%= @mediawiki[:directory] %>/LocalSettings.php>
-    Order allow,deny
-    Deny from all
+  <Files <%= @directory %>/w/LocalSettings.php>
+    Require all denied
   </Files>
 
-  <Directory <%= @mediawiki[:directory] %>/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
@@ -102,21 +98,18 @@
   </Directory>
 
   <Directory ~ "\.svn">
-    Order allow,deny
-    Deny from all
+    Require all denied
   </Directory>
 
   <Directory ~ "\.git">
-    Order allow,deny
-    Deny from all
+    Require all denied
   </Directory>
 
   <Files ~ "~$">
-    Order allow,deny
-    Deny from all
+    Require all denied
   </Files>
 </VirtualHost>
-<% if @mediawiki[:enable_ssl] -%>
+<% if @ssl_enabled -%>
 <VirtualHost *:443>
   ServerName <%= @name %>
 <% @aliases.each do |alias_name| -%>
@@ -149,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
@@ -167,16 +160,20 @@
 
   <Directory <%= @directory %>>
     Options -Indexes
+    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 @private -%>
+    Require all denied
+<% end -%>
   </Directory>
 
-  <Directory <%= @mediawiki[:directory] %>/images/thumb/>
+  <Directory <%= @directory %>/w/images/thumb/>
     RewriteEngine on
 
     RewriteCond %{REQUEST_FILENAME} !-f
@@ -188,24 +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/>
-    Order allow,deny
-    Deny from all
+  <Directory <%= @directory %>/w/maintenance/>
+    Require all denied
   </Directory>
 
-  <Files <%= @mediawiki[:directory] %>/LocalSettings.php>
-    Order allow,deny
-    Deny from all
+  <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
@@ -213,18 +208,15 @@
   </Directory>
 
   <Directory ~ "\.svn">
-    Order allow,deny
-    Deny from all
+    Require all denied
   </Directory>
 
   <Directory ~ "\.git">
-    Order allow,deny
-    Deny from all
+    Require all denied
   </Directory>
 
   <Files ~ "~$">
-    Order allow,deny
-    Deny from all
+    Require all denied
   </Files>
 </VirtualHost>
 <% end -%>