diff --git a/apt/manifests/init.pp b/apt/manifests/init.pp index 0f01a3b..69ff71f 100644 --- a/apt/manifests/init.pp +++ b/apt/manifests/init.pp @@ -45,21 +45,22 @@ define apt::ppa($ensure = "present") { tag("bootstrap") + include apt include apt::ppa::helper - $fname = gsub($name, "^ppa:([^\/]+)\/(.+)", "\\1-\\2-${lsbdistcodename}.list") + $fname = regsubst($name, "^ppa:([^\/]+)\/(.+)", "\\1-\\2-${lsbdistcodename}.list") case $ensure { "present": { exec { "add-apt-repository ${name}": path => "/bin:/usr/bin:/sbin:/usr/sbin", user => "root", - creates => $fname, + creates => "/etc/apt/sources.list.d/${fname}", require => Package["python-software-properties"], notify => Exec["apt-get-update"], } } "absent": { - file { $fname: + file { "/etc/apt/sources.list.d/${fname}": ensure => absent, notify => Exec["apt-get-update"], }