From a1e05108c18f182aa3e1671b80da998f5ac53356 Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Sat, 4 Apr 2020 11:21:30 +0200 Subject: [PATCH] bundles/apt: change origins to sites --- bundles/apt/files/apt.conf-unattended-upgrades | 4 ++-- bundles/nginx/metadata.py | 2 +- bundles/riot-web/metadata.py | 2 +- nodes/htz/ex42-1048908.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bundles/apt/files/apt.conf-unattended-upgrades b/bundles/apt/files/apt.conf-unattended-upgrades index fbc3a00..7a31cb8 100644 --- a/bundles/apt/files/apt.conf-unattended-upgrades +++ b/bundles/apt/files/apt.conf-unattended-upgrades @@ -3,8 +3,8 @@ Unattended-Upgrade::Origins-Pattern { "origin=Debian,codename=${node.metadata['os_release']},label=Debian-Security"; // External packages -% for item in sorted(data.get('origins', set())): - "origin=${item}"; +% for item in sorted(data.get('sites', set())): + "site=${item}"; % endfor }; diff --git a/bundles/nginx/metadata.py b/bundles/nginx/metadata.py index e58e24c..0cf3518 100644 --- a/bundles/nginx/metadata.py +++ b/bundles/nginx/metadata.py @@ -11,7 +11,7 @@ def nginx_apt_repo(metadata): }, }, 'unattended-upgrades': { - 'origins': { + 'sites': { 'nginx.org', }, }, diff --git a/bundles/riot-web/metadata.py b/bundles/riot-web/metadata.py index 52a9058..4b15b82 100644 --- a/bundles/riot-web/metadata.py +++ b/bundles/riot-web/metadata.py @@ -18,7 +18,7 @@ def nodejs_apt_repos(metadata): }, }, 'unattended-upgrades': { - 'origins': { + 'sites': { 'deb.nodesource.com', 'dl.yarnpkg.com', }, diff --git a/nodes/htz/ex42-1048908.py b/nodes/htz/ex42-1048908.py index 6da5a77..d7c53ba 100644 --- a/nodes/htz/ex42-1048908.py +++ b/nodes/htz/ex42-1048908.py @@ -8,7 +8,7 @@ nodes['htz.ex42-1048908'] = { 'metadata': { 'apt': { 'unattended-upgrades': { - 'origins': { + 'sites': { 'weechat.org', 'rspamd.com', 'nginx.org',