diff --git a/srcpkgs/zabbix/files/zabbix-agent/run b/srcpkgs/zabbix/files/zabbix-agent/run index f1e80bc016..c32093b2db 100755 --- a/srcpkgs/zabbix/files/zabbix-agent/run +++ b/srcpkgs/zabbix/files/zabbix-agent/run @@ -1,5 +1,3 @@ #!/bin/sh -chmod 0750 /var/run/zabbix-agent /var/log/zabbix-agent -chown _zabbix_agent:_zabbix_agent /var/run/zabbix-agent /var/log/zabbix-agent - +install -d -m0750 -o _zabbix_agent -g _zabbix_agent /var/run/zabbix-agent chpst -u _zabbix_agent:_zabbix_agent zabbix_agentd -f -c /etc/zabbix_agentd.conf diff --git a/srcpkgs/zabbix/files/zabbix-proxy/run b/srcpkgs/zabbix/files/zabbix-proxy/run index 359f4a72e6..678fc6e0bc 100755 --- a/srcpkgs/zabbix/files/zabbix-proxy/run +++ b/srcpkgs/zabbix/files/zabbix-proxy/run @@ -1,5 +1,3 @@ #!/bin/sh -chmod 0750 /var/run/zabbix-proxy /var/log/zabbix-proxy -chown _zabbix_proxy:_zabbix_proxy /var/run/zabbix-proxy /var/log/zabbix-proxy - +install -d -m0750 -o _zabbix_proxy -g _zabbix_proxy /var/run/zabbix-proxy chpst -u _zabbix_proxy:_zabbix_proxy zabbix_proxy -f -c /etc/zabbix_proxy.conf diff --git a/srcpkgs/zabbix/files/zabbix-server/run b/srcpkgs/zabbix/files/zabbix-server/run index 48e0453684..97e62451ac 100755 --- a/srcpkgs/zabbix/files/zabbix-server/run +++ b/srcpkgs/zabbix/files/zabbix-server/run @@ -1,7 +1,5 @@ #!/bin/sh sv start mysqld >/dev/null || exit 1 -chmod 0750 /var/run/zabbix-server /var/log/zabbix-server -chown _zabbix_server:_zabbix_server /var/run/zabbix-server /var/log/zabbix-server - +install -d -m0750 -o _zabbix_server -g _zabbix_server /var/run/zabbix-server chpst -u _zabbix_server:_zabbix_server zabbix_server -f -c /etc/zabbix_server.conf diff --git a/srcpkgs/zabbix/template b/srcpkgs/zabbix/template index 58e1ca0e5a..54b2ff97c2 100644 --- a/srcpkgs/zabbix/template +++ b/srcpkgs/zabbix/template @@ -20,8 +20,7 @@ checksum=6b3d3b23c72a7af1958dc0938a566be03f0424cb44df5b2a9f487428f32d0463 conf_files="/etc/zabbix_server.conf" system_accounts="_zabbix_server" system_groups="_zabbix_server" -make_dirs="/var/run/zabbix-server 0750 _zabbix_server _zabbix_server - /var/log/zabbix-server 0750 _zabbix_server _zabbix_server" +make_dirs="/var/log/zabbix-server 0750 _zabbix_server _zabbix_server" if [ "$CROSS_BUILD" ]; then # configure scripts is bad at checking, problably runs code instead of @@ -51,8 +50,7 @@ post_install() { } zabbix-agent_package() { - make_dirs="/var/run/zabbix-agentd 0750 _zabbix_agent _zabbix_agent - /var/log/zabbix-agentd 0750 _zabbix_agent _zabbix_agent" + make_dirs="/var/log/zabbix-agentd 0750 _zabbix_agent _zabbix_agent" system_accounts="_zabbix_agent" system_groups=_zabbix_agent short_desc="Zabbix Network Monitoring Agent" @@ -79,8 +77,7 @@ zabbix-utils_package() { zabbix-proxy_package() { system_accounts="_zabbix_proxy" system_groups=_zabbix_proxy - make_dirs="/var/run/zabbix-proxy 0750 _zabbix_proxy _zabbix_proxy - /var/log/zabbix-proxy 0750 _zabbix_proxy _zabbix_proxy" + make_dirs="/var/log/zabbix-proxy 0750 _zabbix_proxy _zabbix_proxy" depends="zabbix" short_desc="Zabbix Network Monitoring Proxy" conf_files="/etc/zabbix_proxy.conf" @@ -93,6 +90,7 @@ zabbix-proxy_package() { } zabbix-frontend-php_package() { + noarch=yes depends="zabbix php-gd php-mysql" short_desc="Zabbix Networking Monitoring PHP Frontend" pkg_install() {