fix: fixed multiple issues in the values.yaml of peertube package

fix: added s-adm to resolv.conf for s-peertube
fix: edites dns entries and peertube role
2023-05-10 16:47:13 +02:00 · 2023-05-10 11:26:27 +02:00 · 2023-05-10 11:02:40 +02:00 · 2023-05-10 09:08:03 +02:00 · 2023-05-10 08:51:57 +02:00 · 2023-05-10 08:45:11 +02:00
13 changed files with 37 additions and 23 deletions
--- 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
@ -36,4 +36,5 @@ 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
+peertube 	IN 	CNAME 	s-peertube
--- a/roles/dns-master/files/db.gsb.lan.rev
+++ b/roles/dns-master/files/db.gsb.lan.rev
@ -27,5 +27,4 @@ $TTL    604800
 100.10   IN      PTR      s-lb.gsb.lan
 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
+254.0     IN      PTR     r-int.gsb.lan.
--- 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-k3s/tasks/main.yml
+++ b/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:
--- a/roles/peertube/files/finish
+++ b/roles/peertube/files/finish
@ -1,10 +1,7 @@
+MYHOST=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/resolv.conf
+++ b/roles/peertube/files/resolv.conf
@ -1 +1,4 @@
-nameserver 192.168.99.99
+domain gsb.lan
+search gsb.lan
+nameserver 172.16.0.1
+nameserver 192.168.99.99
--- a/roles/peertube/files/values.yaml
+++ b/roles/peertube/files/values.yaml
@ -45,7 +45,7 @@ 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: s-peertube.gsb.lan # must be changed to your local setup
+    webHostname: peertube.gsb.lan # must be changed to your local setup
    secret: b2753b0f37444974de0e81f04815e6a889fcf8960bd203a01b624d8fa8a37683
    smtpHostname: peertube-gsb-mail # must be consistent with mail configuration
    smtpPort: 587 # must be consistent with mail configuration
@ -101,18 +101,18 @@ 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
+    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
    # 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:
--- 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/r-int/tasks/main.yml
+++ b/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
--- 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
gadmin	35c46449fa	fix: fixed multiple issues in the values.yaml of peertube package	2023-05-10 16:47:13 +02:00
gadmin	575a2fa87a	fix: added s-adm to resolv.conf for s-peertube	2023-05-10 11:26:27 +02:00
Elam Monnot	30b74c50e2	fix: edites dns entries and peertube role	2023-05-10 11:02:40 +02:00
gadmin	597ff383f7	feat: tried to add peertube domain entry in CNAME	2023-05-10 09:08:03 +02:00
gadmin	c482540de6	fix: removed peertube from dns rev file	2023-05-10 08:51:57 +02:00
gadmin	ce37973f9d	feat: added s-infra to peertube role	2023-05-10 08:45:11 +02:00
andgel sassignol	a2c1636a0f	correction bug Arnoux	2023-04-30 20:27:14 +02:00
Anthony Arnoux	d107c26449	délais dhcp r-int dhcp	2023-04-28 09:39:52 +02:00
Elam Monnot	d0efb480c8	feat: specified k3s install on enp0s8	2023-04-28 09:00:47 +02:00
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