From: Oleg Broytman <phd@phdru.name>
Date: Wed, 17 Jul 2019 00:01:05 +0000 (+0300)
Subject: Feat(debian/phd): Merge `setup-home` back into `main`
X-Git-Url: https://git.phdru.name/?a=commitdiff_plain;h=8106ec7b61aa0c857e35a8e8985763a19e1eec88;p=ansible.git

Feat(debian/phd): Merge `setup-home` back into `main`
---

diff --git a/playbooks/roles/debian/phd/tasks/main.yml b/playbooks/roles/debian/phd/tasks/main.yml
index fb60720..455605f 100644
--- a/playbooks/roles/debian/phd/tasks/main.yml
+++ b/playbooks/roles/debian/phd/tasks/main.yml
@@ -7,10 +7,12 @@
     msg: "User phd has already been created"
   when: phd_exist.rc == 0
 
-- name: "Create and setup user phd"
+- name: Create and setup user phd
   block:
-    - name: "Create user phd"
+    - name: Create user phd
       import_tasks: create.yml
-    - name: "Setup home dir"
-      import_tasks: setup-home.yml
+    - name: Upload and extract home archive
+      unarchive:
+        src: ~/archive/STORE/phd/Home/phd.tar.bz2
+        dest: /home
   when: phd_exist.rc != 0
diff --git a/playbooks/roles/debian/phd/tasks/setup-home.yml b/playbooks/roles/debian/phd/tasks/setup-home.yml
deleted file mode 100644
index 8f7b112..0000000
--- a/playbooks/roles/debian/phd/tasks/setup-home.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-- name: Upload and extract home archive
-  unarchive:
-    src: ~/archive/STORE/phd/Home/phd.tar.bz2
-    dest: /home