Details
Details
- Reviewers
vsellier - Group Reviewers
System administrators - Maniphest Tasks
- T3749: Migrate hedgedoc stack to bullseye
- Commits
- rSPSITE10329235fe05: unattended-upgrade: Use internal distro_codename variable
Actual equivalent change on worker0.internal.staging.swh.network does not seem to disturb the unattended-upgrade cli call as well.
octo-diff:
$SWH_PUPPET_ENVIRONMENT_HOME/bin/octocatalog-diff --octocatalog-diff-args --no-truncate-details --to staging rp1.internal.admin.swh.network
...
*** Running octocatalog-diff on host rp1.internal.admin.swh.network
I, [2021-11-24T12:06:39.781370 #1048624] INFO -- : Catalogs compiled for rp1.internal.admin.swh.network
I, [2021-11-24T12:06:40.088522 #1048624] INFO -- : Diffs computed for rp1.internal.admin.swh.network
diff origin/production/rp1.internal.admin.swh.network current/rp1.internal.admin.swh.network
*******************************************
Apt::Conf[unattended-upgrades] =>
parameters =>
content =>
@@ -5,10 +5,10 @@
// pocket these get automatically pulled in.
Unattended-Upgrade::Origins-Pattern {
- "o=Debian,n=buster";
- "o=Debian,n=buster-updates";
- "o=Debian,n=buster,l=Debian-Security";
- "o=debian icinga-buster,n=icinga-buster";
- "o=Debian Azure,n=buster";
- "o=Proxmox,n=buster";
+ "o=Debian,codename=${distro_codename}";
+ "o=Debian,codename=${distro_codename}-updates";
+ "o=Debian,codename=${distro_codename},l=Debian-Security";
+ "o=debian icinga-stable,codename=icinga-${distro-codename}";
+ "o=Debian Azure,codename=${distro_codename}";
+ "o=Proxmox,codename=${distro_codename}";
"o=packages.sury.org";
};
*******************************************
Apt::Setting[conf-unattended-upgrades] =>
parameters =>
content =>
@@ -6,10 +6,10 @@
// pocket these get automatically pulled in.
Unattended-Upgrade::Origins-Pattern {
- "o=Debian,n=buster";
- "o=Debian,n=buster-updates";
- "o=Debian,n=buster,l=Debian-Security";
- "o=debian icinga-buster,n=icinga-buster";
- "o=Debian Azure,n=buster";
- "o=Proxmox,n=buster";
+ "o=Debian,codename=${distro_codename}";
+ "o=Debian,codename=${distro_codename}-updates";
+ "o=Debian,codename=${distro_codename},l=Debian-Security";
+ "o=debian icinga-stable,codename=icinga-${distro-codename}";
+ "o=Debian Azure,codename=${distro_codename}";
+ "o=Proxmox,codename=${distro_codename}";
"o=packages.sury.org";
};
*******************************************
File[/etc/apt/apt.conf.d/50unattended-upgrades] =>
parameters =>
content =>
@@ -6,10 +6,10 @@
// pocket these get automatically pulled in.
Unattended-Upgrade::Origins-Pattern {
- "o=Debian,n=buster";
- "o=Debian,n=buster-updates";
- "o=Debian,n=buster,l=Debian-Security";
- "o=debian icinga-buster,n=icinga-buster";
- "o=Debian Azure,n=buster";
- "o=Proxmox,n=buster";
+ "o=Debian,codename=${distro_codename}";
+ "o=Debian,codename=${distro_codename}-updates";
+ "o=Debian,codename=${distro_codename},l=Debian-Security";
+ "o=debian icinga-stable,codename=icinga-${distro-codename}";
+ "o=Debian Azure,codename=${distro_codename}";
+ "o=Proxmox,codename=${distro_codename}";
"o=packages.sury.org";
};
*******************************************
*** End octocatalog-diff on rp1.internal.admin.swh.networkDiff Detail
Diff Detail
- Repository
- rSPSITE puppet-swh-site
- Lint
Automatic diff as part of commit; lint not applicable. - Unit
Automatic diff as part of commit; unit tests not applicable.
Event Timeline
Comment Actions
LGTM
https://github.com/mvo5/unattended-upgrades/blob/5d05cd182325bad80558df53968a06c119f60746/data/50unattended-upgrades.Debian#L13
'n' is an alias for 'codename' so everything should be ok