Merge 'develop' => Update to 1.0.0b51

docker/settings.py

@@ -161,6 +161,10 @@ DATABASES = {
     },
 }
 
+DATABASE_ROUTERS = [
+    'config.routers.DefaultRouter',
+]
+
 # Password validation
 # https://docs.djangoproject.com/en/3.1/ref/settings/#auth-password-validators
 
@@ -228,6 +232,7 @@ DEFAULT_FROM_EMAIL = config('DEFAULT_FROM_EMAIL', default='')
 
 ONEGEOSUITE_EMAIL_SUBJECT_PREFIX = config('EMAIL_SUBJECT_PREFIX', default='ONEGEO-SUITE |')
 ONEGEOSUITE_EMAIL_FOOTER = config('EMAIL_FOOTER', default=None)
+ONEGEOSUITE_SUPERUSER_EMAIL_NOTIFICATION = False
 
 # Static and media files
 STATIC_URL = config('STATIC_URL', default='/static/')
@@ -294,21 +299,14 @@ ONEGEO_RESOURCE_FTP_DROP_DIR = config('FTP_DROP_DIR', default='drop_here')
 
 # onegeo-datapusher settings:
 
-DATASTORE_DB_HOST = config('DATAPUSHER_DB_HOST', default=DEFAULT_DB_HOST)
-DATASTORE_DB_PORT = config('DATAPUSHER_DB_PORT', default=DEFAULT_DB_PORT)
-DATASTORE_DB_USER = config('DATAPUSHER_DB_USER', default=DEFAULT_DB_USER)
-DATASTORE_DB_PASSWORD = config('DATAPUSHER_DB_PWD', default=DEFAULT_DB_PASSWORD)
-
-DATASTORE_DB_NAME_DEFAULT = config('DATAPUSHER_DB_NAME', default=DEFAULT_DB_NAME)
-
 ONEGEOSUITE_DATASTORES_DBASE = {
     'default': {
         'ENGINE': 'onegeo_suite.contrib.onegeo_geospatial.db.backends.postgis',
-        'HOST': DATASTORE_DB_HOST,
-        'PORT': DATASTORE_DB_PORT,
-        'NAME': DATASTORE_DB_NAME_DEFAULT,
-        'USER': DATASTORE_DB_USER,
-        'PASSWORD': DATASTORE_DB_PASSWORD,
+        'HOST': config('DATAPUSHER_DB_HOST', default=DEFAULT_DB_HOST),
+        'PORT': config('DATAPUSHER_DB_PORT', default=DEFAULT_DB_PORT),
+        'NAME': config('DATAPUSHER_DB_NAME', default=DEFAULT_DB_NAME),
+        'USER': config('DATAPUSHER_DB_USER', default=DEFAULT_DB_USER),
+        'PASSWORD': config('DATAPUSHER_DB_PWD', default=DEFAULT_DB_PASSWORD),
     },
 }
 
@@ -399,4 +397,3 @@ if ONEGEOSUITE_SSO == 'OpenIDConnect':
             'handlers': ['console'],
             'level': 'DEBUG'
         }
-

docker/triggers.py

 """
-Django triggers for pigma project.
+Django Onegeo Core triggers.
 
 """
 

docker/urls.py

