From bb57d732651e81dc8181f1e7961eb6df52bf4071 Mon Sep 17 00:00:00 2001
From: Evangelos Foutras <evangelos@foutrelis.com>
Date: Sat, 12 Mar 2022 09:12:18 +0200
Subject: [PATCH] geoipupdate: use templating for /etc/GeoIP.conf
---
roles/geoipupdate/tasks/main.yml | 13 +------------
roles/geoipupdate/templates/GeoIP.conf.j2 | 4 ++++
2 files changed, 5 insertions(+), 12 deletions(-)
create mode 100644 roles/geoipupdate/templates/GeoIP.conf.j2
diff --git a/roles/geoipupdate/tasks/main.yml b/roles/geoipupdate/tasks/main.yml
index ab8ed90ff..16fe988b4 100644
--- a/roles/geoipupdate/tasks/main.yml
+++ b/roles/geoipupdate/tasks/main.yml
@@ -4,18 +4,7 @@
pacman: name=geoipupdate state=present
- name: configure geoipupdate
- lineinfile:
- path: /etc/GeoIP.conf
- regex: '^#*\s*{{ item.setting }} '
- line: '{{ item.setting }} {{ item.value }}'
- owner: root
- group: root
- mode: 0600
- no_log: true
- loop:
- - { setting: AccountID, value: '{{ vault_mirror_maxmind_id }}' }
- - { setting: LicenseKey, value: '{{ vault_mirror_maxmind_license }}' }
- - { setting: EditionIDs, value: '{{ geoipupdate_edition_ids }}' }
+ template: src=GeoIP.conf.j2 dest=/etc/GeoIP.conf owner=root group=root mode=0600
- name: create drop-in directory for geoipupdate.service
file: path=/etc/systemd/system/geoipupdate.service.d state=directory owner=root group=root mode=0755
diff --git a/roles/geoipupdate/templates/GeoIP.conf.j2 b/roles/geoipupdate/templates/GeoIP.conf.j2
new file mode 100644
index 000000000..cbe1ee128
--- /dev/null
+++ b/roles/geoipupdate/templates/GeoIP.conf.j2
@@ -0,0 +1,4 @@
+AccountID {{ vault_mirror_maxmind_id }}
+LicenseKey {{ vault_mirror_maxmind_license }}
+
+EditionIDs {{ geoipupdate_edition_ids }}
--
GitLab