sync with global master (#13)

* [Docs] finalize geonode-project debug setup and startup section * [Docs] Administering GeoNode: OAuth2 Access Tokens management * [Docs] Removing misleading contents * [Docs] Removing misleading contents * [Docs] Getting Started part 1 * [Docs] Getting Started part 2 * [Docs] Getting Started part 3 * [Docs] Getting Started part 4 * [docs] GeoNode Project Themes * [docs] fixing typos in basic index * Add vim text editor, fix typos * added ansible to docs * fixed typos on start * Add dev mode with regular Docker (GeoNode#4514) * add env files for dev * Add docker-compose scripts for dev mode * Fix reference links to docs * Align with template link * Avoid clash between django and celery commands * Fix broken links * Align geoserver version in compose file for devel * Remove no longer used variable * Set env_file from root environment variable SET_DOCKER_ENV * Align prod and devel env files * Align filename extension of docker-compose file * Improve cmd logic for development * Use a single file to override for development mode * Add docs for developing with docker * Install ipdb for development * Simplify pygdal installation * Added numpy to requirements.txt * Added numpy for SPC * Solve letsencrypt ssl error For more information watch here : plesk/letsencrypt-plesk#117 Before error was like this : ``` pkg_resources.ContextualVersionConflict: (cryptography 1.8.1 (/usr/lib/python2.7/site-packages), Requirement.parse('cryptography>=2.1.4'), set(['PyOpenSSL'])) ``` * Bump readthedocs-sphinx-ext from 0.5.17 to 0.6.0 Bumps [readthedocs-sphinx-ext](https://github.com/rtfd/readthedocs-sphinx-ext) from 0.5.17 to 0.6.0. - [Release notes](https://github.com/rtfd/readthedocs-sphinx-ext/releases) - [Commits](readthedocs/readthedocs-sphinx-ext@0.5.17...0.6.0) Signed-off-by: dependabot-preview[bot] <[email protected]> * Bump python-slugify from 3.0.1 to 3.0.2 Bumps [python-slugify](https://github.com/un33k/python-slugify) from 3.0.1 to 3.0.2. - [Release notes](https://github.com/un33k/python-slugify/releases) - [Changelog](https://github.com/un33k/python-slugify/blob/master/CHANGELOG.md) - [Commits](un33k/python-slugify@3.0.1...3.0.2) Signed-off-by: dependabot-preview[bot] <[email protected]> * Bump pytest-django from 3.4.8 to 3.5.1 Bumps [pytest-django](https://github.com/pytest-dev/pytest-django) from 3.4.8 to 3.5.1. - [Release notes](https://github.com/pytest-dev/pytest-django/releases) - [Changelog](https://github.com/pytest-dev/pytest-django/blob/master/docs/changelog.rst) - [Commits](pytest-dev/pytest-django@3.4.8...v3.5.1) Signed-off-by: dependabot-preview[bot] <[email protected]> * [Security] Bump django from 1.11.21 to 1.11.22 Bumps [django](https://github.com/django/django) from 1.11.21 to 1.11.22. **This update includes security fixes.** - [Release notes](https://github.com/django/django/releases) - [Commits](django/django@1.11.21...1.11.22) Signed-off-by: dependabot-preview[bot] <[email protected]> * Update Dockerfile * switched to latest tags for docker images to solves GeoNode#4603 * Bump splinter from 0.10.0 to 0.11.0 Bumps [splinter](https://github.com/cobrateam/splinter) from 0.10.0 to 0.11.0. - [Release notes](https://github.com/cobrateam/splinter/releases) - [Changelog](https://github.com/cobrateam/splinter/blob/master/docs/news.rst) - [Commits](cobrateam/splinter@0.10.0...0.11.0) Signed-off-by: dependabot-preview[bot] <[email protected]> * Bump pytz from 2018.9 to 2019.1 Bumps [pytz](https://github.com/stub42/pytz) from 2018.9 to 2019.1. - [Release notes](https://github.com/stub42/pytz/releases) - [Commits](stub42/pytz@release_2018.9...release_2019.1) Signed-off-by: dependabot-preview[bot] <[email protected]> * - use correct resolved object when saving metadata * - use correct resolved object when saving metadata * - Improve Monitoring Request Filter Logging * Bump tqdm from 4.31.1 to 4.32.2 Bumps [tqdm](https://github.com/tqdm/tqdm) from 4.31.1 to 4.32.2. - [Release notes](https://github.com/tqdm/tqdm/releases) - [Commits](tqdm/tqdm@v4.31.1...v4.32.2) Signed-off-by: dependabot-preview[bot] <[email protected]> * Bump pillow from 6.0.0 to 6.1.0 Bumps [pillow](https://github.com/python-pillow/Pillow) from 6.0.0 to 6.1.0. - [Release notes](https://github.com/python-pillow/Pillow/releases) - [Changelog](https://github.com/python-pillow/Pillow/blob/master/CHANGES.rst) - [Commits](python-pillow/Pillow@6.0.0...6.1.0) Signed-off-by: dependabot-preview[bot] <[email protected]> * - GeoServer Render Thumbnails using the correct auth headers * Bump psutil from 5.6.1 to 5.6.3 Bumps [psutil](https://github.com/giampaolo/psutil) from 5.6.1 to 5.6.3. - [Release notes](https://github.com/giampaolo/psutil/releases) - [Changelog](https://github.com/giampaolo/psutil/blob/master/HISTORY.rst) - [Commits](giampaolo/psutil@release-5.6.1...release-5.6.3) Signed-off-by: dependabot-preview[bot] <[email protected]> * - 2.10 stable release * Align nginx tag value driven by .env variable (GeoNode#4623) * Align nginx tag value driven by .env variable (GeoNode#4624) * - Updating README.md links to the doc * [Social Account Settings] LinkedIn profile fields updated * spanish translation update * Geoserver doesn't restart with https Geoserver fail on https Message from logs : geoserver_1 | keytool error: java.io.IOException: Keystore was tampered with, or password was incorrect * Bump lxml from 4.3.3 to 4.3.4 Bumps [lxml](https://github.com/lxml/lxml) from 4.3.3 to 4.3.4. - [Release notes](https://github.com/lxml/lxml/releases) - [Changelog](https://github.com/lxml/lxml/blob/master/CHANGES.txt) - [Commits](lxml/lxml@lxml-4.3.3...lxml-4.3.4) Signed-off-by: dependabot-preview[bot] <[email protected]> * Bump oauthlib from 3.0.1 to 3.0.2 Bumps [oauthlib](https://github.com/oauthlib/oauthlib) from 3.0.1 to 3.0.2. - [Release notes](https://github.com/oauthlib/oauthlib/releases) - [Changelog](https://github.com/oauthlib/oauthlib/blob/master/CHANGELOG.rst) - [Commits](oauthlib/oauthlib@v3.0.1...v3.0.2) Signed-off-by: dependabot-preview[bot] <[email protected]> * Add PULL_REQUEST_TEMPLATE.md * [Fixes GeoNode#4639] Switch library "gsconfig" to "geoserver-restoconfig" * - Bump to version 2.10.1 'maintenance' 0
gannebamm · Jul 17, 2019 · 3c940bc · 3c940bc
1 parent d583269
commit 3c940bc
Show file tree

Hide file tree

Showing 100 changed files with 1,659 additions and 318 deletions.
diff --git a/.env b/.env
@@ -1 +1,2 @@
 COMPOSE_PROJECT_NAME=geonode
+SET_DOCKER_ENV=production
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,23 @@
+<Include a few sentences describing the overall goals for this Pull Request>
+
+## Checklist
+
+> Reviewing is a process done by project maintainers, mostly on a volunteer basis. We try to keep the overhead as small as possible and appreciate if you help us to do so by completing the following items. Feel free to ask in a comment if you have troubles with any of them.
+
+For all pull requests:
+
+- [ ] Confirm you have read the [contribution guidelines](https://github.com/GeoNode/geonode/blob/master/CONTRIBUTING) 
+- [ ] You have sent a Contribution Licence Agreement (CLA) as necessary (not required for small changes, e.g., fixing typos in documentation)
+- [ ] Make sure the first PR targets the master branch, eventual backports will be managed later. This can be ignored if the PR is fixing an issue that only happens in a specific branch, but not in newer ones.
+
+The following are required only for core and extension modules (they are welcomed, but not required, for contrib modules):
+- [ ] There is a ticket in https://github.com/GeoNode/geonode/issues describing the issue/improvement/feature (a notable exemptions is, changes not visible to end users)
+- [ ] The issue connected to the PR must have Labels and Milestone assigned
+- [ ] PR for bug fixes and small new features are presented as a single commit
+- [ ] Commit message must be in the form "[Fixes #<issue_number>] Title of the Issue"
+- [ ] New unit tests have been added covering the changes, unless there are explanation on why the tests are not necessary/implemented
+- [ ] This PR passes all existing unit tests (test results will be reported by travis-ci after opening this PR)
+- [ ] This PR passes the QA checks: flake8 geonode
+- [ ] Commits changing the **settings**, **UI**, **existing user workflows**, or adding **new functionality**, need to include documentation updates
+
+**Submitting the PR does not require you to check all items, but by the time it gets merged, they should be either satisfied or inapplicable.**
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM geonode/geonode:latest
+FROM geonode/geonode:2.10
 MAINTAINER GeoNode development team
 
 COPY requirements.txt /usr/src/app/

diff --git a/README.md b/README.md
@@ -43,7 +43,7 @@ http://master.demo.geonode.org. After your registration you will be able
 to test all basic functionalities like uploading layers, creation of
 maps, editing metadata, styles and much more. To get an overview what
 GeoNode can do we recommend to have a look at the [Users
-Workshop](http://docs.geonode.org/en/master/tutorials/users/index.html).
+Workshop](http://docs.geonode.org/en/2.10.x/usage/index.html).
 
 Install
 -------
@@ -54,17 +54,17 @@ GeoNode can be setup in different ways, flavors and plattforms. If
 you´re planning to do development or install for production please visit
 the offical GeoNode installation documentation:
 
-- [Docker](http://docs.geonode.org/en/master/install/core/index.html#docker)
-- [Ubuntu 18.04](http://docs.geonode.org/en/master/install/core/index.html#ubuntu-18-04)
+- [Docker](http://docs.geonode.org/en/2.10.x/install/core/index.html#docker)
+- [Ubuntu 18.04](http://docs.geonode.org/en/2.10.x/install/core/index.html#ubuntu-18-04)
 
 Learn GeoNode
 -------------
 
 After you´ve finished the setup process make yourself familiar with the
 general usage and settings of your GeoNodes instance. - the [User
-Training](http://docs.geonode.org/en/master/tutorials/users/index.html)
+Training](http://docs.geonode.org/en/2.10.x/usage/index.html)
 is going in depth into what we can do. - the [Administrators
-Workshop](http://docs.geonode.org/en/master/tutorials/admin/index.html)
+Workshop](http://docs.geonode.org/en/2.10.x/admin/index.html)
 will guide you to the most important parts regarding management commands
 and configuration settings.
 
@@ -83,7 +83,7 @@ lightweight components to speed up things.
 To get you started have a look at the [Install
 instructions](#install) which cover all what is needed to run GeoNode
 for development. Further visit the the [Developer
-workshop](http://docs.geonode.org/en/master/tutorials/devel/index.html)
+workshop](http://docs.geonode.org/en/2.10.x/devel/index.html)
 for a basic overview.
 
 If you're planning of customizing your GeoNode instance, or to extend

diff --git a/docker-compose-geoserver-server.yml b/docker-compose-geoserver-server.yml
@@ -26,7 +26,7 @@ services:
     volumes:
       - geoserver-data-dir:/geoserver_data/data
     env_file:
-      - ./scripts/docker/env/production/geoserver.env
+      - ./scripts/docker/env/${SET_DOCKER_ENV}/geoserver.env
     ports:
       - "${GEOSERVER_SERVER_PORT}:8080"
     network_mode: "bridge"

diff --git a/docker-compose.async.yaml → docker-compose.async.yml b/docker-compose.async.yaml → docker-compose.async.yml
@@ -14,7 +14,7 @@ services:
       - dbdata:/var/lib/postgresql/data
       - dbbackups:/pg_backups
     env_file:
-      - ./scripts/docker/env/production/db.env
+      - ./scripts/docker/env/${SET_DOCKER_ENV}/db.env
 
   elasticsearch:
     image: elasticsearch:2.4.1
@@ -40,7 +40,7 @@ services:
 
   celery:
     restart: unless-stopped
-    image: geonode/geonode:latest
+    image: geonode/geonode:2.10
     container_name: celery4${COMPOSE_PROJECT_NAME}
     stdin_open: true
     # tty: true
@@ -56,7 +56,7 @@ services:
       - statics:/mnt/volumes/statics
       - geoserver-data-dir:/geoserver_data/data
     env_file:
-      - ./scripts/docker/env/production/celery.env
+      - ./scripts/docker/env/${SET_DOCKER_ENV}/celery.env
 
   geoserver:
     image: geonode/geoserver:2.14.3
@@ -75,11 +75,11 @@ services:
     volumes:
       - geoserver-data-dir:/geoserver_data/data
     env_file:
-      - ./scripts/docker/env/production/geoserver.env
+      - ./scripts/docker/env/${SET_DOCKER_ENV}/geoserver.env
 
   django:
     restart: unless-stopped
-    image: geonode/geonode:latest
+    image: geonode/geonode:2.10
     container_name: django4${COMPOSE_PROJECT_NAME}
     stdin_open: true
     # tty: true
@@ -97,10 +97,10 @@ services:
       - statics:/mnt/volumes/statics
       - geoserver-data-dir:/geoserver_data/data
     env_file:
-      - ./scripts/docker/env/production/django.env
+      - ./scripts/docker/env/${SET_DOCKER_ENV}/django.env
 
   geonode:
-    image: geonode/nginx:geoserver
+    image: geonode/nginx:${SET_DOCKER_ENV}
     restart: unless-stopped
     container_name: nginx4${COMPOSE_PROJECT_NAME}
     stdin_open: true

diff --git a/docker-compose.development.yml b/docker-compose.development.yml
@@ -0,0 +1,68 @@
+version: '2.2'
+services:
+
+  celery:
+    build: .
+    command: celery worker --app=geonode.celery_app:app --broker=amqp://guest:guest@rabbitmq:5672/ -B -l DEBUG
+    depends_on:
+      - db
+      - elasticsearch
+      - rabbitmq
+    volumes:
+      - .:/usr/src/app
+      - statics:/mnt/volumes/statics
+      - geoserver-data-dir:/geoserver_data/data
+    environment:
+      - DOCKER_ENV=${SET_DOCKER_ENV}
+      - IS_CELERY=True
+      - DEBUG=True
+      - GEONODE_LB_HOST_IP=localhost
+      - GEONODE_LB_PORT=80
+      - SITEURL=http://localhost/
+      - ALLOWED_HOSTS=['localhost', ]
+      - GEOSERVER_PUBLIC_LOCATION=http://localhost/geoserver/
+      - GEOSERVER_WEB_UI_LOCATION=http://localhost/geoserver/
+
+  django:
+    build: .
+    command: python manage.py runserver --settings=geonode.settings 0.0.0.0:8000
+    volumes:
+      - .:/usr/src/app
+      - statics:/mnt/volumes/statics
+      - geoserver-data-dir:/geoserver_data/data
+    environment:
+      - DOCKER_ENV=${SET_DOCKER_ENV}
+      - IS_CELERY=False
+      - DEBUG=True
+      - GEONODE_LB_HOST_IP=localhost
+      - GEONODE_LB_PORT=80
+      - SITEURL=http://localhost/
+      - ALLOWED_HOSTS=['localhost', ]
+      - GEOSERVER_PUBLIC_LOCATION=http://localhost/geoserver/
+      - GEOSERVER_WEB_UI_LOCATION=http://localhost/geoserver/
+
+  geoserver:
+    depends_on:
+      - db
+      - elasticsearch
+      - rabbitmq
+      - data-dir-conf
+    environment:
+      - GEONODE_LB_HOST_IP=localhost
+      - GEONODE_LB_PORT=80
+
+  geonode:
+    image: geonode/nginx:${SET_DOCKER_ENV}
+    restart: unless-stopped
+    container_name: nginx4${COMPOSE_PROJECT_NAME}
+    stdin_open: true
+    # tty: true
+    labels:
+        org.geonode.component: nginx
+        org.geonode.instance.name: geonode
+    depends_on:
+      - django
+      - celery
+      - geoserver
+    ports:
+      - 80:80
diff --git a/docker-compose.override.localhost.yml b/docker-compose.override.localhost.yml
@@ -21,4 +21,3 @@ services:
     environment:
       - GEONODE_LB_HOST_IP=localhost
       - GEONODE_LB_PORT=80
-  #    - NGINX_BASE_URL=
diff --git a/docker-compose.override.yml b/docker-compose.override.yml
@@ -21,4 +21,3 @@ services:
     environment:
       - GEONODE_LB_HOST_IP=localhost
       - GEONODE_LB_PORT=80
-  #    - NGINX_BASE_URL=
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -14,7 +14,7 @@ services:
       - dbdata:/var/lib/postgresql/data
       - dbbackups:/pg_backups
     env_file:
-      - ./scripts/docker/env/production/db.env
+      - ./scripts/docker/env/${SET_DOCKER_ENV}/db.env
 
   geoserver:
     image: geonode/geoserver:2.14.3
@@ -31,11 +31,11 @@ services:
     volumes:
       - geoserver-data-dir:/geoserver_data/data
     env_file:
-      - ./scripts/docker/env/production/geoserver.env
+      - ./scripts/docker/env/${SET_DOCKER_ENV}/geoserver.env
 
   django:
     restart: unless-stopped
-    image: geonode/geonode:latest
+    image: geonode/geonode:2.10
     container_name: django4${COMPOSE_PROJECT_NAME}
     stdin_open: true
     # tty: true
@@ -51,10 +51,10 @@ services:
       - statics:/mnt/volumes/statics
       - geoserver-data-dir:/geoserver_data/data
     env_file:
-      - ./scripts/docker/env/production/django.env
+      - ./scripts/docker/env/${SET_DOCKER_ENV}/django.env
 
   geonode:
-    image: geonode/nginx:geoserver
+    image: geonode/nginx:${SET_DOCKER_ENV}
     restart: unless-stopped
     container_name: nginx4${COMPOSE_PROJECT_NAME}
     stdin_open: true

diff --git a/docs/about/img/logo.png b/docs/about/img/logo.png
diff --git a/docs/about/index.rst b/docs/about/index.rst
@@ -1,6 +1,8 @@
 What is GeoNode
 ===============
 
+.. image:: img/logo.png
+
 GeoNode is a geospatial content management system, a platform for the management and publication of geospatial data. It brings together mature and stable open-source software projects under a consistent and easy-to-use interface allowing non-specialized users to share data and create interactive maps.
 
 Data management tools built into GeoNode allow for integrated creation of data, metadata, and map visualization. Each dataset in the system can be shared publicly or restricted to allow access to only specific users. Social features like user profiles and commenting and rating systems allow for the development of communities around each platform to facilitate the use, management, and quality control of the data the GeoNode instance contains.
@@ -16,6 +18,8 @@ Visit our gallery to see how the community uses GeoNode: `GeoNode Showcase <http
 
 The development community is very supportive of new projects and contributes ideas and guidance for newcomers.
 
+For a live demo see also :ref:`online_demo`
+
 Most useful links
 -----------------
 
@@ -62,6 +66,8 @@ GeoNode current version: `2.10rc5 <https://github.com/GeoNode/geonode/releases/t
 
 Main Features: `State of GeoNode 2.10 <http://summit.geonode.org/presentation/2019/afabiani_StateOfGeoNode.pdf>`_
 
+.. _get_in_touch:
+
 Get in touch with the community
 ===============================
 

diff --git a/docs/admin/admin_panel/img/admin-panel-menus-0000.png b/docs/admin/admin_panel/img/admin-panel-menus-0000.png
diff --git a/docs/admin/admin_panel/img/admin-panel-menus-0001.png b/docs/admin/admin_panel/img/admin-panel-menus-0001.png
diff --git a/docs/admin/admin_panel/img/admin-panel-menus-0002.png b/docs/admin/admin_panel/img/admin-panel-menus-0002.png
diff --git a/docs/admin/admin_panel/img/admin-panel-menus-0003.png b/docs/admin/admin_panel/img/admin-panel-menus-0003.png
diff --git a/docs/admin/admin_panel/img/admin-panel-menus-0004.png b/docs/admin/admin_panel/img/admin-panel-menus-0004.png
diff --git a/docs/admin/admin_panel/img/oauth2-tokens/admin-panel-tokens-0001.png b/docs/admin/admin_panel/img/oauth2-tokens/admin-panel-tokens-0001.png
diff --git a/docs/admin/admin_panel/img/oauth2-tokens/admin-panel-tokens-0002.png b/docs/admin/admin_panel/img/oauth2-tokens/admin-panel-tokens-0002.png
diff --git a/docs/admin/admin_panel/img/oauth2-tokens/admin-panel-tokens-0003.png b/docs/admin/admin_panel/img/oauth2-tokens/admin-panel-tokens-0003.png
diff --git a/docs/admin/admin_panel/img/oauth2-tokens/admin-panel-tokens-0003a.png b/docs/admin/admin_panel/img/oauth2-tokens/admin-panel-tokens-0003a.png
diff --git a/docs/admin/admin_panel/img/oauth2-tokens/admin-panel-tokens-0003b.png b/docs/admin/admin_panel/img/oauth2-tokens/admin-panel-tokens-0003b.png
diff --git a/docs/admin/admin_panel/img/oauth2-tokens/admin-panel-tokens-0003c.png b/docs/admin/admin_panel/img/oauth2-tokens/admin-panel-tokens-0003c.png
diff --git a/docs/admin/admin_panel/img/oauth2-tokens/admin-panel-tokens-0003d.png b/docs/admin/admin_panel/img/oauth2-tokens/admin-panel-tokens-0003d.png
diff --git a/docs/admin/admin_panel/img/oauth2-tokens/admin-panel-tokens-0003e.png b/docs/admin/admin_panel/img/oauth2-tokens/admin-panel-tokens-0003e.png
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		COMPOSE_PROJECT_NAME=geonode
		SET_DOCKER_ENV=production