From 591cfd73afb8f62f6301c5df1fc1ab641126a419 Mon Sep 17 00:00:00 2001
From: polyfloyd <floyd@polyfloyd.net>
Date: Sun, 16 Jul 2023 19:23:14 +0200
Subject: [PATCH] Sync from polyfloyd infra

---
 roles/acme/tasks/main.yaml               |  1 -
 roles/acme/tasks/remove_conflicting.yaml |  2 +-
 roles/common/tasks/debian-backports.yaml |  2 +-
 roles/common/tasks/main.yaml             | 14 +++++++++-----
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/roles/acme/tasks/main.yaml b/roles/acme/tasks/main.yaml
index b812b83..ceac392 100644
--- a/roles/acme/tasks/main.yaml
+++ b/roles/acme/tasks/main.yaml
@@ -14,7 +14,6 @@
       apt:
         name: dehydrated
         state: present
-        default_release: "{{ ansible_distribution_release }}-backports"
 
     - name: Install config file
       template:
diff --git a/roles/acme/tasks/remove_conflicting.yaml b/roles/acme/tasks/remove_conflicting.yaml
index 2d233b8..c04b4e7 100644
--- a/roles/acme/tasks/remove_conflicting.yaml
+++ b/roles/acme/tasks/remove_conflicting.yaml
@@ -22,7 +22,7 @@
 - name: Remove variable directories
   file:
     state: absent
-    path: /usr/local/bin/acmetool
+    path: "{{ item }}"
   with_items:
     - /etc/letsencrypt
     - /var/letsencrypt
diff --git a/roles/common/tasks/debian-backports.yaml b/roles/common/tasks/debian-backports.yaml
index f9119a2..928def1 100644
--- a/roles/common/tasks/debian-backports.yaml
+++ b/roles/common/tasks/debian-backports.yaml
@@ -15,4 +15,4 @@
     name: linux-image-amd64
     state: latest
     default_release: "{{ ansible_facts['distribution_release'] }}-backports"
-  when: ansible_facts['architecture'] == "x86_64"
+  when: ansible_facts['architecture'] == "x86_64" and ansible_facts['distribution_release'] != "bookworm"
diff --git a/roles/common/tasks/main.yaml b/roles/common/tasks/main.yaml
index 841ec09..531894c 100644
--- a/roles/common/tasks/main.yaml
+++ b/roles/common/tasks/main.yaml
@@ -39,11 +39,15 @@
   lineinfile:
     path: /etc/bash.bashrc
     insertafter: EOF
-    regexp: "^source /usr/share/doc/fzf/examples/{{ item }}"
-    line: "source /usr/share/doc/fzf/examples/{{ item }} # Managed by Ansible"
-  with_items:
-    - key-bindings.bash
-    - completion.bash
+    regexp: "^source /usr/share/doc/fzf/examples/key-bindings.bash"
+    line: "source /usr/share/doc/fzf/examples/key-bindings.bash # Managed by Ansible"
+
+- name: Configure FZF for Bash (Bookworm)
+  lineinfile:
+    path: /etc/bash.bashrc
+    insertafter: EOF
+    regexp: "^source /usr/share/doc/fzf/examples/completion.bash"
+    state: absent
 
 - name: Shorten Grub timeout
   lineinfile: