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
Merge pull request #336 from mhaskel/fix_acceptance_tests
[puppet-modules/puppetlabs-apt.git]
/
manifests
/
init.pp
diff --git
a/manifests/init.pp
b/manifests/init.pp
index 08f62d15d950a171006cf9dbc94fc4e3f260544c..1c318b67ca979259ef79933b6b0faf2dedb85f7d 100644
(file)
--- a/
manifests/init.pp
+++ b/
manifests/init.pp
@@
-144,18
+144,18
@@
class apt(
file { '01proxy':
ensure => absent,
path => "${apt_conf_d}/01proxy",
file { '01proxy':
ensure => absent,
path => "${apt_conf_d}/01proxy",
- content => "Acquire::http::Proxy \"http://${proxy_host}:${proxy_port}\";\n",
notify => Exec['apt_update'],
notify => Exec['apt_update'],
- mode => '0644',
- owner => root,
- group => root,
}
}
default: {
file { '01proxy':
ensure => present,
path => "${apt_conf_d}/01proxy",
}
}
default: {
file { '01proxy':
ensure => present,
path => "${apt_conf_d}/01proxy",
+ content => "Acquire::http::Proxy \"http://${proxy_host}:${proxy_port}\";\n",
notify => Exec['apt_update'],
notify => Exec['apt_update'],
+ mode => '0644',
+ owner => root,
+ group => root,
}
}
}
}
}
}