aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--files/50unattended-upgrades20
-rw-r--r--files/Debian/50unattended-upgrades (renamed from files/squeeze/50unattended-upgrades)0
-rw-r--r--files/Debian/50unattended-upgrades.lenny (renamed from files/lenny/50unattended-upgrades)0
-rw-r--r--files/Debian/50unattended-upgrades.squeeze13
-rw-r--r--files/Debian/50unattended-upgrades.wheezy14
-rw-r--r--files/Ubuntu/50unattended-upgrades16
-rw-r--r--manifests/unattended_upgrades.pp8
7 files changed, 47 insertions, 24 deletions
diff --git a/files/50unattended-upgrades b/files/50unattended-upgrades
deleted file mode 100644
index 329c95c..0000000
--- a/files/50unattended-upgrades
+++ /dev/null
@@ -1,20 +0,0 @@
-// this file is managed by puppet !
-
-Unattended-Upgrade::Origins-Pattern {
- // Debian
- "${distro_id} ${distro_codename}";
- "${distro_id} ${distro_codename}-updates";
- "${distro_id} ${distro_codename}-security";
- "${distro_id} Backports:${distro_codename}-backports";
- // Ubuntu specific
- "${distro_id} ${distro_codename}-security";
- "${distro_id} ${distro_codename}-backports";
- "${distro_id} ${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/squeeze/50unattended-upgrades b/files/Debian/50unattended-upgrades
index 0901ad3..0901ad3 100644
--- a/files/squeeze/50unattended-upgrades
+++ b/files/Debian/50unattended-upgrades
diff --git a/files/lenny/50unattended-upgrades b/files/Debian/50unattended-upgrades.lenny
index d55bb29..d55bb29 100644
--- a/files/lenny/50unattended-upgrades
+++ b/files/Debian/50unattended-upgrades.lenny
diff --git a/files/Debian/50unattended-upgrades.squeeze b/files/Debian/50unattended-upgrades.squeeze
new file mode 100644
index 0000000..38da1f4
--- /dev/null
+++ b/files/Debian/50unattended-upgrades.squeeze
@@ -0,0 +1,13 @@
+// this file is managed by puppet !
+
+Unattended-Upgrade::Allowed-Origins {
+ "${distro_id} stable";
+ "${distro_id} ${distro_codename}-security";
+ "${distro_id} ${distro_codename}-backports";
+};
+
+APT::Periodic::Update-Package-Lists "1";
+APT::Periodic::Download-Upgradeable-Packages "1";
+APT::Periodic::Unattended-Upgrade "1";
+
+Unattended-Upgrade::Mail "root";
diff --git a/files/Debian/50unattended-upgrades.wheezy b/files/Debian/50unattended-upgrades.wheezy
new file mode 100644
index 0000000..4463406
--- /dev/null
+++ b/files/Debian/50unattended-upgrades.wheezy
@@ -0,0 +1,14 @@
+// this file is managed by puppet !
+
+Unattended-Upgrade::Allowed-Origins {
+ "${distro_id}:testing";
+ "${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";
diff --git a/files/Ubuntu/50unattended-upgrades b/files/Ubuntu/50unattended-upgrades
new file mode 100644
index 0000000..25c7758
--- /dev/null
+++ b/files/Ubuntu/50unattended-upgrades
@@ -0,0 +1,16 @@
+// this file is managed by puppet !
+
+Unattended-Upgrade::Allowed-Origins {
+ "${distro_id}:${distro_codename}-security";
+ "${distro_id}:${distro_codename}-updates";
+ "${distro_id}:${distro_codename}-backports";
+ //"${distro_id}:${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/manifests/unattended_upgrades.pp b/manifests/unattended_upgrades.pp
index c538831..f74fc81 100644
--- a/manifests/unattended_upgrades.pp
+++ b/manifests/unattended_upgrades.pp
@@ -7,10 +7,10 @@ class apt::unattended_upgrades {
apt_conf { '50unattended-upgrades':
source => [
- "puppet:///modules/site_apt/${::lsbdistcodename}/50unattended-upgrades",
- 'puppet:///modules/site_apt/50unattended-upgrades',
- "puppet:///modules/apt/${::lsbdistcodename}/50unattended-upgrades",
- 'puppet:///modules/apt/50unattended-upgrades' ],
+ "puppet:///modules/site_apt/${::lsbdistid}/50unattended-upgrades.${::lsbdistcodename}",
+ "puppet:///modules/site_apt/${::lsbdistid}/50unattended-upgrades",
+ "puppet:///modules/apt/${::lsbdistid}/50unattended-upgrades.${::lsbdistcodename}",
+ "puppet:///modules/apt/${::lsbdistid}/50unattended-upgrades" ],
require => Package['unattended-upgrades'],
}