From 90deae7d11d8341e7348f57615b22dc46898e2ef Mon Sep 17 00:00:00 2001
From: southerntofu <southerntofu@thunix.net>
Date: Wed, 15 Apr 2020 13:57:28 +0000
Subject: [PATCH] =?UTF-8?q?les=20paquets=20qui=20ne=20sont=20pas=20des=20d?=
 =?UTF-8?q?=C3=A9pendances=20sont=20d=C3=A9finis=20dans=20la=20config=20(f?=
 =?UTF-8?q?erme=20#4)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 host_vars/fr.yml                              |  3 ++
 recette.yml                                   |  1 +
 roles/common/tasks/main.yml                   | 34 ++++---------------
 .../rust_packages.yml => rust/tasks/main.yml} |  6 ++--
 4 files changed, 13 insertions(+), 31 deletions(-)
 rename roles/{common/tasks/rust_packages.yml => rust/tasks/main.yml} (92%)

diff --git a/host_vars/fr.yml b/host_vars/fr.yml
index be21fb4..3be3248 100644
--- a/host_vars/fr.yml
+++ b/host_vars/fr.yml
@@ -1,4 +1,7 @@
 hostname: fr.tild3.org
+packages:
+  debian: [ subversion, mercurial, htop, tmux, vim, emacs, mutt, weechat, elinks, rsync, dnsutils, make, g++, libssl-dev, mosh, gopher ]
+  rust: [ lsd ]
 users:
   - name: tofu
     sudo: true
diff --git a/recette.yml b/recette.yml
index 938a052..7236f32 100644
--- a/recette.yml
+++ b/recette.yml
@@ -3,3 +3,4 @@
   roles:
     - common
     - webserver
+    - rust
diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml
index d037f3f..9b656dd 100644
--- a/roles/common/tasks/main.yml
+++ b/roles/common/tasks/main.yml
@@ -8,32 +8,14 @@
 - name: Installer les paquets de base
   apt:
     state: present
-    name: "{{ packages }}"
+    name: [ certbot, tor, sudo ]
     update_cache: yes
-  vars:
-    packages:
-      - git
-      - subversion
-      - mercurial
-      - htop
-      - tmux
-      - vim
-      - emacs
-      - certbot
-      - mutt
-      - weechat
-      - elinks
-      - rustc
-      - cargo
-      - cargo-doc
-      - rsync
-      - dnsutils
-      - make
-      - g++
-      - libssl-dev
-      - mosh
-      - tor
-      - sudo
+
+- name: Installer les paquets définis dans la config
+  apt:
+    state: present
+    name: "{{ packages.debian }}"
+  when: packages is defined and packages.debian is defined
 
 - name: setup certbot with contact email
   copy:
@@ -42,6 +24,4 @@
 
 - include: tor.yml
 
-- include: rust_packages.yml
-
 - include: users.yml
diff --git a/roles/common/tasks/rust_packages.yml b/roles/rust/tasks/main.yml
similarity index 92%
rename from roles/common/tasks/rust_packages.yml
rename to roles/rust/tasks/main.yml
index d3160c2..3e2ce51 100644
--- a/roles/common/tasks/rust_packages.yml
+++ b/roles/rust/tasks/main.yml
@@ -49,8 +49,6 @@
   command:
     cmd: "cargo install {{ item }}"
     creates: "/usr/local/bin/{{ item }}"
-  loop: "{{ crates }}"
-  vars:
-    crates:
-      - lsd
+  loop: "{{ packages.rust }}"
+  when: packages is defined and packages.rust is defined