14 files changed, 0 insertions, 92 deletions

diff --git a/roles/apt-repo/aptly/tasks/main.yml b/roles/apt-repo/aptly/tasks/main.yml
index 11f3d44f..3bb7d4c1 100644
--- a/roles/apt-repo/aptly/tasks/main.yml
+++ b/roles/apt-repo/aptly/tasks/main.yml
@@ -5,12 +5,6 @@
     dest: /etc/apt/keyrings/aptly.gpg
   register: apt_repo_aptly_key
 
-## TODO: remove once all servers have been converted
-- name: remove repository key from old location
-  file:
-    path: /etc/apt/trusted.gpg.d/aptly.gpg
-    state: absent
-
 - name: add repository entry
   copy:
     content: |
diff --git a/roles/apt-repo/blackmagic/tasks/main.yml b/roles/apt-repo/blackmagic/tasks/main.yml
index e376fe9f..a6060e36 100644
--- a/roles/apt-repo/blackmagic/tasks/main.yml
+++ b/roles/apt-repo/blackmagic/tasks/main.yml
@@ -5,16 +5,6 @@
     dest: /etc/apt/keyrings/spreadspace.gpg
   register: apt_repo_blackmagic_key
 
-## TODO: remove once all servers have been converted
-- name: remove repository key from old locations
-  loop:
-  - /etc/apt/trusted.gpg.d/blackmagic.gpg
-  - /etc/apt/keyrings/blackmagic.gpg
-  file:
-    path: "{{ item }}"
-    state: absent
-
-
 - name: configure repo authentication
   when:
     - ansible_distribution == "Debian"
diff --git a/roles/apt-repo/docker-com/tasks/main.yml b/roles/apt-repo/docker-com/tasks/main.yml
index 7a1b907c..648196f7 100644
--- a/roles/apt-repo/docker-com/tasks/main.yml
+++ b/roles/apt-repo/docker-com/tasks/main.yml
@@ -5,12 +5,6 @@
     dest: /etc/apt/keyrings/docker-com.gpg
   register: apt_repo_docker_com_key
 
-## TODO: remove once all servers have been converted
-- name: remove repository key from old location
-  file:
-    path: /etc/apt/trusted.gpg.d/docker-com.gpg
-    state: absent
-
 - name: add repository entry
   copy:
     content: |
diff --git a/roles/apt-repo/element/tasks/main.yml b/roles/apt-repo/element/tasks/main.yml
index 6971baab..1f856500 100644
--- a/roles/apt-repo/element/tasks/main.yml
+++ b/roles/apt-repo/element/tasks/main.yml
@@ -5,16 +5,6 @@
     dest: /etc/apt/keyrings/element.gpg
   register: apt_repo_element_key
 
-## TODO: remove once all servers have been converted
-- name: remove repository key from old location
-  loop:
-  - /etc/apt/trusted.gpg.d/element.gpg
-  - /etc/apt/keyrings/riot.gpg
-  - /etc/apt/sources.list.d/riot.list
-  file:
-    path: "{{ item }}"
-    state: absent
-
 - name: add repository entry
   copy:
     content: |
diff --git a/roles/apt-repo/grafana/tasks/main.yml b/roles/apt-repo/grafana/tasks/main.yml
index f5bf1275..1b3f10c6 100644
--- a/roles/apt-repo/grafana/tasks/main.yml
+++ b/roles/apt-repo/grafana/tasks/main.yml
@@ -5,12 +5,6 @@
     dest: /etc/apt/keyrings/grafana.gpg
   register: apt_repo_grafana_key
 
-## TODO: remove once all servers have been converted
-- name: remove repository key from old location
-  file:
-    path: /etc/apt/trusted.gpg.d/grafana.gpg
-    state: absent
-
 - name: add repository entry
   copy:
     content: |
diff --git a/roles/apt-repo/helsinki/tasks/main.yml b/roles/apt-repo/helsinki/tasks/main.yml
index fd8ac760..40e011ea 100644
--- a/roles/apt-repo/helsinki/tasks/main.yml
+++ b/roles/apt-repo/helsinki/tasks/main.yml
@@ -5,12 +5,6 @@
     dest: /etc/apt/keyrings/helsinki.gpg
   register: apt_repo_helsinki_key
 
-## TODO: remove once all servers have been converted
-- name: remove repository key from old location
-  file:
-    path: /etc/apt/trusted.gpg.d/helsinki.gpg
-    state: absent
-
 - name: add repository entry
   copy:
     content: |
diff --git a/roles/apt-repo/kodi/tasks/main.yml b/roles/apt-repo/kodi/tasks/main.yml
index f6fcbc5f..c7938b0d 100644
--- a/roles/apt-repo/kodi/tasks/main.yml
+++ b/roles/apt-repo/kodi/tasks/main.yml
@@ -5,12 +5,6 @@
     dest: /etc/apt/keyrings/kodi.gpg
   register: apt_repo_kodi_key
 
