From a64004d713027a5a7ddeb23548b0c3642e05fe47 Mon Sep 17 00:00:00 2001 From: Elam Monnot Date: Wed, 5 Apr 2023 10:56:43 +0200 Subject: [PATCH] feat: added dns records for peertube --- roles/base/templates/hosts.j2 | 2 +- roles/base/templates/hosts.s-proxy.j2 | 2 +- roles/dns-master/files/db.gsb.lan | 5 +++-- roles/dns-master/files/db.gsb.lan.rev | 4 ++-- roles/peertube/tasks/main.yml | 4 ++-- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/roles/base/templates/hosts.j2 b/roles/base/templates/hosts.j2 index d1ba76d..228e45a 100644 --- a/roles/base/templates/hosts.j2 +++ b/roles/base/templates/hosts.j2 @@ -28,7 +28,7 @@ 192.168.99.103 s-lb-web3.gsb.adm 192.168.99.112 r-vp1.gsb.adm 192.168.99.102 r-vp2.gsb.adm - +192.168.99.120 s-peertube.gsb.adm 192.168.99.8 syslog.gsb.adm diff --git a/roles/base/templates/hosts.s-proxy.j2 b/roles/base/templates/hosts.s-proxy.j2 index 47ff182..96f6386 100644 --- a/roles/base/templates/hosts.s-proxy.j2 +++ b/roles/base/templates/hosts.s-proxy.j2 @@ -27,6 +27,6 @@ 192.168.99.103 s-lb-web3.gsb.adm 192.168.99.112 r-vp1.gsb.adm 192.168.99.102 r-vp2.gsb.adm - +192.168.99.120 s-peertube.gsb.adm 192.168.99.8 syslog.gsb.adm diff --git a/roles/dns-master/files/db.gsb.lan b/roles/dns-master/files/db.gsb.lan index 61c93ba..63c7b8a 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. ( - 2023012500 ; Serial + 2023040501 ; Serial 7200 ; Refresh 86400 ; Retry 8419200 ; Expire @@ -35,4 +35,5 @@ s-web1 IN A 192.168.101.1 s-web2 IN A 192.168.101.2 s-lb.gsb.lan IN A 192.168.100.10 ns IN CNAME s-infra.gsb.lan. -wpad IN CNAME s-infra.gsb.lan. +wpad IN CNAME s-infra.gsb.lan. +peertube IN A 192.168.100.20 diff --git a/roles/dns-master/files/db.gsb.lan.rev b/roles/dns-master/files/db.gsb.lan.rev index e95bfa1..ff7e49a 100644 --- a/roles/dns-master/files/db.gsb.lan.rev +++ b/roles/dns-master/files/db.gsb.lan.rev @@ -5,7 +5,7 @@ ; $TTL 604800 @ IN SOA s-infra.gsb.lan. root.s-infra.gsb.lan. ( - 2023012500 ; Serial + 2023040501 ; Serial 7200 ; Refresh 86400 ; Retry 8419200 ; Expire @@ -28,4 +28,4 @@ $TTL 604800 11.0 IN PTR s-elk.gsb.lan. 17.0 IN PTR s-gestsup.lan 254.0 IN PTR r-int.gsb.lan. - +100.20 IN PTR s-peertube diff --git a/roles/peertube/tasks/main.yml b/roles/peertube/tasks/main.yml index 3ced74f..74d2511 100644 --- a/roles/peertube/tasks/main.yml +++ b/roles/peertube/tasks/main.yml @@ -22,10 +22,10 @@ shell: curl https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 | bash - name: exposition du cluster... - shell: export KUBECONFIG=/etc/rancher/k3s/k3s.yaml + command: KUBECONFIG=/etc/rancher/k3s/k3s.yaml - name: installation de peertube... shell: helm repo add postgresql https://charts.bitnami.com/bitnami && helm repo add redis https://charts.bitnami.com/bitnami && helm repo add mail https://bokysan.github.io/docker-postfix - name: lancement du helm chart peertube... - shell: helm install --create-namespace -n peertube peertube-gsb /root/tools/peertube/helm + shell: helm install --create-namespace -n peertube peertube-gsb /root/tools/peertube/helm/