Merge branch 'master' into 4.3.x

Author: giohappy

install/advanced/core/index.rst

@@ -160,8 +160,26 @@ At this point your command prompt shows a ``(geonode)`` prefix, this indicates t
   pip install -e . --upgrade
   pip install pygdal=="`gdal-config --version`.*"
 
+Edit ``/opt/geonode/celery-cmd``.
 
-.. _configure_dbs_core:
+.. code-block:: shell
+
+   CELERY__STATE_DB=${CELERY__STATE_DB:-"/opt/geonode/worker@%h.state"}
+
+Edit ``/opt/geonode/geonode/settings.py``.
+
+.. code-block:: python
+
+   FILE_UPLOAD_DIRECTORY_PERMISSIONS = 0o777
+   FILE_UPLOAD_PERMISSIONS = 0o777
+
+Edit ``/opt/geonode/uwsgi.ini``.
+
+.. code-block:: ini
+
+   chdir = /opt/geonode/
+
+   touch-reload = /opt/geonode/geonode/wsgi.py
 
 3. Postgis database Setup
 ^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -551,6 +569,24 @@ Let's now configure the ``JAVA_OPTS``, i.e. the parameters to run the Servlet Co
 
 .. warning:: The default options we are going to add to the Servlet Container, assume you can reserve at least ``4GB`` of ``RAM`` to ``GeoServer`` (see the option ``-Xmx4096m``). You must be sure your machine has enough memory to run both ``GeoServer`` and ``GeoNode``, which in this case means at least ``4GB`` for ``GeoServer`` plus at least ``2GB`` for ``GeoNode``. A total of at least ``6GB`` of ``RAM`` available on your machine. If you don't have enough ``RAM`` available, you can lower down the values ``-Xms512m -Xmx4096m``. Consider that with less ``RAM`` available, the performances of your services will be highly impacted.
 
