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

26
apache/manifests/redhat.pp
View file

@ -57,7 +57,7 @@ define apache::redhat::site($aliases, $root, $redirect) {
file { "/srv/www/http/${site_fqdn}":
ensure => link,
target => $root,
before => File["${site_conf}"],
before => File[$site_conf],
}
} else {
file { "/srv/www/http/${site_fqdn}":
@ -65,7 +65,7 @@ define apache::redhat::site($aliases, $root, $redirect) {
mode => 0755,
owner => root,
group => root,
before => File["${site_conf}"],
before => File[$site_conf],
}
}
@ -74,12 +74,12 @@ define apache::redhat::site($aliases, $root, $redirect) {
mode => 0755,
owner => root,
group => root,
before => File["${site_conf}"],
before => File[$site_conf],
}
}
}
file { "${site_conf}":
file { $site_conf:
ensure => present,
mode => 0644,
owner => root,
@ -88,14 +88,14 @@ define apache::redhat::site($aliases, $root, $redirect) {
}
if $redirect {
File["${site_conf}"] {
File[$site_conf] {
content => "<VirtualHost *:80>\n ServerName ${site_fqdn}\n Redirect permanent / ${redirect}\n</VirtualHost>\n",
}
} else {
File["${site_conf}"] {
File[$site_conf] {
content => template("apache/site.http.conf.erb"),
}
file { "${site_confdir}":
file { $site_confdir:
ensure => directory,
mode => 0644,
owner => root,
@ -105,7 +105,7 @@ define apache::redhat::site($aliases, $root, $redirect) {
recurse => true,
source => [ "puppet:///files/apache/sites/${site_fqdn}",
"puppet:///modules/custom/empty", ],
before => File["${site_conf}"],
before => File[$site_conf],
notify => Service["httpd"],
}
}
@ -257,7 +257,7 @@ define apache::redhat::sslsite($ipaddr, $root, $ssl_cert, $ssl_key, $ssl_chain)
$site_conf = "/etc/httpd/site.https.d/${site_fqdn}.conf"
$site_confdir = "/etc/httpd/site.https.d/${site_fqdn}.d"
file { "${site_conf}":
file { $site_conf:
ensure => present,
content => template("apache/site.https.conf.erb"),
mode => 0644,
@ -268,7 +268,7 @@ define apache::redhat::sslsite($ipaddr, $root, $ssl_cert, $ssl_key, $ssl_chain)
File["/etc/pki/tls/private/${site_fqdn}.key"], ],
}
file { "${site_confdir}":
file { $site_confdir:
ensure => directory,
mode => 0644,
owner => root,
@ -278,7 +278,7 @@ define apache::redhat::sslsite($ipaddr, $root, $ssl_cert, $ssl_key, $ssl_chain)
recurse => true,
source => [ "puppet:///files/apache/sslsites/${site_fqdn}",
"puppet:///modules/custom/empty", ],
before => File["${site_conf}"],
before => File[$site_conf],
notify => Service["httpsd"],
}
@ -289,7 +289,7 @@ define apache::redhat::configfile($source, $content, $http, $https) {
if defined(Service["httpd"]) {
file { "/etc/httpd/conf.http.d/${name}":
ensure => $http ? {
ensure => $http ? {
true => present,
default => absent,
},
@ -322,7 +322,7 @@ define apache::redhat::configfile($source, $content, $http, $https) {
if defined(Service["httpsd"]) {
file { "/etc/httpd/conf.https.d/${name}":
ensure => $https ? {
ensure => $https ? {
true => present,
default => absent,
},