diff --git a/k8s/apps/postfix/templates/postfix.yaml b/k8s/apps/postfix/templates/postfix.yaml index 6d6da01..e265250 100644 --- a/k8s/apps/postfix/templates/postfix.yaml +++ b/k8s/apps/postfix/templates/postfix.yaml @@ -6,7 +6,7 @@ metadata: name: "postfix-smtp-env" type: Opaque data: - SERVER_HOSTNAME: "{{ .Values.global.domain | b64enc }}" + SERVER_HOSTNAME: "{{ (printf "%s.%s" .Values.global.rootSubDomain .Values.global.domain) | b64enc }}" {{ range $k, $v := .Values.smtp_configs }} {{ $k }}: "{{ $v | b64enc }}" {{ end }} diff --git a/k8s/apps/videohosting/templates/sts-jellyfin.yaml b/k8s/apps/videohosting/templates/sts-jellyfin.yaml index b6d481a..206e10d 100644 --- a/k8s/apps/videohosting/templates/sts-jellyfin.yaml +++ b/k8s/apps/videohosting/templates/sts-jellyfin.yaml @@ -7,7 +7,7 @@ data: PUID: "1000" PGID: "1000" TZ: {{ .Values.global.timezone }} - JELLYFIN_PublishedServerUrl: "https://jellyfin.{{ .Values.global.domain }}" + JELLYFIN_PublishedServerUrl: "https://jellyfin.{{ .Values.global.rootSubDomain }}.{{ .Values.global.domain }}" DOTNET_SYSTEM_IO_DISABLEFILELOCKING: "1" --- diff --git a/k8s/apps/videohosting/templates/sts-plex.yaml b/k8s/apps/videohosting/templates/sts-plex.yaml index 3a250e7..c473f38 100644 --- a/k8s/apps/videohosting/templates/sts-plex.yaml +++ b/k8s/apps/videohosting/templates/sts-plex.yaml @@ -7,7 +7,7 @@ data: PUID: "1000" PGID: "1000" TZ: {{ .Values.global.timezone }} - ADVERTISE_IP: "https://plex.{{ .Values.global.domain }}" + ADVERTISE_IP: "https://plex.{{ .Values.global.rootSubDomain }}.{{ .Values.global.domain }}" --- kind: Service diff --git a/k8s/argoapps/apps-values/nextcloud.yaml b/k8s/argoapps/apps-values/nextcloud.yaml index c80f195..a5baccf 100644 --- a/k8s/argoapps/apps-values/nextcloud.yaml +++ b/k8s/argoapps/apps-values/nextcloud.yaml @@ -2,7 +2,7 @@ global: storageClass: {{ .Values.global.nfs.storageClass }} nextcloud: nextcloud: - host: "nextcloud.{{ .Values.global.domain }}" + host: "nextcloud.{{ .Values.global.rootSubDomain }}.{{ .Values.global.domain }}" externalDatabase: host: postgres.chart-database.svc.cluster.local persistence: @@ -17,7 +17,7 @@ nextcloud: $CONFIG = array ( 'allow_user_to_change_display_name' => false, 'lost_password_link' => 'disabled', - 'oidc_login_provider_url' => 'https://auth.core.{{ .Values.global.domain }}', + 'oidc_login_provider_url' => 'https://auth.core.{{ .Values.global.rootSubDomain }}.{{ .Values.global.domain }}', 'oidc_login_client_id' => 'nextcloud', 'oidc_login_client_secret' => 'xjW7ByDrY0IpGo6XC5o6eQEUGagjkK6hULfbtADO5GV-ugHiG1ri1FRvkfL.-sacdHWyqZyO', 'oidc_login_auto_redirect' => false, diff --git a/k8s/argoapps/apps-values/photoprism.yaml b/k8s/argoapps/apps-values/photoprism.yaml index 075f343..5f7c96a 100644 --- a/k8s/argoapps/apps-values/photoprism.yaml +++ b/k8s/argoapps/apps-values/photoprism.yaml @@ -4,7 +4,7 @@ photoprism: caption: "Sosnovsky Photos" description: "Family Photos" authtor: "{{ .Values.global.email }}" - url: "https://photoprism.{{ .Values.global.domain }}" + url: "https://photoprism.{{ .Values.global.rootSubDomain }}.{{ .Values.global.domain }}" volumes: originals: {{ .Values.global.nfs.additionalShares.familyphotos }} import: ~ diff --git a/k8s/argoapps/chart-values/authentik.yaml b/k8s/argoapps/chart-values/authentik.yaml index 6fd4c90..f339d02 100644 --- a/k8s/argoapps/chart-values/authentik.yaml +++ b/k8s/argoapps/chart-values/authentik.yaml @@ -1,5 +1,5 @@ authentik: - cookie_domain: authentik.core.{{ .Values.global.domain }} + cookie_domain: authentik.core.{{ .Values.global.rootSubDomain }}.{{ .Values.global.domain }} email: from: {{ .Values.global.smtp.email }} host: postfix.email.svc.cluster.local diff --git a/k8s/argoapps/chart-values/prometheus.yaml b/k8s/argoapps/chart-values/prometheus.yaml index 346c415..65d09e5 100644 --- a/k8s/argoapps/chart-values/prometheus.yaml +++ b/k8s/argoapps/chart-values/prometheus.yaml @@ -14,9 +14,9 @@ alertmanager: storage: 100Gi {{- if .Values.global.tls.enabled }} - externalUrl: "https://alerts.core.{{ .Values.global.domain }}" + externalUrl: "https://alerts.core.{{ .Values.global.rootSubDomain }}.{{ .Values.global.domain }}" {{- else }} - externalUrl: "http://alerts.core.{{ .Values.global.domain }}" + externalUrl: "http://alerts.core.{{ .Values.global.rootSubDomain }}.{{ .Values.global.domain }}" {{- end }} resources: requests: @@ -28,7 +28,7 @@ alertmanager: global: smtp_from: '{{.Values.global.smtp.email }}' smtp_smarthost: 'postfix.email.svc.cluster.local:25' - smtp_hello: 'alerts.core.{{ .Values.global.domain }}' + smtp_hello: 'alerts.core.{{ .Values.global.rootSubDomain }}.{{ .Values.global.domain }}' receivers: - name: '{{ .Values.global.email }}' email_configs: @@ -48,16 +48,16 @@ grafana: server: domain: grafana.core.{{ .Values.global.domain }} server: - root_url: https://grafana.core.{{ .Values.global.domain }} + root_url: https://grafana.core.{{ .Values.global.rootSubDomain }}.{{ .Values.global.domain }} prometheus: prometheusSpec: enableAdminAPI: false {{- if .Values.global.tls.enabled }} - externalUrl: "https://monitoring.core.{{ .Values.global.domain }}" + externalUrl: "https://monitoring.core.{{ .Values.global.rootSubDomain }}.{{ .Values.global.domain }}" {{- else }} - externalUrl: "http://monitoring.core.{{ .Values.global.domain }}" + externalUrl: "http://monitoring.core.{{ .Values.global.rootSubDomain }}.{{ .Values.global.domain }}" {{- end }} resources: requests: