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

[svn_mapbender at osgeo.org]

Author: armin11
Date: 2018-12-11 08:21:04 -0800 (Tue, 11 Dec 2018)
New Revision: 10008

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-12-11 13:17:11 UTC (rev 10007)
+++ trunk/mapbender/resources/db/install_geoportal_mb28.sh	2018-12-11 16:21:04 UTC (rev 10008)
@@ -21,7 +21,7 @@
 # 
 ############################################################
 use_ssl="false"
-domain_name="localhost:8083"
+domain_name="192.168.56.101" #beware of using other ports here - some things will not work as expected
 not_proxy_hosts="localhost,127.0.0.1"
 ############################################################
 # 
@@ -179,6 +179,7 @@
     ############################################################
     # install needed debian packages
     ############################################################
+    apt-get update
     apt-get install -y php5-mysql libapache2-mod-php5 php5-pgsql php5-gd php5-curl php5-cli php-gettext g++ make bison bzip2 unzip zip gdal-bin cgi-mapserver php5-imagick mysql-server imagemagick locate postgresql postgis postgresql-9.4-postgis-2.1 mc zip unzip links w3m lynx arj xpdf dbview odt2txt ca-certificates oidentd gettext phppgadmin gkdebconf subversion subversion-tools php5-memcached php5-memcache php-apc curl
 fi
 # +655MB
@@ -224,17 +225,17 @@
 cd ${installation_folder}svn/
 
 if [ $checkout_typo3_svn = 'true' ]; then
-    svn co http://www.gdi-rp-dienste.rlp.de/svn/de-rp/data/portal
+    svn co -q http://www.gdi-rp-dienste.rlp.de/svn/de-rp/data/portal
 fi
 if [ $checkout_mapbender_svn = 'true' ]; then
-    svn co https://svn.osgeo.org/mapbender/trunk/mapbender
+    svn co -q https://svn.osgeo.org/mapbender/trunk/mapbender
 fi
 if [ $checkout_mapbender_conf = 'true' ]; then
     echo "checkout mapbender conf folder for geoportal ..."
-    svn co http://www.gdi-rp-dienste.rlp.de/svn/de-rp/data/conf
+    svn co -q http://www.gdi-rp-dienste.rlp.de/svn/de-rp/data/conf
 fi
 if  [ $checkout_custom_svn = 'true' ]; then
-	svn co $custom_svn_url
+	svn co -q $custom_svn_url
 fi
 ############################################################
 # adopt configuration files and copy them to right folder - if exists
@@ -519,7 +520,7 @@
 INSERT INTO gui_mb_group (fkey_gui_id, fkey_mb_group_id) VALUES ('admin_wfs_metadata', ${mapbender_subadmin_group_id});
 INSERT INTO gui_mb_group (fkey_gui_id, fkey_mb_group_id) VALUES ('admin_ows_scheduler', ${mapbender_subadmin_group_id});
 INSERT INTO gui_mb_group (fkey_gui_id, fkey_mb_group_id) VALUES ('admin_metadata', ${mapbender_subadmin_group_id});
-#INSERT INTO gui_mb_group (fkey_gui_id, fkey_mb_group_id) VALUES ('admin1', ${mapbender_subadmin_group_id});
+--INSERT INTO gui_mb_group (fkey_gui_id, fkey_mb_group_id) VALUES ('admin1', ${mapbender_subadmin_group_id});
 
 
 INSERT INTO gui_mb_group (fkey_gui_id, fkey_mb_group_id) VALUES ('Geoportal-RLP', ${mapbender_guest_group_id});
@@ -787,7 +788,7 @@
 
     #sed -i "s/%%INSTALLATIONFOLDER%%/$installation_folder/g" ${installation_folder}conf/mapbender.conf
     # copy conf files to right places
-    echo "copy mapbender.conf from ${installation_folder}/mapbender.conf to ${installation_folder}mapbender/conf/ ..."
+    echo "copy mapbender.conf from ${installation_folder}mapbender.conf to ${installation_folder}mapbender/conf/ ..."
     cp ${installation_folder}conf/mapbender.conf ${installation_folder}mapbender/conf/
     # alter other conf files
     sed -i "s#%%INSTALLATIONFOLDER%%#${installation_folder}#g" ${installation_folder}conf/geoportal.conf
@@ -956,19 +957,19 @@
         ServerAdmin $webadmin_email
         ReWriteEngine On
         RewriteRule ^/registry/wfs/([\d]+)\/?$ http://127.0.0.1/http_auth/http/index.php?wfs_id=$1 [P,L,QSA,NE]
-        RewriteRule ^/layer/(.*) http://%{SERVER_NAME}/mapbender/php/mod_showMetadata.php?resource=layer&languageCode=de&id=$1
-        RewriteRule ^/wms/(.*) http://%{SERVER_NAME}/mapbender/php/mod_showMetadata.php?resource=wms&languageCode=de&id=$1
-        RewriteRule ^/wmc/(.*) http://%{SERVER_NAME}/mapbender/php/mod_showMetadata.php?resource=wmc&languageCode=de&id=$1
-        RewriteRule ^/dataset/(.*) http://%{SERVER_NAME}/mapbender/php/mod_dataISOMetadata.php?outputFormat=iso19139&id=$1
+        RewriteRule ^/layer/(.*) http://%{HTTP_HOST}/mapbender/php/mod_showMetadata.php?resource=layer&languageCode=de&id=$1
+        RewriteRule ^/wms/(.*) http://%{HTTP_HOST}/mapbender/php/mod_showMetadata.php?resource=wms&languageCode=de&id=$1
+        RewriteRule ^/wmc/(.*) http://%{HTTP_HOST}/mapbender/php/mod_showMetadata.php?resource=wmc&languageCode=de&id=$1
+        RewriteRule ^/dataset/(.*) http://%{HTTP_HOST}/mapbender/php/mod_dataISOMetadata.php?outputFormat=iso19139&id=$1
         # for mobilemap2 api
         RewriteCond %{QUERY_STRING} ^(.*)wmcid(.*)$
-        RewriteRule /mapbender/extensions/mobilemap/map.php http://%{SERVER_NAME}/mapbender/extensions/mobilemap2/index.html?%1wmc_id%2
+        RewriteRule /mapbender/extensions/mobilemap/map.php http://%{HTTP_HOST}/mapbender/extensions/mobilemap2/index.html?%1wmc_id%2
         RewriteCond %{QUERY_STRING} ^(.*)layerid(.*)$
-        RewriteRule /mapbender/extensions/mobilemap/map.php https://%{SERVER_NAME}/mapbender/extensions/mobilemap2/index.html?%1layerid%2
+        RewriteRule /mapbender/extensions/mobilemap/map.php https://%{HTTP_HOST}/mapbender/extensions/mobilemap2/index.html?%1layerid%2
         # for digitizing module
         RewriteRule ^/icons/maki/([^/]+)/([^/]+)/([^[/]+).png$ http://127.0.0.1/mapbender/php/mod_getSymbolFromRepository.php?marker-color=$1&marker-size=$2&marker-symbol=$3 [P,L,QSA,NE]
 
-	# for typo3 installation
+#       For typo3 installation
         DocumentRoot ${installation_folder}portal
         <Directory />
                 Options FollowSymLinks