Fixing puppet-lint errors.

This commit is contained in:
Timo Mkinen 2012-03-27 14:41:39 +03:00
parent 2f83cb7d4a
commit 34c36045fa
59 changed files with 995 additions and 990 deletions

View file

@ -4,23 +4,23 @@
class cups::client {
package { "cups":
ensure => installed,
ensure => installed,
}
file { "/etc/cups/client.conf":
ensure => present,
content => template("cups/client.conf.erb"),
mode => 0644,
owner => root,
group => $operatingsystem ? {
openbsd => wheel,
default => lp,
},
require => Package["cups"],
ensure => present,
content => template("cups/client.conf.erb"),
mode => 0644,
owner => root,
group => $operatingsystem ? {
openbsd => wheel,
default => lp,
},
require => Package["cups"],
}
case $operatingsystem {
openbsd: {
openbsd: {
exec { "cups-enable":
command => $operatingsystemrelease ? {
/4\.[1-8]/ => "echo y | cups-enable",
@ -30,8 +30,8 @@ class cups::client {
user => "root",
creates => "/usr/bin/lpr.pre-cups",
require => Package["cups"],
}
}
}
}
}
}
@ -41,7 +41,7 @@ class cups::client {
class cups::server inherits cups::client {
package { [ "ghostscript", "system-config-printer" ]:
ensure => installed,
ensure => installed,
}
file { "/etc/cups/cupsd.conf":
@ -57,9 +57,9 @@ class cups::server inherits cups::client {
}
service { "cups":
ensure => running,
enable => true,
require => Package["cups"],
ensure => running,
enable => true,
require => Package["cups"],
}
file { "/etc/cups/ppd":
@ -69,9 +69,9 @@ class cups::server inherits cups::client {
group => lp,
require => Package["cups"],
}
File["/etc/cups/client.conf"] {
content => "ServerName 127.0.0.1\n",
content => "ServerName 127.0.0.1\n",
}
}
@ -157,12 +157,12 @@ class cups::lpd {
include inetd::server
package { "cups-lpd":
ensure => installed,
ensure => installed,
}
inetd::service { "cups-lpd":
ensure => present,
require => Package["cups-lpd"],
ensure => present,
require => Package["cups-lpd"],
}
}
@ -175,26 +175,26 @@ class cups::samba {
include samba::server
file { [ "/etc/samba/drivers",
"/usr/share/cups/drivers",
"/usr/share/cups/drivers/x64", ]:
ensure => directory,
mode => 0755,
owner => root,
group => root,
require => [ Package["samba"],
Package["cups"], ],
"/usr/share/cups/drivers",
"/usr/share/cups/drivers/x64", ]:
ensure => directory,
mode => 0755,
owner => root,
group => root,
require => [ Package["samba"],
Package["cups"], ],
}
define driverfile() {
file { "/usr/share/cups/drivers/${name}":
ensure => present,
source => "puppet:///modules/cups/drivers/${name}",
mode => 0644,
owner => root,
group => root,
require => [ File["/usr/share/cups/drivers"],
File["/usr/share/cups/drivers/x64"], ],
}
file { "/usr/share/cups/drivers/${name}":
ensure => present,
source => "puppet:///modules/cups/drivers/${name}",
mode => 0644,
owner => root,
group => root,
require => [ File["/usr/share/cups/drivers"],
File["/usr/share/cups/drivers/x64"], ],
}
}
driverfile { "cups6.inf": }
@ -218,11 +218,11 @@ class cups::samba {
driverfile { "x64/pscript5.dll": }
file { "/etc/cron.hourly/update-printer-inf.sh":
ensure => present,
source => "puppet:///modules/cups/update-printer-inf.sh",
mode => 0755,
owner => root,
group => root,
ensure => present,
source => "puppet:///modules/cups/update-printer-inf.sh",
mode => 0755,
owner => root,
group => root,
}
}
@ -233,24 +233,24 @@ class cups::samba {
class cups::snmp {
package { "net-snmp-utils":
ensure => installed,
ensure => installed,
}
file { "/etc/cron.hourly/printer-details.py":
ensure => present,
source => "puppet:///modules/cups/printer-details.py",
mode => 0755,
owner => root,
group => root,
require => Package["net-snmp-utils"],
ensure => present,
source => "puppet:///modules/cups/printer-details.py",
mode => 0755,
owner => root,
group => root,
require => Package["net-snmp-utils"],
}
exec { "create-details-dir":
command => "umask 022 ; mkdir /usr/share/doc/cups-`rpm -q --queryformat='%{VERSION}' cups`/details",
path => "/bin:/usr/bin:/sbin:/usr/sbin",
user => root,
unless => "test -d /usr/share/doc/cups-`rpm -q --queryformat='%{VERSION}' cups`/details",
require => Package["cups"],
command => "umask 022 ; mkdir /usr/share/doc/cups-`rpm -q --queryformat='%{VERSION}' cups`/details",
path => "/bin:/usr/bin:/sbin:/usr/sbin",
user => root,
unless => "test -d /usr/share/doc/cups-`rpm -q --queryformat='%{VERSION}' cups`/details",
require => Package["cups"],
}
}