[Fixes #14155] Fixes parameter order for mdict to set precedence from settings.PYCSW to pycsw_local defaults

.clabot

@@ -83,6 +83,7 @@
     "ZuitAMB",
     "marlowp",
     "sijandh35",
-    "mcihad"
+    "mcihad", 
+    "nrjadkry" 
   ]
 }

.devcontainer/.env

@@ -1,9 +1,6 @@
 COMPOSE_PROJECT_NAME=geonode
 DOCKER_HOST_IP=
 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
 
 C_FORCE_ROOT=1

.env.sample

@@ -2,9 +2,6 @@ COMPOSE_PROJECT_NAME=geonode
 # 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
 
 C_FORCE_ROOT=1
@@ -47,7 +44,6 @@ SITEURL={siteurl}/
 ALLOWED_HOSTS="['django', '{hostname}']"
 
 # Data Uploader
-DEFAULT_BACKEND_UPLOADER=geonode.importer
 TIME_ENABLED=True
 MOSAIC_ENABLED=False
 
@@ -156,7 +152,6 @@ OAUTH2_CLIENT_SECRET={clientsecret}
 
 # GeoNode APIs
 API_LOCKDOWN=False
-TASTYPIE_APIKEY=
 
 # #################
 # Production and
@@ -169,7 +164,6 @@ SECRET_KEY='{secret_key}'
 STATIC_ROOT=/mnt/volumes/statics/static/
 MEDIA_ROOT=/mnt/volumes/statics/uploaded/
 ASSETS_ROOT=/mnt/volumes/statics/assets/
-GEOIP_PATH=/mnt/volumes/statics/geoip.db
 
 CACHE_BUSTING_STATIC_ENABLED=False
 
@@ -192,7 +186,6 @@ GEONODE_CLIENT_LAYER_PREVIEW_LIBRARY=mapstore
 MAPBOX_ACCESS_TOKEN=
 GOOGLE_API_KEY=
 
-
 # Other Options/Contribs
 MODIFY_TOPICCATEGORY=True
 AVATAR_GRAVATAR_SSL=True
@@ -205,15 +198,15 @@ RESOURCE_PUBLISHING=False
 ADMIN_MODERATE_UPLOADS=False
 
 # 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
+#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
 
@@ -241,7 +234,6 @@ LDAP_GROUP_PROFILE_MEMBER_ATTR=uniqueMember
 HARVESTING_MONITOR_ENABLED=True
 HARVESTING_MONITOR_DELAY=60
 
-
 # PostgreSQL
 POSTGRESQL_MAX_CONNECTIONS=200
 
@@ -253,7 +245,4 @@ RESTART_POLICY_WINDOW=120s
 
 DEFAULT_MAX_PARALLEL_UPLOADS_PER_USER=5
 
-# FORCE_READ_ONLY_MODE=False Override the read-only value saved in the configuration
-
-# enable the generation of dynamic models in GeoNode
-IMPORTER_ENABLE_DYN_MODELS=False
+# FORCE_READ_ONLY_MODE=False Override the read-only value saved in the configuration

.env_dev

@@ -2,9 +2,6 @@ COMPOSE_PROJECT_NAME=geonode
 # 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
 
 C_FORCE_ROOT=1
@@ -50,7 +47,6 @@ SITEURL=http://localhost:8000/
 ALLOWED_HOSTS="['django', '*']"
 
 # Data Uploader
-DEFAULT_BACKEND_UPLOADER=geonode.importer
 TIME_ENABLED=True
 MOSAIC_ENABLED=False
 
@@ -158,7 +154,6 @@ OAUTH2_CLIENT_SECRET=rCnp5txobUo83EpQEblM8fVj3QT5zb5qRfxNsuPzCqZaiRyIoxM4jdgMiZK
 
 # GeoNode APIs
 API_LOCKDOWN=False
-TASTYPIE_APIKEY=
 
 # #################
 # Production and
@@ -168,7 +163,6 @@ DEBUG=True
 
 SECRET_KEY='myv-y4#7j-d*p-__@j#*3z@!y24fz8%^z2v6atuy4bo9vqr1_a'
 
