Skip to content

Commit 612e41c

Browse files
bastelfreakbastelfreak
authored
Merge pull request #634 from voxpupuli/data-types
Add/Fix data types of all parameters
2 parents 5c8aca3 + 0ed2f42 commit 612e41c

19 files changed

Lines changed: 114 additions & 120 deletions

File tree

‎manifests/apache_vhost.pp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818
# address of the fastcgi socket
1919
#
2020
define php::apache_vhost (
21-
$vhost = 'example.com',
22-
$docroot = '/var/www',
23-
$port = 80,
24-
$default_vhost = true,
25-
$fastcgi_socket = 'fcgi://127.0.0.1:9000/$1'
21+
String[1] $vhost = 'example.com',
22+
Stdlib::Absolutepath $docroot = '/var/www',
23+
Integer[1] $port = 80,
24+
Boolean $default_vhost = true,
25+
String[1] $fastcgi_socket = 'fcgi://127.0.0.1:9000/$1'
2626
) {
2727
::apache::vhost { $vhost:
2828
docroot => $docroot,

‎manifests/composer.pp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
class php::composer (
3030
String $source = $php::params::composer_source,
3131
Stdlib::Absolutepath $path = $php::params::composer_path,
32-
$proxy_type = undef,
33-
$proxy_server = undef,
32+
Optional[String[1]] $proxy_type = undef,
33+
Optional[String[1]] $proxy_server = undef,
3434
Php::ComposerChannel $channel = 'stable',
3535
Boolean $auto_update = true,
3636
Integer $max_age = $php::params::composer_max_age,

‎manifests/composer/auto_update.pp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@
2929
# }
3030
#
3131
class php::composer::auto_update (
32-
$max_age,
33-
$source,
34-
$path,
32+
Integer[1] $max_age,
33+
String[1] $source,
34+
Stdlib::Absolutepath $path,
3535
Php::ComposerChannel $channel = 'stable',
36-
$proxy_type = undef,
37-
$proxy_server = undef,
36+
Optional[String[1]] $proxy_type = undef,
37+
Optional[String[1]] $proxy_server = undef,
3838
) {
3939
assert_private()
4040

‎manifests/config/setting.pp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
# }
2020
#
2121
define php::config::setting (
22-
$key,
23-
$value,
22+
String[1] $key,
23+
Variant[Integer, String[1]] $value,
2424
Stdlib::Absolutepath $file,
2525
) {
2626
assert_private()

‎manifests/fpm.pp‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -60,20 +60,20 @@
6060
# This default will be changed in a future release.
6161
#
6262
class php::fpm (
63-
String $ensure = $php::ensure,
64-
$user = $php::fpm_user,
65-
$group = $php::fpm_group,
66-
$service_ensure = $php::fpm_service_ensure,
67-
$service_enable = $php::fpm_service_enable,
68-
$service_name = $php::fpm_service_name,
69-
$service_provider = $php::fpm_service_provider,
63+
Optional[String] $ensure = $php::ensure,
64+
String[1] $user = $php::fpm_user,
65+
String[1] $group = $php::fpm_group,
66+
Enum['running', 'stopped'] $service_ensure = $php::fpm_service_ensure,
67+
Boolean $service_enable = $php::fpm_service_enable,
68+
String[1] $service_name = $php::fpm_service_name,
69+
Optional[String[1]] $service_provider = $php::fpm_service_provider,
7070
String $package = $php::real_fpm_package,
7171
Stdlib::Absolutepath $inifile = $php::fpm_inifile,
7272
Hash $settings = $php::real_settings,
73-
$global_pool_settings = $php::real_fpm_global_pool_settings,
73+
Hash $global_pool_settings = $php::real_fpm_global_pool_settings,
7474
Hash $pools = $php::real_fpm_pools,
75-
$log_owner = $php::log_owner,
76-
$log_group = $php::log_group,
75+
String[1] $log_owner = $php::log_owner,
76+
String[1] $log_group = $php::log_group,
7777
Boolean $pool_purge = $php::pool_purge,
7878
Boolean $reload_fpm_on_config_changes = $php::reload_fpm_on_config_changes,
7979
) {

‎manifests/fpm/config.pp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -71,26 +71,26 @@
7171
# Path to fpm pid file
7272
#
7373
class php::fpm::config (
74-
$config_file = $php::params::fpm_config_file,
74+
Stdlib::Absolutepath $config_file = $php::params::fpm_config_file,
7575
String $user = $php::params::fpm_user,
7676
String $group = $php::params::fpm_group,
7777
String $inifile = $php::params::fpm_inifile,
78-
$pid_file = $php::params::fpm_pid_file,
78+
Stdlib::Absolutepath $pid_file = $php::params::fpm_pid_file,
7979
Hash $settings = {},
8080
Stdlib::Absolutepath $pool_base_dir = $php::params::fpm_pool_dir,
81-
$pool_purge = false,
81+
Boolean $pool_purge = false,
8282
String $error_log = $php::params::fpm_error_log,
8383
String $log_level = 'notice',
8484
Integer $emergency_restart_threshold = 0,
85-
Variant[Integer, Pattern[/^\d+[smhd]?$/]] $emergency_restart_interval = 0,
86-
Variant[Integer, Pattern[/^\d+[smhd]?$/]] $process_control_timeout = 0,
85+
Php::Duration $emergency_restart_interval = 0,
86+
Php::Duration $process_control_timeout = 0,
8787
Integer $process_max = 0,
88-
$rlimit_files = undef,
89-
Optional[Variant[Integer,Pattern[/^\d+[smhd]?$/]]] $systemd_interval = undef,
88+
Optional[Integer[1]] $rlimit_files = undef,
89+
Optional[Php::Duration] $systemd_interval = undef,
9090
String $log_owner = $php::params::fpm_user,
9191
String $log_group = $php::params::fpm_group,
9292
Pattern[/^\d+$/] $log_dir_mode = '0770',
93-
$root_group = $php::params::root_group,
93+
String[1] $root_group = $php::params::root_group,
9494
String $syslog_facility = 'daemon',
9595
String $syslog_ident = 'php-fpm',
9696
) inherits php::params {

‎manifests/fpm/pool.pp‎

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -121,49 +121,49 @@
121121
# '/etc/php5/fpm/pool.d' or '/etc/php-fpm.d'
122122
#
123123
define php::fpm::pool (
124-
$ensure = 'present',
125-
$listen = '127.0.0.1:9000',
126-
$listen_backlog = '-1',
127-
$listen_allowed_clients = undef,
128-
$listen_owner = undef,
129-
$listen_group = undef,
130-
$listen_mode = undef,
131-
$user = $php::fpm::config::user,
132-
$group = $php::fpm::config::group,
124+
Enum['present', 'absent'] $ensure = 'present',
125+
String[1] $listen = '127.0.0.1:9000',
126+
Integer[-1] $listen_backlog = -1,
127+
Optional[String[1]] $listen_allowed_clients = undef,
128+
Optional[String[1]] $listen_owner = undef,
129+
Optional[String[1]] $listen_group = undef,
130+
Optional[Stdlib::Filemode] $listen_mode = undef,
131+
String[1] $user = $php::fpm::config::user,
132+
String[1] $group = $php::fpm::config::group,
133133
Optional[String[1]] $apparmor_hat = undef,
134-
$pm = 'dynamic',
135-
$pm_max_children = '50',
136-
$pm_start_servers = '5',
137-
$pm_min_spare_servers = '5',
138-
$pm_max_spare_servers = '35',
139-
$pm_max_requests = '0',
140-
$pm_process_idle_timeout = '10s',
141-
$pm_status_path = undef,
142-
$ping_path = undef,
143-
$ping_response = 'pong',
144-
$access_log = undef,
145-
$access_log_format = '"%R - %u %t \"%m %r\" %s"',
146-
$request_terminate_timeout = '0',
147-
$request_slowlog_timeout = '0',
148-
$security_limit_extensions = undef,
149-
$slowlog = "/var/log/php-fpm/${name}-slow.log",
150-
$template = 'php/fpm/pool.conf.erb',
151-
$rlimit_files = undef,
152-
$rlimit_core = undef,
153-
$chroot = undef,
154-
$chdir = undef,
155-
$catch_workers_output = 'no',
156-
$include = undef,
157-
$env = [],
158-
$env_value = {},
159-
$clear_env = true,
160-
$options = {},
161-
$php_value = {},
162-
$php_flag = {},
163-
$php_admin_value = {},
164-
$php_admin_flag = {},
165-
$php_directives = [],
166-
$root_group = $php::params::root_group,
134+
String[1] $pm = 'dynamic',
135+
Integer[1] $pm_max_children = 50,
136+
Integer[1] $pm_start_servers = 5,
137+
Integer[0] $pm_min_spare_servers = 5,
138+
Integer[0] $pm_max_spare_servers = 35,
139+
Integer[0] $pm_max_requests = 0,
140+
Php::Duration $pm_process_idle_timeout = '10s',
141+
Optional[Stdlib::Absolutepath] $pm_status_path = undef,
142+
Optional[Stdlib::Absolutepath] $ping_path = undef,
143+
String[1] $ping_response = 'pong',
144+
Optional[Stdlib::Absolutepath] $access_log = undef,
145+
String[1] $access_log_format = '"%R - %u %t \"%m %r\" %s"',
146+
Php::Duration $request_terminate_timeout = 0,
147+
Php::Duration $request_slowlog_timeout = 0,
148+
Array[String[1]] $security_limit_extensions = [],
149+
Stdlib::Absolutepath $slowlog = "/var/log/php-fpm/${name}-slow.log",
150+
String[1] $template = 'php/fpm/pool.conf.erb',
151+
Optional[Integer] $rlimit_files = undef,
152+
Optional[Integer] $rlimit_core = undef,
153+
Optional[Stdlib::Absolutepath] $chroot = undef,
154+
Optional[Stdlib::Absolutepath] $chdir = undef,
155+
Enum['yes', 'no'] $catch_workers_output = 'no',
156+
Optional[String[1]] $include = undef,
157+
Array[String[1]] $env = [],
158+
Hash $env_value = {},
159+
Boolean $clear_env = true,
160+
Hash $options = {},
161+
Hash $php_value = {},
162+
Hash $php_flag = {},
163+
Hash $php_admin_value = {},
164+
Hash $php_admin_flag = {},
165+
Array[String[1]] $php_directives = [],
166+
String[1] $root_group = $php::params::root_group,
167167
Optional[Stdlib::Absolutepath] $base_dir = undef,
168168
) {
169169
# The base class must be included first because it is used by parameter defaults

‎manifests/fpm/service.pp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121
# This default will be changed in a future release.
2222
#
2323
class php::fpm::service (
24-
$service_name = $php::fpm::service_name,
25-
$ensure = $php::fpm::service_ensure,
26-
$enable = $php::fpm::service_enable,
27-
$provider = $php::fpm::service_provider,
24+
String[1] $service_name = $php::fpm::service_name,
25+
Enum['running', 'stopped'] $ensure = $php::fpm::service_ensure,
26+
Boolean $enable = $php::fpm::service_enable,
27+
Optional[String[1]] $provider = $php::fpm::service_provider,
2828
Boolean $reload_fpm_on_config_changes = $php::fpm::reload_fpm_on_config_changes,
2929
) {
3030
if ! defined(Class['php::fpm']) {

‎manifests/globals.pp‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,13 @@
1515
# The mode specifies the specifics in paths for the various RedHat SCL environments so that the module is configured
1616
# correctly on their pathnames.
1717
#
18-
# Valid modes are: 'rhscl', 'remi'
19-
#
2018

2119
class php::globals (
2220

2321
Optional[Pattern[/^(rh-)?(php)?[57](\.)?[0-9]/]] $php_version = undef,
2422
Optional[Stdlib::Absolutepath] $config_root = undef,
2523
Optional[Stdlib::Absolutepath] $fpm_pid_file = undef,
26-
$rhscl_mode = undef,
24+
Optional[Enum['rhscl', 'remi']] $rhscl_mode = undef,
2725
) {
2826
$default_php_version = $facts['os']['name'] ? {
2927
'Debian' => $facts['os']['release']['major'] ? {

‎manifests/init.pp‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -137,29 +137,29 @@
137137
String $ensure = $php::params::ensure,
138138
Boolean $manage_repos = $php::params::manage_repos,
139139
Boolean $fpm = true,
140-
$fpm_service_enable = $php::params::fpm_service_enable,
141-
$fpm_service_ensure = $php::params::fpm_service_ensure,
142-
$fpm_service_name = $php::params::fpm_service_name,
143-
$fpm_service_provider = undef,
140+
Boolean $fpm_service_enable = $php::params::fpm_service_enable,
141+
Enum['running', 'stopped'] $fpm_service_ensure = $php::params::fpm_service_ensure,
142+
String[1] $fpm_service_name = $php::params::fpm_service_name,
143+
Optional[String[1]] $fpm_service_provider = undef,
144144
Hash $fpm_pools = $php::params::fpm_pools,
145145
Hash $fpm_global_pool_settings = {},
146-
$fpm_inifile = $php::params::fpm_inifile,
147-
$fpm_package = undef,
148-
$fpm_user = $php::params::fpm_user,
149-
$fpm_group = $php::params::fpm_group,
146+
Stdlib::Absolutepath $fpm_inifile = $php::params::fpm_inifile,
147+
Optional[String[1]] $fpm_package = undef,
148+
String[1] $fpm_user = $php::params::fpm_user,
149+
String[1] $fpm_group = $php::params::fpm_group,
150150
Boolean $embedded = false,
151151
Boolean $dev = true,
152152
Boolean $composer = true,
153153
Boolean $pear = true,
154154
String $pear_ensure = $php::params::pear_ensure,
155155
Boolean $phpunit = false,
156156
Boolean $apache_config = false,
157-
$proxy_type = undef,
158-
$proxy_server = undef,
157+
Optional[String[1]] $proxy_type = undef,
158+
Optional[String[1]] $proxy_server = undef,
159159
Hash $extensions = {},
160160
Hash $settings = {},
161161
Hash $cli_settings = {},
162-
$package_prefix = $php::params::package_prefix,
162+
Optional[String[1]] $package_prefix = $php::params::package_prefix,
163163
Stdlib::Absolutepath $config_root_ini = $php::params::config_root_ini,
164164
Stdlib::Absolutepath $config_root_inifile = $php::params::config_root_inifile,
165165
Optional[Stdlib::Absolutepath] $ext_tool_enable = $php::params::ext_tool_enable,

0 commit comments

Comments
 (0)