fusion des role jitsi-install et jitsi-pre-install

playbook_prod.yml

@@ -1,7 +1,6 @@
 ---
 - hosts: visio.imio.be
   roles:
-    - role: jitsi-pre-install
     - role: jitsi-install
     - role: jitsi-enable-fr-ln
     - role: jitsi-enable-video-optimisation
@@ -15,7 +14,6 @@
 
 - hosts: jitsi.komuniki.fr
   roles:
-    - role: jitsi-pre-install
     - role: jitsi-install
     - role: jitsi-enable-prejoinPage
     - role: jitsi-enable-metrics
@@ -27,7 +25,7 @@
 
 - hosts: jitsi.entrouvert.com
   roles:
-    - role: jitsi-pre-install
+    - role: jitsi-install
     - role: jitsi-enable-fr-ln
     - role: jitsi-enable-video-optimisation
   tags:

playbook_staging.yml

@@ -2,7 +2,6 @@
 ---
 - hosts: jitsi2.komuniki.fr
   roles:
-    - role: jitsi-pre-install
     - role: jitsi-install
     - role: jitsi-enable-prejoinPage
     - role: jitsi-enable-specific-komuniki

roles/jitsi-install/tasks/main.yml

@@ -1,4 +1,56 @@
 ---
+- name: Installation des prérequis
+  apt:
+    name:
+      - sshguard
+      - ufw
+      - gnupg2
+      - nginx-full
+    update_cache: true
+    state: present
+
+- name: Mise en place des règle firewall tcp et udp
+  # source : https://jitsi.github.io/handbook/docs/devops-guide/devops-guide-quickstart#setup-and-configure-your-firewall
+  ufw:
+    state: enabled
+    rule: allow
+    port: '{{ item[0] }}'
+    proto: '{{ item[1] }}'
+  loop:
+    - ['80', 'tcp']
+    - ['443', 'tcp']
+    - ['4443', 'tcp']
+    - ['22', 'tcp']
+    - ['10000', 'udp']
+    - ['3478', 'udp']
+    - ['5349', 'tcp']
+    - ['5222', 'tcp']  # XMPP port for recorder
+
+- name: Import de la clé GPG  # source: https://jitsi.github.io/handbook/docs/devops-guide/devops-guide-quickstart#add-the-jitsi-package-repository
+  apt_key:
+    id: FFD65A0DA2BEBDEB73D44C8BB4D2D216F1FD7806
+    url: https://download.jitsi.org/jitsi-key.gpg.key
+    keyring: /etc/apt/trusted.gpg.d/jitsi.gpg
+
+- name: Ajout du depot jitsi
+  apt_repository:
+    repo: deb [signed-by=/etc/apt/trusted.gpg.d/jitsi.gpg] https://download.jitsi.org stable/
+    update_cache: true
+
+- name: Application du hostname avant installation
+  debconf:
+    name: jitsi-meet-web-config
+    question: jitsi-videobridge/jvb-hostname
+    value: '{{ inventory_hostname }}'
+    vtype: string
+
+- name: On veut un certificat autogénéré
+  debconf:
+    name: jitsi-meet-web-config
+    question: jitsi-meet/cert-choice
+    value: "Generate a new self-signed certificate (You will later get a chance to obtain a Let's encrypt certificate)"
+    vtype: string
+
 - name: installation de jitsi
   apt:
     name: jitsi-meet

roles/jitsi-pre-install/tasks/main.yml

@@ -1,52 +0,0 @@
----
-- name: Installation des prérequis
-  apt:
-    name:
-      - sshguard
-      - ufw
-      - gnupg2
-      - nginx-full
-    update_cache: true
-    state: present
-
-- name: Mise en place des règle firewall tcp et udp
-  # source : https://jitsi.github.io/handbook/docs/devops-guide/devops-guide-quickstart#setup-and-configure-your-firewall
-  ufw:
-    state: enabled
-    rule: allow
-    port: '{{ item[0] }}'
-    proto: '{{ item[1] }}'
-  loop:
-    - ['80', 'tcp']
-    - ['443', 'tcp']
-    - ['4443', 'tcp']
-    - ['22', 'tcp']
-    - ['10000', 'udp']
-    - ['3478', 'udp']
-    - ['5349', 'tcp']
-    - ['5222', 'tcp']  # XMPP port for recorder
-
-- name: Import de la clé GPG  # source: https://jitsi.github.io/handbook/docs/devops-guide/devops-guide-quickstart#add-the-jitsi-package-repository
-  apt_key:
-    id: FFD65A0DA2BEBDEB73D44C8BB4D2D216F1FD7806
-    url: https://download.jitsi.org/jitsi-key.gpg.key
-    keyring: /etc/apt/trusted.gpg.d/jitsi.gpg
-
-- name: Ajout du depot jitsi
-  apt_repository:
-    repo: deb [signed-by=/etc/apt/trusted.gpg.d/jitsi.gpg] https://download.jitsi.org stable/
-    update_cache: true
-
-- name: Application du hostname avant installation
-  debconf:
-    name: jitsi-meet-web-config
-    question: jitsi-videobridge/jvb-hostname
-    value: '{{ inventory_hostname }}'
-    vtype: string
-
-- name: On veut un certificat autogénéré
-  debconf:
-    name: jitsi-meet-web-config
-    question: jitsi-meet/cert-choice
-    value: "Generate a new self-signed certificate (You will later get a chance to obtain a Let's encrypt certificate)"
-    vtype: string