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

@ -20,11 +20,11 @@ class mysql::client {
class mysql::server {
package { "mysql-server":
ensure => installed,
ensure => installed,
}
if $mysql_datadir {
file { "${mysql_datadir}":
file { $mysql_datadir:
ensure => directory,
mode => 0755,
owner => mysql,
@ -34,9 +34,9 @@ class mysql::server {
}
file { "/srv/mysql":
ensure => link,
target => "${mysql_datadir}",
target => $mysql_datadir,
seltype => "mysqld_db_t",
require => File["${mysql_datadir}"],
require => File[$mysql_datadir],
}
} else {
file { "/srv/mysql":
@ -57,7 +57,7 @@ class mysql::server {
if $mysql_datadir {
selinux::manage_fcontext { "${mysql_datadir}(/.*)?":
type => "mysqld_db_t",
before => File["${mysql_datadir}"],
before => File[$mysql_datadir],
}
}
}
@ -68,30 +68,30 @@ class mysql::server {
"debian" => "mysql",
default => "mysqld",
},
ensure => running,
enable => true,
require => File["/srv/mysql"],
ensure => running,
enable => true,
require => File["/srv/mysql"],
}
file { "/etc/my.cnf":
ensure => present,
source => [ "puppet:///files/mysql/my.cnf.${hostname}",
"puppet:///files/mysql/my.cnf",
"puppet:///modules/mysql/my.cnf", ],
mode => 0644,
owner => root,
group => root,
require => Package["mysql-server"],
notify => Service["mysqld"],
ensure => present,
source => [ "puppet:///files/mysql/my.cnf.${hostname}",
"puppet:///files/mysql/my.cnf",
"puppet:///modules/mysql/my.cnf", ],
mode => 0644,
owner => root,
group => root,
require => Package["mysql-server"],
notify => Service["mysqld"],
}
file { "/etc/logrotate.d/mysql":
ensure => present,
source => "puppet:///modules/mysql/mysql.logrotate",
mode => 0644,
owner => root,
group => root,
require => Package["mysql-server"],
ensure => present,
source => "puppet:///modules/mysql/mysql.logrotate",
mode => 0644,
owner => root,
group => root,
require => Package["mysql-server"],
}
file { "/var/lib/mysql":