aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2012-03-21 12:46:05 -0300
committerSilvio Rhatto <rhatto@riseup.net>2012-03-21 12:46:05 -0300
commitc6f3ca00395aaae6527e0d7149212e4816a36be1 (patch)
treea60ceed203557272f9c01cec4c0a085f559845ef
parentc967da9a93ec930faa85db1345e37b6135cddcf8 (diff)
parent66433e665e611f305b0f65c61558a0ec8232da00 (diff)
downloadpuppet-apt-c6f3ca00395aaae6527e0d7149212e4816a36be1.tar.gz
puppet-apt-c6f3ca00395aaae6527e0d7149212e4816a36be1.tar.bz2
Merge branch 'master' of git://labs.riseup.net/shared-apt
-rw-r--r--files/50unattended-upgrades1
l---------templates/Debian/apticron_sid.erb1
l---------templates/Debian/listchanges_sid.erb1
3 files changed, 3 insertions, 0 deletions
diff --git a/files/50unattended-upgrades b/files/50unattended-upgrades
index fbab858..46fc0dc 100644
--- a/files/50unattended-upgrades
+++ b/files/50unattended-upgrades
@@ -12,6 +12,7 @@ Unattended-Upgrade::Allowed-Origins {
APT::Periodic::Update-Package-Lists "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";
diff --git a/templates/Debian/apticron_sid.erb b/templates/Debian/apticron_sid.erb
new file mode 120000
index 0000000..a9a3a6f
--- /dev/null
+++ b/templates/Debian/apticron_sid.erb
@@ -0,0 +1 @@
+apticron_wheezy.erb \ No newline at end of file
diff --git a/templates/Debian/listchanges_sid.erb b/templates/Debian/listchanges_sid.erb
new file mode 120000
index 0000000..74ab496
--- /dev/null
+++ b/templates/Debian/listchanges_sid.erb
@@ -0,0 +1 @@
+listchanges_lenny.erb \ No newline at end of file