From 045bd893867522d6314f5dcbf53e3cf45d2bbaa9 Mon Sep 17 00:00:00 2001
From: xeruf <27jf@pm.me>
Date: Sun, 24 Mar 2024 18:53:12 +0300
Subject: [PATCH] apps/status: improve domain handling
---
apps/forge/forgejo/forgejo-oauth-client.yaml | 2 +-
.../forgejo/forgejo-values-configmap.yaml | 6 +-
apps/status/gatus/gatus-values-configmap.yaml | 55 ++++++++++---------
3 files changed, 33 insertions(+), 30 deletions(-)
diff --git a/apps/forge/forgejo/forgejo-oauth-client.yaml b/apps/forge/forgejo/forgejo-oauth-client.yaml
index 5300184..a6d1286 100644
--- a/apps/forge/forgejo/forgejo-oauth-client.yaml
+++ b/apps/forge/forgejo/forgejo-oauth-client.yaml
@@ -17,5 +17,5 @@ spec:
scope: "openid profile email stackspin_roles"
secretName: stackspin-forgejo-oauth-variables
redirectUris:
- - https://forge.${domain}/user/oauth2/Stackspin/callback
+ - https://${forgejo_domain}/user/oauth2/Stackspin/callback
tokenEndpointAuthMethod: client_secret_post
diff --git a/apps/forge/forgejo/forgejo-values-configmap.yaml b/apps/forge/forgejo/forgejo-values-configmap.yaml
index 4c20f54..e3f17f0 100644
--- a/apps/forge/forgejo/forgejo-values-configmap.yaml
+++ b/apps/forge/forgejo/forgejo-values-configmap.yaml
@@ -11,14 +11,14 @@ data:
kubernetes.io/tls-acme: "true"
nginx.ingress.kubernetes.io/proxy-body-size: "50m"
hosts:
- - host: "forge.${domain}"
+ - host: "${forgejo_domain}"
paths:
- path: /
pathType: Prefix
tls:
- secretName: forgejo-tls
hosts:
- - "forge.${domain}"
+ - "${forgejo_domain}"
gitea:
admin:
username: "forgejo"
@@ -54,7 +54,7 @@ data:
DEFAULT_REPO_UNITS: [repo.code,repo.releases,repo.issues,repo.pulls]
MAX_CREATION_LIMIT: 99
server:
- ROOT_URL: "https://forge.${domain}"
+ ROOT_URL: "https://${forgejo_domain}"
LANDING_PAGE: login
openid:
ENABLE_OPENID_SIGNUP: true
diff --git a/apps/status/gatus/gatus-values-configmap.yaml b/apps/status/gatus/gatus-values-configmap.yaml
index a4c4390..81ef0b4 100644
--- a/apps/status/gatus/gatus-values-configmap.yaml
+++ b/apps/status/gatus/gatus-values-configmap.yaml
@@ -53,8 +53,8 @@ data:
target: 1.1.1.1:53
interval: 60s
ui:
- header: "FTT Monitor"
- title: "FTT Monitoring"
+ header: "${org_name} Monitor"
+ title: "${org_name} Monitoring"
default-endpoint: &defaults
group: FTT
interval: 2m
@@ -64,45 +64,59 @@ data:
- name: "Nextcloud"
<<: *defaults
group: "Stackspout"
- url: "https://files.ftt.gmbh"
+ url: "https://files.${domain}/status.php"
- name: "Zulip"
<<: *defaults
group: "Stackspout"
- url: "https://chat.ftt.gmbh"
+ url: "https://chat.${domain}"
- name: "Vikunja"
<<: *defaults
group: "Stackspout"
- url: "https://do.ftt.gmbh"
+ url: "https://do.${domain}"
- name: "HedgeDoc"
<<: *defaults
group: "Stackspout"
- url: "https://note.ftt.gmbh"
+ url: "https://note.${domain}"
- name: "InvoiceNinja"
- url: "https://ninja.ftt.gmbh"
+ url: "https://ninja.${domain}"
<<: *defaults
group: "Stackspout"
- name: "Zammad"
- url: "https://support.ftt.gmbh"
+ url: "https://support.${domain}"
<<: *defaults
group: "Stackspout"
- name: "Forgejo Repositories"
- url: "https://forge.ftt.gmbh"
+ url: "https://forge.${domain}"
<<: *defaults
group: "Stackspout"
- - name: "NAS"
- url: "https://nas.ftt.gmbh"
+
+ - name: "Mailserver STARTTLS"
+ url: "starttls://${outgoing_mail_smtp_host}:587"
+ <<: *defaults
+ interval: 10m
+ client:
+ timeout: 5s
+ conditions:
+ - "[CONNECTED] == true"
+ - name: "Mailserver TLS"
+ url: "tls://${outgoing_mail_smtp_host}:465"
<<: *defaults
- group: "Tooling"
+ interval: 10m
+ client:
+ timeout: 5s
+ conditions:
+ - "[CONNECTED] == true"
+
- name: "FTT Homepage"
- url: "https://ftt.gmbh"
+ url: "https://${domain}"
<<: *defaults
group: "FTT"
- name: "FTT Teampage"
- url: "https://ftt.gmbh/team"
+ url: "https://${domain}/team"
<<: *defaults
group: "FTT"
- name: "FTT Teampage EN"
- url: "https://ftt.gmbh/en/team"
+ url: "https://${domain}/en/team"
<<: *defaults
group: "FTT"
- name: "Main Admin Panel"
@@ -113,14 +127,3 @@ data:
url: "https://ns2.iridion.it:999"
<<: *defaults
group: "Iridion"
-
- - name: "Fossil Repositories"
- url: "https://fossil.ftt.gmbh"
- enabled: false
- <<: *defaults
- group: "Development"
- - name: "Firezone"
- url: "https://fire.ftt.gmbh"
- enabled: false
- <<: *defaults
- group: "Security"
--
GitLab