Merge pull request #61 from xaque208/pin_origin

Pin origin

diff --git a/manifests/backports.pp b/manifests/backports.pp
index ecc75048e6c10ff523dbb20355a7d6ab4cbc5374..147801e6e8042541fc804a3a2a92b564ef0ac9f1 100644 (file)
--- a/manifests/backports.pp
+++ b/manifests/backports.pp
@@ -28,7 +28,7 @@ class apt::backports(
 
   $release_real = downcase($release)
 
-  apt::source { 'backports.list':
+  apt::source { 'backports':
     location   => $location,
     release    => "${release_real}-backports",
     repos      => $::lsbdistid ? {

diff --git a/manifests/init.pp b/manifests/init.pp
index 00025893689835f8b1eef17f7202d65327579fda..c42d9ac049ae328076ae5ef183d5fdf5826d5a49 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -20,18 +20,19 @@
 # Sample Usage:
 #  class { 'apt': }
 class apt(
-  $always_apt_update = false,
-  $disable_keys = undef,
-  $proxy_host = false,
-  $proxy_port = '8080',
-  $purge_sources_list = false,
-  $purge_sources_list_d = false
+  $always_apt_update    = false,
+  $disable_keys         = undef,
+  $proxy_host           = false,
+  $proxy_port           = '8080',
+  $purge_sources_list   = false,
+  $purge_sources_list_d = false,
+  $purge_preferences_d  = false
 ) {
 
   include apt::params
   include apt::update
 
-  validate_bool($purge_sources_list, $purge_sources_list_d)
+  validate_bool($purge_sources_list, $purge_sources_list_d, $purge_preferences_d)
 
   $sources_list_content = $purge_sources_list ? {
     false => undef,
@@ -47,6 +48,7 @@ class apt(
   $root           = $apt::params::root
   $apt_conf_d     = $apt::params::apt_conf_d
   $sources_list_d = $apt::params::sources_list_d
+  $preferences_d  = $apt::params::preferences_d
   $provider       = $apt::params::provider
 
   file { 'sources.list':
@@ -69,6 +71,15 @@ class apt(
     notify  => Exec['apt_update'],
   }
 
+  file { 'preferences.d':
+    ensure  => directory,
+    path    => $preferences_d,
+    owner   => root,
+    group   => root,
+    purge   => $purge_preferences_d,
+    recurse => $purge_preferences_d,
+  }
+
   case $disable_keys {
     true: {
       file { '99unauth':

diff --git a/manifests/pin.pp b/manifests/pin.pp
index 29fddfb85ae4656369c023b1e2522bf909f2ff5c..58694d68f6089baee4af89afb37ea02950d26628 100644 (file)
--- a/manifests/pin.pp
+++ b/manifests/pin.pp
@@ -5,19 +5,28 @@ define apt::pin(
   $ensure   = present,
   $packages = '*',
   $priority = 0,
-  $release  = $name
+  $release  = '',
+  $origin   = ''
 ) {
 
   include apt::params
 
   $preferences_d = $apt::params::preferences_d
 
+  if $release != '' {
+    $pin = "release a=${release}"
+  } elsif $origin != '' {
+    $pin = "origin \"${origin}\""
+  } else {
+    $pin = "release a=${name}"
+  }
+
   file { "${name}.pref":
     ensure  => $ensure,
-    path    => "${preferences_d}/${name}",
+    path    => "${preferences_d}/${name}.pref",
     owner   => root,
     group   => root,
     mode    => '0644',
-    content => "# ${name}\nPackage: ${packages}\nPin: release a=${release}\nPin-Priority: ${priority}",
+    content => template("apt/pin.pref.erb"),
   }
 }

diff --git a/manifests/source.pp b/manifests/source.pp
index e55cafdfd1f4fbb493247f88b5a497270eec743e..ce801bc76c90c793230ae874c89bb7b86c2ca5d6 100644 (file)
--- a/manifests/source.pp
+++ b/manifests/source.pp
@@ -2,17 +2,17 @@
 # add an apt source
 
 define apt::source(
-  $ensure = present,
-  $location = '',
-  $release = $lsbdistcodename,
-  $repos = 'main',
-  $include_src = true,
+  $ensure            = present,
+  $location          = '',
+  $release           = $lsbdistcodename,
+  $repos             = 'main',
+  $include_src       = true,
   $required_packages = false,
-  $key = false,
-  $key_server = 'keyserver.ubuntu.com',
-  $key_content = false,
-  $key_source  = false,
-  $pin = false
+  $key               = false,
+  $key_server        = 'keyserver.ubuntu.com',
+  $key_content       = false,
+  $key_source        = false,
+  $pin               = false
 ) {
 
   include apt::params
@@ -35,10 +35,17 @@ define apt::source(
     notify  => Exec['apt_update'],
   }
 
-  if ($pin != false) and ($ensure == 'present') {
-    apt::pin { $release:
+
+  if ($pin != false) {
+    # Get the host portion out of the url so we can pin to origin
+    $url_split = split($location, '/')
+    $host      = $url_split[2]
+
+    apt::pin { $name:
+      ensure   => $ensure,
       priority => $pin,
-      before   => File["${name}.list"]
+      before   => File["${name}.list"],
+      origin   => $host,
     }
   }
 

diff --git a/templates/pin.pref.erb b/templates/pin.pref.erb
new file mode 100644 (file)
index 0000000..9a1e690
--- /dev/null
+++ b/templates/pin.pref.erb
@@ -0,0 +1,4 @@
+# <%= name %>
+Package: <%= packages %>
+Pin: <%= pin %>
+Pin-Priority: <%= priority %>