Improving preset.sql definitions

diff --git a/sql/preset.sql b/sql/preset.sql
index 0e8cb6786e08e0497f34dad15145cc4161c6997f..9758e5c12f791ba6616213b9c57959862afa55cd 100644 (file)
--- 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 bb7ae6157cc583361a30acecab9eb97270a10da2..079416d051944ed5e053ceeddc4aa1874aa1b6f1 100755 (executable)
--- 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