From f30a27dbae27fbe4b509d399c3a03c325c6ab47b Mon Sep 17 00:00:00 2001
From: Marcus Gillitzer <marcus.gillitzer@polizei.bwl.de>
Date: Fri, 12 Jun 2020 08:54:44 +0200
Subject: [PATCH] Fehlerkorrektur an Git-Role

---
 roles/git/defaults/main.yml |  6 +++---
 roles/git/files/.gitignore  | 12 +++++++++++
 roles/git/tasks/main.yml    | 42 ++++++++++++++++++++++++++-----------
 3 files changed, 45 insertions(+), 15 deletions(-)
 create mode 100755 roles/git/files/.gitignore

diff --git a/roles/git/defaults/main.yml b/roles/git/defaults/main.yml
index ef32bc1..33ad812 100644
--- a/roles/git/defaults/main.yml
+++ b/roles/git/defaults/main.yml
@@ -1,5 +1,5 @@
 ---
 # defaults file for default_role
-path_init:  "/opt/rola"
-user_name:  "jetty"
-user_group:  "dba"
+path_init: "/opt/rola"
+user_name: "jetty"
+user_group: "dba"
diff --git a/roles/git/files/.gitignore b/roles/git/files/.gitignore
new file mode 100755
index 0000000..7daeb51
--- /dev/null
+++ b/roles/git/files/.gitignore
@@ -0,0 +1,12 @@
+# Ignore everything
+*
+
+# But not these files...
+!.gitignore
+!*.xml
+!*.conf
+# etc...
+
+# ...even if they are in subdirectories
+!*/
+
diff --git a/roles/git/tasks/main.yml b/roles/git/tasks/main.yml
index 1ae4fc8..563ccb6 100644
--- a/roles/git/tasks/main.yml
+++ b/roles/git/tasks/main.yml
@@ -6,26 +6,44 @@
       name: git.x86_64
       state: latest
       disable_gpg_check: true
+      
+  - name: check if {{ path_init }} exists
+    become: yes
+    file:
+      path: {{ path_init }}
+      owner: {{ user_name }}
+      group: {{ user_group }}
+      mode: '0755'
+      state: directory
 
   - name: Copy file .gitignore with owner and permissions 
     copy:
-      src: ./files/gitignore
-      dest: "{{ path_init }}/.gitignore"
-      owner: "{{ user_name }}"
-      group: "{{ user_group }}"
+      src: ./files/.gitignore
+      dest: {{ path_init }}/.gitignore
+      owner: {{ user_name }}
+      group: {{ user_group }}
       mode: '0644'
       
-  - name: check if {{ path_init }}/.git exists
-    shell: ls -ld {{ path_init }}/.git 
-    register: result
-    ignore_errors: true
+  - name: check if {{ user_name }}/.git exists
+    stat:
+      path: {{ user_name }}/.git
+    register: p
     
   - debug:
-      msg: "{{ result }}"
+      msg: " Path exists and is a directory"
+    when: p.stat.isdir is defined and p.stat.isdir
+      
+  #- name: check if {{ path_init }}/.git exists
+    #shell: ls -ld {{ path_init }}/.git 
+    #register: result
+    #ignore_errors: true
+    
+  #- debug:
+      #msg: "{{ result }}"
 
-  - name: Initialisiere leeres Repo innerhalb von {{ path_init }}
-    command: git init {{ path_init }}/
-    when: result.stdout == ''
+  #- name: Initialisiere leeres Repo innerhalb von {{ path_init }}
+    #command: git init {{ path_init }}/
+    #when: result.stdout == ''
     
   - name: commit changes to git
     shell: |