Merge pull request #148 from ansistrano/ensure_shared_absent

ensure shared targets are absent is back
ansistrano · Jul 22, 2016 · d192b5d · d192b5d
2 parents fa3eece + 167069b
commit d192b5d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/tasks/symlink-shared.yml b/tasks/symlink-shared.yml
@@ -1,4 +1,15 @@
 ---
+# Ensure symlinks target paths is absent
+# This was removed in 1.7.3 to improve speed but it introduced regressions in cases where 
+# there are .gitkeep files in such folders (common practice in some PHP frameworks)
+- name: ANSISTRANO | Ensure shared paths targets are absent
+ file:
+ state: absent
+ path: "{{ ansistrano_release_path.stdout }}/{{ item }}"
+ with_flattened:
+ - "{{ ansistrano_shared_paths }}"
+ - "{{ ansistrano_shared_files }}"
+
 # Ensure shared path exists
 - name: ANSISTRANO | Ensure shared paths exists
  file:
@@ -19,7 +30,6 @@
  state: link
  path: "{{ ansistrano_release_path.stdout }}/{{ item }}"
  src: "{{ item | regex_replace('[^\\/]*', '..') }}/../shared/{{ item }}"
- force: yes
  with_flattened:
  - "{{ ansistrano_shared_paths }}"
  - "{{ ansistrano_shared_files }}"

diff --git a/test/tasks/after-symlink.yml b/test/tasks/after-symlink.yml