Skip to content

Commit 63f15c9

Browse files
authored
[Fixes GeoNode#7852] Update catalog and background layers url configuration in settings.py and related files (GeoNode#9950)
* -[Fixes GeoNode#7852] Update catalog and background layers url configuration in settings.py and related files * - update geoid url
1 parent 64e9aab commit 63f15c9

File tree

16 files changed

+60
-66
lines changed

16 files changed

+60
-66
lines changed

CODE_OF_CONDUCT.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ further defined and clarified by project maintainers.
5555
## Enforcement
5656

5757
Instances of abusive, harassing, or otherwise unacceptable behavior may be
58-
reported by contacting the project team via alessio.fabiani@geo-solutions.it . All
58+
reported by contacting the project team via alessio.fabiani@geosolutionsgroup.com . All
5959
complaints will be reviewed and investigated and will result in a response that
6060
is deemed necessary and appropriate to the circumstances. The project team is
6161
obligated to maintain confidentiality with regard to the reporter of an incident.

celery-cmd

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22
# A configurable celery command.
3-
# Luca Pasquali <luca.pasquali@geo-solutions.it>
3+
# Luca Pasquali <luca.pasquali@geosolutionsgroup.com>
44
CELERY_BIN=${CELERY_BIN:-"$(which celery||echo celery)"}
55
CELERY_APP=${CELERY_APP:-"geonode.celery_app:app"}
66
CELERY__STATE_DB=${CELERY__STATE_DB:-"/mnt/volumes/statics/worker.state"}

geonode/local_settings.py.geoserver.sample

+13-11
Original file line numberDiff line numberDiff line change
@@ -315,14 +315,6 @@ if GEONODE_CLIENT_LAYER_PREVIEW_LIBRARY == 'mapstore':
315315

316316
GEONODE_CATALOGUE_SERVICE = get_geonode_catalogue_service()
317317

318-
MAPSTORE_CATALOGUE_SERVICES = {}
319-
320-
MAPSTORE_CATALOGUE_SELECTED_SERVICE = ""
321-
322-
if GEONODE_CATALOGUE_SERVICE:
323-
MAPSTORE_CATALOGUE_SERVICES[list(GEONODE_CATALOGUE_SERVICE.keys())[0]] = GEONODE_CATALOGUE_SERVICE[list(GEONODE_CATALOGUE_SERVICE.keys())[0]]
324-
MAPSTORE_CATALOGUE_SELECTED_SERVICE = list(GEONODE_CATALOGUE_SERVICE.keys())[0]
325-
326318
DEFAULT_MS2_BACKGROUNDS = [
327319
{
328320
"type": "tileprovider",
@@ -377,10 +369,20 @@ if GEONODE_CLIENT_LAYER_PREVIEW_LIBRARY == 'mapstore':
377369
"format": "image/jpeg",
378370
"id": "s2cloudless",
379371
"name": "s2cloudless:s2cloudless",
380-
"url": "https://maps.geo-solutions.it/geoserver/wms",
372+
"url": [
373+
"https://maps1.geosolutionsgroup.com/geoserver/wms",
374+
"https://maps2.geosolutionsgroup.com/geoserver/wms",
375+
"https://maps3.geosolutionsgroup.com/geoserver/wms",
376+
"https://maps4.geosolutionsgroup.com/geoserver/wms",
377+
"https://maps5.geosolutionsgroup.com/geoserver/wms",
378+
"https://maps6.geosolutionsgroup.com/geoserver/wms"
379+
],
381380
"group": "background",
382-
"thumbURL": "%sstatic/mapstorestyle/img/s2cloudless-s2cloudless.png" % SITEURL,
383-
"visibility": False
381+
"thumbURL": f"{SITEURL}static/mapstorestyle/img/s2cloudless-s2cloudless.png",
382+
"visibility": False,
383+
"credits": {
384+
"title": "<a class=\"a-light\" xmlns:dct=\"http://purl.org/dc/terms/\" href=\"https://s2maps.eu\" property=\"dct:title\">Sentinel-2 cloudless 2016</a> by <a class=\"a-light\" xmlns:cc=\"http://creativecommons.org/ns#\" href=\"https://eox.at\" property=\"cc:attributionName\" rel=\"cc:attributionURL\">EOX IT Services GmbH</a>"
385+
}
384386
},
385387
{
386388
"source": "ol",

geonode/locale/it/LC_MESSAGES/django.po

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
# Antonio <anto.opro@gmail.com>, 2013
3434
# Paolo Corti <pcorti@gmail.com>, 2013
3535
# Stefano Menegon <ste.menegon@gmail.com>, 2015
36-
# Alessio Fabiani <alessio.fabiani@geo-solutions.it>, 2021
36+
# Alessio Fabiani <alessio.fabiani@geosolutionsgroup.com>, 2021
3737
msgid ""
3838
msgstr ""
3939
"Project-Id-Version: GeoNode\n"

geonode/maps/api/tests.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ def test_create_map(self):
293293
},
294294
{
295295
"id": "s2cloudless",
296-
"url": "https://maps.geo-solutions.it/geoserver/wms",
296+
"url": "https://maps.geosolutionsgroup.com.it/geoserver/wms",
297297
"name": "s2cloudless:s2cloudless",
298298
"type": "wms",
299299
"group": "background",

geonode/monitoring/tests/resources/req.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko)
2121
</remoteUserAgent>
2222
<remoteLat>0.0</remoteLat>
2323
<remoteLon>0.0</remoteLon>
24-
<host>demo.geo-solutions.it</host>
24+
<host>demo.geosolutionsgroup.com</host>
2525
<internalHost>ks390295.kimsufi.com</internalHost>
2626
<service>WMS</service>
2727
<operation>GetMap</operation>
@@ -33,7 +33,7 @@ Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko)
3333
<responseContentType>image/png</responseContentType>
3434
<responseStatus>200</responseStatus>
3535
<httpReferer>
36-
http://dev.mapstore2.geo-solutions.it/mapstore/examples/api/?map=Prueba
36+
http://dev.mapstore2.geosolutionsgroup.com/mapstore/examples/api/?map=Prueba
3737
</httpReferer>
3838
<bbox class="org.geotools.geometry.jts.ReferencedEnvelope">
3939
<minx>-45.00000000000001</minx>

geonode/monitoring/tests/resources/req_err.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<remoteUserAgent>Mozilla/5.0 (Windows NT 6.3; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.110 Safari/537.36</remoteUserAgent>
1818
<remoteLat>0.0</remoteLat>
1919
<remoteLon>0.0</remoteLon>
20-
<host>demo.geo-solutions.it</host>
20+
<host>demo.geosolutionsgroup.com</host>
2121
<internalHost>ks390295.kimsufi.com</internalHost>
2222
<service>WMS</service>
2323
<operation>GetMap</operation>
@@ -443,7 +443,7 @@
443443
<exceptionText/>
444444
</error>
445445
<responseStatus>200</responseStatus>
446-
<httpReferer>http://mapstore2.geo-solutions.it/mapstore/</httpReferer>
446+
<httpReferer>http://mapstore2.geosolutionsgroup.com/mapstore/</httpReferer>
447447
<bbox class="org.geotools.geometry.jts.ReferencedEnvelope">
448448
<minx>-56.25000000000001</minx>
449449
<maxx>-45.00000000000001</maxx>

geonode/services/test_selenium.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ def setUpClass(cls):
5454
reg_url = reverse('register_service')
5555
cls.client.get(reg_url)
5656

57-
url = 'https://demo.geo-solutions.it/geoserver/ows?service=wms&version=1.3.0&request=GetCapabilities'
57+
url = 'https://demo.geosolutionsgroup.com/geoserver/ows?service=wms&version=1.3.0&request=GetCapabilities'
5858
service_type = enumerations.WMS
5959
form_data = {
6060
'url': url,

geonode/services/tests.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -812,7 +812,7 @@ def test_local_user_cant_delete_service(self):
812812
self.client.logout()
813813
response = self.client.get(reverse('register_service'))
814814
self.assertEqual(response.status_code, 302)
815-
url = 'https://demo.geo-solutions.it/geoserver/ows?service=wms&version=1.3.0&request=GetCapabilities'
815+
url = 'https://maps.geosolutionsgroup.com/geoserver/ows?service=wms&version=1.3.0&request=GetCapabilities'
816816
# url = "http://fake"
817817
service_type = enumerations.WMS
818818
form_data = {
@@ -858,14 +858,14 @@ def test_local_user_cant_delete_service(self):
858858
@flaky(max_runs=3)
859859
def test_add_duplicate_remote_service_url(self):
860860
form_data = {
861-
'url': 'https://demo.geo-solutions.it/geoserver/ows?service=wms&version=1.3.0&request=GetCapabilities',
861+
'url': 'https://demo.geosolutionsgroup.com/geoserver/ows?service=wms&version=1.3.0&request=GetCapabilities',
862862
'type': enumerations.WMS
863863
}
864864

865865
self.client.login(username='serviceowner', password='somepassword')
866866

867867
# Add the first resource
868-
url = 'https://demo.geo-solutions.it/geoserver/ows?service=wms&version=1.3.0&request=GetCapabilities'
868+
url = 'https://demo.geosolutionsgroup.com/geoserver/ows?service=wms&version=1.3.0&request=GetCapabilities'
869869
# url = "http://fake"
870870
service_type = enumerations.WMS
871871
form_data = {
@@ -911,7 +911,7 @@ def setUpClass(cls):
911911
reg_url = reverse('register_service')
912912
cls.client.get(reg_url)
913913

914-
url = 'https://demo.geo-solutions.it/geoserver/ows?service=wms&version=1.3.0&request=GetCapabilities'
914+
url = 'https://demo.geosolutionsgroup.com/geoserver/ows?service=wms&version=1.3.0&request=GetCapabilities'
915915
service_type = enumerations.WMS
916916
form_data = {
917917
'url': url,

geonode/settings.py

+1-9
Original file line numberDiff line numberDiff line change
@@ -1463,14 +1463,6 @@ def get_geonode_catalogue_service():
14631463

14641464
GEONODE_CATALOGUE_SERVICE = get_geonode_catalogue_service()
14651465

1466-
MAPSTORE_CATALOGUE_SERVICES = {}
1467-
1468-
MAPSTORE_CATALOGUE_SELECTED_SERVICE = ""
1469-
1470-
if GEONODE_CATALOGUE_SERVICE:
1471-
MAPSTORE_CATALOGUE_SERVICES[list(list(GEONODE_CATALOGUE_SERVICE.keys()))[0]] = GEONODE_CATALOGUE_SERVICE[list(list(GEONODE_CATALOGUE_SERVICE.keys()))[0]] # noqa
1472-
MAPSTORE_CATALOGUE_SELECTED_SERVICE = list(list(GEONODE_CATALOGUE_SERVICE.keys()))[0]
1473-
14741466
DEFAULT_MS2_BACKGROUNDS = [
14751467
{
14761468
"type": "osm",
@@ -1493,7 +1485,7 @@ def get_geonode_catalogue_service():
14931485
"format": "image/jpeg",
14941486
"id": "s2cloudless",
14951487
"name": "s2cloudless:s2cloudless",
1496-
"url": "https://maps.geo-solutions.it/geoserver/wms",
1488+
"url": "https://maps.geosolutionsgroup.com/geoserver/wms",
14971489
"group": "background",
14981490
"thumbURL": f"{SITEURL}static/mapstorestyle/img/s2cloudless-s2cloudless.png",
14991491
"visibility": False

geonode/thumbs/tests/fixtures/map_dataset.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"map":1002,
3535
"name":"s2cloudless:s2cloudless",
3636
"store":null,
37-
"ows_url":"https://maps.geo-solutions.it/geoserver/wms",
37+
"ows_url":"https://maps.geosolutionsgroup.com/geoserver/wms",
3838
"extra_params":{
3939
"msId":"s2cloudless"
4040
},
@@ -105,7 +105,7 @@
105105
"map":1009,
106106
"name":"s2cloudless:s2cloudless",
107107
"store":null,
108-
"ows_url":"https://maps.geo-solutions.it/geoserver/wms",
108+
"ows_url":"https://maps.geosolutionsgroup.com/geoserver/wms",
109109
"extra_params":{
110110
"msId":"s2cloudless"
111111
},

geonode/thumbs/tests/test_unit.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ def test_datasets_locations_simple_map(self):
221221
map=map,
222222
name="Meteorite_Landings_from_NASA_Open_Data_Portal1",
223223
current_style="test_style",
224-
ows_url="https://maps.geo-solutions.it/geoserver/wms",
224+
ows_url="https://maps.geosolutionsgroup.com/geoserver/wms",
225225
).save()
226226
locations, bbox = thumbnails._datasets_locations(map)
227227

package/debian/changelog

+20-20
Original file line numberDiff line numberDiff line change
@@ -694,13 +694,13 @@ geonode (2.10.0+rc4) bionic; urgency=high
694694
* [07549481d] 2018-01-16 - (Alessio Fabiani ) [Fixes #3568] - Fix, improve and adapt Backup/Restore Scripts to GeoNode 2.6+ (#3571)
695695
* [da4b12b92] 2018-01-15 - (Ricardo Garcia ..) added support for KML and KMZ with GroundOverlay
696696

697-
-- Alessio Fabiani <alessio.fabiani@geo-solutions.it> Tue, 21 Aug 2018 16:47:18 +0200
697+
-- Alessio Fabiani <alessio.fabiani@geosolutionsgroup.com> Tue, 21 Aug 2018 16:47:18 +0200
698698

699699
geonode (2.8.0+thefinal1) xenial; urgency=high
700700
* [514196] Update README
701701
* [f6dd15] Constrain pip to 9.0.3
702702

703-
-- Alessio Fabiani <alessio.fabiani@geo-solutions.it> Thu, 26 Apr 2018 12:44:14 +0200
703+
-- Alessio Fabiani <alessio.fabiani@geosolutionsgroup.com> Thu, 26 Apr 2018 12:44:14 +0200
704704

705705
geonode (2.8.0+thefinal0) xenial; urgency=high
706706
[ afabiani ]
@@ -729,7 +729,7 @@ geonode (2.8.0+thefinal0) xenial; urgency=high
729729
[ Alessio Fabiani ]
730730
* [48eea1] Release 2.8.0
731731

732-
-- Alessio Fabiani <alessio.fabiani@geo-solutions.it> Tue, 03 Apr 2018 10:40:23 +0200
732+
-- Alessio Fabiani <alessio.fabiani@geosolutionsgroup.com> Tue, 03 Apr 2018 10:40:23 +0200
733733

734734
geonode (2.8.0+rc12) xenial; urgency=high
735735
[ Alessio Fabiani ]
@@ -785,57 +785,57 @@ geonode (2.8.0+rc12) xenial; urgency=high
785785

786786
[ Alessio Fabiani ]
787787

788-
-- Alessio Fabiani <alessio.fabiani@geo-solutions.it> Fri, 30 Mar 2018 11:55:49 +0200
788+
-- Alessio Fabiani <alessio.fabiani@geosolutionsgroup.com> Fri, 30 Mar 2018 11:55:49 +0200
789789

790790
geonode (2.8.0+rc10) xenial; urgency=high
791791

792792
* [c8abc4] GeoNode 2.7.5.dev20180123130714
793793

794-
-- Alessio Fabiani <alessio.fabiani@geo-solutions.it> Wed, 24 Jan 2018 16:41:05 +0100
794+
-- Alessio Fabiani <alessio.fabiani@geosolutionsgroup.com> Wed, 24 Jan 2018 16:41:05 +0100
795795

796796
geonode (2.7.5+dev20180123112419) xenial; urgency=high
797797
* [dd4a19] [Fixes #3568] - Fix, improve and adapt Backup/Restore Scripts to GeoNode 2.6+ (#3571)
798798
* [c8bd21] [Fixes #3565 #3566] Topic Category is no more visible on the Layer summary list / If a Resource belongs to a Group, it should be also visible on the summary list
799799

800-
-- Alessio Fabiani <alessio.fabiani@geo-solutions.it> Tue, 23 Jan 2018 14:06:12 +0100
800+
-- Alessio Fabiani <alessio.fabiani@geosolutionsgroup.com> Tue, 23 Jan 2018 14:06:12 +0100
801801

802802
geonode (2.8.0+rc9) xenial; urgency=high
803803

804804
* UNRELEASED
805805

806-
-- Alessio Fabiani <alessio.fabiani@geo-solutions.it> Mon, 22 Jan 2018 17:00:01 +0100
806+
-- Alessio Fabiani <alessio.fabiani@geosolutionsgroup.com> Mon, 22 Jan 2018 17:00:01 +0100
807807

808808
geonode (2.8.0+rc8) xenial; urgency=high
809809

810810
* UNRELEASED
811811

812-
-- Alessio Fabiani <alessio.fabiani@geo-solutions.it> Mon, 22 Jan 2018 16:07:49 +0100
812+
-- Alessio Fabiani <alessio.fabiani@geosolutionsgroup.com> Mon, 22 Jan 2018 16:07:49 +0100
813813

814814
geonode (2.8.0+rc7) xenial; urgency=high
815815

816816
* [d4e678] - GeoNode Releasing 2.8.0rc3
817817
* [f61c3a] - GeoNode 2.8rc6
818818
* [82927b] - GeoNode 2.8
819819

820-
-- Alessio Fabiani <alessio.fabiani@geo-solutions.it> Mon, 22 Jan 2018 15:12:04 +0100
820+
-- Alessio Fabiani <alessio.fabiani@geosolutionsgroup.com> Mon, 22 Jan 2018 15:12:04 +0100
821821

822822
geonode (2.8.0+rc6) xenial; urgency=high
823823

824824
* UNRELEASED
825825

826-
-- Alessio Fabiani <alessio.fabiani@geo-solutions.it> Fri, 19 Jan 2018 02:42:42 +0100
826+
-- Alessio Fabiani <alessio.fabiani@geosolutionsgroup.com> Fri, 19 Jan 2018 02:42:42 +0100
827827

828828
geonode (2.8.0+rc5) xenial; urgency=high
829829

830830
* UNRELEASED
831831

832-
-- Alessio Fabiani <alessio.fabiani@geo-solutions.it> Fri, 19 Jan 2018 01:59:18 +0100
832+
-- Alessio Fabiani <alessio.fabiani@geosolutionsgroup.com> Fri, 19 Jan 2018 01:59:18 +0100
833833

834834
geonode (2.8.0+rc4) xenial; urgency=high
835835

836836
* [b92c19] - GeoNode Releasing 2.8.0rc3
837837

838-
-- Alessio Fabiani <alessio.fabiani@geo-solutions.it> Fri, 19 Jan 2018 01:17:22 +0100
838+
-- Alessio Fabiani <alessio.fabiani@geosolutionsgroup.com> Fri, 19 Jan 2018 01:17:22 +0100
839839

840840
geonode (2.8.0+rc3) xenial; urgency=high
841841

@@ -845,25 +845,25 @@ geonode (2.8.0+rc3) xenial; urgency=high
845845
[ Alessio Fabiani ]
846846
* [f8b945] - GeoNode Releasing
847847

848-
-- Alessio Fabiani <alessio.fabiani@geo-solutions.it> Thu, 18 Jan 2018 20:39:58 +0100
848+
-- Alessio Fabiani <alessio.fabiani@geosolutionsgroup.com> Thu, 18 Jan 2018 20:39:58 +0100
849849

850850
geonode (2.8.0+rc2) xenial; urgency=high
851851

852852
* UNRELEASED
853853

854-
-- Alessio Fabiani <alessio.fabiani@geo-solutions.it> Thu, 18 Jan 2018 11:34:09 +0100
854+
-- Alessio Fabiani <alessio.fabiani@geosolutionsgroup.com> Thu, 18 Jan 2018 11:34:09 +0100
855855

856856
geonode (2.8.0+rc1) xenial; urgency=high
857857

858858
* UNRELEASED
859859

860-
-- Alessio Fabiani <alessio.fabiani@geo-solutions.it> Wed, 17 Jan 2018 18:50:18 +0100
860+
-- Alessio Fabiani <alessio.fabiani@geosolutionsgroup.com> Wed, 17 Jan 2018 18:50:18 +0100
861861

862862
geonode (2.8.0+rc0) xenial; urgency=high
863863

864864
* UNRELEASED
865865

866-
-- Alessio Fabiani <alessio.fabiani@geo-solutions.it> Wed, 17 Jan 2018 18:45:44 +0100
866+
-- Alessio Fabiani <alessio.fabiani@geosolutionsgroup.com> Wed, 17 Jan 2018 18:45:44 +0100
867867

868868
geonode (2.8.0+rc0) xenial; urgency=high
869869

@@ -875,7 +875,7 @@ geonode (2.8.0+rc0) xenial; urgency=high
875875
* [27db87] - Fix GeoNode 2.6.3 to 2.7.x+ Migration (#3547)
876876
* [a1ed92] [2.7.x] - Prepare for 28x (#3551)
877877

878-
-- Alessio Fabiani <alessio.fabiani@geo-solutions.it> Mon, 15 Jan 2018 09:56:20 +0100
878+
-- Alessio Fabiani <alessio.fabiani@geosolutionsgroup.com> Mon, 15 Jan 2018 09:56:20 +0100
879879

880880
geonode (2.7.4+dev20171114153121) xenial; urgency=high
881881

@@ -1479,7 +1479,7 @@ geonode (2.7.4+dev20171114153121) xenial; urgency=high
14791479
[ Alessio Fabiani ]
14801480
* [20f27a] Allow sending messages to multiple users and groups
14811481

1482-
-- Alessio Fabiani <alessio.fabiani@geo-solutions.it> Tue, 14 Nov 2017 17:13:40 +0100
1482+
-- Alessio Fabiani <alessio.fabiani@geosolutionsgroup.com> Tue, 14 Nov 2017 17:13:40 +0100
14831483

14841484
geonode (2.7.1+dev20171013111656) xenial; urgency=high
14851485

@@ -1662,7 +1662,7 @@ geonode (2.7.1+dev20171013111656) xenial; urgency=high
16621662
* [66d4b0] - Improved Thumbnail Feedbacks
16631663
* [8bf09a] Merge with master
16641664

1665-
-- Alessio Fabiani <alessio.fabiani@geo-solutions.it> Fri, 13 Oct 2017 17:14:40 +0200
1665+
-- Alessio Fabiani <alessio.fabiani@geosolutionsgroup.com> Fri, 13 Oct 2017 17:14:40 +0200
16661666

16671667
geonode (2.7.0+thefinal0) xenial; urgency=high
16681668

@@ -2347,7 +2347,7 @@ geonode (2.7.0+thefinal0) xenial; urgency=high
23472347
* [b3f938] - Returns referencing infos on Layers Upload
23482348
* [b5a775] bump to version 2.7.0
23492349

2350-
-- Alessio Fabiani <alessio.fabiani@geo-solutions.it> Tue, 05 Sep 2017 16:43:18 +0200
2350+
-- Alessio Fabiani <alessio.fabiani@geosolutionsgroup.com> Tue, 05 Sep 2017 16:43:18 +0200
23512351

23522352
geonode (2.6.0+thefinal0) trusty; urgency=high
23532353

package/debian/control

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Source: geonode
2-
Maintainer: Alessio Fabiani <alessio.fabiani@geo-solutions.it>
2+
Maintainer: Alessio Fabiani <alessio.fabiani@geosolutionsgroup.com>
33
Section: python
44
Priority: optional
55
Standards-Version: 3.9.1

0 commit comments

Comments
 (0)