Merge pull request #606 from kartoza/develop

Version 4.2.0

.gitmodules

@@ -4,4 +4,8 @@
 [submodule "geonode"]
 	path = geonode
 	url = git@github.com:kartoza/geonode.git
-	branch = 4.0.4
+	branch = 4.1.1.igrac
+[submodule "istsos2"]
+	path = istsos2
+	url = git@github.com:meomancer/istsos2.git
+	branch = igrac

deployment/.env

@@ -1,61 +1,258 @@
-# Name of the setup (you only need to change this if you run several instances of the stack)
 COMPOSE_PROJECT_NAME=igrac
+DOCKERHOST=
+DOCKER_HOST_IP=
+# See https://github.com/containers/podman/issues/13889
+# DOCKER_BUILDKIT=0
+DOCKER_ENV=production
+# See https://github.com/geosolutions-it/geonode-generic/issues/28
+# to see why we force API version to 1.24
+DOCKER_API_VERSION="1.24"
+BACKUPS_VOLUME_DRIVER=local
 
-# IP or domain name and port where the server can be reached on HTTPS (leave HOST empty if you want to use HTTP only)
-HTTPS_HOST=
-HTTPS_PORT=443
+C_FORCE_ROOT=1
+FORCE_REINIT=false
+INVOKE_LOG_STDOUT=true
 
-# IP or domain name and port where the server can be reached on HTTP (leave HOST empty if you want to use HTTPS only)
-HTTP_HOST=127.0.0.1
-HTTP_PORT=80
+# LANGUAGE_CODE=pt
+# LANGUAGES=(('en-us','English'),('it-it','Italiano'))
 
-# Email where alters should be sent. This will be used by let's encrypt and as the django admin email.
-ADMIN_USERNAME=admin
-ADMIN_PASSWORD=kartoza_pass
-ADMIN_EMAIL=admin@example.com
+DJANGO_SETTINGS_MODULE=core.settings.prod
+GEONODE_INSTANCE_NAME=geonode
+GEONODE_LB_HOST_IP=
+GEONODE_LB_PORT=
+PUBLIC_PORT=80
+NGINX_BASE_URL=
 
-# Email settings
-EMAIL_HOST_USER=noreply
-EMAIL_HOST_PASSWORD=docker
-EMAIL_HOST=smtp
-EMAIL_HOST_DOMAIN=kartoza.com
-
-# Database environment
+# #################
+# backend
+# #################
 POSTGRES_USER=postgres
-## PostgreSQL superuser password (to be set if PostgreSQL is exposed)
 POSTGRES_PASSWORD=postgres
-## geonode specific variables
-## the standart geonode django database with non-spatial data
-## the db name and username are identical by design
 GEONODE_DATABASE=geonode
 GEONODE_DATABASE_USER=geonode
 GEONODE_DATABASE_PASSWORD=geonode
-## the spatial geonode django postigs database for data ingestion
-## the db name and username are identical by design
 GEONODE_GEODATABASE=geonode_data
 GEONODE_GEODATABASE_USER=geonode_data
-GEONODE_GEODATABASE_PASSWORD=geonode
+GEONODE_GEODATABASE_PASSWORD=geonode_data
+GEONODE_DATABASE_SCHEMA=public
+GEONODE_GEODATABASE_SCHEMA=public
+DATABASE_HOST=db
+DATABASE_PORT=5432
+DATABASE_URL=postgis://geonode:geonode@db:5432/geonode
+GEODATABASE_URL=postgis://geonode_data:geonode_data@db:5432/geonode_data
+GEONODE_DB_CONN_MAX_AGE=0
+GEONODE_DB_CONN_TOUT=5
+DEFAULT_BACKEND_DATASTORE=datastore
+BROKER_URL=amqp://guest:guest@rabbitmq:5672/
+CELERY_BEAT_SCHEDULER=celery.beat:PersistentScheduler
+ASYNC_SIGNALS=True
+
+SITEURL=http://localhost/
+
+ALLOWED_HOSTS=['django', '*']
+
+# Data Uploader
+DEFAULT_BACKEND_UPLOADER=geonode.importer
+TIME_ENABLED=True
+MOSAIC_ENABLED=False
+HAYSTACK_SEARCH=False
+HAYSTACK_ENGINE_URL=http://elasticsearch:9200/
+HAYSTACK_ENGINE_INDEX_NAME=haystack
+HAYSTACK_SEARCH_RESULTS_PER_PAGE=200
+
+# #################
+# nginx
+# HTTPD Server
+# #################
+GEONODE_LB_HOST_IP=localhost
+GEONODE_LB_PORT=80
 
-# Django secret key (replace this by any complex and random string)
-SECRET_KEY=1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ
+# IP or domain name and port where the server can be reached on HTTPS (leave HOST empty if you want to use HTTP only)
+# port where the server can be reached on HTTPS
+HTTP_HOST=127.0.0.1
+HTTPS_HOST=
+
+HTTP_PORT=80
+HTTPS_PORT=443
 
 # Let's Encrypt certificates for https encryption. You must have a domain name as HTTPS_HOST (doesn't work
 # with an ip) and it must be reachable from the outside. This can be one of the following :
 # disabled : we do not get a certificate at all (a placeholder certificate will be used)
 # staging : we get staging certificates (are invalid, but allow to test the process completely and have much higher limit rates)
 # production : we get a normal certificate (default)
 LETSENCRYPT_MODE=disabled
