diff options
| author | intrigeri <intrigeri@boum.org> | 2013-01-02 16:14:06 +0100 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2013-01-02 16:14:06 +0100 |
| commit | 517040bb2e088325c2baa5bc4e9860d218357669 (patch) | |
| tree | eeca8062bf072c780aafe6f3b6ae22782a8e1914 /manifests/preseeded_package.pp | |
| parent | cda713fcf6bd189c3e870c9e466aa5f41d1847b6 (diff) | |
| parent | 07a031f2050deecfefa205e1e0c63586692a06ff (diff) | |
| download | puppet-apt-517040bb2e088325c2baa5bc4e9860d218357669.tar.gz puppet-apt-517040bb2e088325c2baa5bc4e9860d218357669.tar.bz2 | |
Merge remote-tracking branch 'riseup/immerda_27_readme' into shared
Conflicts:
README
manifests/cron/dist_upgrade.pp
manifests/cron/download.pp
manifests/init.pp
manifests/preferences.pp
Diffstat (limited to 'manifests/preseeded_package.pp')
| -rw-r--r-- | manifests/preseeded_package.pp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/manifests/preseeded_package.pp b/manifests/preseeded_package.pp index d831934..ac9a821 100644 --- a/manifests/preseeded_package.pp +++ b/manifests/preseeded_package.pp @@ -1,12 +1,11 @@ define apt::preseeded_package ($content = "", $ensure = "installed") { - $seedfile = "/var/cache/local/preseeding/$name.seeds" - $real_content = $content ? { - "" => template ( "site_apt/$lsbdistcodename/$name.seeds" ), - default => $content - } + $seedfile = "/var/cache/local/preseeding/${name}.seeds" file { $seedfile: - content => $real_content, + content => $content ? { + "" => template ( "site_apt/${::lsbdistcodename}/${name}.seeds" ), + default => $content + }, mode => 0600, owner => root, group => root, } |