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

24
puppet/manifests/init.pp
View file

@ -4,7 +4,7 @@
class puppet::client {
tag("bootstrap")
if ! $puppet_server {
$puppet_server = "puppet"
}
@ -19,15 +19,15 @@ class puppet::client {
}
case $operatingsystem {
centos,fedora: {
package { "ruby-shadow":
ensure => installed,
}
}
centos,fedora: {
package { "ruby-shadow":
ensure => installed,
}
}
ubuntu,debian: {
package { "libaugeas-ruby":
name => regsubst($rubyversion, '^([0-9]+\.[0-9]+)\..*', 'libaugeas-ruby\1'),
ensure => installed,
name => regsubst($rubyversion, '^([0-9]+\.[0-9]+)\..*', 'libaugeas-ruby\1'),
before => Service["puppet"],
}
}
@ -44,7 +44,7 @@ class puppet::client {
}
}
}
file { "/etc/puppet/puppet.conf":
ensure => present,
content => template("puppet/puppet.conf.erb"),
@ -259,7 +259,7 @@ class puppet::server::common inherits puppet::client {
}
if $puppet_datadir {
file { "${puppet_datadir}":
file { $puppet_datadir:
ensure => directory,
mode => 0755,
owner => root,
@ -272,9 +272,9 @@ class puppet::server::common inherits puppet::client {
}
file { "/srv/puppet":
ensure => link,
target => "${puppet_datadir}",
target => $puppet_datadir,
seltype => "var_lib_t",
require => File["${puppet_datadir}"],
require => File[$puppet_datadir],
}
} else {
file { "/srv/puppet":
@ -299,7 +299,7 @@ class puppet::server::common inherits puppet::client {
selinux::manage_fcontext { "${puppet_datadir}(/.*)?":
type => "var_lib_t",
before => File[$puppet_datadir],
}
}
}
}