Adding nfs::export resource to manage /etc/exports file …

README.md

@@ -74,6 +74,34 @@ For detailed info about the logic and usage patterns of Example42 modules check
 'client_options' is a passthrough to the [mount type options attribute] (https://docs.puppetlabs.com/references/latest/type.html#mount-attribute-options).
 If the mountpoint directory does not exist it will be created along with any parent directories that don't exist, essentially 'mkdir -p $mountpoint'.
 
+* Exporting NFS shares (server only)
+
+        nfs::export { '/var/log':
+          hosts => [{                 # Hosts must be wrapped in [] even if it is a single entry
+            'host' => '*',            # Host can be '*', IP, IP w/ netmask, or hostname
+            'options' => 'ro,fsid=0'  # Host specific nfs options
+          }],
+          order => 10                 # Optional, order to arrange export entries. Defaults to 100
+        }
+
+* Another example with multiple access control entries
+
+        nfs::export { '/opt/tomcat/webapps':
+          hosts => [
+            {
+              'host' => 'host.example.com',
+              'options' => 'rw'
+            },
+            {
+              'host' => '192.168.56.0/24',
+              'options' => 'rw,sync'
+            },
+            {
+              'host' => '*',
+              'options' => 'ro,fsid=0'
+            }
+          ]
+        }
 
 ## USAGE - Overrides and Customizations
 * Use custom sources for main config file 

README.rdoc

@@ -64,6 +64,34 @@ For detailed info about the logic and usage patterns of Example42 modules check
 'client_options' is a passthrough to the {mount type options attribute}[https://docs.puppetlabs.com/references/latest/type.html#mount-attribute-options].
 If the mountpoint directory does not exist it will be created along with any parent directories that don't exist, essentially 'mkdir -p $mountpoint'.
 
+* Exporting NFS shares (server only)
+
+        nfs::export { '/var/log':
+          hosts => [{                 # Hosts must be wrapped in [] even if it is a single entry
+            'host' => '*',            # Host can be '*', IP, IP w/ netmask, or hostname
+            'options' => 'ro,fsid=0'  # Host specific nfs options
+          }],
+          order => 10                 # Optional, order to arrange export entries. Defaults to 100
+        }
+
+* Another example with multiple access control entries
+
+        nfs::export { '/opt/tomcat/webapps':
+          hosts => [
+            {
+              'host' => 'host.example.com',
+              'options' => 'rw'
+            },
+            {
+              'host' => '192.168.56.0/24',
+              'options' => 'rw,sync'
+            },
+            {
+              'host' => '*',
+              'options' => 'ro,fsid=0'
+            }
+          ]
+        }
 
 == USAGE - Overrides and Customizations
 * Use custom sources for main config file 

manifests/export.pp

@@ -0,0 +1,27 @@
+# This resource manages an individual export rule in /etc/exports
+define nfs::export(
+  $mount_point = $name,
+  $hosts,
+  $order       = '100',
+) {
+  include nfs
+  include nfs::params
+
+  if $nfs::manage_config_file == false {
+    warn('nfs::manage_config_file has been disabled. This resource is now unused!')
+  } else {
+    validate_absolute_path($mount_point)
+    validate_array($hosts)
+    # FIXME: Add validation of hash values for host and options
+    # host: one of '*', IP, IP w/ netmask, or a hostname
+    # options: any of 'ro','rw','sync',wdelay...
+    validate_numeric($order)
+
+    # Create an exports fragment
+    concat::fragment { "nfs_cfg_${name}":
+      target  => $nfs::config_file,
+      content => template($nfs::template),
+      order   => $order,
+    }
+  }
+}

manifests/init.pp

@@ -242,6 +242,7 @@
   $config_file_owner   = params_lookup( 'config_file_owner' ),
   $config_file_group   = params_lookup( 'config_file_group' ),
   $config_file_init    = params_lookup( 'config_file_init' ),
+  $manage_config_file  = params_lookup( 'manage_config_file' ),
   $pid_file            = params_lookup( 'pid_file' ),
   $data_dir            = params_lookup( 'data_dir' ),
   $log_dir             = params_lookup( 'log_dir' ),
@@ -327,11 +328,6 @@
     default   => $nfs::source,
   }
 
-  $manage_file_content = $nfs::template ? {
-    ''        => undef,
-    default   => template($nfs::template),
-  }
-
   include nfs::client
 
   if $nfs::mode == 'server' {

manifests/params.pp

@@ -100,14 +100,16 @@
   $source = ''
   $source_dir = ''
   $source_dir_purge = false
-  $template = ''
+  $manage_config_file = true
+  $template = 'nfs/export.erb'
   $options = ''
   $service_autorestart = true
   $version = 'present'
   $absent = false
   $disable = false
   $disableboot = false
   $mounts = {}
+  $aggregate = false # controls concatination of the nfs_cfg file
 
   ### General module variables that can have a site or per module default
   $monitor = false

manifests/server.pp

@@ -23,21 +23,40 @@
     noop      => $nfs::noops,
   }
 
-  file { 'nfs.conf':
-    ensure  => $nfs::manage_file,
-    path    => $nfs::config_file,
-    mode    => $nfs::config_file_mode,
-    owner   => $nfs::config_file_owner,
-    group   => $nfs::config_file_group,
-    require => Package[$nfs::package],
-    notify  => $nfs::manage_service_autorestart,
-    source  => $nfs::manage_file_source,
-    content => $nfs::manage_file_content,
-    replace => $nfs::manage_file_replace,
-    audit   => $nfs::manage_audit,
-    noop    => $nfs::noops,
+  if $nfs::manage_config_file
+  and $nfs::aggregate {
+    concat { $nfs::config_file:
+      ensure  => $nfs::manage_file,
+      mode    => $nfs::config_file_mode,
+      owner   => $nfs::config_file_owner,
+      group   => $nfs::config_file_group,
+      require => Package[$nfs::package],
+      notify  => $nfs::manage_service_autorestart,
+      warn    => true,
+      order   => numeric,
+      replace => $nfs::manage_file_replace,
+      audit   => $nfs::manage_audit,
+      noop    => $nfs::noops,
+    }
+  }
+  else {
+    file { $nfs::config_file:
+      ensure  => $nfs::manage_file,
+      path    => $nfs::config_file,
+      mode    => $nfs::config_file_mode,
+      owner   => $nfs::config_file_owner,
+      group   => $nfs::config_file_group,
+      require => Package[$nfs::package],
+      notify  => $nfs::manage_service_autorestart,
+      source  => $nfs::manage_file_source,
+      content => $nfs::manage_file_content,
+      replace => $nfs::manage_file_replace,
+      audit   => $nfs::manage_audit,
+      noop    => $nfs::noops,
+    }
   }
 
+
   # The whole nfs configuration directory can be recursively overriden
   if $nfs::source_dir
   and $nfs::config_dir != '' {

templates/export.erb

@@ -0,0 +1 @@
+<%= "#{mount_point}" %><% hosts.each { |host| %><%= " #{host['host']}" %><% unless host['options'].nil? || host['options'].empty? %><%= "(#{host['options']})" %><% end %><% } %>