fix: fixed peertube ingress and dns record

Mise à jour de 'roles/fog/tasks/main.yml'
fix: dhcp start correctly on r-int
2023-04-26 11:09:42 +02:00 · 2023-04-23 17:47:58 +02:00 · 2023-04-07 09:50:59 +02:00 · 2023-04-07 08:49:45 +02:00 · 2023-04-06 11:39:09 +02:00 · 2023-04-06 10:58:52 +02:00
10 changed files with 17 additions and 16 deletions
--- a/lisezmoi.txt
+++ b/lisezmoi.txt
@ -7,7 +7,7 @@ Ce document décrit les divers élements du projet GSB du BTS SIO utilisé pour
 Le projet GSB décrit les diférents playbooks permttant d'installer les
 machines du projet GSB

-Les répertoires :
+Les répertoires : 

 - roles : les roles
 - goss : les outils de test
--- a/roles/dns-master/files/db.gsb.lan
+++ b/roles/dns-master/files/db.gsb.lan
@ -36,4 +36,4 @@ 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.
-peertube	IN	A	192.168.100.20
+s-peertube	IN	A	192.168.100.20
--- a/roles/fog/tasks/main.yml
+++ b/roles/fog/tasks/main.yml
@ -22,5 +22,5 @@
  command: "cp /root/tools/ansible/roles/fog/files/fogsettings /opt/fog/"

 - name: fichier fogsettings en .fogsettings
-command: "mv /opt/fog/fogsettings /opt/fog/.fogsettings"
+  command: "mv /opt/fog/fogsettings /opt/fog/.fogsettings"

--- a/roles/peertube/files/finish
+++ b/roles/peertube/files/finish
@ -1,10 +1,7 @@
+MYHOST=s-peertube.gsb.lan;
 export KUBECONFIG=/etc/rancher/k3s/k3s.yaml;
-helm upgrade --install ingress-nginx ingress-nginx \
-  --repo https://kubernetes.github.io/ingress-nginx \
-  --namespace ingress-nginx --create-namespace;
-sleep 15;
-openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout ${KEY_FILE} -out ${CERT_FILE} -subj "/CN=${HOST}/O=${HOST}" -addext "subjectAltName = DNS:${HOST}";
-kubectl create secret tls tls-peertube --key ${KEY_FILE} --cert ${CERT_FILE};
+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;
 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;
--- a/roles/peertube/files/values.yaml
+++ b/roles/peertube/files/values.yaml
@ -101,8 +101,8 @@ ingress:
  enabled: true
  className: ""
  annotations: 
-    kubernetes.io/ingress.class: nginx
-    nginx.ingress.kubernetes.io/proxy-body-size: 4G # this caps the size of imported videos, if set low this might prevent you from uploading videos
+    kubernetes.io/ingress.class: traefik
+    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
--- a/roles/post/files/interfaces.r-int
+++ b/roles/post/files/interfaces.r-int
@ -34,4 +34,4 @@ iface enp0s10 inet static
 allow-hotplug enp0s16
 iface enp0s16 inet static
 	address 172.16.0.254/24
-	
+	post-up sleep 10 && systemctl restart isc-dhcp-server	
--- a/roles/wireguard-l/README.md
+++ b/roles/wireguard-l/README.md
@ -1,5 +1,5 @@
-#ajout du sleep 5
+# ajout du sleep 5

-éditer "/etc/init.d/isc-dhcp-server"
-aller au "case \"$1\" in" et rajouter "sleep 5" avant le "if"
+~~éditer "/etc/init.d/isc-dhcp-server"~~
+~~aller au "case \"$1\" in" et rajouter "sleep 5" avant le "if"~~

--- a/windows/mkusr-backup.cmd
+++ b/windows/mkusr-backup.cmd
@ -1,3 +1,4 @@
+@echo off
 net group gg-backup /ADD
 call mkusr uBackup "u-backup" gg-backup
 icacls "C:\gsb\partages\public" /Grant:r uBackup:M /T
--- a/windows/mkusr-compta.cmd
+++ b/windows/mkusr-compta.cmd
@ -1,4 +1,5 @@
+@echo off
 call mkusr aDupont "Albert Dupon" gg-compta
 call mkusr cSeum "Claire Seum" gg-compta
 call mkusr nPaul "Nicolas Paul" gg-compta
-call mkusr atour "Alexandre Tour" gg-compta
+call mkusr atour "Alexandre Tour" gg-compta
--- a/windows/mkusr-nextcloud.cmd
+++ b/windows/mkusr-nextcloud.cmd
@ -0,0 +1,2 @@
+@echo off
+call mkusr nextcloud "nextcloud" nextcloud
Author	SHA1	Message	Date
Elam Monnot	be47dbabd2	fix: fixed peertube ingress and dns record	2023-04-26 11:09:42 +02:00
gadmin	24d8892b4c	Mise à jour de 'roles/fog/tasks/main.yml'	2023-04-23 17:47:58 +02:00
Elam Monnot	2c828574ef	fix: dhcp start correctly on r-int	2023-04-07 09:50:59 +02:00
Elam Monnot	a5f0d258a5	feat: peertube work	2023-04-07 08:49:45 +02:00
Elam Monnot	52b9f3af87	feat: changed ingress for peertube	2023-04-06 11:39:09 +02:00
Louis DÉPRÉS	8dc1f9a891	Ajout creation utilisateur nextcloud Windows	2023-04-06 10:58:52 +02:00
Anthony Arnoux	0d3860211b	readme wireguard-l était bancal	2023-04-06 10:48:27 +02:00
Anthony Arnoux	7a2311ae25	readme wireguard-l	2023-04-06 10:43:54 +02:00
Anthony Arnoux	ebcd50bf69	elam qui fait nimporte quoi encore une fois !	2023-04-06 09:19:45 +02:00