diff --git a/playbook_prod.yml b/playbook_prod.yml index 419fa48..9b31ce2 100644 --- a/playbook_prod.yml +++ b/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: diff --git a/playbook_staging.yml b/playbook_staging.yml index b182aca..441b275 100644 --- a/playbook_staging.yml +++ b/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 diff --git a/roles/jitsi-pre-install/files/fail2ban-override.conf b/roles/jitsi-install/files/fail2ban-override.conf similarity index 100% rename from roles/jitsi-pre-install/files/fail2ban-override.conf rename to roles/jitsi-install/files/fail2ban-override.conf diff --git a/roles/jitsi-pre-install/files/jail.conf b/roles/jitsi-install/files/jail.conf similarity index 100% rename from roles/jitsi-pre-install/files/jail.conf rename to roles/jitsi-install/files/jail.conf diff --git a/roles/jitsi-pre-install/files/nftables.conf b/roles/jitsi-install/files/nftables.conf similarity index 100% rename from roles/jitsi-pre-install/files/nftables.conf rename to roles/jitsi-install/files/nftables.conf diff --git a/roles/jitsi-pre-install/handlers/main.yml b/roles/jitsi-install/handlers/main.yml similarity index 100% rename from roles/jitsi-pre-install/handlers/main.yml rename to roles/jitsi-install/handlers/main.yml diff --git a/roles/jitsi-install/tasks/main.yml b/roles/jitsi-install/tasks/main.yml index f022e53..ccf9d70 100644 --- a/roles/jitsi-install/tasks/main.yml +++ b/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 diff --git a/roles/jitsi-pre-install/tasks/main.yml b/roles/jitsi-pre-install/tasks/main.yml deleted file mode 100644 index 6b83210..0000000 --- a/roles/jitsi-pre-install/tasks/main.yml +++ /dev/null @@ -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