adding several minor options to server.pp and shares.pp

diff --git a/manifests/server.pp b/manifests/server.pp
index 7003057b3eac59829aacd5f1fa0602946a5ea83d..31589e0a4cfa57c0df72072e282c7084fa82c40b 100644 (file)
--- a/manifests/server.pp
+++ b/manifests/server.pp
@@ -3,6 +3,13 @@ class samba::server($interfaces = '',
                     $server_string = '',
                     $unix_password_sync = '',
                     $workgroup = '',
+                    $socket_options = '',
+                    $deadtime = '',
+                    $keepalive = '',
+                    $load_printers = '',
+                    $printing = '',
+                    $printcap_name = '',
+                    $disable_spoolss = '',
                     $bind_interfaces_only = 'yes',) {
 
   include samba::server::install
@@ -29,6 +36,13 @@ class samba::server($interfaces = '',
     'server string':        value => $server_string;
     'unix password sync':   value => $unix_password_sync;
     'workgroup':            value => $workgroup;
+    'socket_options':       value => $socket_options;
+    'deadtime':             value => $deadtime;
+    'keepalive':            value => $keepalive;
+    'load_printers':        value => $load_printers;
+    'printing':             value => $printing;
+    'printcap_name':        value => $printcap_name;
+    'disable_spoolss':      value => $disable_spoolss;
   }
 
   file {'check_samba_user':

diff --git a/manifests/server/share.pp b/manifests/server/share.pp
index 2233d45a44201fd7dae82fb4992a31f396cea25e..b7d451f3f0c7d60c73d91b3799c6655fe7790816 100644 (file)
--- a/manifests/server/share.pp
+++ b/manifests/server/share.pp
@@ -1,4 +1,5 @@
 define samba::server::share($ensure = present,
+                            $available = '',
                             $browsable = '',
                             $comment = '',
                             $copy = '',
@@ -22,7 +23,7 @@ define samba::server::share($ensure = present,
                             $printable = '',
                             $valid_users = '',
                             ) {
-                              
+
   $incl    = $samba::server::incl
   $context = $samba::server::context
   $target  = "target[. = '${name}']"
@@ -41,6 +42,11 @@ define samba::server::share($ensure = present,
 
   if $ensure == 'present' {
     $changes = [
+      $available ? {
+          true    => "set \"${target}/available\" yes",
+          false   => "set \"${target}/available\" no",
+          default => "rm  \"${target}/available\"",
+          },
       $browsable ? {
           true    => "set \"${target}/browsable\" yes",
           false   => "set \"${target}/browsable\" no",