From 423a8247bb2e3244cc095ff61492bbc1d279edc6 Mon Sep 17 00:00:00 2001
From: Jakob Meier <comcloudway@ccw.icu>
Date: Sun, 9 Jul 2023 07:56:10 +0200
Subject: [PATCH] Formatted files

---
 roles/containers/calckey/README.org             |  2 +-
 .../caddy/templates/reverse-proxy.template      |  2 +-
 run.yml                                         | 17 ++++++++++++++---
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/roles/containers/calckey/README.org b/roles/containers/calckey/README.org
index 1e8d92d..abade62 100644
--- a/roles/containers/calckey/README.org
+++ b/roles/containers/calckey/README.org
@@ -9,7 +9,7 @@ calckey_project_dir: "world"
 calckey_port: "4753"
 calckey_open: "false"
 calckey_domain: "{{ calckey_project_dir }}.ccw.icu"
-calckey_postgres_pass: ""
 calckey_postgres_user: ""
+calckey_postgres_pass: ""
 calckey_sonic_pass: ""
 #+end_src
diff --git a/roles/network/caddy/templates/reverse-proxy.template b/roles/network/caddy/templates/reverse-proxy.template
index 97572e3..8c17462 100644
--- a/roles/network/caddy/templates/reverse-proxy.template
+++ b/roles/network/caddy/templates/reverse-proxy.template
@@ -1,3 +1,3 @@
 {{ domain }} {
-reverse_proxy :{{ port }}
+   reverse_proxy :{{ port }}
 }
diff --git a/run.yml b/run.yml
index 20c4e3f..4fbe879 100644
--- a/run.yml
+++ b/run.yml
@@ -1,5 +1,7 @@
 ---
-# System setup
+############################################
+# SETUP BASE SYSTEM
+############################################
 - name: setup base system
   hosts: all
   become: true
@@ -7,13 +9,17 @@
     - role: system
       tags: system
 
-# Network related
+############################################
+# SETUP NETWORK
+############################################
+# Setup Proxy (caddy)
 - name: setup caddy as proxy
   hosts: all
   become: true
   roles:
     - role: network/caddy
       tags: proxy
+# Setup Firewall (nftables)
 - name: setup nftables firewall
   hosts: all
   become: true
@@ -21,17 +27,22 @@
     - role: network/nftables
       tags: firewall
 
-# Container related
+############################################
+# SETUP CONTAINERS
+############################################
+# Setup woodpecker-CI
 - name: setup Woodpecker CI
   hosts: all
   roles:
     - role: containers/woodpecker-ci
       tags: ci
+# Setup Calckey
 - name: setup Calckey
   hosts: all
   roles:
     - role: containers/calckey
       tags: calckey
+# Setup Uptime Kuma
 - name: setup Uptime Kuma
   hosts: all
   roles:
-- 
2.38.5