[Mapbender-commits] r7096 - in trunk: documents/community mapbender/resources/db

[svn_mapbender at osgeo.org]

Author: arnulf
Date: 2010-11-07 06:18:58 -0800 (Sun, 07 Nov 2010)
New Revision: 7096

Modified:
   trunk/documents/community/flyer_osgeo_mapbender_de_A4.odp
   trunk/mapbender/resources/db/install.sh
Log:
added hints to install script, wording

Modified: trunk/documents/community/flyer_osgeo_mapbender_de_A4.odp
===================================================================
(Binary files differ)

Modified: trunk/mapbender/resources/db/install.sh
===================================================================
--- trunk/mapbender/resources/db/install.sh	2010-11-05 13:08:23 UTC (rev 7095)
+++ trunk/mapbender/resources/db/install.sh	2010-11-07 14:18:58 UTC (rev 7096)
@@ -6,22 +6,24 @@
 function show_disclaimer() {
     # Disclaimer
     echo ""
-    echo "The script will create a database for you and will import the Mapbender data to the new database"
-    echo "It will also compile the Mapbender.mo files"
+    echo "The script will create the database needed for Mapbender and enter the initial data"
+    echo "The script will also compile the Mapbender.mo files needed for multi language support."
     echo ""
-    echo "To run this script you have to set the following options"
+    echo "Before running this script make sure that:"
     # echo " * set the right to execute on this install script"
     # echo " * set the right to execute on mapbender/tools/i18n_update_mo.sh"
     # echo " * write access to mapbender/log"
     # echo " * write access to mapbender/http/tmp"
     # echo " * write access to mapbender/resources/locale/ and subdirectories"
-    echo " * provide a database user that is a superuser"
+    echo " * you have credentials for a PostgreSQL user with superuser privileges"
+    echo " * you know under which account the web server is running (on Debian Linux typically www-data)"
+    echo " * you know which group the web server user belongs (on Debian Linux typically www-data)"
     echo ""
     echo ""
     echo "If everything is prepared you can continue."
     echo "-------"
     echo ""
-    echo "You can give nearly all arguments on commandline:"
+    echo "You can also give all arguments on commandline using:"
     echo "$0 <HOST> <PORT> <DBNAME> <DBTEMPLATE> <DBUSER>"
     echo ""
     echo "e.g."
@@ -42,13 +44,13 @@
 
    #ask for database host
     echo ""
-    echo "database host (e.g. localhost)?"
+    echo "database host (Default: localhost)?"
     read DBHOST
 	: ${DBHOST:="localhost"}
 
    #ask for database port
     echo ""
-    echo "database port (e.g. 5432 for postgres)?"
+    echo "database port (Default: 5432 for postgres)?"
     read DBPORT
 	: ${DBPORT:="5432"}     
         
@@ -62,7 +64,7 @@
 
 	#ask for database template
         echo ""
-        echo "database template to use (just hit return for default template0)?"
+        echo "database template to use (Default: template0)?"
         read DBTEMPLATE
         : ${DBTEMPLATE:="template0"}
    
@@ -70,7 +72,7 @@
     echo "database user?"
     read DBUSER
 
-#using a password via commandline oder as shell var could lead to security problems, so we don't do it
+#using a password via commandline or as a shell variable could lead to security problems, so we don't do it
 #see  http://www.postgresql.org/docs/current/static/libpq-pgpass.html for a convenient way
 #    echo ""
 #    echo "Password for $DBUSER (will not be shown)?"
@@ -124,7 +126,7 @@
         exit 1;
     fi
     echo "Your password will be asked twice, this is normal (unless .pgpass is used)"
-    echo "creating database"
+    echo "creating database (this might take a while)"
     createdb -U $DBUSER  -h $DBHOST -p $DBPORT -E $DBENCODING $DBNAME -T $DBTEMPLATE
     cat pgsql/pgsql_schema_2.5.sql  \
       pgsql/$DBENCODING/pgsql_data_2.5.sql \
@@ -138,7 +140,7 @@
       pgsql/$DBENCODING/update/update_2.6.2_to_2.7rc1_pgsql_$DBENCODING.sql \
       pgsql/pgsql_serial_set_sequences_2.7.sql \
 	> _install.sql
-    echo "inserting data (this might take a few minutes)"
+    echo "inserting data (this might take a while longer)"
     psql -U $DBUSER -h $DBHOST -p $DBPORT -f _install.sql $DBNAME > log_schema.txt 2> error.log
     rm _install.sql
     echo ""
@@ -148,7 +150,7 @@
 	# creating mapbender.conf
 	if [ -f ../../conf/mapbender.conf ]
 	then
-	echo "mapbender.conf already exists, not changed"
+	echo "mapbender.conf already exists, not changed. Please check manually whether it needs to be updated!"
 	else
 
 	echo "Creating mapbender.conf..."
@@ -170,12 +172,14 @@
 }
 
 function set_permissions(){
-    echo "The installer can set the permissions to the files"
-    echo "and directory for you. If you want the installer to"
-    echo "do this please enter (y)es else (n)o"
-    echo "Please note, to do this you have to be"
-    echo "read write access to the Mapbender directory"
-    echo "set permissions, (y)es or (n)?"
+    echo "This installer can set the permissions of the Mapbender files "
+    echo "and directories for you. If you want the installer to proceed "
+    echo "please enter (y)es, otherwise (n)o."
+    echo ""
+    echo "Notice that you need write permission for the Mapbender"
+    echo "directory to do this."
+    echo ""
+    echo "Set permissions, (y)es or (n)?"
     read automatic
 
     if test $automatic != "n"
@@ -184,9 +188,9 @@
           read setowner
           if test $setowner != "n"
           then
-	        echo "Please specify the webserver user"
+	        echo "Please specify the webserver user (on Debian Linux typically www-data)"
 	        read webservuser
-	        echo "Please specify the webserver group"
+	        echo "Please specify the webserver group (on Debian Linux typically www-data)"
 	        read webservgroup
 
 	        chown -R $webservuser:$webservgroup ../../
@@ -253,6 +257,6 @@
 compile_po;
 
 echo ""
-echo "Finished...check the log and error files to see if an error occured.";
+echo "Finished...check the log and error files (./mapbender/log/*) to see if an error occured.";