Specify geoip file.

TODO.md

@@ -0,0 +1,3 @@
+# Roadmap
+
+- [ ] Allow external postgres instance

defaults/main.yml

@@ -29,3 +29,6 @@ plausible_volume_config: "{{ plausible_volume_base }}/config"
 plausible_volume_db: "{{ plausible_volume_base }}/db_data"
 plausible_volume_events: "{{ plausible_volume_base }}/event_data"
 plausible_volume_geoip: "{{ plausible_volume_base }}/geoip_data"
+
+# GeoIP
+plausible_geoip_db: "GeoLite2-Country.mmdb"

molecule/default/destroy.yml

@@ -8,7 +8,7 @@
     # Developer must implement.
     - name: Remove the docker image
       community.docker.docker_container:
-        name: instance
+        name: instance-plausible
         state: absent
 
     # Mandatory configuration for Molecule to function.

molecule/default/molecule.yml

@@ -10,7 +10,7 @@ dependency:
 driver:
   name: docker
 platforms:
-  - name: instance
+  - name: instance-plausible
     image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos8}-ansible:latest"
     command: ${MOLECULE_DOCKER_COMMAND:-""}
     volumes:

molecule/default/prepare.yml

@@ -1,15 +1,24 @@
 ---
 - name: Setup the test machine
-  hosts: instance
+  hosts: instance-plausible
   tasks:
+    - name: Check if /var/run/docker.sock already exists
+      ansible.builtin.stat:
+        path: "/var/run/docker.sock"
+      register: docker_sock_stat
+
     - name: Create docker.sock
       raw: touch /var/run/docker.sock
       become: true
       changed_when: false
+      when: not docker_sock_stat.stat.exists
+
     - name: Move docker.sock from tmp
       raw: mount --move /tmp/docker_mounted.sock /var/run/docker.sock
       become: true
       changed_when: false
+      when: not docker_sock_stat.stat.exists
+      
     - name: Update apt cache.
       apt: update_cache=yes cache_valid_time=600
       when: ansible_os_family == 'Debian'

tasks/main.yml

@@ -4,7 +4,7 @@
 # Check if geoip volume exists
 - name: Check if geoip volume exists
   ansible.builtin.stat:
-    path: "{{ plausible_volume_geoip }}/GeoLite2-Country.mmdb"
+    path: "{{ plausible_volume_geoip }}/{{ plausible_geoip_db }}"
   register: plausible_geoip_stat
 
 - name: Set up directories

templates/docker-compose.yml.j2

@@ -46,7 +46,7 @@ services:
       - {{ plausible_volume_config }}/env.plausible.conf
 {% if plausible_geoip_stat.stat.exists %}
     volumes:
-      - {{ plausible_volume_geoip }}/GeoLite2-Country.mmdb:/geoip:ro
+      - {{ plausible_volume_geoip }}/{{ plausible_geoip_db }}:/geoip:ro
 {% else %}
     # No GeoIP data volume
 {% endif%}

templates/env.plausible.conf.j2

@@ -5,7 +5,7 @@ BASE_URL={{ plausible_base_url }}
 SECRET_KEY_BASE={{ plausible_secret_key_base }}
 
 {% if plausible_geoip_stat.stat.exists %}
-GEOLITE2_COUNTRY_DB={{ plausible_volume_geoip }}/GeoLite2-Country.mmdb
+GEOLITE2_COUNTRY_DB={{ plausible_volume_geoip }}/{{ plausible_geoip_db }}
 {% endif %}
 
 # DB and events