From eaa41863b4441a8a4fb90e4d0308115041397038 Mon Sep 17 00:00:00 2001
From: Jakob Meier <comcloudway@ccw.icu>
Date: Sun, 17 Sep 2023 21:03:10 +0200
Subject: [PATCH] Unbundled domain from config

---
 group_vars/all/vars.yml                          | 1 +
 roles/containers/alpine-mirror/defaults/main.yml | 2 +-
 roles/containers/firefish/defaults/main.yml      | 2 +-
 roles/containers/homepage/defaults/main.yml      | 2 +-
 roles/containers/transport/defaults/main.yml     | 2 +-
 roles/containers/uptime-kuma/defaults/main.yml   | 2 +-
 roles/containers/wireguard/defaults/main.yml     | 2 +-
 roles/containers/woodpecker-ci/defaults/main.yml | 2 +-
 8 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/group_vars/all/vars.yml b/group_vars/all/vars.yml
index fe47c9e..33b9312 100644
--- a/group_vars/all/vars.yml
+++ b/group_vars/all/vars.yml
@@ -9,3 +9,4 @@ base_packages:
 shell: /bin/ash
 docker_subid: "100000:65536"
 container_dir: "/home/{{ username }}"
+domain: "example.com"
diff --git a/roles/containers/alpine-mirror/defaults/main.yml b/roles/containers/alpine-mirror/defaults/main.yml
index 5f10810..2997586 100644
--- a/roles/containers/alpine-mirror/defaults/main.yml
+++ b/roles/containers/alpine-mirror/defaults/main.yml
@@ -1,5 +1,5 @@
 ---
-alpine_mirror_domain: "mirror.ccw.icu"
+alpine_mirror_domain: "mirror.{{ domain }}"
 alpine_mirror_user: "deploy"
 alpine_mirror_token: "changeme"
 alpine_mirror_bucket: "aports"
diff --git a/roles/containers/firefish/defaults/main.yml b/roles/containers/firefish/defaults/main.yml
index d570b79..4977754 100644
--- a/roles/containers/firefish/defaults/main.yml
+++ b/roles/containers/firefish/defaults/main.yml
@@ -2,7 +2,7 @@
 firefish_project_dir: world
 firefish_port: "4753"
 firefish_open: "false"
-firefish_domain: "{{ firefish_project_dir }}.ccw.icu"
+firefish_domain: "{{ firefish_project_dir }}.{{ domain }}"
 firefish_postgres_pass: ""
 firefish_postgres_user: ""
 firefish_sonic_pass: ""
diff --git a/roles/containers/homepage/defaults/main.yml b/roles/containers/homepage/defaults/main.yml
index 32e6fec..87bc603 100644
--- a/roles/containers/homepage/defaults/main.yml
+++ b/roles/containers/homepage/defaults/main.yml
@@ -1,5 +1,5 @@
 ---
-homepage_domain: "ccw.icu"
+homepage_domain: "{{ domain }}"
 homepage_user: "deploy"
 homepage_token: "changeme"
 homepage_bucket: "pages"
diff --git a/roles/containers/transport/defaults/main.yml b/roles/containers/transport/defaults/main.yml
index a9fe197..60d4473 100644
--- a/roles/containers/transport/defaults/main.yml
+++ b/roles/containers/transport/defaults/main.yml
@@ -1,3 +1,3 @@
 ---
 transport_port: 7945
-transport_domain: "transport.ccw.icu"
+transport_domain: "transport.{{ transport }}"
diff --git a/roles/containers/uptime-kuma/defaults/main.yml b/roles/containers/uptime-kuma/defaults/main.yml
index 69f10be..401a5fe 100644
--- a/roles/containers/uptime-kuma/defaults/main.yml
+++ b/roles/containers/uptime-kuma/defaults/main.yml
@@ -1,4 +1,4 @@
 ---
 uptime_kuma_project_dir: status
 uptime_kuma_port: 3001
-uptime_kuma_domain: status.ccw.icu
+uptime_kuma_domain: "status.{{ domain }}"
diff --git a/roles/containers/wireguard/defaults/main.yml b/roles/containers/wireguard/defaults/main.yml
index 701e97a..2b253d6 100644
--- a/roles/containers/wireguard/defaults/main.yml
+++ b/roles/containers/wireguard/defaults/main.yml
@@ -1,5 +1,5 @@
 ---
-wireguard_domain: vpn.ccw.icu
+wireguard_domain: "vpn.{{ domain }}"
 wireguard_project_dir: vpn
 wireguard_port: "51820"
 wireguard_peers:
diff --git a/roles/containers/woodpecker-ci/defaults/main.yml b/roles/containers/woodpecker-ci/defaults/main.yml
index 6db7894..6203b5c 100644
--- a/roles/containers/woodpecker-ci/defaults/main.yml
+++ b/roles/containers/woodpecker-ci/defaults/main.yml
@@ -2,7 +2,7 @@
 woodpecker_project_dir: ci
 woodpecker_port: "8000"
 woodpecker_open: "false"
-woodpecker_domain: ci.ccw.icu
+woodpecker_domain: "ci.{{ domain }}"
 woodpecker_host: https://{{ woodpecker_domain }}
 woodpecker_gitea: https://codeberg.org
 woodpecker_gitea_client: changeme
-- 
2.38.5