[Mapbender-commits] r9994 - trunk/mapbender/resources/db

[svn_mapbender at osgeo.org]

Author: armin11
Date: 2018-11-07 08:45:43 -0800 (Wed, 07 Nov 2018)
New Revision: 9994

Modified:
   trunk/mapbender/resources/db/install_geoportal_mb28.sh
Log:
Some more fixes for install script

Modified: trunk/mapbender/resources/db/install_geoportal_mb28.sh
===================================================================
--- trunk/mapbender/resources/db/install_geoportal_mb28.sh	2018-11-07 15:10:59 UTC (rev 9993)
+++ trunk/mapbender/resources/db/install_geoportal_mb28.sh	2018-11-07 16:45:43 UTC (rev 9994)
@@ -689,7 +689,8 @@
 eval $wms_6_register_cmd
     #####################
 fi
-if [ $checkout_custom_svn = 'true' ] || [$checkout_mapbender_conf]; then
+
+if [ $checkout_custom_svn = 'true' ] || [$checkout_mapbender_conf = 'true']; then
     # override information in custom conf files 
     # mapbender.conf
     #####################
@@ -794,7 +795,19 @@
 #configure files for db connect: 
 #/data/portal/fileadmin/function/util.php
 #/data/portal/typo3conf/localconf.php
+if [ $configure_typo3 = 'true' ]; then
+	sed -i "s/%%TYPO3DB%%/${typo3_database_name}/g" ${installation_folder}conf/util.php
+	sed -i "s/%%TYPO3DBUSER%%/${typo3_database_user}/g" ${installation_folder}conf/util.php
+	sed -i "s/%%TYPO3DBPASSWORD%%/${typo3_database_password}/g" ${installation_folder}conf/util.php
 
+	cp ${installation_folder}conf/util.php ${installation_folder}portal/fileadmin/function/
+
+	sed -i "s/%%TYPO3DBUSER%%/${typo3_database_user}/g" ${installation_folder}conf/localconf.conf
+	sed -i "s/%%TYPO3DBPASSWORD%%/${typo3_database_password}/g" ${installation_folder}conf/localconf.conf
+
+	cp ${installation_folder}conf/localconf.conf ${installation_folder}portal/typo3conf/
+
+fi
 if [ $configure_apache = 'true' ]; then
 ############################################################
 # create apache configuration for mapbender