Fix missing replacement of geoserver public location (#4215)

* Fix missing replacement of geoserver public location * Fix diff visualization
GeoNode · Feb 11, 2019 · a5311bd · a5311bd
1 parent 312d59f
commit a5311bd
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 17 deletions.
diff --git a/docker-compose.override.localhost.yml b/docker-compose.override.localhost.yml
@@ -14,7 +14,7 @@ services:
       - GEONODE_LB_PORT=80
       - SITEURL=http://localhost/
       - ALLOWED_HOSTS=['localhost', ]
-      - GEOSERVER_PUBLIC_LOCATION=http://localhost/geoserver/
+      - GEOSERVER_PUBLIC_LOCATION=http://localhost/gs/
 
   celery:
     build: .
@@ -26,7 +26,7 @@ services:
       - GEONODE_LB_PORT=80
       - SITEURL=http://localhost/
       - ALLOWED_HOSTS=['localhost', ]
-      - GEOSERVER_PUBLIC_LOCATION=http://localhost/geoserver/
+      - GEOSERVER_PUBLIC_LOCATION=http://localhost/gs/
 
   geoserver:
     environment:

diff --git a/docker-compose.override.yml b/docker-compose.override.yml
@@ -14,7 +14,7 @@ services:
       - GEONODE_LB_PORT=80
       - SITEURL=http://localhost/
       - ALLOWED_HOSTS=['localhost', ]
-      - GEOSERVER_PUBLIC_LOCATION=http://localhost/geoserver/
+      - GEOSERVER_PUBLIC_LOCATION=http://localhost/gs/
 
   celery:
     build: .
@@ -26,7 +26,7 @@ services:
       - GEONODE_LB_PORT=80
       - SITEURL=http://localhost/
       - ALLOWED_HOSTS=['localhost', ]
-      - GEOSERVER_PUBLIC_LOCATION=http://localhost/geoserver/
+      - GEOSERVER_PUBLIC_LOCATION=http://localhost/gs/
 
   geoserver:
     environment:

diff --git a/docs/reference/worldmap.txt b/docs/reference/worldmap.txt
@@ -59,7 +59,7 @@ Set the following environment variables as needed (change SITE_NAME and SERVER_I
       export OWNER=$PG_USERNAME
       export ALLOWED_HOSTS="localhost, $SERVER_IP, "
       export GEOSERVER_LOCATION=http://localhost:8080/geoserver/
-      export GEOSERVER_PUBLIC_LOCATION=http://$SERVER_IP/geoserver/
+      export GEOSERVER_PUBLIC_LOCATION=http://$SERVER_IP/gs/
       export SOLR_URL =http://localhost:8983/solr/hypermap/select/
       export HYPERMAP_REGISTRY_URL =http://localhost:8001
       export MAPPROXY_URL=http://localhost:8001

diff --git a/docs/tutorials/install_and_admin/geonode_install/create_geonode_db.txt b/docs/tutorials/install_and_admin/geonode_install/create_geonode_db.txt
@@ -340,7 +340,7 @@ Revert to default site settings
             #)
 
             #GEOSERVER_PUBLIC_LOCATION = os.getenv(
-            #    'GEOSERVER_PUBLIC_LOCATION', '{}/geoserver/'.format(SITEURL)
+            #    'GEOSERVER_PUBLIC_LOCATION', '{}/gs/'.format(SITEURL)
             #)
             ...
 

diff --git a/docs/tutorials/install_and_admin/geonode_install/setup_configure_httpd.txt b/docs/tutorials/install_and_admin/geonode_install/setup_configure_httpd.txt
@@ -56,7 +56,7 @@ Preliminary Steps & Checks
             )
 
             GEOSERVER_PUBLIC_LOCATION = os.getenv(
-                'GEOSERVER_PUBLIC_LOCATION', '{}/geoserver/'.format(SITEURL)
+                'GEOSERVER_PUBLIC_LOCATION', '{}/gs/'.format(SITEURL)
             )
             ...
 
@@ -309,7 +309,7 @@ In order to do that, edit the ``my_geonode/local_settings.py`` file:
         )
 
         GEOSERVER_PUBLIC_LOCATION = os.getenv(
-            'GEOSERVER_PUBLIC_LOCATION', '{}/geoserver/'.format(SITEURL)
+            'GEOSERVER_PUBLIC_LOCATION', '{}/gs/'.format(SITEURL)
         )
         ...
         CATALOGUE = {
@@ -475,7 +475,7 @@ In order to do that, edit the ``my_geonode/local_settings.py`` file:
         )
 
         GEOSERVER_PUBLIC_LOCATION = os.getenv(
-            'GEOSERVER_PUBLIC_LOCATION', '{}/geoserver/'.format(SITEURL)
+            'GEOSERVER_PUBLIC_LOCATION', '{}/gs/'.format(SITEURL)
         )
 
         OGC_SERVER_DEFAULT_USER = os.getenv(

diff --git a/docs/tutorials/install_and_admin/geonode_update/26_to_27/index.txt b/docs/tutorials/install_and_admin/geonode_update/26_to_27/index.txt
@@ -136,7 +136,7 @@ Upgrade Development Environment
             65  GEOSERVER_PUBLIC_LOCATION = os.getenv(                                                                                  49  GEOSERVER_PUBLIC_LOCATION = os.getenv(
             ------------------------------------------------------------------------
             66  #    'GEOSERVER_PUBLIC_LOCATION', '{}geoserver/'.format(SITEURL)                                                    <>
-            67      'GEOSERVER_LOCATION', 'http://localhost:8080/geoserver/'                                                            50      'GEOSERVER_PUBLIC_LOCATION', 'http://localhost:8080/geoserver/'
+            67      'GEOSERVER_LOCATION', 'http://localhost:8080/geoserver/'                                                            50      'GEOSERVER_PUBLIC_LOCATION', 'http://localhost:8080/gs/'
             68  )
             ------------------------------------------------------------------------
             69                                                                                                                       =

diff --git a/docs/tutorials/install_and_admin/running_docker/resources/docker-compose.yml b/docs/tutorials/install_and_admin/running_docker/resources/docker-compose.yml
@@ -77,7 +77,7 @@ services:
       - UWSGI_CMD=uwsgi --ini /usr/src/app/uwsgi.ini
       - IS_CELERY=false
       - C_FORCE_ROOT=1
-      - GEOSERVER_PUBLIC_LOCATION=http://geonode/geoserver/
+      - GEOSERVER_PUBLIC_LOCATION=http://geonode/gs/
       - GEOSERVER_LOCATION=http://geonode/geoserver/
       - SITEURL=http://geonode/
 
@@ -116,7 +116,7 @@ services:
       - CELERY_CMD=celery worker --app=geonode.celery_app:app -B -l INFO
       - IS_CELERY=true
       - C_FORCE_ROOT=1
-      - GEOSERVER_PUBLIC_LOCATION=http://geonode/geoserver/
+      - GEOSERVER_PUBLIC_LOCATION=http://geonode/gs/
       - GEOSERVER_LOCATION=http://geonode/geoserver/
       - SITEURL=http://geonode/
 

diff --git a/docs/tutorials/install_and_admin/setup_on_centos/install_geonode.txt b/docs/tutorials/install_and_admin/setup_on_centos/install_geonode.txt
@@ -119,7 +119,7 @@ Change the value of the `LOCATION` and `PUBLIC_LOCATION` variables as below::
         'GEOSERVER_LOCATION', 'http://localhost/geoserver/'
     )
     GEOSERVER_PUBLIC_LOCATION = os.getenv(
-        'GEOSERVER_PUBLIC_LOCATION', 'http://localhost/geoserver/'
+        'GEOSERVER_PUBLIC_LOCATION', 'http://localhost/gs/'
     )
 
 Finally configure GeoServer datastore:
@@ -167,7 +167,7 @@ The resulting configuration file should look like this:::
         'GEOSERVER_LOCATION', 'http://localhost/geoserver/'
     )
     GEOSERVER_PUBLIC_LOCATION = os.getenv(
-        'GEOSERVER_PUBLIC_LOCATION', 'http://localhost:8001/geoserver/'
+        'GEOSERVER_PUBLIC_LOCATION', 'http://localhost:8001/gs/'
     )
 
     # OGC (WMS/WFS/WCS) Server Settings

