diff options
| author | intrigeri <intrigeri@boum.org> | 2015-02-28 12:34:54 +0000 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2015-02-28 12:34:54 +0000 |
| commit | 31f8661eea49b05f32ccca4ad3d628548ba54b77 (patch) | |
| tree | 93020168f8979b317c3a7c93e2b8ec154078385a /files/Debian | |
| parent | 7c55bee06ab952c914b3a367f495e36a2539807f (diff) | |
| parent | 8ed07cac2f084bfe542f4978daa783aedd7e79b4 (diff) | |
Merge branch 'master' into 'master'
Merge with cmaisonnneuve and immerda
See merge request !4
Diffstat (limited to 'files/Debian')
| -rw-r--r-- | files/Debian/50unattended-upgrades | 6 | ||||
| -rw-r--r-- | files/Debian/50unattended-upgrades.squeeze | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/files/Debian/50unattended-upgrades b/files/Debian/50unattended-upgrades index 88f4ab8..075f680 100644 --- a/files/Debian/50unattended-upgrades +++ b/files/Debian/50unattended-upgrades @@ -1,10 +1,8 @@ // this file is managed by puppet ! Unattended-Upgrade::Origins-Pattern { -// "o=Debian,n=${distro-codename}"; -// "o=Debian,n=${distro-codename}-updates"; -// "o=Debian,n=${distro_codename}-proposed-updates"; - "o=Debian,n=${distro_codename},l=Debian-Security"; + "o=Debian,a=oldstable,l=Debian-Security"; + "o=Debian,a=stable,l=Debian-Security"; } APT::Periodic::Update-Package-Lists "1"; diff --git a/files/Debian/50unattended-upgrades.squeeze b/files/Debian/50unattended-upgrades.squeeze index e7ba290..77f715d 100644 --- a/files/Debian/50unattended-upgrades.squeeze +++ b/files/Debian/50unattended-upgrades.squeeze @@ -3,8 +3,8 @@ Unattended-Upgrade::Allowed-Origins { // "${distro-id} oldstable"; // "${distro_id} ${distro_codename}-backports"; - "${distro-id} ${distro-codename}-security"; - "${distro-id} ${distro-codename}-lts"; + "${distro_id} ${distro_codename}-security"; + "${distro_id} ${distro_codename}-lts"; }; APT::Periodic::Update-Package-Lists "1"; |