From b359e1aaf8231c1e383768cbb96b0deaa4afd64f Mon Sep 17 00:00:00 2001
From: Bertrand Benjamin <benjamin.bertrand@opytex.org>
Date: Sat, 14 Dec 2019 16:48:53 +0100
Subject: [PATCH] Feat: try other way to manager users

---
 Choux.yml       |  3 ++-
 tasks/users.yml |  4 ++--
 vars/common.yml | 24 ++++++++++++------------
 vars/users.yml  | 15 +++++++++++++++
 4 files changed, 31 insertions(+), 15 deletions(-)
 create mode 100644 vars/users.yml

diff --git a/Choux.yml b/Choux.yml
index d89006f..c00c242 100644
--- a/Choux.yml
+++ b/Choux.yml
@@ -4,6 +4,7 @@
 
   vars_files:
     - vars/common.yml
+    - vars/users.yml
       #- vars/home.yml
     - vars/Choux.yml
 
@@ -13,7 +14,7 @@
     - include: tasks/arch_aur.yml
     - include: tasks/arch_CLI_packages.yml
     - include: tasks/prompt.yml
-      # - include: tasks/users.yml
+    - include: tasks/users.yml
     - include: tasks/sudo.yml
     - include: tasks/ssh.yml
     - include: tasks/arch_programming.yml
diff --git a/tasks/users.yml b/tasks/users.yml
index f778a2d..e77732a 100644
--- a/tasks/users.yml
+++ b/tasks/users.yml
@@ -7,7 +7,7 @@
 - name: Add deploy users
   user:
     name: "{{ item.username }}"
-    password: "{{ item.password }}"
+    password: "{{ item.password | password_hash('sha512')}}"
     group: "{{ item.group }}"
     groups: "{{ item.groups }}"
     uid: "{{ item.uid }}"
@@ -18,7 +18,7 @@
 - name: Add me
   user:
     name: "{{ item.username }}"
-    password: "{{ item.password }}"
+    password: "{{ item.password | password_hash('sha512')}}"
     group: "{{ item.group }}"
     uid: "{{ item.uid }}"
     shell: "{{ prompt_place['stdout'] }}"
diff --git a/vars/common.yml b/vars/common.yml
index ac2be94..fc181d2 100644
--- a/vars/common.yml
+++ b/vars/common.yml
@@ -1,17 +1,17 @@
 ---
 
-me:
-  - username: 'lafrite'
-    password: '$6$OnPrZgotbSWZlh0T$VSyF8lUhD/N881d1GsggE7jDFt0uAzls2r.pqgDV6XQKbTqZWfv0X4QWd/3wivUDyzaSjP4LQWVfne7KYR6Vv1'
-    uid: '1000'
-    group: users
-
-deploy_users:
-  - username: 'waha'
-    password: '$6$tQLlZ3lI/NDcT3.C$VCBzrpNxDgOK7b2que2/BnAYWl.zKVugZrQEPxtsq3iWcskEzQ1NvytZRXkB4GCDa/xEohxiodyCaZyFnhxby1'
-    uid: '999'
-    group: wheel
-    groups: sudo, adm
+# me:
+#   - username: 'lafrite'
+#     password: '$6$OnPrZgotbSWZlh0T$VSyF8lUhD/N881d1GsggE7jDFt0uAzls2r.pqgDV6XQKbTqZWfv0X4QWd/3wivUDyzaSjP4LQWVfne7KYR6Vv1'
+#     uid: '1000'
+#     group: users
+# 
+# deploy_users:
+#   - username: 'waha'
+#     password: '$6$tQLlZ3lI/NDcT3.C$VCBzrpNxDgOK7b2que2/BnAYWl.zKVugZrQEPxtsq3iWcskEzQ1NvytZRXkB4GCDa/xEohxiodyCaZyFnhxby1'
+#     uid: '999'
+#     group: wheel
+#     groups: sudo, adm
 
 prompt: 'fish'
 
diff --git a/vars/users.yml b/vars/users.yml
new file mode 100644
index 0000000..ca61fc4
--- /dev/null
+++ b/vars/users.yml
@@ -0,0 +1,15 @@
+$ANSIBLE_VAULT;1.1;AES256
+61636333643630363766376462626335323331326462613233363539626236306562343966373633
+3164623532656334643063396532356230623834343537630a653039326336353933346361626536
+36373134636264323361316439666534323861376562346436623966663731396337353061303333
+6436663130336532610a663933646630373962633038633166356234326263613066646634623931
+66666666363335393534303633313865653036656438396363643439333032333431656631643135
+35653666613666353534373638373365386230636666643736613337333665346263313031346236
+30316439396238353863326361303466333530373639666165346532653138666363383131316531
+63353530653839333366643535306264323263373931393866396130303631613763376430356530
+64363066333364306236323766616434323230663062383465346661356365313066393131333530
+38316639396236623562623261306231386236363636373464666630663230343962383966653765
+65643962353237343066383530333535346538643233396138666366343262356264353164343433
+63333131326330366264343538333364366133646436393730613933643034656133366538313731
+31363034313631663564373735666661336338303463313738356336636263643661386439616637
+3234323439326662623962373563363832346563623964626463