-
 CACHE_BUSTING_STATIC_ENABLED=False
 
 MEMCACHED_ENABLED=False
@@ -212,6 +206,5 @@ RESTART_POLICY_MAX_ATTEMPTS="3"
 RESTART_POLICY_WINDOW=120s
 
 DEFAULT_MAX_PARALLEL_UPLOADS_PER_USER=5
-IMPORTER_ENABLE_DYN_MODELS=True
 UPSERT_CHUNK_SIZE= 100
 UPSERT_LIMIT_ERROR_LOG=100

.env_local

@@ -2,9 +2,6 @@ COMPOSE_PROJECT_NAME=geonode
 # 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
 
 C_FORCE_ROOT=1
@@ -50,7 +47,6 @@ SITEURL=http://localhost:8000/
 ALLOWED_HOSTS="['django', '*']"
 
 # Data Uploader
-DEFAULT_BACKEND_UPLOADER=geonode.importer
 TIME_ENABLED=True
 MOSAIC_ENABLED=False
 
@@ -158,7 +154,6 @@ OAUTH2_CLIENT_SECRET=rCnp5txobUo83EpQEblM8fVj3QT5zb5qRfxNsuPzCqZaiRyIoxM4jdgMiZK
 
 # GeoNode APIs
 API_LOCKDOWN=False
-TASTYPIE_APIKEY=
 
 # #################
 # Production and
@@ -170,7 +165,6 @@ SECRET_KEY='myv-y4#7j-d*p-__@j#*3z@!y24fz8%^z2v6atuy4bo9vqr1_a'
 
 # STATIC_ROOT=/mnt/volumes/statics/static/
 # MEDIA_ROOT=/mnt/volumes/statics/uploaded/
-# GEOIP_PATH=/mnt/volumes/statics/geoip.db
 
 CACHE_BUSTING_STATIC_ENABLED=False
 
@@ -215,5 +209,3 @@ RESTART_POLICY_MAX_ATTEMPTS="3"
 RESTART_POLICY_WINDOW=120s
 
 DEFAULT_MAX_PARALLEL_UPLOADS_PER_USER=5
-
-IMPORTER_ENABLE_DYN_MODELS=False

.env_test

@@ -2,9 +2,6 @@ COMPOSE_PROJECT_NAME=geonode
 # 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
 
 C_FORCE_ROOT=1
@@ -50,7 +47,6 @@ SITEURL=http://localhost:8000/
 ALLOWED_HOSTS="['django', 'localhost', '127.0.0.1']"
 
 # Data Uploader
-DEFAULT_BACKEND_UPLOADER=geonode.importer
 TIME_ENABLED=True
 MOSAIC_ENABLED=False
 
@@ -167,7 +163,6 @@ SOCIALACCOUNT_PROVIDER=google
 
 # GeoNode APIs
 API_LOCKDOWN=False
-TASTYPIE_APIKEY=
 
 # #################
 # Production and
@@ -179,7 +174,6 @@ SECRET_KEY='myv-y4#7j-d*p-__@j#*3z@!y24fz8%^z2v6atuy4bo9vqr1_a'
 
 STATIC_ROOT=/mnt/volumes/statics/static/
 MEDIA_ROOT=/mnt/volumes/statics/uploaded/
-GEOIP_PATH=/mnt/volumes/statics/geoip.db
 
 CACHE_BUSTING_STATIC_ENABLED=False
 
@@ -230,4 +224,3 @@ MICROSOFT_TENANT_ID=
 AZURE_CLIENT_ID=
 AZURE_SECRET_KEY=
 AZURE_KEY=
-IMPORTER_ENABLE_DYN_MODELS=False

celery-cmd

@@ -8,26 +8,52 @@ CELERY__STATE_DB=${CELERY__STATE_DB:-"/mnt/volumes/statics/worker@%h.state"}
 CELERY__MAX_MEMORY_PER_CHILD=${CELERY__MAX_MEMORY_PER_CHILD:-"200000"}
 CELERY__AUTOSCALE_VALUES=${CELERY__AUTOSCALE_VALUES:-"10,5"}
 CELERY__MAX_TASKS_PER_CHILD=${CELERY__MAX_TASKS_PER_CHILD:-"10"}
