From bc1459bc514218f7db59279e1564a5928356420d Mon Sep 17 00:00:00 2001
From: Alexandre Iooss <erdnaxe@crans.org>
Date: Tue, 12 Mar 2019 17:22:39 +0100
Subject: [PATCH] Fix various yamllint warnings

---
 matrix.yml                                |  3 ++-
 roles/codimd/tasks/0_apt_dependencies.yml | 24 +++++++++++++++++++----
 roles/etherpad/tasks/main.yml             |  8 +++-----
 roles/matrix-mxisd/tasks/main.yml         |  2 +-
 4 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/matrix.yml b/matrix.yml
index 797215b..56e2a51 100644
--- a/matrix.yml
+++ b/matrix.yml
@@ -2,7 +2,8 @@
 # Install Matrix Synapse on corresponding containers
 - hosts: synapse.adm.auro.re
   vars:
-    mxisd_version: 1.3.1
+    mxisd_releases: https://github.com/kamax-matrix/mxisd/releases
+    mxisd_deb: "{{ mxisd_releases }}/download/v1.3.1/mxisd_1.3.1_all.deb"
   roles:
     - debian-backports
     - matrix-synapse
diff --git a/roles/codimd/tasks/0_apt_dependencies.yml b/roles/codimd/tasks/0_apt_dependencies.yml
index 3e30b80..2f40e50 100644
--- a/roles/codimd/tasks/0_apt_dependencies.yml
+++ b/roles/codimd/tasks/0_apt_dependencies.yml
@@ -9,10 +9,26 @@
     dest: /etc/apt/preferences.d/nodejs
     mode: 0644
 
-# TODO
-# apt-transport-https
-# curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add -
-# echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list
+# For HTTPS apt
+- name: Install HTTPS apt
+  apt:
+    name: apt-transport-https
+    update_cache: true
+  register: apt_result
+  retries: 3
+  until: apt_result is succeeded
+
+- name: Configure the apt key
+  apt_key:
+    url: https://dl.yarnpkg.com/debian/pubkey.gpg
+    id: 1646B01B86E50310
+  register: apt_key_result
+  retries: 3
+  until: apt_key_result is succeeded
+
+- name: Configure Yarn repository
+  apt_repository:
+    repo: "deb https://dl.yarnpkg.com/debian/ stable main"
 
 # Install CodiMD dependencies
 - name: Install required packages
diff --git a/roles/etherpad/tasks/main.yml b/roles/etherpad/tasks/main.yml
index 1e36ffe..9ccadc2 100644
--- a/roles/etherpad/tasks/main.yml
+++ b/roles/etherpad/tasks/main.yml
@@ -69,10 +69,8 @@
   service:
     name: etherpad-lite
     state: started
-    enabled: True
-
-# La configuration de la clé `dbSettings` n'est pas encore automatisé !
+    enabled: true
 
 # TODO-list
-#  * Configure admin user, logs
-# Plugins : https://framacloud.org/fr/cultiver-son-jardin/etherpad.html#concernant-framapad
+# La configuration de la clé `dbSettings` n'est pas encore automatisé !
+#  * Configure logs
diff --git a/roles/matrix-mxisd/tasks/main.yml b/roles/matrix-mxisd/tasks/main.yml
index fae2a84..422243f 100644
--- a/roles/matrix-mxisd/tasks/main.yml
+++ b/roles/matrix-mxisd/tasks/main.yml
@@ -1,7 +1,7 @@
 ---
 - name: Install mxisd
   apt:
-    deb: https://github.com/kamax-matrix/mxisd/releases/download/v{{ mxisd_version }}/mxisd_{{ mxisd_version }}_all.deb
+    deb: "{{ mxisd_deb }}"
   register: apt_result
   retries: 3
   until: apt_result is succeeded