default => 'present',
}
- $auth_conf_tmp = epp('apt/auth_conf.epp')
+ $auth_conf_tmp = stdlib::deferrable_epp('apt/auth_conf.epp', { 'auth_conf_entries' => $auth_conf_entries })
file { '/etc/apt/auth.conf':
ensure => $auth_conf_ensure,
owner => $auth_conf_owner,
group => 'root',
mode => '0600',
- content => Sensitive("${confheadertmp}${auth_conf_tmp}"),
+ content => Sensitive($auth_conf_tmp),
notify => Class['apt::update'],
}
}
super().merge(manage_auth_conf: true)
end
- auth_conf_content = "// This file is managed by Puppet. DO NOT EDIT.
-machine deb.example.net login foologin password secret
-machine apt.example.com login aptlogin password supersecret
-"
+ auth_conf_content = <<~CONTENT
+ // This file is managed by Puppet. DO NOT EDIT.
+ machine deb.example.net login foologin password secret
+ machine apt.example.com login aptlogin password supersecret
+ CONTENT
it {
expect(subject).to contain_file('/etc/apt/auth.conf').with(ensure: 'present',
it {
expect(subject).to contain_apt__key("Add key: #{id} from Apt::Source my_source").that_comes_before('Apt::Setting[list-my_source]').with(ensure: 'refreshed',
- id: GPG_KEY_ID,
+ id: id,
server: 'pgp.mit.edu',
content: 'GPG key content',
source: 'http://apt.puppetlabs.com/pubkey.gpg',
-<% if $apt::auth_conf_entries != [] { -%>
-<% $apt::auth_conf_entries.each | $auth_conf_entry | { -%>
+// This file is managed by Puppet. DO NOT EDIT.
+<% if $auth_conf_entries != [] { -%>
+<% $auth_conf_entries.each | $auth_conf_entry | { -%>
machine <%= $auth_conf_entry['machine'] %> login <%= $auth_conf_entry['login'] %> password <%= $auth_conf_entry['password'] %>
<% } -%>
<% } -%>