diff options
| author | varac <varacanero@zeromail.org> | 2013-04-14 14:55:15 +0200 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2013-04-14 14:55:15 +0200 |
| commit | cd87ef7ff8a7af82575e2a3b254e469b2da412f2 (patch) | |
| tree | 5c92e64727696c3884babe4615172338a78fc742 /files | |
| parent | dcbf50776f4cb6fc2e1e2a9065e1a7308025d5b9 (diff) | |
| parent | 355372f31cc93ea975c89dc2977d942ee048fe9d (diff) | |
| download | puppet-apt-cd87ef7ff8a7af82575e2a3b254e469b2da412f2.tar.gz puppet-apt-cd87ef7ff8a7af82575e2a3b254e469b2da412f2.tar.bz2 | |
Merge branch 'nadir_issue_4227' into nadir_master
Conflicts:
manifests/unattended_upgrades.pp
Diffstat (limited to 'files')
| -rw-r--r-- | files/50unattended-upgrades | 20 | ||||
| -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.squeeze | 13 | ||||
| -rw-r--r-- | files/Debian/50unattended-upgrades.wheezy | 14 | ||||
| -rw-r--r-- | files/Ubuntu/50unattended-upgrades | 16 |
6 files changed, 43 insertions, 20 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"; |