diff --git a/de/eoxserver_overview.rst b/de/eoxserver_overview.rst index 52f9c30..168ffc0 100644 --- a/de/eoxserver_overview.rst +++ b/de/eoxserver_overview.rst @@ -1,7 +1,7 @@ :Author: OSGeo-Live :Author: Stephan Meissl, Stephan Krause :Reviewer: Cameron Shorter, LISAsoft -:Version: osgeo-live6.5 +:Version: osgeo-live7.0 :License: Creative Commons Attribution 3.0 Unported (CC BY 3.0) :Translator: Frank Gasdorf, Stephan Meissl @@ -43,11 +43,11 @@ Kernfunktionen * Ansehen, Filtern, Auswählen und Herunterladen von Erdbeobachtungsdaten * Registrieren von Archiven von Erdbeobachtungsdaten * Administration via Web und Kommandozeile -* Zur Verfügung stellen von Daten über offene standardisierte Dienste des - Open Geospatial Consortium (OGC): +* Zur Verfügung stellen von Daten über :doc:`Open Geospatial Consortium (OGC) standards + <../standards/standards>`: - * Web Coverage Service (WCS) 1.0, 1.1 und 2.0 & vorgeschlagenes EO-WCS - * Web Map Service (WMS) & EO-WMS + * :doc:`Web Coverage Service (WCS) <../standards/wcs_overview>` 1.0, 1.1 und 2.0 & vorgeschlagenes EO-WCS + * :doc:`Web Map Service (WMS) <../standards/wms_overview>` & EO-WMS * Vorgeschlagene Erweiterungen für WCS wie: GeoTIFF-Codierung, vordefinierte Projektionen (CRSs), Skalierung und Interpolation. * Die unterstützen Protokolle sind: KVP und XML/POST (zusammen verwendet mit @@ -82,7 +82,7 @@ Details **Lizenz:** `MIT-style license `_ -**Software Version:** 0.2.3 +**Software Version:** 0.3.0 **Unterstützte Plattformen:** Linux, Windows, Mac diff --git a/de/eoxserver_quickstart.rst b/de/eoxserver_quickstart.rst index dc21940..fbe0af1 100644 --- a/de/eoxserver_quickstart.rst +++ b/de/eoxserver_quickstart.rst @@ -1,7 +1,7 @@ -:Author: OSGeo-Live +:Author: OSGeo-Live :Author: Stephan Meissl, Stephan Krause -:Reviewer: -:Version: osgeo-live6.5 +:Reviewer: Angelos Tzotsos +:Version: osgeo-live7.0 :License: Creative Commons Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0) :Translator: Stephan Meissl @@ -33,16 +33,26 @@ Dieses Quickstart beschreibt das: * Registrieren von Archiven von Erdbeobachtungsdaten unter Verwendung des in EOxServer eingebauten Administrationsklienten +.. contents:: Contents + Weiterführende Informationen finden Sie im :doc:`EOxServer Overview <../overview/eoxserver_overview>`, in der `lokalen EOxServer Dokumentation <../../eoxserver-docs/EOxServer_documentation.pdf>`_ oder der `online verfügbaren EOxServer Dokumentation `_. -.. contents:: Contents +.. image:: ../../images/screenshots/1024x768/eoxserver_documentation.png + :scale: 50 % + :alt: EOxServer Dokumentation Demonstrationsinstanz --------------------- +.. Commented since Tomcat isn't started automatically anymore (#1032). + Für den Fall, dass Sie OSGeoLive mit 1GB RAM oder weniger laufen lassen, ist es ratsam den default Tomcat Service vor dem Aufruf von EOxServer zu stoppen. + :: + + sudo service tomcat6 stop + Unter `Web Services` finden Sie ein mit `EOxServer` beschriftetes Symbol welches einen Browser startet der die Demonstrationsinstanz anzeigt. Diese ist unter http://localhost/eoxserver/ verfügbar und stellt dieselben Daten @@ -50,15 +60,7 @@ zur Verfügung wie die `online Demo `_ .. image:: ../../images/screenshots/1024x768/eoxserver_start.png :scale: 50 % - :alt: EOxServer Demonstration - -Unter `Web Services` finden Sie auch ein mit `EOxServer Documentation` -beschriftetes Symbol welches einen pdf Betrachter startet der die verfügbare -Dokumentation anzeigt. - -.. image:: ../../images/screenshots/1024x768/eoxserver_documentation.png - :scale: 50 % - :alt: EOxServer Dokumentation + :alt: Stat der EOxServer Demonstration Web Klient ~~~~~~~~~~ @@ -133,7 +135,7 @@ Administrationsklienten erkunden. Weiterführende Informationen liefert der :scale: 50 % :alt: EOxServer Demonstration des Administrationsklienten Beginn -Zum Beispiel ist es möglich die `EO Metadaten` der konfigurierten `Dataset +Zum Beispiel ist es möglich die `EO Metadaten Einträge` der konfigurierten `Dataset Series` anzuzeigen und zu ändern. .. image:: ../../images/screenshots/1024x768/eoxserver_adminclient3.png diff --git a/eoxserver_documentation.png b/eoxserver_documentation.png index 2afe10f..7bc6757 100644 Binary files a/eoxserver_documentation.png and b/eoxserver_documentation.png differ diff --git a/eoxserver_overview.rst b/eoxserver_overview.rst index f7a7668..1ac1f44 100644 --- a/eoxserver_overview.rst +++ b/eoxserver_overview.rst @@ -1,7 +1,7 @@ :Author: OSGeo-Live :Author: Stephan Meissl, Stephan Krause :Reviewer: Cameron Shorter, LISAsoft -:Version: osgeo-live6.5 +:Version: osgeo-live7.0 :License: Creative Commons Attribution 3.0 Unported (CC BY 3.0) .. image:: ../../images/project_logos/logo-eoxserver.png @@ -40,10 +40,12 @@ Core Features * View, filter, subset, and download EO data * Register EO data archives * Web based and command line administration interface -* Publish data via Open Geospatial Consortium (OGC) standards: +* Publish data via :doc:`Open Geospatial Consortium (OGC) standards + <../standards/standards>`: - * Web Coverage Service (WCS) 1.0, 1.1 and 2.0 & proposed EO-WCS - * Web Map Service (WMS) & EO-WMS + * :doc:`Web Coverage Service (WCS) <../standards/wcs_overview>` 1.0, 1.1 and + 2.0 & proposed EO-WCS + * :doc:`Web Map Service (WMS) <../standards/wms_overview>` & EO-WMS * Proposed extensions to WCS including: GeoTIFF encoding, predefined projections (CRSs), scaling, and interpolation. * Protocols supported are: KVP and XML/POST (used together with SOAP2POST @@ -75,7 +77,7 @@ Details **Licence:** `MIT-style license `_ -**Software Version:** 0.2.3 +**Software Version:** 0.3.0 **Supported Platforms:** Linux, Windows, Mac diff --git a/eoxserver_quickstart.rst b/eoxserver_quickstart.rst index 0f03c05..2fc6335 100644 --- a/eoxserver_quickstart.rst +++ b/eoxserver_quickstart.rst @@ -1,7 +1,7 @@ -:Author: OSGeo-Live +:Author: OSGeo-Live :Author: Stephan Meissl, Stephan Krause -:Reviewer: -:Version: osgeo-live6.5 +:Reviewer: Angelos Tzotsos +:Version: osgeo-live7.0 :License: Creative Commons Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0) .. image:: ../../images/project_logos/logo-eoxserver-2.png @@ -30,16 +30,26 @@ This Quick Start describes how to: * View, filter, subset, and download EO data via EOxServer's Web Client * Register EO data archives via EOxServer's Admin Client +.. contents:: Contents + See the :doc:`EOxServer Overview <../overview/eoxserver_overview>`, the `local EOxServer documentation <../../eoxserver-docs/EOxServer_documentation.pdf>`_, or the `online EOxServer documentation `_ for more information. -.. contents:: Contents +.. image:: ../../images/screenshots/1024x768/eoxserver_documentation.png + :scale: 50 % + :alt: EOxServer documentation Demonstration Instance ---------------------- +.. Commented since Tomcat isn't started automatically anymore (#1032). + In case you use OSGeoLive with 1GB RAM or less it is recommended to stop default Tomcat service before launching EOxServer + :: + + sudo service tomcat6 stop + The icon labeled `EOxServer` filed under `Web Services` launches a browser showing the demonstration instance available at http://localhost/eoxserver/ which provides the same data as the `one available online @@ -49,13 +59,6 @@ which provides the same data as the `one available online :scale: 50 % :alt: EOxServer demonstration start -The icon labeled `EOxServer Documentation` also filed under `Web Services` -launches a pdf viewer showing the available documentation. - -.. image:: ../../images/screenshots/1024x768/eoxserver_documentation.png - :scale: 50 % - :alt: EOxServer documentation - Web Client ~~~~~~~~~~ @@ -126,7 +129,7 @@ be found in the `operators' guide :scale: 50 % :alt: EOxServer demonstration admin client start -It is for example possible to view and alter the `EO Metadata` of the +It is for example possible to view and alter the `EO Metadata Entries` of the configured `Dataset Series`. .. image:: ../../images/screenshots/1024x768/eoxserver_adminclient3.png diff --git a/eoxserver_start.png b/eoxserver_start.png index ed02528..181e324 100644 Binary files a/eoxserver_start.png and b/eoxserver_start.png differ diff --git a/eoxserver_webclient1.png b/eoxserver_webclient1.png index 658e3d0..11850cd 100644 Binary files a/eoxserver_webclient1.png and b/eoxserver_webclient1.png differ diff --git a/eoxserver_webclient4.png b/eoxserver_webclient4.png index 3907cca..611a93c 100644 Binary files a/eoxserver_webclient4.png and b/eoxserver_webclient4.png differ diff --git a/install_eoxserver.sh b/install_eoxserver.sh index f2d4ba7..43df666 100755 --- a/install_eoxserver.sh +++ b/install_eoxserver.sh @@ -21,12 +21,16 @@ # ======= # sudo ./install_eoxserver.sh +SCRIPT="install_eoxserver.sh" echo "===============================================================" -echo "install_eoxserver.sh" +echo "$SCRIPT" echo "===============================================================" echo "Starting EOxServer installation" +# Set EOxServer version to install +EOXSVER="0.3.0" + if [ -z "$USER_NAME" ] ; then USER_NAME="user" fi @@ -48,7 +52,7 @@ fi apt-get -q update apt-get --assume-yes install gcc libgdal1-dev python-gdal libxml2 python-lxml \ python-libxml2 python-pip libproj0 libproj-dev libgeos-dev libgeos++-dev \ - cgi-mapserver python-mapscript libapache2-mod-wsgi + cgi-mapserver python-mapscript libapache2-mod-wsgi python-psycopg2 if [ $? -ne 0 ] ; then echo 'ERROR: Package install failed! Aborting.' @@ -62,16 +66,8 @@ fi cd "$TMP_DIR" -# Install Django using version 1.5 although its beta to have PostGIS 2.0 support -wget -c --progress=dot:mega -O Django-1.5b2.tar.gz \ - "https://www.djangoproject.com/download/1.5b2/tarball/" -tar -xzf Django-1.5b2.tar.gz -cd Django-1.5b2 -python setup.py install - - # Install EOxServer -pip install --upgrade --no-deps eoxserver==0.2.3 +pip install --upgrade --no-deps eoxserver=="$EOXSVER" # Create database for demonstration instance @@ -81,75 +77,101 @@ sudo -u $POSTGRES_USER psql eoxserver_demo -c 'create extension postgis;' # Create demonstration instance [ -d "$DATA_DIR" ] || mkdir -p "$DATA_DIR" + cd "$DATA_DIR" -chmod g+w . -chgrp users . +chmod -R g+w "$DATA_DIR" +chgrp -R users "$DATA_DIR" +adduser user users + if [ ! -d eoxserver_demonstration ] ; then echo "Creating EOxServer demonstration instance" eoxserver-admin.py create_instance eoxserver_demonstration + cd eoxserver_demonstration + # Configure database - DATA_DIR_ESCAPED=`echo $DATA_DIR | sed -e 's/\//\\\&/g'` - sed -e "s/'ENGINE': 'django.contrib.gis.db.backends.spatialite', # Use 'spatialite' or change to 'postgis'./'ENGINE': 'django.contrib.gis.db.backends.postgis',/" \ + sed -e "s/'ENGINE': .*/'ENGINE': 'django.contrib.gis.db.backends.postgis',/" \ -i eoxserver_demonstration/settings.py - sed -e "s/'NAME': '$DATA_DIR_ESCAPED\/eoxserver_demonstration\/eoxserver_demonstration\/data\/config.sqlite', # Or path to database file if using spatialite./'NAME': 'eoxserver_demo',/" \ + sed -e "s/'NAME': .*/'NAME': 'eoxserver_demo',/" \ -i eoxserver_demonstration/settings.py - sed -e "s/'USER': '', # Not used with spatialite./'USER': '$POSTGRES_USER',/" \ + sed -e "s/'USER': .*/'USER': '$POSTGRES_USER',/" \ -i eoxserver_demonstration/settings.py - sed -e "s/'PASSWORD': '', # Not used with spatialite./'PASSWORD': '$POSTGRES_USER',/" \ + sed -e "s/'PASSWORD': .*/'PASSWORD': '$POSTGRES_USER',/" \ -i eoxserver_demonstration/settings.py - sed -e "/#'TEST_NAME': '$DATA_DIR_ESCAPED\/eoxserver_demonstration\/eoxserver_demonstration\/data\/test-config.sqlite', # Required for certain test cases, but slower!/d" \ + sed -e "/#'TEST_NAME': .*/d" \ -i eoxserver_demonstration/settings.py - sed -e "s/'HOST': '', # Set to empty string for localhost. Not used with spatialite./'HOST': 'localhost',/" \ + sed -e "s/'HOST': .*/'HOST': 'localhost',/" \ -i eoxserver_demonstration/settings.py - sed -e "/'PORT': '', # Set to empty string for default. Not used with spatialite./d" \ + sed -e "/'PORT': .*/d" \ -i eoxserver_demonstration/settings.py + # Configure logging sed -e 's/#logging_level=/logging_level=INFO/' -i eoxserver_demonstration/conf/eoxserver.conf sed -e 's/DEBUG = True/DEBUG = False/' -i eoxserver_demonstration/settings.py + + # Further configuration + echo "ALLOWED_HOSTS = ['localhost']" >> eoxserver_demonstration/settings.py + # Initialize database python manage.py syncdb --noinput + # Download and register demonstration data wget -c --progress=dot:mega \ - "http://eoxserver.org/export/head/downloads/EOxServer_autotest-0.2.3.tar.gz" + "http://eoxserver.org/export/head/downloads/EOxServer_autotest-$EOXSVER.tar.gz" + echo "Extracting demonstration data in `pwd`." - tar -xzf EOxServer_autotest-0.2.3.tar.gz - mv EOxServer_autotest-0.2.3/data/fixtures/auth_data.json \ - EOxServer_autotest-0.2.3/data/fixtures/initial_rangetypes.json \ + tar -xzf EOxServer_autotest-$EOXSVER.tar.gz + chown -R root.root EOxServer_autotest-* + + mkdir -p eoxserver_demonstration/data/fixtures/ + mv EOxServer_autotest-$EOXSVER/data/fixtures/auth_data.json \ + EOxServer_autotest-$EOXSVER/data/fixtures/initial_rangetypes.json \ eoxserver_demonstration/data/fixtures/ + mkdir -p eoxserver_demonstration/data/meris/ - mv EOxServer_autotest-0.2.3/data/meris/README \ + mv EOxServer_autotest-$EOXSVER/data/meris/README \ eoxserver_demonstration/data/meris/ - mv EOxServer_autotest-0.2.3/data/meris/mosaic_MER_FRS_1P_RGB_reduced/ \ + mv EOxServer_autotest-$EOXSVER/data/meris/mosaic_MER_FRS_1P_RGB_reduced/ \ eoxserver_demonstration/data/meris/ - rm EOxServer_autotest-0.2.3.tar.gz - rm -r EOxServer_autotest-0.2.3/ + + rm EOxServer_autotest-$EOXSVER.tar.gz + rm -r EOxServer_autotest-$EOXSVER/ + python manage.py loaddata auth_data.json initial_rangetypes.json python manage.py eoxs_add_dataset_series --id MER_FRS_1P_RGB_reduced python manage.py eoxs_register_dataset \ --data-files "$DATA_DIR"/eoxserver_demonstration/eoxserver_demonstration/data/meris/mosaic_MER_FRS_1P_RGB_reduced/*.tif \ - --rangetype RGB --dataset-series MER_FRS_1P_RGB_reduced --visible=False + --rangetype RGB --dataset-series MER_FRS_1P_RGB_reduced --invisible + touch eoxserver_demonstration/logs/eoxserver.log chown www-data eoxserver_demonstration/logs/eoxserver.log sed -e 's,http_service_url=http://localhost:8000/ows,http_service_url=http://localhost/eoxserver/ows,' \ -i eoxserver_demonstration/conf/eoxserver.conf + # Collect static files python manage.py collectstatic --noinput + # Configure WSGI sed -e "s,^import os$,import os\nimport sys\n\npath = \"$DATA_DIR/eoxserver_demonstration/\"\nif path not in sys.path:\n sys.path.append(path)\n," \ -i eoxserver_demonstration/wsgi.py + chmod g+w -R . chgrp users -R . fi +#### final tidy up +sudo -u "$POSTGRES_USER" psql eoxserver_demo -c 'VACUUM ANALYZE;' + + + # Deploy demonstration instance in Apache echo "Deploying EOxServer demonstration instance" cat << EOF > "$APACHE_CONF" -Alias /static "$DATA_DIR/eoxserver_demonstration/eoxserver_demonstration/static" +Alias /eoxserver_demonstration_static "$DATA_DIR/eoxserver_demonstration/eoxserver_demonstration/static" Alias /eoxserver "$DATA_DIR/eoxserver_demonstration/eoxserver_demonstration/wsgi.py" -WSGIDaemonProcess eoxserver processes=10 threads=1 +WSGIDaemonProcess eoxserver processes=5 threads=1 AllowOverride None Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch @@ -186,6 +208,7 @@ Terminal=false StartupNotify=false EOF fi + cp /usr/share/applications/eoxserver.desktop "$USER_HOME/Desktop/" chown -R $USER_NAME.$USER_NAME "$USER_HOME/Desktop/eoxserver.desktop" @@ -193,13 +216,16 @@ chown -R $USER_NAME.$USER_NAME "$USER_HOME/Desktop/eoxserver.desktop" # EOxServer Documentation echo "Getting EOxServer documentation" [ -d "$DOC_DIR" ] || mkdir -p "$DOC_DIR" + cd "$DOC_DIR" chmod g+w . chgrp users . + wget -c --progress=dot:mega \ - "http://eoxserver.org/export/head/downloads/EOxServer_documentation-0.2.3.pdf" \ - -O EOxServer_documentation-0.2.3.pdf -ln -sf EOxServer_documentation-0.2.3.pdf EOxServer_documentation.pdf + "http://eoxserver.org/export/head/downloads/EOxServer_documentation-$EOXSVER.pdf" \ + -O EOxServer_documentation-$EOXSVER.pdf + +ln -sf EOxServer_documentation-$EOXSVER.pdf EOxServer_documentation.pdf chmod g+w -R EOxServer_documentation* chgrp users -R EOxServer_documentation* ln -sTf "$DOC_DIR" /var/www/eoxserver-docs @@ -230,7 +256,14 @@ chown -R $USER_NAME:$USER_NAME "$USER_HOME/Desktop/eoxserver-docs.desktop" # Uninstall dev packages apt-get --assume-yes remove libgdal1-dev libproj-dev libgeos-dev libgeos++-dev apt-get --assume-yes autoremove -rm -rf "$TMP_DIR"/Django-1.5b2.tar.gz "$TMP_DIR"/Django-1.5b2/ +# make symlinks for geotifs to common data dir so all projects can use them +mkdir -p /usr/local/share/data/raster +cd /usr/local/share/data/raster +ln -s "$DATA_DIR"/eoxserver_demonstration/eoxserver_demonstration/data/meris . -echo "Finished EOxServer installation" +echo "===============================================================" +echo "Finished $SCRIPT" +echo Disk Usage1:, $SCRIPT, `df . -B 1M | grep "Filesystem" | sed -e "s/ */,/g"`, date +echo Disk Usage2:, $SCRIPT, `df . -B 1M | grep " /$" | sed -e "s/ */,/g"`, `date` +echo "==============================================================="