diff --git a/.editorconfig b/.editorconfig old mode 100755 new mode 100644 diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md old mode 100755 new mode 100644 diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml old mode 100755 new mode 100644 diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml old mode 100755 new mode 100644 diff --git a/.github/workflows/call_issue_pr_tracker.yml b/.github/workflows/call_issue_pr_tracker.yml old mode 100755 new mode 100644 diff --git a/.github/workflows/call_issues_cron.yml b/.github/workflows/call_issues_cron.yml old mode 100755 new mode 100644 diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml old mode 100755 new mode 100644 diff --git a/.github/workflows/external_trigger_scheduler.yml b/.github/workflows/external_trigger_scheduler.yml old mode 100755 new mode 100644 diff --git a/.github/workflows/greetings.yml b/.github/workflows/greetings.yml old mode 100755 new mode 100644 diff --git a/.github/workflows/package_trigger_scheduler.yml b/.github/workflows/package_trigger_scheduler.yml old mode 100755 new mode 100644 diff --git a/.github/workflows/permissions.yml b/.github/workflows/permissions.yml old mode 100755 new mode 100644 diff --git a/Dockerfile b/Dockerfile index 16bc59b..8504536 100644 --- a/Dockerfile +++ b/Dockerfile @@ -34,7 +34,7 @@ RUN \ p7zip && \ echo "**** grab GeoIP database ****" && \ curl -L --retry 10 --retry-max-time 60 --retry-all-errors \ - "https://mailfud.org/geoip-legacy/GeoIP.dat.gz" \ + "https://geo.el0.org/GeoIP.dat.gz" \ | gunzip > /usr/share/GeoIP/GeoIP.dat && \ printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ echo "**** cleanup ****" && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 9ea7b46..bbf8d49 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -34,7 +34,7 @@ RUN \ p7zip && \ echo "**** grab GeoIP database ****" && \ curl -L --retry 10 --retry-max-time 60 --retry-all-errors \ - "https://mailfud.org/geoip-legacy/GeoIP.dat.gz" \ + "https://geo.el0.org/GeoIP.dat.gz" \ | gunzip > /usr/share/GeoIP/GeoIP.dat && \ printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ echo "**** cleanup ****" && \ diff --git a/README.md b/README.md index 4c92c69..d392393 100644 --- a/README.md +++ b/README.md @@ -315,6 +315,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **23.08.25:** - Update GeoIP provider, add weekly cronjob to update. * **12.01.25:** - Rebase libtorrentv1 branch to Alpine 3.21. * **19.09.24:** - Prevent race condition related delay during container stop. * **26.08.24:** - Add libtorrentv1 tag. diff --git a/readme-vars.yml b/readme-vars.yml index 769ddef..1a81282 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -96,6 +96,7 @@ init_diagram: | "deluge:latest" <- Base Images # changelog changelogs: + - {date: "23.08.25:", desc: "Update GeoIP provider, add weekly cronjob to update."} - {date: "12.01.25:", desc: "Rebase libtorrentv1 branch to Alpine 3.21."} - {date: "19.09.24:", desc: "Prevent race condition related delay during container stop."} - {date: "26.08.24:", desc: "Add libtorrentv1 tag."} diff --git a/root/app/update-geoip.sh b/root/app/update-geoip.sh new file mode 100755 index 0000000..0bb147b --- /dev/null +++ b/root/app/update-geoip.sh @@ -0,0 +1,16 @@ +#!/usr/bin/with-contenv bash +# shellcheck shell=bash + +# Sleep a random amount of time up to 3 hours so we're not hitting the server all at once +sleep $(( RANDOM % 10800 )) + +# downlad latest GeoIP.dat +geoip_dat_path="/usr/share/GeoIP/GeoIP.dat" + +if [[ -e "${geoip_dat_path}" ]]; then + curl -s -L --retry 2 --retry-max-time 10 --retry-all-errors \ + "https://geo.el0.org/GeoIP.dat.gz" | + gunzip > /tmp/GeoIP.dat && \ + mv /tmp/GeoIP.dat "${geoip_dat_path}" && \ + chmod 644 "${geoip_dat_path}" +fi diff --git a/root/crontabs/root b/root/crontabs/root new file mode 100644 index 0000000..e31e825 --- /dev/null +++ b/root/crontabs/root @@ -0,0 +1,2 @@ +# min hour day month weekday command +0 3 * * 0 /app/geoip-update.sh 2>&1