Merge branch 'marka-cleanup-builtin-config' into 'master'

remove geoip-use-ecs from default config See merge request isc-projects/bind9!2032
2019-06-17 09:35:58 -04:00
parent 47c8deee52 b2026bd9e8
commit ea054d024a
1 changed files with 2 additions and 5 deletions
@@ -150,11 +150,8 @@ options {\n\
 #	fetch-glue <obsolete>;\n\
 	fetch-quota-params 100 0.1 0.3 0.7;\n\
 	fetches-per-server 0;\n\
-	fetches-per-zone 0;\n"
-#ifdef HAVE_GEOIP
-"	geoip-use-ecs yes;\n"
-#endif
-"	glue-cache yes;\n\
+	fetches-per-zone 0;\n\
+	glue-cache yes;\n\
 	lame-ttl 600;\n"
 #ifdef HAVE_LMDB
 "	lmdb-mapsize 32M;\n"