10000 style guide fixes · guillemcanal/puppet-php@00ed4b1 · GitHub
[go: up one dir, main page]
Skip to content

Commit 00ed4b1

Browse files
sazsaz
committed
style guide fixes
2 parents cf28fde + 7117192 commit 00ed4b1

File tree

4 files changed

+80
-62
lines changed

4 files changed

+80
-62
lines changed

‎manifests/apache2.pp

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
1-
class php::apache2($apache2_ini_content = undef, $apache2_ini_source = undef) {
1+
class php::apache2 (
2+
$apache2_ini_content = undef,
3+
$apache2_ini_source = undef
4+
) inherits php::params {
25
require apache
36

47
include php
58
include php::apache2::install
69
include php::apache2::config
710

8-
Class["php::config"] ~> Service[$php::params::apache_service_name]
9-
}
11+
Class['php::config'] ~> Service[$php::params::apache_service_name]
12+
}

‎manifests/config.pp

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,44 @@
11
class php::config {
2-
file { $php::params::extra_dir:
3-
owner => root,
4-
group => root,
5-
purge => true,
6-
recurse => true,
7-
force => true,
8-
require => Class["php::install"],
9-
ensure => directory,
10-
}
2+
file { $php::params::extra_dir:
3+
ensure => directory,
4+
owner => 'root',
5+
group => 'root',
6+
purge => true,
7+
recurse => true,
8+
force => true,
9+
require => Class['php::install'],
10+
}
1111

12-
file { $php::params::conf_dir:
13-
owner => root,
14-
group => root,
15-
purge => true,
16-
recurse => true,
17-
force => true,
18-
require => Class["php::install"],
19-
ensure => directory,
20-
}
12+
file { $php::params::conf_dir:
13+
ensure => directory,
14+
owner => 'root',
15+
group => 'root',
16+
purge => true,
17+
recurse => true,
18+
force => true,
19+
require => Class['php::install'],
20+
}
2121

22-
file { $php::params::cli_ini:
23-
owner => root,
24-
group => root,
25-
require => Class["php::install"],
26-
ensure => file,
27-
content => $php::cli_ini_content,
28-
source => $php::cli_ini_source,
29-
}
22+
file { $php::params::cli_ini:
23+
ensure => file,
24+
owner => 'root',
25+
group => 'root',
26+
content => $php::cli_ini_content,
27+
source => $php::cli_ini_source,
28+
require => Class['php::install'],
29+
}
3030

31-
file { $php::params::cli_dir:
32-
owner => root,
33-
group => root,
34-
purge => true,
35-
recurse => true,
36-
force => true,
37-
require => Class["php::install"],
38-
ensure => directory,
39-
}
31+
file { $php::params::cli_dir:
32+
ensure => directory,
33+
owner => 'root',
34+
group => 'root',
35+
purge => true,
36+
recurse => true,
37+
force => true,
38+
require => Class['php::install'],
39+
}
4040

41-
file { "${php::params::cli_dir}conf.d":
42-
ensure => "../conf.d",
43-
}
41+
file { "${php::params::cli_dir}conf.d":
42+
ensure => '../conf.d',
43+
}
4444
}

‎manifests/fpm.pp

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
1-
class php::fpm($fpm_ini_content = undef, $fpm_ini_source = undef, $fpm_conf_content = undef, $fpm_conf_source = undef) {
2-
include php, php::fpm::install, php::fpm::config, php::fpm::service
1+
class php::fpm (
2+
$fpm_ini_content = undef,
3+
$fpm_ini_source = undef,
4+
$fpm_conf_content = undef,
5+
$fpm_conf_source = undef
6+
) {
7+
include php
8+
include php::fpm::install
9+
include php::fpm::config
10+
include php::fpm::service
311

4-
Class["php::config"] ~> Class["php::fpm::service"]
12+
Class['php::config'] ~> Class['php::fpm::service']
513
}

‎manifests/params.pp

Lines changed: 25 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,29 @@
11
class php::params {
2-
case $::operatingsystem {
3-
'ubuntu', 'debian': {
4-
$base_dir = "/etc/php5/"
5-
$cli_dir = "${base_dir}cli/"
6-
$cli_ini = "${cli_dir}php.ini"
7-
$cli_package_name = "php5-cli"
8-
$extra_dir = "${base_dir}extra/"
9-
$conf_dir = "${base_dir}conf.d/"
10-
$fpm_dir = "${base_dir}fpm/"
11-
$fpm_pool_dir = "${fpm_dir}pool.d/"
12-
$fpm_ini = "${fpm_dir}php.ini"
13-
$fpm_package_name = "php5-fpm"
14-
$fpm_conf = "${fpm_dir}php-fpm.conf"
15-
$fpm_service_name = "php5-fpm"
16-
$apache_dir = "${base_dir}apache2/"
17-
$apache_ini = "${apache_dir}php.ini"
18-
$apache_package_name = "libapache2-mod-php5"
19-
$apache_service_name = "apache2"
2+
case $::osfamily {
3+
debian: {
4+
$base_dir = '/etc/php5/'
5+
$cli_dir = "${base_dir}cli/"
6+
$cli_ini = "${cli_dir}php.ini"
7+
$cli_package_name = 'php5-cli'
8+
$extra_dir = "${base_dir}extra/"
9+
$conf_dir = "${base_dir}conf.d/"
10+
$fpm_dir = "${base_dir}fpm/"
11+
$fpm_pool_dir = "${fpm_dir}pool.d/"
12+
$fpm_ini = "${fpm_dir}php.ini"
13+
$fpm_package_name = 'php5-fpm'
14+
$fpm_conf = "${fpm_dir}php-fpm.conf"
15+
$fpm_service_name = 'php5-fpm'
16+
$apache_dir = "${base_dir}apache2/"
17+
$apache_ini = "${apache_dir}php.ini"
18+
$apache_package_name = 'libapache2-mod-php5'
19+
$apache_service_name = 'apache2'
20+
}
21+
default: {
22+
case $::operatingsystem {
23+
default: {
24+
fail("Unsupported platform: ${::osfamily}/${::operatingsystem}")
2025
}
26+
}
2127
}
28+
}
2229
}

0 commit comments

Comments
 (0)
0