tmakinen/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixing puppet-lint errors.

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

54
apache/manifests/init.pp
View file

@ -21,7 +21,7 @@ class apache::common {
}
if $apache_datadir {
file { "${apache_datadir}":
file { $apache_datadir:
ensure => directory,
mode => 0755,
owner => "root",
@ -31,8 +31,8 @@ class apache::common {
file { "/srv/www":
ensure => link,
target => "${apache_datadir}",
require => File["${apache_datadir}"],
target => $apache_datadir,
require => File[$apache_datadir],
}
} else {
file { "/srv/www":
@ -55,7 +55,7 @@ class apache::common {
if $apache_datadir {
selinux::manage_fcontext { "${apache_datadir}(/.*)?":
type => "httpd_sys_content_t",
before => File["${apache_datadir}"],
before => File[$apache_datadir],
}
}
}
@ -70,11 +70,11 @@ class apache::common {
}
file { "/usr/local/sbin/www-logrotate.sh":
ensure => present,
source => "puppet:///modules/apache/www-logrotate.sh",
mode => 0755,
owner => root,
group => root,
ensure => present,
source => "puppet:///modules/apache/www-logrotate.sh",
mode => 0755,
owner => root,
group => root,
seluser => "system_u",
selrole => "object_r",
seltype => "httpd_rotatelogs_exec_t",
@ -155,14 +155,14 @@ define apache::site($aliases="", $root="", $redirect="") {
case $operatingsystem {
debian,ubuntu: {
apache::debian::site { "${name}":
apache::debian::site { $name:
aliases => $aliases,
root => $root,
redirect => $redirect,
}
}
centos,fedora: {
apache::redhat::site { "${name}":
apache::redhat::site { $name:
aliases => $aliases,
root => $root,
redirect => $redirect,
@ -175,8 +175,8 @@ define apache::site($aliases="", $root="", $redirect="") {
if !$redirect {
$site_fqdn = $name ? {
"default" => "${homename}",
default => "${name}",
"default" => $homename,
default => $name,
}
apache::webalizer::site { "http/${site_fqdn}":
site_proto => "http",
@ -268,7 +268,7 @@ define apache::sslsite($ipaddr="_default_", $root="", $ssl_cert="", $ssl_key="",
case $operatingsystem {
debian,ubuntu: {
$apache_ssldir = "/etc/ssl"
apache::debian::sslsite { "${name}":
apache::debian::sslsite { $name:
ipaddr => $ipaddr,
root => $root,
ssl_cert => $ssl_cert,
@ -279,7 +279,7 @@ define apache::sslsite($ipaddr="_default_", $root="", $ssl_cert="", $ssl_key="",
}
centos,fedora: {
$apache_ssldir = "/etc/pki/tls"
apache::redhat::sslsite { "${name}":
apache::redhat::sslsite { $name:
ipaddr => $ipaddr,
root => $root,
ssl_cert => $ssl_cert,
@ -294,8 +294,8 @@ define apache::sslsite($ipaddr="_default_", $root="", $ssl_cert="", $ssl_key="",
}
$site_fqdn = $name ? {
"default" => "${homename}",
default => "${name}",
"default" => $homename,
default => $name,
}
apache::webalizer::site { "https/${site_fqdn}":
site_proto => "https",
@ -335,17 +335,17 @@ define apache::configfile($source="", $content="", $http=true, $https=true) {
case $operatingsystem {
debian,ubuntu: {
apache::debian::configfile { "${name}":
source => "${source}",
content => "${content}",
apache::debian::configfile { $name:
source => $source,
content => $content,
http => $http,
https => $https,
}
}
centos,fedora: {
apache::redhat::configfile { "${name}":
source => "${source}",
content => "${content}",
apache::redhat::configfile { $name:
source => $source,
content => $content,
http => $http,
https => $https,
}
@ -418,7 +418,7 @@ class apache::mod::fcgid {
ubuntu => "libapache2-mod-fcgid",
default => "mod_fcgid",
},
ensure => installed,
ensure => installed,
require => Package["httpd"],
}
@ -485,7 +485,7 @@ class apache::mod::perl {
ubuntu => "libapache2-mod-perl2",
default => "mod_perl",
},
ensure => installed,
ensure => installed,
require => Package["httpd"],
}
@ -518,7 +518,7 @@ class apache::mod::php {
ubuntu => "libapache2-mod-php5",
default => "php",
},
ensure => installed,
ensure => installed,
require => Package["httpd"],
}
@ -608,7 +608,7 @@ class apache::mod::python {
ubuntu => "libapache2-mod-python",
default => "mod_python",
},
ensure => installed,
ensure => installed,
require => Package["httpd"],
}