X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/46d97368eb6034f2eb95d5a8400bd4bf6faf4ed2..b88d6ea0fa7181ba138ef249a9a4aac0ce77c8a3:/cookbooks/mediawiki/templates/default/apache.erb?ds=inline diff --git a/cookbooks/mediawiki/templates/default/apache.erb b/cookbooks/mediawiki/templates/default/apache.erb index dcded20cc..7aed4b3e7 100644 --- a/cookbooks/mediawiki/templates/default/apache.erb +++ b/cookbooks/mediawiki/templates/default/apache.erb @@ -1,6 +1,7 @@ # DO NOT EDIT - This file is being maintained by Chef +<% @ports.each do |port| -%> - +> ServerName <%= @name %> <% @aliases.each do |alias_name| -%> ServerAlias <%= alias_name %> @@ -8,8 +9,15 @@ ServerAdmin webmaster@openstreetmap.org +<% if port == 443 -%> + SSLEngine on + + CustomLog /var/log/apache2/<%= @name %>-secure-access.log combined + ErrorLog /var/log/apache2/<%= @name %>-secure-error.log +<% else -%> CustomLog /var/log/apache2/<%= @name %>-access.log combined ErrorLog /var/log/apache2/<%= @name %>-error.log +<% end -%> DocumentRoot <%= @directory %> @@ -20,6 +28,13 @@ php_value upload_max_filesize 70M php_value post_max_size 100M + RewriteCond %{SERVER_NAME} !=<%= @name %> +<% if port == 443 -%> + RewriteRule ^/(.*)$ https://<%= @name %>/$1 [R=permanent] +<% else -%> + RewriteRule ^/(.*)$ http://<%= @name %>/$1 [R=permanent] +<% end -%> + RedirectMatch 301 ^/$ /wiki/Main_Page #Historical Compatibility Links @@ -30,7 +45,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,19 +63,21 @@ > Options -Indexes -<% if node[:lsb][:release].to_f >= 14.04 -%> Require all granted -<% end -%> - /images/> + /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 -%> - /images/thumb/> + /w/images/thumb/> RewriteEngine on RewriteCond %{REQUEST_FILENAME} !-f @@ -80,174 +97,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] - /maintenance/> -<% if node[:lsb][:release].to_f >= 14.04 -%> - Require all denied -<% else -%> - Order allow,deny - Deny from all -<% end -%> - - - /LocalSettings.php> -<% if node[:lsb][:release].to_f >= 14.04 -%> - Require all denied -<% else -%> - Order allow,deny - Deny from all -<% end -%> - - - /images/> - Options -ExecCGI -Includes -Indexes - AllowOverride None - AddType text/plain .html .htm .shtml - php_admin_flag engine off - - - /cache/> - Options -ExecCGI -Includes -Indexes - AllowOverride None - AddType text/plain .html .htm .shtml - php_admin_flag engine off - - - -<% if node[:lsb][:release].to_f >= 14.04 -%> - Require all denied -<% else -%> - Order allow,deny - Deny from all -<% end -%> - - - -<% if node[:lsb][:release].to_f >= 14.04 -%> - Require all denied -<% else -%> - Order allow,deny - Deny from all -<% end -%> - - - -<% if node[:lsb][:release].to_f >= 14.04 -%> - Require all denied -<% else -%> - Order allow,deny - Deny from all -<% end -%> - - -<% if @mediawiki[:enable_ssl] -%> - - ServerName <%= @name %> -<% @aliases.each do |alias_name| -%> - ServerAlias <%= alias_name %> -<% end -%> - - ServerAdmin webmaster@openstreetmap.org - - SSLEngine on - - CustomLog /var/log/apache2/<%= @name %>-secure-access.log combined - ErrorLog /var/log/apache2/<%= @name %>-secure-error.log - - DocumentRoot <%= @directory %> - - php_admin_value open_basedir <%= @directory %>/:/usr/share/php/:/tmp/ - #php_admin_value disable_functions "exec,shell_exec,system,passthru,popen,proc_open" - php_value memory_limit 128M - php_value max_execution_time 240 - php_value upload_max_filesize 70M - php_value post_max_size 100M - - RedirectMatch 301 ^/$ /wiki/Main_Page - - #Historical Compatibility Links - RedirectMatch 301 ^/index\.php$ /w/index.php - RedirectMatch 301 ^/index\.php/(.*)$ /wiki/$1 - RedirectMatch 301 ^/skins/(.*)$ /w/skins/$1 - RedirectMatch 301 ^/images/(.*)$ /w/images/$1 - RedirectMatch 301 ^/api\.php$ /w/api.php - RedirectMatch 301 ^/opensearch_desc\.php$ /w/opensearch_desc.php - - Alias /wiki <%= @mediawiki[:directory] %>/index.php - - #Support /pagename -> /wiki/pagename - RewriteEngine on - RewriteCond %{REQUEST_URI} !^/w/ - RewriteCond %{REQUEST_URI} !^/wiki/ - RewriteCond %{REQUEST_URI} !^/index\.php - RewriteCond %{REQUEST_URI} !^/skins/ - RewriteCond %{REQUEST_URI} !^/images/ - RewriteCond %{REQUEST_URI} !^/api\.php$ - RewriteCond %{REQUEST_URI} !^/opensearch_desc\.php$ - RewriteCond %{REQUEST_URI} !^/server-status - RewriteCond %{LA-U:REQUEST_FILENAME} !-f - RewriteCond %{LA-U:REQUEST_FILENAME} !-d - RewriteRule ^/(.*) /wiki/$1 [R,L] - - > - Options -Indexes -<% if node[:lsb][:release].to_f >= 14.04 -%> - Require all granted -<% end -%> - - - /images/> - # 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 -%> - Require all denied -<% else -%> - Order allow,deny - Deny from all -<% end -%> -<% end -%> - - - /images/thumb/> - RewriteEngine on - - RewriteCond %{REQUEST_FILENAME} !-f - RewriteCond %{REQUEST_FILENAME} !-d - RewriteRule ^[0-9a-f]/[0-9a-f][0-9a-f]/([^/]+)/([0-9]+)px-.*$ /w/thumb.php?f=$1&width=$2 [L,QSA,B] - - RewriteCond %{REQUEST_FILENAME} !-f - RewriteCond %{REQUEST_FILENAME} !-d - 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] - - - /maintenance/> -<% if node[:lsb][:release].to_f >= 14.04 -%> + /w/maintenance/> Require all denied -<% else -%> - Order allow,deny - Deny from all -<% end -%> - /LocalSettings.php> -<% if node[:lsb][:release].to_f >= 14.04 -%> + /w/LocalSettings.php> Require all denied -<% else -%> - Order allow,deny - Deny from all -<% end -%> - /images/> - Options -ExecCGI -Includes -Indexes - AllowOverride None - AddType text/plain .html .htm .shtml - php_admin_flag engine off - - - /cache/> + /w/cache/> Options -ExecCGI -Includes -Indexes AllowOverride None AddType text/plain .html .htm .shtml @@ -255,30 +113,15 @@ -<% if node[:lsb][:release].to_f >= 14.04 -%> Require all denied -<% else -%> - Order allow,deny - Deny from all -<% end -%> -<% if node[:lsb][:release].to_f >= 14.04 -%> Require all denied -<% else -%> - Order allow,deny - Deny from all -<% end -%> -<% if node[:lsb][:release].to_f >= 14.04 -%> Require all denied -<% else -%> - Order allow,deny - Deny from all -<% end -%> <% end -%>