diff options
| author | Micah Anderson <micah@riseup.net> | 2013-06-25 16:57:07 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2013-06-25 16:57:07 -0400 |
| commit | 8f58a40ad81b32e1abed80485d388753deafb87b (patch) | |
| tree | 327fb24935966e567675ede5c57bb1b579c63061 /files/squeeze | |
| parent | f11e3d475345059220402a44a97da491c85d2b5a (diff) | |
| parent | 2e3c8fe71cec14411ccee2736f342440a7fedb92 (diff) | |
| download | puppet-apt-8f58a40ad81b32e1abed80485d388753deafb87b.tar.gz puppet-apt-8f58a40ad81b32e1abed80485d388753deafb87b.tar.bz2 | |
Merge branch 'bug/fix_push' into leap
This gets us fixes for the unattended_upgrades in wheezy, as well as the custom_key_dir class parameter replacement of the global variable
Conflicts:
manifests/unattended_upgrades.pp
Diffstat (limited to 'files/squeeze')
| -rw-r--r-- | files/squeeze/50unattended-upgrades | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/files/squeeze/50unattended-upgrades b/files/squeeze/50unattended-upgrades deleted file mode 100644 index 0901ad3..0000000 --- a/files/squeeze/50unattended-upgrades +++ /dev/null @@ -1,14 +0,0 @@ -// this file is managed by puppet ! - -Unattended-Upgrade::Allowed-Origins { - "${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"; |