From 35727b04e330b323ace37d8a6de9d9b264dd7e96 Mon Sep 17 00:00:00 2001
From: Peter Hormanns <peter.hormanns@jalin.de>
Date: Thu, 07 Mar 2019 19:37:57 +0100
Subject: [PATCH] IPv6 changes

---
 hsarback/src/de/hsadmin/mods/dom/apache-vhost.vm |   32 ++++++++++++++++----------------
 1 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/hsarback/src/de/hsadmin/mods/dom/apache-vhost.vm b/hsarback/src/de/hsadmin/mods/dom/apache-vhost.vm
index ea1eb4c..7834096 100644
--- a/hsarback/src/de/hsadmin/mods/dom/apache-vhost.vm
+++ b/hsarback/src/de/hsadmin/mods/dom/apache-vhost.vm
@@ -1,9 +1,9 @@
-# 
+#
 # This file is managed by HSAdmin.
 # Do not edit manually. Changes will be overwritten.
 #
 
-<VirtualHost ${pac.curINetAddr.inetAddr}:80 ${pac.oldINetAddr.inetAddr}:80>
+<VirtualHost ${pac.curINetAddr.inet4Addr}:80 ${pac.oldINetAddr.inet4Addr}:80 ${pac.curINetAddr.inet6Addr}:80 ${pac.oldINetAddr.inet6Addr}:80>
     ServerName ${dom.name}
     ServerAlias ${dom.serveraliases}
     ServerAdmin webmaster@${dom.name}
@@ -59,8 +59,8 @@
 #end
     RewriteCond %{HTTP_HOST} ^(.+)\.${dom.name}\.?(:[0-9]+)?$ [novary]
     RewriteCond /home/doms/${dom.name}/subs/#[[${tolower:%1} ]]# -d
-    RewriteRule ^(.*) /home/doms/${dom.name}/subs/#[[${tolower:%1}$1 ]]# [last] 
-     
+    RewriteRule ^(.*) /home/doms/${dom.name}/subs/#[[${tolower:%1}$1 ]]# [last]
+
 #if( !${htdocsfallback} )
     RewriteCond %{REQUEST_URI} !^/cgi-bin/
     RewriteCond %{REQUEST_URI} !^/fastcgi-bin/
@@ -70,19 +70,19 @@
     RewriteCond %{HTTP_HOST} ^(.+)\.${dom.name}\.?(:80)?$ [novary]
     RewriteCond /home/doms/${dom.name}/subs/#[[${tolower:%1} ]]# !-d
     RewriteRule ^(.*) - [redirect=404,last]
-    
+
 #end
     AddType application/x-httpd-php .php .php5 .php4 .php3
     Action application/x-httpd-php /fastcgi-bin/phpstub
 </VirtualHost>
 
-<VirtualHost ${pac.curINetAddr.inetAddr}:443 ${pac.oldINetAddr.inetAddr}:443>
+<VirtualHost ${pac.curINetAddr.inet4Addr}:443 ${pac.oldINetAddr.inet4Addr}:443 ${pac.curINetAddr.inet6Addr}:443 ${pac.oldINetAddr.inet6Addr}:443>
     ServerName ${dom.name}
     ServerAlias ${dom.serveraliases}
     ServerAdmin webmaster@${dom.name}
 
     SuexecUserGroup ${dom.user.name} ${pac.name}
-    
+
     PassengerEnabled Off
     PassengerUser ${dom.user.name}
     PassengerGroup ${pac.name}
@@ -92,7 +92,7 @@
     SSLCertificateFile /etc/apache2/pems-enabled/${dom.name}.crt
     SSLCertificateKeyFile /etc/apache2/pems-enabled/${dom.name}.key
     SSLCertificateChainFile /etc/apache2/pems-enabled/${dom.name}.chain
-       
+
     DocumentRoot /home/doms/${dom.name}/htdocs-ssl
 
     Alias /cgi-bin/ /home/doms/${dom.name}/cgi-ssl/
@@ -123,23 +123,23 @@
         SetHandler fcgid-script
         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
     RewriteOptions Inherit
-    
+
     RewriteCond %{REQUEST_URI} !^/cgi-bin/
-    RewriteCond %{REQUEST_URI} !^/fastcgi-bin/    
+    RewriteCond %{REQUEST_URI} !^/fastcgi-bin/
 #if( ${letsencrypt} )
     RewriteCond %{REQUEST_URI} !^/.well-known/acme-challenge/
 #end
     RewriteCond %{HTTP_HOST} ^(.+)\.${dom.name}\.?(:[0-9]+)?$ [novary]
     RewriteCond /home/doms/${dom.name}/subs-ssl/#[[${tolower:%1} ]]# -d
-    RewriteRule ^(.*) /home/doms/${dom.name}/subs-ssl/#[[${tolower:%1}$1 ]]# [last] 
-          
+    RewriteRule ^(.*) /home/doms/${dom.name}/subs-ssl/#[[${tolower:%1}$1 ]]# [last]
+
 #if( !${htdocsfallback} )
     RewriteCond %{REQUEST_URI} !^/cgi-bin/
     RewriteCond %{REQUEST_URI} !^/fastcgi-bin/
@@ -149,7 +149,7 @@
     RewriteCond %{HTTP_HOST} ^(.+)\.${dom.name}\.?(:443)?$ [novary]
     RewriteCond /home/doms/${dom.name}/subs-ssl/#[[${tolower:%1} ]]# !-d
     RewriteRule ^(.*) - [redirect=404,last]
-    
+
 #end
     AddType application/x-httpd-php .php .php5 .php4 .php3
     Action application/x-httpd-php /fastcgi-bin/phpstub

--
Gitblit v1.9.0-SNAPSHOT