summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--files/50unattended-upgrades20
-rw-r--r--files/lenny/50unattended-upgrades48
-rw-r--r--files/squeeze/50unattended-upgrades56
-rw-r--r--manifests/unattended_upgrades.pp3
4 files changed, 30 insertions, 97 deletions
diff --git a/files/50unattended-upgrades b/files/50unattended-upgrades
new file mode 100644
index 0000000..ebf9f49
--- /dev/null
+++ b/files/50unattended-upgrades
@@ -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";
diff --git a/files/lenny/50unattended-upgrades b/files/lenny/50unattended-upgrades
index 768bef8..d55bb29 100644
--- a/files/lenny/50unattended-upgrades
+++ b/files/lenny/50unattended-upgrades
@@ -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";
-
-};
+Unattended-Upgrade::Mail "root";
diff --git a/files/squeeze/50unattended-upgrades b/files/squeeze/50unattended-upgrades
index 46fc0dc..0901ad3 100644
--- a/files/squeeze/50unattended-upgrades
+++ b/files/squeeze/50unattended-upgrades
@@ -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";
-
-};
+Unattended-Upgrade::Mail "root";
diff --git a/manifests/unattended_upgrades.pp b/manifests/unattended_upgrades.pp
index d2a2352..c538831 100644
--- a/manifests/unattended_upgrades.pp
+++ b/manifests/unattended_upgrades.pp
@@ -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'],
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-27 15:14:29 +0000