@@ -3,8 +3,8 @@ Django URL Configuration for ONEGEO-SUITE project.
 
 """
 
-import urllib3
 from six.moves.urllib.parse import urlencode
+import urllib3
 
 from django.conf.urls import include
 from django.urls import path
@@ -16,6 +16,7 @@ from drfreverseproxy.utilites import encode_items
 
 
 class ServiceProxyView(ProxyView):
+
     upstream = 'http://localhost'
 
     def _created_proxy_response(self, request, path):
@@ -26,7 +27,7 @@ class ServiceProxyView(ProxyView):
         path = ''
         request_url = (self.upstream + '/' if path and self.upstream[-1] != '/' else self.upstream) + path
 
-        if not '?' in request_url: #fix bug for POST request (line 40 add a '&' to url even if no '?' )
+        if '?' not in request_url:  # fix bug for POST request (line 40 add a '&' to url even if no '?' )
             request_url += '?'
         self.log.debug("Request URL: %s", request_url)
 
@@ -44,10 +45,8 @@ class ServiceProxyView(ProxyView):
 
         domain = request_url[8:].split('/')[0]
 
-        if not (domain.endswith('org')
-                or domain.endswith('fr')
-                or domain.endswith('com')):
-            raise Exception('Invalid domain Url')
+        if not (domain.endswith('org') or domain.endswith('fr') or domain.endswith('com')):
+            raise Exception("Invalid domain Url")
 
         try:
             proxy_response = self.http.urlopen(
@@ -78,6 +77,7 @@ urlpatterns = [
     path('organisation/', include('onegeo_suite.contrib.onegeo_organisation.urls')),
     path('login/', include('onegeo_suite.contrib.onegeo_login.urls')),
     path('dataset/', include('onegeo_suite.contrib.onegeo_dataset.urls')),
+    path('dataset/', include('onegeo_suite.contrib.onegeo_geonet.urls')),
     path('resource/', include('onegeo_suite.contrib.onegeo_resource.urls')),
     path('indexer/', include('onegeo_suite.contrib.onegeo_indexer.urls')),
     path('geoserv/', include('onegeo_suite.contrib.onegeo_geoserv.urls')),

env

 # Sample .env
 
+C_FORCE_ROOT=1
+
+# settings.py
+# ===========
+
 SECRET_KEY=
-ALLOWED_HOSTS=
 DEBUG=
 LOG_LEVEL=
-
-PUBLIC_BASE_URL=
+ALLOWED_HOSTS=
 
 DB_HOST=
 DB_PORT=
+DB_PORT_READONLY=
 DB_USER=
 DB_PWD=
 DB_NAME=
-
-DATAPUSHER_DB_HOST=
-DATAPUSHER_DB_PORT=
-DATAPUSHER_DB_USER=
-DATAPUSHER_DB_PWD=
-DATAPUSHER_DB_NAME=
-DATAPUSHER_DATA_WS_UPSTREAM=
-DATAPUSHER_DATA_WS_EXTERNAL_URL=
-
-FTP_HOST=
-FTP_PORT=
-FTP_SECURE=
-FTP_BASE_DIR=
-FTP_DROP_DIR=
+DATABASE_FOR_READ=
+DATABASE_FOR_WRITE=
 
 EMAIL_BACKEND=
 EMAIL_HOST=
 EMAIL_PORT=
-EMAIL_USE_TLS=
 EMAIL_HOST_USER=
 EMAIL_HOST_PASSWORD=
+EMAIL_USE_TLS=
 DEFAULT_FROM_EMAIL=
 EMAIL_SUBJECT_PREFIX=
 EMAIL_FOOTER=
@@ -41,12 +33,32 @@ REDIS_HOST=
 REDIS_PORT=
 REDIS_BASE=
 
+PUBLIC_BASE_URL=
+
+FTP_HOST=
+FTP_PORT=
+FTP_SECURE=
+FTP_BASE_DIR=
+FTP_GROUP_PREFIX=
+FTP_DROP_DIR=
+
+DATAPUSHER_DB_HOST=
+DATAPUSHER_DB_PORT=
+DATAPUSHER_DB_USER=
+DATAPUSHER_DB_PWD=
+DATAPUSHER_DB_NAME=
+DATAPUSHER_DATA_WS_UPSTREAM=
+DATAPUSHER_DATA_WS_EXTERNAL_URL=
+
 GEOSERVER_OWS_EXTERNAL_URL=
 GEOSERVER_GWC_UPSTREAM=
 GEOSERVER_OWS_UPSTREAM=
 GEOSERVER_LOCATION=
 GEOSERVER_USER=
 GEOSERVER_PWD=
+GEOSERVER_WMS_FORMAT_LIST=
+GEOSERVER_WFS_FORMAT_LIST=
+GEOSERVER_WCS_FORMAT_LIST=
 
 GEONETWORK_CATALOG_UUID=
 GEONETWORK_EXTERNAL_URL=
@@ -54,31 +66,28 @@ GEONETWORK_SRV_BASE_URL=
 GEONETWORK_USERNAME=
 GEONETWORK_PASSWORD=
 
-PUBLIC_PORTAL_DATASET_PATTERN_URL=
-
 INDEXER_ELASTIC_UPSTREAM=
 INDEXER_ELASTIC_HOST=
 INDEXER_ELASTIC_PORT=
 INDEXER_ELASTIC_PREFIX=
 INDEXER_ELASTIC_SSL=
+INDEXER_ELASTIC_TIMEOUT=
 INDEXER_ELASTIC_INDEX=
 INDEXER_ELASTIC_REPLICAS=
 INDEXER_ELASTIC_SHARDS=
 INDEXER_EXPORT_DIR=
 
-C_FORCE_ROOT=1
+PUBLIC_PORTAL_DATASET_PATTERN_URL=
 
 SSO=
-
 OIDC_RP_CLIENT_ID=
 OIDC_RP_CLIENT_SECRET=
-OIDC_OP_AUTHORIZATION_ENDPOINT=http://localhost:8080/realms/OnegeoSuite/protocol/openid-connect/auth
-OIDC_OP_TOKEN_ENDPOINT=http://localhost:8080/realms/OnegeoSuite/protocol/openid-connect/token
-OIDC_OP_USER_ENDPOINT=http://localhost:8080/realms/OnegeoSuite/protocol/openid-connect/userinfo
-OIDC_OP_JWKS_ENDPOINT=http://localhost:8080/realms/OnegeoSuite/protocol/openid-connect/certs
-
-OIDC_RP_SIGN_ALGO=RS256
-
-LOGIN_REDIRECT_URL=http://localhost:8000/admin
-LOGIN_URL=oidc_authentication_init
-LOGOUT_URL=onegeo_login:signout
+OIDC_RP_SIGN_ALGO=
+OIDC_OP_AUTHORIZATION_ENDPOINT=
+OIDC_OP_JWKS_ENDPOINT=
+OIDC_OP_TOKEN_ENDPOINT=
+OIDC_OP_USER_ENDPOINT=
+
+LOGIN_REDIRECT_URL=
+LOGIN_URL=
+LOGOUT_URL=

requirements.txt

@@ -2,7 +2,7 @@
 elasticsearch==7.13.0
 -e git+https://github.com/neogeo-technologies/OWSLib.git@neogeo/0.25.0#egg=OWSLib
 
--e git+https://docker-onegeo-suite:D7S9gajfakqgzRwsAxB4@git.neogeo.fr/onegeo-suite/apps/django-onegeo-suite.git@1.0.0b49#egg=django_onegeo_suite
+-e git+https://docker-onegeo-suite:D7S9gajfakqgzRwsAxB4@git.neogeo.fr/onegeo-suite/apps/django-onegeo-suite.git@1.0.0b51#egg=django_onegeo_suite
 -e git+https://docker-onegeo-suite:D7S9gajfakqgzRwsAxB4@git.neogeo.fr/onegeo-suite/apps/django-onegeo-rproxy-mapstore2.git@1.0.0b1#egg=django_onegeo_rproxy_mapstore2
 -e git+https://github.com/danpoland/drf-reverse-proxy@master#egg=drf-reverse-proxy
 python-decouple