From 3629b3659a62fa385815d3c0b9f838659286febc Mon Sep 17 00:00:00 2001
From: Sam Al-Sapti <sam@sapti.me>
Date: Sun, 1 Oct 2023 15:26:33 +0200
Subject: [PATCH] Move files to their correct locations

---
 .../limiter.toml.j2 => files/searxng/limiter.toml}          | 0
 roles/docker_services/tasks/services/caddy.yml              | 2 +-
 roles/docker_services/tasks/services/searxng.yml            | 6 +++---
 roles/docker_services/templates/{ => caddy}/Caddyfile.j2    | 0
 .../docker_services/templates/{ => searxng}/settings.yml.j2 | 0
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename roles/docker_services/{templates/limiter.toml.j2 => files/searxng/limiter.toml} (100%)
 rename roles/docker_services/templates/{ => caddy}/Caddyfile.j2 (100%)
 rename roles/docker_services/templates/{ => searxng}/settings.yml.j2 (100%)

diff --git a/roles/docker_services/templates/limiter.toml.j2 b/roles/docker_services/files/searxng/limiter.toml
similarity index 100%
rename from roles/docker_services/templates/limiter.toml.j2
rename to roles/docker_services/files/searxng/limiter.toml
diff --git a/roles/docker_services/tasks/services/caddy.yml b/roles/docker_services/tasks/services/caddy.yml
index 94616a2..d10b5ed 100644
--- a/roles/docker_services/tasks/services/caddy.yml
+++ b/roles/docker_services/tasks/services/caddy.yml
@@ -14,7 +14,7 @@
 
 - name: Copy Caddyfile
   ansible.builtin.template:
-    src: Caddyfile.j2
+    src: caddy/Caddyfile.j2
     dest: "{{ services.caddy.volume }}/Caddyfile"
     owner: root
     mode: u=rw,g=r,o=r
diff --git a/roles/docker_services/tasks/services/searxng.yml b/roles/docker_services/tasks/services/searxng.yml
index 13087a7..516cf73 100644
--- a/roles/docker_services/tasks/services/searxng.yml
+++ b/roles/docker_services/tasks/services/searxng.yml
@@ -17,14 +17,14 @@
 
 - name: Copy SearXNG settings.yml file
   ansible.builtin.template:
-    src: settings.yml.j2
+    src: searxng/settings.yml.j2
     dest: "{{ services.searxng.volume }}/searxng/settings.yml"
     owner: root
     mode: u=rw,g=r,o=r
 
 - name: Copy SearXNG limiter.toml file
-  ansible.builtin.template:
-    src: limiter.toml.j2
+  ansible.builtin.copy:
+    src: searxng/limiter.toml
     dest: "{{ services.searxng.volume }}/searxng/limiter.toml"
     owner: root
     mode: u=rw,g=r,o=r
diff --git a/roles/docker_services/templates/Caddyfile.j2 b/roles/docker_services/templates/caddy/Caddyfile.j2
similarity index 100%
rename from roles/docker_services/templates/Caddyfile.j2
rename to roles/docker_services/templates/caddy/Caddyfile.j2
diff --git a/roles/docker_services/templates/settings.yml.j2 b/roles/docker_services/templates/searxng/settings.yml.j2
similarity index 100%
rename from roles/docker_services/templates/settings.yml.j2
rename to roles/docker_services/templates/searxng/settings.yml.j2