feat: move maxmind db to files instead of tmpl in caddy role

vegaprotocol · Nov 15, 2024 · 963909c · 963909c
1 parent 8a686a3
commit 963909c
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/roles/vega_caddy_server/defaults/main.yaml b/roles/vega_caddy_server/defaults/main.yaml
@@ -1,7 +1,5 @@
 ---
-vega_caddy_server_caddyfile_file_name: ""
-vega_caddy_server_node_home: "/home/vega"
-
+vega_caddy_server_enforce_rebuild: false
 vega_caddy_server_xcaddy_version: 0.4.2
 vega_caddy_server_caddy_version: v2.8.4
 
@@ -29,6 +27,8 @@ vega_caddy_server_with_block_explorer_lb: false
 vega_caddy_server_block_explorer_lb_domains: []
 vega_caddy_server_block_explorer_lb_upstreams: []
 
-# Space separated list of countries e.g: "PA PL UK US"
+# Space separated list of countries e.g: "PA PL GB US"
+# for more information see ISO-3166 alpha2 at
+#  http://www.geonames.org/countries/
 vega_caddy_server_geoblocking_enabled: false
-vega_caddy_server_geoblocking_countries: "UK PA"
+vega_caddy_server_geoblocking_countries: "GB PA"
diff --git a/...templates/etc/caddy/GeoLite2-Country.mmdb → ...ver/files/etc/caddy/GeoLite2-Country.mmdb b/...templates/etc/caddy/GeoLite2-Country.mmdb → ...ver/files/etc/caddy/GeoLite2-Country.mmdb
diff --git a/roles/vega_caddy_server/tasks/install-caddy.yaml b/roles/vega_caddy_server/tasks/install-caddy.yaml
@@ -62,8 +62,9 @@
     xcaddy build {{ vega_caddy_server_caddy_version }} \
       --output /usr/bin/caddy \
       --with github.com/caddyserver/replace-response \
+      --with github.com/porech/caddy-maxmind-geolocation \
       --with github.com/shift72/caddy-geo-ip
-  when: (caddy_version.rc != 0) or (not vega_caddy_server_caddy_version in caddy_version.stdout)
+  when: (caddy_version.rc != 0) or (not vega_caddy_server_caddy_version in caddy_version.stdout or vega_caddy_server_enforce_rebuild)
   changed_when: (caddy_version.rc != 0) or (not vega_caddy_server_caddy_version in caddy_version.stdout)
   notify: "Restart caddy"
 

diff --git a/roles/vega_caddy_server/tasks/main.yaml b/roles/vega_caddy_server/tasks/main.yaml
@@ -103,10 +103,14 @@
   notify: "Restart caddy"
 
 - name: Copy the Maxmind database
-  ansible.builtin.template:
+  ansible.builtin.copy:
     src: "etc/caddy/GeoLite2-Country.mmdb"
     dest: "/etc/caddy/GeoLite2-Country.mmdb"
     owner: "caddy"
     group: "caddy"
     mode: "0644"
   notify: "Restart caddy"
+  diff: false
+  args:
+    # database is managed by external process, do not overwrite it with default one
+    creates: "/etc/caddy/GeoLite2-Country.mmdb"