From bdb410fa366eb0d4ea6d632ce377dfe3598730c1 Mon Sep 17 00:00:00 2001
From: meomancer <meomancer@gmail.com>
Date: Tue, 1 Aug 2017 15:28:21 +0700
Subject: [PATCH] fix geoserver url is wrong

---
 deployment/docker-compose.yml           | 1 +
 django_project/core/settings/project.py | 4 ++--
 django_project/core/urls.py             | 4 ++++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/deployment/docker-compose.yml b/deployment/docker-compose.yml
index cd1298c..66ee67c 100644
--- a/deployment/docker-compose.yml
+++ b/deployment/docker-compose.yml
@@ -150,6 +150,7 @@ devweb:
     - smtp:smtp
     - db:db
     - rabbitmq:rabbitmq
+    - geoserver:geoserver
   ports:
     # for django test server
     - "33303:8080"
diff --git a/django_project/core/settings/project.py b/django_project/core/settings/project.py
index d5a7b47..0f63d26 100644
--- a/django_project/core/settings/project.py
+++ b/django_project/core/settings/project.py
@@ -61,8 +61,8 @@ from .celery_setting import *  # noqa
 # default login url
 LOGIN_URL = '/account/login/'
 
-GEOSERVER_LOCATION = 'http://geoserver:8080/geoserver/'
-GEOSERVER_PUBLIC_LOCATION = 'http://geoserver:8080/geoserver/'
+GEOSERVER_LOCATION = 'http://localhost:33308/geoserver/'
+GEOSERVER_PUBLIC_LOCATION = 'http://localhost:33308/geoserver/'
 
 OGC_SERVER = {
     'default': {
diff --git a/django_project/core/urls.py b/django_project/core/urls.py
index 5f1ebbf..89a3480 100644
--- a/django_project/core/urls.py
+++ b/django_project/core/urls.py
@@ -3,6 +3,8 @@ from django.contrib import admin
 from django.conf.urls.i18n import i18n_patterns
 from django.views.generic import TemplateView
 
+import geonode
+
 admin.autodiscover()
 
 urlpatterns = i18n_patterns(
@@ -17,3 +19,5 @@ urlpatterns = i18n_patterns(
     url(r'^geonode/groups/', include('geonode.groups.urls')),
     url(r'^geonode/', include('geonode.urls')),
 )
+
+urlpatterns += geonode.proxy.urls.urlpatterns