v0.36.5

scripts/deploy/deploy_runtime.py

@@ -365,7 +365,12 @@ def update(record: dict, binary: Path, sha: str, start: bool, refresh_geoip: boo
         if refresh_geoip:
             # Shared lock with the runtime worker prevents concurrent upgrades.
             geoip_lock_fd = acquire_geoip_update_lock(data, account.pw_uid, account.pw_gid)
-            geoip_stage, geoip_names = prepare_geoip_update(data, prefix)
+            try:
+                geoip_stage, geoip_names = prepare_geoip_update(data, prefix)
+            except GeoipUnavailable as error:
+                # GeoIP is refreshed best-effort: the update must not be blocked by a flaky download.
+                print(f'WARNING: GeoIP refresh skipped, keeping the installed country data: {error}', file=sys.stderr)
+                geoip_stage, geoip_names = None, []
         active = subprocess.run(['systemctl', 'is-active', '--quiet', SERVICE], check=False, stdout=subprocess.DEVNULL).returncode == 0
         stop_for_managed_update(data)
         try:
@@ -434,7 +439,10 @@ def install(record: dict, binary: Path, sha: str, start: bool, install_geoip: bo
     prefix.mkdir(parents=True, mode=0o755, exist_ok=True); os.chmod(prefix, 0o755)
     data.mkdir(parents=True, mode=0o700, exist_ok=True); os.chmod(data, 0o700); os.chown(data, account.pw_uid, account.pw_gid)
     if install_geoip:
-        download_geoip(data, account.pw_uid, account.pw_gid)
+        try:
+            download_geoip(data, account.pw_uid, account.pw_gid)
+        except GeoipUnavailable as error:
+            print(f'WARNING: GeoIP download skipped ({error}). Country allow/block lists will use data fetched later by the GeoIP updater, or rerun update.sh.', file=sys.stderr)
     release, version = stage(binary, prefix, record['user'], sha)
     record.update(release=release, version=version, sha256=sha)
     switch(prefix, release)