make it possible to opt out of MailOnlyOnError

This combines all files into one template. It should make maintenance
easier.

3 files changed, 0 insertions, 42 deletions

diff --git a/files/Debian/50unattended-upgrades b/files/Debian/50unattended-upgrades
deleted file mode 100644
index 075f680..0000000
--- a/files/Debian/50unattended-upgrades
+++ /dev/null
@@ -1,12 +0,0 @@
-// this file is managed by puppet !
-
-Unattended-Upgrade::Origins-Pattern {
-        "o=Debian,a=oldstable,l=Debian-Security";
-        "o=Debian,a=stable,l=Debian-Security";
-}
-
-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.squeeze b/files/Debian/50unattended-upgrades.squeeze
deleted file mode 100644
index 77f715d..0000000
--- a/files/Debian/50unattended-upgrades.squeeze
+++ /dev/null
@@ -1,14 +0,0 @@
-// this file is managed by puppet !
-
-Unattended-Upgrade::Allowed-Origins {
-//  "${distro-id} oldstable";
-//  "${distro_id} ${distro_codename}-backports";
-    "${distro_id} ${distro_codename}-security";
-    "${distro_id} ${distro_codename}-lts";
-};
-
-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
deleted file mode 100644
index 25c7758..0000000
--- a/files/Ubuntu/50unattended-upgrades
+++ /dev/null
@@ -1,16 +0,0 @@
-// 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";