opuppet/module-apt
4
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge remote-tracking branch 'leap/feature/unattended_upgrades' into review

Browse source 
Conflicts:
	files/lenny/50unattended-upgrades
This commit is contained in:
intrigeri 2013-01-08 13:54:57 +01:00
commit 354283d54e
4 changed files with 30 additions and 97 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
files/50unattended-upgrades Normal file
View file

@ -0,0 +1,20 @@
// this file is managed by puppet !
Unattended-Upgrade::Origins-Pattern {
// Debian
"o=${distro_id},n=${distro_codename}";
"o=${distro_id},n=${distro_codename}-updates";
"o=${distro_id},n=${distro_codename},l=Debian-security";
"o=${distro_id} Backports,n=${distro_codename}-backports";
// Ubuntu specific
"o=${distro_id},a=${distro_codename}-security";
"o=${distro_id},a=${distro_codename}-backports";
"o=${distro_id},a=${distro_codename}-proposed";
};
APT::Periodic::Update-Package-Lists "1";
APT::Periodic::Download-Upgradeable-Packages "1";
APT::Periodic::Unattended-Upgrade "1";
Unattended-Upgrade::Mail "root";
Unattended-Upgrade::MailOnlyOnError "true";

48
files/lenny/50unattended-upgrades
View file

@ -1,57 +1,13 @@
// this file is managed by puppet !
//
//See https://wiki.ubuntu.com/AutomaticUpdates for more details about this feature.
// allowed (origin, archive) pairs
Unattended-Upgrade::Allowed-Origins {
"Debian oldstable";
"Debian-Security oldstable";
// "Debian testing";
};
APT::Periodic::Update-Package-Lists "1";
APT::Periodic::Download-Upgradeable-Packages "1";
APT::Periodic::Unattended-Upgrade "1";
Unattended-Upgrade::Mail "root";
APT::UnattendedUpgrades::LogDir "/var/log/";
APT::UnattendedUpgrades::LogFile "unattended_upgrades.log";
Unattended-Upgrade::Package-Blacklist {
// we don't want the kernel to be updated so nagios still can give a warning if there is
// a manual update (and reboot) left
"linux-image-*";
// unfortunately there seems to be a bug in unattended-upgrades <= 0.62 that wildcards aren't recognized:
//2009-12-11 13:41:43,267 INFO Initial blacklisted packages: linux-image-*
//2009-12-11 13:41:43,267 INFO Starting unattended upgrades script
//2009-12-11 13:41:43,267 INFO Allowed origins are: ["['Debian', 'stable']", "['Debian-Security', 'stable']"]
//2009-12-11 13:41:45,233 INFO Packages that are upgraded: linux-image-2.6.26-2-amd64
//2009-12-11 13:41:45,233 INFO Writing dpkg log to '/var/log/unattended-upgrades-dpkg_2009-12-11_13:41:45.233713.log'
//2009-12-11 13:42:11,988 INFO All upgrades installed
// lenny
"linux-image-2.6.26-1-686";
"linux-image-2.6.26-1-amd64";
"linux-image-2.6.26-1-xen-686";
"linux-image-2.6.26-1-xen-amd64";
"linux-image-2.6.26-1-vserver-686";
"linux-image-2.6.26-1-vserver-amd64";
"linux-image-2.6.26-2-686";
"linux-image-2.6.26-2-amd64";
"linux-image-2.6.26-2-xen-686";
"linux-image-2.6.26-2-xen-amd64";
"linux-image-2.6.26-2-vserver-686";
"linux-image-2.6.26-2-vserver-amd64";
// squeeze
"linux-image-2.6.32-5-686";
"linux-image-2.6.32-5-amd64";
"linux-image-2.6.32-5-xen-686";
"linux-image-2.6.32-5-xen-amd64";
"linux-image-2.6.32-5-vserver-686";
"linux-image-2.6.32-5-vserver-amd64";
};

56
files/squeeze/50unattended-upgrades
View file

@ -1,58 +1,14 @@
// this file is managed by puppet !
//
//See https://wiki.ubuntu.com/AutomaticUpdates for more details about this feature.
// allowed (origin, archive) pairs
Unattended-Upgrade::Allowed-Origins {
"Debian stable";
"Debian-Security stable";
// "Debian testing";
"${distro_id}:stable";
"${distro_id}:${distro_codename}-security";
"${distro_id}:${distro_codename}-updates";
"${distro_id} Backports:${distro_codename}-backports";
};
APT::Periodic::Update-Package-Lists "1";
APT::Periodic::Download-Upgradeable-Packages "1";
APT::Periodic::Unattended-Upgrade "1";
Unattended-Upgrade::Mail "root";
Unattended-Upgrade::MailOnlyOnError "true";
APT::UnattendedUpgrades::LogDir "/var/log/";
APT::UnattendedUpgrades::LogFile "unattended_upgrades.log";
Unattended-Upgrade::Package-Blacklist {
// we don't want the kernel to be updated so nagios still can give a warning if there is
// a manual update (and reboot) left
"linux-image-*";
// unfortunately there seems to be a bug in unattended-upgrades <= 0.62 that wildcards aren't recognized:
//2009-12-11 13:41:43,267 INFO Initial blacklisted packages: linux-image-*
//2009-12-11 13:41:43,267 INFO Starting unattended upgrades script
//2009-12-11 13:41:43,267 INFO Allowed origins are: ["['Debian', 'stable']", "['Debian-Security', 'stable']"]
//2009-12-11 13:41:45,233 INFO Packages that are upgraded: linux-image-2.6.26-2-amd64
//2009-12-11 13:41:45,233 INFO Writing dpkg log to '/var/log/unattended-upgrades-dpkg_2009-12-11_13:41:45.233713.log'
//2009-12-11 13:42:11,988 INFO All upgrades installed
// lenny
"linux-image-2.6.26-1-686";
"linux-image-2.6.26-1-amd64";
"linux-image-2.6.26-1-xen-686";
"linux-image-2.6.26-1-xen-amd64";
"linux-image-2.6.26-1-vserver-686";
"linux-image-2.6.26-1-vserver-amd64";
"linux-image-2.6.26-2-686";
"linux-image-2.6.26-2-amd64";
"linux-image-2.6.26-2-xen-686";
"linux-image-2.6.26-2-xen-amd64";
"linux-image-2.6.26-2-vserver-686";
"linux-image-2.6.26-2-vserver-amd64";
// squeeze
"linux-image-2.6.32-5-686";
"linux-image-2.6.32-5-amd64";
"linux-image-2.6.32-5-xen-686";
"linux-image-2.6.32-5-xen-amd64";
"linux-image-2.6.32-5-vserver-686";
"linux-image-2.6.32-5-vserver-amd64";
};

3
manifests/unattended_upgrades.pp
View file

@ -9,7 +9,8 @@ class apt::unattended_upgrades {
source => [
"puppet:///modules/site_apt/${::lsbdistcodename}/50unattended-upgrades",
'puppet:///modules/site_apt/50unattended-upgrades',
"puppet:///modules/apt/${::lsbdistcodename}/50unattended-upgrades" ],
"puppet:///modules/apt/${::lsbdistcodename}/50unattended-upgrades",
'puppet:///modules/apt/50unattended-upgrades' ],
require => Package['unattended-upgrades'],
}