Merge branch 'release/2.11.0'

Author: vlauciani

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Release Notes
 
+### Release 2.11.0 (2026-05-14)
+  - Add Docker environment variables for full-rebuild data move configuration
+  - Change `--no-move` to read protected event IDs from a text file
+  - Exclude Reported Intensity directories during first-boot event processing
+
 ### Release 2.10.0 (2026-05-14)
   - Add `process_events.sh` options to move old realtime event directories to `data_storage`
   - Add `--no-move` protection list for event directories that must remain in `data`

Dockerfile

@@ -24,6 +24,7 @@ COPY disclaimer*.md /usr/share/nginx/html/
 COPY contributors*.md /usr/share/nginx/html/
 COPY scientific-background*.md /usr/share/nginx/html/
 COPY productsListToProcess.json /usr/share/nginx/html/
+COPY EVENTID_DO_NOT_MOVE.txt /usr/share/nginx/html/
 COPY css/ /usr/share/nginx/html/css/
 COPY js/ /usr/share/nginx/html/js/
 COPY images/ /usr/share/nginx/html/images/

EVENTID_DO_NOT_MOVE.txt

@@ -0,0 +1,2 @@
+# Event IDs that must remain in data/ when DATA_MOVE_DAYS is enabled.
+# Add one event ID per line. Empty lines and lines starting with "#" are ignored.

README.md

@@ -77,6 +77,26 @@ docker run -d -p 8080:80 \
 
 When `PROCESS_ALL_DATA_FIRST_TIME=true` is set, the container will process events at startup before starting the Nginx server. It processes recent events from the realtime data directory first, then starts a full rebuild in the background; the full rebuild also includes `data_storage` when mounted.
 
+**Run with automatic old-event moving enabled:**
+```bash
+docker run -d -p 8080:80 \
+  -v $(pwd)/data:/usr/share/nginx/html/data:rw \
+  -v $(pwd)/data_storage:/usr/share/nginx/html/data_storage:rw \
+  -v $(pwd)/EVENTID_DO_NOT_MOVE.txt:/usr/share/nginx/html/EVENTID_DO_NOT_MOVE.txt:rw \
+  --name shakemap4-web__container \
+  -e PROCESS_ALL_DATA_FIRST_TIME=true \
+  -e DATA_MOVE_DAYS=100 \
+  -e DATA_MOVE_NO_MOVE_IDS=/usr/share/nginx/html/EVENTID_DO_NOT_MOVE.txt \
+  ingv/shakemap4-web
+```
+
+`DATA_MOVE_DAYS` is applied only to full rebuilds: the daily cron full rebuild
+and the second startup pass triggered by `PROCESS_ALL_DATA_FIRST_TIME=true`.
+Incremental runs (`-l`) never move data. `DATA_MOVE_NO_MOVE_IDS` must be an
+absolute path inside the container to a readable text file with one protected
+event ID per line. The file can be edited while the container is running; the
+next full rebuild reads the updated contents.
+
 **Run with a specific environment profile (e.g. EU):**
 ```bash
 docker run -d -p 8080:80 \
@@ -93,6 +113,8 @@ docker run -d -p 8080:80 \
 | `ENABLE_CRONTAB` | Enable automated event processing via cron | `false` | `true` |
 | `PROCESS_ALL_DATA_FIRST_TIME` | Process all events at container startup | `false` | `true` |
 | `SHAKEMAP_ENV` | Environment profile to load (`ingv`, `eu`, or custom) | `ingv` | `eu` |
+| `DATA_MOVE_DAYS` | Move realtime event directories older than this many days during full rebuilds | unset | `100` |
+| `DATA_MOVE_NO_MOVE_IDS` | Absolute container path to a file with event IDs that must not be moved | unset | `/usr/share/nginx/html/EVENTID_DO_NOT_MOVE.txt` |
 
 **Notes:**
 - All environment variables are optional. If not set, the INGV defaults from `js/config-base.js` are used.
@@ -161,9 +183,11 @@ the destination already exists in `data_storage/`, it is overwritten.
 
 Protect selected event IDs from moving with `--no-move`:
 ```bash
-./process_events.sh --data-realtime-dir data/ --data-storage-dir data_storage/ --move-days 100 --no-move 432423,4342342,4342343 --exclude-dir-end _ri
+./process_events.sh --data-realtime-dir data/ --data-storage-dir data_storage/ --move-days 100 --no-move EVENTID_DO_NOT_MOVE.txt --exclude-dir-end _ri
 ```
-Each protected ID also protects its matching `<eventid>_ri` directory.
+The `--no-move` file must contain one event ID per line. Empty lines and lines
+starting with `#` are ignored. Each protected ID also protects its matching
+`<eventid>_ri` directory.
 
 When `--move-days` is used, both `data/` and `data_storage/` must be mounted
 read-write; the read-only Docker volume examples are suitable for serving and

