Merge branch 'stapling_cache' into 'master'

context corrected



See merge request !560

Author: Till Brehm

install/tpl/apache_ispconfig.conf.master

@@ -4,7 +4,11 @@
 ServerTokens ProductOnly
 ServerSignature Off
 
-
+<tmpl_if name='apache_version' op='>=' value='2.4' format='version'>
+<IfModule mod_ssl.c>
+SSLStaplingCache shmcb:/var/run/ocsp(128000)
+</IfModule>
+</tmpl_if>
 
 ################################################
 # ISPConfig Logfile configuration for vlogger

server/conf/apache_ispconfig.conf.master

@@ -4,7 +4,11 @@
 ServerTokens ProductOnly
 ServerSignature Off
 
-
+<tmpl_if name='apache_version' op='>=' value='2.4' format='version'>
+<IfModule mod_ssl.c>
+SSLStaplingCache shmcb:/var/run/ocsp(128000)
+</IfModule>
+</tmpl_if>
 
 ################################################
 # ISPConfig Logfile configuration for vlogger

server/conf/vhost.conf.master

@@ -500,15 +500,6 @@
 <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'>