add comments, add *_add and *_del variables, add active and passive checks, change geoip2 db dir

seb4itik/byow/roles/caddy/tasks/caddy_install.yml

@@ -4,7 +4,6 @@
       - "git"
       - "libnss3-tools"
       - "ssl-cert"
-#     - "geoipupdate"
 
 - name: Create Go directory
   ansible.builtin.file:
@@ -35,15 +34,15 @@
     caddy_build_command: >
       /usr/local/xcaddy-{{ caddy_xcaddy_version }}/xcaddy build v{{ caddy_version }}
       --with github.com/pteich/caddy-tlsconsul
-      --with github.com/corazawaf/coraza-caddy/v2@v{{ caddy_coraza_caddy_version }}
+      --with github.com/corazawaf/coraza-caddy/{{ caddy_coraza_caddy_version }}
       --with github.com/mholt/caddy-ratelimit
       --with github.com/steffenbusch/caddy-bot-barrier
       --with github.com/zhangjiayin/caddy-geoip2
-      --output /usr/local/bin/{{ caddy_my_name }}
+      --output {{ caddy_binary }}
 
 - name: Remember and test Caddy version
   ansible.builtin.copy:
-    dest: "/usr/local/bin/.caddy.build"
+    dest: "/usr/local/bin/.caddy.{{ caddy_my_name }}.build"
     content: >
       XCADDY_WHICH_GO=/usr/local/go-{{ caddy_go_version }}/go/bin/go
       {{ caddy_build_command }}"
@@ -57,7 +56,7 @@
     XCADDY_WHICH_GO: "/usr/local/go-{{ caddy_go_version }}/go/bin/go"
   ansible.builtin.command:
     cmd: "{{ caddy_build_command }}"
-    creates: "/usr/local/bin/{{ caddy_my_name }}"
+    creates: "{{ caddy_binary }}"
   notify:
     - "Restart Caddy"
 
@@ -75,23 +74,21 @@
     system: true
     home: "{{ caddy_home_dir }}"
 
-- name: Create Caddy config directories
+- name: Create Caddy directories
   ansible.builtin.file:
-    path: "{{ item }}"
+    path: "{{ item.path }}"
     state: "directory"
+    owner: "{{ item.owner | default('root') }}"
     group: "{{ caddy_system_group }}"
-    mode: "0750"
+    mode: "{{ item.mode | default('0750') }}"
   loop:
-    - "{{ caddy_config_dir }}"
-    - "{{ caddy_config_dir }}/crs-plugins"
-    - "{{ caddy_config_dir }}/sites"
-
-- name: Create Caddy log dir
-  ansible.builtin.file:
-    path: "{{ caddy_log_dir }}"
-    state: "directory"
-    group: "{{ caddy_system_group }}"
-    mode: "0770"
+    - path: "{{ caddy_config_dir }}"
+    - path: "{{ caddy_config_dir }}/crs-plugins"
+    - path: "{{ caddy_config_dir }}/sites"
+    - path: "{{ caddy_log_dir }}"
+      mode: "0770"
+    - path: "{{ caddy_home_dir }}/geoip2"
+      owner: "{{ caddy_system_user }}"
 
 - name: Install OWASP CRS
   loop: "{{ caddy_owasp_crs_versions }}"
@@ -105,7 +102,7 @@
   loop: "{{ caddy_crs_plugins }}"
   loop_control:
     loop_var: "plugin"
-  ansible.builtin.include_tasks: "plugin_install.yml"
+  ansible.builtin.include_tasks: "caddy_install_plugin.yml"
 
 - name: Deploy caddy service file
   ansible.builtin.template: