Merge pull request #2 from luckyraul/fix_php_ver_debian

fix php versions for debian systems
dgolja · Jan 24, 2015 · db07fad · db07fad
2 parents a4b0e3a + 0e9fa7b
commit db07fad
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/manifests/params.pp b/manifests/params.pp
@@ -18,7 +18,12 @@
       $service_provider = undef
   } elsif $::osfamily == 'Debian' {
       $service_name = 'apache2'
-      $php_version  = '5.3'
+      case $::operatingsystemmajrelease {
+        8: { $php_version  = '5.6'}
+        7: { $php_version  = '5.4'}
+        6: { $php_version  = '5.3'}
+        default: { $php_version  = '5.4' }
+      }
       $php_conf_dir = '/etc/php5/conf.d'
       if $::operatingsystem == 'Ubuntu' {
         $service_provider = 'upstart'
@@ -32,4 +37,4 @@
   }
 
   $ioncube_loader_base = 'ioncube_loader_lin'
-}
+}
diff --git a/spec/classes/ioncubeloader_init_spec.rb b/spec/classes/ioncubeloader_init_spec.rb
@@ -68,7 +68,7 @@
     it { should compile }
     it { should contain_exec('retrieve_ioncubeloader') }
     it { should contain_file('/etc/php5/conf.d/ioncube.ini').with('ensure'  => 'present') }
-    it { should contain_file('/etc/php5/conf.d/ioncube.ini').with_content(/zend_extension=\/usr\/local\/ioncube\/ioncube_loader_lin_5.3_ts.so/) }
+    it { should contain_file('/etc/php5/conf.d/ioncube.ini').with_content(/zend_extension=\/usr\/local\/ioncube\/ioncube_loader_lin_5.4_ts.so/) }
 
     context "with custom params" do
       let (:params) do