Merge pull request #230 from lexxxel/feature/add_bookworm_and_debian_12_compatibility

lae · web-flow · commit c5b12dc4d429 · 2024-03-15T22:58:33.000+09:00
feature: add debian 12 bookworm and proxmox 8 compatibility
diff --git a/files/proxmox-release-bookworm.gpg b/files/proxmox-release-bookworm.gpg
diff --git a/meta/main.yml b/meta/main.yml
@@ -13,6 +13,7 @@ galaxy_info:
       versions:
         - buster
         - bullseye
+        - bookworm
 
   galaxy_tags:
     - proxmox
diff --git a/tasks/main.yml b/tasks/main.yml
@@ -104,11 +104,19 @@
     name: gpg
     state: present
 
-- name: Trust Proxmox' packaging key
+- name: Trust Proxmox' packaging key on Debian < 12
   apt_key:
     data: "{{ lookup('file', pve_release_key) }}"
     id: "{{ pve_release_key_id }}"
     state: present
+  when: "ansible_distribution_major_version | int < 12"
+
+- name: Trust Proxmox' packaging key on Debian 12
+  copy:
+    src: "proxmox-release-{{ ansible_distribution_release }}.gpg"
+    dest: "/etc/apt/trusted.gpg.d/proxmox-release-{{ ansible_distribution_release }}.gpg"
+    mode: 0644
+  when: "ansible_distribution_major_version | int == 12"
 
 - name: Remove os-prober package
   apt:
diff --git a/vars/debian-bookworm.yml b/vars/debian-bookworm.yml
@@ -0,0 +1,2 @@
+---
+pve_ssh_ciphers: "aes128-ctr,aes192-ctr,aes256-ctr,aes128-gcm@openssh.com,aes256-gcm@openssh.com,chacha20-poly1305@openssh.com"

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+---`
	`2`	`+pve_ssh_ciphers: "aes128-ctr,aes192-ctr,aes256-ctr,[email protected],[email protected],[email protected]"`