diff --git a/ansible/inventory/host_vars/london-b.yml b/ansible/inventory/host_vars/london-b.yml index 9b8f2c9..c446391 100644 --- a/ansible/inventory/host_vars/london-b.yml +++ b/ansible/inventory/host_vars/london-b.yml @@ -20,9 +20,6 @@ snap_services: apt_user_services: - syncthing@pez -# Third-party apt repos (deployed by common role). The lunar -> noble upgrade -# disabled all of them (PESO-160). Plex moved to repo.plex.tv with a new key; -# the old downloads.plex.tv repo stopped at 1.42.2. common_apt_repositories: - name: tailscale uris: https://pkgs.tailscale.com/stable/ubuntu @@ -40,9 +37,6 @@ common_apt_repositories: components: main signed_by: https://downloads.plex.tv/plex-keys/PlexSign.v2.key -# Leftovers from the upgrade. Sonarr v3 (apt.sonarr.tv) and its mono repo are -# dead ends, nvidia-container-toolkit isn't used by Docker here, and datadog -# is retired, so those repos go without replacements. common_apt_cleanup_files: - /etc/apt/sources.list.d/datadog.list.distUpgrade - /etc/apt/sources.list.d/graphics-drivers-ubuntu-ppa-lunar.list.distUpgrade diff --git a/ansible/roles/common/defaults/main.yml b/ansible/roles/common/defaults/main.yml index 9d7bbec..c2e60b4 100644 --- a/ansible/roles/common/defaults/main.yml +++ b/ansible/roles/common/defaults/main.yml @@ -6,9 +6,5 @@ common_ufw_allowed_ports: [] # - {port: 80, proto: tcp, comment: "HTTP"} # - {port: 443, proto: tcp, comment: "HTTPS"} -# Third-party apt repositories, written as deb822 .sources files. -# Each item needs name, uris, suites, components and signed_by (key URL). common_apt_repositories: [] - -# Leftover apt source and keyring files to delete, e.g. after a release upgrade. common_apt_cleanup_files: [] diff --git a/ansible/roles/common/tasks/main.yml b/ansible/roles/common/tasks/main.yml index dff22dc..3268b85 100644 --- a/ansible/roles/common/tasks/main.yml +++ b/ansible/roles/common/tasks/main.yml @@ -20,10 +20,6 @@ force: true when: common_github_cli_source.stat.exists -# Third-party apt repos are declared per host in common_apt_repositories. A -# release upgrade disables them silently (london-b's lunar -> noble upgrade -# left tailscale, jellyfin and plex frozen for a year), so they live in code. -# A URL in signed_by is fetched into /etc/apt/keyrings by deb822_repository. - name: Install deb822_repository dependency ansible.builtin.apt: name: python3-debian @@ -50,7 +46,6 @@ loop: "{{ common_apt_cleanup_files }}" register: common_apt_cleanup_result -# Refresh straight away when the sources changed, otherwise at most hourly. - name: Update apt cache ansible.builtin.apt: update_cache: true