From 4569cae57f127afd093794310ccd290d2d9fdf36 Mon Sep 17 00:00:00 2001 From: Marius Burkard <m.burkard@pixcept.de> Date: Wed, 20 Apr 2016 10:58:46 -0400 Subject: [PATCH] Merge branch 'stable-3.1' --- server/conf/vhost.conf.master | 32 ++++++++++++++++++++++++++++---- 1 files changed, 28 insertions(+), 4 deletions(-) diff --git a/server/conf/vhost.conf.master b/server/conf/vhost.conf.master index bdfc761..230f089 100644 --- a/server/conf/vhost.conf.master +++ b/server/conf/vhost.conf.master @@ -1,3 +1,4 @@ +<tmpl_hook name='apache2_vhost:header'> <Directory {tmpl_var name='web_basedir'}/{tmpl_var name='domain'}> AllowOverride None @@ -9,8 +10,9 @@ </tmpl_if> </Directory> -<tmpl_loop name="vhosts"> +<tmpl_loop name='vhosts'> <VirtualHost {tmpl_var name='ip_address'}:{tmpl_var name='port'}> +<tmpl_hook name='apache2_vhost:vhost_header'> <tmpl_if name='php' op='==' value='suphp'> DocumentRoot <tmpl_var name='web_document_root'> </tmpl_else> @@ -284,7 +286,7 @@ ProcessLifeTime 3600 # MaxProcessCount 1000 DefaultMinClassProcessCount 0 - DefaultMaxClassProcessCount 100 + DefaultMaxClassProcessCount 10 IPCConnectTimeout 3 IPCCommTimeout 600 BusyTimeout 3600 @@ -393,16 +395,24 @@ <tmpl_if name="rewrite_enabled"> RewriteEngine on +<tmpl_if name='apache_version' op='>' value='2.2' format='version'> + RewriteEngine on + RewriteCond %{REQUEST_URI} ^/\.well-known/acme-challenge/ + RewriteRule ^ - [END] +</tmpl_if> <tmpl_if name='seo_redirect_enabled'> RewriteCond %{HTTP_HOST} <tmpl_var name='seo_redirect_operator'>^<tmpl_var name='seo_redirect_origin_domain'>$ [NC] - RewriteRule ^(.*)$ http<tmpl_if name='ssl_enabled'>s</tmpl_if>://<tmpl_var name='seo_redirect_target_domain'>$1 [R=301,L] + <tmpl_if name='apache_version' op='<' value='2.4' format='version'>RewriteCond %{REQUEST_URI} !^/\.well-known/acme-challenge/</tmpl_if> + RewriteRule ^(.*)$ http<tmpl_if name='ssl_enabled'>s</tmpl_if>://<tmpl_var name='seo_redirect_target_domain'>$1 [R=301,NE,L] </tmpl_if> <tmpl_loop name="alias_seo_redirects"> RewriteCond %{HTTP_HOST} <tmpl_var name='alias_seo_redirect_operator'>^<tmpl_var name='alias_seo_redirect_origin_domain'>$ [NC] - RewriteRule ^(.*)$ http<tmpl_if name='ssl_enabled'>s</tmpl_if>://<tmpl_var name='alias_seo_redirect_target_domain'>$1 [R=301,L] + <tmpl_if name='apache_version' op='<' value='2.4' format='version'>RewriteCond %{REQUEST_URI} !^/\.well-known/acme-challenge/</tmpl_if> + RewriteRule ^(.*)$ http<tmpl_if name='ssl_enabled'>s</tmpl_if>://<tmpl_var name='alias_seo_redirect_target_domain'>$1 [R=301,NE,L] </tmpl_loop> <tmpl_loop name="redirects"> RewriteCond %{HTTP_HOST} <tmpl_var name='rewrite_domain'>$ [NC] + <tmpl_if name='apache_version' op='<' value='2.4' format='version'>RewriteCond %{REQUEST_URI} !^/\.well-known/acme-challenge/</tmpl_if> <tmpl_if name="rewrite_is_url" op="==" value="n"> RewriteCond %{REQUEST_URI} !^/webdav/ RewriteCond %{REQUEST_URI} !^/php5-fcgi/ @@ -413,8 +423,10 @@ </tmpl_loop> <tmpl_if name='ssl_enabled'> +<tmpl_else> <tmpl_if name='rewrite_to_https' op='==' value='y'> RewriteCond %{HTTPS} off + <tmpl_if name='apache_version' op='<' value='2.4' format='version'>RewriteCond %{REQUEST_URI} !^/\.well-known/acme-challenge/</tmpl_if> RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} [R=301,L] </tmpl_if> </tmpl_if> @@ -444,5 +456,17 @@ </IfModule> <tmpl_var name='apache_directives'> +<tmpl_hook name='apache2_vhost:vhost_footer'> </VirtualHost> + +<tmpl_if name='apache_version' op='>=' value='2.4' format='version'> +<tmpl_if name='ssl_enabled'> +<IfModule mod_ssl.c> + SSLStaplingCache shmcb:/var/run/ocsp(128000) +</IfModule> +</tmpl_if> +</tmpl_if> + </tmpl_loop> + +<tmpl_hook name='apache2_vhost:footer'> -- Gitblit v1.9.1