Fixed conflicts with master

GeoNode · Jan 10, 2018 · 6e3d1af · 6e3d1af
2 parents b61e6fa + 5cd4062
commit 6e3d1af
Show file tree

Hide file tree

Showing 178 changed files with 6,345 additions and 3,575 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1,6 @@
+geonode/uploaded
+geonode/qgis_layer
+geonode/qgis_tiles
+docs
+.coverage
+.celerybeat-*
diff --git a/.gitignore b/.gitignore
@@ -82,6 +82,7 @@ geonode/qgis_tiles
 #Testing output
 .coverage
 .noseids
+.cache
 geonode_test_data/
 nosetests.xml
 geonode/static/geonode/junit.xml
@@ -129,3 +130,7 @@ geonode/contrib/monitoring/frontend/node_modules
 geonode/contrib/monitoring/frontend/static
 # celery files
 celerybeat-schedule.*
+
+geonode\.tests\.bdd\.e2e\.test_login/
+
+*.log
diff --git a/.travis.yml b/.travis.yml
@@ -32,6 +32,8 @@ branches:
 
 before_install:
   - scripts/misc/qgis_server_setup.sh before_install
+  - chmod +x scripts/misc/bdd_setup.sh
+  - scripts/misc/bdd_setup.sh before_install
 
 install:
   - sudo apt-get -qq -y update
@@ -50,11 +52,12 @@ install:
 before_script:
   # For QGIS Server Travis steps
   - scripts/misc/qgis_server_setup.sh before_script
+  - scripts/misc/bdd_setup.sh before_script
 
   - paver setup
 
 script:
-  - paver run_tests --coverage
+  - paver run_tests --coverage --local false
 
 after_script:
   # For QGIS Server Travis steps

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -11,7 +11,7 @@ services:
      image: rabbitmq
 
   django:
-    image: geonode/django
+    image: geonode/geonode:geonode
     links:
       - postgres
       - elasticsearch
@@ -21,7 +21,7 @@ services:
       - ./scripts/docker/env/production/django.env
 
   celery:
-    image: geonode/django
+    image: geonode/geonode:geonode
     links:
       - rabbitmq
       - postgres
@@ -31,7 +31,7 @@ services:
       - ./scripts/docker/env/production/django.env
 
   consumers:
-    image: geonode/django
+    image: geonode/geonode:geonode
     links:
       - rabbitmq
       - postgres

diff --git a/docs/tutorials/admin/admin_mgmt_commands/index.txt b/docs/tutorials/admin/admin_mgmt_commands/index.txt
@@ -245,3 +245,20 @@ Usage::
 
   # synchronize all layers which contain a given search string in their name
   python manage.py sync_geofence --layername cambridge
+
+
+find_geoserver_broken_layers
+============================
+
+Find GeoNode layers with a missing GeoServer resource.
+
+Usage::
+
+  # search the whole catalog
+  python manage.py find_geoserver_broken_layers
+
+  # search all layers which contain a given search string in their name and owned by a given user
+  python manage.py sync_geofence --layername cambridge  --owner bob
+
+  # remove layers which are broken
+  python manage.py find_geoserver_broken_layers --remove
diff --git a/docs/tutorials/admin/geoserver_geonode_security/index.txt b/docs/tutorials/admin/geoserver_geonode_security/index.txt
@@ -529,6 +529,14 @@ Setup of the GeoNode REST Role Service
 
     Once everything has been setup and it is working, choose the ``Administrator role`` and ``Group administrator role`` as ``ROLE_ADMIN``
 
+Allow GeoFence to validate rules with ``ROLES``
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. warning:: The following instruction are different accordingly to the GeoServer version you are currently using.
+
+GeoServer 2.9.x and 2.10.x
+--------------------------
+
 #. Access the ``Security`` > ``Settings`` section
 
     .. figure:: img/oauth011.png
@@ -537,6 +545,19 @@ Setup of the GeoNode REST Role Service
 
     .. figure:: img/oauth012.png
 
