diff --git a/manifests/module.pp b/manifests/module.pp index 9e90b6e..992d81f 100644 --- a/manifests/module.pp +++ b/manifests/module.pp @@ -14,10 +14,14 @@ include '::php::params' - # Manage the incorrect named php-apc package under Debians + # Manage naming issue of pecl installed packages on RHEL if ($title == 'apc') { $package = $::php::params::php_apc_package_name - } else { + } + elsif ($title == 'memcache') { + $package = $::php::params::php_memcache_package_name + } + else { # Hack to get pkg prefixes to work, i.e. php56-mcrypt title $package = $title ? { /^php/ => $title, diff --git a/manifests/module/ini.pp b/manifests/module/ini.pp index 50fe45f..1b08a5d 100644 --- a/manifests/module/ini.pp +++ b/manifests/module/ini.pp @@ -27,11 +27,16 @@ # Strip 'pecl-*' prefix is present, since .ini files don't have it $modname = regsubst($title , '^pecl-', '', 'G') - # Handle naming issue of php-apc package on Debian + # Handle naming issue of pecl installed packages on RHEL if ($modname == 'apc' and $pkgname == false) { # Package name $ospkgname = $::php::params::php_apc_package_name - } else { + } + elsif ($modname == 'memcache' and $pkgname == false) { + # Package name + $ospkgname = $::php::params::php_memcache_package_name + } + else { # Package name $ospkgname = $pkgname ? { /^php/ => "${pkgname}", diff --git a/manifests/params.pp b/manifests/params.pp index ff07341..7dc907d 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -3,6 +3,7 @@ 'Debian': { $php_package_name = 'php5' $php_apc_package_name = 'php-apc' + $php_memcache_package_name = 'php-memcache' $common_package_name = 'php5-common' $cli_package_name = 'php5-cli' $php_conf_dir = '/etc/php5/conf.d' @@ -19,6 +20,7 @@ default: { $php_package_name = 'php' $php_apc_package_name = 'php-pecl-apc' + $php_memcache_package_name = 'php-pecl-memcache' $common_package_name = 'php-common' $cli_package_name = 'php-cli' $php_conf_dir = '/etc/php.d'