fix: drop ci-prod-controller.vm.liw.fi; use unstable on apt.liw.fi

Not unstable-ci.

Signed-off-by: Lars Wirzenius <liw@liw.fi>
Sponsored-by: author

22 files changed, 32 insertions, 336 deletions

diff --git a/ansible/ambient-dev.yml b/ansible/ambient-dev.yml
index a144fff..988cc51 100644
--- a/ansible/ambient-dev.yml
+++ b/ansible/ambient-dev.yml
@@ -43,8 +43,8 @@
         sudo: yes
 
     sane_debian_system_sources_lists:
-      - repo: deb http://ci-prod-controller.vm.liw.fi/debian unstable-ci main
-        signing_key: "{{ ci_prod_signing_key }}"
+      - repo: deb http://ap.liw.fi/debian unstable main
+        signing_key: "apt_liw_fi_signing_key }}"
 
     sshd_version: 1
  
diff --git a/ansible/bigtoy.yml b/ansible/bigtoy.yml
index 3acd8a4..765aefc 100644
--- a/ansible/bigtoy.yml
+++ b/ansible/bigtoy.yml
@@ -37,8 +37,8 @@
         sudo: yes
 
     sane_debian_system_sources_lists:
-      - repo: deb http://ci-prod-controller.vm.liw.fi/debian unstable-ci main
-        signing_key: "{{ ci_prod_signing_key }}"
+      - repo: deb http://apt.liw.fi/debian unstable main
+        signing_key: "{{ apt_liw_fi_signing_key }}"
 
     sshd_version: 1
     sshd_allow_authorized_keys: yes
diff --git a/ansible/conc.yml b/ansible/conc.yml
deleted file mode 100644
index 3f9688c..0000000
--- a/ansible/conc.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-- hosts: conc
-  remote_user: debian
-  become: yes
-  roles:
-    - role: sane_debian_system
-      tags: [sane]
-    - role: sshd
-      tags: [sshd]
-    - role: comfortable-debian-system
-      tags: [comfy]
-    - role: unix_users
-      tags: [users]
-  tasks:
-    - apt:
-        name:
-          - curl
-          - docker.io
-          - docker-compose
-  vars:
-    ansible_python_interpreter: python3
-
-    sane_debian_system_version: 2
-    sane_debian_system_hostname: "{{ inventory_hostname }}"
-    sane_debian_system_codename: bookworm
-
-    timezone: Europe/Helsinki
-
-    unix_users_version: 2
-    unix_users:
-      - username: liw
-        comment: Lars Wirzenius
-        sudo: yes
-        groups:
-          - docker
-
-    sshd_version: 1
-    sshd_allow_authorized_keys: yes
diff --git a/ansible/debian-ansible-dev.yml b/ansible/debian-ansible-dev.yml
index 5a194c4..58d2bda 100644
--- a/ansible/debian-ansible-dev.yml
+++ b/ansible/debian-ansible-dev.yml
@@ -61,8 +61,8 @@
         sudo: yes
 
     sane_debian_system_sources_lists:
-      - repo: deb http://ci-prod-controller.vm.liw.fi/debian unstable-ci main
-        signing_key: "{{ ci_prod_signing_key }}"
+      - repo: deb http://apt.liw.fi/debian unstable main
+        signing_key: "{{ apt_liw_fi_signing_key }}"
 
     sshd_version: 1
     sshd_allow_authorized_keys: yes
diff --git a/ansible/exolobe1.yml b/ansible/exolobe1.yml
index 20e6dd3..c69bd8a 100644
--- a/ansible/exolobe1.yml
+++ b/ansible/exolobe1.yml
@@ -280,12 +280,6 @@
       - repo: |
           deb http://deb.debian.org/debian bookworm-backports main contrib non-free non-free-firmware
 
-      - repo: deb http://ci-prod-controller.vm.liw.fi/debian unstable-ci main
-        signing_key: "{{ ci_prod_signing_key }}"
-
-      - repo: deb http://ci-prod-controller.vm.liw.fi/debian unstable main
-        signing_key: "{{ ci_prod_signing_key }}"
-
       - repo: deb http://apt.liw.fi/debian unstable main
         signing_key: "{{ apt_liw_fi_signing_key }}"
 
diff --git a/ansible/exolobe2.yml b/ansible/exolobe2.yml
index b00e2c7..70c4cec 100644
--- a/ansible/exolobe2.yml
+++ b/ansible/exolobe2.yml
@@ -25,8 +25,8 @@
       - repo: |
           deb http://deb.debian.org/debian bullseye contrib non-free
 
-      - repo: deb http://ci-prod-controller.vm.liw.fi/debian unstable-ci main
-        signing_key: "{{ ci_prod_signing_key }}"
+      - repo: deb http://apt.liw.fi/debian unstable main
+        signing_key: "{{ apt_liw_fi_signing_key }}"
 
     unix_users_version: 2
     unix_users:
diff --git a/ansible/holywood2.yml b/ansible/holywood2.yml
index cff235f..20fafc7 100644
--- a/ansible/holywood2.yml
+++ b/ansible/holywood2.yml
@@ -30,8 +30,8 @@
     sane_debian_system_sources_lists:
       - repo: deb http://deb.debian.org/debian bullseye main contrib non-free
 
-      - repo: deb http://ci-prod-controller.vm.liw.fi/debian unstable-ci main
-        signing_key: "{{ ci_prod_signing_key }}"
+      - repo: deb http://apt.liw.fi/debian unstable main
+        signing_key: "{{ apt_liw_fi_signing_key }}"
 
     unix_users_version: 2
     unix_users:
diff --git a/ansible/image-dist.yml b/ansible/image-dist.yml
index 91e2612..2ef70af 100644
--- a/ansible/image-dist.yml
+++ b/ansible/image-dist.yml
@@ -99,8 +99,8 @@
     sane_debian_system_hostname: "{{ inventory_hostname }}"
     sane_debian_system_codename: bullseye
     sane_debian_system_sources_lists:
-      - repo: deb http://ci-prod-controller.vm.liw.fi/debian unstable-ci main
-        signing_key: "{{ ci_prod_signing_key }}"
+      - repo: deb http://apt.liw.fi/debian unstable-ci main
+        signing_key: "{{ apt_liw_fi_signing_key }}"
 
     unix_users_version: 2
     unix_users:
diff --git a/ansible/maybe-someday/contractor-dev.yml b/ansible/maybe-someday/contractor-dev.yml
deleted file mode 100644
index 0ef3722..0000000
--- a/ansible/maybe-someday/contractor-dev.yml
+++ /dev/null
@@ -1,48 +0,0 @@
-- hosts: contractor-dev
-  remote_user: root
-  roles:
-    - role: sane_debian_system
-      tags: [sane]
-    - comfortable-debian-system
-    - unix_users
-    - version-controller
-    - vmhost
-  tasks:
-    - user:
-        name: liw
-        groups:
-          - kvm
-          - libvirt
-    - apt:
-        name:
-          - black
-          - vmdb2
-          - subplot
-    - shell: |
-        virsh net-autostart default
-        virsh net-start default || true
-    - user:
-        name: liw
-        groups: [liw, kvm]
-    - copy:
-        content: |
-          {{ liw_personal_ssh_pub }}
-        dest: /home/liw/.ssh/liw-openpgp.pub
-        owner: liw
-        group: liw
-        mode: 0600
-
-  vars:
-    sane_debian_system_version: 2
-    sane_debian_system_hostname: contractor-dev
-    sane_debian_system_codename: buster
-
-    unix_users_version: 2
-    unix_users:
-      - username: liw
-        comment: Lars Wirzenius
-        sudo: yes
-
-    sources_lists:
-      - repo: deb http://ci-prod-controller.vm.liw.fi/debian unstable-ci main
-        signing_key: "{{ ci_prod_signing_key }}"
diff --git a/ansible/maybe-someday/ick2-dev.yml b/ansible/maybe-someday/ick2-dev.yml
deleted file mode 100644
index 6a8b0c6..0000000
--- a/ansible/maybe-someday/ick2-dev.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-- hosts: ick2-dev
-  remote_user: debian
-  become: yes
-  roles:
-    - role: sane_debian_system
-    - role: unix_users
-    - role: version-controller
-    - role: liw
-  tasks:
-    - name: "install build dependencies for Ick"
-      apt:
-        state: present
-        name:
-          - debhelper
-          - python3-all
-          - python3-bottle
-          - python-cliapp
-          - python3-cliapp
-          - python3-coverage-test-runner
-          - python3-apifw
-          - python3-slog
-          - python3-cryptography
-          - python3-requests
-          - python-requests
-          - pycodestyle
-          - gunicorn3
-          - python3-yaml
-          - cmdtest
-          - copyright-statement-lint
-  vars:
-    ansible_python_interpreter: /usr/bin/python3
-
-    sane_debian_system_version: 2
-    sane_debian_system_hostname: ick2-dev
-    sane_debian_system_codename: buster
-    sane_debian_system_sources_lists:
-      - repo: deb http://ci-prod-controller.vm.liw.fi/debian unstable-ci main
-        signing_key: "{{ ci_prod_signing_key }}"
-
-    unix_users_version: 2
-    unix_users:
-      - username: liw
-        comment: Lars Wirzenius
-        sudo: true
-        authorized_keys: |
-          {{ liw_personal_ssh_pub }}
-        ssh_key: |
-          {{ lookup('pipe', 'pass show ssh/liw@mirror-git') }}
-        ssh_key_pub: |
-          {{ lookup('pipe', 'pass show ssh/liw@mirror-git.pub') }}
diff --git a/ansible/maybe-someday/sq-test.yml b/ansible/maybe-someday/sq-test.yml
deleted file mode 100644
index 5879ef1..0000000
--- a/ansible/maybe-someday/sq-test.yml
+++ /dev/null
@@ -1,160 +0,0 @@
-- hosts: sq-test
-  remote_user: root
-  roles:
-    - role: sane_debian_system
-    - role: comfortable-debian-system
-    - role: unix_users
-    - role: self-updating-system
-  tasks:
-    - apt:
-        name:
-          - bash-completion
-          - sq
-        state: present
-    - file:
-        path: /tmp/shared
-        state: directory
-        mode: 01777
-    - copy:
-        content: |
-          -----BEGIN PGP PUBLIC KEY BLOCK-----
-          Comment: 010A B1FA 8E24 283F B898  3F52 9036 838A 283E 1AA9
-          Comment: Lars Wirzenius
-
-          xjMEYuzSFBYJKwYBBAHaRw8BAQdAkOVflgRACWQrysidOFgXUa5AmknlCt0Sb5U/
-          kFHOHmzCwBEEHxYKAIMFgmLs0hQFiQWkj70DCwkHCRCQNoOKKD4aqUcUAAAAAAAe
-          ACBzYWx0QG5vdGF0aW9ucy5zZXF1b2lhLXBncC5vcmc0zoAeYXkSCb7SOLblaokA
-          uMiuMLNocIM4XSeEEVVdogMVCggCmwECHgEWIQQBCrH6jiQoP7iYP1KQNoOKKD4a
-          qQAAJvkBAPOvcIFKjV+RDssTF+M8ANsVPN8e9MCaHhF65o6dHtv2AQCyJVPftDH2
-          ub9mr6bIPEUYJi6+imZX2Xa3C7SGNEe0Bc0OTGFycyBXaXJ6ZW5pdXPCwBQEExYK
-          AIYFgmLs0hQFiQWkj70DCwkHCRCQNoOKKD4aqUcUAAAAAAAeACBzYWx0QG5vdGF0
-          aW9ucy5zZXF1b2lhLXBncC5vcmdy+aoELSz02TDwDO0w+j6N/Yg4vQ8Ws6cZeFQU
-          u0lkMAMVCggCmQECmwECHgEWIQQBCrH6jiQoP7iYP1KQNoOKKD4aqQAApqwBANTK
-          v3NN6xI8eH/TSbR+5VgrSiZj4mZoNCBQALpEQzT9AQCvrZmKNfeq77Q4SsEWUmD8
-          dHb0eMsppyi0oW8itAuaC84zBGLs0hQWCSsGAQQB2kcPAQEHQGpPf6RSeuBlzhTS
-          5J+yAYQNSKUC+RPYBiq3u1jkydJ9wsDFBBgWCgE3BYJi7NIUBYkFpI+9CRCQNoOK
-          KD4aqUcUAAAAAAAeACBzYWx0QG5vdGF0aW9ucy5zZXF1b2lhLXBncC5vcmcg7Rr7
-          iOeL3SCZ2ecGO0/g/5CorBrxP8AlfuyWAJroeAKbAr6gBBkWCgBvBYJi7NIUCRCM
-          lfahnAL5XUcUAAAAAAAeACBzYWx0QG5vdGF0aW9ucy5zZXF1b2lhLXBncC5vcmd1
-          Jf5951yGEOtGCSw0BpWa4pPp6mR9hGGhMqpyA5sXkhYhBHTyxaykxgutnvUZlIyV
-          9qGcAvldAAA+iAD/VOod7dIUrxPL23iUKYCe1OjQ+rOWrjzWr4lXh8MbYD8A/ium
-          ns8bmARpt2+VPqfbTQiESK5i+k3HFw2O2R3MP1EFFiEEAQqx+o4kKD+4mD9SkDaD
-          iig+GqkAAJo0AP9TWhlep2UnuQb1eqpyK7bxrpaPV/cR2v98DtxUcDZJPAEAyjcD
-          +AR1KC2VHF32JYHddbvEBG4YkRuslXpX8t46SQ3OMwRi7NIUFgkrBgEEAdpHDwEB
-          B0Dlc6Sa0OENRkXRlGSJx+TW6+QEK7WB8eIHikyxfK4hdcLABgQYFgoAeAWCYuzS
-          FAWJBaSPvQkQkDaDiig+GqlHFAAAAAAAHgAgc2FsdEBub3RhdGlvbnMuc2VxdW9p
-          YS1wZ3Aub3JnadCLyuCKpqa7utZ+81jTDOpCgF1yoR/grzfb3h3H+0YCmyAWIQQB
-          CrH6jiQoP7iYP1KQNoOKKD4aqQAAY/gA/35WSxWkNURZdGOwKgBJtw5nc5K9s6nt
-          LefNkI/OB7O/AP98xXylCuzQNw7jbmkuwIyb3t1iyBUmBBkAkVHUVkEmCs44BGLs
-          0hQSCisGAQQBl1UBBQEBB0B73lJoeEfLvaYgpYJiJcTnDPXon0TI3Kd37xa+8ieM
-          eAMBCAfCwAYEGBYKAHgFgmLs0hQFiQWkj70JEJA2g4ooPhqpRxQAAAAAAB4AIHNh
-          bHRAbm90YXRpb25zLnNlcXVvaWEtcGdwLm9yZyeEI8W6tcOpWsDOVz9SqpQlgAlN
-          IzNCdED0mddImb5RApsMFiEEAQqx+o4kKD+4mD9SkDaDiig+GqkAAFxjAP40OKNA
-          IEx5tGJneoTLFFDYQUpstG6h7AZ36ooEaRIk5AEA6mUCs9JdJMElHa34g+txs7Pk
-          3gygQYQtpkkeCXZ2tgc=
-          =YmSW
-          -----END PGP PUBLIC KEY BLOCK-----
-        dest: /home/liw/liw-pub.pgp
-        owner: liw
-        group: liw
-    - copy:
-        content: |
-          -----BEGIN PGP PRIVATE KEY BLOCK-----
-          Comment: 010A B1FA 8E24 283F B898  3F52 9036 838A 283E 1AA9
-          Comment: Lars Wirzenius
-
-          xVgEYuzSFBYJKwYBBAHaRw8BAQdAkOVflgRACWQrysidOFgXUa5AmknlCt0Sb5U/
-          kFHOHmwAAP90GKYJ/CEDoZtNhVMCsXveNAmriM18VhfjQmoJVY9F8g6gwsARBB8W
-          CgCDBYJi7NIUBYkFpI+9AwsJBwkQkDaDiig+GqlHFAAAAAAAHgAgc2FsdEBub3Rh
-          dGlvbnMuc2VxdW9pYS1wZ3Aub3JnNM6AHmF5Egm+0ji25WqJALjIrjCzaHCDOF0n
-          hBFVXaIDFQoIApsBAh4BFiEEAQqx+o4kKD+4mD9SkDaDiig+GqkAACb5AQDzr3CB
-          So1fkQ7LExfjPADbFTzfHvTAmh4ReuaOnR7b9gEAsiVT37Qx9rm/Zq+myDxFGCYu
-          vopmV9l2twu0hjRHtAXNDkxhcnMgV2lyemVuaXVzwsAUBBMWCgCGBYJi7NIUBYkF
-          pI+9AwsJBwkQkDaDiig+GqlHFAAAAAAAHgAgc2FsdEBub3RhdGlvbnMuc2VxdW9p
-          YS1wZ3Aub3JncvmqBC0s9Nkw8AztMPo+jf2IOL0PFrOnGXhUFLtJZDADFQoIApkB
-          ApsBAh4BFiEEAQqx+o4kKD+4mD9SkDaDiig+GqkAAKasAQDUyr9zTesSPHh/00m0
-          fuVYK0omY+JmaDQgUAC6REM0/QEAr62ZijX3qu+0OErBFlJg/HR29HjLKacotKFv
-          IrQLmgvHWARi7NIUFgkrBgEEAdpHDwEBB0BqT3+kUnrgZc4U0uSfsgGEDUilAvkT
-          2AYqt7tY5MnSfQABAIPRid4IAhZwCvDmr27PF78T/0VSA2gtlwouA8yvb7HsDojC
-          wMUEGBYKATcFgmLs0hQFiQWkj70JEJA2g4ooPhqpRxQAAAAAAB4AIHNhbHRAbm90
-          YXRpb25zLnNlcXVvaWEtcGdwLm9yZyDtGvuI54vdIJnZ5wY7T+D/kKisGvE/wCV+
-          7JYAmuh4ApsCvqAEGRYKAG8FgmLs0hQJEIyV9qGcAvldRxQAAAAAAB4AIHNhbHRA
-          bm90YXRpb25zLnNlcXVvaWEtcGdwLm9yZ3Ul/n3nXIYQ60YJLDQGlZrik+nqZH2E
-          YaEyqnIDmxeSFiEEdPLFrKTGC62e9RmUjJX2oZwC+V0AAD6IAP9U6h3t0hSvE8vb
-          eJQpgJ7U6ND6s5auPNaviVeHwxtgPwD+K6aezxuYBGm3b5U+p9tNCIRIrmL6TccX
-          DY7ZHcw/UQUWIQQBCrH6jiQoP7iYP1KQNoOKKD4aqQAAmjQA/1NaGV6nZSe5BvV6
-          qnIrtvGulo9X9xHa/3wO3FRwNkk8AQDKNwP4BHUoLZUcXfYlgd11u8QEbhiRG6yV
-          elfy3jpJDcdYBGLs0hQWCSsGAQQB2kcPAQEHQOVzpJrQ4Q1GRdGUZInH5Nbr5AQr
-          tYHx4geKTLF8riF1AAEAx8kFIwgl9lPJI91ZUXBK9nj8BAChRHHiq1YJI+heIUoN
-          4MLABgQYFgoAeAWCYuzSFAWJBaSPvQkQkDaDiig+GqlHFAAAAAAAHgAgc2FsdEBu
-          b3RhdGlvbnMuc2VxdW9pYS1wZ3Aub3JnadCLyuCKpqa7utZ+81jTDOpCgF1yoR/g
-          rzfb3h3H+0YCmyAWIQQBCrH6jiQoP7iYP1KQNoOKKD4aqQAAY/gA/35WSxWkNURZ
-          dGOwKgBJtw5nc5K9s6ntLefNkI/OB7O/AP98xXylCuzQNw7jbmkuwIyb3t1iyBUm
-          BBkAkVHUVkEmCsddBGLs0hQSCisGAQQBl1UBBQEBB0B73lJoeEfLvaYgpYJiJcTn
-          DPXon0TI3Kd37xa+8ieMeAMBCAcAAP9ou8Z/+/40YzSNg9fTYC33bJCA/IFb7V+N
-          XGhehUoNcBIEwsAGBBgWCgB4BYJi7NIUBYkFpI+9CRCQNoOKKD4aqUcUAAAAAAAe
-          ACBzYWx0QG5vdGF0aW9ucy5zZXF1b2lhLXBncC5vcmcnhCPFurXDqVrAzlc/UqqU
-          JYAJTSMzQnRA9JnXSJm+UQKbDBYhBAEKsfqOJCg/uJg/UpA2g4ooPhqpAABcYwD+
-          NDijQCBMebRiZ3qEyxRQ2EFKbLRuoewGd+qKBGkSJOQBAOplArPSXSTBJR2t+IPr
-          cbOz5N4MoEGELaZJHgl2drYH
-          =DO2c
-          -----END PGP PRIVATE KEY BLOCK-----
-        dest: /home/liw/liw.pgp
-        owner: liw
-        group: liw
-  vars:
-    ansible_python_interpreter: /usr/bin/python3
-
-    sane_debian_system_version: 2
-    sane_debian_system_hostname: shell
-    sane_debian_system_codename: bullseye
-    sane_debian_system_mirror: deb.debian.org
-    sane_debian_system_sources_lists:
-      - repo: deb http://ci-prod-controller.vm.liw.fi/debian unstable-ci main
-        signing_key: "{{ ci_prod_signing_key }}"
-
-    unix_users_version: 2
-    unix_users:
-      - username: root
-        authorized_keys: |
-          {{ liw_hetzner_ssh_pub }}
-      - username: liw
-        comment: Lars Wirzenius
-        authorized_keys: |
-          {{ liw_hetzner_ssh_pub }}
-      - username: volunteer1
-        comment: sq volunteer
-        authorized_keys: |
-          {{ liw_hetzner_ssh_pub }}
-#          ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGZdyfLIkIPT49xv3wHurk97Q4Iv2+E8vzBdLl9FEt/m
-      - username: volunteer2
-        comment: sq volunteer
-        authorized_keys: |
-          {{ liw_hetzner_ssh_pub }}
-#          ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMnYWSq0gnmLnshJdikKT65NJcuKRXa7RAsyUraqha0V
-      - username: volunteer3
-        comment: sq volunteer
-        authorized_keys: |
-          {{ liw_hetzner_ssh_pub }}
-#          ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOY4VaVEXyQpV7knCanFU4oNb8+Tuz2ef8HvMD8fYPhA
-      - username: volunteer4
-        comment: sq volunteer
-        authorized_keys: |
-          {{ liw_hetzner_ssh_pub }}
-#          ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDIcY2jjbtV2OnQourPizkXbgLfJJVi4orUdeuvgiM6alHiPmuo/Feya+R+GuLgxoJYXHIk82ZZSHS9LGGNrXrHJIvrCva7CC5XPdUrgGjZRCHnHXI1Ly7Grw1fa/We8a1PoxISxDGRy9NTwqChm8qGEG8Gm4eH7DOXrJCgUoI04oCp/gEfRL+wF0A2/FZvpG7zSuYReJsdIa733t+CpltVTlJS9iCdUFuYkzKzhp01r6sw7Kp3PuzaU2xi2nxBP8K9nBW85UB4q42RdoDHASTcIZE3uss4XzdRQPOurvoppzV7MzGtegCPY65t3MMDJtVKmhAYc4OEZKu4+8cnOd1Wre2rLARFHw/u881QfNjDwN2+oMnmJo45YHM45GIIXhFr+Hs44TJEuons9rA933MW8vjLTNzyKSNK5TXfzg9oqD+Gc3ATwooTPBf+EaN2i5D4DGxX6l7xsRoBXD6DidLRoN9iD1pVVJRpE7q9lRU0GaUMdNC2RRtUk36BZDpmKoyBsuFDLgOUSbKFPOG7378LYC9MQmB0RR2VW0g0x01MGfd7UNX9cpHuJNjRikfqF8Lm4Y7UAkyF498MFbkZPaKpGPFxbUARghryrLRkVjDyqwDAIlOgjjdN2KOGLIB+rgjRnuEvHoshnr1MADlGHBocfX4LO0ABxMNcCB3RU/t26w==
-      - username: volunteer5
-        comment: sq volunteer
-        authorized_keys: |
-          {{ liw_hetzner_ssh_pub }}
-          ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC/0/n02JFJXtuBOUbu34Hm5xQ9CuiQtthsxPkfnIOhfC4Gx2tNWgcygnZTUh0ymDutQugJVKKj2nHJoKVJUeecroqW7VdR8omfWJGTST9CxJhubMuJnD4dnRVnvsLvmPN5X2ELaoQU7H4Ia4/P596kH9aw3/b07mx+xf0wg9OCLf7q3dNjBUR9ztqR253hjRA9yi4yut3sNosDwtfzbDhypDsG+fzve/bUH13X3Et+pUD3GWRkEjbTUv6qTxob+xlSBRVHviCiQG0MAcW+YAOyvG/REzONGoMufiP9ozgrx46Qn1Ey1bh6POBQjgE8zaajOHn4f63j5sir1aezRmSd7l6yAB/YwyFHuSXY4TkWmiWLaFw0EB4E3A2M8qACjsH173gVh+BlnRot+AYzpJ2oDIluQrTzcY558AYuRb4u0jfRfsnDdt3aifSnLXkF2cw46zB8nBDY789adhvoyX+HR/igA2W2Ljl1i15zHeo8IqI8kgNnghxaSYGisBAUO5oQWsgGoDV5rNz00MZT3IXkG5NN+Diaep0rJBteaqMYQWD/Nr2A/Oq7f7Q47Z9i378kWQywlSk6M252fRh8+sJLCzMFd9sH/MPIEk1HiX3umZoEdfU4/bULYBL6q8ePXC7wSaW7eOL5b0/za0NwTZRL9UC4uduEQC1t/HWuJ3OB+w==
-      - username: volunteer6
-        comment: sq volunteer
-        authorized_keys: |
-          {{ liw_hetzner_ssh_pub }}
-          ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCqhNi9rrxfK6Rn2rsoJZbBmxWmPoqftMOTf7LD+1K99sOUmwCM+bqoPt7pHl/JsxOpAilfD5lVQ9m+4Xutjtaenf98jnO8Gi3h7xMsUZRaU0T3gCmKq/T1B9N3/YSWosPHAHvRfeu9zr6rJj7gxMAJ7Ab+Ix7t60j6iAGkX+LuyC9VQ5GR1SGC76a3TMHYrgR0VBYohFTzFqhVquubTEtUZrvZy/kNkKb5XvgiCLCNyFfO1huq/c3hDFUnQvP6/0MSGJq/FRqwPdLLOcRDaBQpw942JC0Xh0+0qOJVIpdRfdM/83NBsBIJKNqR2eWYHoW2brTKjxHPsRNtKjn6AgKj
-          ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDYbT9Mw8v+C2SdqjFhWCmR2IrurUoZJBxTw1WsO1JkcXdcl7PX/jaQoVlAolI3P2iF9wHO9SwG8LLRObjtjOWzHOGtk+GGwRpxFYgu2a+y3mSu50UwOCJeROWerVfra0/E0JuWkAWAlVzrfcBApXx+g/IY/gH9jb4/ErEqysAE4BcsQSQ25FgtZVj97emSW1Ozzd68X7i6i6KX9W778Guq9XOxS7n+hX+0+yCibMBvW+hBK9HhJba5QvQtZ6msaw9wvWWbfr0T3IknrbRhZAGoNcQ0DW++vrv2+8pvOhcTdXIWsNF/WFIqBAcZmFHR6iKZAnx/pxW2ZM4N+IPT4zX12PsMWPZQqBQxMXy/MIEsAby/NlMK9XO3L1K8WqOqLwnjIJ0YUbsaTkaE1REHY17LuQgmu2UXm4cpTHyzEVBz48PeCh6jqoP4Wd/YQ+VtLZiSqjsP7leU9mvd06mFoBk/z4KeaM7dKqWTUxwwXRJ0HDTb3CaYgy3GF+FtZWAcsKv6X32GEV8lYsrOFSUPXUhPuoJZR12BLuJRCv2kk7rlIjVIAZjG0r84PRWKgNXNmFW9dtpnQmaZnOqeLwIBepQsdb2I5NWUItg4YUp3M8Ne/+KAywH5Zx9FHjCn4PNNKYoYKLYb1D/FW03UECa2Jv+ygi+1iYNgUA8uA4CX2vYXEw==
-      - username: volunteer7
-        comment: sq volunteer
-        authorized_keys: |
-          {{ liw_hetzner_ssh_pub }}
-#          ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOZAUtpJZ3I3alPpJuvAqsjixoO+WWRxFTKauJKe2Lup
diff --git a/ansible/obnam-bench.yml b/ansible/obnam-bench.yml
index 7b5c393..8e3c84d 100644
--- a/ansible/obnam-bench.yml
+++ b/ansible/obnam-bench.yml
@@ -39,8 +39,8 @@
       - repo: |
           deb http://security.debian.org/debian-security buster/updates main
 
-      - repo: deb http://ci-prod-controller.vm.liw.fi/debian unstable-ci main
-        signing_key: "{{ ci_prod_signing_key }}"
+      - repo: deb http://apt.liw.fi/debian unstable-ci main
+        signing_key: "{{ apt_liw_fi_signing_key }}"
 
     unix_users_version: 2
     unix_users:
diff --git a/ansible/obnam-dev.yml b/ansible/obnam-dev.yml
index a444e64..9656810 100644
--- a/ansible/obnam-dev.yml
+++ b/ansible/obnam-dev.yml
@@ -56,8 +56,8 @@
       - repo: |
           deb http://security.debian.org/debian-security buster/updates main
 
-      - repo: deb http://ci-prod-controller.vm.liw.fi/debian unstable-ci main
-        signing_key: "{{ ci_prod_signing_key }}"
+      - repo: deb http://apt.liw.fi/debian unstable-ci main
+        signing_key: "{{ apt_liw_fi_signing_key }}"
 
     unix_users_version: 2
     unix_users:
diff --git a/ansible/riki-dev.yml b/ansible/riki-dev.yml
index 26e8e81..7a5ad32 100644
--- a/ansible/riki-dev.yml
+++ b/ansible/riki-dev.yml
@@ -37,8 +37,8 @@
       - repo: |
           deb http://security.debian.org/debian-security bullseye-security main contrib non-free
 
-      - repo: deb http://ci-prod-controller.vm.liw.fi/debian unstable-ci main
-        signing_key: "{{ ci_prod_signing_key }}"
+      - repo: deb http://apt.liw.fi/debian unstable-ci main
+        signing_key: "{{ apt_liw_fi_signing_key }}"
 
     unix_users_version: 2
     unix_users:
diff --git a/ansible/solace.yml b/ansible/solace.yml
index 12532d7..6d679db 100644
--- a/ansible/solace.yml
+++ b/ansible/solace.yml
@@ -59,8 +59,8 @@
       - repo: |
           deb http://security.debian.org/debian-security bookworm-security main contrib non-free non-free-firmware
 
-      - repo: deb http://ci-prod-controller.vm.liw.fi/debian unstable-ci main
-        signing_key: "{{ ci_prod_signing_key }}"
+      - repo: deb http://apt.liw.fi/debian unstable-ci main
+        signing_key: "{{ apt_liw_fi_signing_key }}"
 
     unix_users_version: 2
     unix_users:
diff --git a/ansible/sshca-dev.yml b/ansible/sshca-dev.yml
index 1ecdb0a..53f49f5 100644
--- a/ansible/sshca-dev.yml
+++ b/ansible/sshca-dev.yml
@@ -48,8 +48,8 @@
         sudo: yes
 
     sane_debian_system_sources_lists:
