From b7a75bd414a3f90a328bec2979bd9d0419a9e6f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Sachse?= <Joerg.Sachse@slub-dresden.de>
Date: Tue, 9 Mar 2021 18:59:08 +0100
Subject: [PATCH] fix: cleanup config locations and only leave those that are
 actually used and in the correct location

---
 tasks/install-repair-tools.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tasks/install-repair-tools.yml b/tasks/install-repair-tools.yml
index abee187..4947cc6 100644
--- a/tasks/install-repair-tools.yml
+++ b/tasks/install-repair-tools.yml
@@ -24,6 +24,7 @@
     - "/usr/local/bin/checkit_tiff"
     - "/usr/local/bin/fixit_tiff"
     - "/home/{{ vault_service_user }}/.cache/SLUB_LZA_Reparaturtool.cache"
+    - "/etc/cit_tiff6_baseline_SLUB.cfg"
   notify: restart repairtools
 
 - name: install repairtool (package dependencies are encoded in the package)
@@ -36,10 +37,12 @@
     state: present
   tags: [apt]
 
+# FHS 3.0 specifies the correct path for the config:
+# https://refspecs.linuxfoundation.org/FHS_3.0/fhs/ch04s09.html
 - name: install checkit_tiff config
   copy:
     src: "/usr/share/checkit_tiff/example_configs/cit_tiff6_baseline_SLUB.cfg"
-    dest: "/etc/cit_tiff6_baseline_SLUB.cfg"
+    dest: "/usr/local/etc/cit_tiff6_baseline_SLUB.cfg"
     owner: "{{ vault_service_user }}"
     group: "{{ vault_service_user }}"
     mode: 0600
@@ -68,5 +71,5 @@
       dest: "/home/{{ vault_service_user }}/.config/repair/bin/checkit_tiff"
     - src: "/usr/bin/fixit_tiff"
       dest: "/home/{{ vault_service_user }}/.config/repair/bin/fixit_tiff"
-    - src: "/etc/cit_tiff6_baseline_SLUB.cfg"
+    - src: "/usr/local/etc/cit_tiff6_baseline_SLUB.cfg"
       dest: "/home/{{ vault_service_user }}/.config/repair/cfg/cit_tiff6_baseline_SLUB.cfg"
-- 
GitLab