diff --git a/roles/geo_dns/meta/main.yml b/roles/geo_dns/meta/main.yml index b186e166b8c670b5f0941a41af0702a1c3b414da..e480ecc79d87b38c65c1b8528c138e30b8df8db1 100644 --- a/roles/geo_dns/meta/main.yml +++ b/roles/geo_dns/meta/main.yml @@ -4,5 +4,3 @@ galaxy_info: dependencies: - role: geoipupdate - vars: - geoipupdate_edition_ids: GeoLite2-City diff --git a/roles/geoipupdate/defaults/main.yml b/roles/geoipupdate/defaults/main.yml deleted file mode 100644 index 815680b1bd1ad60f986b54af6a91089afa0eed7f..0000000000000000000000000000000000000000 --- a/roles/geoipupdate/defaults/main.yml +++ /dev/null @@ -1 +0,0 @@ -geoipupdate_edition_ids: GeoLite2-Country # GeoLite2-City GeoLite2-ASN diff --git a/roles/geoipupdate/templates/GeoIP.conf.j2 b/roles/geoipupdate/templates/GeoIP.conf.j2 index cbe1ee1286170806b1aafaada9ad4d8ecdd11070..3799d489805f1b7ac74481c7186b8a37b4656821 100644 --- a/roles/geoipupdate/templates/GeoIP.conf.j2 +++ b/roles/geoipupdate/templates/GeoIP.conf.j2 @@ -1,4 +1,4 @@ AccountID {{ vault_mirror_maxmind_id }} LicenseKey {{ vault_mirror_maxmind_license }} -EditionIDs {{ geoipupdate_edition_ids }} +EditionIDs GeoLite2-Country GeoLite2-City