- Switching to 2.8.x branch

.travis.yml

@@ -66,9 +66,7 @@ env:
 branches:
   only:
     - master
-    - 2.9.x
-    - 2.8.0
-    - 2.7.x
+    - 2.8.x
     - 2.6.x
 
 before_install:

Dockerfile

@@ -4,8 +4,8 @@ MAINTAINER GeoNode development team
 COPY requirements.txt /usr/src/app/
 RUN pip install --upgrade pip
 RUN pip install -r requirements.txt --upgrade
-RUN python manage.py makemigrations --noinput --settings=geonode.settings
-RUN python manage.py migrate --noinput --settings=geonode.settings
+RUN python manage.py makemigrations --settings=geonode.settings
+RUN python manage.py migrate --settings=geonode.settings
 
 EXPOSE 8000
 

MANIFEST.in

@@ -1,4 +1,4 @@
-include README README.rst LICENSE
+include README README.rst LICENSE requirements.txt
 recursive-exclude geonode/static/.components
 recursive-include geonode *.css *.eot *.gif *.html *.ico *.ini *.jpg *.js *.json *.less *.md *.mo *.po *.otf *.png *.rst *.sample *.svg *.swf *.ttf *.txt *.woff *.woff2 *.xml *.xsl README
 recursive-include geonode/contrib/geosites gunicorn nginx

docker-compose.override.localhost.yml

@@ -0,0 +1,33 @@
+version: '2.2'
+
+services:
+  django:
+    build: .
+    # Loading the app is defined here to allow for
+    # autoreload on changes it is mounted on top of the
+    # old copy that docker added when creating the image
+    volumes:
+      - '.:/usr/src/app'
+    environment:
+      - DEBUG=True
+      - GEONODE_LB_HOST_IP=localhost
+      - GEONODE_LB_PORT=80
+      - SITEURL=http://localhost/
+      - ALLOWED_HOSTS=['localhost', ]
+      - GEOSERVER_PUBLIC_LOCATION=http://localhost/geoserver/
+
+  # celery:
+  #   build: .
+  #   # Loading the app is defined here to allow for
+  #   # autoreload on changes it is mounted on top of the
+  #   # old copy that docker added when creating the image
+  #   volumes:
+  #     - '.:/usr/src/app'
+  #   environment:
+  #     - DEBUG=True
+
+  geoserver:
+    environment:
+      - GEONODE_LB_HOST_IP=localhost
+      - GEONODE_LB_PORT=80
+  #    - NGINX_BASE_URL=

docs/organizational/contribute/README

@@ -41,7 +41,7 @@ If you want to use Docker you can now::
     docker-compose build
 
     # run the docker container
-    docker-compose up
+    docker-compose up -f docker-compose.override.localhost.yml -d
 
     # turn it off
     docker-compose down

docs/tutorials/admin/install/custom_install.txt

@@ -571,8 +571,11 @@ Once edited (if necessary) run the ``./install.sh`` file with the following comm
     # call geonode binary django-admin.py create django super user
     $ geonode createsuperuser
 
-    # create the IP address to your address
-    $ sudo geonode-updateip youraddress
+    # create the IP address to your public address
+    $ sudo geonode-updateip -p yourpublicaddress
+
+    # if geoserver and geonode are not on the same machine then also add the local geonode address
+    $ sudo geonode-updateip -p yourpublicaddress -l yourlocaladdress
 
 
 GeoNode can now be accessed at http://localhost

docs/tutorials/install_and_admin/geonode_install/install_geonode_application.txt

@@ -76,7 +76,7 @@ First of all we need to prepare a new Python Virtual Environment:
 
 .. code-block:: bash
 
-    $ sudo apt install python-pip
+    $ sudo apt-get install python-pip
     $ pip install --upgrade pip
     $ pip install --user virtualenv
     $ pip install --user virtualenvwrapper

docs/tutorials/install_and_admin/geonode_install/install_geoserver_application.txt

@@ -134,17 +134,6 @@ administrator will be able to access and administer GeoServer as well.
         <checkTokenEndpointUrl>http://localhost/api/o/v4/tokeninfo/</checkTokenEndpointUrl>
         <logoutUri>http://localhost/account/logout/</logoutUri>
 
-#. Edit ``/data/geoserver-data/security/auth/geonodeAuthProvider/config.xml`` with a text editor
-
-    .. code-block:: bash
-
-        $ sudo gedit /data/geoserver-data/security/auth/geonodeAuthProvider/config.xml
-
-    And make sure the following values are configured as follows:
-
-    .. code-block:: xml
-
-        <baseUrl>http://localhost/</baseUrl>
 
 #. Edit ``/data/geoserver-data/security/role/geonode\ REST\ role\ service/config.xml`` with a text editor
 

docs/tutorials/install_and_admin/running_docker/setup_docker_compose.txt

@@ -31,17 +31,20 @@ Verify the installation::
 
     docker-compose --version
 
-Running GeoNode stack
-=====================
+Running GeoNode stack on localhost
+==================================
 
 Clone the repository::
 
     git clone https://github.com/GeoNode/geonode.git
 
 Launch the stack with the build of GeoNode so any changes you did will be immediately available::
 
-    docker-compose up --build
-
+    docker-compose up -f docker-compose.override.localhost.yml --build
+
+.. note::
+   **docker-compose.override.localhost.yml** containse environment variables to allow you run the instances on *localhost*. You can use this file as template in order to run on other public addresses.
+
 .. note:: 
    **For Windows users**: In case you're using the native Docker for Windows (on Hyper-V) you will probably be affected by an error related to mounting the /var/run/docker.sock volume. It's due to a `problem with the current version of Docker Compose <https://github.com/docker/for-win/issues/1829>`_ for Windows.
    In this case you need to set the **COMPOSE_CONVERT_WINDOWS_PATHS** environmental variable:
@@ -52,6 +55,13 @@ Launch the stack with the build of GeoNode so any changes you did will be immedi
 
    before running docker-compose up
 
+Running GeoNode stack on docker ip address
+==========================================
+
+If you want to navigate the application from the address of the Docker socket than run simply::
+
+    docker-compose up --build
+
 GeoNode will be available at the ip address of the ``docker0`` interface::
 
     ifconfig -a

geonode/base/management/commands/fixgeofencerules.py

@@ -58,10 +58,7 @@ def handle(self, *args, **options):
                         geofence_user = str(profile)
                         if "AnonymousUser" in geofence_user:
                             geofence_user = None
-                        utils.set_geofence_owner(
-                            layer, geofence_user,
-                            view_perms=True,
-                            download_perms=True
-                        )
+                        utils.sync_geofence_with_guardian(
+                            layer, perms, user=geofence_user)
                 except:
                     print "[ERROR] Layer [%s] couldn't be updated" % (layer.name)

geonode/base/migrations/0034_auto_20180606_1543.py

@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.11 on 2018-06-06 15:43
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('base', '0033_auto_20180330_0951'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='resourcebase',
+            name='metadata_uploaded_preserve',
+            field=models.BooleanField(default=False, verbose_name='Metadata uploaded preserve'),
+        ),
+        migrations.AlterField(
+            model_name='resourcebase',
+            name='thumbnail_url',
+            field=models.TextField(blank=True, null=True, verbose_name='Thumbnail url'),
+        ),
+        migrations.AlterField(
+            model_name='resourcebase',
+            name='tkeywords',
+            field=models.ManyToManyField(blank=True, help_text='formalised word(s) or phrase(s) from a fixed thesaurus used to describe the subject (space or comma-separated', to='base.ThesaurusKeyword', verbose_name='keywords'),
+        ),
+    ]