From 490b733f1aca59e962015087dc963bb8504d0020 Mon Sep 17 00:00:00 2001
From: Jeremy Dubois <jdubois@evolix.fr>
Date: Wed, 13 Apr 2022 17:53:09 +0200
Subject: [PATCH] etc-git: create gitignore files differently so that it stays
 idempotent

---
 roles/etc-git/files/gitignore_etc               |  4 ++++
 roles/etc-git/files/gitignore_usr_share_scripts |  0
 roles/etc-git/tasks/main.yml                    |  6 ------
 roles/etc-git/tasks/repository.yml              | 13 +++----------
 4 files changed, 7 insertions(+), 16 deletions(-)
 create mode 100644 roles/etc-git/files/gitignore_etc
 create mode 100644 roles/etc-git/files/gitignore_usr_share_scripts

diff --git a/roles/etc-git/files/gitignore_etc b/roles/etc-git/files/gitignore_etc
new file mode 100644
index 0000000..9c6063c
--- /dev/null
+++ b/roles/etc-git/files/gitignore_etc
@@ -0,0 +1,4 @@
+aliases.db
+*.swp
+random.seed
+openvpn/ipp.txt
diff --git a/roles/etc-git/files/gitignore_usr_share_scripts b/roles/etc-git/files/gitignore_usr_share_scripts
new file mode 100644
index 0000000..e69de29
diff --git a/roles/etc-git/tasks/main.yml b/roles/etc-git/tasks/main.yml
index 9c3d308..d659adf 100644
--- a/roles/etc-git/tasks/main.yml
+++ b/roles/etc-git/tasks/main.yml
@@ -19,11 +19,6 @@
 - include: repository.yml
   vars:
     repository_path: "/etc"
-    gitignore_items:
-      - "aliases.db"
-      - "*.swp"
-      - "random.seed"
-      - "openvpn/ipp.txt"
 
 - name: verify /usr/share/scripts presence
   stat:
@@ -33,7 +28,6 @@
 - include: repository.yml
   vars:
     repository_path: "/usr/share/scripts"
-    gitignore_items: []
   when:
     - _usr_share_scripts.stat.isdir
 
diff --git a/roles/etc-git/tasks/repository.yml b/roles/etc-git/tasks/repository.yml
index 82bdc6d..467fc74 100644
--- a/roles/etc-git/tasks/repository.yml
+++ b/roles/etc-git/tasks/repository.yml
@@ -29,21 +29,14 @@
     - etc-git
 
 - name: "{{ repository_path }}/.gitignore is present"
-  file:
-    path: "{{ repository_path }}/.gitignore"
+  copy:
+    src: "gitignore{{ repository_path | replace('/','_') }}"
+    dest: "{{ repository_path }}/.gitignore"
     owner: root
     mode: "0600"
   tags:
     - etc-git
 
-- name: "Some entries MUST be in the {{ repository_path }}/.gitignore file"
-  lineinfile:
-    dest: "{{ repository_path }}/.gitignore"
-    line: "{{ item }}"
-  loop: "{{ gitignore_items | default([]) }}"
-  tags:
-    - etc-git
-
 - name: Set vim as default editor
   git_config:
     name: core.editor