+.. code-block:: shell
+
+   # Create the Logrotate config
+   sudo tee /etc/logrotate.d/geoserver <<EOF
+   /opt/data/geoserver_logs/geoserver.log
+   /opt/tomcat/apache-tomcat-*/logs/*.log
+   /opt/tomcat/apache-tomcat-*/logs/*.out
+   /opt/tomcat/apache-tomcat-*/logs/*.txt
+   {
+     copytruncate
+     daily
+     rotate 5
+     delaycompress
+     missingok
+     su tomcat tomcat
+   }
+   EOF
+
 Conifgure the Geofence DB
 ............................
 
@@ -744,6 +780,21 @@ Serving {“geonode”, “geoserver”} via NGINX
   sudo systemctl status geonode-uwsgi.service
   sudo systemctl enable geonode-uwsgi.service
 
+.. code-block:: shell
+
+   # Create the Logrotate config
+   sudo tee /etc/logrotate.d/uwsgi-geonode <<EOF
+   "/var/log/geonode.log" {
+     copytruncate
+     daily
+     rotate 5
+     delaycompress
+     missingok
+     notifempty
+     su root root
+   }
+   EOF
+
 .. code-block:: shell
 
   # Backup the original NGINX config
@@ -1006,7 +1057,7 @@ In particular the steps to do are:
         cd /opt/geonode
 
         # Update the GeoNode ip or hostname
-        PYTHONWARNINGS=ignore VIRTUAL_ENV=$VIRTUAL_ENV DJANGO_SETTINGS_MODULE=geonode.local_settings GEONODE_ETC=/opt/geonode/geonode GEOSERVER_DATA_DIR=/opt/data/geoserver_data TOMCAT_SERVICE="service tomcat9" APACHE_SERVICE="service nginx" geonode_updateip -l localhost -p www.example.org
+        PYTHONWARNINGS=ignore VIRTUAL_ENV=$VIRTUAL_ENV DJANGO_SETTINGS_MODULE=geonode.settings GEONODE_ETC=/opt/geonode/geonode GEOSERVER_DATA_DIR=/opt/data/geoserver_data TOMCAT_SERVICE="service tomcat9" APACHE_SERVICE="service nginx" geonode_updateip -l localhost -p www.example.org
 
 	exit
 
@@ -1022,14 +1073,14 @@ In particular the steps to do are:
 	# Add these to make available. Change user, password and server information to yours
 	export DATABASE_URL='postgresql://<postgresqluser>:<postgresqlpass>@localhost:5432/geonode'
 
-	#Close virtual environmetn and aopen it again to update variables
+	# Close virtual environment and aopen it again to update variables
 	deactivate
 	
 	workon geonode
         cd /opt/geonode
 
         # Update the GeoNode ip or hostname
-        DJANGO_SETTINGS_MODULE=geonode.local_settings python manage.py migrate_baseurl --source-address=http://localhost --target-address=http://www.example.org
+        DJANGO_SETTINGS_MODULE=geonode.settings python manage.py migrate_baseurl --source-address=http://localhost --target-address=http://www.example.org
 	
 .. note:: If at the end you get a "bad gateway" error when accessing your geonode site, check uwsgi log with ``sudo tail -f /var/log/geonode.log`` and if theres is an error related with port 5432 check the listening configuration from the postgresql server and allow the incoming traffic from geonode.
 
@@ -1214,6 +1265,21 @@ Daemonize and configure Celery
     [Install]
     WantedBy=multi-user.target
 
+.. code-block:: shell
+
+   # Create the Logrotate config
+   sudo tee /etc/logrotate.d/celery <<EOF
+   "/var/log/celery.log" {
+     copytruncate
+     daily
+     rotate 5
+     delaycompress
+     missingok
+     notifempty
+     su root root
+   }
+   EOF
+
 ----
 
 **Manage Celery**

usage/dashboard/img/create_dashboard.png

@@ -9,12 +9,17 @@ Dashboard is a MapStore tool integrated in GeoNode that provides the user with a
 * Interact spatially and analytically with the data by creating connections between widgets
 * Perform analysis on involved data/layers
 
-To build a new Dashboard go to :guilabel:`Add Resource` option on the resource page and choose option *Create dashboard*.
+To build a new Dashboard go to :guilabel:`Add Resource` option on the *All Resources* page and choose option *Create dashboard* or select :guilabel:`New` option on the *Dashboards* page
 
-.. figure:: img/new_dashboard.png
-    :align: center
+  .. figure:: img/create_dashboard_link.png
+      :align: center
 
-    *New Dashboard Apps option*
+      *Create dashboard from All Resources page*
+
+.. figure:: img/create_dashboard.png
+      :align: center
+
+      *Create dashboard from Dashboards page*
 
 Now you landed on the Dashboard edition page that is composed of the following sections:
 

usage/dashboard/img/create_dashboard_link.png

@@ -5,14 +5,16 @@ Data Types
 
 | GeoNode welcome page shows a variety of information about the current GeoNode instance.
 | You can explore the existing data using many search tools and filters (see :ref:`finding-data`) or through the links of the navigation bar at the top of the page.
-| There are three main types of resources that GeoNode can manage:
+| There are five main types of resources that GeoNode can manage:
 
-#. Documents
 #. Datasets
 #. Maps
+#. Documents
+#. GeoStories
+#. Dashboards
 
-Datasets and Documents can be accessed from the :guilabel:`Data` menu of the navigation bar.
-The :guilabel:`Maps` menu lets you filter only maps in the available resource. This applies to other existing menu items like :guilabel:`GeoStories`.
+
+Each resource type has its own menu and can be reached through :guilabel:`Datasets`, :guilabel:`Maps`, :guilabel:`Documents`, :guilabel:`GeoStories` and :guilabel:`Dashboards` buttons on the navigation bar
 
 .. note:: :guilabel:`GeoStories` and :guilabel:`Dashboards` In the screenshot below are GeoApp resouce types which are added by the client.
 
@@ -23,14 +25,6 @@ The :guilabel:`Maps` menu lets you filter only maps in the available resource. T
 
 .. _document-data-type:
 
-Documents
----------
-
-| GeoNode allows to publish tabular and text data and to manage metadata and associated documents.
-| Documents can be uploaded directly from your disk (see :ref:`uploading-documents` for further information).
-| The following documents types are allowed: `txt, .log, .doc, .docx, .ods, .odt, .sld, .qml, .xls, .xlsx, .xml, .bm, .bmp, .dwg, .dxf, .fif, .gif, .jpg, .jpe, .jpeg, .png, .tif, .tiff, .pbm, .odp, .ppt, .pptx, .pdf, .tar, .tgz, .rar, .gz, .7z, .zip, .aif, .aifc, .aiff, .au, .mp3, .mpga, .wav, .afl, .avi, .avs, .fli, .mp2, .mp4, .mpg, .ogg, .webm, .3gp, .flv, .vdo, .glb, .pcd, .gltf`.
-| Through the document detailed page is possible to view, download and manage a document.
-
 Datasets
 ------
 
@@ -47,9 +41,29 @@ Maps
 
 | Maps are a primary component of GeoNode.
 | Maps are comprised of various datasets and their styles. Datasets can be both local datasets in GeoNode as well as remote datasets either served from other WMS servers or by web service datasets such as Google or MapQuest.
-
 GeoNode maps also contain other information such as map zoom and extent, dataset ordering, and style.
 
 You can create a map based on uploaded datasets, combine them with some existing datasets and a remote web service dataset, share the resulting map for public viewing.
 Once the data has been uploaded, GeoNode lets the user search for it geographically or via keywords and create maps.
 All the datasets are automatically reprojected to web mercator for maps display, making it possible to use popular base maps such as `OpenStreetMap <https://www.openstreetmap.org>`_.
+
+Documents
+---------
+
+| GeoNode allows to publish tabular and text data and to manage metadata and associated documents.
+| Documents can be uploaded directly from your disk (see :ref:`uploading-documents` for further information).
+| The following documents types are allowed: `txt, .log, .doc, .docx, .ods, .odt, .sld, .qml, .xls, .xlsx, .xml, .bm, .bmp, .dwg, .dxf, .fif, .gif, .jpg, .jpe, .jpeg, .png, .tif, .tiff, .pbm, .odp, .ppt, .pptx, .pdf, .tar, .tgz, .rar, .gz, .7z, .zip, .aif, .aifc, .aiff, .au, .mp3, .mpga, .wav, .afl, .avi, .avs, .fli, .mp2, .mp4, .mpg, .ogg, .webm, .3gp, .flv, .vdo, .glb, .pcd, .gltf`.
+| Through the document detailed page is possible to view, download and manage a document.
+
+GeoStories
+---------
+
+| GeoStory is a MapStore tool integrated in GeoNode that provides the user a way to create inspiring and immersive stories by combining text, interactive maps, and other multimedia content like images and video or other third party contents. Through this tool you can simply tell your stories on the web and then publish and share them with different groups of GeoNode users or make them public to everyone around the world.
+
+Dashboard
+---------
+
+| Dashboard is a MapStore tool integrated in GeoNode that provides the user with a space to add many Widgets, such as charts, maps, tables, texts and counters, and can create connections between them in order to:
+| - Provide an overview to better visualize a specific data context
+| - Interact spatially and analytically with the data by creating connections between widgets
+| - Perform analysis on involved data/layers

usage/dashboard/index.rst

@@ -6,7 +6,7 @@ Finding Data
 | This section will guide you to navigate GeoNode to find datasets, maps and documents and other resource types by using different routes, filters and search functions.
 | On every page you can find some quick search tool.
 
-The *Search* box in the navigation bar (see the picture below) let you type a text and find all the data which have to deal with that text.
+The *Search* box in the navigation bar (see the picture below) let you type a text and find all the resource which have to deal with that text.
 
 .. figure:: img/search_tool.png
      :align: center
@@ -21,7 +21,7 @@ When you trigger a search you are brought to the *Search* page which shows you t
      *The Search page*
 
 | This page contains a wealth of options for customizing a search for various information on GeoNode. This search form allows for much more fine-tuned searches than the simple search box is available at the top of every page.
-| It is possible to search and filter data by Text, Types, Categories, Keywords, Owners, Regions or Extent.
+| It is possible to search and filter data by Text, Types, Categories, Keywords, Owners, Regions, Group, Limitations on public access, Date and Extent.
 
 Try to set some filter and see how the resulting data list changes accordingly. An interesting type of filter is *EXTENT*: you can apply a spatial filter by moving or zooming a map within a box as shown in the picture below.
 

usage/data/data_types.rst

@@ -6,12 +6,17 @@ GeoStory
 GeoStory is a MapStore tool integrated in GeoNode that provides the user a way to create inspiring and immersive stories by combining text, interactive maps, and other multimedia content like images and video or other third party contents.
 Through this tool you can simply tell your stories on the web and then publish and share them with different groups of GeoNode users or make them public to everyone around the world.
 
-To build a new GeoStory go to :guilabel:`Add Resource` option on the resource page and choose option *Create geostory*.
+To build a new GeoStory go to :guilabel:`Add Resource` option on the *All Resources* page and choose option *Create geostory* or select :guilabel:`New` option on the *Geostories* page
 
-.. figure:: img/new_geostory.png
-    :align: center
+  .. figure:: img/create_geostory_link.png
+      :align: center
 
-    *New GeoStory Apps option*
+      *Create geostory from All Resources page*
+
+.. figure:: img/create_geostory.png
+      :align: center
+
+      *Create geostory from Geostories page*
 
 Now you landed on the GeoStory edition page that is composed of the following sections:
 

usage/data/finding_data.rst

@@ -12,12 +12,11 @@ The :guilabel:`Edit` link in the menu of the *Dataset Page*  opens a list of opt
 
 In that options list, you can see three options listed as:
 
-1. *Edit Info*
-2. *Edit Data* 
-3. *Edit Styles* 
-4. *Edit Metadata*
-5. *Upload Style*
-6. *Upload Metadata*
+1. *Edit Data* 
+2. *Edit Styles* 
+3. *Edit Metadata*
+4. *Upload Style*
+5. *Upload Metadata*
 
 
 In this section you will learn how to edit a *Dataset*, and its data. See :ref:`dataset-metadata` to learn how to explore the dataset *Metadata*, how to upload and edit them. The *Styles* will be covered in a dedicated section, see :ref:`dataset-style`.

usage/data/img/data_menu.png

@@ -3,7 +3,7 @@
 Share Options
 =============
 
-In order to modify the Dataset *Share options* settings, on the detail page of the dataset click the :guilabel:`Share` link in the menu. By default only owners can edit and manage datasets, anyone can view them.
+In order to modify the Dataset *Share options* settings, on the detail page of the dataset click the :guilabel:`Share` link in the :guilabel:`Resource` menu. By default only owners can edit and manage datasets, anyone can view them.
 
 .. figure:: img/change_dataset_permissions.png
     :align: center

usage/data/img/ordering_data.png

@@ -6,12 +6,21 @@ Datasets Uploading
 | The most important resource type in GeoNode is the *Dataset*. A dataset represents spatial information so it can be displayed inside a map.
 | To better understand what we are talking about lets upload your first dataset.
 
-The *Dataset Uploading* page can be reached from the :guilabel:`Upload dataset` link of the :guilabel:`Add Resource` menu above the resources list page.
+It is possible to upload a *Datasets* in two ways:
 
-.. figure:: img/upload_dataset_link.png
+- From the :guilabel:`All Resources` page, by clicking *Add Resource* which displays a list including `Upload dataset` link:
+
+  .. figure:: img/upload_dataset_link.png
      :align: center
 
-     *Link for Datasets Uploading*
+     *Dataset Upload from All Resources page*
+
+- From the :guilabel:`Datasets` page, by clicking on *New* which displays a list including `Upload dataset` link:
+
+.. figure:: img/upload_dataset.png
+      :align: center
+
+      *Dataset Upload from Datasets page*
 
 The *Datasets Uploading* page looks like the one in the picture below.
 

usage/data/img/search_filter_by_extent.png

@@ -6,7 +6,7 @@ In this section you will learn how to add a new service and how to load resource
 
 Let's try it!
 
-Click on the :guilabel:`Remote Services` link of the :guilabel:`Add Resource` menu in the navigation bar.
+Click on the :guilabel:`Remote Services` link of the :guilabel:`New` menu in the navigation bar.
 
 .. figure:: img/remote_services_link.png
     :align: center

usage/data/img/search_page.png

@@ -79,23 +79,22 @@ As soon as a document is opened, the **Info** panel is shown. It reports the doc
     *Document Info*
 
 
-Through the :guilabel:`View`, it should look as follows.
- button it is possible to visualize the metadata of the document
+
+Selecting *View Metadata* from the :guilabel:`View` button it is possible to visualize the metadata of the document
 
 .. figure:: img/view_metadata.png
     :align: center
+    
     *Document Metadata*
 
-The :guilabel:`Share`, it should look as follows.
- link provides the document link to share.
+Under the :guilabel:`Resource` button, it is possible to select the *Share* option to provides the document link to share.
 
 .. figure:: img/document_sharing.png
     :align: center
 
     *Document Sharing*
 
-If you want to download the document, click on the :guilabel:`Download`, it should look as follows.
- link in the menu and the document will be downloaded automatically.
+If you want to download the document, click on the :guilabel:`Download` button and the document will be downloaded automatically.
 
 .. figure:: img/document_download.png
     :align: center

usage/data/img/search_tool.png

@@ -7,12 +7,21 @@ GeoNode allows to share reports, conceptual notes, posters, spreadsheets, etc. A
 
 .. warning:: Only authenticated users can upload data into GeoNode.
 
-*Documents* uploading is accessible by clicking *Create new* which displays a list including `upload document link`:
+It is possible to upload a *Documents* in two ways:
+
+- From the :guilabel:`All Resources` page, by clicking *Add Resource* which displays a list including `Upload document` link:
 
   .. figure:: img/upload_document_link.png
       :align: center
 
-      *Document Upload link*
+      *Document Upload from All Resources page*
+
+- From the :guilabel:`Documents` page, by clicking on *New* button.
+
+.. figure:: img/upload_document.png
+      :align: center
+
+      *Document Upload from Documents page*
 
 The *Document Upload* page looks like the one shown in the picture below.
 

usage/geostory/img/create_geostory.png

@@ -7,19 +7,26 @@ In this section, we’ll create a *Map* using some uploaded datasets, combine th
 
 In order to create new maps you can use:
 
-* The :guilabel:`Create map` listed after clicking the :guilabel:`Create new` link on the menu above the resources list page.
+* The :guilabel:`Create map` listed after clicking the :guilabel:`Add Resource` button on the *All Resources* list page.
 
   .. figure:: img/create_map_link.png
        :align: center
 
-       *The Create Map link*
+       *The Create Map from All Resources page*
+
+- The :guilabel:`New` button after clicking the :guilabel:`Maps` button on the menu bar.
+
+  .. figure:: img/new_map_link.png
+      :align: center
+
+      *The Create Map from Maps page*
 
 * The :guilabel:`Create map` link in the *Dataset Page* (it creates a map using a specific dataset)
 
   .. figure:: img/create_map_button.png
        :align: center
 
-       *The Create map link from dataset*
+       *The Create map from dataset*
 
 The new *Map* will open in a *Map Viewer* like the one in the picture below.