8000 more style fixes · guillemcanal/puppet-php@14b201e · GitHub
[go: up one dir, main page]
Skip to content

Commit 14b201e

Browse files
sazsaz
committed
more style fixes
2 parents 00ed4b1 + 2f0f94d commit 14b201e

File tree

3 files changed

+139
-100
lines changed

3 files changed

+139
-100
lines changed

‎manifests/conf.pp

Lines changed: 46 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,49 @@
1-
define php::conf($ensure = present, $source = undef, $content = undef, $require = undef, $notify = undef) {
2-
include php
1+
define php::conf(
2+
$ensure = present,
3+
$source = undef,
4+
$content = undef,
5+
$require = undef,
6+
$notify = undef
7+
) {
8+
include php
39

4-
$file_name = "${name}.ini"
10+
$file_name = "${name}.ini"
511

6-
# Puppet will bail out if both source and content is set,
7-
# hence we don't have to deal with it.
8-
file { $file_name:
9-
path => "${php::params::conf_dir}${file_name}",
10-
mode => 644,
11-
owner => root,
12-
group => root,
13-
ensure => $ensure,
14-
notify => $notify,
15-
require => $require ? {
16-
undef => Class['php'],
17-
default => [ Class['php'], $require, ],
18-
},
19-
source => $source ? {
20-
undef => undef,
21-
true => [
22-
"puppet:///files/${fqdn}/etc/php5/conf.d/${file_name}",
23-
"puppet:///files/${hostgroup}/etc/php5/conf.d/${file_name}",
24-
"puppet:///files/${domain}/etc/php5/conf.d/${file_name}",
25-
"puppet:///files/global/etc/php5/conf.d/${file_name}",
26-
],
27-
default => $source,
28-
},
29-
content => $content ? {
30-
undef => undef,
31-
default => template("${content}${file_name}.erb"),
32-
},
33-
}
12+
$require_real = $require ? {
13+
undef => Class['php'],
14+
default => [
15+
Class['php'],
16+
$require,
17+
],
18+
}
19+
20+
$content_real = $content ? {
21+
undef => undef,
22+
default => template("${content}${file_name}.erb"),
23+
}
24+
25+
$source_real = $source ? {
26+
undef => undef,
27+
true => [
28+
"puppet:///files/${::fqdn}/etc/php5/conf.d/${file_name}",
29+
"puppet:///files/${::hostgroup}/etc/php5/conf.d/${file_name}",
30+
"puppet:///files/${::domain}/etc/php5/conf.d/${file_name}",
31+
"puppet:///files/global/etc/php5/conf.d/${file_name}",
32+
],
33+
default => $source,
34+
}
35+
36+
# Puppet will bail out if both source and content is set,
37+
# hence we don't have to deal with it.
38+
file { $file_name:
39+
ensure => $ensure,
40+
path => "${php::params::conf_dir}${file_name}",
41+
mode => '0644',
42+
owner => 'root',
43+
group => 'root',
44+
notify => $notify,
45+
require => $require_real,
46+
source => $source_real,
47+
content => $content_real,
48+
}
3449
}
‎manifests/extra.pp
Lines changed: 40 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,43 @@
1-
define php::extra($ensure = present, $source = undef, $content = undef, $require = undef, $notify = undef) {
2-
# Puppet will bail out if both source and content is set,
3-
# hence we don't have to deal with it.
1+
define php::extra (
2+
$ensure = present,
3+
$source = undef,
4+
$content = undef,
5+
$require = undef,
6+
$notify = undef
7+
) {
8+
# Puppet will bail out if both source and content is set,
9+
# hence we don't have to deal with it.
410

5-
$file_name = "${name}.ini"
11+
$file_name = "${name}.ini"
612

7-
file { $file_name:
8-
path => "${php::params::extra_dir}${file_name}",
9-
mode => 644,
10-
owner => root,
11-
group => root,
12-
ensure => $ensure,
13-
notify => $notify,
14-
require => [
15-
Class["php"],
16-
$require,
17-
],
18-
source => $source ? {
19-
undef => undef,
20-
true => [
21-
"puppet:///files/${fqdn}/etc/php5/extra/${file_name}",
22-
"puppet:///files/${hostgroup}/etc/php5/extra/${file_name}",
23-
"puppet:///files/${domain}/etc/php5/extra/${file_name}",
24-
"puppet:///files/global/etc/php5/extra/${file_name}",
25-
],
26-
default => "${source}${file_name}",
27-
},
28-
content => $content ? {
29-
undef => undef,
30-
default => template("${content}${file_name}.erb"),
31-
},
32-
}
13+
$source_real = $source ? {
14+
default => "${source}${file_name}",
15+
undef => undef,
16+
true => [
17+
"puppet:///files/${::fqdn}/etc/php5/extra/${file_name}",
18+
"puppet:///files/${::hostgroup}/etc/php5/extra/${file_name}",
19+
"puppet:///files/${::domain}/etc/php5/extra/${file_name}",
20+
"puppet:///files/global/etc/php5/extra/${file_name}",
21+
],
22+
}
23+
24+
$content_real = $content ? {
25+
undef => undef,
26+
default => template("${content}${file_name}.erb"),
27+
}
28+
29+
file { $file_name:
30+
ensure => $ensure,
31+
path => "${php::params::extra_dir}${file_name}",
32+
mode => '0644',
33+
owner => 'root',
34+
group => 'root',
35+
notify => $notify,
36+
source => $source_real,
37+
content => $content_real,
38+
require => [
39+
Class['php'],
40+
$require,
41+
],
42+
}
3343
}

‎manifests/module.pp

Lines changed: 53 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,58 @@
1-
define php::module($ensure = present, $source = undef, $content = undef, $require = undef, $notify = undef, $package_prefix = 'php5-') {
2-
include php
1+
define php::module(
2+
$ensure = present,
3+
$package_prefix = 'php5-',
4+
$source = undef,
5+
$content = undef,
6+
$require = undef,
< 10000 code>7+
$notify = undef
8+
) {
9+
include php
310

4-
$file_name = "${name}.ini"
11+
$file_name = "${name}.ini"
512

6-
if $require {
7-
$real_require = [ Class['php::install'], $require, ]
8-
} else {
9-
$real_require = Class['php::install']
10-
}
13+
if $require {
14+
$real_require = [
15+
Class['php::install'],
16+
$require,
17+
]
18+
} else {
19+
$real_require = Class['php::install']
20+
}
1121

12-
package { "php-${name}":
13-
name => "${package_prefix}${name}",
14-
ensure => $ensure,
15-
require => $real_require,
16-
}
22+
package { "php-${name}":
23+
ensure => $ensure,
24+
name => "${package_prefix}${name}",
25+
require => $real_require,
26+
}
1727

18-
file { $file_name:
19-
path => "${php::params::conf_dir}${file_name}",
20-
mode => 644,
21-
owner => root,
22-
group => root,
23-
ensure => $ensure,
24-
notify => $notify,
25-
source => $source ? {
26-
undef => undef,
27-
true => [
28-
"puppet:///files/${fqdn}/etc/php5/conf.d/${file_name}",
29-
"puppet:///files/${hostgroup}/etc/php5/conf.d/${file_name}",
30-
"puppet:///files/${domain}/etc/php5/conf.d/${file_name}",
31-
"puppet:///files/global/etc/php5/conf.d/${file_name}",
32-
],
33-
default => $source,
34-
},
35-
content => $content ? {
36-
undef => undef,
37-
default => template("${content}${file_name}.erb"),
38-
},
39-
require => [
40-
Class["php"],
41-
Package["php-${name}"],
42-
],
43-
}
28+
$source_real = $source ? {
29+
undef => undef,
30+
true => [
31+
"puppet:///files/${::fqdn}/etc/php5/conf.d/${file_name}",
32+
"puppet:///files/${::hostgroup}/etc/php5/conf.d/${file_name}",
33+
"puppet:///files/${::domain}/etc/php5/conf.d/${file_name}",
34+
"puppet:///files/global/etc/php5/conf.d/${file_name}",
35+
],
36+
default => $source,
37+
}
38+
39+
$content_real = $content ? {
40+
undef => undef,
41+
default => template("${content}${file_name}.erb"),
42+
}
43+
44+
file { $file_name:
45+
ensure => $ensure,
46+
path => "${php::params::conf_dir}${file_name}",
47+
mode => '0644',
48+
owner => 'root',
49+
group => 'root',
50+
notify => $notify,
51+
source => $source_real,
52+
content => $content_real,
53+
require => [
54+
Class['php'],
55+
Package["php-${name}"],
56+
],
57+
}
4458
}

0 commit comments

Comments
 (0)
0