-CELERY__OPTS=${CELERY__OPTS:-"--without-gossip --without-mingle -Ofair -B -E"}
-CELERY__BEAT_SCHEDULE=${CELERY__BEAT_SCHEDULE:-"celery.beat:PersistentScheduler"}
+CELERY__OPTS=${CELERY__OPTS:-"--without-gossip --without-mingle -Ofair -E"}
 CELERY__LOG_LEVEL=${CELERY__LOG_LEVEL:-"ERROR"}
 CELERY__LOG_FILE=${CELERY__LOG_FILE:-"/var/log/celery.log"}
 CELERY__WORKER_NAME=${CELERY__WORKER_NAME:-"worker1@%h"}
 CELERY__WORKER_CONCURRENCY=${CELERY__WORKER_CONCURRENCY:-"4"}
 
+# Celery beat settings
+CELERY__BEAT_SCHEDULE=${CELERY__BEAT_SCHEDULE:-"celery.beat:PersistentScheduler"}
+CELERY__BEAT_LOG=${CELERY__BEAT_LOG:-"/var/log/celery_beat.log"}
+
 # Harvester settings
 CELERY__HARVESTER_WORKER_NAME=${CELERY__HARVESTER_WORKER_NAME:-"harvesting_worker@%h"}
 CELERY__HARVESTER_CONCURRENCY=${CELERY__HARVESTER_CONCURRENCY:-"10"}
 CELERY__HARVESTER_AUTOSCALE_VALUES=${CELERY__HARVESTER_AUTOSCALE_VALUES:-"15,10"}
 CELERY__HARVESTER_MAX_MEMORY_PER_CHILD=${CELERY__MAX_MEMORY_PER_CHILD:-"500000"}
 
+# --- FIX: Remove stale Beat pidfile before starting beat ---
+BEAT_PIDFILE="/tmp/celerybeat.pid"
+
+if [ -f "$BEAT_PIDFILE" ]; then
+    PID=$(cat "$BEAT_PIDFILE" 2>/dev/null)
+
+    # If PID exists and is running → warn but continue (avoid killing)
+    if kill -0 "$PID" 2>/dev/null; then
+        echo "WARNING: Celery Beat seems to be running already (PID $PID). Removing stale pidfile anyway."
+    else
+        echo "Removing stale Celery Beat pidfile: $BEAT_PIDFILE"
+    fi
+
+    rm -f "$BEAT_PIDFILE"
+fi
+# --- END FIX ---
+
+echo "Starting Celery Beat..."
+$CELERY_BIN -A $CELERY_APP beat --scheduler=$CELERY__BEAT_SCHEDULE \
+    --loglevel=$CELERY__LOG_LEVEL -f $CELERY__BEAT_LOG --pidfile=/tmp/celerybeat.pid &
+
+echo "Starting Default Celery Worker..."
 $CELERY_BIN -A $CELERY_APP worker --autoscale=$CELERY__AUTOSCALE_VALUES \
     --max-memory-per-child=$CELERY__MAX_MEMORY_PER_CHILD $CELERY__OPTS \
-    --statedb=$CELERY__STATE_DB --scheduler=$CELERY__BEAT_SCHEDULE \
+    --statedb=$CELERY__STATE_DB \
     --loglevel=$CELERY__LOG_LEVEL -n $CELERY__WORKER_NAME -f $CELERY__LOG_FILE \
     --concurrency=$CELERY__WORKER_CONCURRENCY --max-tasks-per-child=$CELERY__MAX_TASKS_PER_CHILD \
     -X harvesting &
 
+echo "Starting Harvester Celery Worker..."
 $CELERY_BIN -A $CELERY_APP worker -Q harvesting \
     --autoscale=$CELERY__HARVESTER_AUTOSCALE_VALUES \
     --max-memory-per-child=$CELERY__HARVESTER_MAX_MEMORY_PER_CHILD \
