Changeset 469

Timestamp:

Dec 7, 2009, 8:47:36 PM (14 years ago)

Author:

sebas

Message:

manejo de filtro por impresora, de ppd con un path local o sino un archivo desde puppet: una masa todo esto

File:

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

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

@@ -5 +5 @@
 
    package { "cupsys": ensure => "installed" }
+   package { [ "hplip", "hpijs-ppds" ]: ensure => installed; }
 
    file { "/etc/cups/cupsd.conf":
@@ -13 +14 @@
    }
 
+   file { "/etc/cups/printers.conf":
+      ensure => present,
+      require => Package["cupsys"],
+      owner => "root", group => "lp", mode => "600",
+   }
+
+
 #   service { "cups":
 #      enable => true,
@@ -20 +28 @@
 }
 
-define cups::printer ($printer, $p_deviceuri, $p_description, $p_location, $p_pathppd, $p_accept = "", $p_enable = "" )
+define cups::printer ($printer, $p_deviceuri, $p_description, $p_location, $p_pathppd = "", $p_ppd = "", $p_filter = "", $p_accept = "", $p_enable = "" )
  {
    include cups::server
 
-  exec { "cups_create_printer_$name":
-    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",
-    require => Package["cupsys"],
+  if $p_pathppd {
+    exec { "cups_create_printer_$name":
+      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",
+      require => [Package["cupsys"], Package["hplip"], Package["hpijs-ppds"]],
+    }
+  } else {
+     file { "/etc/cups/ppd/$p_ppd":
+     ensure => present,
+     owner => "root", group => "root", mode => "644",
+     source  => "puppet:///files/cups/$name/$p_ppd",
+     require => [Package["cupsys"], Package["hplip"], Package["hpijs-ppds"]],
+    }
+    $p_pathppdd = "/etc/cups/ppd/"
+
+    exec { "cups_create_printer_$name":
+      command => "lpadmin -p $printer -v $p_deviceuri -D '$p_description' -L '$p_location' -P $p_pathppdd$p_ppd",
+      path => "/bin:/sbin:/usr/sbin:/usr/bin",
+      unless => "/bin/grep $printer /etc/cups/printers.conf",
+      require => [Package["cupsys"], Package["hplip"], Package["hpijs-ppds"]],
+    }
+  }
+
+  if $p_filter {
+     file { "/usr/lib/cups/filter/$p_filter":
+     ensure => present,
+     owner => "root", group => "root", mode => "755",
+     source  => "puppet:///files/cups/$name/$p_filter",
+     require => exec["cups_create_printer_$name"],
+    }
+  } else {
+    debug ("'$printer' doesn't need a special filter")
   }
 
@@ -53 +89 @@
   }
 
-   file { "/etc/cups/printers.conf":
-      ensure => present,
-      require => Package["cupsys"],
-      owner => "root", group => "lp", mode => "600",
-   }
-
-   service { "cups":
-      enable => true,
-      ensure => running,
-      subscribe => [ Package["cupsys"], File["/etc/cups/printers.conf"] ],
-   }
+#   service { "cups":
+#      enable => true,
+#      ensure => running,
+#      subscribe => [ Package["cupsys"], File["/etc/cups/printers.conf"] ],
+#   }
 }