From d596a5fa9ac95709277a5f1e233aea712370bf0c Mon Sep 17 00:00:00 2001
From: Paul Brinkmeier <hallo@pbrinkmeier.de>
Date: Sun, 10 Apr 2022 00:49:41 +0200
Subject: [PATCH] Change sites to Sites to make home dir more consistent

---
 ansible/misc.yaml                                   | 11 ++---------
 ansible/roles/checkout_static_sites/tasks/main.yaml | 10 +++++++++-
 docker/web/docker-compose.yaml                      |  3 +--
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/ansible/misc.yaml b/ansible/misc.yaml
index f65b800..2d752c3 100644
--- a/ansible/misc.yaml
+++ b/ansible/misc.yaml
@@ -65,23 +65,16 @@
           state: present
         - name: runner
           state: present
-    - name: Create sites directory
-      become: yes
-      become_user: paul
-      ansible.builtin.file:
-        path: /home/paul/sites
-        state: directory
-        mode: '0755'
     - include_role:
         name: checkout_static_sites
       vars:
         checkout_static_sites:
           checkouts:
-            - path: /home/paul/sites/pbrinkmeier.de
+            - path: /home/paul/Sites/pbrinkmeier.de
               url: https://git.pbrinkmeier.de/paul/pbrinkmeier.de
               commit: 680ac7d9c44752f57436d0ecb9c8018205a5fc0f
               owner: paul
-            - path: /home/paul/sites/tichy.click
+            - path: /home/paul/Sites/tichy.click
               url: https://github.com/pbrinkmeier/tichy-clicker
               commit: 7dfb14183c765e3661fda84a7e89c2f73ca86f26
               owner: paul
diff --git a/ansible/roles/checkout_static_sites/tasks/main.yaml b/ansible/roles/checkout_static_sites/tasks/main.yaml
index 576b120..42e099f 100644
--- a/ansible/roles/checkout_static_sites/tasks/main.yaml
+++ b/ansible/roles/checkout_static_sites/tasks/main.yaml
@@ -1,4 +1,13 @@
 ---
+- name: Create static site directories
+  become: yes
+  ansible.builtin.file:
+    path: "{{ item.path }}"
+    state: directory
+    mode: '0755'
+    owner: "{{ item.owner }}"
+    group: "{{ item.owner }}"
+  loop: "{{ checkout_static_sites.checkouts }}"
 - name: Check out static site repositories
   become: yes
   become_user: "{{ item.owner }}"
@@ -6,5 +15,4 @@
     dest: "{{ item.path }}"
     repo: "{{ item.url }}"
     version: "{{ item.commit }}"
-
   loop: "{{ checkout_static_sites.checkouts }}"
diff --git a/docker/web/docker-compose.yaml b/docker/web/docker-compose.yaml
index cbd2407..d285764 100644
--- a/docker/web/docker-compose.yaml
+++ b/docker/web/docker-compose.yaml
@@ -11,8 +11,7 @@ services:
     volumes:
       - caddy_data:/data
       - caddy_config:/config
-      - /home/paul/sites/pbrinkmeier.de:/srv/pbrinkmeier.de:ro
-      - /home/paul/sites/tichy.click:/srv/tichy.click:ro
+      - /home/paul/Sites:/srv:ro
     restart: always
 
   codi: