Revert "Fix geoip-dataset templates"

This reverts commit d49df5dc.

roles/geoip-dataset/handlers/main.yml

 - listen: trigger geoipupdate
-  shell: "/usr/bin/geoipupdate -f /etc/GeoIP.conf"
+  shell: "/usr/bin/geoipupdate -f /etc/GeoIP_{{ item }}.conf"
   with_items: "{{ geoip_dataset }}"

roles/geoip-dataset/tasks/main.yml

@@ -7,12 +7,13 @@
 - name: Configure GeoIP downloader
   template:
     src: GeoIP.conf.j2
-    dest: "/etc/GeoIP.conf"
+    dest: "/etc/GeoIP_{{ item }}.conf"
   when: geoip_account_id is defined
+  with_items: "{{ geoip_dataset }}"
   notify: trigger geoipupdate
   
 - name: Setup geoipupdate cron job
   copy:
-    dest: "/etc/cron.d/geoipupdate"
-    content: "12 0 * * 5 root /usr/local/bin/splay 3600 && /usr/bin/geoipupdate -f /etc/GeoIP.conf"
-
+    dest: "/etc/cron.d/geoipupdate_{{ item }}"
+    content: "12 0 * * 5 root /usr/local/bin/splay 3600 && /usr/bin/geoipupdate -f /etc/GeoIP_{{ item }}.conf"
+  with_items: "{{ geoip_dataset }}"

roles/geoip-dataset/templates/GeoIP.conf.j2

@@ -7,6 +7,4 @@ LicenseKey {{ geoip_license_key | default('000000000000') }}
 # * GeoLite2-City - GeoLite 2 City
 # * GeoLite2-Country - GeoLite2 Country
 # For geoipupdate versions earlier than 2.5.0, use ProductIds here instead of EditionIDs.
-{% for geoip_database in geoip_dataset %}
-EditionIDs GeoLite2-{{ geoip_database }}
-{% endfor %}
+EditionIDs GeoLite2-{{ geoip_dataset }}