-      - repo: deb http://ci-prod-controller.vm.liw.fi/debian unstable-ci main
-        signing_key: "{{ ci_prod_signing_key }}"
+      - repo: deb http://apt.liw.fi/debian unstable-ci main
+        signing_key: "{{ apt_liw_fi_signing_key }}"
 
     sshd_version: 1
     sshd_allow_authorized_keys: yes
diff --git a/ansible/stamina.yml b/ansible/stamina.yml
index 094ce4c..713bef1 100644
--- a/ansible/stamina.yml
+++ b/ansible/stamina.yml
@@ -169,8 +169,8 @@
       - repo: |
           deb http://security.debian.org/debian-security bookworm-security main contrib non-free
 
-      - repo: deb http://ci-prod-controller.vm.liw.fi/debian unstable-ci main
-        signing_key: "{{ ci_prod_signing_key }}"
+      - repo: deb http://apt.liw.fi/debian unstable main
+        signing_key: "{{ apt_liw_fi_signing_key }}"
 
     unix_users_version: 2
     unix_users:
diff --git a/ansible/texlive.yml b/ansible/texlive.yml
index 4fc4c7c..7945b5b 100644
--- a/ansible/texlive.yml
+++ b/ansible/texlive.yml
@@ -39,9 +39,6 @@
       - repo: |
           deb http://security.debian.org/debian-security bullseye-security main contrib non-free
 
