From e715c955e18fa537418758d12bbc4c77ac87d0a6 Mon Sep 17 00:00:00 2001
From: Michael Hierweck <michael@hierweck.de>
Date: Sat, 26 May 2018 08:28:50 +0200
Subject: [PATCH 1/3] .htaccess: no indentation in output file.

---
 hsarback/src/de/hsadmin/mods/dom/htaccess.vm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

From 605701bb3f660c32dba778dddca1b0e57e7afc9e Mon Sep 17 00:00:00 2001
From: Michael Hierweck <michael@hierweck.de>
Date: Sat, 26 May 2018 08:34:07 +0200
Subject: [PATCH 2/3] apache-vhost: ServerAdmin should be webmaster@<domain>

---
 hsarback/src/de/hsadmin/mods/dom/apache-vhost.vm | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/hsarback/src/de/hsadmin/mods/dom/apache-vhost.vm b/hsarback/src/de/hsadmin/mods/dom/apache-vhost.vm
index f3d51c1..a1c89c3 100644
--- a/hsarback/src/de/hsadmin/mods/dom/apache-vhost.vm
+++ b/hsarback/src/de/hsadmin/mods/dom/apache-vhost.vm
@@ -46,9 +46,9 @@
     </Location>
 
 #if( ${php5} )
-	FcgidInitialEnv HTTP_PHP_BIN /usr/lib/cgi-bin/php5
-#end
+    FcgidInitialEnv HTTP_PHP_BIN /usr/lib/cgi-bin/php5
 
+#end
     RewriteEngine On
     RewriteOptions Inherit
 
@@ -79,7 +79,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}
     
@@ -119,15 +119,15 @@
     </Location>
 
     <Location /fastcgi-bin/>
-    PassengerEnabled Off
+        PassengerEnabled Off
         SetHandler fcgid-script
         Options +ExecCGI -Includes -Indexes -MultiViews +SymLinksIfOwnerMatch
     </Location>
     
 #if( ${php5} )
-	FcgidInitialEnv HTTP_PHP_BIN /usr/lib/cgi-bin/php5
-#end
+  FcgidInitialEnv HTTP_PHP_BIN /usr/lib/cgi-bin/php5
 
+#end
     RewriteEngine On
     RewriteOptions Inherit
     

From 89e321e3e8ac4c280890cc28871f17eeae01384c Mon Sep 17 00:00:00 2001
From: Michael Hierweck <michael@hierweck.de>
Date: Sat, 9 Jun 2018 11:51:46 +0200
Subject: [PATCH 3/3] MyySQL: GRANT WITH GRANT OPTION when updating db owner.

---
 .../src/de/hsadmin/mods/db/MySqlDatabaseProcessorFactory.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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;
 	}