diff --git a/dns/zones/mnke.org.zone b/dns/zones/mnke.org.zone index f5c5445..54655b9 100644 --- a/dns/zones/mnke.org.zone +++ b/dns/zones/mnke.org.zone @@ -1,10 +1,12 @@ $ORIGIN mnke.org. -@ 900 IN SOA dns-server. hostadmin 34 900 300 604800 900 +@ 900 IN SOA dns-server. hostadmin 37 900 300 604800 900 @ 3600 IN NS dns-server. authentik 600 IN CNAME authentik.dolo blog 600 IN CNAME blog.dolo git 600 IN CNAME git.jumper media 600 IN CNAME media.dolo -panel 600 IN CNAME panel.jumper +panel 600 IN CNAME panel.dolo +seerr 600 IN CNAME seerr.dolo up 600 IN CNAME up.dolo vault 600 IN CNAME vault.jumper +wings-01_jodye 600 IN CNAME dolo diff --git a/dns/zones/web.jodye.mnke.org.zone b/dns/zones/web.jodye.mnke.org.zone deleted file mode 100644 index 41409b3..0000000 --- a/dns/zones/web.jodye.mnke.org.zone +++ /dev/null @@ -1,4 +0,0 @@ -$ORIGIN web.jodye.mnke.org. -@ 900 IN SOA dns-server. hostadmin 2 900 300 604800 900 -@ 3600 IN NS dns-server. -wings-01 600 IN CNAME dolo.mnke.org. diff --git a/k8s/apps/cloudflared/cloudflared-mnke.yaml b/k8s/apps/cloudflared/cloudflared-mnke.yaml index 7086fd2..8f1c34f 100644 --- a/k8s/apps/cloudflared/cloudflared-mnke.yaml +++ b/k8s/apps/cloudflared/cloudflared-mnke.yaml @@ -118,5 +118,9 @@ data: service: https://media.mnke.org - hostname: up.mnke.org service: https://up.mnke.org + - hostname: panel.mnke.org + service: https://panel.mnke.org + - hostname: wings-01_jodye.mnke.org + service: https://wings-01_jodye.mnke.org # This rule matches any traffic which didn't match a previous rule, and responds with HTTP 404. - service: http_status:404 diff --git a/k8s/apps/ingressroutes/external/build/kustomization.yaml b/k8s/apps/ingressroutes/external/build/kustomization.yaml index cdb09d4..fa85bb9 100644 --- a/k8s/apps/ingressroutes/external/build/kustomization.yaml +++ b/k8s/apps/ingressroutes/external/build/kustomization.yaml @@ -8,4 +8,5 @@ resources: - seerr-tonydu.yaml - wizarr-tonydu.yaml - dns-dolo-mnke.yaml - - wings-01-web-jodye-mnke.yaml + - wings-01-jodye.yaml + - panel.yaml diff --git a/k8s/apps/ingressroutes/external/build/jodye-wings-01-dolo-mnke.yaml b/k8s/apps/ingressroutes/external/build/panel.yaml similarity index 62% rename from k8s/apps/ingressroutes/external/build/jodye-wings-01-dolo-mnke.yaml rename to k8s/apps/ingressroutes/external/build/panel.yaml index a527a8a..763e64d 100644 --- a/k8s/apps/ingressroutes/external/build/jodye-wings-01-dolo-mnke.yaml +++ b/k8s/apps/ingressroutes/external/build/panel.yaml @@ -3,13 +3,13 @@ apiVersion: v1 kind: Service metadata: - name: jodye-wings-01-dolo-mnke-external + name: panel-external namespace: default spec: type: ExternalName - externalName: wings-01.jodye.mnke.org + externalName: panel.jumper.mnke.org ports: - - name: jodye-wings-01-dolo-mnke-external + - name: panel-external port: 443 targetPort: 443 @@ -18,18 +18,18 @@ spec: apiVersion: traefik.io/v1alpha1 kind: IngressRoute metadata: - name: jodye-wings-01-dolo-mnke-external + name: panel-external namespace: default spec: entryPoints: - websecure routes: - - match: Host(`jodye-wings-01.dolo.mnke.org`) + - match: Host(`panel.mnke.org`) kind: Rule services: - kind: Service - name: jodye-wings-01-dolo-mnke-external + name: panel-external port: 443 - passHostHeader: true + passHostHeader: True tls: secretName: wildcard-mnke-org-tls diff --git a/k8s/apps/ingressroutes/external/build/web-wings-01-jodye-mnke.yaml b/k8s/apps/ingressroutes/external/build/wings-01-jodye.yaml similarity index 72% rename from k8s/apps/ingressroutes/external/build/web-wings-01-jodye-mnke.yaml rename to k8s/apps/ingressroutes/external/build/wings-01-jodye.yaml index 1fcc516..243a94a 100644 --- a/k8s/apps/ingressroutes/external/build/web-wings-01-jodye-mnke.yaml +++ b/k8s/apps/ingressroutes/external/build/wings-01-jodye.yaml @@ -3,13 +3,13 @@ apiVersion: v1 kind: Service metadata: - name: web-wings-01-jodye-mnke-external + name: wings-01-jodye-external namespace: default spec: type: ExternalName externalName: wings-01.jodye.mnke.org ports: - - name: web-wings-01-jodye-mnke-external + - name: wings-01-jodye-external port: 443 targetPort: 443 @@ -18,17 +18,17 @@ spec: apiVersion: traefik.io/v1alpha1 kind: IngressRoute metadata: - name: web-wings-01-jodye-mnke-external + name: wings-01-jodye-external namespace: default spec: entryPoints: - websecure routes: - - match: Host(`web.wings-01.jodye.mnke.org`) + - match: Host(`wings-01_jodye.mnke.org`) kind: Rule services: - kind: Service - name: web-wings-01-jodye-mnke-external + name: wings-01-jodye-external port: 443 passHostHeader: true scheme: http diff --git a/k8s/apps/ingressroutes/external/build/wings-01-web-jodye-mnke.yaml b/k8s/apps/ingressroutes/external/build/wings-01-web-jodye-mnke.yaml deleted file mode 100644 index f7145f6..0000000 --- a/k8s/apps/ingressroutes/external/build/wings-01-web-jodye-mnke.yaml +++ /dev/null @@ -1,36 +0,0 @@ ---- -# This file was automatically generated. Do not modify. -apiVersion: v1 -kind: Service -metadata: - name: wings-01-web-jodye-mnke-external - namespace: default -spec: - type: ExternalName - externalName: wings-01.jodye.mnke.org - ports: - - name: wings-01-web-jodye-mnke-external - port: 443 - targetPort: 443 - ---- -# This file was automatically generated. Do not modify. -apiVersion: traefik.io/v1alpha1 -kind: IngressRoute -metadata: - name: wings-01-web-jodye-mnke-external - namespace: default -spec: - entryPoints: - - websecure - routes: - - match: Host(`wings-01.web.jodye.mnke.org`) - kind: Rule - services: - - kind: Service - name: wings-01-web-jodye-mnke-external - port: 443 - passHostHeader: true - scheme: http - tls: - secretName: wildcard-mnke-org-tls diff --git a/k8s/apps/ingressroutes/external/templater/values.yaml b/k8s/apps/ingressroutes/external/templater/values.yaml index 6cb48bb..39ef99d 100644 --- a/k8s/apps/ingressroutes/external/templater/values.yaml +++ b/k8s/apps/ingressroutes/external/templater/values.yaml @@ -56,9 +56,16 @@ proxies: upstream_port: 5380 pass_host_header: false - - service_name: wings-01-web-jodye-mnke + - service_name: wings-01-jodye tls_secret_name: wildcard-mnke-org-tls - listen_host: wings-01.web.jodye.mnke.org + listen_host: wings-01_jodye.mnke.org upstream_host: wings-01.jodye.mnke.org upstream_port: 443 scheme: http + + - service_name: panel + tls_secret_name: wildcard-mnke-org-tls + listen_host: panel.mnke.org + upstream_host: panel.jumper.mnke.org + upstream_port: 443 + pass_host_header: true