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

42
custom/manifests/init.pp
View file

@ -50,11 +50,11 @@ define custom::file($ensure, $group="NONE", $mode="NONE", $owner="NONE", $seltyp
$test = regsubst($source, '^([^:]+)://.+$', '\1')
if "${test}" == "${source}" {
$method = "file"
$path = "${source}"
$path = $source
} else {
$method = "${test}"
$method = $test
}
case $method {
"ftp","http","https": {
$fetch_cmd = "wget -q -O '${name}' '${source}'"
@ -75,33 +75,33 @@ define custom::file($ensure, $group="NONE", $mode="NONE", $owner="NONE", $seltyp
cwd => regsubst($name, '(.*)/[^/]+$', '\1'),
command => $fetch_cmd,
unless => $diff_cmd,
before => File["${name}"],
before => File[$name],
}
}
}
file { "${name}":
ensure => "${ensure}",
source => "${method}" ? {
"file" => "${path}",
"puppet" => "${source}",
default => undef,
file { $name:
ensure => $ensure,
source => $method ? {
"file" => $path,
"puppet" => $source,
default => undef,
},
mode => "${mode}" ? {
"NONE" => undef,
default => "${mode}",
},
owner => "${owner}" ? {
mode => $mode ? {
"NONE" => undef,
default => "${owner}",
default => $mode,
},
group => "${group}" ? {
owner => $owner ? {
"NONE" => undef,
default => "${group}",
default => $owner,
},
seltype => "${seltype}" ? {
group => $group ? {
"NONE" => undef,
default => "${seltype}",
default => $group,
},
seltype => $seltype ? {
"NONE" => undef,
default => $seltype,
},
}
@ -132,7 +132,7 @@ class custom::rootpassword {
default: {
user { "root":
ensure => present,
password => "${root_password}",
password => $root_password,
}
}
}