--- a/modules/apache/manifests/mod/php.pp	Sun Dec 22 09:41:45 2019 -0500
+++ b/modules/apache/manifests/mod/php.pp	Sun Dec 22 14:43:29 2019 -0500
@@ -4,25 +4,28 @@
   $path           = undef,
   $extensions     = ['.php'],
   $content        = undef,
-  $template       = 'apache/mod/php5.conf.erb',
+  $template       = 'apache/mod/php.conf.erb',
   $source         = undef,
   $root_group     = $::apache::params::root_group,
+  $php_version    = $::apache::params::php_version,
 ) inherits apache::params {
+  include ::apache
+  $mod = "php${php_version}"
 
   if defined(Class['::apache::mod::prefork']) {
-    Class['::apache::mod::prefork']->File['php5.conf']
+    Class['::apache::mod::prefork']->File["${mod}.conf"]
   }
   elsif defined(Class['::apache::mod::itk']) {
-    Class['::apache::mod::itk']->File['php5.conf']
+    Class['::apache::mod::itk']->File["${mod}.conf"]
   }
   else {
     fail('apache::mod::php requires apache::mod::prefork or apache::mod::itk; please enable mpm_module => \'prefork\' or mpm_module => \'itk\' on Class[\'apache\']')
   }
   validate_array($extensions)
 
-  if $source and ($content or $template != 'apache/mod/php5.conf.erb') {
+  if $source and ($content or $template != 'apache/mod/php.conf.erb') {
     warning('source and content or template parameters are provided. source parameter will be used')
-  } elsif $content and $template != 'apache/mod/php5.conf.erb' {
+  } elsif $content and $template != 'apache/mod/php.conf.erb' {
     warning('content and template parameters are provided. content parameter will be used')
   }
 
@@ -34,23 +37,52 @@
     default => undef,
   }
 
-  ::apache::mod { 'php5':
-    package        => $package_name,
-    package_ensure => $package_ensure,
-    path           => $path,
+  # Determine if we have a package
+  $mod_packages = $::apache::params::mod_packages
+  if $package_name {
+    $_package_name = $package_name
+  } elsif has_key($mod_packages, $mod) { # 2.6 compatibility hack
+    $_package_name = $mod_packages[$mod]
+  } elsif has_key($mod_packages, 'phpXXX') { # 2.6 compatibility hack
+    $_package_name = regsubst($mod_packages['phpXXX'], 'XXX', $php_version)
+  } else {
+    $_package_name = undef
   }
 
+  $_lib = "libphp${php_version}.so"
+  $_php_major = regsubst($php_version, '^(\d+)\..*$', '\1')
+
+  if $::operatingsystem == 'SLES' {
+      ::apache::mod { $mod:
+        package        => $_package_name,
+        package_ensure => $package_ensure,
+        lib            => 'mod_php5.so',
+        id             => "php${_php_major}_module",
+        path           => "${::apache::lib_path}/mod_php5.so",
+      }
+    } else {
+      ::apache::mod { $mod:
+        package        => $_package_name,
+        package_ensure => $package_ensure,
+        lib            => $_lib,
+        id             => "php${_php_major}_module",
+        path           => $path,
+      }
+
+    }
+
+
   include ::apache::mod::mime
   include ::apache::mod::dir
   Class['::apache::mod::mime'] -> Class['::apache::mod::dir'] -> Class['::apache::mod::php']
 
   # Template uses $extensions
-  file { 'php5.conf':
+  file { "${mod}.conf":
     ensure  => file,
-    path    => "${::apache::mod_dir}/php5.conf",
+    path    => "${::apache::mod_dir}/${mod}.conf",
     owner   => 'root',
     group   => $root_group,
-    mode    => '0644',
+    mode    => $::apache::file_mode,
     content => $manage_content,
     source  => $source,
     require => [