From 96a2bbecddc42544c1fcb90c2f6f3a90b9b9803c Mon Sep 17 00:00:00 2001
From: Jeremy Lecour <jlecour@evolix.fr>
Date: Wed, 15 Mar 2023 22:49:02 +0100
Subject: [PATCH] apt: move-apt-keyrings moved in /usr/share/scripts

---
 apt/files/move-apt-keyrings.sh |  2 +-
 apt/tasks/move-apt-keyring.yml | 18 ++++++++++++++++--
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/apt/files/move-apt-keyrings.sh b/apt/files/move-apt-keyrings.sh
index 3283c4ee..2d266412 100644
--- a/apt/files/move-apt-keyrings.sh
+++ b/apt/files/move-apt-keyrings.sh
@@ -7,7 +7,7 @@
 repository_pattern=$1
 key=$2
 
-found_files=$(grep --files-with-matches --recursive --extended-regexp "${repository_pattern}" "/etc/apt/sources.list.d/")
+found_files=$(grep --files-with-matches --recursive --extended-regexp "${repository_pattern}" "/etc/apt/sources.list.d/*.list")
 
 old_key_file="/etc/apt/trusted.gpg.d/${key}"
 new_key_file="/etc/apt/keyrings/${key}"
diff --git a/apt/tasks/move-apt-keyring.yml b/apt/tasks/move-apt-keyring.yml
index ade3d190..4214d2d6 100644
--- a/apt/tasks/move-apt-keyring.yml
+++ b/apt/tasks/move-apt-keyring.yml
@@ -1,4 +1,5 @@
 ---
+
 - name: New APT keyrings directory is present
   file:
     path: /etc/apt/keyrings
@@ -7,16 +8,29 @@
     owner: root
     group: root
 
+- include_role:
+    name: evolix/remount-usr
+
+- name: /usr/share/scripts exists
+  file:
+    dest: /usr/share/scripts
+    mode: "0700"
+    owner: root
+    group: root
+    state: directory
+  tags:
+    - apt
+
 - name: migration script is present
   copy:
     src: move-apt-keyrings.sh
-    dest: /root/move-apt-keyrings.sh
+    dest: /usr/share/scripts/move-apt-keyrings.sh
     mode: "0755"
     owner: root
     group: root
 
 - name: Move repository signing key
-  command: "/root/move-apt-keyrings.sh \"{{ item.repository_pattern }}\" \"{{ item.key }}\""
+  command: "/usr/share/scripts/move-apt-keyrings.sh \"{{ item.repository_pattern }}\" \"{{ item.key }}\""
   loop:
     - { repository_pattern: "http://pub.evolix.net/", key: "reg.asc" }
     - { repository_pattern: "http://pub.evolix.org/evolix", key: "pub_evolix.asc" }