WIP: Feature/simon hoenscheid 603 restructure repository management

data/CentOS/6.yaml

@@ -0,0 +1 @@
+---

data/CentOS/7.yaml

@@ -0,0 +1 @@
+---

data/CentOS/8.yaml

@@ -0,0 +1 @@
+---

data/Debian/10.yaml

@@ -0,0 +1,25 @@
+---
+php::external_repo: false
+php::php_version: '7.3'
+php::os_supported_php_versions:
+  - '7.3'
+
+php::external_repo_supported_php_versions:
+  - '5.6'
+  - '7.0'
+  - '7.1'
+  - '7.2'
+  - '7.3'
+  - '7.4'
+
+php::external_repo_details:
+  'source_php_sury':
+    comment: 'the debian sury repo sury.org'
+    location: 'https://packages.sury.org/php/'
+    repos: 'main'
+    include:
+      src: true
+      deb: true
+    key:
+      id: '15058500A0235D97F5D10063B188E2B695BD4743'
+      source: 'https://packages.sury.org/php/apt.gpg'

data/Debian/9.yaml

@@ -0,0 +1 @@
+---

data/Fedora/31.yaml

@@ -0,0 +1 @@
+---

data/Fedora/32.yaml

@@ -0,0 +1 @@
+---

data/Fedora/33.yaml

@@ -0,0 +1 @@
+---

data/FreeBSD/11.3.yaml

@@ -0,0 +1 @@
+---

data/FreeBSD/11.4.yaml

@@ -0,0 +1 @@
+---

data/FreeBSD/12.1.yaml

@@ -0,0 +1 @@
+---

data/OpenSuSE/15.1.yaml

@@ -0,0 +1 @@
+---

data/OpenSuSE/15.2.yaml

@@ -0,0 +1 @@
+---

data/OpenSuSE/15.3.yaml

@@ -0,0 +1 @@
+---

data/RedHat/6.yaml

@@ -0,0 +1 @@
+---

data/RedHat/7.yaml

@@ -0,0 +1 @@
+---

data/RedHat/8.yaml

@@ -0,0 +1 @@
+---

data/SLES/11.yaml

@@ -0,0 +1 @@
+---

data/SLES/12.yaml

@@ -0,0 +1 @@
+---

data/SLES/15.yaml

@@ -0,0 +1 @@
+---

data/Ubuntu/16.04.yaml

@@ -0,0 +1 @@
+---

data/Ubuntu/18.04.yaml

@@ -0,0 +1 @@
+---

data/Ubuntu/20.04.yaml

@@ -0,0 +1 @@
+---

data/default.yaml → data/common.yaml

@@ -1,6 +1,4 @@
 ---
-
 lookup_options:
   php::fpm::pools:
     merge: first
-

hiera.yaml

@@ -1,6 +1,12 @@
 ---
 version: 5
+defaults:
+  datadir: 'data'
+  data_hash: 'yaml_data'
+
 hierarchy:
-  - name: default.yaml
+  - name: 'My Hierachie'
     paths:
-      - 'default.yaml'
+     - '%{facts.os.name}/%{facts.os.release.full}.yaml'
+     - '%{facts.os.name}/%{facts.os.release.major}.yaml'
+     - 'common.yaml'

manifests/init.pp

@@ -169,6 +169,13 @@
   String $log_group                               = $php::params::fpm_group,
   Boolean $pool_purge                             = $php::params::pool_purge,
   Boolean $reload_fpm_on_config_changes           = true,
+  # added for refactoring
+  Boolean $external_repo                                = false,
+  Optional[String[1]] $php_version                      = undef,
+  Optional[Array] $os_supported_php_versions            = undef,
+  Optional[Array] $external_repo_supported_php_versions = undef,
+  Hash $external_repo_details                           = {},
+
 ) inherits php::params {
   $real_fpm_package = pick($fpm_package, "${package_prefix}${php::params::fpm_package_suffix}")
 

manifests/repo.pp

@@ -1,32 +1,15 @@
 # Configure package repository
 #
-class php::repo {
-  $msg_no_repo = "No repo available for ${facts['os']['family']}/${facts['os']['name']}"
-
-  case $facts['os']['family'] {
-    'Debian': {
-      # no contain here because apt does that already
-      case $facts['os']['name'] {
-        'Debian': {
-          include php::repo::debian
-        }
-        'Ubuntu': {
-          include php::repo::ubuntu
-        }
-        default: {
-          fail($msg_no_repo)
-        }
-      }
-    }
-    'FreeBSD': {}
-    'Suse': {
-      contain php::repo::suse
-    }
-    'RedHat': {
-      contain 'php::repo::redhat'
-    }
-    default: {
-      fail($msg_no_repo)
-    }
+class php::repo (
+  Boolean $external_repo                                = $php::external_repo,
+  Optional[String[1]] $php_version                      = $php::php_version,
+  Optional[Array] $external_repo_supported_php_versions = $php::external_repo_supported_php_versions,
+) {
+  if ($external_repo and $php_version in $external_repo_supported_php_versions) {
+  case $facts['os']['name'] {
+  'RedHat', 'CentOS': { contain '::php::repo::redhat'  }
+  'Debian', 'Ubuntu': { contain '::php::repo::debian'  }
+  default:            { contain '::php::repo::fallback' }
+}
   }
 }

manifests/repo/debian.pp

@@ -2,66 +2,18 @@
 #
 # === Parameters
 #
-# [*location*]
-#   Location of the apt repository
-#
-# [*release*]
-#   Release of the apt repository
-#
-# [*repos*]
-#   Apt repository names
-#
-# [*include_src*]
-#   Add source source repository
-#
-# [*key*]
-#   Public key in apt::key format
-#
-# [*dotdeb*]
-#   Enable special dotdeb handling
-#
-# [*sury*]
-#   Enable special sury handling
+# [*external_repo_details*]
+#   The repository details
 #
 class php::repo::debian (
-  $location     = 'https://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,
+  Hash $external_repo_details = $php::external_repo_details,
 ) {
   assert_private()
 
   include 'apt'
-
-  apt::source { "source_php_${release}":
-    location => $location,
-    release  => $release,
-    repos    => $repos,
-    include  => {
-      'src' => $include_src,
-      'deb' => true,
-    },
-    key      => $key,
-  }
-
-  if ($sury and $php::globals::php_version in ['7.1','7.2']) {
-    apt::source { 'source_php_sury':
-      location => 'https://packages.sury.org/php/',
-      repos    => 'main',
-      include  => {
-        'src' => $include_src,
-        'deb' => true,
-      },
-      key      => {
-        id     => '15058500A0235D97F5D10063B188E2B695BD4743',
-        source => 'https://packages.sury.org/php/apt.gpg',
-      },
+  $external_repo_details.each |String $repository, Hash $repository_details| {
+    apt::source { $repository:
+      * => $repository_details,
     }
   }
 }

manifests/repo/fallback.pp

@@ -0,0 +1,7 @@
+# the fallback class, throws an error, if called
+class php::repo::fallback () {
+  assert_private()
+
+  $msg_no_repo = "No repo available for ${facts['os']['family']}/${facts['os']['name']}"
+  fail($msg_no_repo)
+}