diff options
| author | intrigeri <intrigeri@boum.org> | 2010-12-11 09:39:27 +0100 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2010-12-11 09:39:27 +0100 |
| commit | 1cf642b3a87399c165e9e66399ab92694b27ee43 (patch) | |
| tree | 27f0612ef1104f4158a94bbf9455b25ecf8fa1d6 /manifests/apt_conf.pp | |
| parent | 5e94f0707c2e77f73444a88844bc800124d6e05e (diff) | |
| parent | ab3a5294cf0ea0cf2ad233e04bf13f7631f9454c (diff) | |
Merge remote branch 'riseup/master'
Diffstat (limited to 'manifests/apt_conf.pp')
| -rw-r--r-- | manifests/apt_conf.pp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/manifests/apt_conf.pp b/manifests/apt_conf.pp index 62e4377..c484ec3 100644 --- a/manifests/apt_conf.pp +++ b/manifests/apt_conf.pp @@ -1,11 +1,13 @@ define apt::apt_conf( $ensure = 'present', $source = '', - $content = undef -){ + $content = undef ) +{ + if $source == '' and $content == undef { fail("One of \$source or \$content must be specified for apt_conf ${name}") } + if $source != '' and $content != undef { fail("Only one of \$source or \$content must specified for apt_conf ${name}") } @@ -13,7 +15,7 @@ define apt::apt_conf( file { "/etc/apt/apt.conf.d/${name}": ensure => $ensure, notify => Exec["refresh_apt"], - owner => root, group => 0, mode => 0600; + owner => root, group => 0, mode => 0644; } if $source { |