diff --git a/lib/facter/ubuntu_release.rb b/lib/facter/ubuntu_release.rb new file mode 100644 index 0000000..fff8769 --- /dev/null +++ b/lib/facter/ubuntu_release.rb @@ -0,0 +1,3 @@ +Facter.add(:ubuntu_release) do + setcode "lsb_release -r | awk '/^Release:/ {print $2}'" +end diff --git a/manifests/params.pp b/manifests/params.pp index 75fbfd5..b201567 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -3,22 +3,41 @@ class php::params { case $::osfamily { 'Debian': { - $php_package_name = 'php5' - $php_apc_package_name = 'php-apc' - $common_package_name = 'php5-common' - $cli_package_name = 'php5-cli' - $cli_inifile = '/etc/php5/cli/php.ini' - $php_conf_dir = '/etc/php5/mods-available' - $fpm_package_name = 'php5-fpm' - $fpm_service_name = 'php5-fpm' - $fpm_service_restart = 'restart' - $fpm_pool_dir = '/etc/php5/fpm/pool.d' - $fpm_conf_dir = '/etc/php5/fpm' - $fpm_error_log = '/var/log/php5-fpm.log' - $fpm_pid = '/var/run/php5-fpm.pid' - $httpd_package_name = 'apache2' - $httpd_service_name = 'apache2' - $httpd_conf_dir = '/etc/apache2/conf.d' + if $::ubuntu_release == '16.04' { + $php_package_name = 'php' + $php_apc_package_name = 'php-apc' + $common_package_name = 'php-common' + $cli_package_name = 'php-cli' + $cli_inifile = '/etc/php/7.0/cli/php.ini' + $php_conf_dir = '/etc/php/7.0/mods-available' + $fpm_package_name = 'php-fpm' + $fpm_service_name = 'php7.0-fpm' + $fpm_service_restart = 'restart' + $fpm_pool_dir = '/etc/php/7.0/fpm/pool.d' + $fpm_conf_dir = '/etc/php/7.0/fpm' + $fpm_error_log = '/var/log/php-fpm.log' + $fpm_pid = '/var/run/php-fpm.pid' + $httpd_package_name = 'apache2' + $httpd_service_name = 'apache2' + $httpd_conf_dir = '/etc/apache2/conf.d' + } else { + $php_package_name = 'php5' + $php_apc_package_name = 'php-apc' + $common_package_name = 'php5-common' + $cli_package_name = 'php5-cli' + $cli_inifile = '/etc/php5/cli/php.ini' + $php_conf_dir = '/etc/php5/mods-available' + $fpm_package_name = 'php5-fpm' + $fpm_service_name = 'php5-fpm' + $fpm_service_restart = 'restart' + $fpm_pool_dir = '/etc/php5/fpm/pool.d' + $fpm_conf_dir = '/etc/php5/fpm' + $fpm_error_log = '/var/log/php5-fpm.log' + $fpm_pid = '/var/run/php5-fpm.pid' + $httpd_package_name = 'apache2' + $httpd_service_name = 'apache2' + $httpd_conf_dir = '/etc/apache2/conf.d' + } } default: { $php_package_name = 'php'