From 3a55ebf6aba735c56f4778705e9d143f3d437bdb Mon Sep 17 00:00:00 2001
From: Henry Paulissen <henry@telegraafnet.nl>
Date: Sat, 25 Feb 2017 22:34:08 +0100
Subject: [PATCH 1/6] Created PHP version switching based on distro / version

All tested with Debian Jessie and Stretch.
Most likely broke for RedHat based systems (but this module was
probably broke for RedHat systems already - Feel free to extend).

Signed-off-by: Henry Paulissen <henry@nitronetworks.nl>
---
 manifests/apache/params.pp              | 34 +++++++++++++++++---
 manifests/cli/params.pp                 | 25 +++++++++++++--
 manifests/contrib/base_package.pp       | 23 ++++++++++++--
 manifests/dev/params.pp                 | 20 +++++++++++-
 manifests/extension/apc/params.pp       | 35 +++++++++++----------
 manifests/extension/apcu/params.pp      | 21 ++++++++++++-
 manifests/extension/curl/params.pp      | 20 +++++++++++-
 manifests/extension/gd/params.pp        | 20 +++++++++++-
 manifests/extension/gearman/params.pp   | 20 +++++++++++-
 manifests/extension/http/params.pp      | 19 +++++++++++
 manifests/extension/igbinary/params.pp  | 20 +++++++++++-
 manifests/extension/imagick/params.pp   | 20 +++++++++++-
 manifests/extension/imap/params.pp      | 23 ++++++++++++--
 manifests/extension/intl/params.pp      | 20 +++++++++++-
 manifests/extension/jsmin/params.pp     |  1 -
 manifests/extension/ldap/params.pp      | 21 ++++++++++++-
 manifests/extension/mcrypt/params.pp    | 20 +++++++++++-
 manifests/extension/memcache/params.pp  | 20 +++++++++++-
 manifests/extension/memcached/params.pp | 20 +++++++++++-
 manifests/extension/mysql/params.pp     | 20 +++++++++++-
 manifests/extension/mysqlnd/params.pp   | 20 +++++++++++-
 manifests/extension/newrelic/params.pp  | 20 +++++++++++-
 manifests/extension/pgsql/params.pp     | 21 ++++++++++++-
 manifests/extension/redis/params.pp     | 20 +++++++++++-
 manifests/extension/sqlite/params.pp    | 21 ++++++++++++-
 manifests/extension/ssh2/params.pp      | 20 +++++++++++-
 manifests/extension/tidy/params.pp      | 20 +++++++++++-
 manifests/extension/xcache/params.pp    | 20 +++++++++++-
 manifests/extension/xdebug/params.pp    | 25 +++++++++++++--
 manifests/extension/yaml/params.pp      | 20 +++++++++++-
 manifests/fpm/params.pp                 | 42 +++++++++++++++++++++----
 manifests/params.pp                     | 21 +++++++++++--
 manifests/pear/params.pp                | 20 +++++++++++-
 33 files changed, 652 insertions(+), 60 deletions(-)

diff --git a/manifests/apache/params.pp b/manifests/apache/params.pp
index 0bafb227..1e83221f 100644
--- a/manifests/apache/params.pp
+++ b/manifests/apache/params.pp
@@ -41,11 +41,37 @@
 class php::apache::params {
 
   $ensure   = $php::params::ensure
-  $package  = 'libapache2-mod-php5'
   $provider = undef
-  $inifile  = '/etc/php/7.0/apache2/php.ini'
   $settings = [ ]
 
-  $service_name = 'apache2'
-
+  case $::osfamily {
+    'Debian': {
+      case $::operatingsystem {
+        'Debian': {
+          if (versioncmp($::operatingsystemrelease, '9')) {
+            $service_name   = 'apache2'
+            $package        = 'libapache2-mod-php7.0'
+            $inifile        = '/etc/php/7.0/apache2/php.ini'
+          } else {
+            $service_name   = 'apache2'
+            $package        = 'libapache2-mod-php5'
+            $inifile        = '/etc/php5/apache2/php.ini'
+          }
+        }
+        default: {
+          $server_name  = 'apache2'
+          $package      = 'libapache2-mod-php7.0'
+          $inifile      = '/etc/php/7.0/apache2/php.ini'
+        }
+      }
+    }
+    #
+    # @todo RedHat uses 'httpd' as service name
+    #
+    default: {
+      $service_name     = 'apache2'
+      $package          = 'libapache2-mod-php7.0'
+      $inifile          = '/etc/php/7.0/apache2/php.ini'
+    }
+  }
 }
diff --git a/manifests/cli/params.pp b/manifests/cli/params.pp
index 9dc9c603..40bb66b4 100644
--- a/manifests/cli/params.pp
+++ b/manifests/cli/params.pp
@@ -41,9 +41,30 @@
 class php::cli::params {
 
   $ensure   = $php::params::ensure
-  $package  = 'php7.0-cli'
   $provider = undef
-  $inifile  = '/etc/php/7.0/cli/php.ini'
   $settings = [ ]
 
+  case $::osfamily {
+    'Debian': {
+      case $::operatingsystem {
+        'Debian': {
+          if (versioncmp($::operatingsystemrelease, '9')) {
+            $inifile        = '/etc/php/7.0/cli/php.ini'
+            $package        = 'php7.0-cli'
+          } else {
+            $inifile        = '/etc/php5/cli/php.ini'
+            $package        = 'php5-cli'
+          }
+        }
+        default: {
+          $inifile      = '/etc/php/7.0/cli/php.ini'
+          $package      = 'php7.0-cli'
+        }
+      }
+    }
+    default: {
+      $inifile      = '/etc/php/7.0/cli/php.ini'
+      $package      = 'php7.0-cli'
+    }
+  }
 }
