Changeset 468

Timestamp:

Dec 4, 2009, 7:05:37 PM (14 years ago)

Author:

sebas

Message:

habilitamos 3 variables mas accept, enable y location

File:

• trunk/puppet/modules/cups/manifests/init.pp (modified) (2 diffs)

trunk/puppet/modules/cups/manifests/init.pp

@@ -20 +20 @@
 }
 
-define cups::printer ($printer, $p_description, $p_deviceuri, $p_pathppd)
+define cups::printer ($printer, $p_deviceuri, $p_description, $p_location, $p_pathppd, $p_accept = "", $p_enable = "" )
  {
    include cups::server
 
   exec { "cups_create_printer_$name":
-    command => "lpadmin -p $printer -D '$p_description' -v $p_deviceuri -P $p_pathppd",
+    command => "lpadmin -p $printer -v $p_deviceuri -D '$p_description' -L '$p_location' -P $p_pathppd",
     path => "/bin:/sbin:/usr/sbin:/usr/bin",
     unless => "/bin/grep $printer /etc/cups/printers.conf",
@@ -31 +31 @@
   }
 
-  exec { "cupsaccept_$name":
-    command => "cupsaccept $printer",
-    path => "/bin:/sbin:/usr/sbin:/usr/bin",
-    unless => "grep -A8 $printer /etc/cups/printers.conf | grep 'Accepting Yes'",
-    require => exec["cups_create_printer_$name"],
+  if $p_accept {
+    exec { "cupsaccept_$name":
+      command => "cupsaccept $printer",
+      path => "/bin:/sbin:/usr/sbin:/usr/bin",
+      unless => "grep -A8 $printer /etc/cups/printers.conf | grep 'Accepting Yes'",
+      require => exec["cups_create_printer_$name"],
+    }
+  } else {
+    debug ("'$printer' will not accept print jobs")
   }
 
-  exec { "cupsenable_$name":
-    command => "cupsenable $printer",
-    path => "/bin:/sbin:/usr/sbin:/usr/bin",
-    unless => "grep -A5 $printer /etc/cups/printers.conf | grep 'State Idle'",
-    require => exec["cups_create_printer_$name"],
+  if $p_enable {
+    exec { "cupsenable_$name":
+      command => "cupsenable $printer",
+      path => "/bin:/sbin:/usr/sbin:/usr/bin",
+      unless => "grep -A5 $printer /etc/cups/printers.conf | grep 'State Idle'",
+      require => exec["cups_create_printer_$name"],
+    }
+  } else {
+    debug ("'$printer' is disabled")
   }