From 1b02ec12fea2035e871f0041448d3ce74f153641 Mon Sep 17 00:00:00 2001
From: Paul Brinkmeier <hallo@pbrinkmeier.de>
Date: Sun, 10 Apr 2022 00:32:33 +0200
Subject: [PATCH] Add better config for static site repositories

---
 ansible/misc.yaml                             | 22 ++++++++++++++++++-
 .../checkout_static_sites/tasks/main.yaml     | 10 +++++++++
 docker/web/Caddyfile                          |  2 +-
 docker/web/docker-compose.yaml                |  4 ++--
 4 files changed, 34 insertions(+), 4 deletions(-)
 create mode 100644 ansible/roles/checkout_static_sites/tasks/main.yaml

diff --git a/ansible/misc.yaml b/ansible/misc.yaml
index 5f71aaa..f65b800 100644
--- a/ansible/misc.yaml
+++ b/ansible/misc.yaml
@@ -64,4 +64,24 @@
         - name: web
           state: present
         - name: runner
-          state: present
\ No newline at end of file
+          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
+              url: https://git.pbrinkmeier.de/paul/pbrinkmeier.de
+              commit: 680ac7d9c44752f57436d0ecb9c8018205a5fc0f
+              owner: paul
+            - 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
new file mode 100644
index 0000000..576b120
--- /dev/null
+++ b/ansible/roles/checkout_static_sites/tasks/main.yaml
@@ -0,0 +1,10 @@
+---
+- name: Check out static site repositories
+  become: yes
+  become_user: "{{ item.owner }}"
+  ansible.builtin.git:
+    dest: "{{ item.path }}"
+    repo: "{{ item.url }}"
+    version: "{{ item.commit }}"
+
+  loop: "{{ checkout_static_sites.checkouts }}"
diff --git a/docker/web/Caddyfile b/docker/web/Caddyfile
index 4a2d068..5d06ff5 100644
--- a/docker/web/Caddyfile
+++ b/docker/web/Caddyfile
@@ -16,4 +16,4 @@ codi.pbrinkmeier.de {
 
 git.pbrinkmeier.de {
     reverse_proxy gitlab:80
-}
\ No newline at end of file
+}
diff --git a/docker/web/docker-compose.yaml b/docker/web/docker-compose.yaml
index 50c2441..cbd2407 100644
--- a/docker/web/docker-compose.yaml
+++ b/docker/web/docker-compose.yaml
@@ -11,8 +11,8 @@ services:
     volumes:
       - caddy_data:/data
       - caddy_config:/config
-      - /home/paul/pbrinkmeier.de:/srv/pbrinkmeier.de:ro
-      - /home/paul/tichy.click:/srv/tichy.click:ro
+      - /home/paul/sites/pbrinkmeier.de:/srv/pbrinkmeier.de:ro
+      - /home/paul/sites/tichy.click:/srv/tichy.click:ro
     restart: always
 
   codi: