From 97bb7a433f3dd36ae68d54e824006eb6bc1b82b5 Mon Sep 17 00:00:00 2001
From: nd <git@notandy.de>
Date: Thu, 2 Dec 2021 20:58:54 +0100
Subject: [PATCH] disable extended geoip logging
---
files/config/conf.d/geoip.conf | 4 ++--
files/config/conf.d/logging.conf | 11 ++++++-----
tasks/main.yml | 1 -
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/files/config/conf.d/geoip.conf b/files/config/conf.d/geoip.conf
index 9bb3308..651eb99 100644
--- a/files/config/conf.d/geoip.conf
+++ b/files/config/conf.d/geoip.conf
@@ -1,3 +1,3 @@
geoip_country /usr/share/GeoIP/GeoIPv6.dat;
-geoip_city /usr/share/GeoIP/GeoIPCity.dat;
-geoip_org /usr/share/GeoIP/GeoIPASNum.dat;
+#geoip_city /usr/share/GeoIP/GeoIPCity.dat;
+#geoip_org /usr/share/GeoIP/GeoIPASNum.dat;
diff --git a/files/config/conf.d/logging.conf b/files/config/conf.d/logging.conf
index 4f62b47..047c8f9 100644
--- a/files/config/conf.d/logging.conf
+++ b/files/config/conf.d/logging.conf
@@ -38,11 +38,12 @@ log_format promtail_analytics escape=json '{'
'"gzip_ratio": "$gzip_ratio", '
'"http_cf_ray": "$http_cf_ray",'
'"geoip_country_code": "$geoip_country_code",'
- '"geoip_region": "$geoip_region",'
- '"geoip_city": "$geoip_city",'
- '"geoip_org": "$geoip_org",'
- '"geoip_latitude": "$geoip_latitude",'
- '"geoip_longitude": "$geoip_longitude"'
+ '"geoip_region": "$geoip_region"'
+# disabled for now since debian bullseye doesn't ship the needed geoip database
+# '"geoip_city": "$geoip_city",'
+# '"geoip_org": "$geoip_org",'
+# '"geoip_latitude": "$geoip_latitude",'
+# '"geoip_longitude": "$geoip_longitude"'
'}';
diff --git a/tasks/main.yml b/tasks/main.yml
index ce0b8f0..f712725 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -26,7 +26,6 @@
- libnginx-mod-http-geoip
- goaccess
- geoip-database
- - geoip-database-extra
notify:
- delete nginx index.nginx-debian.html
- restart nginx
--
GitLab