docker-entrypoint.sh

@@ -16,6 +16,60 @@ echo ""
 PROCESS_EVENTS_SCRIPT="/usr/share/nginx/html/process_events.sh"
 REALTIME_DATA_DIR="/usr/share/nginx/html/data"
 STORAGE_DATA_DIR="/usr/share/nginx/html/data_storage"
+DATA_MOVE_DAYS="${DATA_MOVE_DAYS:-}"
+DATA_MOVE_NO_MOVE_IDS="${DATA_MOVE_NO_MOVE_IDS:-}"
+
+validate_data_move_config() {
+    if [ -n "$DATA_MOVE_NO_MOVE_IDS" ] && [ -z "$DATA_MOVE_DAYS" ]; then
+        echo "ERROR: DATA_MOVE_NO_MOVE_IDS requires DATA_MOVE_DAYS" >&2
+        exit 1
+    fi
+
+    if [ -z "$DATA_MOVE_DAYS" ]; then
+        return 0
+    fi
+
+    if ! [[ "$DATA_MOVE_DAYS" =~ ^[0-9]+$ ]] || [ "$DATA_MOVE_DAYS" -le 0 ]; then
+        echo "ERROR: DATA_MOVE_DAYS must be a positive integer, got: $DATA_MOVE_DAYS" >&2
+        exit 1
+    fi
+
+    if [ ! -d "$STORAGE_DATA_DIR" ]; then
+        echo "ERROR: DATA_MOVE_DAYS requires storage directory: $STORAGE_DATA_DIR" >&2
+        exit 1
+    fi
+
+    if [ -n "$DATA_MOVE_NO_MOVE_IDS" ]; then
+        if [[ "$DATA_MOVE_NO_MOVE_IDS" != /* ]]; then
+            echo "ERROR: DATA_MOVE_NO_MOVE_IDS must be an absolute path inside the container: $DATA_MOVE_NO_MOVE_IDS" >&2
+            exit 1
+        fi
+
+        if [ ! -f "$DATA_MOVE_NO_MOVE_IDS" ]; then
+            echo "ERROR: DATA_MOVE_NO_MOVE_IDS file does not exist: $DATA_MOVE_NO_MOVE_IDS" >&2
+            exit 1
+        fi
+
+        if [ ! -r "$DATA_MOVE_NO_MOVE_IDS" ]; then
+            echo "ERROR: DATA_MOVE_NO_MOVE_IDS file is not readable: $DATA_MOVE_NO_MOVE_IDS" >&2
+            exit 1
+        fi
+    fi
+}
+
+append_move_command_args() {
+    local cmd=$1
+
+    if [ -n "$DATA_MOVE_DAYS" ]; then
+        cmd="$cmd --move-days $DATA_MOVE_DAYS"
+
+        if [ -n "$DATA_MOVE_NO_MOVE_IDS" ]; then
+            cmd="$cmd --no-move $DATA_MOVE_NO_MOVE_IDS"
+        fi
+    fi
+
+    printf '%s' "$cmd"
+}
 
 get_full_rebuild_args() {
     local args=("--data-realtime-dir" "$REALTIME_DATA_DIR")
@@ -24,6 +78,14 @@ get_full_rebuild_args() {
         args+=("--data-storage-dir" "$STORAGE_DATA_DIR")
     fi
 
+    if [ -n "$DATA_MOVE_DAYS" ]; then
+        args+=("--move-days" "$DATA_MOVE_DAYS")
+
+        if [ -n "$DATA_MOVE_NO_MOVE_IDS" ]; then
+            args+=("--no-move" "$DATA_MOVE_NO_MOVE_IDS")
+        fi
+    fi
+
     printf '%s\n' "${args[@]}"
 }
 
@@ -34,9 +96,23 @@ get_full_rebuild_command() {
         cmd="$cmd --data-storage-dir $STORAGE_DATA_DIR"
     fi
 
+    cmd=$(append_move_command_args "$cmd")
+
     printf '%s' "$cmd"
 }
 
+validate_data_move_config
+
+if [ -n "$DATA_MOVE_DAYS" ]; then
+    echo "DATA_MOVE_DAYS is set to $DATA_MOVE_DAYS. Full rebuilds will move older events to storage."
+    if [ -n "$DATA_MOVE_NO_MOVE_IDS" ]; then
+        echo "DATA_MOVE_NO_MOVE_IDS is set to $DATA_MOVE_NO_MOVE_IDS."
+    fi
+else
+    echo "DATA_MOVE_DAYS is not set. Data move will not run."
+fi
+echo ""
+
 # --- Cron setup for periodic event reprocessing ---
 if [ "$ENABLE_CRONTAB" = "true" ]; then
     echo "ENABLE_CRONTAB is set to true. Starting cron service..."
@@ -86,8 +162,9 @@ if [ "$PROCESS_ALL_DATA_FIRST_TIME" = "true" ]; then
     # so that events.json is available quickly and the portal is usable right away.
     # The second run rebuilds the full dataset in the background without blocking
     # nginx startup — it may take a long time on large data directories.
-    "$PROCESS_EVENTS_SCRIPT" --data-realtime-dir "$REALTIME_DATA_DIR" -l 20
+    "$PROCESS_EVENTS_SCRIPT" --data-realtime-dir "$REALTIME_DATA_DIR" -l 20 -x _ri
     mapfile -t FULL_REBUILD_ARGS < <(get_full_rebuild_args)
+    FULL_REBUILD_ARGS+=("-x" "_ri")
     "$PROCESS_EVENTS_SCRIPT" "${FULL_REBUILD_ARGS[@]}" &
 
     echo "All data processed."

js/config-base.js

@@ -19,7 +19,7 @@ const ShakeMap = {
 };
 
 const config = {
-    version: "v2.10.0",
+    version: "v2.11.0",
     githubLink: "https://github.com/INGV/shakemap4-web",
     disclaimerPage: './disclaimer-ingv.md',
     contributorsPage: './contributors-ingv.md',

process_events.sh

@@ -18,7 +18,7 @@ echo_date() {
 # Function to display usage/help
 usage() {
     cat <<EOF
-Usage: $(basename "$0") -d DATA_DIR [-k DATA_STORAGE_DIR] [-m DAYS [-n IDS]] [-e EVENT_ID | -l LAST_N_EVENTS] [-x SUFFIX] [-h]
+Usage: $(basename "$0") -d DATA_DIR [-k DATA_STORAGE_DIR] [-m DAYS [-n FILE]] [-e EVENT_ID | -l LAST_N_EVENTS] [-x SUFFIX] [-h]
 
 Process ShakeMap event data and generate events.json.
 
@@ -37,9 +37,9 @@ Options:
                              The event OriginTime is read directly from
                              current/event.xml. Requires -d and -k
   --move-days DAYS           Long alias for -m
-  -n IDS                     Comma-separated event IDs that must never be
-                             moved when -m is used. Example: 432423,4342342
-  --no-move IDS              Long alias for -n
+  -n FILE                    Path to a text file with event IDs that must never
+                             be moved when -m is used, one event ID per line
+  --no-move FILE             Long alias for -n
   -e EVENT_ID                Process a single event by its ID. Performs an
                              incremental update: adds or updates the event in
                              events.json while preserving all other events
@@ -64,7 +64,8 @@ Examples:
   $(basename "$0") -d data/ -l 5                                 Process last 5 modified realtime events
   $(basename "$0") -d data/ -k data_storage/ -x _ri              Full rebuild excluding dirs ending with "_ri"
   $(basename "$0") -d data/ -k data_storage/ -m 100 -x _ri       Move events older than 100 days, then full rebuild
-  $(basename "$0") -d data/ -k data_storage/ -m 100 -n 1,2,3     Move old events except listed IDs, then full rebuild
+  $(basename "$0") -d data/ -k data_storage/ -m 100 -n EVENTID_DO_NOT_MOVE.txt
+                                                                  Move old events except IDs listed in the file
   $(basename "$0") -d data/ --exclude-dir-end _ri                Same exclusion, using long option
   $(basename "$0") -h                                            Show this help
 EOF
@@ -175,7 +176,7 @@ SINGLE_EVENT_ID=""
 LAST_EVENTS=""
 EXCLUDE_DIR_END=""
 MOVE_DAYS=""
-NO_MOVE_IDS_CSV=""
+NO_MOVE_IDS_FILE=""
 NO_MOVE_IDS=()
 # Array to track events with time parsing issues
 EVENTS_WITH_TIME_PARSING=()
@@ -223,11 +224,11 @@ while [ $# -gt 0 ]; do
             shift
             ;;
         --no-move)
-            NO_MOVE_IDS_CSV="$2"
+            NO_MOVE_IDS_FILE="$2"
             shift 2
             ;;
         --no-move=*)
-            NO_MOVE_IDS_CSV="${1#*=}"
+            NO_MOVE_IDS_FILE="${1#*=}"
             shift
             ;;
         *)
@@ -247,7 +248,7 @@ while getopts "d:e:l:x:k:m:n:h" opt; do
     ;;
     m) MOVE_DAYS="$OPTARG"
     ;;
-    n) NO_MOVE_IDS_CSV="$OPTARG"
+    n) NO_MOVE_IDS_FILE="$OPTARG"
     ;;
     e) SINGLE_EVENT_ID="$OPTARG"
     ;;
@@ -302,7 +303,7 @@ if [ -n "$MOVE_DAYS" ]; then
     fi
 fi
 
-if [ -n "$NO_MOVE_IDS_CSV" ] && [ -z "$MOVE_DAYS" ]; then
+if [ -n "$NO_MOVE_IDS_FILE" ] && [ -z "$MOVE_DAYS" ]; then
     echo "Error: -n/--no-move is valid only when -m/--move-days is used" >&2
     echo "" >&2
     usage >&2
@@ -342,6 +343,18 @@ if [ -n "$MOVE_DAYS" ]; then
     fi
 fi
 
+if [ -n "$NO_MOVE_IDS_FILE" ]; then
+    if [ ! -f "$NO_MOVE_IDS_FILE" ]; then
+        echo "Error: -n/--no-move file does not exist or is not a regular file: $NO_MOVE_IDS_FILE" >&2
+        exit 1
+    fi
+
+    if [ ! -r "$NO_MOVE_IDS_FILE" ]; then
+        echo "Error: -n/--no-move file is not readable: $NO_MOVE_IDS_FILE" >&2
+        exit 1
+    fi
+fi
+
 # Validate -l is a positive integer
 if [ -n "$LAST_EVENTS" ]; then
     if ! [[ "$LAST_EVENTS" =~ ^[0-9]+$ ]] || [ "$LAST_EVENTS" -le 0 ]; then
@@ -350,10 +363,6 @@ if [ -n "$LAST_EVENTS" ]; then
     fi
 fi
 
-if [ -n "$NO_MOVE_IDS_CSV" ]; then
-    IFS=',' read -r -a NO_MOVE_IDS <<< "$NO_MOVE_IDS_CSV"
-fi
-
 # Function to restructure flat event list into Year -> Month -> List structure
 restructure_events_json() {
     echo "Restructuring data..."
@@ -401,6 +410,30 @@ normalize_event_base_id() {
     printf '%s' "$event_id"
 }
 
+# Function to load protected event IDs from -n/--no-move file.
+# Empty lines and lines starting with "#" are ignored.
+load_no_move_ids() {
+    local line
+
+    NO_MOVE_IDS=()
+
+    if [ -z "$NO_MOVE_IDS_FILE" ]; then
+        return 0
+    fi
+
+    while IFS= read -r line || [ -n "$line" ]; do
+        line=$(trim_spaces "$line")
+
+        if [ -z "$line" ] || [[ "$line" == \#* ]]; then
+            continue
+        fi
+
+        NO_MOVE_IDS+=("$line")
+    done < "$NO_MOVE_IDS_FILE"
+
+    echo_date "Loaded ${#NO_MOVE_IDS[@]} protected event ID(s) from $NO_MOVE_IDS_FILE"
+}
+
 # Function to check if an event is protected by -n/--no-move
 # Parameters:
 #   $1 - event_id: directory name to check
@@ -583,6 +616,7 @@ move_old_events_to_storage() {
     cutoff_epoch=$((now_epoch - (MOVE_DAYS * 86400)))
 
     echo_date "Moving events older than ${MOVE_DAYS} day(s) from $DATA_DIR to $DATA_STORAGE_DIR"
+    load_no_move_ids
 
     while IFS= read -r event_xml; do
         found_events=1

publiccode.yml

@@ -7,7 +7,7 @@ name: "INGV - ShakeMap4 Web Page"
 releaseDate: 2026-05-14
 url: "https://github.com/INGV/shakemap4-web"
 landingURL: "https://github.com/INGV/shakemap4-web"
-softwareVersion: v2.10.0
+softwareVersion: v2.11.0
 developmentStatus: stable
 softwareType: standalone/other
 platforms: