Modernize Tailscale apt key / install routine

Author: holta

roles/kolibri/tasks/install.yml

@@ -104,8 +104,8 @@
 # https://kolibri.readthedocs.io/en/latest/install/ubuntu-debian.html
 - name: Add signed Kolibri PPA {{ kolibri_suite }}
   template:
-    src: kolibri_ubuntu.sources.j2
-    dest: /etc/apt/sources.list.d/kolibri_ubuntu.sources
+    src: kolibri.sources.j2
+    dest: /etc/apt/sources.list.d/kolibri.sources
 #  apt_repository:
 #    repo: "deb [signed-by=/usr/share/keyrings/learningequality-kolibri.gpg] http://ppa.launchpad.net/learningequality/kolibri/ubuntu jammy main"
 #   when: is_ubuntu and os_ver is version('ubuntu-2204', '>=') or is_linuxmint_21 or is_debian_12

…ibri/templates/kolibri_ubuntu.sources.j2 …les/kolibri/templates/kolibri.sources.j2roles/kolibri/templates/kolibri_ubuntu.sources.j2 renamed to roles/kolibri/templates/kolibri.sources.j2 roles/kolibri/templates/kolibri_ubuntu.sources.j2 renamed to roles/kolibri/templates/kolibri.sources.j2

@@ -3,10 +3,13 @@
   register: df1
 
 
-- name: "Set up apt source (jammy) in /etc/apt/sources.list.d/tailscale.list and its key /usr/share/keyrings/tailscale-archive-keyring.gpg, to install Tailscale"
-  shell: |
-    curl -fsSL https://pkgs.tailscale.com/stable/ubuntu/jammy.noarmor.gpg > /usr/share/keyrings/tailscale-archive-keyring.gpg
-    curl -fsSL https://pkgs.tailscale.com/stable/ubuntu/jammy.tailscale-keyring.list > /etc/apt/sources.list.d/tailscale.list
+- name: Download signing key to /etc/apt/keyrings/tailscale.gpg, to install Tailscale
+  shell: curl -fsSL https://pkgs.tailscale.com/stable/ubuntu/noble.noarmor.gpg > /etc/apt/keyrings/tailscale.gpg
+
+- name: Create /etc/apt/sources.list.d/tailscale.sources from template
+  template:
+    src: tailscale.sources
+    dest: /etc/apt/sources.list.d/tailscale.sources
 
 - name: "Install packages: jq, sudo, tailscale"
   package:

roles/tailscale/tasks/install.yml

@@ -0,0 +1,5 @@
+Types: deb
+URIs: https://pkgs.tailscale.com/stable/ubuntu/
+Suites: noble
+Components: main
+Signed-By: /etc/apt/keyrings/tailscale.gpg

roles/tailscale/templates/tailscale.sources

@@ -3,15 +3,15 @@
   register: df1
 
 
-- name: Yarn | Download apt key to /usr/share/keyrings/yarn.gpg
+- name: Yarn | Download apt key to /etc/apt/keyrings/yarn.gpg
   shell: curl https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor > /etc/apt/keyrings/yarn.gpg
 
 - name: Remove stale apt .list
   file:
     path: /etc/apt/sources.list.d/dl_yarnpkg_com_debian.list
     state: absent
 
-- name: Yarn | Add signed Yarn PPA to /etc/apt/sources.list.d/dl_yarnpkg_com_debian.list
+- name: Yarn | Add signed Yarn PPA to /etc/apt/sources.list.d/yarn.sources
   #apt_repository:
   #  repo: "deb [signed-by=/usr/share/keyrings/yarn.gpg] https://dl.yarnpkg.com/debian/ stable main"
     #filename: yarn    # If legacy filename yarn.list is preferred