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

[svn_mapbender at osgeo.org]

Author: armin11
Date: 2018-11-07 07:10:59 -0800 (Wed, 07 Nov 2018)
New Revision: 9993

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

Modified: trunk/mapbender/resources/db/install_geoportal_mb28.sh
===================================================================
--- trunk/mapbender/resources/db/install_geoportal_mb28.sh	2018-11-07 11:08:12 UTC (rev 9992)
+++ trunk/mapbender/resources/db/install_geoportal_mb28.sh	2018-11-07 15:10:59 UTC (rev 9993)
@@ -95,6 +95,9 @@
 install_mapbender_database="true"
 install_typo3_database="true"
 ############################################################
+checkout_mapbender_conf="true"
+install_mapbender_conf="true"
+############################################################
 configure_mapbender="true"
 configure_typo3="true"
 configure_apache="true"
@@ -103,7 +106,7 @@
 ############################################################
 # other svn to checkout - installation specific
 ############################################################
-checkout_custom_svn="true"
+checkout_custom_svn="false"
 custom_svn_url="http://www.gdi-rp-dienste.rlp.de/svn/de-rp-landau/data"
 ############################################################
 # set some environment variables
@@ -188,7 +191,9 @@
 if [ $checkout_mapbender_svn = 'true' ]; then
     svn co https://svn.osgeo.org/mapbender/trunk/mapbender
 fi
-
+if [ $checkout_mapbender_conf = 'true' ]; then
+    svn co http://www.gdi-rp-dienste.rlp.de/svn/de-rp/data/conf
+fi
 if  [ $checkout_custom_svn = 'true' ]; then
 	svn co $custom_svn_url
 fi
@@ -236,6 +241,20 @@
     echo 'done.'
 fi
 ############################################################
+# compress and create typo3
+############################################################
+if [ $install_mapbender_conf = 'true' ]; then
+    cd ${installation_folder}svn/
+    tar -czf conf.tar.gz conf/
+    mv conf.tar.gz /tmp/
+    cd ${installation_folder}
+    mv /tmp/conf.tar.gz .
+    tar -xzf conf.tar.gz
+    svn info http://www.gdi-rp-dienste.rlp.de/svn/de-rp/data/conf | grep Revision | grep -Eo '[0-9]{1,}' > ${installation_folder}conf/lastinstalled
+    rm conf.tar.gz
+    echo 'done.'
+fi
+############################################################
 # compress and create custom conf files
 ############################################################
 if  [ $checkout_custom_svn = 'true' ]; then
@@ -260,8 +279,6 @@
     rm custom.tar.gz
     echo 'done.'
 fi
-
-
 ############################################################
 # cleanup .svn relicts
 ############################################################
@@ -348,7 +365,10 @@
 EOF
 #####################
 service postgresql restart
-
+#####################
+cp /etc/phppgadmin/config.inc.php /etc/phppgadmin/config.inc.php_geoportal_backup
+sed -i "s/conf\['extra_login_security'\] = true/conf\['extra_login_security'\] = false/g" /etc/phppgadmin/config.inc.php
+#####################
 sudo -u postgres psql -p $mapbender_database_port -d $mapbender_database_name -c 'CREATE SCHEMA mapbender'
 sudo -u postgres psql -p $mapbender_database_port -d $mapbender_database_name -c 'ALTER DATABASE mapbender SET search_path TO mapbender,public,pg_catalog,topology'
 #####################
@@ -654,7 +674,7 @@
 cat << EOF > ${installation_folder}mapbender/tools/monitorCapabilities.sh
 . /etc/profile
 cd ${installation_folder}mapbender/tools/
-[ -f /tmp/wmsmonitorlock ] && : || php5 ${installation_folder}mapbender/tools/mod_monitorCapabilities_main.php group:${mapbender_subadmin_group_id} > /dev/null
+[ -f /tmp/wmsmonitorlock ] && : || /usr/bin/php5 ${installation_folder}mapbender/tools/mod_monitorCapabilities_main.php group:${mapbender_subadmin_group_id} > /dev/null
 EOF
     #####################
     # register initial services for default and extended search GUIs
@@ -669,7 +689,7 @@
 eval $wms_6_register_cmd
     #####################
 fi
-if [ $checkout_custom_svn = 'true' ]; then
+if [ $checkout_custom_svn = 'true' ] || [$checkout_mapbender_conf]; then
     # override information in custom conf files 
     # mapbender.conf
     #####################
@@ -1033,7 +1053,7 @@
 ( crontab -l | grep -v -F "$croncmd5" ; echo "$cronjob5" ) | crontab -
 ############################################################
 # 6. run ows scheduler - to update ows capabilities
-croncmd6="php5 ${installation_folder}mapbender/tools/mod_runScheduler.php"
+croncmd6="/usr/bin/php5 ${installation_folder}mapbender/tools/mod_runScheduler.php"
 cronjob6="57 23 * * * $croncmd6"
 ( crontab -l | grep -v -F "$croncmd6" ; echo "$cronjob6" ) | crontab -
 ############################################################
@@ -1124,6 +1144,11 @@
         echo "Backup version of file exists - overwrite it with the original one"
         cp /etc/php5/cli/php.ini_geoportal_backup /etc/php5/cli/php.ini
 fi 
+if [ -e "/etc/phppgadmin/config.inc.php_geoportal_backup" ]; then
+        echo "Backup version of file exists - overwrite it with the original one"
+        cp  /etc/phppgadmin/config.inc.php_geoportal_backup /etc/phppgadmin/config.inc.php
+fi 
+
 rm *.tar.gz*
 rm *.sql
 rm -R ${installation_folder}cronjobs