diff options
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/defines/append_if_no_such_line.pp | 14 | ||||
| -rw-r--r-- | manifests/defines/config_file.pp | 11 | ||||
| -rw-r--r-- | manifests/defines/line.pp | 1 | ||||
| -rw-r--r-- | manifests/defines/module_dir.pp | 9 | ||||
| -rw-r--r-- | manifests/defines/module_file.pp | 2 | ||||
| -rw-r--r-- | manifests/defines/replace.pp | 2 | ||||
| -rw-r--r-- | manifests/init.pp | 1 |
7 files changed, 19 insertions, 21 deletions
diff --git a/manifests/defines/append_if_no_such_line.pp b/manifests/defines/append_if_no_such_line.pp deleted file mode 100644 index 6ccf9f9..0000000 --- a/manifests/defines/append_if_no_such_line.pp +++ /dev/null @@ -1,14 +0,0 @@ -# -# This define is only for "CFEngine compatability". It is only a light -# wrapper around the "line" define, which is equally dangerous, but at -# least named according to a proper resource model. -# -define append_if_no_such_line($file, $line) { - line { - $name: - ensure => present, - file => $file, - line => $line; - } -} - diff --git a/manifests/defines/config_file.pp b/manifests/defines/config_file.pp index 375e25c..2be2460 100644 --- a/manifests/defines/config_file.pp +++ b/manifests/defines/config_file.pp @@ -3,7 +3,7 @@ # See LICENSE for the full license granted to you. # A simple wrapper to give all configuration files common defaults. -# +# # Usage: # config_file { filename: # content => "....\n", @@ -14,11 +14,10 @@ # To create the file /etc/vservers/${vs_name}/context with specific # content: # -# config_file { -# "/etc/vservers/${vs_name}/context": -# content => "${context}\n", -# notify => Exec["vs_restart_${vs_name}"], -# require => Exec["vs_create_${vs_name}"]; +# config_file { "/etc/vservers/${vs_name}/context": +# content => "${context}\n", +# notify => Exec["vs_restart_${vs_name}"], +# require => Exec["vs_create_${vs_name}"]; # } # # To create the file /etc/apache2/sites-available/munin-stats with the diff --git a/manifests/defines/line.pp b/manifests/defines/line.pp index 44c52a0..bbe0a54 100644 --- a/manifests/defines/line.pp +++ b/manifests/defines/line.pp @@ -36,6 +36,7 @@ # # Code with fixes gathered at # http://reductivelabs.com/trac/puppet/wiki/Recipes/SimpleText +>>>>>>> sarava/master define line($file, $line, $ensure = 'present') { case $ensure { default : { err ( "unknown ensure value '${ensure}'" ) } diff --git a/manifests/defines/module_dir.pp b/manifests/defines/module_dir.pp index 613cc49..227fe71 100644 --- a/manifests/defines/module_dir.pp +++ b/manifests/defines/module_dir.pp @@ -4,6 +4,15 @@ # Copyright (C) 2007 David Schmitt <david@schmitt.edv-bus.at> # See LICENSE for the full license granted to you. +# A module_dir is a storage place for all the stuff a module might want to +# store. According to the FHS, this should go to /var/lib. Since this is a part +# of puppet, the full path is /var/lib/puppet/modules/${name}. Every module +# should # prefix its module_dirs with its name. +# +# By default, the module_dir is loaded from "puppet:///${name}/module_dir". If +# that doesn't exist an empty directory is taken as source. The directory is +# purged so that modules do not have to worry about removing cruft. +# # Usage: # include common::moduledir # module_dir { ["common", "common/dir1", "common/dir2" ]: } diff --git a/manifests/defines/module_file.pp b/manifests/defines/module_file.pp index 44f3968..5977b2d 100644 --- a/manifests/defines/module_file.pp +++ b/manifests/defines/module_file.pp @@ -4,6 +4,8 @@ # Copyright (C) 2007 David Schmitt <david@schmitt.edv-bus.at> # See LICENSE for the full license granted to you. +# Put a file into module-local storage. +# # Usage: # modules_file { "module/file": # source => "puppet:///...", diff --git a/manifests/defines/replace.pp b/manifests/defines/replace.pp index f7da3b4..dd8db4d 100644 --- a/manifests/defines/replace.pp +++ b/manifests/defines/replace.pp @@ -2,7 +2,7 @@ # Copyright (C) 2007 David Schmitt <david@schmitt.edv-bus.at> # See LICENSE for the full license granted to you. -# A hack to replace all ocurrances of a regular expression in a file with a +# A hack to replace all occurrences of a regular expression in a file with a # specified string. Sometimes it can be less effort to replace only a single # value in a huge config file instead of creating a template out of it. Still, # creating a template is often better than this hack. diff --git a/manifests/init.pp b/manifests/init.pp index 3770897..3a9faf5 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -3,3 +3,4 @@ # See LICENSE for the full license granted to you. import "defines/*.pp" + |