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
 

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
 

roles/dns-master/files/db.gsb.lan

@@ -5,7 +5,7 @@
 ;
 $TTL    604800
 @       IN      SOA     s-infra.gsb.lan. root.s-infra.gsb.lan. (
-                        2023051000      ; Serial
+                        2023012500      ; Serial
                         7200	        ; Refresh
                         86400           ; Retry
                         8419200         ; Expire
@@ -36,5 +36,3 @@ 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.	
-s-peertube	IN	A	192.168.100.20
-peertube 	IN 	CNAME 	s-peertube

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. (
-                        2023040501      ; Serial
+                        2023012500      ; Serial
                         7200            ; Refresh
                         86400           ; Retry
                         8419200         ; Expire
@@ -28,3 +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.
+

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/fw-ferm/files/ferm.conf.r-vp1

@@ -4,12 +4,10 @@
 
 @def $DEV_PRIVATE = enp0s8;
 @def $DEV_WORLD = enp0s9;
-@def $DEV_WORLD = enp0s9;
 @def $DEV_VPN= wg0;
 @def $NET_PRIVATE = 172.16.0.0/24;
 
 table filter {
-
     chain (INPUT OUTPUT){
         # allow VPN
 	proto udp dport 51820 ACCEPT;
@@ -30,22 +28,22 @@ table filter {
 
         # allow SSH connections from the private network and from some
         # well-known internet hosts
-        saddr ($NET_PRIVATE) proto tcp dport ssh ACCEPT;
+        saddr ($NET_PRIVATE 81.209.165.42) proto tcp dport ssh ACCEPT;
 
         # we provide DNS and SMTP services for the internal net
         interface $DEV_PRIVATE saddr $NET_PRIVATE {
             proto (udp tcp) dport domain ACCEPT;
             proto udp dport bootps ACCEPT;
         }
+        # interface réseau
 
         # the rest is dropped by the above policy
-
     }#FIN INPUT
 
     # outgoing connections are not limited
-
     chain OUTPUT {
         policy ACCEPT;
+#	interface $DEV_VPN proto ssh dport 22 ACCEPT;
 
     }#FIN OUTPUT
 
@@ -61,9 +59,6 @@ table filter {
         # internal nets are allowed
         interface $DEV_PRIVATE ACCEPT;
 
-	interface $DEV_VPN daddr $NET_PRIVATE {
- 	proto tcp dport ssh DROP;
-        }
         # the rest is dropped by the above policy
     }
 }

roles/fw-ferm/files/ferm.conf.r-vp2

@@ -51,7 +51,6 @@ table filter {
     chain FORWARD {
         policy ACCEPT;
 
-	proto icmp icmp-type echo-request ACCEPT;
         # connection tracking
         mod state state INVALID DROP;
         mod state state (ESTABLISHED RELATED) ACCEPT;

roles/nxc-traefik/README.md

@@ -35,24 +35,3 @@ Nextcloud est alors fonctionnel avec le proxy inverse **traefik** assurant la re
 ATTENTION : Après avoir relancé la VM, executez le script "nxc-start.sh" afin d'installer les piles applicatives.
  
 Une fois le script terminé, le site est disponible ici : https://s-nxc.gsb.lan
-
-
-## 5. Ajout authentification LDAP
-
-Pour ajouter l'authentification LDAP au Nextcloud, il faut :
-* Une fois l'installation de Nextcloud terminé, cliquez sur le profil et Application
-* Dans vos applications, descendre et activer "LDAP user and group backend"
-* Puis cliquer sur le profil, puis Paramètres d'administration et dans Administration cliquer sur Intégration LDAP/AD
-* Une fois sur la page d'intégration LDAP/AD :
-    * Dans Hôte mettre : 
-        > ldap://s-win.gsb.lan
-    * Cliquer sur Détecter le port (normalement le port 389 apparait)
-    * Dans DN Utilisateur mettre :
-        > CN=nextcloud,CN=Users,DC=GSB,DC=LAN
-    * Mot de passe : 
-        > Azerty1+
-    * Et dans Un DN de base par ligne : 
-        > DC=GSB,DC=LAN
-* Après la configuration passe OK
-* Une fois la configuration finie, cliquer 3 fois sur continuer
-* Une fois arrivé sur Groupes, vous pouvez vous déconnecter du compte Admin et vous connecter avec un compte qui est dans l'AD.

roles/peertube-k3s/tasks/main.yml

@@ -8,15 +8,16 @@
   - name: installation de docker...
     shell: curl https://releases.rancher.com/install-docker/20.10.sh | sh
 
-  - name: attente de l'installation de docker...
+  - name: attente de l'installation...
     wait_for:
       timeout: 30
       host: localhost
 
   - name: installation de k3s...
-    shell: curl -sfL https://get.k3s.io | INSTALL_K3S_EXEC="--node-ip=192.168.100.20 --flannel-iface=enp0s8" sh -s - --docker
+    shell: curl -sfL https://get.k3s.io | sh -s - --docker
 
-  - name: attente de l'installation de k3s...
+  - name: mise a jour de resolv.conf...
-    wait_for:
+    copy:
-      timeout: 25
+      src: /root/tools/ansible/gsb2023/roles/peertube/files/resolv.conf
-      host: localhost
+      dest: /etc/
+      mode: '0644'

roles/peertube/files/finish

@@ -1,9 +0,0 @@
-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;
-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;
-helm install --create-namespace -n peertube peertube-gsb /root/tools/peertube/helm/ ;
-kubectl config view --raw > ~/.kube/config

roles/peertube/files/resolv.conf

@@ -1,4 +1 @@
-domain gsb.lan
-search gsb.lan
-nameserver 172.16.0.1
 nameserver 192.168.99.99

roles/peertube/files/values.yaml

@@ -45,9 +45,9 @@ peertube:
     dbPasswd: user # must be consistent with postgresql configuration
     dbSsl: false # disabled by default WARNING: ssl connection feature not tested, use at your own risk
     dbHostname: peertube-gsb-postgresql # must be consistent with postgresql configuration
-    webHostname: peertube.gsb.lan # must be changed to your local setup
+    webHostname: peertube # must be changed to your local setup
     secret: b2753b0f37444974de0e81f04815e6a889fcf8960bd203a01b624d8fa8a37683
-    smtpHostname: peertube-gsb-mail # must be consistent with mail configuration
+    smtpHostname: peertube-mail # must be consistent with mail configuration
     smtpPort: 587 # must be consistent with mail configuration
     smtpFrom: noreply@lan.lan # not configured by default, add something meaningfull if you want
     smtpTls: false # disabled by default WARNING: tls connection feature not tested, use at your own risk
@@ -98,21 +98,21 @@ redis:
 
 ## ingress configuration is very specific this part must be configured or else you'll get 503 or 404 errors
 ingress:
-  enabled: true
+  enabled: false
   className: ""
   annotations: 
-    kubernetes.io/ingress.class: traefik
+    kubernetes.io/ingress.class: nginx
-    traefik.ingress.kubernetes.io/proxy-body-size: 6G # this caps the size of imported videos, if set low this might prevent you from uploading videos
+    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/tls-acme: "true"
   hosts:
-    - host: peertube.gsb.lan
+    - host: # your domain here
       paths:
         - path: /
           pathType: ImplementationSpecific
   tls: 
-    - secretName: tls-peertube
+  #  - secretName: chart-example-tls
     - hosts:
-      - peertube.gsb.lan
+      -  # your domain here
 
 resources: {}
 autoscaling:

roles/peertube/tasks/main.yml

@@ -18,11 +18,14 @@
       dest: /root/tools/peertube/helm/
       mode: '0644'
 
-  - name: copie du script finish...
-    copy:
-      src: /root/tools/ansible/gsb2023/roles/peertube/files/finish
-      dest: /root
-      mode: '0644'
-
   - name: installation de helm...
     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
+
+  - 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

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/post/files/interfaces.s-peertube

@@ -14,4 +14,4 @@ iface enp0s3 inet static
 allow-hotplug enp0s8
 iface enp0s8 inet static
         address 192.168.100.20/24
-	post-up systemctl start k3s 
+	post-up systemctl start k3s && sleep 20 && export KUBECONFIG=/etc/rancher/k3s/k3s.yaml

roles/r-int/tasks/main.yml

@@ -17,13 +17,3 @@
 
   #- 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,4 +1,3 @@
-@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,3 @@
-@echo off
 call mkusr aDupont "Albert Dupon" gg-compta
 call mkusr cSeum "Claire Seum" gg-compta
 call mkusr nPaul "Nicolas Paul" gg-compta

windows/mkusr-nextcloud.cmd

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