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.

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

Merged
merged 4 commits into from
Feb 26, 2019

Conversation

grahamuk2018
Copy link

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.

Copy link
Collaborator

@ekohl ekohl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Makes sense

@@ -49,7 +50,7 @@
$_package_name = undef
}

$_lib = "libphp${php_version}.so"
$_lib = "$libphp_prefix${php_version}.so"
Copy link
Collaborator

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}

Copy link
Author

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.

@ekohl
Copy link
Collaborator

ekohl commented Nov 27, 2018

Can you also remove the executable bit from the file again?

@grahamuk2018
Copy link
Author

Can you also remove the executable bit from the file again?

Sorry but I'm not sure what you mean by this?

@ekohl
Copy link
Collaborator

ekohl commented Nov 27, 2018

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.

@grahamuk2018
Copy link
Author

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.

Copy link
Collaborator

@ekohl ekohl left a 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 :)

@grahamuk2018
Copy link
Author

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.

Thank you :)

@mmoll
Copy link
Contributor

mmoll commented Dec 14, 2018

this needs a rebase now :)

@david22swan
Copy link
Member

@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.

@grahamuk2018 grahamuk2018 force-pushed the parameterize-libphp branch 2 times, most recently from a07150e to 12a5856 Compare January 15, 2019 09:03
@lionce
Copy link
Contributor

lionce commented Jan 29, 2019

Hello @grahamuk2018 ,
It seems like this PR has some conflicts that must be resolved. Look forward to hearing from you.

@@ -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
Copy link
Collaborator

@ekohl ekohl Feb 21, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indenting looks off here

@pmcmaw
Copy link
Contributor

pmcmaw commented Feb 26, 2019

Merging. All requirements have been met :-) and PR LGTM.
Thanks for the rebase @HelenCampbell 👍

@pmcmaw pmcmaw merged commit 359ca1d into puppetlabs:master Feb 26, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants