diff --git a/files/config/conf.d/geoip.conf b/files/config/conf.d/geoip.conf index 9bb33081fa028610dadcf09bf1a61322ee8a2980..651eb992992be7c02d9580016f2518277333beaa 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 4f62b47bb22426abcac6444dfa0177843d6cec04..047c8f98873c581c9732bd476236dadea09c60c9 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 ce0b8f090e31fc5bed7cd1bb1b2d194ec864123c..f712725d550d5cfcda4630ea7867df20c93401ea 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