-## TODO: remove once all servers have been converted
-- name: remove repository key from old location
-  file:
-    path: /etc/apt/trusted.gpg.d/kodi.gpg
-    state: absent
-
 - name: add repository entry
   copy:
     content: |
diff --git a/roles/apt-repo/kubic-project/tasks/main.yml b/roles/apt-repo/kubic-project/tasks/main.yml
index 386815bc..658565d0 100644
--- a/roles/apt-repo/kubic-project/tasks/main.yml
+++ b/roles/apt-repo/kubic-project/tasks/main.yml
@@ -5,12 +5,6 @@
     dest: /etc/apt/keyrings/kubic-project.gpg
   register: apt_repo_kubic_project_key
 
-## TODO: remove once all servers have been converted
-- name: remove repository key from old location
-  file:
-    path: /etc/apt/trusted.gpg.d/kubic-project.gpg
-    state: absent
-
 - name: add repository entry
   copy:
     content: |
diff --git a/roles/apt-repo/nodejs/tasks/main.yml b/roles/apt-repo/nodejs/tasks/main.yml
index 5c59cf5a..69af27a1 100644
--- a/roles/apt-repo/nodejs/tasks/main.yml
+++ b/roles/apt-repo/nodejs/tasks/main.yml
@@ -5,12 +5,6 @@
     dest: /etc/apt/keyrings/nodejs.gpg
   register: apt_repo_nodejs_key
 
-## TODO: remove once all servers have been converted
-- name: remove repository key from old location
-  file:
-    path: /etc/apt/trusted.gpg.d/nodejs.gpg
-    state: absent
-
 - name: add repository entry
   copy:
     content: |
diff --git a/roles/apt-repo/nordvpn/tasks/main.yml b/roles/apt-repo/nordvpn/tasks/main.yml
index 32711ad0..923c2fb0 100644
--- a/roles/apt-repo/nordvpn/tasks/main.yml
+++ b/roles/apt-repo/nordvpn/tasks/main.yml
@@ -5,12 +5,6 @@
     dest: /etc/apt/keyrings/nordvpn.gpg
   register: apt_repo_nordvpn_key
 
-## TODO: remove once all servers have been converted
-- name: remove repository key from old location
-  file:
-    path: /etc/apt/trusted.gpg.d/nordvpn.gpg
-    state: absent
-
 - name: add repository entry
   copy:
     content: |
diff --git a/roles/apt-repo/obs-studio/tasks/main.yml b/roles/apt-repo/obs-studio/tasks/main.yml
index e3933596..9a966268 100644
--- a/roles/apt-repo/obs-studio/tasks/main.yml
+++ b/roles/apt-repo/obs-studio/tasks/main.yml
@@ -5,12 +5,6 @@
     dest: /etc/apt/keyrings/obs-studio.gpg
   register: apt_repo_obs_studio_key
 
-## TODO: remove once all servers have been converted
-- name: remove repository key from old location
-  file:
-    path: /etc/apt/trusted.gpg.d/obs-studio.gpg
-    state: absent
-
 - name: add repository entry
   copy:
     content: |
diff --git a/roles/apt-repo/percona/tasks/main.yml b/roles/apt-repo/percona/tasks/main.yml
index 59f7f2a9..51ed9426 100644
--- a/roles/apt-repo/percona/tasks/main.yml
+++ b/roles/apt-repo/percona/tasks/main.yml
@@ -5,12 +5,6 @@
     dest: /etc/apt/keyrings/percona.gpg
   register: apt_repo_percona_key
 
-## TODO: remove once all servers have been converted
-- name: remove repository key from old location
-  file:
-    path: /etc/apt/trusted.gpg.d/percona.gpg
-    state: absent
-
 - name: add repository entry
   copy:
     content: |
diff --git a/roles/apt-repo/spreadspace/tasks/main.yml b/roles/apt-repo/spreadspace/tasks/main.yml
index 8351d12d..4c789efd 100644
--- a/roles/apt-repo/spreadspace/tasks/main.yml
+++ b/roles/apt-repo/spreadspace/tasks/main.yml
@@ -5,12 +5,6 @@
     dest: /etc/apt/keyrings/spreadspace.gpg
   register: apt_repo_spreadspace_key
 
-## TODO: remove once all servers have been converted
-- name: remove repository key from old location
-  file:
-    path: /etc/apt/trusted.gpg.d/spreadspace.gpg
-    state: absent
-
 - name: add repository entry
   copy:
     content: |
diff --git a/roles/apt-repo/tor-project/tasks/main.yml b/roles/apt-repo/tor-project/tasks/main.yml
index 6f465016..7c1669bc 100644
--- a/roles/apt-repo/tor-project/tasks/main.yml
+++ b/roles/apt-repo/tor-project/tasks/main.yml
@@ -5,12 +5,6 @@
     dest: /etc/apt/keyrings/tor-project.gpg
   register: apt_repo_tor_project_key
 
-## TODO: remove once all servers have been converted
-- name: remove repository key from old location
-  file:
-    path: /etc/apt/trusted.gpg.d/tor-project.gpg
-    state: absent
-
 - name: add repository entry
   copy:
     content: |