diff --git a/roles/debian/nodejs/defaults/main.yml b/roles/debian/nodejs/defaults/main.yml index 0ae6c011c..82c19edd3 100644 --- a/roles/debian/nodejs/defaults/main.yml +++ b/roles/debian/nodejs/defaults/main.yml @@ -1,7 +1,8 @@ --- nodejs: # Used by apt_unattended_upgrades - apt_origin_nodejs: "origin=Node Source,codename=nodistro,label=Node Source" # nodejs repo + apt_origin_nodejs: "origin=. nodistro,codename=nodistro,label=. nodistro" # nodejs repo + apt_origin_nodejs_v10: "origin=Node Source,codename=${distro_codename},label=Node Source" # nodejs repo apt_signed_by_nodejs: https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key apt_origin_yarn: "origin=yarn,codename=stable,label=yarn-stable" # yarn repo apt_signed_by_yarn: https://dl.yarnpkg.com/debian/pubkey.gpg diff --git a/roles/debian/nodejs/tasks/main.yml b/roles/debian/nodejs/tasks/main.yml index 63a72de32..f875636bd 100644 --- a/roles/debian/nodejs/tasks/main.yml +++ b/roles/debian/nodejs/tasks/main.yml @@ -70,6 +70,15 @@ when: - apt_unattended_upgrades.enable is defined - apt_unattended_upgrades.enable + - nodejs.version != '10.x' + +- name: Add nodejs and yarn repositories to unattended-upgrades origins list. + ansible.builtin.set_fact: + _apt_unattended_upgrades_default_origins: "{{ _apt_unattended_upgrades_default_origins + [nodejs.apt_origin_nodejs_v10, nodejs.apt_origin_yarn] }}" + when: + - apt_unattended_upgrades.enable is defined + - apt_unattended_upgrades.enable + - nodejs.version == '10.x' - name: Install the unattended-upgrades config. ansible.builtin.include_role: