From 47d3002b57a4f1a1b730a4b5e08a3d97abb3f457 Mon Sep 17 00:00:00 2001 From: Nikita Tarasov Date: Fri, 23 Jan 2015 22:15:12 +0300 Subject: [PATCH 1/3] fix php versions for debian systems --- manifests/params.pp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/manifests/params.pp b/manifests/params.pp index 277b124..4ec6cff 100644 --- 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' -} \ No newline at end of file +} From 661a59c3c5180da6d1eb8ac99ccaef7cd08c3dd7 Mon Sep 17 00:00:00 2001 From: Nikita Tarasov Date: Sat, 24 Jan 2015 09:26:02 +0300 Subject: [PATCH 2/3] fix tabs --- manifests/params.pp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/manifests/params.pp b/manifests/params.pp index 4ec6cff..f9359d2 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -19,10 +19,10 @@ } elsif $::osfamily == 'Debian' { $service_name = 'apache2' case $::operatingsystemmajrelease { - 8: { $php_version = '5.6'} - 7: { $php_version = '5.4'} - 6: { $php_version = '5.3'} - default: { $php_version = '5.4' } + 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' { From 0e9fa7bc9841393057d7173a7567b3961de34afa Mon Sep 17 00:00:00 2001 From: Nikita Tarasov Date: Sat, 24 Jan 2015 09:31:22 +0300 Subject: [PATCH 3/3] fix test for 5.4 --- spec/classes/ioncubeloader_init_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/classes/ioncubeloader_init_spec.rb b/spec/classes/ioncubeloader_init_spec.rb index d06c5aa..0ad68c9 100644 --- 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