From 3c0499b78d1f671fcce13127ef14b1b662a48c5a Mon Sep 17 00:00:00 2001
From: nadir <nadir-technik@nadir.org>
Date: Sun, 9 Jan 2011 22:57:18 +0100
Subject: apt::custom_sources_template to deploy custom sources.list.d/xyz.list

---
 manifests/custom_sources.pp | 10 ++++++++++
 manifests/init.pp           |  2 ++
 2 files changed, 12 insertions(+)
 create mode 100644 manifests/custom_sources.pp

diff --git a/manifests/custom_sources.pp b/manifests/custom_sources.pp
new file mode 100644
index 0000000..d0c020a
--- /dev/null
+++ b/manifests/custom_sources.pp
@@ -0,0 +1,10 @@
+define apt::custom_sources_template ($sources_file = "") {
+
+  include apt::update
+
+  file { "/etc/apt/sources.list.d/$sources_file":
+            content => template($name),
+	    notify => Exec['apt_updated'] 
+  }
+}
+
diff --git a/manifests/init.pp b/manifests/init.pp
index b5be91f..57f02e9 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -5,6 +5,8 @@
 
 class apt {
 
+  import "custom_sources.pp"
+
   $use_volatile = $apt_volatile_enabled ? {
     ''      => false,
     default => $apt_volatile_enabled,
-- 
cgit v1.2.3


From 75f988242ad96c2bb90ac0956e63d124bea48003 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Sun, 23 Jan 2011 23:33:06 +0100
Subject: preferences.pp for ubuntu maverick

---
 manifests/preferences.pp                  |  2 +-
 templates/Ubuntu/preferences_maverick.erb | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 templates/Ubuntu/preferences_maverick.erb

diff --git a/manifests/preferences.pp b/manifests/preferences.pp
index 4c93542..71ef0a6 100644
--- a/manifests/preferences.pp
+++ b/manifests/preferences.pp
@@ -7,7 +7,7 @@ class apt::preferences {
     content => $custom_preferences ? {
       '' => $operatingsystem ? {
         'debian' => template("apt/${operatingsystem}/preferences_${codename}.erb"),
-        'ubuntu' => '',
+        'ubuntu' => template("apt/${operatingsystem}/preferences_${codename}.erb"),
       },
       default => $custom_preferences
     },
diff --git a/templates/Ubuntu/preferences_maverick.erb b/templates/Ubuntu/preferences_maverick.erb
new file mode 100644
index 0000000..977a7e2
--- /dev/null
+++ b/templates/Ubuntu/preferences_maverick.erb
@@ -0,0 +1,19 @@
+Explanation: Ubuntu <%= codename %>
+Package: *
+Pin: release o=Ubuntu,a=<%= release %>,v=<%= release_version %>*
+Pin-Priority: 990
+
+Explanation: Ubuntu backports
+Package: *
+Pin: release a=<%= codename %>-backports
+Pin-Priority: 200
+
+Explanation: Ubuntu <%= next_release %>
+Package: *
+Pin: release o=Ubuntu,a=<%= next_release %>
+Pin-Priority: 2
+
+Explanation: Ubuntu fallback
+Package: *
+Pin: release o=Ubuntu
+Pin-Priority: -10
-- 
cgit v1.2.3


From 44c6d6aa8f394b0acf72a26ebb185595fe451159 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Sat, 29 Jan 2011 13:27:03 +0100
Subject: updated Ubuntu preferences to include security + updates

---
 templates/Ubuntu/preferences_maverick.erb | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/templates/Ubuntu/preferences_maverick.erb b/templates/Ubuntu/preferences_maverick.erb
index 977a7e2..00ca4c4 100644
--- a/templates/Ubuntu/preferences_maverick.erb
+++ b/templates/Ubuntu/preferences_maverick.erb
@@ -1,8 +1,18 @@
-Explanation: Ubuntu <%= codename %>
+Explanation: Ubuntu <%= codename %> security 
 Package: *
-Pin: release o=Ubuntu,a=<%= release %>,v=<%= release_version %>*
+Pin: release o=Ubuntu,a=<%= codename %>-security
 Pin-Priority: 990
 
+Explanation: Ubuntu <%= codename %> updates
+Package: *
+Pin: release o=Ubuntu,a=<%= codename %>-updates
+Pin-Priority: 980
+
+Explanation: Ubuntu <%= codename %>
+Package: *
+Pin: release o=Ubuntu,a=<%= codename %>
+Pin-Priority: 970
+
 Explanation: Ubuntu backports
 Package: *
 Pin: release a=<%= codename %>-backports
-- 
cgit v1.2.3


From 5964e90e335473844f2474efe6590c0218a8e7f2 Mon Sep 17 00:00:00 2001
From: root <root@puppet.nadir.org>
Date: Sat, 2 Apr 2011 11:16:43 +0000
Subject: Possibility to delpoy release related config file

---
 manifests/unattended_upgrades.pp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/manifests/unattended_upgrades.pp b/manifests/unattended_upgrades.pp
index e2992f8..b90fcbb 100644
--- a/manifests/unattended_upgrades.pp
+++ b/manifests/unattended_upgrades.pp
@@ -6,7 +6,9 @@ class apt::unattended_upgrades {
   }
 
   apt_conf { "50unattended-upgrades":
-    source  => ["puppet:///modules/site-apt/50unattended-upgrades",
+    source  => ["puppet:///modules/site-apt/$lsbdistcodename/50unattended-upgrades",
+		"puppet:///modules/site-apt/50unattended-upgrades",
+		"puppet:///modules/apt/$lsbdistcodename/50unattended-upgrades",
 		"puppet:///modules/apt/50unattended-upgrades" ],
     require => Package['unattended-upgrades'],
   }
-- 
cgit v1.2.3