From a6297473fb9abdf423b18efe69ebfdbc05dd44de Mon Sep 17 00:00:00 2001
From: Peter Hormanns <peter.hormanns@jalin.de>
Date: Tue, 12 Jun 2018 17:09:03 +0200
Subject: [PATCH] configure PassengerLogFile

---
 .../de/hsadmin/mods/db/MySqlDatabaseProcessorFactory.java   | 2 +-
 hsarback/src/de/hsadmin/mods/dom/apache-vhost.vm            | 6 ++++--
 hsarback/src/de/hsadmin/mods/dom/htaccess.vm                | 4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/hsarback/src/de/hsadmin/mods/db/MySqlDatabaseProcessorFactory.java b/hsarback/src/de/hsadmin/mods/db/MySqlDatabaseProcessorFactory.java
index 1162139..a24635b 100644
--- a/hsarback/src/de/hsadmin/mods/db/MySqlDatabaseProcessorFactory.java
+++ b/hsarback/src/de/hsadmin/mods/db/MySqlDatabaseProcessorFactory.java
@@ -47,7 +47,7 @@ public class MySqlDatabaseProcessorFactory implements EntityProcessorFactory {
 		String aOwner = AbstractEntity.escapeString(db.getOwner());
 		JDBCProcessor aJDBCP = null;
 		aJDBCP = createMySqlAdminProcessor();
-		aJDBCP.addSQL("GRANT ALL ON " + aName + ".* TO '" + aOwner + "'@'%'");
+		aJDBCP.addSQL("GRANT ALL ON " + aName + ".* TO '" + aOwner + "'@'%' WITH GRANT OPTION");
 		return aJDBCP;
 	}
 
diff --git a/hsarback/src/de/hsadmin/mods/dom/apache-vhost.vm b/hsarback/src/de/hsadmin/mods/dom/apache-vhost.vm
index f3d51c1..4535542 100644
--- a/hsarback/src/de/hsadmin/mods/dom/apache-vhost.vm
+++ b/hsarback/src/de/hsadmin/mods/dom/apache-vhost.vm
@@ -14,6 +14,7 @@
     PassengerUser ${dom.user.name}
     PassengerGroup ${pac.name}
     PassengerAppRoot /home/doms/${dom.name}/app/
+    PassengerLogFile /var/log/apache2/passenger.log
 
     DocumentRoot /home/doms/${dom.name}/htdocs
 
@@ -79,7 +80,7 @@
 <VirtualHost ${pac.curINetAddr.inetAddr}:443 ${pac.oldINetAddr.inetAddr}:443>
     ServerName ${dom.name}
     ServerAlias ${dom.serveraliases}
-    ServerAdmin ${dom.user.name}@${dom.name}
+    ServerAdmin webmaster@${dom.name}
 
     SuexecUserGroup ${dom.user.name} ${pac.name}
     
@@ -87,6 +88,7 @@
     PassengerUser ${dom.user.name}
     PassengerGroup ${pac.name}
     PassengerAppRoot /home/doms/${dom.name}/app-ssl/
+    PassengerLogFile /var/log/apache2/passenger.log
 
     SSLEngine On
     SSLCertificateFile /etc/apache2/pems-enabled/${dom.name}.crt
@@ -119,7 +121,7 @@
     </Location>
 
     <Location /fastcgi-bin/>
-    PassengerEnabled Off
+        PassengerEnabled Off
         SetHandler fcgid-script
         Options +ExecCGI -Includes -Indexes -MultiViews +SymLinksIfOwnerMatch
     </Location>
diff --git a/hsarback/src/de/hsadmin/mods/dom/htaccess.vm b/hsarback/src/de/hsadmin/mods/dom/htaccess.vm
index 7c0da8b..626dd1a 100644
--- a/hsarback/src/de/hsadmin/mods/dom/htaccess.vm
+++ b/hsarback/src/de/hsadmin/mods/dom/htaccess.vm
@@ -1,5 +1,5 @@
 #if( ${www} )
-    Redirect permanent / https://www.${dom.name}/
+Redirect permanent / https://www.${dom.name}/
 #else
-    Redirect permanent / https://${dom.name}/
+Redirect permanent / https://${dom.name}/
 #end