From 7f7c76cf5c3ff6947beaf9cc2d198aa2b3609a80 Mon Sep 17 00:00:00 2001 From: CoralMinister Date: Mon, 1 Jun 2026 13:49:51 +0300 Subject: [PATCH] Add files via upload --- .github/workflows/lead-region-ops.yml | 29 ++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/.github/workflows/lead-region-ops.yml b/.github/workflows/lead-region-ops.yml index cf5d5ab1..65710c36 100644 --- a/.github/workflows/lead-region-ops.yml +++ b/.github/workflows/lead-region-ops.yml @@ -261,24 +261,35 @@ jobs: - name: op=fetch-rossvyaz (download registry on prod) if: ${{ github.event.inputs.op == 'fetch-rossvyaz' }} run: | - if [ -z "${URL}" ]; then echo "::error::input url обязателен для fetch-rossvyaz"; exit 1; fi + # Пустой url → качаем все 4 официальных файла Минцифры за один прогон. + # Непустой url → качаем только его (ручной режим). ssh -i ~/.ssh/liderra_deploy "${LIDERRA_USER}@${LIDERRA_HOST}" \ "URL='$URL' bash -s" <<'REMOTE' | tee /tmp/op.log set -euo pipefail DEST=/var/www/liderra/rossvyaz sudo mkdir -p "$DEST" cd "$DEST" - FNAME=$(basename "${URL%%\?*}") - [ -n "$FNAME" ] || FNAME="rossvyaz-download" - echo "Скачиваю $URL -> $DEST/$FNAME" - sudo curl -fSL --retry 3 -o "$FNAME" "$URL" - case "$FNAME" in - *.zip|*.ZIP) echo "Распаковываю zip..."; sudo unzip -o "$FNAME" ;; - esac + if [ -n "$URL" ]; then + URLS="$URL" + else + URLS="https://opendata.digital.gov.ru/downloads/DEF-9xx.csv + https://opendata.digital.gov.ru/downloads/ABC-3xx.csv + https://opendata.digital.gov.ru/downloads/ABC-4xx.csv + https://opendata.digital.gov.ru/downloads/ABC-8xx.csv" + fi + for U in $URLS; do + FNAME=$(basename "${U%%\?*}") + [ -n "$FNAME" ] || FNAME="rossvyaz-download" + echo "Скачиваю $U -> $FNAME" + sudo curl -fSL --retry 3 -A 'Mozilla/5.0' -o "$FNAME" "$U" + case "$FNAME" in + *.zip|*.ZIP) echo "Распаковываю zip..."; sudo unzip -o "$FNAME" ;; + esac + done sudo chown -R www-data:www-data "$DEST" echo "=== Содержимое $DEST ===" ls -lh "$DEST" - FIRST_CSV=$(ls "$DEST"/*.csv "$DEST"/*.CSV 2>/dev/null | head -1 || true) + FIRST_CSV=$(ls "$DEST"/DEF-9xx.csv "$DEST"/*.csv "$DEST"/*.CSV 2>/dev/null | head -1 || true) if [ -n "$FIRST_CSV" ]; then echo "=== Первые строки $FIRST_CSV (cp1251→utf8) ===" sudo head -3 "$FIRST_CSV" | iconv -f cp1251 -t utf-8 2>/dev/null || sudo head -3 "$FIRST_CSV"