Changeset 476

Timestamp:

Dec 8, 2009, 10:57:16 PM (14 years ago)

Author:

sebas

Message:

levantar cups antes de la creacion de las imprisoras + reorganisacion de saned

File:

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

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

@@ -9 +9 @@
    package { "sane-utils": ensure => "installed" }
 
+    line { saned_activate_off:
+      file => "/etc/default/saned",
+      line => 'RUN=no',
+      ensure => absent,
+      require => Package["sane-utils"],
+      notify  => Service["saned"],
+    }
+    line { saned_activate_on:
+      file => "/etc/default/saned",
+      line => 'RUN=yes',
+      ensure => present,
+      require => Package["sane-utils"],
+      notify  => Service["saned"],
+    }
+
    file { "/etc/default/saned":
       ensure => present,
@@ -18 +33 @@
       enable => true,
       ensure => running,
+      provider => "debian",
       subscribe => [ Package["sane-utils"], File["/etc/default/saned"] ],
    }
@@ -54 +70 @@
       enable => true,
       ensure => running,
+      provider => "debian",
       subscribe => [ Package["cupsys"], File["/etc/cups/cupsd.conf"] ],
    }
@@ -67 +84 @@
       path => "/bin:/sbin:/usr/sbin:/usr/bin",
       unless => "/bin/grep $printer /etc/cups/printers.conf",
-      require => [Package["cupsys"], Package["hplip"], Package["hpijs-ppds"]],
+      require => [Package["cupsys"], Package["hplip"], Package["hpijs-ppds"], Service["cups"]],
     }
   } else {
@@ -121 +138 @@
   if $p_scan {
     include cups::saned
-    line { saned_activate_off:
-      file => "/etc/default/saned",
-      line => 'RUN=no',
-      ensure => absent,
-      require => Package["sane-utils"],
-      notify  => Service["saned"],
-    }
-    line { saned_activate_on:
-      file => "/etc/default/saned",
-      line => 'RUN=yes',
-      ensure => present,
-      require => Package["sane-utils"],
-      notify  => Service["saned"],
-    }
   } else {
     debug ("'$printer' cannot scan on the network")