From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stefan Schantl <stefan.schantl@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH] update-location-database: Only update database once a week.
Date: Tue, 28 Jul 2020 22:02:46 +0200
Message-ID: <20200728200246.3834-1-stefan.schantl@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0484934901352672228=="
List-Id: <development.lists.ipfire.org>

--===============0484934901352672228==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Ensure to download and update the database only once a week, even the
script will be called by cron each hour.

Also detect of the database has been changed and only in this case
re-export the database.

Fixes #12462.

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
---
 src/scripts/update-location-database | 32 +++++++++++++++++++++++-----
 1 file changed, 27 insertions(+), 5 deletions(-)

diff --git a/src/scripts/update-location-database b/src/scripts/update-locati=
on-database
index d830286ce..b3eb27c92 100644
--- a/src/scripts/update-location-database
+++ b/src/scripts/update-location-database
@@ -21,6 +21,19 @@
=20
 eval $(/usr/local/bin/readhash /var/ipfire/proxy/settings)
=20
+DB_FILE=3D"/var/lib/location/database.db"
+UPDATE_INTERVAL=3D"weekly"
+
+# Tiny function to get the current timestamp of the database file.
+function get_db_timestamp {
+	local timestamp=3D`stat -c "%Y" $DB_FILE`
+
+	echo $timestamp
+}
+
+# Get database timestamp.
+database_timestamp=3D$(get_db_timestamp)
+
 # Proxy settings.
 # Check if a proxy should be used.
 if [[ $UPSTREAM_PROXY ]]; then
@@ -39,11 +52,20 @@ if [[ $UPSTREAM_PROXY ]]; then
 fi
=20
 # Get the latest location database from server.
-if /usr/bin/location update; then
-	# Call location and export all countries in xt_geoip compatible format.
-	if /usr/bin/location export --directory=3D/usr/share/xt_geoip --family=3Dip=
v4 --format=3Dxt_geoip; then
+if /usr/bin/location update --cron=3D$UPDATE_INTERVAL; then
+	# Grab timestamp of the database again.
+	new_database_timestamp=3D$(get_db_timestamp)
=20
-		# Call initscript to reload the firewall.
-		/etc/init.d/firewall reload
+	# Check if the timestamps are different.
+	# In this case it needs to be exported again.
+	if [ ! $database_timestamp eq $new_database_timestamp ]; then
+		# Call location and export all countries in xt_geoip compatible format.
+		if /usr/bin/location export --directory=3D/usr/share/xt_geoip --family=3Di=
pv4 --format=3Dxt_geoip; then
+
+			# Call initscript to reload the firewall.
+			/etc/init.d/firewall reload
+		fi
 	fi
 fi
+
+
--=20
2.20.1


--===============0484934901352672228==--