From 30b74c50e288ad48b023fe499f5e07a11d2b804b Mon Sep 17 00:00:00 2001 From: Elam Monnot Date: Wed, 10 May 2023 11:02:40 +0200 Subject: [PATCH] fix: edites dns entries and peertube role --- roles/dns-master/files/db.gsb.lan | 4 ++-- roles/peertube/files/finish | 2 +- roles/peertube/files/resolv.conf | 5 +++-- roles/peertube/files/values.yaml | 4 ++-- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/roles/dns-master/files/db.gsb.lan b/roles/dns-master/files/db.gsb.lan index f9d866a..fc6ccc4 100644 --- a/roles/dns-master/files/db.gsb.lan +++ b/roles/dns-master/files/db.gsb.lan @@ -5,7 +5,7 @@ ; $TTL 604800 @ IN SOA s-infra.gsb.lan. root.s-infra.gsb.lan. ( - 2023040501 ; Serial + 2023051000 ; Serial 7200 ; Refresh 86400 ; Retry 8419200 ; Expire @@ -37,4 +37,4 @@ s-lb.gsb.lan IN A 192.168.100.10 ns IN CNAME s-infra.gsb.lan. wpad IN CNAME s-infra.gsb.lan. s-peertube IN A 192.168.100.20 -s-peertube.gsb.lan IN CNAME s-peertube \ No newline at end of file +peertube IN CNAME s-peertube diff --git a/roles/peertube/files/finish b/roles/peertube/files/finish index 588db3f..f64fbd8 100644 --- a/roles/peertube/files/finish +++ b/roles/peertube/files/finish @@ -1,4 +1,4 @@ -MYHOST=s-peertube.gsb.lan; +MYHOST=peertube.gsb.lan; export KUBECONFIG=/etc/rancher/k3s/k3s.yaml; openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout tls.key -out tls.cert -subj /CN="${MYHOST}"/O="${MYHOST}" -addext "subjectAltName = DNS:${MYHOST}"; kubectl create secret tls tls-peertube --key tls.key --cert tls.cert; diff --git a/roles/peertube/files/resolv.conf b/roles/peertube/files/resolv.conf index ff7304e..369d1b1 100644 --- a/roles/peertube/files/resolv.conf +++ b/roles/peertube/files/resolv.conf @@ -1,2 +1,3 @@ -nameserver 192.168.99.99 -nameserver 172.16.0.1 \ No newline at end of file +domain gsb.lan +search gsb.lan +nameserver 172.16.0.1 diff --git a/roles/peertube/files/values.yaml b/roles/peertube/files/values.yaml index ce7e6b2..ea8e466 100644 --- a/roles/peertube/files/values.yaml +++ b/roles/peertube/files/values.yaml @@ -105,14 +105,14 @@ ingress: nginx.ingress.kubernetes.io/proxy-body-size: 6G # this caps the size of imported videos, if set low this might prevent you from uploading videos # kubernetes.io/tls-acme: "true" hosts: - - host: s-peertube.gsb.lan + - host: peertube.gsb.lan paths: - path: / pathType: ImplementationSpecific tls: - secretName: tls-peertube - hosts: - - s-peertube.gsb.lan + - peertube.gsb.lan resources: {} autoscaling: