Preset.sql should be fine now

diff --git a/sql/preset.sql b/sql/preset.sql
index 9758e5c12f791ba6616213b9c57959862afa55cd..67601f397836c0139c81ae4218528a74fee1cd22 100644 (file)
--- a/sql/preset.sql
+++ b/sql/preset.sql
@@ -18,6 +18,6 @@ INSERT INTO admins (email)
 
 //inserting the mail account
 INSERT INTO emails (email,password)
-       VALUES ('root',RPASS);
+       VALUES (ROOTDOMAINNAME,RPASS);
 
 

diff --git a/support/do_database.sh b/support/do_database.sh
index 83e69f51c4ff4a8fba89e74dc8734f4a80dccac1..6107f372e3de3238e30eeb23d1403e97a2fcedbb 100755 (executable)
--- a/support/do_database.sh
+++ b/support/do_database.sh
@@ -101,10 +101,6 @@ if [ -n "$MSQL" ] ; then
   echo "#--------------- Create Database ----------------" >> $SQLLOG
   cpp -P -D$DB_TYPE /usr/share/$APPNAME/sql/$APPNAME.sql| tee -a $SQLLOG | $MSQL
   echo "#--------------- Set Preset value ---------------" >> $SQLLOG
-  echo "#--------------- DEBUG ---------------" >> $SQLLOG
-  echo "DOMAINNAME=<"$DOMAINNAME">"
-  echo "RPASS=<"$RPASS">"
-  echo "#--------------- DEBUG ---------------" >> $SQLLOG
   cpp -P -D$DB_TYPE                                                    \
          -DDOMAINNAME=\'$DOMAINNAME\'                                  \
          -DROOTDOMAINNAME=\'root@$DOMAINNAME\'                         \