diff --git a/manifests/contrib/base_package.pp b/manifests/contrib/base_package.pp
index b240a2c7..20b9bd51 100644
--- a/manifests/contrib/base_package.pp
+++ b/manifests/contrib/base_package.pp
@@ -32,9 +32,28 @@
   $ensure,
   $provider = undef
 ) {
+  case $::osfamily {
+    'Debian': {
+      case $::operatingsystem {
+        'Debian': {
+          if (versioncmp($::operatingsystemrelease, '9')) {
+            $package        = 'php7.0-common'
+          } else {
+            $package        = 'php5-common'
+          }
+        }
+        default: {
+          $package      = 'php7.0-common'
+        }
+      }
+    }
+    default: {
+      $package      = 'php7.0-common'
+    }
+  }
 
-  if !defined(Package['php7.0-common']) {
-    package { 'php7.0-common':
+  if !defined(Package[$package]) {
+    package { $package:
       ensure   => $ensure,
       provider => $provider
     }
diff --git a/manifests/dev/params.pp b/manifests/dev/params.pp
index 50c6ea95..29f086be 100644
--- a/manifests/dev/params.pp
+++ b/manifests/dev/params.pp
@@ -34,7 +34,25 @@
 class php::dev::params {
 
   $ensure   = $php::params::ensure
-  $package  = 'php7.0-dev'
   $provider = undef
 
+  case $::osfamily {
+    'Debian': {
+      case $::operatingsystem {
+        'Debian': {
+          if (versioncmp($::operatingsystemrelease, '9')) {
+            $package        = 'php7.0-dev'
+          } else {
+            $package        = 'php5-dev'
+          }
+        }
+        default: {
+          $package      = 'php7.0-dev'
+        }
+      }
+    }
+    default: {
+      $package      = 'php7.0-dev'
+    }
+  }
 }
diff --git a/manifests/extension/apc/params.pp b/manifests/extension/apc/params.pp
index f6d5519b..bec4664a 100644
--- a/manifests/extension/apc/params.pp
+++ b/manifests/extension/apc/params.pp
@@ -41,24 +41,27 @@
 class php::extension::apc::params {
 
   $ensure   = $php::params::ensure
-  $package  = $::lsbdistcodename ? {
-    # php-apc is phased out as of Ubuntu 13.10 (saucy)
-    # and Debian jessie in favour of php5-apcu
-    # Debian
-    'squeeze' => 'php-apc',
-    'wheezy' => 'php-apc',
-
-    # Ubuntu
-    'lucid' => 'php-apc',
-    'precise' => 'php-apc',
-    'quantal' => 'php-apc',
-    'raring' => 'php-apc',
-
-    # Default to support future distros cleanly.
-    default => 'php7.0-apcu',
-  }
   $provider = undef
   $inifile  = "${php::params::config_root_ini}/apc.ini"
   $settings = [ ]
 
+  case $::osfamily {
+    'Debian': {
+      case $::operatingsystem {
+        'Debian': {
+          if (versioncmp($::operatingsystemrelease, '9')) {
+            $package        = 'php-apcu'
+          } else {
+            $package        = 'php-apc'
+          }
+        }
+        default: {
+          $package      = 'php-apc'
+        }
+      }
+    }
+    default: {
+      $package      = 'php-apc'
+    }
+  }
 }
diff --git a/manifests/extension/apcu/params.pp b/manifests/extension/apcu/params.pp
index f8bf0a3d..2ab7d392 100644
--- a/manifests/extension/apcu/params.pp
+++ b/manifests/extension/apcu/params.pp
@@ -41,8 +41,27 @@
 class php::extension::apcu::params {
 
   $ensure   = $php::params::ensure
-  $package  = 'php7.0-apcu'
   $provider = undef
   $inifile  = "${php::params::config_root_ini}/apcu.ini"
   $settings = []
+
+  case $::osfamily {
+    'Debian': {
+      case $::operatingsystem {
+        'Debian': {
+          if (versioncmp($::operatingsystemrelease, '9')) {
+            $package        = 'php7.0-apcu'
+          } else {
+            $package        = 'php5-apcu'
+          }
+        }
+        default: {
+          $package      = 'php7.0-apcu'
+        }
+      }
+    }
+    default: {
+      $package      = 'php7.0-apcu'
+    }
+  }
 }
diff --git a/manifests/extension/curl/params.pp b/manifests/extension/curl/params.pp
index 8a4daa6f..fe608594 100644
--- a/manifests/extension/curl/params.pp
+++ b/manifests/extension/curl/params.pp
@@ -41,9 +41,27 @@
 class php::extension::curl::params {
 
   $ensure   = $php::params::ensure
-  $package  = 'php7.0-curl'
   $provider = undef
   $inifile  = "${php::params::config_root_ini}/curl.ini"
   $settings = [ ]
 
+  case $::osfamily {
+    'Debian': {
+      case $::operatingsystem {
+        'Debian': {
+          if (versioncmp($::operatingsystemrelease, '9')) {
+            $package        = 'php7.0-curl'
+          } else {
+            $package        = 'php5-curl'
+          }
+        }
+        default: {
+          $package      = 'php7.0-curl'
+        }
+      }
+    }
+    default: {
+      $package      = 'php7.0-curl'
+    }
+  }
 }
diff --git a/manifests/extension/gd/params.pp b/manifests/extension/gd/params.pp
index 7e7ff876..cd980be4 100644
--- a/manifests/extension/gd/params.pp
+++ b/manifests/extension/gd/params.pp
@@ -41,9 +41,27 @@
 class php::extension::gd::params {
 
   $ensure   = $php::params::ensure
-  $package  = 'php7.0-gd'
   $provider = undef
   $inifile  = "${php::params::config_root_ini}/gd.ini"
   $settings = [ ]
 
+  case $::osfamily {
+    'Debian': {
+      case $::operatingsystem {
+        'Debian': {
+          if (versioncmp($::operatingsystemrelease, '9')) {
+            $package        = 'php7.0-gd'
+          } else {
+            $package        = 'php5-gd'
+          }
+        }
+        default: {
+          $package      = 'php7.0-gd'
+        }
+      }
+    }
+    default: {
+      $package      = 'php7.0-gd'
+    }
+  }
 }
diff --git a/manifests/extension/gearman/params.pp b/manifests/extension/gearman/params.pp
index e34fb559..1382d5eb 100644
--- a/manifests/extension/gearman/params.pp
+++ b/manifests/extension/gearman/params.pp
@@ -41,9 +41,27 @@
 class php::extension::gearman::params {
 
   $ensure   = $php::params::ensure
-  $package  = 'php7.0-gearman'
   $provider = undef
   $inifile  = "${php::params::config_root_ini}/gearman.ini"
   $settings = [ ]
 
+  case $::osfamily {
+    'Debian': {
+      case $::operatingsystem {
+        'Debian': {
+          if (versioncmp($::operatingsystemrelease, '9')) {
+            $package        = 'php7.0-gearman'
+          } else {
+            $package        = 'php5-gearman'
+          }
+        }
+        default: {
+          $package      = 'php7.0-gearman'
+        }
+      }
+    }
+    default: {
+      $package      = 'php7.0-gearman'
+    }
+  }
 }
diff --git a/manifests/extension/http/params.pp b/manifests/extension/http/params.pp
index de3304fc..9dff70b1 100644
--- a/manifests/extension/http/params.pp
+++ b/manifests/extension/http/params.pp
@@ -46,4 +46,23 @@
   $inifile  = "${php::params::config_root_ini}/http.ini"
   $settings = [ ]
 
+  case $::osfamily {
+    'Debian': {
+      case $::operatingsystem {
+        'Debian': {
+          if (versioncmp($::operatingsystemrelease, '9')) {
+            $package        = 'php7.0-http'
+          } else {
+            warning('php::extension::http package does not exists on php5')
+          }
+        }
+        default: {
+          $package      = 'php7.0-http'
+        }
+      }
+    }
+    default: {
+      $package      = 'php7.0-http'
+    }
+  }
 }
diff --git a/manifests/extension/igbinary/params.pp b/manifests/extension/igbinary/params.pp
index 53bd3516..c15ece92 100644
--- a/manifests/extension/igbinary/params.pp
+++ b/manifests/extension/igbinary/params.pp
@@ -41,9 +41,27 @@
 class php::extension::igbinary::params {
 
   $ensure   = $php::params::ensure
-  $package  = 'php7.0-igbinary'
   $provider = undef
   $inifile  = "${php::params::config_root_ini}/igbinary.ini"
   $settings = [ ]
 
+  case $::osfamily {
+    'Debian': {
+      case $::operatingsystem {
+        'Debian': {
+          if (versioncmp($::operatingsystemrelease, '9')) {
+            $package        = 'php7.0-igbinary'
+          } else {
+            $package        = 'php5-igbinary'
+          }
+        }
+        default: {
+          $package      = 'php7.0-igbinary'
+        }
+      }
+    }
+    default: {
+      $package      = 'php7.0-igbinary'
+    }
+  }
 }
diff --git a/manifests/extension/imagick/params.pp b/manifests/extension/imagick/params.pp
index c9cdb274..fa26a91d 100644
--- a/manifests/extension/imagick/params.pp
+++ b/manifests/extension/imagick/params.pp
@@ -41,9 +41,27 @@
 class php::extension::imagick::params {
 
   $ensure   = $php::params::ensure
-  $package  = 'php7.0-imagick'
   $provider = undef
   $inifile  = "${php::params::config_root_ini}/imagick.ini"
   $settings = [ ]
 
+  case $::osfamily {
+    'Debian': {
+      case $::operatingsystem {
+        'Debian': {
+          if (versioncmp($::operatingsystemrelease, '9')) {
+            $package        = 'php7.0-imagick'
+          } else {
+            $package        = 'php5-imagick'
+          }
+        }
+        default: {
+          $package      = 'php7.0-imagick'
+        }
+      }
+    }
+    default: {
+      $package      = 'php7.0-imagick'
+    }
+  }
 }
diff --git a/manifests/extension/imap/params.pp b/manifests/extension/imap/params.pp
index 23f5a52f..952228bc 100644
--- a/manifests/extension/imap/params.pp
+++ b/manifests/extension/imap/params.pp
@@ -41,8 +41,27 @@
 class php::extension::imap::params {
 
   $ensure   = $php::params::ensure
-  $package  = 'php7.0-imap'
   $provider = undef
-  $inifile  = '/etc/php/conf.d/imap.ini'
+  $inifile  = "${php::params::config_root_ini}/imap.ini"
   $settings = []
+
+  case $::osfamily {
+    'Debian': {
+      case $::operatingsystem {
+        'Debian': {
+          if (versioncmp($::operatingsystemrelease, '9')) {
+            $package        = 'php7.0-imap'
+          } else {
+            $package        = 'php5-imap'
+          }
+        }
+        default: {
+          $package      = 'php7.0-imap'
+        }
+      }
+    }
+    default: {
+      $package      = 'php7.0-imap'
+    }
+  }
 }
diff --git a/manifests/extension/intl/params.pp b/manifests/extension/intl/params.pp
index 6e05b100..f489fa3f 100644
--- a/manifests/extension/intl/params.pp
+++ b/manifests/extension/intl/params.pp
@@ -41,9 +41,27 @@
 class php::extension::intl::params {
 
   $ensure   = $php::params::ensure
-  $package  = 'php7.0-intl'
   $provider = undef
   $inifile  = "${php::params::config_root_ini}/intl.ini"
   $settings = [ ]
 
+  case $::osfamily {
+    'Debian': {
+      case $::operatingsystem {
+        'Debian': {
+          if (versioncmp($::operatingsystemrelease, '9')) {
+            $package        = 'php7.0-intl'
+          } else {
+            $package        = 'php5-intl'
+          }
+        }
+        default: {
+          $package      = 'php7.0-intl'
+        }
+      }
+    }
+    default: {
+      $package      = 'php7.0-intl'
+    }
+  }
 }
diff --git a/manifests/extension/jsmin/params.pp b/manifests/extension/jsmin/params.pp
index 513e1181..c13d1669 100644
--- a/manifests/extension/jsmin/params.pp
+++ b/manifests/extension/jsmin/params.pp
@@ -47,5 +47,4 @@
   $settings = [
     'set ".anon/extension" "jsmin.so"'
   ]
-
 }
diff --git a/manifests/extension/ldap/params.pp b/manifests/extension/ldap/params.pp
index b4129650..f0275d55 100644
--- a/manifests/extension/ldap/params.pp
+++ b/manifests/extension/ldap/params.pp
@@ -41,8 +41,27 @@
 class php::extension::ldap::params {
 
   $ensure   = $php::params::ensure
-  $package  = 'php5-ldap'
   $provider = undef
   $inifile  = '/etc/php/7.0/conf.d/20-ldap.ini'
   $settings = []
+
+  case $::osfamily {
+    'Debian': {
+      case $::operatingsystem {
+        'Debian': {
+          if (versioncmp($::operatingsystemrelease, '9')) {
+            $package        = 'php7.0-ldap'
+          } else {
+            $package        = 'php5-ldap'
+          }
+        }
+        default: {
+          $package      = 'php7.0-ldap'
+        }
+      }
+    }
+    default: {
+      $package      = 'php7.0-ldap'
+    }
+  }
 }
diff --git a/manifests/extension/mcrypt/params.pp b/manifests/extension/mcrypt/params.pp
index 044f863f..52ae504c 100644
--- a/manifests/extension/mcrypt/params.pp
+++ b/manifests/extension/mcrypt/params.pp
@@ -41,9 +41,27 @@
 class php::extension::mcrypt::params {
 
   $ensure   = $php::params::ensure
-  $package  = 'php7.0-mcrypt'
   $provider = undef
   $inifile  = "${php::params::config_root_ini}/mcrypt.ini"
   $settings = [ ]
 
+  case $::osfamily {
+    'Debian': {
+      case $::operatingsystem {
+        'Debian': {
+          if (versioncmp($::operatingsystemrelease, '9')) {
+            $package        = 'php7.0-mcrypt'
+          } else {
+            $package        = 'php5-mcrypt'
+          }
+        }
+        default: {
+          $package      = 'php7.0-mcrypt'
+        }
+      }
+    }
+    default: {
+      $package      = 'php7.0-mcrypt'
+    }
+  }
 }
diff --git a/manifests/extension/memcache/params.pp b/manifests/extension/memcache/params.pp
index 262fdc67..a8c8f0bc 100644
--- a/manifests/extension/memcache/params.pp
+++ b/manifests/extension/memcache/params.pp
@@ -42,9 +42,27 @@
 class php::extension::memcache::params {
 
   $ensure   = $php::params::ensure
-  $package  = 'php7.0-memcache'
   $provider = undef
   $inifile  = "${php::params::config_root_ini}/memcache.ini"
   $settings = []
 
+  case $::osfamily {
+    'Debian': {
+      case $::operatingsystem {
+        'Debian': {
+          if (versioncmp($::operatingsystemrelease, '9')) {
+            $package        = 'php7.0-memcache'
+          } else {
+            $package        = 'php5-memcache'
+          }
+        }
+        default: {
+          $package      = 'php7.0-memcache'
+        }
+      }
+    }
+    default: {
+      $package      = 'php7.0-memcache'
+    }
+  }
 }
diff --git a/manifests/extension/memcached/params.pp b/manifests/extension/memcached/params.pp
index 16d57577..d6c037a3 100644
--- a/manifests/extension/memcached/params.pp
+++ b/manifests/extension/memcached/params.pp
@@ -42,9 +42,27 @@
 class php::extension::memcached::params {
 
   $ensure   = $php::params::ensure
-  $package  = 'php7.0-memcached'
   $provider = undef
   $inifile  = "${php::params::config_root_ini}/memcached.ini"
   $settings = []
 
+  case $::osfamily {
+    'Debian': {
+      case $::operatingsystem {
+        'Debian': {
+          if (versioncmp($::operatingsystemrelease, '9')) {
+            $package        = 'php7.0-memcached'
+          } else {
+            $package        = 'php5-memcached'
+          }
+        }
+        default: {
+          $package      = 'php7.0-memcached'
+        }
+      }
+    }
+    default: {
+      $package      = 'php7.0-memcached'
+    }
+  }
 }
diff --git a/manifests/extension/mysql/params.pp b/manifests/extension/mysql/params.pp
index b2996988..f2a32e22 100644
--- a/manifests/extension/mysql/params.pp
+++ b/manifests/extension/mysql/params.pp
@@ -41,9 +41,27 @@
 class php::extension::mysql::params {
 
   $ensure   = $php::params::ensure
-  $package  = 'php7.0-mysql'
   $provider = undef
   $inifile  = "${php::params::config_root_ini}/mysql.ini"
   $settings = [ ]
 
+  case $::osfamily {
+    'Debian': {
+      case $::operatingsystem {
+        'Debian': {
+          if (versioncmp($::operatingsystemrelease, '9')) {
+            $package        = 'php7.0-mysql'
+          } else {
+            $package        = 'php5-mysql'
+          }
+        }
+        default: {
+          $package      = 'php7.0-mysql'
+        }
+      }
+    }
+    default: {
+      $package      = 'php7.0-mysql'
+    }
+  }
 }
diff --git a/manifests/extension/mysqlnd/params.pp b/manifests/extension/mysqlnd/params.pp
index 82198fe8..8c12c1b8 100644
--- a/manifests/extension/mysqlnd/params.pp
+++ b/manifests/extension/mysqlnd/params.pp
@@ -41,9 +41,27 @@
 class php::extension::mysqlnd::params {
 
   $ensure   = $php::params::ensure
-  $package  = 'php7.0-mysqlnd'
   $provider = undef
   $inifile  = "${php::params::config_root_ini}/mysqlnd.ini"
   $settings = [ ]
 
+  case $::osfamily {
+    'Debian': {
+      case $::operatingsystem {
+        'Debian': {
+          if (versioncmp($::operatingsystemrelease, '9')) {
+            $package        = 'php7.0-mysqlnd'
+          } else {
+            $package        = 'php5-mysqlnd'
+          }
+        }
+        default: {
+          $package      = 'php7.0-mysqlnd'
+        }
+      }
+    }
+    default: {
+      $package      = 'php7.0-mysqlnd'
+    }
+  }
 }
diff --git a/manifests/extension/newrelic/params.pp b/manifests/extension/newrelic/params.pp
index a5d9eaab..e0e4c3ba 100644
--- a/manifests/extension/newrelic/params.pp
+++ b/manifests/extension/newrelic/params.pp
@@ -41,9 +41,27 @@
 class php::extension::newrelic::params {
 
   $ensure   = $php::params::ensure
-  $package  = 'newrelic-php5'
   $provider = undef
   $inifile  = "${php::params::config_root_ini}/newrelic.ini"
   $settings = [ ]
 
+  case $::osfamily {
+    'Debian': {
+      case $::operatingsystem {
+        'Debian': {
+          if (versioncmp($::operatingsystemrelease, '9')) {
+            $package        = 'newrelic-php7'
+          } else {
+            $package        = 'newrelic-php5'
+          }
+        }
+        default: {
+          $package      = 'newrelic-php5'
+        }
+      }
+    }
+    default: {
+      $package      = 'newrelic-php5'
+    }
+  }
 }
diff --git a/manifests/extension/pgsql/params.pp b/manifests/extension/pgsql/params.pp
index f15c0e31..cc75f200 100644
--- a/manifests/extension/pgsql/params.pp
+++ b/manifests/extension/pgsql/params.pp
@@ -41,8 +41,27 @@
 class php::extension::pgsql::params {
 
   $ensure   = $php::params::ensure
-  $package  = 'php7.0-pgsql'
   $provider = undef
   $inifile  = "${php::params::config_root_ini}/pgsql.ini"
   $settings = [ ]
+
+  case $::osfamily {
+    'Debian': {
+      case $::operatingsystem {
+        'Debian': {
+          if (versioncmp($::operatingsystemrelease, '9')) {
+            $package        = 'php7.0-pgsql'
+          } else {
+            $package        = 'php5-pgsql'
+          }
+        }
+        default: {
+          $package      = 'php7.0-pgsql'
+        }
+      }
+    }
+    default: {
+      $package      = 'php7.0-pgsql'
+    }
+  }
 }
diff --git a/manifests/extension/redis/params.pp b/manifests/extension/redis/params.pp
index af3c5613..dc342037 100644
--- a/manifests/extension/redis/params.pp
+++ b/manifests/extension/redis/params.pp
@@ -41,9 +41,27 @@
 class php::extension::redis::params {
 
   $ensure   = $php::params::ensure
-  $package  = 'php7.0-redis'
   $provider = undef
   $inifile  = "${php::params::config_root_ini}/redis.ini"
   $settings = [ ]
 
+  case $::osfamily {
+    'Debian': {
+      case $::operatingsystem {
+        'Debian': {
+          if (versioncmp($::operatingsystemrelease, '9')) {
+            $package        = 'php7.0-redis'
+          } else {
+            $package        = 'php5-redis'
+          }
+        }
+        default: {
+          $package      = 'php7.0-redis'
+        }
+      }
+    }
+    default: {
+      $package      = 'php7.0-redis'
+    }
+  }
 }
diff --git a/manifests/extension/sqlite/params.pp b/manifests/extension/sqlite/params.pp
index abba9fbd..3d353f7d 100644
--- a/manifests/extension/sqlite/params.pp
+++ b/manifests/extension/sqlite/params.pp
@@ -41,8 +41,27 @@
 class php::extension::sqlite::params {
 
   $ensure   = $php::params::ensure
-  $package  = 'php7.0-sqlite'
   $provider = undef
   $inifile  = "${php::params::config_root_ini}/sqlite.ini"
   $settings = [ ]
+
+  case $::osfamily {
+    'Debian': {
+      case $::operatingsystem {
+        'Debian': {
+          if (versioncmp($::operatingsystemrelease, '9')) {
+            $package        = 'php7.0-sqlite'
+          } else {
+            $package        = 'php5-sqlite'
+          }
+        }
+        default: {
+          $package      = 'php7.0-sqlite'
+        }
+      }
+    }
+    default: {
+      $package      = 'php7.0-sqlite'
+    }
+  }
 }
diff --git a/manifests/extension/ssh2/params.pp b/manifests/extension/ssh2/params.pp
index 9ada1fb2..7ced56ec 100644
--- a/manifests/extension/ssh2/params.pp
+++ b/manifests/extension/ssh2/params.pp
@@ -41,9 +41,27 @@
 class php::extension::ssh2::params {
 
   $ensure   = $php::params::ensure
-  $package  = 'php7.0-ssh2'
   $provider = undef
   $inifile  = "${php::params::config_root_ini}/ssh2.ini"
   $settings = [ ]
 
+  case $::osfamily {
+    'Debian': {
+      case $::operatingsystem {
+        'Debian': {
+          if (versioncmp($::operatingsystemrelease, '9')) {
+            $package        = 'php7.0-ssh2'
+          } else {
+            $package        = 'php5-ssh2'
+          }
+        }
+        default: {
+          $package      = 'php7.0-ssh2'
+        }
+      }
+    }
+    default: {
+      $package      = 'php7.0-ssh2'
+    }
+  }
 }
diff --git a/manifests/extension/tidy/params.pp b/manifests/extension/tidy/params.pp
index 252c2956..5d29f64d 100644
--- a/manifests/extension/tidy/params.pp
+++ b/manifests/extension/tidy/params.pp
@@ -42,9 +42,27 @@
 class php::extension::tidy::params {
 
   $ensure   = $php::params::ensure
-  $package  = 'php7.0-tidy'
   $provider = undef
   $inifile  = "${php::params::config_root_ini}/tidy.ini"
   $settings = [ ]
 
+  case $::osfamily {
+    'Debian': {
+      case $::operatingsystem {
+        'Debian': {
+          if (versioncmp($::operatingsystemrelease, '9')) {
+            $package        = 'php7.0-tidy'
+          } else {
+            $package        = 'php5-tidy'
+          }
+        }
+        default: {
+          $package      = 'php7.0-tidy'
+        }
+      }
+    }
+    default: {
+      $package      = 'php7.0-tidy'
+    }
+  }
 }
diff --git a/manifests/extension/xcache/params.pp b/manifests/extension/xcache/params.pp
index 15847edc..44df7399 100644
--- a/manifests/extension/xcache/params.pp
+++ b/manifests/extension/xcache/params.pp
@@ -41,9 +41,27 @@
 class php::extension::xcache::params {
 
   $ensure   = $php::params::ensure
-  $package  = 'php7.0-xcache'
   $provider = undef
   $inifile  = "${php::params::config_root_ini}/xcache.ini"
   $settings = []
 
+  case $::osfamily {
+    'Debian': {
+      case $::operatingsystem {
+        'Debian': {
+          if (versioncmp($::operatingsystemrelease, '9')) {
+            $package        = 'php7.0-xcache'
+          } else {
+            $package        = 'php5-xcache'
+          }
+        }
+        default: {
+          $package      = 'php7.0-xcache'
+        }
+      }
+    }
+    default: {
+      $package      = 'php7.0-xcache'
+    }
+  }
 }
diff --git a/manifests/extension/xdebug/params.pp b/manifests/extension/xdebug/params.pp
index ab5ddcbb..0955d0f0 100644
--- a/manifests/extension/xdebug/params.pp
+++ b/manifests/extension/xdebug/params.pp
@@ -44,12 +44,33 @@
 class php::extension::xdebug::params {
 
   $ensure      = $php::params::ensure
-  $package     = 'php7.0-xdebug'
   $provider    = undef
-  $install_dir = "/usr/lib/php5/${::php_extension_version}"
   $inifile     = "${php::params::config_root_ini}/xdebug.ini"
   $settings    = [
     "set .anon/zend_extension '${install_dir}/xdebug.so'"
   ]
 
+  case $::osfamily {
+    'Debian': {
+      case $::operatingsystem {
+        'Debian': {
+          if (versioncmp($::operatingsystemrelease, '9')) {
+            $install_dir    = "/usr/lib/php/${::php_extension_version}"
+            $package        = 'php7.0-xdebug'
+          } else {
+            $install_dir    = "/usr/lib/php5/${::php_extension_version}"
+            $package        = 'php5-xdebug'
+          }
+        }
+        default: {
+          $install_dir  = "/usr/lib/php/${::php_extension_version}"
+          $package      = 'php7.0-xdebug'
+        }
+      }
+    }
+    default: {
+      $install_dir  = "/usr/lib/php/${::php_extension_version}"
+      $package      = 'php7.0-xdebug'
+    }
+  }
 }
diff --git a/manifests/extension/yaml/params.pp b/manifests/extension/yaml/params.pp
index a9133173..2ef0ceb5 100644
--- a/manifests/extension/yaml/params.pp
+++ b/manifests/extension/yaml/params.pp
@@ -41,9 +41,27 @@
 class php::extension::yaml::params {
 
   $ensure   = $php::params::ensure
-  $package  = 'php7.0-yaml'
   $provider = undef
   $inifile  = "${php::params::config_root_ini}/yaml.ini"
   $settings = []
 
+  case $::osfamily {
+    'Debian': {
+      case $::operatingsystem {
+        'Debian': {
+          if (versioncmp($::operatingsystemrelease, '9')) {
+            $package        = 'php7.0-yaml'
+          } else {
+            $package        = 'php5-yaml'
+          }
+        }
+        default: {
+          $package      = 'php7.0-yaml'
+        }
+      }
+    }
+    default: {
+      $package      = 'php7.0-yaml'
+    }
+  }
 }
diff --git a/manifests/fpm/params.pp b/manifests/fpm/params.pp
index 28d8c680..62114b55 100644
--- a/manifests/fpm/params.pp
+++ b/manifests/fpm/params.pp
@@ -41,20 +41,15 @@
 class php::fpm::params inherits php::params {
 
   $ensure             = $::php::params::ensure
-  $package            = 'php7.0-fpm'
   $provider           = undef
-  $inifile            = '/etc/php/7.0/fpm/php.ini'
   $settings           = [ ]
 
-  $service_name       = 'php7.0-fpm'
   $service_ensure     = 'running'
   $service_enable     = true
   $service_has_status = true
   $service_provider   = undef
 
   # default params for php-fpm.conf, ported from php::fpm::daemon
-  $pid                          = '/var/run/php7.0-fpm.pid'
-  $error_log                    = '/var/log/php7.0-fpm.log'
   $syslog_facility              = undef
   $syslog_ident                 = undef
   $log_level                    = 'notice'
@@ -68,4 +63,39 @@
   $rlimit_core                  = 0
   $events_mechanism             = undef
 
-}
+  case $::osfamily {
+    'Debian': {
+      case $::operatingsystem {
+        'Debian': {
+          if (versioncmp($::operatingsystemrelease, '9')) {
+            $pid            = '/var/run/php7.0-fpm.pid'
+            $error_log      = '/var/log/php7.0-fpm.log'
+            $inifile        = '/etc/php/7.0/fpm/php.ini'
+            $package        = 'php7.0-fpm'
+            $service_name   = 'php7.0-fpm'
+          } else {
+            $pid            = '/var/run/php5-fpm.pid'
+            $error_log      = '/var/log/php5-fpm.log'
+            $inifile        = '/etc/php5/fpm/php.ini'
+            $package        = 'php5.0-fpm'
+            $service_name   = 'php5.0-fpm'
+          }
+        }
+        default: {
+          $pid          = '/var/run/php7.0-fpm.pid'
+          $error_log    = '/var/log/php7.0-fpm.log'
+          $inifile      = '/etc/php/7.0/fpm/php.ini'
+          $package      = 'php7.0-fpm'
+          $service_name = 'php7.0-fpm'
+        }
+      }
+    }
+    default: {
+      $pid          = '/var/run/php7.0-fpm.pid'
+      $error_log    = '/var/log/php7.0-fpm.log'
+      $inifile      = '/etc/php/7.0/fpm/php.ini'
+      $package      = 'php7.0-fpm'
+      $service_name = 'php7.0-fpm'
+    }
+  }
+} 
diff --git a/manifests/params.pp b/manifests/params.pp
index e20a03d3..62a1ede0 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -29,8 +29,6 @@
 
   $ensure = 'installed'
 
-  $config_root = '/etc/php'
-
   if $::php_version == '' or versioncmp($::php_version, '5.4') >= 0 {
     $config_root_ini = "${::php::params::config_root}/mods-available"
   } else {
@@ -39,4 +37,23 @@
 
   $augeas_contrib_dir = '/usr/share/augeas/lenses/contrib'
 
+  case $::osfamily {
+    'Debian': {
+      case $::operatingsystem {
+        'Debian': {
+          if (versioncmp($::operatingsystemrelease, '9')) {
+            $config_root    = '/etc/php/7.0'
+          } else {
+            $config_root    = '/etc/php5'
+          }
+        }
+        default: {
+          $config_root  = '/etc/php/7.0'
+        }
+      }
+    }
+    default: {  
+      $config_root  = '/etc/php/7.0'
+    }
+  }
 }
diff --git a/manifests/pear/params.pp b/manifests/pear/params.pp
index bc91fafe..0114263c 100644
--- a/manifests/pear/params.pp
+++ b/manifests/pear/params.pp
@@ -46,7 +46,25 @@
 class php::pear::params {
 
   $ensure   = $php::params::ensure
-  $package  = 'php-pear'
   $provider = undef
 
+  case $::osfamily {
+    'Debian': {
+      case $::operatingsystem {
+        'Debian': {
+          if (versioncmp($::operatingsystemrelease, '9')) {
+            $package        = 'php-pear'
+          } else {
+            $package        = 'php-pear'
+          }
+        }
+        default: {
+          $package      = 'php-pear'
+        }
+      }
+    }
+    default: {
+      $package      = 'php-pear'
+    }
+  }
 }

From b8a2a318190bac47f3b23c8090ef8ac7ea3e2be5 Mon Sep 17 00:00:00 2001
From: Henry Paulissen <henry@telegraafnet.nl>
Date: Sun, 26 Feb 2017 02:51:16 +0100
Subject: [PATCH 2/6] Made improvements to the versioncmp checking

Signed-off-by: Henry Paulissen <henry@telegraafnet.nl>
---
 manifests/apache/params.pp              | 2 +-
 manifests/cli/params.pp                 | 2 +-
 manifests/config/augeas.pp              | 6 +++---
 manifests/contrib/base_package.pp       | 2 +-
 manifests/dev/params.pp                 | 2 +-
 manifests/extension/apc/params.pp       | 2 +-
 manifests/extension/apcu/params.pp      | 2 +-
 manifests/extension/curl/params.pp      | 2 +-
 manifests/extension/gd/params.pp        | 2 +-
 manifests/extension/gearman/params.pp   | 2 +-
 manifests/extension/http/params.pp      | 2 +-
 manifests/extension/igbinary/params.pp  | 2 +-
 manifests/extension/imagick/params.pp   | 2 +-
 manifests/extension/imap/params.pp      | 2 +-
 manifests/extension/intl/params.pp      | 2 +-
 manifests/extension/ldap/params.pp      | 2 +-
 manifests/extension/mcrypt/params.pp    | 2 +-
 manifests/extension/memcache/params.pp  | 2 +-
 manifests/extension/memcached/params.pp | 2 +-
 manifests/extension/mysql/params.pp     | 2 +-
 manifests/extension/mysqlnd/params.pp   | 2 +-
 manifests/extension/newrelic/params.pp  | 2 +-
 manifests/extension/pgsql/params.pp     | 2 +-
 manifests/extension/redis/params.pp     | 2 +-
 manifests/extension/sqlite/params.pp    | 2 +-
 manifests/extension/ssh2/params.pp      | 2 +-
 manifests/extension/tidy/params.pp      | 2 +-
 manifests/extension/xcache/params.pp    | 2 +-
 manifests/extension/xdebug/params.pp    | 2 +-
 manifests/extension/yaml/params.pp      | 2 +-
 manifests/fpm.pp                        | 4 +++-
 manifests/fpm/params.pp                 | 7 +++----
 manifests/params.pp                     | 2 +-
 manifests/pear/params.pp                | 2 +-
 34 files changed, 40 insertions(+), 39 deletions(-)

diff --git a/manifests/apache/params.pp b/manifests/apache/params.pp
index 1e83221f..d9a3d4a5 100644
--- a/manifests/apache/params.pp
+++ b/manifests/apache/params.pp
@@ -48,7 +48,7 @@
     'Debian': {
       case $::operatingsystem {
         'Debian': {
-          if (versioncmp($::operatingsystemrelease, '9')) {
+          if (versioncmp($::operatingsystemrelease, '9') >= 0) {
             $service_name   = 'apache2'
             $package        = 'libapache2-mod-php7.0'
             $inifile        = '/etc/php/7.0/apache2/php.ini'
diff --git a/manifests/cli/params.pp b/manifests/cli/params.pp
index 40bb66b4..fc6cb46e 100644
--- a/manifests/cli/params.pp
+++ b/manifests/cli/params.pp
@@ -48,7 +48,7 @@
     'Debian': {
       case $::operatingsystem {
         'Debian': {
-          if (versioncmp($::operatingsystemrelease, '9')) {
+          if (versioncmp($::operatingsystemrelease, '9') >= 0) {
             $inifile        = '/etc/php/7.0/cli/php.ini'
             $package        = 'php7.0-cli'
           } else {
diff --git a/manifests/config/augeas.pp b/manifests/config/augeas.pp
index 0ce3aae3..7a25678b 100644
--- a/manifests/config/augeas.pp
+++ b/manifests/config/augeas.pp
@@ -3,10 +3,10 @@
   $file,
   $config,
 ) {
-  include php::augeas
-  include php::params
+  include ::php::augeas
+  include ::php::params
 
-  augeas { "php-${name}-config":
+  augeas { $name:
     incl      => $file,
     changes   => $config,
     load_path => $php::params::augeas_contrib_dir,
diff --git a/manifests/contrib/base_package.pp b/manifests/contrib/base_package.pp
index 20b9bd51..9ade41b8 100644
--- a/manifests/contrib/base_package.pp
+++ b/manifests/contrib/base_package.pp
@@ -36,7 +36,7 @@
     'Debian': {
       case $::operatingsystem {
         'Debian': {
-          if (versioncmp($::operatingsystemrelease, '9')) {
+          if (versioncmp($::operatingsystemrelease, '9') >= 0) {
             $package        = 'php7.0-common'
           } else {
             $package        = 'php5-common'
diff --git a/manifests/dev/params.pp b/manifests/dev/params.pp
index 29f086be..97e28fdf 100644
--- a/manifests/dev/params.pp
+++ b/manifests/dev/params.pp
@@ -40,7 +40,7 @@
     'Debian': {
       case $::operatingsystem {
         'Debian': {
-          if (versioncmp($::operatingsystemrelease, '9')) {
+          if (versioncmp($::operatingsystemrelease, '9') >= 0) {
             $package        = 'php7.0-dev'
           } else {
             $package        = 'php5-dev'
diff --git a/manifests/extension/apc/params.pp b/manifests/extension/apc/params.pp
index bec4664a..5a8c0a18 100644
--- a/manifests/extension/apc/params.pp
+++ b/manifests/extension/apc/params.pp
@@ -49,7 +49,7 @@
     'Debian': {
       case $::operatingsystem {
         'Debian': {
-          if (versioncmp($::operatingsystemrelease, '9')) {
+          if (versioncmp($::operatingsystemrelease, '9') >= 0) {
             $package        = 'php-apcu'
           } else {
             $package        = 'php-apc'
diff --git a/manifests/extension/apcu/params.pp b/manifests/extension/apcu/params.pp
index 2ab7d392..3dc0bd13 100644
--- a/manifests/extension/apcu/params.pp
+++ b/manifests/extension/apcu/params.pp
@@ -49,7 +49,7 @@
     'Debian': {
       case $::operatingsystem {
         'Debian': {
-          if (versioncmp($::operatingsystemrelease, '9')) {
+          if (versioncmp($::operatingsystemrelease, '9') >= 0) {
             $package        = 'php7.0-apcu'
           } else {
             $package        = 'php5-apcu'
diff --git a/manifests/extension/curl/params.pp b/manifests/extension/curl/params.pp
index fe608594..8157ef77 100644
--- a/manifests/extension/curl/params.pp
+++ b/manifests/extension/curl/params.pp
@@ -49,7 +49,7 @@
     'Debian': {
       case $::operatingsystem {
         'Debian': {
-          if (versioncmp($::operatingsystemrelease, '9')) {
+          if (versioncmp($::operatingsystemrelease, '9') >= 0) {
             $package        = 'php7.0-curl'
           } else {
             $package        = 'php5-curl'
diff --git a/manifests/extension/gd/params.pp b/manifests/extension/gd/params.pp
index cd980be4..0cb68e9a 100644
--- a/manifests/extension/gd/params.pp
+++ b/manifests/extension/gd/params.pp
@@ -49,7 +49,7 @@
     'Debian': {
       case $::operatingsystem {
         'Debian': {
-          if (versioncmp($::operatingsystemrelease, '9')) {
+          if (versioncmp($::operatingsystemrelease, '9') >= 0) {
             $package        = 'php7.0-gd'
           } else {
             $package        = 'php5-gd'
diff --git a/manifests/extension/gearman/params.pp b/manifests/extension/gearman/params.pp
index 1382d5eb..4e6fa483 100644
--- a/manifests/extension/gearman/params.pp
+++ b/manifests/extension/gearman/params.pp
@@ -49,7 +49,7 @@
     'Debian': {
       case $::operatingsystem {
         'Debian': {
-          if (versioncmp($::operatingsystemrelease, '9')) {
+          if (versioncmp($::operatingsystemrelease, '9') >= 0) {
             $package        = 'php7.0-gearman'
           } else {
             $package        = 'php5-gearman'
diff --git a/manifests/extension/http/params.pp b/manifests/extension/http/params.pp
index 9dff70b1..4eab7f38 100644
--- a/manifests/extension/http/params.pp
+++ b/manifests/extension/http/params.pp
@@ -50,7 +50,7 @@
     'Debian': {
       case $::operatingsystem {
         'Debian': {
-          if (versioncmp($::operatingsystemrelease, '9')) {
+          if (versioncmp($::operatingsystemrelease, '9') >= 0) {
             $package        = 'php7.0-http'
           } else {
             warning('php::extension::http package does not exists on php5')
diff --git a/manifests/extension/igbinary/params.pp b/manifests/extension/igbinary/params.pp
index c15ece92..1e5f503d 100644
--- a/manifests/extension/igbinary/params.pp
+++ b/manifests/extension/igbinary/params.pp
@@ -49,7 +49,7 @@
     'Debian': {
       case $::operatingsystem {
         'Debian': {
-          if (versioncmp($::operatingsystemrelease, '9')) {
+          if (versioncmp($::operatingsystemrelease, '9') >= 0) {
             $package        = 'php7.0-igbinary'
           } else {
             $package        = 'php5-igbinary'
diff --git a/manifests/extension/imagick/params.pp b/manifests/extension/imagick/params.pp
index fa26a91d..fb220383 100644
--- a/manifests/extension/imagick/params.pp
+++ b/manifests/extension/imagick/params.pp
@@ -49,7 +49,7 @@
     'Debian': {
       case $::operatingsystem {
         'Debian': {
-          if (versioncmp($::operatingsystemrelease, '9')) {
+          if (versioncmp($::operatingsystemrelease, '9') >= 0) {
             $package        = 'php7.0-imagick'
           } else {
             $package        = 'php5-imagick'
diff --git a/manifests/extension/imap/params.pp b/manifests/extension/imap/params.pp
index 952228bc..8a8d1f18 100644
--- a/manifests/extension/imap/params.pp
+++ b/manifests/extension/imap/params.pp
@@ -49,7 +49,7 @@
     'Debian': {
       case $::operatingsystem {
         'Debian': {
-          if (versioncmp($::operatingsystemrelease, '9')) {
+          if (versioncmp($::operatingsystemrelease, '9') >= 0) {
             $package        = 'php7.0-imap'
           } else {
             $package        = 'php5-imap'
diff --git a/manifests/extension/intl/params.pp b/manifests/extension/intl/params.pp
index f489fa3f..3cfe8a25 100644
--- a/manifests/extension/intl/params.pp
+++ b/manifests/extension/intl/params.pp
@@ -49,7 +49,7 @@
     'Debian': {
       case $::operatingsystem {
         'Debian': {
-          if (versioncmp($::operatingsystemrelease, '9')) {
+          if (versioncmp($::operatingsystemrelease, '9') >= 0) {
             $package        = 'php7.0-intl'
           } else {
             $package        = 'php5-intl'
diff --git a/manifests/extension/ldap/params.pp b/manifests/extension/ldap/params.pp
index f0275d55..a8e09ba7 100644
--- a/manifests/extension/ldap/params.pp
+++ b/manifests/extension/ldap/params.pp
@@ -49,7 +49,7 @@
     'Debian': {
       case $::operatingsystem {
         'Debian': {
-          if (versioncmp($::operatingsystemrelease, '9')) {
+          if (versioncmp($::operatingsystemrelease, '9') >= 0) {
             $package        = 'php7.0-ldap'
           } else {
             $package        = 'php5-ldap'
diff --git a/manifests/extension/mcrypt/params.pp b/manifests/extension/mcrypt/params.pp
index 52ae504c..4e103516 100644
--- a/manifests/extension/mcrypt/params.pp
+++ b/manifests/extension/mcrypt/params.pp
@@ -49,7 +49,7 @@
     'Debian': {
       case $::operatingsystem {
         'Debian': {
-          if (versioncmp($::operatingsystemrelease, '9')) {
+          if (versioncmp($::operatingsystemrelease, '9') >= 0) {
             $package        = 'php7.0-mcrypt'
           } else {
             $package        = 'php5-mcrypt'
diff --git a/manifests/extension/memcache/params.pp b/manifests/extension/memcache/params.pp
index a8c8f0bc..3aae0cf1 100644
--- a/manifests/extension/memcache/params.pp
+++ b/manifests/extension/memcache/params.pp
@@ -50,7 +50,7 @@
     'Debian': {
       case $::operatingsystem {
         'Debian': {
-          if (versioncmp($::operatingsystemrelease, '9')) {
+          if (versioncmp($::operatingsystemrelease, '9') >= 0) {
             $package        = 'php7.0-memcache'
           } else {
             $package        = 'php5-memcache'
diff --git a/manifests/extension/memcached/params.pp b/manifests/extension/memcached/params.pp
index d6c037a3..cdcd3bfd 100644
--- a/manifests/extension/memcached/params.pp
+++ b/manifests/extension/memcached/params.pp
@@ -50,7 +50,7 @@
     'Debian': {
       case $::operatingsystem {
         'Debian': {
-          if (versioncmp($::operatingsystemrelease, '9')) {
+          if (versioncmp($::operatingsystemrelease, '9') >= 0) {
             $package        = 'php7.0-memcached'
           } else {
             $package        = 'php5-memcached'
diff --git a/manifests/extension/mysql/params.pp b/manifests/extension/mysql/params.pp
index f2a32e22..a84ce836 100644
--- a/manifests/extension/mysql/params.pp
+++ b/manifests/extension/mysql/params.pp
@@ -49,7 +49,7 @@
     'Debian': {
       case $::operatingsystem {
         'Debian': {
-          if (versioncmp($::operatingsystemrelease, '9')) {
+          if (versioncmp($::operatingsystemrelease, '9') >= 0) {
             $package        = 'php7.0-mysql'
           } else {
             $package        = 'php5-mysql'
diff --git a/manifests/extension/mysqlnd/params.pp b/manifests/extension/mysqlnd/params.pp
index 8c12c1b8..5db987f0 100644
--- a/manifests/extension/mysqlnd/params.pp
+++ b/manifests/extension/mysqlnd/params.pp
@@ -49,7 +49,7 @@
     'Debian': {
       case $::operatingsystem {
         'Debian': {
-          if (versioncmp($::operatingsystemrelease, '9')) {
+          if (versioncmp($::operatingsystemrelease, '9') >= 0) {
             $package        = 'php7.0-mysqlnd'
           } else {
             $package        = 'php5-mysqlnd'
diff --git a/manifests/extension/newrelic/params.pp b/manifests/extension/newrelic/params.pp
index e0e4c3ba..6215f775 100644
--- a/manifests/extension/newrelic/params.pp
+++ b/manifests/extension/newrelic/params.pp
@@ -49,7 +49,7 @@
     'Debian': {
       case $::operatingsystem {
         'Debian': {
-          if (versioncmp($::operatingsystemrelease, '9')) {
+          if (versioncmp($::operatingsystemrelease, '9') >= 0) {
             $package        = 'newrelic-php7'
           } else {
             $package        = 'newrelic-php5'
diff --git a/manifests/extension/pgsql/params.pp b/manifests/extension/pgsql/params.pp
index cc75f200..52a8f3f0 100644
--- a/manifests/extension/pgsql/params.pp
+++ b/manifests/extension/pgsql/params.pp
@@ -49,7 +49,7 @@
     'Debian': {
       case $::operatingsystem {
         'Debian': {
-          if (versioncmp($::operatingsystemrelease, '9')) {
+          if (versioncmp($::operatingsystemrelease, '9') >= 0) {
             $package        = 'php7.0-pgsql'
           } else {
             $package        = 'php5-pgsql'
diff --git a/manifests/extension/redis/params.pp b/manifests/extension/redis/params.pp
index dc342037..d2a63a2c 100644
--- a/manifests/extension/redis/params.pp
+++ b/manifests/extension/redis/params.pp
@@ -49,7 +49,7 @@
     'Debian': {
       case $::operatingsystem {
         'Debian': {
-          if (versioncmp($::operatingsystemrelease, '9')) {
+          if (versioncmp($::operatingsystemrelease, '9') >= 0) {
             $package        = 'php7.0-redis'
           } else {
             $package        = 'php5-redis'
diff --git a/manifests/extension/sqlite/params.pp b/manifests/extension/sqlite/params.pp
index 3d353f7d..03e91396 100644
--- a/manifests/extension/sqlite/params.pp
+++ b/manifests/extension/sqlite/params.pp
@@ -49,7 +49,7 @@
     'Debian': {
       case $::operatingsystem {
         'Debian': {
-          if (versioncmp($::operatingsystemrelease, '9')) {
+          if (versioncmp($::operatingsystemrelease, '9') >= 0) {
             $package        = 'php7.0-sqlite'
           } else {
             $package        = 'php5-sqlite'
diff --git a/manifests/extension/ssh2/params.pp b/manifests/extension/ssh2/params.pp
index 7ced56ec..392a9a38 100644
--- a/manifests/extension/ssh2/params.pp
+++ b/manifests/extension/ssh2/params.pp
@@ -49,7 +49,7 @@
     'Debian': {
       case $::operatingsystem {
         'Debian': {
-          if (versioncmp($::operatingsystemrelease, '9')) {
+          if (versioncmp($::operatingsystemrelease, '9') >= 0) {
             $package        = 'php7.0-ssh2'
           } else {
             $package        = 'php5-ssh2'
diff --git a/manifests/extension/tidy/params.pp b/manifests/extension/tidy/params.pp
index 5d29f64d..5896ae2d 100644
--- a/manifests/extension/tidy/params.pp
+++ b/manifests/extension/tidy/params.pp
@@ -50,7 +50,7 @@
     'Debian': {
       case $::operatingsystem {
         'Debian': {
-          if (versioncmp($::operatingsystemrelease, '9')) {
+          if (versioncmp($::operatingsystemrelease, '9') >= 0) {
             $package        = 'php7.0-tidy'
           } else {
             $package        = 'php5-tidy'
diff --git a/manifests/extension/xcache/params.pp b/manifests/extension/xcache/params.pp
index 44df7399..070486f0 100644
--- a/manifests/extension/xcache/params.pp
+++ b/manifests/extension/xcache/params.pp
@@ -49,7 +49,7 @@
     'Debian': {
       case $::operatingsystem {
         'Debian': {
-          if (versioncmp($::operatingsystemrelease, '9')) {
+          if (versioncmp($::operatingsystemrelease, '9') >= 0) {
             $package        = 'php7.0-xcache'
           } else {
             $package        = 'php5-xcache'
diff --git a/manifests/extension/xdebug/params.pp b/manifests/extension/xdebug/params.pp
index 0955d0f0..44262538 100644
--- a/manifests/extension/xdebug/params.pp
+++ b/manifests/extension/xdebug/params.pp
@@ -54,7 +54,7 @@
     'Debian': {
       case $::operatingsystem {
         'Debian': {
-          if (versioncmp($::operatingsystemrelease, '9')) {
+          if (versioncmp($::operatingsystemrelease, '9') >= 0) {
             $install_dir    = "/usr/lib/php/${::php_extension_version}"
             $package        = 'php7.0-xdebug'
           } else {
diff --git a/manifests/extension/yaml/params.pp b/manifests/extension/yaml/params.pp
index 2ef0ceb5..f792ee75 100644
--- a/manifests/extension/yaml/params.pp
+++ b/manifests/extension/yaml/params.pp
@@ -49,7 +49,7 @@
     'Debian': {
       case $::operatingsystem {
         'Debian': {
-          if (versioncmp($::operatingsystemrelease, '9')) {
+          if (versioncmp($::operatingsystemrelease, '9') >= 0) {
             $package        = 'php7.0-yaml'
           } else {
             $package        = 'php5-yaml'
diff --git a/manifests/fpm.pp b/manifests/fpm.pp
index 1b2ae643..1c8efebb 100644
--- a/manifests/fpm.pp
+++ b/manifests/fpm.pp
@@ -52,6 +52,7 @@
   $service_provider   = $php::fpm::params::service_provider,
 
   # settings for php-fpm.conf
+  $fpm_config                   = $php::fpm::params::fpm_config,
   $pid                          = $php::fpm::params::pid,
   $error_log                    = $php::fpm::params::error_log,
   $syslog_facility              = $php::fpm::params::syslog_facility,
@@ -66,6 +67,7 @@
   $rlimit_core                  = $php::fpm::params::rlimit_core,
   $events_mechanism             = $php::fpm::params::events_mechanism,
 
+  $config_root                  = $php::params::config_root
 ) inherits php::fpm::params {
 
   class  { 'php::fpm::package':
@@ -90,7 +92,7 @@
     require => Package[$package]
   }
 
-  file { '/etc/php/7.0/fpm/php-fpm.conf':
+  file { $fpm_config:
     notify  => Service[$service_name],
     content => template('php/fpm/php-fpm.conf.erb'),
     owner   => root,
diff --git a/manifests/fpm/params.pp b/manifests/fpm/params.pp
index 62114b55..c428e1fb 100644
--- a/manifests/fpm/params.pp
+++ b/manifests/fpm/params.pp
@@ -50,6 +50,8 @@
   $service_provider   = undef
 
   # default params for php-fpm.conf, ported from php::fpm::daemon
+  $fpm_config                   = "${::php::params::config_root}/fpm/php-fpm.conf"
+  $inifile                      = "${::php::params::config_root}/fpm/php.ini"
   $syslog_facility              = undef
   $syslog_ident                 = undef
   $log_level                    = 'notice'
@@ -67,16 +69,14 @@
     'Debian': {
       case $::operatingsystem {
         'Debian': {
-          if (versioncmp($::operatingsystemrelease, '9')) {
+          if (versioncmp($::operatingsystemrelease, '9') >= 0) {
             $pid            = '/var/run/php7.0-fpm.pid'
             $error_log      = '/var/log/php7.0-fpm.log'
-            $inifile        = '/etc/php/7.0/fpm/php.ini'
             $package        = 'php7.0-fpm'
             $service_name   = 'php7.0-fpm'
           } else {
             $pid            = '/var/run/php5-fpm.pid'
             $error_log      = '/var/log/php5-fpm.log'
-            $inifile        = '/etc/php5/fpm/php.ini'
             $package        = 'php5.0-fpm'
             $service_name   = 'php5.0-fpm'
           }
@@ -84,7 +84,6 @@
         default: {
           $pid          = '/var/run/php7.0-fpm.pid'
           $error_log    = '/var/log/php7.0-fpm.log'
-          $inifile      = '/etc/php/7.0/fpm/php.ini'
           $package      = 'php7.0-fpm'
           $service_name = 'php7.0-fpm'
         }
diff --git a/manifests/params.pp b/manifests/params.pp
index 62a1ede0..8414d839 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -41,7 +41,7 @@
     'Debian': {
       case $::operatingsystem {
         'Debian': {
-          if (versioncmp($::operatingsystemrelease, '9')) {
+          if (versioncmp($::operatingsystemrelease, '9') >= 0) {
             $config_root    = '/etc/php/7.0'
           } else {
             $config_root    = '/etc/php5'
diff --git a/manifests/pear/params.pp b/manifests/pear/params.pp
index 0114263c..9a628163 100644
--- a/manifests/pear/params.pp
+++ b/manifests/pear/params.pp
@@ -52,7 +52,7 @@
     'Debian': {
       case $::operatingsystem {
         'Debian': {
-          if (versioncmp($::operatingsystemrelease, '9')) {
+          if (versioncmp($::operatingsystemrelease, '9') >= 0) {
             $package        = 'php-pear'
           } else {
             $package        = 'php-pear'

From 175b12cdc5da8afc279a5259e2bfa24c23849758 Mon Sep 17 00:00:00 2001
From: Henry Paulissen <henry@telegraafnet.nl>
Date: Mon, 27 Feb 2017 11:03:08 +0100
Subject: [PATCH 3/6] * Fixed config_root_ini and augeas loading.

Signed-off-by: Henry Paulissen <henry@nitronetworks.nl>
---
 manifests/config/augeas.pp     |  6 +++---
 manifests/params.pp            | 13 ++++++-------
 templates/fpm/php-fpm.conf.erb |  3 ++-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/manifests/config/augeas.pp b/manifests/config/augeas.pp
index 7a25678b..0ce3aae3 100644
--- a/manifests/config/augeas.pp
+++ b/manifests/config/augeas.pp
@@ -3,10 +3,10 @@
   $file,
   $config,
 ) {
-  include ::php::augeas
-  include ::php::params
+  include php::augeas
+  include php::params
 
-  augeas { $name:
+  augeas { "php-${name}-config":
     incl      => $file,
     changes   => $config,
     load_path => $php::params::augeas_contrib_dir,
diff --git a/manifests/params.pp b/manifests/params.pp
index 8414d839..37361af9 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -28,13 +28,6 @@
 class php::params {
 
   $ensure = 'installed'
-
-  if $::php_version == '' or versioncmp($::php_version, '5.4') >= 0 {
-    $config_root_ini = "${::php::params::config_root}/mods-available"
-  } else {
-    $config_root_ini = "${::php::params::config_root}/conf.d"
-  }
-
   $augeas_contrib_dir = '/usr/share/augeas/lenses/contrib'
 
   case $::osfamily {
@@ -56,4 +49,10 @@
       $config_root  = '/etc/php/7.0'
     }
   }
+
+  if $::php_version == '' or versioncmp($::php_version, '5.4') >= 0 {
+    $config_root_ini = "${config_root}/mods-available"
+  } else {
+    $config_root_ini = "${config_root}/conf.d"
+  }
 }
diff --git a/templates/fpm/php-fpm.conf.erb b/templates/fpm/php-fpm.conf.erb
index 1aa58972..2ad986c5 100644
--- a/templates/fpm/php-fpm.conf.erb
+++ b/templates/fpm/php-fpm.conf.erb
@@ -142,4 +142,5 @@ events.mechanism = <%= @events_mechanism %>
 ; Relative path can also be used. They will be prefixed by:
 ;  - the global prefix if it's been set (-p argument)
 ;  - /usr otherwise
-include=/etc/php/7.0/fpm/pool.d/*.conf
+include=<%= @config_root -%>/fpm/pool.d/*.conf
+

From 9c090750582bf883bdbe77f35b68489e1af5f159 Mon Sep 17 00:00:00 2001
From: Henry Paulissen <henry@telegraafnet.nl>
Date: Mon, 27 Feb 2017 13:00:44 +0100
Subject: [PATCH 4/6] Fixed multiple extensions.

Stretch seems to use php7.0- prefix for extensions shipped
with php7.0 and php- prefix for other php extensions. I
updated the code to reflect this.

Cross checked Jessie, every package on there is prefixed with php5-.

Signed-off-by: Henry Paulissen <henry@telegraafnet.nl>
---
 manifests/extension/apc/params.pp       |  6 ++---
 manifests/extension/apcu/params.pp      |  6 ++---
 manifests/extension/gearman/params.pp   |  6 ++---
 manifests/extension/http/params.pp      |  6 ++---
 manifests/extension/igbinary/params.pp  |  6 ++---
 manifests/extension/imagick/params.pp   |  6 ++---
 manifests/extension/memcache/params.pp  |  6 ++---
 manifests/extension/memcached/params.pp |  6 ++---
 manifests/extension/mongo/params.pp     | 34 +++++++++++++++++++++----
 manifests/extension/mysqlnd/params.pp   |  6 ++---
 manifests/extension/redis/params.pp     |  6 ++---
 manifests/extension/sqlite/params.pp    |  6 ++---
 manifests/extension/ssh2/params.pp      |  6 ++---
 manifests/extension/xcache/params.pp    |  6 ++---
 manifests/extension/xdebug/params.pp    | 13 +++++-----
 manifests/extension/yaml/params.pp      |  6 ++---
 16 files changed, 78 insertions(+), 53 deletions(-)

diff --git a/manifests/extension/apc/params.pp b/manifests/extension/apc/params.pp
index 5a8c0a18..c6a16c52 100644
--- a/manifests/extension/apc/params.pp
+++ b/manifests/extension/apc/params.pp
@@ -49,19 +49,19 @@
     'Debian': {
       case $::operatingsystem {
         'Debian': {
-          if (versioncmp($::operatingsystemrelease, '9') >= 0) {
+          if (versioncmp($::operatingsystemrelease, '8') >= 0) {
             $package        = 'php-apcu'
           } else {
             $package        = 'php-apc'
           }
         }
         default: {
-          $package      = 'php-apc'
+          $package      = 'php-apcu'
         }
       }
     }
     default: {
-      $package      = 'php-apc'
+      $package      = 'php-apcu'
     }
   }
 }
diff --git a/manifests/extension/apcu/params.pp b/manifests/extension/apcu/params.pp
index 3dc0bd13..4a831b1b 100644
--- a/manifests/extension/apcu/params.pp
+++ b/manifests/extension/apcu/params.pp
@@ -50,18 +50,18 @@
       case $::operatingsystem {
         'Debian': {
           if (versioncmp($::operatingsystemrelease, '9') >= 0) {
-            $package        = 'php7.0-apcu'
+            $package        = 'php-apcu'
           } else {
             $package        = 'php5-apcu'
           }
         }
         default: {
-          $package      = 'php7.0-apcu'
+          $package      = 'php-apcu'
         }
       }
     }
     default: {
-      $package      = 'php7.0-apcu'
+      $package      = 'php-apcu'
     }
   }
 }
diff --git a/manifests/extension/gearman/params.pp b/manifests/extension/gearman/params.pp
index 4e6fa483..e702bc60 100644
--- a/manifests/extension/gearman/params.pp
+++ b/manifests/extension/gearman/params.pp
@@ -50,18 +50,18 @@
       case $::operatingsystem {
         'Debian': {
           if (versioncmp($::operatingsystemrelease, '9') >= 0) {
-            $package        = 'php7.0-gearman'
+            $package        = 'php-gearman'
           } else {
             $package        = 'php5-gearman'
           }
         }
         default: {
-          $package      = 'php7.0-gearman'
+          $package      = 'php-gearman'
         }
       }
     }
     default: {
-      $package      = 'php7.0-gearman'
+      $package      = 'php-gearman'
     }
   }
 }
diff --git a/manifests/extension/http/params.pp b/manifests/extension/http/params.pp
index 4eab7f38..fa647052 100644
--- a/manifests/extension/http/params.pp
+++ b/manifests/extension/http/params.pp
@@ -51,18 +51,18 @@
       case $::operatingsystem {
         'Debian': {
           if (versioncmp($::operatingsystemrelease, '9') >= 0) {
-            $package        = 'php7.0-http'
+            $package        = 'php-http'
           } else {
             warning('php::extension::http package does not exists on php5')
           }
         }
         default: {
-          $package      = 'php7.0-http'
+          $package      = 'php-http'
         }
       }
     }
     default: {
-      $package      = 'php7.0-http'
+      $package      = 'php-http'
     }
   }
 }
diff --git a/manifests/extension/igbinary/params.pp b/manifests/extension/igbinary/params.pp
index 1e5f503d..1cd3f9ea 100644
--- a/manifests/extension/igbinary/params.pp
+++ b/manifests/extension/igbinary/params.pp
@@ -50,18 +50,18 @@
       case $::operatingsystem {
         'Debian': {
           if (versioncmp($::operatingsystemrelease, '9') >= 0) {
-            $package        = 'php7.0-igbinary'
+            $package        = 'php-igbinary'
           } else {
             $package        = 'php5-igbinary'
           }
         }
         default: {
-          $package      = 'php7.0-igbinary'
+          $package      = 'php-igbinary'
         }
       }
     }
     default: {
-      $package      = 'php7.0-igbinary'
+      $package      = 'php-igbinary'
     }
   }
 }
diff --git a/manifests/extension/imagick/params.pp b/manifests/extension/imagick/params.pp
index fb220383..3ec0fe03 100644
--- a/manifests/extension/imagick/params.pp
+++ b/manifests/extension/imagick/params.pp
@@ -50,18 +50,18 @@
       case $::operatingsystem {
         'Debian': {
           if (versioncmp($::operatingsystemrelease, '9') >= 0) {
-            $package        = 'php7.0-imagick'
+            $package        = 'php-imagick'
           } else {
             $package        = 'php5-imagick'
           }
         }
         default: {
-          $package      = 'php7.0-imagick'
+          $package      = 'php-imagick'
         }
       }
     }
     default: {
-      $package      = 'php7.0-imagick'
+      $package      = 'php-imagick'
     }
   }
 }
diff --git a/manifests/extension/memcache/params.pp b/manifests/extension/memcache/params.pp
index 3aae0cf1..ecc45931 100644
--- a/manifests/extension/memcache/params.pp
+++ b/manifests/extension/memcache/params.pp
@@ -51,18 +51,18 @@
       case $::operatingsystem {
         'Debian': {
           if (versioncmp($::operatingsystemrelease, '9') >= 0) {
-            $package        = 'php7.0-memcache'
+            $package        = 'php-memcache'
           } else {
             $package        = 'php5-memcache'
           }
         }
         default: {
-          $package      = 'php7.0-memcache'
+          $package      = 'php-memcache'
         }
       }
     }
     default: {
-      $package      = 'php7.0-memcache'
+      $package      = 'php-memcache'
     }
   }
 }
diff --git a/manifests/extension/memcached/params.pp b/manifests/extension/memcached/params.pp
index cdcd3bfd..896446e7 100644
--- a/manifests/extension/memcached/params.pp
+++ b/manifests/extension/memcached/params.pp
@@ -51,18 +51,18 @@
       case $::operatingsystem {
         'Debian': {
           if (versioncmp($::operatingsystemrelease, '9') >= 0) {
-            $package        = 'php7.0-memcached'
+            $package        = 'php-memcached'
           } else {
             $package        = 'php5-memcached'
           }
         }
         default: {
-          $package      = 'php7.0-memcached'
+          $package      = 'php-memcached'
         }
       }
     }
     default: {
-      $package      = 'php7.0-memcached'
+      $package      = 'php-memcached'
     }
   }
 }
diff --git a/manifests/extension/mongo/params.pp b/manifests/extension/mongo/params.pp
index 8cc1cc21..00b52fb1 100644
--- a/manifests/extension/mongo/params.pp
+++ b/manifests/extension/mongo/params.pp
@@ -42,11 +42,35 @@
 class php::extension::mongo::params {
 
   $ensure   = $php::params::ensure
-  $package  = 'mongo'
-  $provider = 'pecl'
+  $package  = undef
+  $provider = undef
   $inifile  = "${php::params::config_root_ini}/mongo.ini"
-  $settings = [
-    'set ".anon/extension" "mongo.so"'
-  ]
+  $settings = undef
 
+  case $::osfamily {
+    'Debian': {
+      case $::operatingsystem {
+        'Debian': {
+          if (versioncmp($::operatingsystemrelease, '9') >= 0) {
+            $package    = 'php-mongodb'
+            $settings   = []
+          } else {
+            $package    = 'mongo'
+            $provider   = 'pecl'
+            $settings   = [
+                'set ".anon/extension" "mongo.so"'
+            ]
+          }
+        }
+        default: {
+          $package      = 'php-mongodb'
+          $settings     = []
+        }
+      }
+    }
+    default: {
+      $package      = 'php-mongodb'
+      $settings     = []
+    }
+  }
 }
diff --git a/manifests/extension/mysqlnd/params.pp b/manifests/extension/mysqlnd/params.pp
index 5db987f0..6ef89a1e 100644
--- a/manifests/extension/mysqlnd/params.pp
+++ b/manifests/extension/mysqlnd/params.pp
@@ -50,18 +50,18 @@
       case $::operatingsystem {
         'Debian': {
           if (versioncmp($::operatingsystemrelease, '9') >= 0) {
-            $package        = 'php7.0-mysqlnd'
+            $package        = 'php7.0-mysql'
           } else {
             $package        = 'php5-mysqlnd'
           }
         }
         default: {
-          $package      = 'php7.0-mysqlnd'
+          $package      = 'php7.0-mysql'
         }
       }
     }
     default: {
-      $package      = 'php7.0-mysqlnd'
+      $package      = 'php7.0-mysql'
     }
   }
 }
diff --git a/manifests/extension/redis/params.pp b/manifests/extension/redis/params.pp
index d2a63a2c..b3a867e9 100644
--- a/manifests/extension/redis/params.pp
+++ b/manifests/extension/redis/params.pp
@@ -50,18 +50,18 @@
       case $::operatingsystem {
         'Debian': {
           if (versioncmp($::operatingsystemrelease, '9') >= 0) {
-            $package        = 'php7.0-redis'
+            $package        = 'php-redis'
           } else {
             $package        = 'php5-redis'
           }
         }
         default: {
-          $package      = 'php7.0-redis'
+          $package      = 'php-redis'
         }
       }
     }
     default: {
-      $package      = 'php7.0-redis'
+      $package      = 'php-redis'
     }
   }
 }
diff --git a/manifests/extension/sqlite/params.pp b/manifests/extension/sqlite/params.pp
index 03e91396..e1dc4ece 100644
--- a/manifests/extension/sqlite/params.pp
+++ b/manifests/extension/sqlite/params.pp
@@ -50,18 +50,18 @@
       case $::operatingsystem {
         'Debian': {
           if (versioncmp($::operatingsystemrelease, '9') >= 0) {
-            $package        = 'php7.0-sqlite'
+            $package        = 'php7.0-sqlite3'
           } else {
             $package        = 'php5-sqlite'
           }
         }
         default: {
-          $package      = 'php7.0-sqlite'
+          $package      = 'php7.0-sqlite3'
         }
       }
     }
     default: {
-      $package      = 'php7.0-sqlite'
+      $package      = 'php7.0-sqlite3'
     }
   }
 }
diff --git a/manifests/extension/ssh2/params.pp b/manifests/extension/ssh2/params.pp
index 392a9a38..de1a0910 100644
--- a/manifests/extension/ssh2/params.pp
+++ b/manifests/extension/ssh2/params.pp
@@ -50,18 +50,18 @@
       case $::operatingsystem {
         'Debian': {
           if (versioncmp($::operatingsystemrelease, '9') >= 0) {
-            $package        = 'php7.0-ssh2'
+            $package        = 'php-ssh2'
           } else {
             $package        = 'php5-ssh2'
           }
         }
         default: {
-          $package      = 'php7.0-ssh2'
+          $package      = 'php-ssh2'
         }
       }
     }
     default: {
-      $package      = 'php7.0-ssh2'
+      $package      = 'php-ssh2'
     }
   }
 }
diff --git a/manifests/extension/xcache/params.pp b/manifests/extension/xcache/params.pp
index 070486f0..00674584 100644
--- a/manifests/extension/xcache/params.pp
+++ b/manifests/extension/xcache/params.pp
@@ -50,18 +50,18 @@
       case $::operatingsystem {
         'Debian': {
           if (versioncmp($::operatingsystemrelease, '9') >= 0) {
-            $package        = 'php7.0-xcache'
+            warning('php::extension::xcache is not compatible with Debian >= 9')
           } else {
             $package        = 'php5-xcache'
           }
         }
         default: {
-          $package      = 'php7.0-xcache'
+          warning('php::extension::xcache is not compatible with Debian based systems')
         }
       }
     }
     default: {
-      $package      = 'php7.0-xcache'
+      $package      = 'php-xcache'
     }
   }
 }
diff --git a/manifests/extension/xdebug/params.pp b/manifests/extension/xdebug/params.pp
index 44262538..e47851ed 100644
--- a/manifests/extension/xdebug/params.pp
+++ b/manifests/extension/xdebug/params.pp
@@ -46,9 +46,6 @@
   $ensure      = $php::params::ensure
   $provider    = undef
   $inifile     = "${php::params::config_root_ini}/xdebug.ini"
-  $settings    = [
-    "set .anon/zend_extension '${install_dir}/xdebug.so'"
-  ]
 
   case $::osfamily {
     'Debian': {
@@ -56,7 +53,7 @@
         'Debian': {
           if (versioncmp($::operatingsystemrelease, '9') >= 0) {
             $install_dir    = "/usr/lib/php/${::php_extension_version}"
-            $package        = 'php7.0-xdebug'
+            $package        = 'php-xdebug'
           } else {
             $install_dir    = "/usr/lib/php5/${::php_extension_version}"
             $package        = 'php5-xdebug'
@@ -64,13 +61,17 @@
         }
         default: {
           $install_dir  = "/usr/lib/php/${::php_extension_version}"
-          $package      = 'php7.0-xdebug'
+          $package      = 'php-xdebug'
         }
       }
     }
     default: {
       $install_dir  = "/usr/lib/php/${::php_extension_version}"
-      $package      = 'php7.0-xdebug'
+      $package      = 'php-xdebug'
     }
   }
+
+  $settings    = [
+    "set .anon/zend_extension '${install_dir}/xdebug.so'"
+  ]
 }
diff --git a/manifests/extension/yaml/params.pp b/manifests/extension/yaml/params.pp
index f792ee75..35a5ddaf 100644
--- a/manifests/extension/yaml/params.pp
+++ b/manifests/extension/yaml/params.pp
@@ -50,18 +50,18 @@
       case $::operatingsystem {
         'Debian': {
           if (versioncmp($::operatingsystemrelease, '9') >= 0) {
-            $package        = 'php7.0-yaml'
+            $package        = 'php-yaml'
           } else {
             $package        = 'php5-yaml'
           }
         }
         default: {
-          $package      = 'php7.0-yaml'
+          $package      = 'php-yaml'
         }
       }
     }
     default: {
-      $package      = 'php7.0-yaml'
+      $package      = 'php-yaml'
     }
   }
 }

From ce0c06ff72764a55964c7c7465a2ac4fc125f3e2 Mon Sep 17 00:00:00 2001
From: Henry Paulissen <henry@telegraafnet.nl>
Date: Mon, 27 Feb 2017 14:44:06 +0100
Subject: [PATCH 5/6] Fixed apc extension for Debian Jessie.

In Jessie the php-apc is a virtual package for php5-apcu.
In Stretch this package is named php-apcu and as last, for
Wheezy we want to install the real php-apc.

So I added more conditionals in the apc package.

Signed-off-by: Henry Paulissen <henry@telegraafnet.nl>
---
 manifests/extension/apc/params.pp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/manifests/extension/apc/params.pp b/manifests/extension/apc/params.pp
index c6a16c52..0f1d6933 100644
--- a/manifests/extension/apc/params.pp
+++ b/manifests/extension/apc/params.pp
@@ -49,10 +49,12 @@
     'Debian': {
       case $::operatingsystem {
         'Debian': {
-          if (versioncmp($::operatingsystemrelease, '8') >= 0) {
-            $package        = 'php-apcu'
+          if (versioncmp($::operatingsystemrelease, '8') == 0) {
+            $package    = 'php5-apcu'
+          } elsif (versioncmp($::operatingsystemrelease, '9') >= 0) {
+            $package    = 'php-apcu'
           } else {
-            $package        = 'php-apc'
+            $package    = 'php-apc'
           }
         }
         default: {

From 12c94855240af419d0757560767c4b01a2ed0cec Mon Sep 17 00:00:00 2001
From: Henry Paulissen <henry@telegraafnet.nl>
Date: Tue, 28 Feb 2017 11:23:10 +0100
Subject: [PATCH 6/6] Found some more spots where the php version number was
 hard coded.

All "7.0" in puppet code should be gone now.

Signed-off-by: Henry Paulissen <henry@telegraafnet.nl>
---
 manifests/apache/config.pp   |  1 -
 manifests/composer.pp        |  4 ++--
 manifests/composer/params.pp | 20 ++++++++++++++++++++
 manifests/fpm/pool.pp        | 11 +++++------
 manifests/phpunit.pp         |  3 ++-
 manifests/phpunit/params.pp  | 20 ++++++++++++++++++++
 6 files changed, 49 insertions(+), 10 deletions(-)

diff --git a/manifests/apache/config.pp b/manifests/apache/config.pp
index f29e92ee..f59f201d 100644
--- a/manifests/apache/config.pp
+++ b/manifests/apache/config.pp
@@ -34,7 +34,6 @@
   $section  = 'PHP',
   $value    = undef,
 ) {
-
   include ::php::apache::params
 
   if $file {
diff --git a/manifests/composer.pp b/manifests/composer.pp
index 67812c81..457248f0 100644
--- a/manifests/composer.pp
+++ b/manifests/composer.pp
@@ -27,6 +27,7 @@
 # Copyright 2012-2015 Christian "Jippi" Winther, unless otherwise noted.
 #
 class php::composer (
+  $cli_package  = $php::composer::params::cli_package,
   $source       = $php::composer::params::source,
   $destination  = $php::composer::params::destination
 ) inherits php::composer::params {
@@ -36,7 +37,7 @@
     creates => $destination,
     path    => [ '/bin/', '/sbin/' , '/usr/bin/', '/usr/sbin/' ],
     require => [
-      Package['php7.0-cli']
+      Package[$cli_package]
     ]
   }
 
@@ -46,5 +47,4 @@
     group   => root,
     require => Exec['download composer'],
   }
-
 }
diff --git a/manifests/composer/params.pp b/manifests/composer/params.pp
index 30e39565..846de18f 100644
--- a/manifests/composer/params.pp
+++ b/manifests/composer/params.pp
@@ -34,4 +34,24 @@
   $max_age     = 30
   $source      = 'https://getcomposer.org/composer.phar'
   $destination = '/usr/local/bin/composer'
+
+  case $::osfamily {
+    'Debian': {
+      case $::operatingsystem {
+        'Debian': {
+          if (versioncmp($::operatingsystemrelease, '9') >= 0) {
+            $cli_package    = 'php7.0-cli'
+          } else {
+            $cli_package    = 'php5-cli'
+          }
+        }
+        default: {
+          $cli_package  = 'php7.0-cli'
+        }
+      }
+    }
+    default: {
+      $cli_package  = 'php7.0-cli'
+    }
+  }
 }
diff --git a/manifests/fpm/pool.pp b/manifests/fpm/pool.pp
index 24d27c40..daf30c40 100644
--- a/manifests/fpm/pool.pp
+++ b/manifests/fpm/pool.pp
@@ -64,20 +64,19 @@
   $group_final = $group ? { undef => $user, default => $group }
 
   if ($ensure == 'absent') {
-    file { "/etc/php/7.0/fpm/pool.d/${pool}.conf":
+    file { "${::php::params::config_root}/fpm/pool.d/${pool}.conf":
       ensure => absent,
-      notify => Service['php7.0-fpm']
+      notify => Service[$::php::fpm::params::service_name]
     }
   } else {
-    file { "/etc/php/7.0/fpm/pool.d/${pool}.conf":
+    file { "${::php::params::config_root}/fpm/pool.d/${pool}.conf":
       ensure  => file,
-      notify  => Service['php7.0-fpm'],
-      require => Package['php7.0-fpm'],
+      notify  => Service[$::php::fpm::params::service_name],
+      require => Package[$::php::fpm::params::package],
       content => template('php/fpm/pool.conf.erb'),
       owner   => root,
       group   => root,
       mode    => $config_mode,
     }
   }
-
 }
diff --git a/manifests/phpunit.pp b/manifests/phpunit.pp
index a14436fa..bc2ee121 100644
--- a/manifests/phpunit.pp
+++ b/manifests/phpunit.pp
@@ -27,6 +27,7 @@
 #
 
 class php::phpunit (
+  $cli_package = $php::phpunit::params::cli_package,
   $ensure      = $php::phpunit::params::ensure,
   $source      = $php::phpunit::params::source,
   $destination = $php::phpunit::params::destination
@@ -42,7 +43,7 @@
       command => "wget ${source} -O ${destination}",
       creates => $destination,
       path    => [ '/bin', '/sbin' , '/usr/bin', '/usr/sbin' ],
-      require => Package['php5-cli'],
+      require => Package[$cli_package],
       before  => File[$destination]
     }
   }
diff --git a/manifests/phpunit/params.pp b/manifests/phpunit/params.pp
index 6216444b..2729a2f6 100644
--- a/manifests/phpunit/params.pp
+++ b/manifests/phpunit/params.pp
@@ -42,4 +42,24 @@
   $ensure   = $php::params::ensure
   $source = 'https://phar.phpunit.de/phpunit.phar'
   $destination = '/usr/local/bin/phpunit'
+  
+  case $::osfamily {
+    'Debian': {
+      case $::operatingsystem {
+        'Debian': {
+          if (versioncmp($::operatingsystemrelease, '9') >= 0) {
+            $cli_package    = 'php7.0-cli'
+          } else {
+            $cli_package    = 'php5-cli'
+          }
+        }
+        default: {
+          $cli_package  = 'php7.0-cli'
+        }
+      }
+    }
+    default: {
+      $cli_package  = 'php7.0-cli'
+    }
+  }
 }