-      - repo: deb http://ci-prod-controller.vm.liw.fi/debian unstable-ci main
-        signing_key: "{{ ci_prod_signing_key }}"
-
     unix_users_version: 2
     unix_users:
       - username: liw
diff --git a/ansible/v-i-dev.yml b/ansible/v-i-dev.yml
index d092a07..571097a 100644
--- a/ansible/v-i-dev.yml
+++ b/ansible/v-i-dev.yml
@@ -59,8 +59,8 @@
         sudo: yes
 
     sane_debian_system_sources_lists:
-      - repo: deb http://ci-prod-controller.vm.liw.fi/debian unstable-ci main
-        signing_key: "{{ ci_prod_signing_key }}"
+      - repo: deb http://apt.liw.fi/debian unstable-ci main
+        signing_key: "{{ apt_liw_fi_signing_key }}"
       - repo: |
           deb http://deb.debian.org/debian bookworm-backports main contrib non-free
 
diff --git a/ansible/vmadm-dev.yml b/ansible/vmadm-dev.yml
index 4d37461..f103382 100644
--- a/ansible/vmadm-dev.yml
+++ b/ansible/vmadm-dev.yml
@@ -58,8 +58,8 @@
     sane_debian_system_hostname: vmadm-dev
     sane_debian_system_codename: bookworm
     sane_debian_system_sources_lists:
