- Backporting fixes from master

GeoNode · Jul 24, 2018 · 89649f6 · 89649f6
1 parent bde6f58
commit 89649f6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/docs/tutorials/install_and_admin/quick_install.txt b/docs/tutorials/install_and_admin/quick_install.txt
@@ -102,13 +102,13 @@ This option installs geonode in a virtual environment. This option is very usefu
 
     sudo add-apt-repository ppa:ubuntugis/ppa && sudo apt-get update
     sudo apt-get install gdal-bin
-    # check GDAL version
-    gdalinfo --version
+
+    # install the correct PyGDAL version
+    gdal-config --version | cut -c 1-5 | xargs -I % pip install 'pygdal>=%.0,<=%.999'
 
-    # install the correct PyGDAL version (>1.10.1)
-    pip install pygdal==`gdal-config --version`
-
-    # if you cannot find exactly the same version, be sure to install at least the closer major one e.g. 2.1.2 -> 2.1.2.3
+    # if the command cannot install a suitable version, be sure to install at least the closer major one e.g. 2.1.2 -> 2.1.2.3
+    # gdalinfo --version
+    # pip install pygdal==`gdal-config --version`
 
 You can now setup and start GeoNode::
 

diff --git a/geonode/settings.py b/geonode/settings.py
@@ -1298,7 +1298,8 @@
 else:
     _BROKER_URL = LOCAL_SIGNALS_BROKER_URL
 
-BROKER_URL = _BROKER_URL
+# Note:BROKER_URL is deprecated in favour of CELERY_BROKER_URL 
+CELERY_BROKER_URL = _BROKER_URL
 
 CELERY_RESULT_PERSISTENT = False