From 82481cc083e6c97dbb2fb00e2b01ee87cbfb6da2 Mon Sep 17 00:00:00 2001 From: Bram Matthys Date: Sun, 22 Mar 2026 17:58:36 +0100 Subject: [PATCH] NO_GEOIP_CONFIG => NO_DEFAULT_GEOIP to make it consistent As we also have NO_DEFAULT_RPC_SOCKET and NO_DEFAULT_LOG_MEMORY_BLOCK --- doc/RELEASE-NOTES.md | 2 +- doc/conf/modules.default.conf | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/doc/RELEASE-NOTES.md b/doc/RELEASE-NOTES.md index 3a10f729c..77ba7511d 100644 --- a/doc/RELEASE-NOTES.md +++ b/doc/RELEASE-NOTES.md @@ -13,7 +13,7 @@ This is work in progress and may not always be a stable version. * The `./Config` question on GeoIP now defaults to `mmdb`. Existing users who upgrade will keep their current setting (usually `classic`) for now. * Both `geoip_classic` and `geoip_mmdb` now receive automatic updates - * You can `@define $NO_GEOIP_CONFIG "1"` to disable auto configuration + * You can `@define $NO_DEFAULT_GEOIP "1"` to disable auto configuration and updates. ### Fixes: diff --git a/doc/conf/modules.default.conf b/doc/conf/modules.default.conf index 978ebd446..ce7019f14 100644 --- a/doc/conf/modules.default.conf +++ b/doc/conf/modules.default.conf @@ -313,11 +313,10 @@ loadmodule "utf8only"; /* UTF8ONLY via set::utf8-only */ loadmodule "portinfo"; /* storing local_port and server_port of users */ loadmodule "isupport"; /* ISUPPORT / numeric 005 handling */ +@if !defined(NO_DEFAULT_GEOIP) @if $GEOIP_ENGINE != "none" loadmodule "$GEOIP_ENGINE"; @endif - -@if !defined(NO_GEOIP_CONFIG) @if module-loaded("geoip_classic") set { geoip-classic {