Refactor and add php-fpm support

1 files changed, 14 insertions, 8 deletions

diff --git a/manifests/series5.pp b/manifests/series5.pp
index 50ab6f4..f05efb2 100644
--- a/manifests/series5.pp
+++ b/manifests/series5.pp
@@ -1,19 +1,24 @@
-class php::series5($hardened = true) {
+class php::series5(
+  $hardened = true
+) {
   case $::lsbdistcodename {
     'xenial': {
-      include php::series5::packages::ppa
+      include php::ppa
     }
     'stretch': {
-      include php::series5::packages::dpa
-    }
-    default: {
-      include php::series5::packages::default
+      include php::dpa
     }
   }
 
+  $version = $::lsbdistcodename ? {
+    'xenial'  => '5.6',
+    'stretch' => '5.6',
+    default   => '5',
+  }
+
   $folder = $::lsbdistcodename ? {
-    'xenial'  => '/etc/php/5.6',
-    'stretch' => '/etc/php/5.6',
+    'xenial'  => "/etc/php/${version}",
+    'stretch' => "/etc/php/${version}",
     default   => '/etc/php5',
   }
 
@@ -52,6 +57,7 @@ class php::series5($hardened = true) {
   #  require => [ Package['php5'], File["${folder}/apache2"] ],
   #}
 
+  include php::series5::packages
   include php::resources
   include php::series5::defaults