Mercurial > code > home > repos > infra
diff apt.py @ 187:466108f0a509
redo pkg keys and future podman 4.3.1 version
author | drewp@bigasterisk.com |
---|---|
date | Sat, 15 Apr 2023 00:51:21 -0700 |
parents | 6ec7cd3615f0 |
children | 087b84e68765 |
line wrap: on
line diff
--- a/apt.py Fri Apr 07 17:23:20 2023 -0700 +++ b/apt.py Sat Apr 15 00:51:21 2023 -0700 @@ -7,38 +7,18 @@ def pkg_keys(): - # apt.key(keyserver='keyserver.ubuntu.com', keyid='04EE7237B7D453EC') - # apt.key(keyserver='keyserver.ubuntu.com', keyid='648ACFD622F3D138') - # apt.key(keyserver='keyserver.ubuntu.com', keyid='8B48AD6246925553') - # apt.key(keyserver='keyserver.ubuntu.com', keyid='F24AEA9FB05498B7') - # if host.name != 'prime': - # apt.key(keyserver='keyserver.ubuntu.com', keyid='D0392EC59F9583BA') - # apt.key(src='https://dl.google.com/linux/linux_signing_key.pub') - # apt.key(src='https://ftp-master.debian.org/keys/archive-key-8-security.asc') - # apt.key(src='https://ftp-master.debian.org/keys/archive-key-8.asc') - # apt.key(src='https://ftp-master.debian.org/keys/archive-key-9-security.asc') - # apt.key(src='https://packages.microsoft.com/keys/microsoft.asc') - # apt.key(src='https://deb.nodesource.com/gpgkey/nodesource.gpg.key') - - apt.key(keyserver='keyserver.ubuntu.com', keyid='1655A0AB68576280') - files.directory(path='/etc/apt/keyrings/') # for raspi for url, name in [ ('https://repo.steampowered.com/steam/archive/stable/steam.gpg', 'steam.gpg'), - ('https://deb.nodesource.com/node_18.x/dists/kinetic/Release.gpg', 'nodesource-kinetic.gpg'), - ('http://packages.microsoft.com/ubuntu/22.10/prod/dists/kinetic/Release.gpg', 'ms.gpg'), - ('https://download.opensuse.org/repositories/devel:kubic:libcontainers:unstable/Debian_Unstable/Release.key', - 'podman.gpg'), - ('https://dl.google.com/linux/linux_signing_key.pub', 'chrome.gpg'), - ('https://deb.nodesource.com/gpgkey/nodesource.gpg.key', 'nodesource.gpg'), ]: files.download(src=url, dest=f'/etc/apt/keyrings/{name}') - # server.shell(commands=[ - # f"curl -fsSL {url} | gpg --dearmor > /etc/apt/keyrings/{name}" for (url, name) in [ - # # ('https://deb.nodesource.com/node_18.x/dists/kinetic/Release.gpg', 'nodesource-kinetic.gpg'), - # # ('http://packages.microsoft.com/ubuntu/22.10/prod/dists/kinetic/Release.gpg', 'ms.gpg'), - # ] - # ]) + server.shell(commands=[ + f"curl -fsSL {url} | gpg --dearmor > /etc/apt/keyrings/{name}" for (url, name) in [ + ('https://packages.microsoft.com/keys/microsoft.asc', 'ms.gpg'), + ('https://deb.nodesource.com/gpgkey/nodesource.gpg.key', 'nodesource.gpg'), + ('https://dl.google.com/linux/linux_signing_key.pub', 'chrome.gpg'), + ] + ]) def apt_sources(): @@ -49,7 +29,7 @@ if host.get_fact(FindFiles, '/etc/apt/sources.list.d/', quote_path=True): raise SystemExit(f"new files in {host.name} /etc/apt/sources.list.d/ - please remove") apt.packages(update=True, - cache_time=86400, + cache_time=86400, packages=['tzdata'], force=True, _env={ @@ -60,4 +40,4 @@ pkg_keys() -apt_sources() \ No newline at end of file +apt_sources()