From ac2bbeae5b6b6df066e5dddf8972c3e0b41cb142 Mon Sep 17 00:00:00 2001 From: Aaron Elkiss Date: Wed, 17 Dec 2025 17:52:15 -0500 Subject: [PATCH] ETT-1210: Don't create GeoIP2-Country.mmdb symlink by default The fake "always_us.mmdb" and "always_nonus.mmdb" files work with the babel apps but not apparently with the version of geoip we have for PHP. This avoids that problem by: * When repo is checked out, geoip/GeoIP2-Country.mmdb symlink won't exist * This symlink and real GeoIP mmdb files are gitignored, so we can put real files there in test/preview/whatever and they won't get clobbered by the symlink --- geoip/GeoIP2-Country.mmdb | 1 - setup-env.sh | 2 ++ setup.sh | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) delete mode 120000 geoip/GeoIP2-Country.mmdb diff --git a/geoip/GeoIP2-Country.mmdb b/geoip/GeoIP2-Country.mmdb deleted file mode 120000 index 62d0a9403..000000000 --- a/geoip/GeoIP2-Country.mmdb +++ /dev/null @@ -1 +0,0 @@ -always_us.mmdb \ No newline at end of file diff --git a/setup-env.sh b/setup-env.sh index 3e56a2f51..7bea26a32 100644 --- a/setup-env.sh +++ b/setup-env.sh @@ -11,3 +11,5 @@ APACHE_RUN_GROUP="$(id -g)" BABEL_HOME="$(dirname $(realpath $0))" EOT + +ln -rsv geoip/always_us.mmdb geoip/GeoIP2-Country.mmdb diff --git a/setup.sh b/setup.sh index 18b3acdc7..af2c14029 100755 --- a/setup.sh +++ b/setup.sh @@ -40,6 +40,8 @@ APACHE_RUN_USER="$(id -u)" APACHE_RUN_GROUP="$(id -g)" BABEL_HOME="$(dirname $(realpath $0))" +ln -rsv geoip/always_us.mmdb geoip/GeoIP2-Country.mmdb + EOT echo