From 86d88a43555252b1393bf2b7a919d32a6e77fbcd Mon Sep 17 00:00:00 2001
From: Franziska Kunsmann <hi@kunsmann.eu>
Date: Sat, 23 May 2020 17:01:30 +0200
Subject: [PATCH] fix apt unattended-upgrades

---
 bundles/apt/files/apt.conf-unattended-upgrades |  4 ++--
 bundles/jenkins-ci/metadata.py                 |  4 ++--
 bundles/matrix-synapse/metadata.py             |  4 ++--
 bundles/nginx/metadata.py                      |  4 ++--
 bundles/nodejs/metadata.py                     |  6 +++---
 nodes/htz/ex42-1048908.py                      | 12 +++++-------
 6 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/bundles/apt/files/apt.conf-unattended-upgrades b/bundles/apt/files/apt.conf-unattended-upgrades
index 7a31cb8..e17af62 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('sites', set())):
-        "site=${item}";
+% for item in sorted(data.get('origins', set())):
+        "${item}";
 % endfor
 };
 
diff --git a/bundles/jenkins-ci/metadata.py b/bundles/jenkins-ci/metadata.py
index 8d1fcdf..9a39094 100644
--- a/bundles/jenkins-ci/metadata.py
+++ b/bundles/jenkins-ci/metadata.py
@@ -11,8 +11,8 @@ def nodejs_apt_repos(metadata):
                 },
             },
             'unattended-upgrades': {
-                'sites': {
-                    'pkg.jenkins.io',
+                'origins': {
+                    'o=jenkins.io,a=binary',
                 },
             },
             'packages': {
diff --git a/bundles/matrix-synapse/metadata.py b/bundles/matrix-synapse/metadata.py
index 0002db3..7b4b10d 100644
--- a/bundles/matrix-synapse/metadata.py
+++ b/bundles/matrix-synapse/metadata.py
@@ -11,8 +11,8 @@ def nodejs_apt_repos(metadata):
                 },
             },
             'unattended-upgrades': {
-                'sites': {
-                    'packages.matrix.org',
+                'origins': {
+                    'o=matrix.org,n=buster,c=main',
                 },
             },
             'packages': {
diff --git a/bundles/nginx/metadata.py b/bundles/nginx/metadata.py
index 98e8a25..0da8995 100644
--- a/bundles/nginx/metadata.py
+++ b/bundles/nginx/metadata.py
@@ -11,8 +11,8 @@ def defaults(metadata):
                 },
             },
             'unattended-upgrades': {
-                'sites': {
-                    'nginx.org',
+                'origins': {
+                    'o=nginx,a=stable,n=buster,l=nginx,c=nginx',
                 },
             },
             'packages': {
diff --git a/bundles/nodejs/metadata.py b/bundles/nodejs/metadata.py
index 9bd1f53..7906b86 100644
--- a/bundles/nodejs/metadata.py
+++ b/bundles/nodejs/metadata.py
@@ -18,9 +18,9 @@ def nodejs_apt_repos(metadata):
                 },
             },
             'unattended-upgrades': {
-                'sites': {
-                    'deb.nodesource.com',
-                    'dl.yarnpkg.com',
+                'origins': {
+                    'o=Node Source,n=buster,l=Node Source,c=main',
+                    'o=yarn,a=stable,n=stable,l=yarn-stable,c=main',
                 },
             },
             'packages': {
diff --git a/nodes/htz/ex42-1048908.py b/nodes/htz/ex42-1048908.py
index c70ba67..a4b8cf0 100644
--- a/nodes/htz/ex42-1048908.py
+++ b/nodes/htz/ex42-1048908.py
@@ -13,13 +13,11 @@ nodes['htz.ex42-1048908'] = {
     'metadata': {
         'apt': {
             'unattended-upgrades': {
-                'sites': {
-                    'weechat.org',
-                    'rspamd.com',
-                    'artifacts.elastic.co',
-                    'apt.miniflux.app',
-                    'packages.grafana.com',
-                    'packages.matrix.org',
+                'origins': {
+                    'site=weechat.org',
+                    'o=Rspamd,n=buster,l=Rspamd,c=main',
+                    'site=apt.miniflux.app',
+                    'o=grafana stable,a=stable,n=stable,l=grafana stable,c=main',
                 },
             },
         },