summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitlab-ci.yml1
-rw-r--r--host_vars/bbb.entrouvert.com.yml2
-rw-r--r--host_vars/coturn.komuniki.fr.yml2
-rw-r--r--host_vars/jibri2.komuniki.fr.yml2
-rw-r--r--host_vars/jitsi.komuniki.fr.yml2
-rw-r--r--host_vars/jitsi2.komuniki.fr.yml2
-rw-r--r--roles/coturn-install/handlers/main.yml1
-rw-r--r--roles/coturn-install/tasks/letsencrypt.yml7
-rw-r--r--roles/coturn-install/tasks/main.yml6
-rw-r--r--roles/jibri-install/tasks/install-chromedriver.yml3
-rw-r--r--roles/jibri-install/tasks/install-googlechrome.yml1
-rw-r--r--roles/jibri-install/tasks/install-jibri.yml1
-rw-r--r--roles/jitsi-enable-multidomain/tasks/ssl.yml3
13 files changed, 19 insertions, 14 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 068c23a..334efc0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,3 +1,4 @@
+---
default:
before_script:
- pip3 install --user "ansible-lint[core,yamllint]"
diff --git a/host_vars/bbb.entrouvert.com.yml b/host_vars/bbb.entrouvert.com.yml
index 4ed19a1..7f92dab 100644
--- a/host_vars/bbb.entrouvert.com.yml
+++ b/host_vars/bbb.entrouvert.com.yml
@@ -2,4 +2,4 @@
bbb_sip_provider: sip5.ovh.fr
bbb_sip_telnum_for_user: 0972552599
bbb_sip_username: 0033972552599
-bbb_sip_password: "{{ vault_bbb_EO_sip_password }}" \ No newline at end of file
+bbb_sip_password: "{{ vault_bbb_EO_sip_password }}"
diff --git a/host_vars/coturn.komuniki.fr.yml b/host_vars/coturn.komuniki.fr.yml
index 69b5aca..3d122ad 100644
--- a/host_vars/coturn.komuniki.fr.yml
+++ b/host_vars/coturn.komuniki.fr.yml
@@ -1,2 +1,2 @@
---
-coturn_secret: "{{ vault_coturn_secret }}" \ No newline at end of file
+coturn_secret: "{{ vault_coturn_secret }}"
diff --git a/host_vars/jibri2.komuniki.fr.yml b/host_vars/jibri2.komuniki.fr.yml
index 66be16f..b152425 100644
--- a/host_vars/jibri2.komuniki.fr.yml
+++ b/host_vars/jibri2.komuniki.fr.yml
@@ -2,4 +2,4 @@
jibri_user: "jibri1"
jibri_password: "{{ vault_jibri1_komuniki }}"
jitsi_server_host: "jitsi2.komuniki.fr"
-jitsi_cookie_enabled: true \ No newline at end of file
+jitsi_cookie_enabled: true
diff --git a/host_vars/jitsi.komuniki.fr.yml b/host_vars/jitsi.komuniki.fr.yml
index 005dc6b..cfcbe09 100644
--- a/host_vars/jitsi.komuniki.fr.yml
+++ b/host_vars/jitsi.komuniki.fr.yml
@@ -3,4 +3,4 @@ ansible_user: debian
ansible_become: true
jigasi_sip_account: 0033972551042@sip5.ovh.fr
jigasi_sip_password: "{{ vault_jigasi_sip_password }}"
-jigasi_sip_room: machineacafe \ No newline at end of file
+jigasi_sip_room: machineacafe
diff --git a/host_vars/jitsi2.komuniki.fr.yml b/host_vars/jitsi2.komuniki.fr.yml
index 6e96b61..6770dc1 100644
--- a/host_vars/jitsi2.komuniki.fr.yml
+++ b/host_vars/jitsi2.komuniki.fr.yml
@@ -1,4 +1,4 @@
---
jibri_users:
- user: "jibri1"
- password: "{{ vault_jibri1_komuniki }}" \ No newline at end of file
+ password: "{{ vault_jibri1_komuniki }}"
diff --git a/roles/coturn-install/handlers/main.yml b/roles/coturn-install/handlers/main.yml
index 4ac752d..ee74c82 100644
--- a/roles/coturn-install/handlers/main.yml
+++ b/roles/coturn-install/handlers/main.yml
@@ -5,4 +5,3 @@
state: restarted
daemon_reload: true
enabled: true
-
diff --git a/roles/coturn-install/tasks/letsencrypt.yml b/roles/coturn-install/tasks/letsencrypt.yml
index 3b0228a..df201ef 100644
--- a/roles/coturn-install/tasks/letsencrypt.yml
+++ b/roles/coturn-install/tasks/letsencrypt.yml
@@ -1,10 +1,12 @@
+---
- name: Installation de snapd
apt:
name:
- snapd
state: present
-- name: Initialisation de snap et installtion de certbot (prendre bien 5min, soyez patient)
+- name: Initialisation de snap et installtion de certbot
+ (prend bien 5min, soyez patient)
command: "{{ item }}"
loop:
- snap install core
@@ -12,4 +14,5 @@
- snap install --classic certbot
- name: Création du certificat SSL
- command: /snap/bin/certbot certonly --standalone -d {{ inventory_hostname }} -m supervision@nereide.fr --agree-tos --non-interactive \ No newline at end of file
+ # yamllint disable-line rule:line-length
+ command: /snap/bin/certbot certonly --standalone -d {{ inventory_hostname }} -m supervision@nereide.fr --agree-tos --non-interactive
diff --git a/roles/coturn-install/tasks/main.yml b/roles/coturn-install/tasks/main.yml
index 848d7de..2b28bf6 100644
--- a/roles/coturn-install/tasks/main.yml
+++ b/roles/coturn-install/tasks/main.yml
@@ -26,7 +26,7 @@
owner: turnserver
group: turnserver
state: directory
- recurse: yes
+ recurse: true
loop:
- /etc/letsencrypt/live
- /etc/letsencrypt/archive
@@ -40,10 +40,8 @@
- name: Ajout des capabilities à coturn
lineinfile:
path: /etc/systemd/system/coturn.service.d/override.conf
- create: yes
+ create: true
line: |
[Service]
AmbientCapabilities=CAP_NET_BIND_SERVICE
notify: restart coturn
-
-
diff --git a/roles/jibri-install/tasks/install-chromedriver.yml b/roles/jibri-install/tasks/install-chromedriver.yml
index eb47cde..2e341e6 100644
--- a/roles/jibri-install/tasks/install-chromedriver.yml
+++ b/roles/jibri-install/tasks/install-chromedriver.yml
@@ -18,7 +18,8 @@
state: directory
path: /usr/local/bin/
mode: 0644
- - name: "télécharge de chromedriver pour la version {{ _latest_release.content }}"
+ - name: "télécharge de chromedriver pour la version
+ {{ _latest_release.content }}"
unarchive:
src: "http://chromedriver.storage.googleapis.com/{{ _latest_release.content }}/chromedriver_linux64.zip"
dest: /usr/local/bin
diff --git a/roles/jibri-install/tasks/install-googlechrome.yml b/roles/jibri-install/tasks/install-googlechrome.yml
index 5893d24..5ab6898 100644
--- a/roles/jibri-install/tasks/install-googlechrome.yml
+++ b/roles/jibri-install/tasks/install-googlechrome.yml
@@ -7,6 +7,7 @@
- name: Ajout du depot google
apt_repository:
+ # yamllint disable-line rule:line-length
repo: deb [arch=amd64 signed-by=/etc/apt/trusted.gpg.d/google.gpg] http://dl.google.com/linux/chrome/deb/ stable main
update_cache: true
filename: google-chrome
diff --git a/roles/jibri-install/tasks/install-jibri.yml b/roles/jibri-install/tasks/install-jibri.yml
index 1a9b591..4b8a38b 100644
--- a/roles/jibri-install/tasks/install-jibri.yml
+++ b/roles/jibri-install/tasks/install-jibri.yml
@@ -17,6 +17,7 @@
- name: Ajout du depot jitsi
apt_repository:
+ # yamllint disable-line rule:line-length
repo: deb [signed-by=/etc/apt/trusted.gpg.d/jitsi.gpg] https://download.jitsi.org stable/
update_cache: true
diff --git a/roles/jitsi-enable-multidomain/tasks/ssl.yml b/roles/jitsi-enable-multidomain/tasks/ssl.yml
index ba1c7cf..3571c49 100644
--- a/roles/jitsi-enable-multidomain/tasks/ssl.yml
+++ b/roles/jitsi-enable-multidomain/tasks/ssl.yml
@@ -44,7 +44,8 @@
replace:
path: /etc/nginx/sites-available/{{ item }}.conf
regexp:
- "[^?]ssl_certificate_key /etc/letsencrypt/live/{{inventory_hostname}}.*$"
+ # yamllint disable-line rule:line-length
+ "[^?]ssl_certificate_key /etc/letsencrypt/live/{{ inventory_hostname }}.*$"
replace:
"ssl_certificate_key /etc/letsencrypt/live/{{ item }}/privkey.pem;"
loop: "{{ jitsi_multidomain_domain }}"