Do not use a a hardcoded default for php::repo::debian #430

jkroepke · 2018-03-14T10:07:04Z

On Debian 8 and 9 systems, the dotdeb debian 7 repo will be used by default. This shouldn't be.

Some breaking changes here since all location special handling removed for now.

bastelfreak · 2018-03-17T17:51:33Z

manifests/repo/debian.pp

-      ::apt::source { 'dotdeb-wheezy':
-        location => $location,
+      ::apt::source { 'php-wheezy':
+        location => 'http://packages.dotdeb.org',


we can use $location here, right?

this is the question, if we want this module to auto manage the repos, we have to add hardcoded locations. like

if stretch and php version = 7.1 or 5.6 auto use sury

if wheezy ... use dotdeb or sury (or sury for all, we have to build a matrix what repo should automatically be used

some kind of if location is undef -> use auto mode, else do not use any hardcoded repo

bastelfreak · 2018-03-17T17:52:03Z

Hi @jkroepke, thanks for this bugfix. Can you add unit tests or an acceptance test that verifies it's now working correctly?

jkroepke · 2018-03-17T18:02:47Z

$location is used here

https://github.com/voxpupuli/puppet-php/pull/430/files#diff-9f5ae5c7a7b8c3af838615f1765cde65L51

bastelfreak · 2018-03-17T19:21:09Z

All those repos and conditions are quite confusing. Can you please add tests for this?

c33s

i think we have to discuss the direction of this module for debian a little bit. if not the next PR will surely make changes here again

c33s · 2018-03-17T20:03:12Z

manifests/repo/debian.pp

-  $dotdeb       = true,
-  $sury         = true,
+  Boolean          $dotdeb       = false,
+  Boolean          $sury         = false,


Bc break. both bool flags should stay on true or if the sury parameter has not be released, we can change sury to false as default

c33s · 2018-03-17T20:06:13Z

manifests/repo/debian.pp

@@ -47,7 +47,7 @@
    source => $key['source'],
  }})

