diff options
author | Silvio Rhatto <rhatto@riseup.net> | 2011-02-14 12:11:35 -0200 |
---|---|---|
committer | Silvio Rhatto <rhatto@riseup.net> | 2011-02-14 12:11:35 -0200 |
commit | 0b03f41b32e8423bbbfa3c8a6b02dbf17c04f4c1 (patch) | |
tree | c5d7863c96377394b8559fbd5c7777fb32b6fda1 /manifests/defines/config_file.pp | |
parent | e0080adb1ca115ee98bf97c9cfb91fccbfeddaac (diff) | |
parent | a81984c77ed1efb56e978d8b5050b6c3ec409d80 (diff) |
Merge branch 'master' of git://labs.riseup.net/shared-common
Conflicts:
lib/puppet/parser/functions/gsub.rb
lib/puppet/parser/functions/prefix_with.rb
lib/puppet/parser/functions/slash_escape.rb
lib/puppet/parser/functions/split.rb
lib/puppet/parser/functions/substitute.rb
manifests/classes/lsb_release.pp
manifests/defines/concatenated_file.pp
manifests/defines/config_file.pp
manifests/defines/line.pp
manifests/defines/module_dir.pp
manifests/defines/module_file.pp
manifests/defines/replace.pp
manifests/init.pp
Diffstat (limited to 'manifests/defines/config_file.pp')
-rw-r--r-- | manifests/defines/config_file.pp | 60 |
1 files changed, 29 insertions, 31 deletions
diff --git a/manifests/defines/config_file.pp b/manifests/defines/config_file.pp index 781e9ec..375e25c 100644 --- a/manifests/defines/config_file.pp +++ b/manifests/defines/config_file.pp @@ -5,11 +5,11 @@ # A simple wrapper to give all configuration files common defaults. # # Usage: -# config_file { filename: -# content => "....\n", -# } +# config_file { filename: +# content => "....\n", +# } # -# Examples: +# Examples: # # To create the file /etc/vservers/${vs_name}/context with specific # content: @@ -24,35 +24,33 @@ # To create the file /etc/apache2/sites-available/munin-stats with the # content pulled from a template: # -# config_file { -# "/etc/apache2/sites-available/munin-stats": -# content => template("apache/munin-stats"), -# require => Package["apache2"], -# notify => Exec["reload-apache2"]; -# } -define config_file ( - $content = '', - $source = '', - $ensure = 'present') -{ - file { $name: - ensure => $ensure, - # default permissions for config files - mode => 0644, owner => root, group => 0, - # really detect changes to this file - checksum => md5, - } +# config_file { "/etc/apache2/sites-available/munin-stats": +# content => template("apache/munin-stats"), +# require => Package["apache2"], +# notify => Exec["reload-apache2"] +# } + +define config_file ($content = '', $source = '', $ensure = 'present') { + file { $name: + ensure => $ensure, + # keep old versions on the server + backup => puppet, + # default permissions for config files + mode => 0644, owner => root, group => 0, + # really detect changes to this file + checksum => md5, + } + + case $source { + '': { } + default: { File[$name] { source => $source } } + } - case $source { - '': { } - default: { File[$name] { source => $source } } - } + case $content { + '': { } + default: { File[$name] { content => $content } } + } - case $content { - '': { } - default: { File[$name] { content => $content } } - } - } |