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

Fix wrongly named parameters for apt::source/key #420

Merged
merged 2 commits into from
Mar 3, 2018
Merged

Fix wrongly named parameters for apt::source/key #420

merged 2 commits into from
Mar 3, 2018

Conversation

bitcrush
Copy link
Contributor

This PR fixes a naming issue in php::repo::debian. The parameters given to the apt::key and apt::source defined types are not valid for the puppetlabs/apt module >= 4.4.0, which this module depends on.

@c33s
Copy link
Member

c33s commented Feb 24, 2018

can you please also put the whole php7.1 part in an if and add a flag to it?

class php::repo::debian(
  $location     = 'http://packages.dotdeb.org',
  $release      = 'wheezy-php56',
  $repos        = 'all',
  $include_src  = false,
  $key          = {
    'id'     => '6572BBEF1B5FF28B28B706837E3F070089DF5277',
    'source' => 'http://www.dotdeb.org/dotdeb.gpg',
  },
  $dotdeb       = true,
  $sury         = true,
) {

and


if ($sury and $php::globals::php_version == '7.1') {
...

as i wrote #293 (comment) if you use the manage repo and provide the sury repo by hiera the new php7.1 section in this module part break it.

@juniorsysadmin juniorsysadmin added bug Something isn't working needs-work not ready to merge just yet labels Feb 25, 2018
@bitcrush
Copy link
Contributor Author

I implemented the requested flag. However the class lags functionality/configurabiltity. This is a proposal that should solve the issues mentioned in #293. In addition it adds support for PHP 7.2 on Jessie and Stretch. Please have a look and let me know if I should create another PR for it.

@c33s
Copy link
Member

c33s commented Feb 28, 2018

if i would have merge permissions i would merge/approve your PR but we have to wait for someone with merge permissions here.

@juniorsysadmin juniorsysadmin removed the needs-work not ready to merge just yet label Mar 3, 2018
@bastelfreak
Copy link
Member

Hi @bitcrush and @c33s, thanks for the work here!

@bastelfreak bastelfreak merged commit 89a2c1a into voxpupuli:master Mar 3, 2018
include_src => false,
require => [
location => 'https://packages.sury.org/php/',
release => $::lsbdistcodename,
Copy link
Member

Choose a reason for hiding this comment

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

preferred way would be to use the new facts hash instead of a topscope variable. If you want you can change this in another PR, or we just stick with it.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants