From c19cd283f51518c07c80a0267e9a93071afd1929 Mon Sep 17 00:00:00 2001 From: Paul Gale Date: Wed, 3 May 2023 00:07:30 -0400 Subject: [PATCH 1/2] Pipe output from '/sbin/sysctl -n' through sed to remove spaces/tabs --- manifests/init.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/init.pp b/manifests/init.pp index 70e2ee5..0e0bfaf 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -90,7 +90,7 @@ $qvalue = shellquote("${value}") # lint:endignore exec { "enforce-sysctl-value-${qtitle}": - unless => "/usr/bin/test \"$(/sbin/sysctl -n ${qtitle})\" = ${qvalue}", + unless => "/usr/bin/test \"$(/sbin/sysctl -n ${qtitle} | sed -r 's/[ \t]+/ /g')\" = ${qvalue}", command => "/sbin/sysctl -w ${qtitle}=${qvalue}", } } From 44ca31935dfbc1c5e0ac846c989fbee0bc22c628 Mon Sep 17 00:00:00 2001 From: Paul Gale Date: Wed, 3 May 2023 14:13:23 -0400 Subject: [PATCH 2/2] Make sed executable path explicit --- manifests/init.pp | 2 +- spec/classes/sysctl_base_spec.rb | 7 +++++++ spec/defines/sysctl_init_spec.rb | 7 +++++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/manifests/init.pp b/manifests/init.pp index 0e0bfaf..ae1f5f7 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -90,7 +90,7 @@ $qvalue = shellquote("${value}") # lint:endignore exec { "enforce-sysctl-value-${qtitle}": - unless => "/usr/bin/test \"$(/sbin/sysctl -n ${qtitle} | sed -r 's/[ \t]+/ /g')\" = ${qvalue}", + unless => "/usr/bin/test \"$(/sbin/sysctl -n ${qtitle} | /usr/bin/sed -r -e 's/[ \t]+/ /g')\" = ${qvalue}", command => "/sbin/sysctl -w ${qtitle}=${qvalue}", } } diff --git a/spec/classes/sysctl_base_spec.rb b/spec/classes/sysctl_base_spec.rb index a1d47a2..50ff340 100644 --- a/spec/classes/sysctl_base_spec.rb +++ b/spec/classes/sysctl_base_spec.rb @@ -2,6 +2,13 @@ describe 'sysctl::base', :type => :class do + let(:facts) do + { + :osfamily => 'RedHat', + :operatingsystemmajrelease => '8', + } + end + it { should create_class('sysctl::base') } it { should contain_file('/etc/sysctl.d') } diff --git a/spec/defines/sysctl_init_spec.rb b/spec/defines/sysctl_init_spec.rb index 1f8db67..b4b7d67 100644 --- a/spec/defines/sysctl_init_spec.rb +++ b/spec/defines/sysctl_init_spec.rb @@ -3,6 +3,13 @@ describe 'sysctl', :type => :define do let(:title) { 'net.ipv4.ip_forward'} + let(:facts) do + { + :osfamily => 'RedHat', + :operatingsystemmajrelease => '8', + } + end + context 'present' do let(:params) { { :value => '1' } }