diff --git a/manifests/params.pp b/manifests/params.pp index bbcdff88..948eec63 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -217,7 +217,7 @@ $fpm_inifile = "${config_root}/php-fpm.ini" $fpm_package_suffix = undef $fpm_pool_dir = "${config_root}/php-fpm.d" - $fpm_service_name = 'php-fpm' + $fpm_service_name = 'php_fpm' $fpm_user = 'www' $fpm_group = 'www' $embedded_package_suffix = 'embed' diff --git a/spec/classes/php_fpm_service_spec.rb b/spec/classes/php_fpm_service_spec.rb index 39df3cee..d7c80068 100644 --- a/spec/classes/php_fpm_service_spec.rb +++ b/spec/classes/php_fpm_service_spec.rb @@ -39,7 +39,9 @@ when '20.04', '11' it { is_expected.to contain_service('php7.4-fpm').with_ensure('running') } end - when 'Suse', 'FreeBSD' + when 'FreeBSD' + it { is_expected.to contain_service('php_fpm').with_ensure('running') } + when 'Suse' it { is_expected.to contain_service('php-fpm').with_ensure('running') } end end diff --git a/spec/classes/php_fpm_spec.rb b/spec/classes/php_fpm_spec.rb index 04d13e43..c8ff6cf8 100644 --- a/spec/classes/php_fpm_spec.rb +++ b/spec/classes/php_fpm_spec.rb @@ -39,7 +39,7 @@ it { is_expected.not_to contain_package('php56-') } it { is_expected.not_to contain_package('php5-fpm') } it { is_expected.not_to contain_package('php-fpm') } - it { is_expected.to contain_service('php-fpm').with_ensure('running') } + it { is_expected.to contain_service('php_fpm').with_ensure('running') } else it { is_expected.to contain_package('php-fpm').with_ensure('present') } it { is_expected.to contain_service('php-fpm').with_ensure('running') }