Changeset 18694 for trunk/DataCheck/Setup

Timestamp:

12/18/16 23:46:07 (8 years ago)

Author:

Daniela Dorner

Message:

introduced usage of file for mysql pw to avoid warnings

Location:

trunk/DataCheck/Setup

Files:

• setup.fact.lp.data (modified) (1 diff)
• setup.fact.lp.gate (modified) (1 diff)

trunk/DataCheck/Setup/setup.fact.lp.data

@@ -53 +53 @@
 # dependencies of steps
 steps=$mars/resources/steps_fact.rc
-# file with db information
+# files with db information
 sqlrc=$mars/sql.rc
+sqlpw=/home/fact/.mysql.pw
 
 

trunk/DataCheck/Setup/setup.fact.lp.gate

@@ -12 +12 @@
 # set only variables which are needed for the scripts running on this machine
 
+# software
+export mars=/users/fact/SW.automatic.processing/Mars.svn.2014.05.26
+
 # logging and setup
-logpath=/users/fact/logs.automatic.processing/autologs
+user=`whoami`
+if [ "$user" == "www-data" ]
+then 
+   # processes called from the web
+   logpath=/home/factwww/logs.automatic.processing/autologs
+   # file with db information
+   sqlrc=/home/fact/sql.rc
+   sqlpw=/home/fact/.mysql.pw
+else
+   # normal processes called from the commandline or cron
+   logpath=/users/fact/logs.automatic.processing/autologs
+   # file with db information
+   sqlrc=$mars/sql.rc
+   sqlpw=/users/fact/.mysql.pw
+fi
 runlogpath=/users/fact/logs.automatic.processing/autologs
 
-export mars=/users/fact/SW.automatic.processing/Mars.svn.2014.05.26
-
-# file with db information
-sqlrc=$mars/sql.rc
-