Added some crazy bash madness to check if the ppa is installed already. Otherwise...

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

diff --git a/manifests/init.pp b/manifests/init.pp
index c4df481dd35d2377afa5c340362307ead0cb1efc..8042c8be198a2e1c50938899c76151700d63abde 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -19,8 +19,8 @@ class apt(
   $always_apt_update = false
 ) {
 
-       $root = '/etc/apt'
-       $provider = '/usr/bin/apt-get'
+  include apt::params
+
   $refresh_only_apt_update = $always_apt_update? {
     true => false,
     false => true
@@ -28,20 +28,20 @@ class apt(
 
   package { "python-software-properties": }
 
-       file { "sources.list":
-               name => "${root}/sources.list",
-               ensure => present,
-               owner => root,
-               group => root,
-               mode => 644,
-       }
+  file { "sources.list":
+    name => "${apt::params::root}/sources.list",
+    ensure => present,
+    owner => root,
+    group => root,
+    mode => 644,
+  }
 
-       file { "sources.list.d":
-               name => "${root}/sources.list.d",
-               ensure => directory,
-               owner => root,
-               group => root,
-       }
+  file { "sources.list.d":
+    name => "${apt::params::root}/sources.list.d",
+    ensure => directory,
+    owner => root,
+    group => root,
+  }
 
   exec { "apt_update":
     command => "${apt::params::provider} update",