From: Oleg Broytman <phd@phdru.name>
Date: Mon, 27 Apr 2020 10:54:59 +0000 (+0300)
Subject: Feat(root): Remove `force: no` to update some files
X-Git-Url: https://git.phdru.name/?a=commitdiff_plain;h=1eb9d48b49ed49df95a63463aa54d81ab851aaa5;p=ansible.git

Feat(root): Remove `force: no` to update some files
---

diff --git a/playbooks/roles/root/tasks/root.yml b/playbooks/roles/root/tasks/root.yml
index 7826f8c..5ca9f96 100644
--- a/playbooks/roles/root/tasks/root.yml
+++ b/playbooks/roles/root/tasks/root.yml
@@ -21,7 +21,19 @@
     directory_mode: "0700"
     mode: "0700"
     force: no
-  loop: ['.mc', '.ssh', '.vim', 'bin', 'lib']
+  loop: ['.mc', '.ssh', 'bin', 'lib']
+
+- name: "Setup ~root - copy vim from ~phd"
+  become: true
+  copy:
+    src: "~phd/{{ item }}"
+    remote_src: yes
+    dest: ~root
+    owner: root
+    group: root
+    directory_mode: "0700"
+    mode: "0700"
+  loop: ['.vim']
 
 - name: "Setup ~root - copy files from ~phd without overwriting"
   become: true
@@ -33,7 +45,6 @@
     group: root
     directory_mode: "0700"
     mode: "0600"
-    force: no
   loop: ['.bash_logout', '.inputrc', '.less', '.lesskey',
          '.screenrc', '.shellrc', '.tmux.conf', '.vimrc',
         ]
diff --git a/playbooks/update-root.yml b/playbooks/update-root.yml
index 1deda04..c59578b 100644
--- a/playbooks/update-root.yml
+++ b/playbooks/update-root.yml
@@ -22,7 +22,6 @@
         owner: root
         group: root
         mode: "0600"
-        force: no
       loop: ['.bashrc', 'admin/home/root/.profile',
              '.bash_logout', '.inputrc', '.less', '.lesskey',
              '.screenrc', '.shellrc', '.tmux.conf', '.vimrc',