+GeoServer 2.12.x and above
+--------------------------
+
+With the latest updates to GeoFence Plugin, the latter no more recognizes the Role Service from the default settings but from the ``geofence-server.properties`` file.
+
+That said, it is important that the ``Security`` > ``Settings`` role service will be set to **default**, in order to allow GeoServer following the standard authorization chain.
+
+On the other side, you will need to be sure that the ``geofence-server.properties`` file under the ``$GEOSERVER_DATA_DIR/geofence`` folder, contains the two following additional properties: ::
+
+    gwc.context.suffix=gwc
+    org.geoserver.rest.DefaultUserGroupServiceName=geonode REST role service
+
+
 Setup of the GeoServer OAuth2 Authentication Filter
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 

diff --git a/docs/tutorials/install_and_admin/geonode_install/all_together.txt b/docs/tutorials/install_and_admin/geonode_install/all_together.txt
@@ -4,192 +4,17 @@
 Finish installation
 ===================
 
-In previous sections you've setup all the applications we need to run GeoNode.
-
-In this section we are going to `glue` all the pieces together and finalize GeoNode
-setup.
-
-GeoNode Configuration
-=====================
-
-Now that all applications have been configured we are going to instruct GeoNode on
-how to connect to `PostgreSQL` and `GeoServer`. Also we are going to instruct GeoNode
-on who is allowed to connect to it.
-
-First navigate to geonode configuration folder::
-
-    cd /home/geonode/geonode/geonode/
-
-Copy the `local_settings.py` sample file called `local_settings.py.geoserver.sample`::
-
-    sudo cp local_settings.py.geoserver.sample local_settings.py
-
-Then edit the configuration file::
-
-    sudo gedit local_settings.py
-
-Add the `ALLOWED_HOSTS` and `PROXY_ALLOWED_HOSTS` variables at the top with the
-following values::
-
-    ALLOWED_HOSTS = ['127.0.0.1', 'localhost', '::1']
-    PROXY_ALLOWED_HOSTS = ("127.0.0.1", 'localhost', '::1')
-
-Add the `POSTGIS_VERSION` variable matching your PostGIS version::
-
-    POSTGIS_VERSION = (2, 2, 1)
-
-This will instruct GeoNode to listen on connections from your local machine.
-
-Change the value of the `SITEURL` to your server's host name::
-
-    SITEURL = "http://<host>/"
-
-Now configure database access:
-Uncomment the `ENGINE`: `django.contrib.gis.db.backends.postgis` line
-and comment the one with empty `ENGINE` variable. Also set the `NAME` variable to
-`geonode_data`::
-
-    DATABASES = {
-    'default': {
-    ...
-    },
-    'datastore' : {
-        'ENGINE': 'django.contrib.gis.db.backends.postgis',
-        #'ENGINE': '', # Empty ENGINE name disables,
-        'NAME': 'geonode_data',
-        ...
-    }
-
-Then configure GeoServer location:
-Change the value of the `LOCATION` and `PUBLIC_LOCATION` variables as follows,
-also set the `DATASTORE` variable to `datastore`::
-
-    OGC_SERVER = {
-        'default' : {
-        ...
-        'LOCATION' : 'http://localhost/geoserver/',
-        'PUBLIC_LOCATION' : 'http://localhost/geoserver/',
-        ...
-        'DATASTORE': 'datastore',
-    }
-
-The resulting configuration file should look like this::
-
-    import os
-
-    PROJECT_ROOT = os.path.abspath(os.path.dirname(__file__))
-
-    SITEURL = "http://<host>/"
-
-    ALLOWED_HOSTS = ['127.0.0.1', 'localhost', '::1']
-    PROXY_ALLOWED_HOSTS = ("127.0.0.1", 'localhost', '::1')
-    POSTGIS_VERSION = (2, 2, 1)
-
-    DATABASES = {
-        'default': {
-             'ENGINE': 'django.db.backends.postgresql_psycopg2',
-             'NAME': 'geonode',
-             'USER': 'geonode',
-             'PASSWORD': 'geonode',
-         },
-        # vector datastore for uploads
-        'datastore' : {
-            'ENGINE': 'django.contrib.gis.db.backends.postgis',
-            #'ENGINE': '', # Empty ENGINE name disables
-            'NAME': 'geonode_data',
-            'USER' : 'geonode',
-            'PASSWORD' : 'geonode',
-            'HOST' : 'localhost',
-            'PORT' : '5432',
-        }
-    }
-
-    # OGC (WMS/WFS/WCS) Server Settings
-    OGC_SERVER = {
-        'default' : {
-            'BACKEND' : 'geonode.geoserver',
-            'LOCATION' : 'http://localhost/geoserver/',
-            'PUBLIC_LOCATION' : 'http://localhost/geoserver/',
-            'USER' : 'admin',
-            'PASSWORD' : 'geoserver',
-            'MAPFISH_PRINT_ENABLED' : True,
-            'PRINT_NG_ENABLED' : True,
-            'GEONODE_SECURITY_ENABLED' : True,
-            'GEOGIG_ENABLED' : False,
-            'WMST_ENABLED' : False,
-            'BACKEND_WRITE_ENABLED': True,
-            'WPS_ENABLED' : False,
-            'LOG_FILE': '%s/geoserver/data/logs/geoserver.log' % os.path.abspath(os.path.join(PROJECT_ROOT, os.pardir)),
-            # Set to name of database in DATABASES dictionary to enable
-            'DATASTORE': 'datastore', #'datastore',
-        }
-    }
-
-    CATALOGUE = {
-        'default': {
-            # The underlying CSW implementation
-            # default is pycsw in local mode (tied directly to GeoNode Django DB)
-            'ENGINE': 'geonode.catalogue.backends.pycsw_local',
-            # pycsw in non-local mode
-            # 'ENGINE': 'geonode.catalogue.backends.pycsw_http',
-            # GeoNetwork opensource
-            # 'ENGINE': 'geonode.catalogue.backends.geonetwork',
-            # deegree and others
-            # 'ENGINE': 'geonode.catalogue.backends.generic',
-
-            # The FULLY QUALIFIED base url to the CSW instance for this GeoNode
-            'URL': '%scatalogue/csw' % SITEURL,
-            # 'URL': 'http://localhost:8080/geonetwork/srv/en/csw',
-            # 'URL': 'http://localhost:8080/deegree-csw-demo-3.0.4/services',
-
-            # login credentials (for GeoNetwork)
-            'USER': 'admin',
-            'PASSWORD': 'admin',
-        }
-    }
-
-    # Default preview library
-    #LAYER_PREVIEW_LIBRARY = 'geoext'
-
-Initialize the Database
-=======================
-
-We' ve already setup GeoNode databases and user permissions for PostgreSQL. And
-instruct GeoNode on how to access the database. Now let's get the database ready
-running the following::
-
-    cd /home/geonode/geonode
-    python manage.py migrate
-    python manage.py loaddata geonode/base/fixtures/initial_data.json
-
-If you get an error message it is likely that database access is not set properly.
-Check you pg_hba.conf file and GeoNode `local_settings.py` file. Remember to restart
-PostgreSQL to make any changes to pg_hba.conf effective.
-
-Test that you are able to connect to the database as follows::
-
-    psql -U geonode geonode
-
-and::
-
-    psql -U geonode geonode_data
-
-Create GeoNode Superuser
-========================
-
-Now create the admin user for GeoNode running the following::
-
-    python manage.py createsuperuser
-
-You will be prompted for the username, email address and password for the user
+In previous sections you' ve setup all the applications we need to run GeoNode.
 
 Test the installation
 =====================
 
 We are ready to restart GeoNode (Apache) and test the installation.
-Restart Apache::
+Restart Apache
 
-    sudo service apache2 restart
+.. code-block:: bash
+
+    $ sudo service apache2 restart
 
 Open the browser and navigate to http://localhost/
 
@@ -213,10 +38,6 @@ Now open the main menu and click on `GeoServer`
 You will be redirected to GeoServer user interface. You will automatically be
 logged in as administrator in GeoServer.
 
-.. note::
-   If you connect to GeoNode as administrator for the first time , you will need to connect to 
-   GeoServer manually (The default credentials are: user:admin, password:geoserver).
-
 .. image:: img/geoserver_admin.png
    :width: 600px
    :alt: GeoServer Admin