Merge branch 'master' of https://bitbucket.org/tmakinen/puppet

cups/manifests/init.pp

@@ -31,6 +31,14 @@ class cups::client {
                 creates => "/usr/bin/lpr.pre-cups",
                 require => Package["cups"],
             }
+            file { "/etc/printcap":
+                ensure  => present,
+                source  => "/etc/cups/printcap",
+                mode    => "0644",
+                owner   => "root",
+                group   => "wheel",
+                require => Exec["cups-enable"],
+            }
         }
     }