From: Jean-Marc Pigeon <jmp@safe.c>
Date: Fri, 14 Nov 2025 11:56:06 +0000 (-0500)
Subject: Improving preset.sql definitions
X-Git-Tag: tag-0.17~33
X-Git-Url: https://jmp-git.ovh.safe.ca/?a=commitdiff_plain;h=81762a731ca7bb2d06dee9ebdfc68e55a53a7600;p=jmp%2Fmailleur

Improving preset.sql definitions
---

diff --git a/sql/preset.sql b/sql/preset.sql
index 0e8cb67..9758e5c 100644
--- a/sql/preset.sql
+++ b/sql/preset.sql
@@ -14,10 +14,10 @@
 /********************************************************/
 //root is the default preset admin
 INSERT INTO admins (email)
-	VALUES ('root@$DOMAINNAME');
+	VALUES (ROOTDOMAINNAME);
 
 //inserting the mail account
 INSERT INTO emails (email,password)
-	VALUES ('root','$RPASS');
+	VALUES ('root',RPASS);
 
 
diff --git a/support/do_database.sh b/support/do_database.sh
index bb7ae61..079416d 100755
--- a/support/do_database.sh
+++ b/support/do_database.sh
@@ -103,6 +103,7 @@ if [ -n "$MSQL" ] ; then
   echo "#--------------- Set Preset value ---------------" >> $SQLLOG
   cpp -P -D$DB_TYPE 							\
 	  -DDOMAINNAME=\'$DOMAINNAME\'					\
+	  -DROOTDOMAIN=\'root@$DOMAINAME\'				\
 	  -DRPASS=\'$RPASS\'						\
 	  /usr/share/$APPNAME/sql/preset.sql	| tee -a $SQLLOG | $MSQL
   echo "#--------------- Init Process Completed ---------" >> $SQLLOG