Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions recipes/common.rb
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,16 @@
end
end

if node['init_package'] == 'systemd'
template "/usr/lib/tmpfiles.d/zabbix.conf" do
source 'tmpfiles.conf.erb'
owner 'root'
group 'root'
mode '644'
action :create
end
end

unless node['zabbix']['agent']['source_url']
node.default['zabbix']['agent']['source_url'] = Chef::Zabbix.default_download_url(node['zabbix']['agent']['branch'], node['zabbix']['agent']['version'])
end
Expand Down
28 changes: 20 additions & 8 deletions recipes/server_source.rb
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@

curldev = (node['platform_version'].to_i < 6) ? 'curl-devel' : 'libcurl-devel'

packages = %w(fping iksemel-devel iksemel-utils net-snmp-libs net-snmp-devel openssl-devel redhat-lsb php-pear)
packages = %w(fping iksemel-devel iksemel-utils net-snmp-libs net-snmp-devel openssl-devel php-pear)
packages.push('redhat-lsb') if node['init_package'] != 'systemd'
packages.push(curldev)

case node['zabbix']['database']['install_method']
Expand Down Expand Up @@ -114,13 +115,23 @@
action :install_server
end

# Install Init script
template '/etc/init.d/zabbix_server' do
source init_template
owner 'root'
group 'root'
mode '755'
notifies :restart, 'service[zabbix_server]', :delayed
if node['init_package'] == 'systemd'
template '/lib/systemd/system/zabbix-server.service' do
source 'zabbix-server.service.erb'
owner 'root'
group 'root'
mode '644'
notifies :restart, 'service[zabbix_server]', :delayed
end
else
# Install Init script
template '/etc/init.d/zabbix_server' do
source init_template
owner 'root'
group 'root'
mode '755'
notifies :restart, 'service[zabbix_server]', :delayed
end
end

# install zabbix server conf
Expand All @@ -144,6 +155,7 @@

# Define zabbix_agentd service
service 'zabbix_server' do
service_name 'zabbix-server' if node['init_package'] == 'systemd'
supports :status => true, :start => true, :stop => true, :restart => true
action [:start, :enable]
end
Expand Down
1 change: 1 addition & 0 deletions templates/default/tmpfiles.conf.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
d <%= node['zabbix']['run_dir'] %> 755 <%= node['zabbix']['login'] %> <%= node['zabbix']['group'] %>
11 changes: 11 additions & 0 deletions templates/default/zabbix-server.service.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
[Unit]
Description=Zabbix Server
After=syslog.target network.target

[Service]
Type=forking
ExecStart=<%= node['zabbix']['install_dir'] %>/sbin/zabbix_server -c <%= node['zabbix']['etc_dir'] %>/zabbix_server.conf
PIDFile=<%= node['zabbix']['run_dir'] %>/zabbix_server.pid

[Install]
WantedBy=multi-user.target