upgrade holywood2 to bullseye

Sponsored-by: author

1 files changed, 12 insertions, 19 deletions

diff --git a/ansible/holywood2.yml b/ansible/holywood2.yml
index c10c454..dc225ef 100644
--- a/ansible/holywood2.yml
+++ b/ansible/holywood2.yml
@@ -13,19 +13,16 @@
     ansible_python_interpreter: /usr/bin/python3
 
     sane_debian_system_version: 2
-    unix_users_version: 2
-
     sane_debian_system_hostname: holywood2
-    sane_debian_system_codename: buster
+    sane_debian_system_codename: bullseye
     sane_debian_system_mirror: deb.debian.org
+    sane_debian_system_sources_lists:
+      - repo: deb http://deb.debian.org/debian bullseye main contrib non-free
 
-    mailname: "{{ sane_debian_system_hostname }}.liw.fi"
-    relayhost: pieni.net:587
-    smarthost: pieni.net
-    smarthost_user: pienirelay
-    smarthost_password: "{{ lookup('pipe', 'pass show pieni.net/pienirelay') }}"
+      - repo: deb http://ci-prod-controller.vm.liw.fi/debian unstable-ci main
+        signing_key: "{{ ci_prod_signing_key }}"
 
-    letsencrypt: no
+    unix_users_version: 2
     unix_users:
       - username: liw
         comment: Lars Wirzenius
@@ -38,14 +35,10 @@
         authorized_keys: |
           {{ liw_ssh_pub }}
 
-    sane_debian_system_sources_lists:
-#      - repo: deb http://deb.debian.org/debian stretch main contrib non-free
-
-      - repo: deb http://deb.debian.org/debian buster-backports main contrib non-free
-
-#       - repo: deb http://code.liw.fi/debian stretch main
-#         signing_key: "{{ code_liw_fi_signing_key }}"
-# #        keyring_package: code.liw.fi-keyring
+    mailname: "{{ sane_debian_system_hostname }}.liw.fi"
+    relayhost: pieni.net:587
+    smarthost: pieni.net
+    smarthost_user: pienirelay
+    smarthost_password: "{{ lookup('pipe', 'pass show pieni.net/pienirelay') }}"
 
-      - repo: deb http://ci-prod-controller.vm.liw.fi/debian unstable-ci main
-        signing_key: "{{ ci_prod_signing_key }}"
+    letsencrypt: no