From 3c07f11bebdb3747304911ac5a033556265419cf Mon Sep 17 00:00:00 2001 From: Dirk Goetz Date: Thu, 20 Apr 2017 11:52:25 +0200 Subject: [PATCH 1/2] fix suse architecture specific constants fixes #283 --- manifests/params.pp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/manifests/params.pp b/manifests/params.pp index 4dbd18ca5..3b0e70530 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -115,10 +115,7 @@ 'suse': { $user = 'icinga' $group = 'icinga' - $lib_dir = $::architecture ? { - 'x86_64' => '/usr/lib64', - default => '/usr/lib', - } + $lib_dir = '/usr/lib' } # Suse default: { From dea1d91b34254f232b4ac8004c23c6c8e0ab9097 Mon Sep 17 00:00:00 2001 From: Markus Frosch Date: Thu, 20 Apr 2017 23:03:17 +0200 Subject: [PATCH 2/2] Update spec for SUSE libdir correction --- spec/classes/init_spec.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spec/classes/init_spec.rb b/spec/classes/init_spec.rb index 63e789e6f..df16dee9b 100644 --- a/spec/classes/init_spec.rb +++ b/spec/classes/init_spec.rb @@ -51,11 +51,11 @@ .with_content %r{^const ManubulonPluginDir = \"/usr/lib64/nagios/plugins\"\n} } when 'Suse' it { is_expected.to contain_file(@constants_conf) - .with_content %r{^const PluginDir = \"/usr/lib64/nagios/plugins\"\n} } + .with_content %r{^const PluginDir = \"/usr/lib/nagios/plugins\"\n} } it { is_expected.to contain_file(@constants_conf) - .with_content %r{^const PluginContribDir = \"/usr/lib64/nagios/plugins\"\n} } + .with_content %r{^const PluginContribDir = \"/usr/lib/nagios/plugins\"\n} } it { is_expected.to contain_file(@constants_conf) - .with_content %r{^const ManubulonPluginDir = \"/usr/lib64/nagios/plugins\"\n} } + .with_content %r{^const ManubulonPluginDir = \"/usr/lib/nagios/plugins\"\n} } end it { is_expected.to contain_file(@constants_conf)