Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use package pecl-memcache on RHEL #56

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Use package pecl-memcache on RHEL #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5a3f403
Enable memcache pecl install for RHEL
christopher-hopper Feb 4, 2015
0492efc
Fix bug when defining memcache module package name
christopher-hopper Feb 5, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions manifests/module.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
9 changes: 7 additions & 2 deletions manifests/module/ini.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}",
Expand Down
2 changes: 2 additions & 0 deletions manifests/params.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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'
Expand Down