diff modules/concat/README.md @ 36:37675581a273 puppet-3.6

Update Puppet module for Apache (pulls in concat module)
author IBBoard <dev@ibboard.co.uk>
date Sat, 14 Mar 2015 20:07:04 +0000
parents 956e484adc12
children d9352a684e62
line wrap: on
line diff
--- a/modules/concat/README.md	Sat Mar 14 20:01:17 2015 +0000
+++ b/modules/concat/README.md	Sat Mar 14 20:07:04 2015 +0000
@@ -48,7 +48,7 @@
 }
 
 concat::fragment { 'tmpfile':
-  target  => '/tmp/file'
+  target  => '/tmp/file',
   content => 'test contents',
   order   => '01'
 }
@@ -100,7 +100,7 @@
 }
 
 # used by other modules to register themselves in the motd
-define motd::register($content="", $order=10) {
+define motd::register($content="", $order='10') {
   if $content == "" {
     $body = $name
   } else {
@@ -173,17 +173,13 @@
 
 #####`warn`
 Determine if a warning message should be added at the top of the file to let
-users know it was autogenerated by Puppet.
+users know it was autogenerated by Puppet.  It should be a boolean or a string
+containing the contents of the warning message.
 
 ######Example
 - warn => true
 - warn => false
-
-#####`warn_message`
-Set the contents of the warning message.
-
-######Example
-- warn_message => 'This file is autogenerated!'
+- warn => '# This file is autogenerated!'
 
 #####`force`
 Determine if empty files are allowed when no fragments were added.
@@ -220,6 +216,14 @@
 - ensure_newline => true
 - ensure_newline => false
 
+#####`validate_cmd`
+Ensure the destination file passes the following validation command.
+Only supported on Puppet >= 3.5.0.
+
+######Example
+- validate_cmd => '/usr/sbin/apache2 -t -f %'
+- validate_cmd => '/usr/sbin/visudo -c -f %'
+
 ####concat::fragment
 
 #####`target`
@@ -247,14 +251,14 @@
 ######Example
 - order => '01'
 
+Best practice is to pass a string to this parameter but integer values are accepted.
+
 #####`ensure`
 Control the file of fragment created.
 
 ######Example
 - ensure => 'present'
 - ensure => 'absent'
-- ensure => 'file'
-- ensure => 'directory'
 
 #####`mode`
 Set the mode of the fragment.
@@ -398,7 +402,7 @@
 ```puppet
 include concat::setup     # generates deprecation warning
 
-class { 'concat::setup: } # generates deprecation warning
+class { 'concat::setup': } # generates deprecation warning
 ```
 
 The `concat::setup` class is deprecated as a public API of this module and