From 53400639bebead70aaae10cf713ee847bab43d56 Mon Sep 17 00:00:00 2001
From: "ncomputers.org" <contact@ncomputers.org>
Date: Sat, 18 Mar 2017 14:04:59 -0600
Subject: [PATCH] context corrected

---
 install/tpl/apache_ispconfig.conf.master | 6 +++++-
 server/conf/apache_ispconfig.conf.master | 6 +++++-
 server/conf/vhost.conf.master            | 9 ---------
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/install/tpl/apache_ispconfig.conf.master b/install/tpl/apache_ispconfig.conf.master
index 4721979d1e..3e414b4f4f 100644
--- a/install/tpl/apache_ispconfig.conf.master
+++ b/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
diff --git a/server/conf/apache_ispconfig.conf.master b/server/conf/apache_ispconfig.conf.master
index 4721979d1e..3e414b4f4f 100644
--- a/server/conf/apache_ispconfig.conf.master
+++ b/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
diff --git a/server/conf/vhost.conf.master b/server/conf/vhost.conf.master
index cab89e6eef..c8ead10334 100644
--- a/server/conf/vhost.conf.master
+++ b/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'>
-- 
GitLab