+# LETSENCRYPT_MODE=staging
+# LETSENCRYPT_MODE=production
 
-# Choose from https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
-TIME_ZONE=UTC
+RESOLVER=127.0.0.11
 
-# Whether users should be able to create accounts themselves
-REGISTRATION_OPEN=True
+# #################
+# geoserver
+# #################
+GEOSERVER_WEB_UI_LOCATION=http://localhost/geoserver/
+GEOSERVER_PUBLIC_LOCATION=http://localhost/geoserver/
+GEOSERVER_LOCATION=http://geoserver:8080/geoserver/
+GEOSERVER_ADMIN_USER=admin
+GEOSERVER_ADMIN_PASSWORD=admin
+
+OGC_REQUEST_TIMEOUT=30
+OGC_REQUEST_MAX_RETRIES=1
+OGC_REQUEST_BACKOFF_FACTOR=0.3
+OGC_REQUEST_POOL_MAXSIZE=10
+OGC_REQUEST_POOL_CONNECTIONS=10
+
+# Java Options & Memory
+ENABLE_JSONP=true
+outFormat=text/javascript
+GEOSERVER_JAVA_OPTS="-Djava.awt.headless=true -Xms2G -Xmx4G -Dgwc.context.suffix=gwc -XX:+UnlockDiagnosticVMOptions -XX:+LogVMOutput -XX:LogFile=/var/log/jvm.log -XX:PerfDataSamplingInterval=500 -XX:SoftRefLRUPolicyMSPerMB=36000 -XX:-UseGCOverheadLimit -XX:+UseConcMarkSweepGC -XX:ParallelGCThreads=4 -Dfile.encoding=UTF8 -Djavax.servlet.request.encoding=UTF-8 -Djavax.servlet.response.encoding=UTF-8 -Duser.timezone=GMT -Dorg.geotools.shapefile.datetime=false -DGS-SHAPEFILE-CHARSET=UTF-8 -DGEOSERVER_CSRF_DISABLED=true -DPRINT_BASE_URL=http://geoserver:8080/geoserver/pdf -DALLOW_ENV_PARAMETRIZATION=true -Xbootclasspath/a:/usr/local/tomcat/webapps/geoserver/WEB-INF/lib/marlin-0.9.3-Unsafe.jar -Dsun.java2d.renderer=org.marlin.pisces.MarlinRenderingEngine"
+PRINT_BASE_URL=http://localhost/geoserver/pdf
+
+# #################
+# Security
+# #################
+# Admin Settings
+#
+# ADMIN_PASSWORD is used to overwrite the GeoNode admin password **ONLY** the first time
+# GeoNode is run. If you need to overwrite it again, you need to set the env var FORCE_REINIT,
+# otherwise the invoke updateadmin task will be skipped and the current password already stored
+# in DB will honored.
+
+ADMIN_USERNAME=admin
+ADMIN_PASSWORD=admin
+ADMIN_EMAIL=admin@localhost
 
