Fix unit test private key permission

voxpupuli · Jun 28, 2024 · e1461ad · e1461ad
1 parent 4a9b446
commit e1461ad
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 15 deletions.
diff --git a/manifests/install.pp b/manifests/install.pp
@@ -23,7 +23,7 @@
       before => File[$cert_dir, $conf_dir],
     }
 
-    if $facts['os']['selinux']['enabled'] and $selinux_package_name {
+    if fact('os.selinux.enabled') and $facts['os']['selinux']['enabled'] and $selinux_package_name {
       package { $selinux_package_name:
         ensure  => installed,
         require => Package[$package_name],

diff --git a/spec/classes/elasticsearch_spec.rb b/spec/classes/elasticsearch_spec.rb
@@ -23,13 +23,13 @@
       when 'FreeBSD'
         let(:icinga2_conf_dir) { '/usr/local/etc/icinga2' }
         let(:icinga2_pki_dir) { '/var/lib/icinga2/certs' }
-        let(:icinga2_sslkey_mode) { '0400' }
+        let(:icinga2_sslkey_mode) { '0440' }
         let(:icinga2_user) { 'icinga' }
         let(:icinga2_group) { 'icinga' }
       else
         let(:icinga2_conf_dir) { '/etc/icinga2' }
         let(:icinga2_pki_dir) { '/var/lib/icinga2/certs' }
-        let(:icinga2_sslkey_mode) { '0400' }
+        let(:icinga2_sslkey_mode) { '0440' }
         case facts[:os]['family']
         when 'Debian'
           let(:icinga2_user) { 'nagios' }

diff --git a/spec/classes/gelf_spec.rb b/spec/classes/gelf_spec.rb
@@ -23,13 +23,13 @@
       when 'FreeBSD'
         let(:icinga2_conf_dir) { '/usr/local/etc/icinga2' }
         let(:icinga2_pki_dir) { '/var/lib/icinga2/certs' }
-        let(:icinga2_sslkey_mode) { '0400' }
+        let(:icinga2_sslkey_mode) { '0440' }
         let(:icinga2_user) { 'icinga' }
         let(:icinga2_group) { 'icinga' }
       else
         let(:icinga2_conf_dir) { '/etc/icinga2' }
         let(:icinga2_pki_dir) { '/var/lib/icinga2/certs' }
-        let(:icinga2_sslkey_mode) { '0400' }
+        let(:icinga2_sslkey_mode) { '0440' }
         case facts[:os]['family']
         when 'Debian'
           let(:icinga2_user) { 'nagios' }

diff --git a/spec/classes/icingadb_spec.rb b/spec/classes/icingadb_spec.rb
@@ -24,14 +24,14 @@
       when 'FreeBSD'
         let(:icinga2_conf_dir) { '/usr/local/etc/icinga2' }
         let(:icinga2_pki_dir) { '/var/lib/icinga2/certs' }
-        let(:icinga2_sslkey_mode) { '0400' }
+        let(:icinga2_sslkey_mode) { '0440' }
         let(:icinga2_sslfile_owner) { 'icinga' }
         let(:icinga2_sslfile_mode) { '0640' }
         let(:icinga2_group) { 'icinga' }
       else
         let(:icinga2_conf_dir) { '/etc/icinga2' }
         let(:icinga2_pki_dir) { '/var/lib/icinga2/certs' }
-        let(:icinga2_sslkey_mode) { '0400' }
+        let(:icinga2_sslkey_mode) { '0440' }
         let(:icinga2_sslfile_mode) { '0640' }
         case facts[:os]['family']
         when 'Debian'

diff --git a/spec/classes/idomysql_spec.rb b/spec/classes/idomysql_spec.rb
@@ -42,14 +42,14 @@
         let(:icinga2_conf_dir) { '/usr/local/etc/icinga2' }
         let(:icinga2_pki_dir) { '/var/lib/icinga2/certs' }
         let(:ido_mysql_schema_dir) { '/usr/local/share/icinga2-ido-mysql/schema' }
-        let(:icinga2_sslkey_mode) { '0400' }
+        let(:icinga2_sslkey_mode) { '0440' }
         let(:icinga2_user) { 'icinga' }
         let(:icinga2_group) { 'icinga' }
       else
         let(:icinga2_conf_dir) { '/etc/icinga2' }
         let(:icinga2_pki_dir) { '/var/lib/icinga2/certs' }
         let(:ido_mysql_schema_dir) { '/usr/share/icinga2-ido-mysql/schema' }
-        let(:icinga2_sslkey_mode) { '0400' }
+        let(:icinga2_sslkey_mode) { '0440' }
         case facts[:os]['family']
         when 'Debian'
           let(:icinga2_user) { 'nagios' }

diff --git a/spec/classes/idopgsql_spec.rb b/spec/classes/idopgsql_spec.rb
@@ -25,14 +25,14 @@
         let(:icinga2_conf_dir) { '/usr/local/etc/icinga2' }
         let(:icinga2_pki_dir) { '/var/lib/icinga2/certs' }
         let(:ido_pgsql_schema_dir) { '/usr/local/share/icinga2-ido-pgsql/schema' }
-        let(:icinga2_sslkey_mode) { '0400' }
+        let(:icinga2_sslkey_mode) { '0440' }
         let(:icinga2_user) { 'icinga' }
         let(:icinga2_group) { 'icinga' }
       else
         let(:icinga2_conf_dir) { '/etc/icinga2' }
         let(:icinga2_pki_dir) { '/var/lib/icinga2/certs' }
         let(:ido_pgsql_schema_dir) { '/usr/share/icinga2-ido-pgsql/schema' }
-        let(:icinga2_sslkey_mode) { '0400' }
+        let(:icinga2_sslkey_mode) { '0440' }
         case facts[:os]['family']
         when 'Debian'
           let(:icinga2_user) { 'nagios' }

diff --git a/spec/classes/influxdb2_spec.rb b/spec/classes/influxdb2_spec.rb
@@ -23,13 +23,13 @@
       when 'FreeBSD'
         let(:icinga2_conf_dir) { '/usr/local/etc/icinga2' }
         let(:icinga2_pki_dir) { '/var/lib/icinga2/certs' }
-        let(:icinga2_sslkey_mode) { '0400' }
+        let(:icinga2_sslkey_mode) { '0440' }
         let(:icinga2_user) { 'icinga' }
         let(:icinga2_group) { 'icinga' }
       else
         let(:icinga2_conf_dir) { '/etc/icinga2' }
         let(:icinga2_pki_dir) { '/var/lib/icinga2/certs' }
-        let(:icinga2_sslkey_mode) { '0400' }
+        let(:icinga2_sslkey_mode) { '0440' }
         case facts[:os]['family']
         when 'Debian'
           let(:icinga2_user) { 'nagios' }

diff --git a/spec/classes/influxdb_spec.rb b/spec/classes/influxdb_spec.rb
@@ -23,13 +23,13 @@
       when 'FreeBSD'
         let(:icinga2_conf_dir) { '/usr/local/etc/icinga2' }
         let(:icinga2_pki_dir) { '/var/lib/icinga2/certs' }
-        let(:icinga2_sslkey_mode) { '0400' }
+        let(:icinga2_sslkey_mode) { '0440' }
         let(:icinga2_user) { 'icinga' }
         let(:icinga2_group) { 'icinga' }
       else
         let(:icinga2_conf_dir) { '/etc/icinga2' }
         let(:icinga2_pki_dir) { '/var/lib/icinga2/certs' }
-        let(:icinga2_sslkey_mode) { '0400' }
+        let(:icinga2_sslkey_mode) { '0440' }
         case facts[:os]['family']
         when 'Debian'
           let(:icinga2_user) { 'nagios' }