-
Notifications
You must be signed in to change notification settings - Fork 1.1k
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.
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
Added code to paramertize the libphp prefix #1852
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Makes sense
manifests/mod/php.pp
Outdated
@@ -49,7 +50,7 @@ | |||
$_package_name = undef | |||
} | |||
|
|||
$_lib = "libphp${php_version}.so" | |||
$_lib = "$libphp_prefix${php_version}.so" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This should be using braces: ${libphp_prefix}
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I have now added the braces.
Can you also remove the executable bit from the file again? |
Sorry but I'm not sure what you mean by this? |
The file mode changed from 100644 → 100755 which means it's executable. This file shouldn't be. |
Apologies for this, I am using Windows Subsystem for Linux which changes my permissions in certain circumstances. I have now corrected this. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No worries, it happens. The code looks correct. I'll leave it up to the puppetlabs repo owners now :)
Thank you :) |
this needs a rebase now :) |
@grahamuk2018 This change looks good to me. If you could rebase your work and add some documentation and test coverage I would feel happy to merge. |
a07150e
to
12a5856
Compare
Hello @grahamuk2018 , |
manifests/mod/php.pp
Outdated
@@ -57,7 +58,8 @@ | |||
if $apache::version::scl_httpd_version { | |||
$_lib = "librh-php${_php_version_no_dot}-php${_php_major}.so" | |||
} else { | |||
$_lib = "libphp${php_version}.so" | |||
# Controls php version and libphp prefix |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Indenting looks off here
Merging. All requirements have been met :-) and PR LGTM. |
This change allows libphp prefix in the $_lib variable to be changed as required. Currently I need to be able to set the value to libphp- as opposed to libphp.