-# Rclone backup configuration for Amazon S3 (leave empty if you don't want to use S3)
-S3_ACCESS_KEY=
-S3_SECRET_KEY=
-S3_REGION=
-S3_BUCKET=
+# EMAIL Notifications
+EMAIL_ENABLE=False
+DJANGO_EMAIL_BACKEND=django.core.mail.backends.smtp.EmailBackend
+DJANGO_EMAIL_HOST=localhost
+DJANGO_EMAIL_PORT=25
+DJANGO_EMAIL_HOST_USER=
+DJANGO_EMAIL_HOST_PASSWORD=
+DJANGO_EMAIL_USE_TLS=False
+DJANGO_EMAIL_USE_SSL=False
+DEFAULT_FROM_EMAIL='GeoNode <no-reply@geonode.org>'
+
+# Session/Access Control
+LOCKDOWN_GEONODE=False
+CORS_ALLOW_ALL_ORIGINS=True
+X_FRAME_OPTIONS="SAMEORIGIN"
+SESSION_EXPIRED_CONTROL_ENABLED=True
+DEFAULT_ANONYMOUS_VIEW_PERMISSION=True
+DEFAULT_ANONYMOUS_DOWNLOAD_PERMISSION=True
+
+# Users Registration
+ACCOUNT_OPEN_SIGNUP=True
+ACCOUNT_EMAIL_REQUIRED=True
+ACCOUNT_APPROVAL_REQUIRED=False
+ACCOUNT_CONFIRM_EMAIL_ON_GET=False
+ACCOUNT_EMAIL_VERIFICATION=none
+ACCOUNT_AUTHENTICATION_METHOD=username_email
+AUTO_ASSIGN_REGISTERED_MEMBERS_TO_REGISTERED_MEMBERS_GROUP_NAME=True
+
+# OAuth2
+OAUTH2_API_KEY=
+OAUTH2_CLIENT_ID=Jrchz2oPY3akmzndmgUTYrs9gczlgoV20YPSvqaV
+OAUTH2_CLIENT_SECRET=rCnp5txobUo83EpQEblM8fVj3QT5zb5qRfxNsuPzCqZaiRyIoxM4jdgMiZKFfePBHYXCLd7B8NlkfDBY9HKeIQPcy5Cp08KQNpRHQbjpLItDHv12GvkSeXp6OxaUETv3
+
+# GeoNode APIs
+API_LOCKDOWN=False
+TASTYPIE_APIKEY=
+
+# #################
+# Production and
+# Monitoring
+# #################
+DEBUG=False
+
+SECRET_KEY='myv-y4#7j-d*p-__@j#*3z@!y24fz8%^z2v6atuy4bo9vqr1_a'
+
+STATIC_ROOT=/home/web/statics/static/
+MEDIA_ROOT=/home/web/statics/media/
+GEOIP_PATH=/home/web/statics/geoip.db
+
+CACHE_BUSTING_STATIC_ENABLED=False
+
+MEMCACHED_ENABLED=False
+MEMCACHED_BACKEND=django.core.cache.backends.memcached.MemcachedCache
+MEMCACHED_LOCATION=127.0.0.1:11211
+MEMCACHED_LOCK_EXPIRE=3600
+MEMCACHED_LOCK_TIMEOUT=10
+
+MAX_DOCUMENT_SIZE=2
+CLIENT_RESULTS_LIMIT=5
+API_LIMIT_PER_PAGE=1000
+
+# GIS Client
+GEONODE_CLIENT_LAYER_PREVIEW_LIBRARY=mapstore
+MAPBOX_ACCESS_TOKEN=
+BING_API_KEY=
+GOOGLE_API_KEY=
+
+# Monitoring
+MONITORING_ENABLED=False
+MONITORING_DATA_TTL=365
+USER_ANALYTICS_ENABLED=True
+USER_ANALYTICS_GZIP=True
+CENTRALIZED_DASHBOARD_ENABLED=False
+MONITORING_SERVICE_NAME=local-geonode
+MONITORING_HOST_NAME=geonode
+
+# Other Options/Contribs
+MODIFY_TOPICCATEGORY=True
+AVATAR_GRAVATAR_SSL=True
+EXIF_ENABLED=True
+CREATE_LAYER=True
+FAVORITE_ENABLED=True
+
+# Advanced Workflow
+RESOURCE_PUBLISHING=False
+ADMIN_MODERATE_UPLOADS=False
+
+# PostgreSQL
+POSTGRESQL_MAX_CONNECTIONS=200
+
+# Upload Size Limiting
+DEFAULT_MAX_UPLOAD_SIZE=5368709120
+DEFAULT_MAX_PARALLEL_UPLOADS_PER_USER=100
+
+# LDAP
+LDAP_ENABLED=False
+LDAP_SERVER_URL=ldap://<the_ldap_server>
+LDAP_BIND_DN=uid=ldapinfo,cn=users,dc=ad,dc=example,dc=org
+LDAP_BIND_PASSWORD=<something_secret>
+LDAP_USER_SEARCH_DN=dc=ad,dc=example,dc=org
+LDAP_USER_SEARCH_FILTERSTR=(&(uid=%(user)s)(objectClass=person))
+LDAP_GROUP_SEARCH_DN=cn=groups,dc=ad,dc=example,dc=org
+LDAP_GROUP_SEARCH_FILTERSTR=(|(cn=abt1)(cn=abt2)(cn=abt3)(cn=abt4)(cn=abt5)(cn=abt6))
+LDAP_GROUP_PROFILE_MEMBER_ATTR=uniqueMember
+
+# CELERY
+
+# expressed in KB
+# CELERY__MAX_MEMORY_PER_CHILD="200000"
+# ##
+# Note right autoscale value must coincide with worker concurrency value
+# CELERY__AUTOSCALE_VALUES="15,10"
+# CELERY__WORKER_CONCURRENCY="4"
+# ##
+# CELERY__OPTS="--without-gossip --without-mingle -Ofair -B -E"
+# CELERY__BEAT_SCHEDULE="/home/web/statics/celerybeat-schedule"
+# CELERY__LOG_LEVEL="INFO"
+# CELERY__LOG_FILE="/var/log/celery.log"
+# CELERY__WORKER_NAME="worker1@%h"
+
+# ------- IGRAC SPECIFIED ---------
+GWML_FOLDER=/home/web/statics/gwml2/
+SFTP_FOLDER=/home/web/statics/sftp/
+PYTHONPATH=/home/web/django_project:/geonode
+USE_DEFAULT_GEOSERVER_STYLE=False
+INITIAL_FIXTURES=True
 
 VERSION=4.2.0
+ISTSOS_VERSION=2.4.1-2
+
+# ------ GEOSERVER ------
+STABLE_EXTENSIONS=web-resource-plugin,netcdf-out-plugin
+NGINX_BASE_URL=http://nginx:80
+SAMPLE_DATA=FALSE
+GEOSERVER_DATA_DIR=/spcgeonode-geodatadir