Check if python-software-properties is defined before attempting to define it.

[puppet-modules/puppetlabs-apt.git] / manifests / init.pp

diff --git a/manifests/init.pp b/manifests/init.pp
index c4df481dd35d2377afa5c340362307ead0cb1efc..0f6bcef6218767de8fd62d3e5785779175c8d4ee 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -15,43 +15,75 @@
 # Sample Usage:
 #  class { 'apt': }
 class apt(
-  $disable_keys = false,
-  $always_apt_update = false
+  $always_apt_update = false,
+  $disable_keys = undef,
+  $proxy_host = false,
+  $proxy_port = '8080',
+  $purge = false
 ) {
 
-       $root = '/etc/apt'
-       $provider = '/usr/bin/apt-get'
+  include apt::params
+
+  validate_bool($purge)
+
   $refresh_only_apt_update = $always_apt_update? {
     true => false,
     false => true
   }
 
-  package { "python-software-properties": }
+  if ! defined(Package["python-software-properties"]) {
+    package { "python-software-properties": }
+  }
 
-       file { "sources.list":
-               name => "${root}/sources.list",
-               ensure => present,
-               owner => root,
-               group => root,
-               mode => 644,
-       }
+  file { "sources.list":
+    path => "${apt::params::root}/sources.list",
+    ensure => present,
+    owner => root,
+    group => root,
+    mode => 644,
+    content => $purge ? {
+      false =>  undef,
+      true  => "# Repos managed by puppet.\n",
+    },
+  }
 
-       file { "sources.list.d":
-               name => "${root}/sources.list.d",
-               ensure => directory,
-               owner => root,
-               group => root,
-       }
+  file { "sources.list.d":
+    path => "${apt::params::root}/sources.list.d",
+    ensure => directory,
+    owner => root,
+    group => root,
+    purge => $purge,
+    recurse => $purge,
+  }
 
   exec { "apt_update":
     command => "${apt::params::provider} update",
     subscribe => [ File["sources.list"], File["sources.list.d"] ],
     refreshonly => $refresh_only_apt_update,
   }
-  if($disable_keys) {
-    exec { 'make-apt-insecure':
-      command => '/bin/echo "APT::Get::AllowUnauthenticated 1;" >> /etc/apt/apt.conf.d/99unauth',
-      creates => '/etc/apt/apt.conf.d/99unauth'
+
+  case $disable_keys {
+    true: {
+      file { "99unauth":
+        content => "APT::Get::AllowUnauthenticated 1;\n",
+        ensure  => present,
+        path    => "/etc/apt/apt.conf.d/99unauth",
+      }
+    }
+    false: {
+      file { "99unauth":
+        ensure => absent,
+        path   => "/etc/apt/apt.conf.d/99unauth",
+      }
+    }
+    undef: { } # do nothing
+    default: { fail("Valid values for disable_keys are true or false") }
+  }
+
+  if($proxy_host) {
+    file { 'configure-apt-proxy':
+      path    => '/etc/apt/apt.conf.d/proxy',
+      content => "Acquire::http::Proxy \"http://${proxy_host}:${proxy_port}\";",
     }
   }
 }