Merge branch 'bullseye'

tasks/apt.yml

@@ -26,16 +26,11 @@
   apt:
     name: universal-ctags
   when: ansible_distribution == 'Debian' or ansible_distribution_major_version|int >= 20
-- name: non-focal packages
-  become: true
-  apt:
-    name: python-setuptools,python-dev,python-pip
-  when: ansible_distribution_major_version|int < 20 and ansible_distribution_release != 'sid'
-- name: focal packages
+- name: python-is-python3
   become: true
   apt:
     name: python-is-python3
-  when: ansible_distribution_major_version|int >= 20
+  when: (ansible_distribution == 'Ubuntu' and ansible_distribution_major_version|int >= 20) or (ansible_distribution == 'Debian' and ansible_distribution_major_version|int >= 11)
 - name: pve kernel header
   become: true
   apt:

tasks/docker.yml

@@ -17,11 +17,11 @@
 - name: target distribution for non-sid
   set_fact:
     docker_distribution: '{{ ansible_distribution_release|lower }}'
-  when: ansible_distribution_release != 'sid'
+  when: ansible_distribution_release != 'sid' and ansible_distribution_release != 'bullseye'
 - name: target distribution for sid
   set_fact:
-    docker_distribution: buster
-  when: ansible_distribution_release == 'sid'
+    docker_distribution: bullseye
+  when: ansible_distribution_release == 'sid' or ansible_distribution_release == 'bullseye'
 - name: Docker apt 源公钥
   become: true
   apt_key:
@@ -40,11 +40,6 @@
     update_cache: yes
   when: ansible_os_family == 'Debian'
   notify: restart_docker
-- name: Docker extra packages
-  become: true
-  apt:
-    name: python-backports-shutil-get-terminal-size,python-backports.ssl-match-hostname
-  when: ansible_os_family == 'Debian' and ansible_distribution_release != 'sid' and ansible_distribution_major_version|int < 20
 - name: clean yum Docker
   become: true
   yum:

tasks/kernel/Debian-after.yml

@@ -8,12 +8,12 @@
   apt:
     name: r8168-dkms
     default_release: '{{ target_distribution }}-backports'
-  when: check_rtl_result.rc == 0 and ansible_distribution_release != 'sid'
+  when: check_rtl_result.rc == 0 and target_distribution != 'sid' and target_distribution != 'bullseye'
 - name: install RTL8111 driver for sid
   become: true
   apt:
     name: r8168-dkms
-  when: check_rtl_result.rc == 0 and ansible_distribution_release == 'sid'
+  when: check_rtl_result.rc == 0 and (target_distribution == 'sid' or target_distribution == 'bullseye')
 - name: check b43
   shell: 'lspci | grep BCM4322'
   register: check_b43_result

tasks/kernel/Debian.yml

@@ -14,11 +14,19 @@
   set_fact:
     install_kernel_name: linux-image-cloud-{{install_kernel_arch}},linux-headers-cloud-{{install_kernel_arch}}
   when: cloud_kernel == "enabled" or cloud_kernel == "auto" and ansible_virtualization_role == "guest" and ansible_virtualization_type == "kvm"
+- name: use backports
+  set_fact:
+    install_kernel_release: '{{ target_distribution }}-backports'
+  when: target_distribution != 'bullseye'
+- name: use main
+  set_fact:
+    install_kernel_release: '{{ target_distribution }}'
+  when: target_distribution == 'bullseye'
 - name: install kernel
   become: true
   apt:
     name: '{{install_kernel_name}}'
     state: latest
     update_cache: true
-    default_release: '{{ target_distribution }}-backports'
+    default_release: '{{ install_kernel_release }}'
   when: ansible_distribution_release != 'sid'

tasks/pip.yml

@@ -62,6 +62,7 @@
     - 3.6
     - 3.7
     - 3.8
+    - 3.9
 - name: upgrade pip
   become: true
   pip:

tasks/utility.yml

@@ -70,9 +70,9 @@
   set_fact:
     target_distribution: 'focal'
   when: ansible_distribution == 'Ubuntu' and upgrade
-- name: move to buster
+- name: move to bullseye
   set_fact:
-    target_distribution: 'buster'
+    target_distribution: 'bullseye'
   when: ansible_distribution == 'Debian' and upgrade and ansible_distribution_release != 'sid'
 - name: 系统源 (apt)
   become: true

templates/sources.list.j2

@@ -2,16 +2,22 @@
 
 {% if ansible_distribution == 'Ubuntu' %}
 
+# Ubuntu
 deb {{mirror_ubuntu}}/ubuntu/ {{ target_distribution }} main restricted universe multiverse
 deb {{mirror_ubuntu_security}}/ubuntu/ {{ target_distribution }}-security main restricted universe multiverse
 deb {{mirror_ubuntu}}/ubuntu/ {{ target_distribution }}-updates main restricted universe multiverse
 
 {% else %}
 
+# Debian
 deb {{mirror_debian}}/debian {{ target_distribution }} main contrib non-free
 {% if target_distribution != 'sid' %}
 deb {{mirror_debian}}/debian {{ target_distribution }}-updates main contrib non-free
+{% if target_distribution == 'bullseye' or target_distribution == 'bookworm' or target_distribution == 'testing' %}
+deb {{mirror_debian_security}}/debian-security {{ target_distribution }}-security main contrib non-free
+{% else %}
 deb {{mirror_debian_security}}/debian-security {{ target_distribution }}/updates main contrib non-free
+{% endif %}
 deb {{mirror_debian}}/debian {{ target_distribution }}-backports main contrib non-free
 {% else %}
 deb {{mirror_debian}}/debian experimental main contrib non-free