From c192d071280988095ab0c2c8cf71eba132cfe414 Mon Sep 17 00:00:00 2001
From: Valentin Deville <contact@valentin-deville.eu>
Date: Sat, 18 Feb 2017 13:07:25 +0100
Subject: [PATCH] Add environement variables in apache configuration

---
 conf/z-ocsinventory-server.conf | 10 +++++-----
 setup.sh                        | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/conf/z-ocsinventory-server.conf b/conf/z-ocsinventory-server.conf
index 3e8ab47..6ad0bf7 100644
--- a/conf/z-ocsinventory-server.conf
+++ b/conf/z-ocsinventory-server.conf
@@ -19,16 +19,16 @@
 
   # Master Database settings
   # Replace localhost by hostname or ip of MySQL server for WRITE
-  PerlSetEnv OCS_DB_HOST localhost
+  PerlSetEnv OCS_DB_HOST ${OCS_DBSERVER_WRITE}
   # Replace 3306 by port where running MySQL server, generally 3306
   PerlSetEnv OCS_DB_PORT 3306
   # Name of database
-  PerlSetEnv OCS_DB_NAME ocsweb
-  PerlSetEnv OCS_DB_LOCAL ocsweb
+  PerlSetEnv OCS_DB_NAME ${OCS_DBNAME}	
+  PerlSetEnv OCS_DB_LOCAL ${OCS_DBNAME}
   # User allowed to connect to database
-  PerlSetEnv OCS_DB_USER ocs
+  PerlSetEnv OCS_DB_USER ${OCS_DBUSER}
   # Password for user
-  PerlSetVar OCS_DB_PWD ocs
+  PerlSetVar OCS_DB_PWD ${OCS_DBPASS}
 
   # Slave Database settings
   # Replace localhost by hostname or ip of MySQL server for READ
diff --git a/setup.sh b/setup.sh
index a76fe60..038c87c 100644
--- a/setup.sh
+++ b/setup.sh
@@ -65,11 +65,11 @@ fi
 
 BASEPATH=$(cd -P -- "$(dirname -- "$0")" && pwd -P)
 #MODIFY APACHE CONFIGURATION
-sed -i -e "s/PerlSetEnv OCS_DB_HOST localhost/PerlSetEnv OCS_DB_HOST ${databaseServerWrite}/g" $BASEPATH/conf/z-ocsinventory-server.conf
-sed -i -e "s/PerlSetEnv OCS_DB_NAME ocsweb/PerlSetEnv OCS_DB_NAME ${databaseName}/g" $BASEPATH/conf/z-ocsinventory-server.conf
-sed -i -e "s/PerlSetEnv OCS_DB_LOCAL ocsweb/PerlSetEnv OCS_DB_LOCAL ${databaseName}/g" $BASEPATH/conf/z-ocsinventory-server.conf
-sed -i -e "s/PerlSetEnv OCS_DB_USER ocs/PerlSetEnv OCS_DB_USER ${databaseUser}/g" $BASEPATH/conf/z-ocsinventory-server.conf
-sed -i -e "s/PerlSetVar OCS_DB_PWD ocs/PerlSetVar OCS_DB_PWD ${databasePassword}/g" $BASEPATH/conf/z-ocsinventory-server.conf
+#sed -i -e "s/PerlSetEnv OCS_DB_HOST localhost/PerlSetEnv OCS_DB_HOST ${databaseServerWrite}/g" $BASEPATH/conf/z-ocsinventory-server.conf
+#sed -i -e "s/PerlSetEnv OCS_DB_NAME ocsweb/PerlSetEnv OCS_DB_NAME ${databaseName}/g" $BASEPATH/conf/z-ocsinventory-server.conf
+#sed -i -e "s/PerlSetEnv OCS_DB_LOCAL ocsweb/PerlSetEnv OCS_DB_LOCAL ${databaseName}/g" $BASEPATH/conf/z-ocsinventory-server.conf
+#sed -i -e "s/PerlSetEnv OCS_DB_USER ocs/PerlSetEnv OCS_DB_USER ${databaseUser}/g" $BASEPATH/conf/z-ocsinventory-server.conf
+#sed -i -e "s/PerlSetVar OCS_DB_PWD ocs/PerlSetVar OCS_DB_PWD ${databasePassword}/g" $BASEPATH/conf/z-ocsinventory-server.conf