Add aggregate graph for API errors

[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 b37ec1b0c898f6aeadaa49ad2aa9cda391370ad1..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
 
   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
 
   #Support /pagename -> /wiki/pagename
   RewriteEngine on


@@ -48,28 +48,21 @@
 
   <Directory <%= @directory %>>
     Options -Indexes
 
   <Directory <%= @directory %>>
     Options -Indexes

-<% if node[:lsb][:release].to_f >= 14.04 -%>

     Require all granted
     Require all granted

-<% end -%>

   </Directory>
 
   </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
     # 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 node[:lsb][:release].to_f >= 14.04 -%>
+<% if @private -%>

     Require all denied
     Require all denied

-<% else -%>
-    Order allow,deny
-    Deny from all
-<% end -%>

 <% end -%>
   </Directory>
 
 <% end -%>
   </Directory>
 

-  <Directory <%= @mediawiki[:directory] %>/images/thumb/>
+  <Directory <%= @directory %>/w/images/thumb/>

     RewriteEngine on
 
     RewriteCond %{REQUEST_FILENAME} !-f
     RewriteEngine on
 
     RewriteCond %{REQUEST_FILENAME} !-f


@@ -89,25 +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>
 
     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/>
-<% if node[:lsb][:release].to_f >= 14.04 -%>
+  <Directory <%= @directory %>/w/maintenance/>

     Require all denied
     Require all denied

-<% else -%>
-    Order allow,deny
-    Deny from all
-<% end -%>

   </Directory>
 
   </Directory>
 

-  <Files <%= @mediawiki[:directory] %>/LocalSettings.php>
-<% if node[:lsb][:release].to_f >= 14.04 -%>
+  <Files <%= @directory %>/w/LocalSettings.php>

     Require all denied
     Require all denied

-<% else -%>
-    Order allow,deny
-    Deny from all
-<% end -%>

   </Files>
 
   </Files>
 

-  <Directory <%= @mediawiki[:directory] %>/cache/>
+  <Directory <%= @directory %>/w/cache/>

     Options -ExecCGI -Includes -Indexes
     AllowOverride None
     AddType text/plain .html .htm .shtml
     Options -ExecCGI -Includes -Indexes
     AllowOverride None
     AddType text/plain .html .htm .shtml


@@ -115,33 +98,18 @@
   </Directory>
 
   <Directory ~ "\.svn">
   </Directory>
 
   <Directory ~ "\.svn">

-<% if node[:lsb][:release].to_f >= 14.04 -%>

     Require all denied
     Require all denied

-<% else -%>
-    Order allow,deny
-    Deny from all
-<% end -%>

   </Directory>
 
   <Directory ~ "\.git">
   </Directory>
 
   <Directory ~ "\.git">

-<% if node[:lsb][:release].to_f >= 14.04 -%>

     Require all denied
     Require all denied

-<% else -%>
-    Order allow,deny
-    Deny from all
-<% end -%>

   </Directory>
 
   <Files ~ "~$">
   </Directory>
 
   <Files ~ "~$">

-<% if node[:lsb][:release].to_f >= 14.04 -%>

     Require all denied
     Require all denied

-<% else -%>
-    Order allow,deny
-    Deny from all
-<% end -%>

   </Files>
 </VirtualHost>
   </Files>
 </VirtualHost>

-<% if @mediawiki[:enable_ssl] -%>
+<% if @ssl_enabled -%>

 <VirtualHost *:443>
   ServerName <%= @name %>
 <% @aliases.each do |alias_name| -%>
 <VirtualHost *:443>
   ServerName <%= @name %>
 <% @aliases.each do |alias_name| -%>


@@ -174,7 +142,7 @@
   RedirectMatch 301 ^/api\.php$                   /w/api.php
   RedirectMatch 301 ^/opensearch_desc\.php$       /w/opensearch_desc.php
 
   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
 
   #Support /pagename -> /wiki/pagename
   RewriteEngine on


@@ -192,27 +160,20 @@
 
   <Directory <%= @directory %>>
     Options -Indexes
 
   <Directory <%= @directory %>>
     Options -Indexes

-<% if node[:lsb][:release].to_f >= 14.04 -%>

     Require all granted
     Require all granted

-<% end -%>

   </Directory>
 
   </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
     # No php execution in the upload area
     php_admin_flag engine off
     Options -ExecCGI -Includes -Indexes
     AllowOverride None

-<% if @mediawiki[:private] -%>
-<% if node[:lsb][:release].to_f >= 14.04 -%>
+<% if @private -%>

     Require all denied
     Require all denied

-<% else -%>
-    Order allow,deny
-    Deny from all
-<% end -%>

 <% end -%>
   </Directory>
 
 <% end -%>
   </Directory>
 

-  <Directory <%= @mediawiki[:directory] %>/images/thumb/>
+  <Directory <%= @directory %>/w/images/thumb/>

     RewriteEngine on
 
     RewriteCond %{REQUEST_FILENAME} !-f
     RewriteEngine on
 
     RewriteCond %{REQUEST_FILENAME} !-f


@@ -224,32 +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>
 
     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/>
-<% if node[:lsb][:release].to_f >= 14.04 -%>
+  <Directory <%= @directory %>/w/maintenance/>

     Require all denied
     Require all denied

-<% else -%>
-    Order allow,deny
-    Deny from all
-<% end -%>

   </Directory>
 
   </Directory>
 

-  <Files <%= @mediawiki[:directory] %>/LocalSettings.php>
-<% if node[:lsb][:release].to_f >= 14.04 -%>
+  <Files <%= @directory %>/w/LocalSettings.php>

     Require all denied
     Require all denied

-<% else -%>
-    Order allow,deny
-    Deny from all
-<% end -%>

   </Files>
 
   </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>
 
     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
     Options -ExecCGI -Includes -Indexes
     AllowOverride None
     AddType text/plain .html .htm .shtml


@@ -257,30 +208,15 @@
   </Directory>
 
   <Directory ~ "\.svn">
   </Directory>
 
   <Directory ~ "\.svn">

-<% if node[:lsb][:release].to_f >= 14.04 -%>

     Require all denied
     Require all denied

-<% else -%>
-    Order allow,deny
-    Deny from all
-<% end -%>

   </Directory>
 
   <Directory ~ "\.git">
   </Directory>
 
   <Directory ~ "\.git">

-<% if node[:lsb][:release].to_f >= 14.04 -%>

     Require all denied
     Require all denied

-<% else -%>
-    Order allow,deny
-    Deny from all
-<% end -%>

   </Directory>
 
   <Files ~ "~$">
   </Directory>
 
   <Files ~ "~$">

-<% if node[:lsb][:release].to_f >= 14.04 -%>

     Require all denied
     Require all denied

-<% else -%>
-    Order allow,deny
-    Deny from all
-<% end -%>

   </Files>
 </VirtualHost>
 <% end -%>
   </Files>
 </VirtualHost>
 <% end -%>