X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=manifests%2Finit.pp;h=48c4f53050e8c8baaac5e3a86c307fbc0a38dc36;hb=93f40ca8928109956f3ecebbe8077414c5b52a29;hp=140e171c50b008cb8f57d8596cfe77ca8f958476;hpb=911c4de90fc493e4449d42a1ed6ea0e40925b330;p=puppet-modules%2Fpuppetlabs-apt.git diff --git a/manifests/init.pp b/manifests/init.pp index 140e171..48c4f53 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -67,18 +67,18 @@ class apt( if $proxy['host'] { apt::setting { 'conf-proxy': priority => '01', - content => template('apt/_header.erb', 'apt/proxy.erb'), + content => template('apt/_conf_header.erb', 'apt/proxy.erb'), } } $sources_list_content = $_purge['sources.list'] ? { - false => undef, - true => "# Repos managed by puppet.\n", + true => "# Repos managed by puppet.\n", + default => undef, } $preferences_ensure = $_purge['preferences'] ? { - false => file, - true => absent, + true => absent, + default => file, } if $_update['frequency'] == 'always' { @@ -89,7 +89,7 @@ class apt( apt::setting { 'conf-update-stamp': priority => 15, - content => template('apt/_header.erb', 'apt/15update-stamp.erb'), + content => template('apt/_conf_header.erb', 'apt/15update-stamp.erb'), } file { 'sources.list': @@ -133,7 +133,7 @@ class apt( notify => Exec['apt_update'], } - contain 'apt::update' + anchor { 'apt_first': } -> Class['apt::update'] -> anchor { 'apt_last': } # manage sources if present if $sources {