diff options
author | Silvio Rhatto <rhatto@riseup.net> | 2013-01-18 10:51:59 -0200 |
---|---|---|
committer | Silvio Rhatto <rhatto@riseup.net> | 2013-01-18 10:51:59 -0200 |
commit | c2219fa645251599b797b2574e6a68212d676f66 (patch) | |
tree | b2b5cb63bee1abc3f2ae31b81cd417b292355b6c /manifests/dist_upgrade | |
parent | 8bfd579a82b6f824b0184bb2e33a384254426eec (diff) | |
parent | 14670466be5eceba043e697d5f6f0f0ada9d5b07 (diff) | |
download | puppet-apt-c2219fa645251599b797b2574e6a68212d676f66.tar.gz puppet-apt-c2219fa645251599b797b2574e6a68212d676f66.tar.bz2 |
Merge branch 'master' of git://labs.riseup.net/shared-apt
Conflicts:
templates/Ubuntu/sources.list.erb
Diffstat (limited to 'manifests/dist_upgrade')
-rw-r--r-- | manifests/dist_upgrade/initiator.pp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/manifests/dist_upgrade/initiator.pp b/manifests/dist_upgrade/initiator.pp index 571cd51..d238988 100644 --- a/manifests/dist_upgrade/initiator.pp +++ b/manifests/dist_upgrade/initiator.pp @@ -4,15 +4,15 @@ class apt::dist_upgrade::initiator inherits apt::dist_upgrade { $initiator_abs = "${apt::apt_base_dir}/${initiator}" file { 'apt_upgrade_initiator': - mode => 0644, + mode => '0644', owner => root, group => 0, - path => "${initiator_abs}", + path => $initiator_abs, checksum => md5, source => [ - "puppet:///modules/site_apt/${fqdn}/${initiator}", - "puppet:///modules/site_apt/${initiator}", - "puppet:///modules/apt/${initiator}", + "puppet:///modules/site_apt/${::fqdn}/${initiator}", + "puppet:///modules/site_apt/${initiator}", + "puppet:///modules/apt/${initiator}", ], } |