@@ -36,5 +62,9 @@ $CELERY_BIN -A $CELERY_APP worker -Q harvesting \
     --concurrency=$CELERY__HARVESTER_CONCURRENCY \
     -f $CELERY__LOG_FILE &
 
-# Keep the container alive
-wait
+# Wait for any process to exit
+wait -n
+
+# Exit with the status of the process that exited first
+# Docker will restart the container if this is non-zero (i.e., a failure)
+exit $?

docker-compose-dev.yml

@@ -79,7 +79,7 @@ services:
 
   # Geoserver backend
   geoserver:
-    image: geonode/geoserver:2.24.3-latest
+    image: geonode/geoserver:2.27.4-latest
     container_name: geoserver4${COMPOSE_PROJECT_NAME}
     healthcheck:
       test: "curl -m 10 --fail --silent --write-out 'HTTP CODE : %{http_code}\n' --output /dev/null http://geoserver:8080/geoserver/ows"
@@ -105,7 +105,7 @@ services:
         condition: service_healthy
 
   data-dir-conf:
-    image: geonode/geoserver_data:2.24.3-latest
+    image: geonode/geoserver_data:2.27.4-latest
     container_name: gsconf4${COMPOSE_PROJECT_NAME}
     entrypoint: sleep infinity
     volumes:

docker-compose-geoserver-server.yml

@@ -2,7 +2,7 @@ version: '2.2'
 services:
 
   data-dir-conf:
-    image: geonode/geoserver_data:latest
+    image: geonode/geoserver_data:2.27.4-latest
     restart: on-failure
     container_name: gsconf4${COMPOSE_PROJECT_NAME}
     labels:
@@ -13,7 +13,7 @@ services:
       - geoserver-data-dir:/geoserver_data/data
 
   geoserver:
-    image: geonode/geoserver:latest
+    image: geonode/geoserver:2.27.4-latest
     restart: unless-stopped
     container_name: geoserver4${COMPOSE_PROJECT_NAME}
     stdin_open: true

docker-compose-test.yml

@@ -80,7 +80,7 @@ services:
 
   # Geoserver backend
   geoserver:
-    image: geonode/geoserver:2.24.4-latest
+    image: geonode/geoserver:2.27.4-latest
     container_name: geoserver4${COMPOSE_PROJECT_NAME}
     healthcheck:
       test: "curl -m 10 --fail --silent --write-out 'HTTP CODE : %{http_code}\n' --output /dev/null http://geoserver:8080/geoserver/ows"
@@ -106,7 +106,7 @@ services:
         condition: service_healthy
 
   data-dir-conf:
-    image: geonode/geoserver_data:2.24.4-latest
+    image: geonode/geoserver_data:2.27.4-latest
     container_name: gsconf4${COMPOSE_PROJECT_NAME}
     entrypoint: sleep infinity
     volumes:

docker-compose.yml

@@ -92,7 +92,7 @@ services:
 
   # Geoserver backend
   geoserver:
-    image: geonode/geoserver:2.27.x-latest
+    image: geonode/geoserver:2.27.4-latest
     container_name: geoserver4${COMPOSE_PROJECT_NAME}
     healthcheck:
       test: "curl -m 10 --fail --silent --write-out 'HTTP CODE : %{http_code}\n' --output /dev/null http://geoserver:8080/geoserver/ows"
@@ -118,7 +118,7 @@ services:
         condition: service_healthy
 
   data-dir-conf:
-    image: geonode/geoserver_data:2.27.2-latest
+    image: geonode/geoserver_data:2.27.4-latest
     container_name: gsconf4${COMPOSE_PROJECT_NAME}
     entrypoint: sleep infinity
     volumes:

entrypoint.sh

@@ -27,7 +27,6 @@ invoke update
 source $HOME/.bashrc
 source $HOME/.override_env
 
-echo DOCKER_API_VERSION=$DOCKER_API_VERSION
 echo POSTGRES_USER=$POSTGRES_USER
 echo POSTGRES_PASSWORD=$POSTGRES_PASSWORD
 echo DATABASE_URL=$DATABASE_URL