Code Review
/
puppet-modules
/
puppetlabs-apt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
unattended_upgrades: Allow changing legacy_origin
[puppet-modules/puppetlabs-apt.git]
/
manifests
/
init.pp
diff --git
a/manifests/init.pp
b/manifests/init.pp
index d64b013accbbaa3e1bb1ba3f34e17672ce798cc3..5f33fdba703920ddf94d2ea540ffc4ef2ed3497c 100644
(file)
--- a/
manifests/init.pp
+++ b/
manifests/init.pp
@@
-92,7
+92,7
@@
class apt(
file { '/etc/apt/apt.conf.d/15update-stamp':
ensure => 'file',
file { '/etc/apt/apt.conf.d/15update-stamp':
ensure => 'file',
- content =>
'APT::Update::Post-Invoke-Success {"touch /var/lib/apt/periodic/update-success-stamp 2>/dev/null || true";};'
,
+ content =>
template('apt/_header.erb', 'apt/15update-stamp.erb')
,
group => 'root',
mode => '0644',
owner => 'root',
group => 'root',
mode => '0644',
owner => 'root',
@@
-144,7
+144,7
@@
class apt(
true: {
file { '99progressbar':
ensure => present,
true: {
file { '99progressbar':
ensure => present,
- content =>
'Dpkg::Progress-Fancy "1";'
,
+ content =>
template('apt/_header.erb', 'apt/progressbar.erb')
,
path => "${apt_conf_d}/99progressbar",
}
}
path => "${apt_conf_d}/99progressbar",
}
}
@@
-162,7
+162,7
@@
class apt(
true: {
file { '99unauth':
ensure => present,
true: {
file { '99unauth':
ensure => present,
- content =>
"APT::Get::AllowUnauthenticated 1;\n"
,
+ content =>
template('apt/_header.erb', 'apt/unauth.erb')
,
path => "${apt_conf_d}/99unauth",
}
}
path => "${apt_conf_d}/99unauth",
}
}
@@
-188,7
+188,7
@@
class apt(
file { '01proxy':
ensure => present,
path => "${apt_conf_d}/01proxy",
file { '01proxy':
ensure => present,
path => "${apt_conf_d}/01proxy",
- content =>
"Acquire::http::Proxy \"http://${proxy_host}:${proxy_port}\";\n"
,
+ content =>
template('apt/_header.erb', 'apt/proxy.erb')
,
notify => Exec['apt_update'],
mode => '0644',
owner => root,
notify => Exec['apt_update'],
mode => '0644',
owner => root,