Update documentation and README.

diff --git a/README.md b/README.md
index 9bd2000defd93d2f0ffad947ee3f8ad5fba36483..d1c41c72e4376d07d1e55e5ebc53a951ec8b1905 100644 (file)
--- a/README.md
+++ b/README.md
@@ -32,13 +32,16 @@ Example:
 
 Parameters:
 
-*  ensure: file type, default file.
-*  recurse: file recurse, default false.
-*  owner: file owner, default tftp.
-*  group: file group. default tftp.
-*  mode: file mode, default 0644 (puppet will change to 0755 for directories).
-*  content: file content.
-*  source: file source.
+* ensure: file type, default file.
+* owner: file owner, default tftp.
+* group: file group. default tftp.
+* mode: file mode, default 0644 (puppet will change to 0755 for directories).
+* content: file content.
+* source: file source, defaults to puppet:///module/${caller_module_name}/${name} for files without content.
+* recurse: directory recurse, default false.
+* purge: directory recurse and purge.
+* replace: replace directory with file or symlink, default undef,
+* recurselimit: directory recurse limit, default undef,
 
 Example:
 
@@ -51,9 +54,14 @@ Example:
     }
     
     tftp::file { 'pxelinux.cfg/default':
-      source => 'puppet:///modules/acme/default',
+      ensure => file,
+      source => 'puppet:///modules/acme/pxelinux.cfg/default',
     }
 
+The last example can be abbreviated to the following if it's in the acme module:
+
+    tftp::file { 'pxelinux.cfg/default': }
+
 ## Example
 
 1. tftp directories not in the OS package defaults should be managed as file resources.

diff --git a/manifests/file.pp b/manifests/file.pp
index b3985c709d688c53c142076ee93673b2555d2b7b..3628188fca0097c02e323793c2c6da0c4451f629 100644 (file)
--- a/manifests/file.pp
+++ b/manifests/file.pp
@@ -2,12 +2,31 @@
 #
 # Parameters:
 #
+#   [*ensure*]: file type, default file.
+#   [*owner*]: file owner, default tftp.
+#   [*group*]: file group. default tftp.
+#   [*mode*]: file mode, default 0644 (puppet will change to 0755 for directories).
+#   [*content*]: file content.
+#   [*source*]: file source, defaults to puppet*]:///module/${caller_module_name}/${name} for files without content.
+#   [*recurse*]: directory recurse, default false.
+#   [*purge*]: directory recurse and purge.
+#   [*replace*]: replace directory with file or symlink, default undef,
+#   [*recurselimit*]: directory recurse limit, default undef,
+#
 # Actions:
 #
-# Requires:
+#   Deploy files into the tftp directory.
 #
 # Usage:
 #
+#   tftp::file { 'pxelinux.0':
+#     source => 'puppet:///modules/acme/pxelinux.0',
+#   }
+#
+#   tftp::file { 'pxelinux.cfg':
+#     ensure => directory,
+#   }
+#
 define tftp::file (
   $ensure       = file,
   $owner        = 'tftp',

diff --git a/manifests/init.pp b/manifests/init.pp
index 13954b5fc2ee61d802542bd9faa5f7c449702932..9dfab3793df5cebad1d8f3e8f62d73aabececc9c 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -18,7 +18,7 @@
 #
 # Usage:
 #
-#   class tftp {
+#   class { 'tftp':
 #     directory => '/opt/tftp',
 #     address   => $::ipaddress,
 #     options   => '--ipv6 --timeout 60',

diff --git a/manifests/params.pp b/manifests/params.pp
index 564e0f203656f0cc7840d37cf6eadf047e330deb..e6581840a7846fb3888b194a374afbfe2e725c7a 100644 (file)
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -1,13 +1,6 @@
 # Class: tftp::params
 #
-# Parameters:
-#
-# Actions:
-#
-# Requires:
-#
-# Usage:
-#
+#   TFTP class parameters.
 class tftp::params {
   $address    = '0.0.0.0'
   $port       = '69'