Skip to content

Commit 8da8100

Browse files
authored
Merge pull request #599 from KrzysztofHajdamowicz/fix/change-selmodule-to-ensure_resources
Put selboolean{'zabbix_can_network'} inside ensure_resources
2 parents 1772fdd + 39378bc commit 8da8100

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

manifests/server.pp

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -567,15 +567,18 @@
567567
}
568568
# check if selinux is active and allow zabbix
569569
if $facts['selinux'] == true and $manage_selinux {
570-
selboolean{'zabbix_can_network':
571-
persistent => true,
572-
value => 'on',
573-
notify => $dependency,
574-
}
575-
-> selinux::module{'zabbix-server':
570+
ensure_resource ('selboolean',
571+
[
572+
'zabbix_can_network',
573+
], {
574+
persistent => true,
575+
value => 'on',
576+
})
577+
selinux::module{'zabbix-server':
576578
ensure => 'present',
577579
source_te => 'puppet:///modules/zabbix/zabbix-server.te',
578580
before => $dependency,
581+
require => Selboolean['zabbix_can_network'],
579582
}
580583
# zabbix-server 3.4 introduced IPC via a socket in /tmp
581584
# https://support.zabbix.com/browse/ZBX-12567

0 commit comments

Comments
 (0)