Fix probleme within starting.sh about RPASS

diff --git a/sql/preset.sql b/sql/preset.sql
index 9758e5c12f791ba6616213b9c57959862afa55cd..fc620817e2eace8263ac4b34d46e72faa99c6d95 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 ('root',RPA);
 
 

diff --git a/support/starting.sh b/support/starting.sh
index 534e860c05d9adcb93939f2c13f3092837f15b78..3ef7b2ebd7ffa241ed0c4ab9ae955ca005f4d50b 100755 (executable)
--- a/support/starting.sh
+++ b/support/starting.sh
@@ -184,8 +184,6 @@ case "$DB_TYPE" in
     ;;
   esac
 #extracting local configuration value
-export DOMAINNAME=`dnsdomainname`;
-export RPASS=`grep root /etc/shadow | cut -d':' -f2 |sed -e 's:\\\\$:\\\\\\\\$:g'`;
 }
 #----------------------------------------------------------------------
 #creating mailleur local certificat
@@ -244,6 +242,8 @@ fi
 #overiding some variable by local setting
 [ -f /etc/sysconfig/$APPNAME ] && . /etc/sysconfig/$APPNAME
 
+export DOMAINNAME=`dnsdomainname`;
+export RPASS=`grep root /etc/shadow | cut -d':' -f2 |sed -e 's:\\\\$:\\\\\\\\$:g'`;
 chk_config $1;
 do_mkconf $1;
 exit 0;