From 8e3b4b35cd9f0e790da3e5d5a7b0f65bbf748d54 Mon Sep 17 00:00:00 2001
From: Jeremy Dubois <jdubois@evolix.fr>
Date: Thu, 4 Aug 2022 18:03:23 +0200
Subject: [PATCH] etc-git: do not erase custom entries of servers in .gitignore
 files

---
 CHANGELOG                                             |  1 +
 .../files/{gitignore_usr_share_scripts => gitignore}  |  0
 roles/etc-git/files/gitignore_etc                     |  4 ----
 roles/etc-git/tasks/repositories.yml                  |  6 ++++++
 roles/etc-git/tasks/repository.yml                    | 11 ++++++++++-
 5 files changed, 17 insertions(+), 5 deletions(-)
 rename roles/etc-git/files/{gitignore_usr_share_scripts => gitignore} (100%)
 delete mode 100644 roles/etc-git/files/gitignore_etc

diff --git a/CHANGELOG b/CHANGELOG
index 75b3195..3d13c0d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -35,6 +35,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - evocheck: execute evocheck without --cron the first of the month
 - etc-git: chmod 600 for local periodic files (daily, weekly, monthly)
 - base: loop over fstab entries instead of copying the same task for each entries
+- etc-git: do not erase custom entries of servers in .gitignore files
 
 ### Fixed
 
diff --git a/roles/etc-git/files/gitignore_usr_share_scripts b/roles/etc-git/files/gitignore
similarity index 100%
rename from roles/etc-git/files/gitignore_usr_share_scripts
rename to roles/etc-git/files/gitignore
diff --git a/roles/etc-git/files/gitignore_etc b/roles/etc-git/files/gitignore_etc
deleted file mode 100644
index 9c6063c..0000000
--- a/roles/etc-git/files/gitignore_etc
+++ /dev/null
@@ -1,4 +0,0 @@
-aliases.db
-*.swp
-random.seed
-openvpn/ipp.txt
diff --git a/roles/etc-git/tasks/repositories.yml b/roles/etc-git/tasks/repositories.yml
index 156338f..e7c71dc 100644
--- a/roles/etc-git/tasks/repositories.yml
+++ b/roles/etc-git/tasks/repositories.yml
@@ -3,6 +3,11 @@
 - include: repository.yml
   vars:
     repository_path: "/etc"
+    gitignore_items:
+      - "aliases.db"
+      - "*.swp"
+      - "random.seed"
+      - "openvpn/ipp.txt"
   tags:
     - etc-git
 
@@ -16,6 +21,7 @@
 - include: repository.yml
   vars:
     repository_path: "/usr/share/scripts"
+    gitignore_items: []
   when:
     - _usr_share_scripts.stat.exists
     - _usr_share_scripts.stat.isdir
diff --git a/roles/etc-git/tasks/repository.yml b/roles/etc-git/tasks/repository.yml
index ba3fc48..f1ccc39 100644
--- a/roles/etc-git/tasks/repository.yml
+++ b/roles/etc-git/tasks/repository.yml
@@ -30,10 +30,19 @@
 
 - name: "{{ repository_path }}/.gitignore is present"
   copy:
-    src: "gitignore{{ repository_path | replace('/','_') }}"
+    src: gitignore
     dest: "{{ repository_path }}/.gitignore"
     owner: root
     mode: "0600"
+    force: no
+  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