diff --git a/geonode/local_settings.py.psql_test b/geonode/local_settings.py.psql_test
@@ -46,7 +46,7 @@ GEOSERVER_LOCATION = os.getenv(
     'GEOSERVER_LOCATION', 'http://localhost:8080/geoserver/'
 )
 GEOSERVER_PUBLIC_LOCATION = os.getenv(
-    'GEOSERVER_PUBLIC_LOCATION', 'http://localhost:8080/geoserver/'
+    'GEOSERVER_PUBLIC_LOCATION', 'http://localhost:8080/gs/'
 )
 
 # OGC (WMS/WFS/WCS) Server Settings

diff --git a/package/support/geonode.local_settings b/package/support/geonode.local_settings
@@ -87,7 +87,7 @@ GEOSERVER_LOCATION = os.getenv(
 )
 
 GEOSERVER_PUBLIC_LOCATION = os.getenv(
-    'GEOSERVER_PUBLIC_LOCATION', '{}geoserver/'.format(SITEURL)
+    'GEOSERVER_PUBLIC_LOCATION', '{}gs/'.format(SITEURL)
 )
 
 OGC_SERVER_DEFAULT_USER = os.getenv(

diff --git a/tasks.py b/tasks.py
@@ -41,7 +41,7 @@ def update(ctx):
         'GEONODE_LB_PORT'
     ):
         ctx.run("echo export GEOSERVER_PUBLIC_LOCATION=\
-http://{public_fqdn}/geoserver/ >> {override_fn}".format(**envs), pty=True)
+http://{public_fqdn}/gs/ >> {override_fn}".format(**envs), pty=True)
         ctx.run("echo export SITEURL=\
 http://{public_fqdn}/ >> {override_fn}".format(**envs), pty=True)