optimizations

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

@@ -15,6 +15,9 @@
   ansible.builtin.unarchive:
     src: "https://go.dev/dl/go{{ caddy_go_version }}.linux-amd64.tar.gz"
     dest: "/usr/local/go-{{ caddy_go_version }}"
+    creates: "/usr/local/go-{{ caddy_go_version }}/bin/go"
+    extra_opts:
+      - "--strip-components=1"
     remote_src: true
 
 - name: Create xcaddy directory
@@ -27,6 +30,7 @@
   ansible.builtin.unarchive:
     src: "https://github.com/caddyserver/xcaddy/releases/download/v{{ caddy_xcaddy_version }}/xcaddy_{{ caddy_xcaddy_version }}_linux_amd64.tar.gz"
     dest: "/usr/local/xcaddy-{{ caddy_xcaddy_version }}"
+    creates: "/usr/local/xcaddy-{{ caddy_xcaddy_version }}/xcaddy"
     remote_src: true
 
 - name: Create Caddy build command
@@ -44,8 +48,8 @@
   ansible.builtin.copy:
     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 }}"
+      XCADDY_WHICH_GO=/usr/local/go-{{ caddy_go_version }}/bin/go
+      {{ caddy_build_command }}
     mode: "0644"
   register: caddy_test_caddy_version
 
@@ -53,7 +57,7 @@
   # noqa: no-handler
   when: "caddy_test_caddy_version.changed"
   environment:
-    XCADDY_WHICH_GO: "/usr/local/go-{{ caddy_go_version }}/go/bin/go"
+    XCADDY_WHICH_GO: "/usr/local/go-{{ caddy_go_version }}/bin/go"
   ansible.builtin.command:
     cmd: "{{ caddy_build_command }}"
     creates: "{{ caddy_binary }}"
@@ -83,8 +87,8 @@
     mode: "{{ item.mode | default('0750') }}"
   loop:
     - path: "{{ caddy_config_dir }}"
-    - path: "{{ caddy_config_dir }}/crs-plugins"
-    - path: "{{ caddy_config_dir }}/sites"
+    - path: "{{ caddy_crs_plugins_dir }}"
+    - path: "{{ caddy_sites_dir }}"
     - path: "{{ caddy_log_dir }}"
       mode: "0770"
     - path: "{{ caddy_home_dir }}/geoip2"
@@ -95,14 +99,33 @@
   ansible.builtin.unarchive:
     src: "https://github.com/coreruleset/coreruleset/archive/refs/tags/v{{ item }}.tar.gz"
     dest: "{{ caddy_config_dir }}"
+    creates: "{{ caddy_config_dir }}/coreruleset-{{ item }}/rules/"
     group: "{{ caddy_system_group }}"
     remote_src: true
 
 - name: Install plugins
   loop: "{{ caddy_crs_plugins }}"
-  loop_control:
-    loop_var: "plugin"
-  ansible.builtin.include_tasks: "caddy_install_plugin.yml"
+  ansible.builtin.unarchive:
+    src: "https://github.com/{{ item.provider | default('coreruleset') }}/{{ item.name }}-plugin/archive/refs/tags/v{{ item.version }}.tar.gz"
+    dest: "{{ caddy_crs_plugins_dir }}"
+    creates: "{{ caddy_crs_plugins_dir }}/{{ item.name }}-config.conf"
+    include:
+      - "*.conf"
+    extra_opts:
+      - "--strip-components=2"
+      - "--wildcards"
+    mode: "0644"
+    group: "{{ caddy_system_group }}"
+    remote_src: true
+
+- name: Create plugins after config
+  loop: "{{ caddy_crs_plugins }}"
+  when: "not(item.has_after_config | default(false))"
+  ansible.builtin.copy:
+    content: ""
+    dest: "{{ caddy_crs_plugins_dir }}/{{ item.name }}-after.conf"
+    mode: "0644"
+    group: "{{ caddy_system_group }}"
 
 - name: Deploy caddy service file
   ansible.builtin.template:
@@ -110,4 +133,5 @@
     dest: "/etc/systemd/system/{{ caddy_my_name }}.service"
     mode: "0644"
   notify:
+    - "Reload systemd"
     - "Restart Caddy"