From cee6ccc586ed8fbb72aa52ad779d2ddb3d085239 Mon Sep 17 00:00:00 2001
From: Peter Hormanns <peter.hormanns@jalin.de>
Date: Fri, 01 Mar 2019 13:18:09 +0100
Subject: [PATCH] prepare php7.3

---
 hsarback/src/de/hsadmin/mods/dom/apache-vhost.vm             |    4 ++--
 hsarback/src/de/hsadmin/mods/dom/DomainProcessorFactory.java |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/hsarback/src/de/hsadmin/mods/dom/DomainProcessorFactory.java b/hsarback/src/de/hsadmin/mods/dom/DomainProcessorFactory.java
index 90afa3a..e751143 100644
--- a/hsarback/src/de/hsadmin/mods/dom/DomainProcessorFactory.java
+++ b/hsarback/src/de/hsadmin/mods/dom/DomainProcessorFactory.java
@@ -275,7 +275,7 @@
 		ifOption(templateVars, query, "multiviews", "+MultiViews", "-MultiViews");
 		ifOption(templateVars, query, "htdocsfallback", Boolean.TRUE, Boolean.FALSE);
 		ifOption(templateVars, query, "letsencrypt", Boolean.TRUE, Boolean.FALSE);
-		ifOption(templateVars, query, "php5", Boolean.TRUE, Boolean.FALSE);
+		ifOption(templateVars, query, "phplatest", Boolean.TRUE, Boolean.FALSE);
 		final boolean isSetLetsencryptOption = templateVars.get("letsencrypt").equals(Boolean.TRUE);
 		final Processor domSetupProcessor = new CompoundProcessor(
 			isSetLetsencryptOption ? new NullProcessor() : new ShellProcessor("rm -f /etc/apache2/pems-generated/" + domName + ".crt"),
diff --git a/hsarback/src/de/hsadmin/mods/dom/apache-vhost.vm b/hsarback/src/de/hsadmin/mods/dom/apache-vhost.vm
index eb3d021..ea1eb4c 100644
--- a/hsarback/src/de/hsadmin/mods/dom/apache-vhost.vm
+++ b/hsarback/src/de/hsadmin/mods/dom/apache-vhost.vm
@@ -45,8 +45,8 @@
         Options +ExecCGI +IncludesNoExec -Indexes -MultiViews +SymLinksIfOwnerMatch
     </Location>
 
-#if( ${php5} )
-    FcgidInitialEnv HTTP_PHP_BIN /usr/lib/cgi-bin/php5.6
+#if( ${phplatest} )
+    FcgidInitialEnv HTTP_PHP_BIN /usr/lib/cgi-bin/php7.3
 
 #end
     RewriteEngine On

--
Gitblit v1.9.0-SNAPSHOT