-      - repo: deb http://ci-prod-controller.vm.liw.fi/debian unstable-ci main
-        signing_key: "{{ ci_prod_signing_key }}"
+      - repo: deb http://apt.liw.fi/debian unstable main
+        signing_key: "{{ apt_liw_fi_signing_key }}"
       - repo: |
           deb http://deb.debian.org/debian bookworm-backports main contrib non-free
 
diff --git a/ansible/vmdb2-dev.yml b/ansible/vmdb2-dev.yml
index 0b76943..27c6e7e 100644
--- a/ansible/vmdb2-dev.yml
+++ b/ansible/vmdb2-dev.yml
@@ -64,8 +64,8 @@
         sudo: yes
 
     sane_debian_system_sources_lists:
-      - repo: deb http://ci-prod-controller.vm.liw.fi/debian unstable-ci main
-        signing_key: "{{ ci_prod_signing_key }}"
+      - repo: deb http://apt.liw.fi/debian unstable-ci main
+        signing_key: "{{ apt_liw_fi_signing_key }}"
 
     sshd_version: 1
     sshd_allow_authorized_keys: yes
diff --git a/ansible/web.yml b/ansible/web.yml
index 7088968..aa044b3 100644
--- a/ansible/web.yml
+++ b/ansible/web.yml
@@ -101,8 +101,8 @@
     sane_debian_system_codename: bookworm
     sane_debian_system_mirror: deb.debian.org
     sane_debian_system_sources_lists:
-      - repo: deb http://ci-prod-controller.vm.liw.fi/debian unstable-ci main
-        signing_key: "{{ ci_prod_signing_key }}"
+      - repo: deb http://apt.liw.fi/debian unstable-ci main
+        signing_key: "{{ apt_liw_fi_signing_key }}"
 
     unix_users_version: 2
     unix_users: