Merge branch 'master' into LLM_connector

francelabs · Oct 22, 2024 · 0fdfa8d · 0fdfa8d
2 parents 2c061fc + 131b53a
commit 0fdfa8d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -113,7 +113,7 @@ May 16th, 2023
 #885 Propose SSD conf in install script for PostgreSQL
 
 #887 Redirect to asked resource on successful authentication
-#892 CVE-2022-42889 “Text4Shell” vulnerability
+#892 CVE-2022-42889 ???Text4Shell??? vulnerability
 #884 Provide a protected endpoint that performs a simple redirect
 
 #893 Keep persistence after a restart of Docker container for CE

diff --git a/datafari-tomcat/conf-datafari/mcf-postgres.properties b/datafari-tomcat/conf-datafari/mcf-postgres.properties
@@ -1,6 +1,6 @@
-HOST=localhost
-PORT=5432
-DATABASE=manifoldcf
-USER=postgres
+HOST=@POSTGRESQLHOSTNAME@
+PORT=@POSTGRESQLPORT@
+DATABASE=@POSTGRESQLDATABASE@
+USER=@POSTGRESQLUSERNAME@
 PASSWORD=@POSTGRESPASSWORD@
 TABLENAME=repohistory
diff --git a/linux/bin/init-datafari.sh b/linux/bin/init-datafari.sh
@@ -382,6 +382,12 @@ init_postgresql() {
   sed -i -e "s~@POSTGRESQLPORT@~${POSTGRESQL_PORT}~g" $MCF_HOME/properties-global.xml >>$installerLog 2>&1
   sed -i -e "s~@POSTGRESQLDATABASE@~${POSTGRESQL_DATABASE}~g" $MCF_HOME/properties-global.xml >>$installerLog 2>&1
   sed -i -e "s~@POSTGRESQLUSERNAME@~${POSTGRESQL_USERNAME}~g" $MCF_HOME/properties-global.xml >>$installerLog 2>&1
+
+  sed -i -e "s~@POSTGRESQLHOSTNAME@~${POSTGRESQL_HOSTNAME}~g" $TOMCAT_HOME/conf/mcf-postgres.properties >>$installerLog 2>&1
+  sed -i -e "s~@POSTGRESQLPORT@~${POSTGRESQL_PORT}~g" $TOMCAT_HOME/conf/mcf-postgres.properties >>$installerLog 2>&1
+  sed -i -e "s~@POSTGRESQLDATABASE@~${POSTGRESQL_DATABASE}~g" $TOMCAT_HOME/conf/mcf-postgres.properties >>$installerLog 2>&1
+  sed -i -e "s~@POSTGRESQLUSERNAME@~${POSTGRESQL_USERNAME}~g" $TOMCAT_HOME/conf/mcf-postgres.properties >>$installerLog 2>&1
+
 }
 
 init_password_postgresql() {