correction bug Arnoux

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

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

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"
 

roles/peertube-k3s/tasks/main.yml

@@ -14,7 +14,7 @@
       host: localhost
 
   - name: installation de k3s...
-    shell: curl -sfL https://get.k3s.io | sh -s - --docker
+    shell: curl -sfL https://get.k3s.io | INSTALL_K3S_EXEC="--node-ip=192.168.100.20 --flannel-iface=enp0s8" sh -s - --docker
 
   - name: attente de l'installation de k3s...
     wait_for:

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 \
+openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout tls.key -out tls.cert -subj /CN="${MYHOST}"/O="${MYHOST}" -addext "subjectAltName = DNS:${MYHOST}";
-  --repo https://kubernetes.github.io/ingress-nginx \
+kubectl create secret tls tls-peertube --key tls.key --cert tls.cert;
-  --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};
 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;

roles/peertube/files/values.yaml

@@ -101,8 +101,8 @@ ingress:
   enabled: true
   className: ""
   annotations: 
-    kubernetes.io/ingress.class: nginx
+    kubernetes.io/ingress.class: traefik
-    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
+    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

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	

roles/r-int/tasks/main.yml

@@ -17,3 +17,13 @@
 
   #- name: extraction fog.tar.gz
   #unarchive: src=/tmp/fog.tar.gz  dest=/var/www/ copy=no
+
+#- name: delais 2 secondes isc-dhcp-service
+#  become: yes
+#  lineinfile:
+#    path: /etc/init.d/isc-dhcp-server
+#    insertafter: '^\s+start\)$'
+#    line: "                sleep 2"
+#    firstmatch: yes
+#    state: present
+#    backup: yes

roles/wireguard-l/README.md

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

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

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

windows/mkusr-nextcloud.cmd

@@ -0,0 +1,2 @@
+@echo off
+call mkusr nextcloud "nextcloud" nextcloud