-  ::apt::source { "source_php_${release}":
+  ::apt::source { 'php-upstream':


@bastelfreak we should make this name configureable. i personally prefer to name my repo files according the upstream name dotdeb or sury and not according the content php. both provide php but also other things. especially dotdeb provides a lot of other stuff

I agree, but thats out of the scope here.

c33s · 2018-03-17T20:10:16Z

manifests/repo/debian.pp

-      ::apt::source { 'dotdeb-wheezy':
-        location => $location,
+      ::apt::source { 'php-wheezy':
+        location => 'http://packages.dotdeb.org',


this is the question, if we want this module to auto manage the repos, we have to add hardcoded locations. like

if stretch and php version = 7.1 or 5.6 auto use sury

if wheezy ... use dotdeb or sury (or sury for all, we have to build a matrix what repo should automatically be used

some kind of if location is undef -> use auto mode, else do not use any hardcoded repo

c33s · 2018-03-17T20:11:39Z

manifests/repo/debian.pp

-  $repos        = 'all',
-  $include_src  = false,
-  $key          = {
+  String           $location     = 'http://packages.dotdeb.org',


if we use the auto stuff i described below, we also should set the default location and key hash to undef

jkroepke · 2018-03-20T23:20:49Z

Okay.

The point of this PR is to support current debian version without changing the behavior old debian 7.

Since I don't have any knowledge about debian repos (it doesn't looks like an charm), optimization should be done in a follow-up PR.

jkroepke · 2018-04-08T12:12:34Z

Good enough for most cases.

I removed some special handing. This class should be easier to maintain now.

c33s

in general i think we have to fix the debian tests before we refactor something. i would like to use the hiera module data for all the hardcoded stuff

c33s · 2018-04-08T12:47:23Z

manifests/repo/debian.pp

-  }})
-
-  ::apt::source { "source_php_${release}":
+  apt::source { 'php':


should be named sury and should be configurable

I don't think so. The sury location is just daemon and can be replaced by any other location. I look around other voxpopuli modules. nginx just use nginx, collectd used ppa_collect. Use the software as apt::source title should be good enough in my eyes like other modules do it.

c33s · 2018-04-08T12:51:17Z

manifests/repo/debian.pp

-    'source' => 'http://www.dotdeb.org/dotdeb.gpg',
-  },
-  $dotdeb       = true,
-  $sury         = true,


we should introduce a enum parameter like repo_management auto|native|sury|(dotdeb) so the user can decide how the repo management behaves. it should be possible to set a custom repo and prevent the auto added repo from below

Parameters like location, key are configurable via hiera. With this PR all standard deb repo like sury are covered by this change. I do not see a point for sury special handing.

c33s · 2018-04-08T12:57:21Z

manifests/repo/debian.pp

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


i would prefer keeping the if with the repo_management parameter. we also could keep the dotdeb repo data in here or better move the hard coded classes to module-hiera-data

c33s · 2018-04-08T12:58:27Z

manifests/repo/debian.pp

-      },
-      require  => [
-        Apt::Key['php::repo::debian-php71'],
-        Package['apt-transport-https', 'lsb-release', 'ca-certificates']


why can we drop this?

apt-transport-https is handed by apt well.

https://github.com/puppetlabs/puppetlabs-apt/blob/master/manifests/source.pp#L41

lsb-release and ca-certificates are core packages, its out of scope here. For example apt recommends ca-certificates, you don't need define it here.

c33s · 2018-04-08T12:58:39Z

manifests/repo/debian.pp

-
-  if ($sury and $php::globals::php_version == '7.1') {
-    # Required packages for PHP 7.1 repository
-    ensure_packages(['lsb-release', 'ca-certificates'], {'ensure' => 'present'})


why can we drop this?

c33s · 2018-04-08T13:04:42Z

@jkroepke can we chat somewhere? i already started with the refactoring plans before. mainly i would need help with the broken tests.

jkroepke · 2018-04-08T13:12:11Z

Sure. Does voxpopuli already discord? Or just IRC?

c33s · 2018-04-08T13:18:07Z

slack also ok? (online right now)

ekohl · 2018-05-28T16:34:33Z

What's the status of this now (other than the merge conflict)?

jkroepke · 2018-05-29T19:58:05Z

@ekohl As I know @c33s doesn't want it, because I drop all the special repo handing which isn't necessary from my side. He wants more puppet classes like php::repo::debian::sury but which is in conflict with this PR. Sorry if i'm telling bullshit. Long time ago.

jkroepke changed the title ~~WIP: Fix debian 8 acceptance tests~~ Do not use a a hardcoded default for php::repo::debian Mar 14, 2018

juniorsysadmin added the bug Something isn't working label Mar 15, 2018

bastelfreak reviewed Mar 17, 2018

View reviewed changes

bastelfreak added the needs-tests label Mar 17, 2018

c33s requested changes Mar 17, 2018

View reviewed changes

This was referenced Apr 7, 2018

Add initial ubuntu 18.04 support #428

Merged

Tests failing under debian8 #433

Closed

jkroepke added 2 commits April 8, 2018 13:58

Fix repo::debian

bb76262

Added tests

96055b4

c33s reviewed Apr 8, 2018

View reviewed changes

ekohl added the needs-rebase label May 28, 2018

c33s mentioned this pull request May 29, 2018

WIP: Debian repo handling refactoring #436

Open

jkroepke closed this Aug 15, 2018

jkroepke deleted the patch-5 branch December 19, 2018 18:25

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Do not use a a hardcoded default for php::repo::debian #430

Do not use a a hardcoded default for php::repo::debian #430

jkroepke commented Mar 14, 2018 •

edited

Loading

bastelfreak Mar 17, 2018

c33s Mar 17, 2018

bastelfreak commented Mar 17, 2018

jkroepke commented Mar 17, 2018

bastelfreak commented Mar 17, 2018

c33s left a comment

c33s Mar 17, 2018

c33s Mar 17, 2018

jkroepke Mar 20, 2018

c33s Mar 17, 2018

c33s Mar 17, 2018

jkroepke commented Mar 20, 2018

jkroepke commented Apr 8, 2018

c33s left a comment

c33s Apr 8, 2018

jkroepke Apr 8, 2018

c33s Apr 8, 2018

jkroepke Apr 8, 2018

c33s Apr 8, 2018

c33s Apr 8, 2018

jkroepke Apr 8, 2018

c33s Apr 8, 2018

jkroepke Apr 8, 2018

c33s commented Apr 8, 2018

jkroepke commented Apr 8, 2018

c33s commented Apr 8, 2018

ekohl commented May 28, 2018

jkroepke commented May 29, 2018

Do not use a a hardcoded default for php::repo::debian #430

Do not use a a hardcoded default for php::repo::debian #430

Conversation

jkroepke commented Mar 14, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bastelfreak commented Mar 17, 2018

jkroepke commented Mar 17, 2018

bastelfreak commented Mar 17, 2018

c33s left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jkroepke commented Mar 20, 2018

jkroepke commented Apr 8, 2018

c33s left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

c33s commented Apr 8, 2018

jkroepke commented Apr 8, 2018

c33s commented Apr 8, 2018

ekohl commented May 28, 2018

jkroepke commented May 29, 2018

jkroepke commented Mar 14, 2018 •

edited

Loading