rtyler
/
pkgsrc-wip
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

zabbix50-*: Cleanup 

- Fix stack size issue in NetBSD scripts
- Fix most pkglint warning
- Fix SMF manifests
This commit is contained in:
Juraj Lutter 2020-09-10 18:38:56 +00:00
parent c1879fb421
commit f20c0b60c1
10 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
zabbix50-agent/Makefile
View File

@ -5,7 +5,7 @@
PKGNAME= ${DISTNAME:S/-/-agent-/}
COMMENT= Enterprise-class Monitoring Solution for Everyone
CONFLICTS+= zabbix-agent-[3-4]*
CONFLICTS+= zabbix-agent-[0-9]*
USE_TOOLS+= pkg-config
GNU_CONFIGURE= yes
@ -31,8 +31,6 @@ SUBST_SED.fix-paths= -e 's,/usr/local/etc,${PKG_SYSCONFDIR},g'
.include "../../mk/bsd.prefs.mk"
SMF_INSTANCES= agent
.include "options.mk"
.include "../../security/openssl/buildlink3.mk"

2
zabbix50-agent/files/smf/manifest.xml
View File

@ -14,7 +14,7 @@
<method_context>
<method_credential user="@ZABBIX_USER@" group="@ZABBIX_GROUP@"/>
</method_context>
<instance name="agent" enabled="false">
<instance name="@SMF_INSTANCES@" enabled="false">
<dependency name="config-file" grouping="require_all" restart_on="refresh" type="path">
<service_fmri value="file://localhost@PKG_SYSCONFDIR@/zabbix_agentd.conf"/>
</dependency>

2
zabbix50-agent/files/zabbix_agentd.sh
View File

@ -14,6 +14,7 @@ fi
name="zabbix_agentd"
rcvar=${name}
command="@PREFIX@/sbin/${name}"
start_precmd="ulimit -s 10240"
required_files="@PKG_SYSCONFDIR@/${name}.conf"
if [ -f /etc/rc.subr ]; then
@ -21,5 +22,6 @@ if [ -f /etc/rc.subr ]; then
run_rc_command "$1"
else
@ECHO@ -n " ${name}"
[ "x$1" = "xstart" ] && ulimit -s 10240
${command} ${command_args}
fi

6
zabbix50-proxy/Makefile
View File

@ -5,8 +5,8 @@
PKGNAME= ${DISTNAME:S/-/-proxy-/}
COMMENT= Enterprise-class Monitoring Solution for Everyone
CONFLICTS+= zabbix-server-*
CONFLICTS+= zabbix-proxy-[3-4]*
CONFLICTS+= zabbix-server-[0-9]*
CONFLICTS+= zabbix-proxy-[0-9]*
USE_TOOLS+= pax pkg-config
GNU_CONFIGURE= yes
@ -37,8 +37,6 @@ SUBST_SED.fix-paths= -e 's,/usr/local/etc,${PKG_SYSCONFDIR},g'
.include "../../mk/bsd.prefs.mk"
SMF_INSTANCES= proxy
post-install:
cd ${WRKSRC}/database/${ZABBIX_DB_TYPE}; \
${PAX} -rw . ${DESTDIR}${PREFIX}/share/zabbix/

4
zabbix50-proxy/PLIST
View File

@ -4,10 +4,10 @@ man/man8/zabbix_proxy.8
sbin/zabbix_proxy
share/examples/zabbix/zabbix_proxy.conf
share/zabbix/data.sql
share/zabbix/images.sql
share/zabbix/schema.sql
${PLIST.mysql}share/zabbix/double.sql
${PLIST.pgsql}share/zabbix/double.sql
share/zabbix/images.sql
share/zabbix/schema.sql
${PLIST.pgsql}share/zabbix/timescaledb.sql
@pkgdir share/zabbix/externalscripts
@pkgdir lib/modules

2
zabbix50-proxy/files/smf/manifest.xml
View File

@ -14,7 +14,7 @@
<method_context>
<method_credential user="@ZABBIX_USER@" group="@ZABBIX_GROUP@"/>
</method_context>
<instance name="proxy" enabled="false">
<instance name="@SMF_INSTANCES@" enabled="false">
<dependency name="config-file" grouping="require_all" restart_on="refresh" type="path">
<service_fmri value="file://localhost@PKG_SYSCONFDIR@/zabbix_proxy.conf"/>
</dependency>

2
zabbix50-proxy/files/zabbix_proxy.sh
View File

@ -14,6 +14,7 @@ fi
name="zabbix_proxy"
rcvar=${name}
command="@PREFIX@/sbin/${name}"
start_precmd="ulimit -s 10240"
required_files="@PKG_SYSCONFDIR@/${name}.conf"
if [ -f /etc/rc.subr ]; then
@ -21,5 +22,6 @@ if [ -f /etc/rc.subr ]; then
run_rc_command "$1"
else
@ECHO@ -n " ${name}"
[ "x$1" = "xstart" ] && ulimit -s 10240
${command} ${command_args}
fi

6
zabbix50-proxy/options.mk
View File

@ -12,9 +12,8 @@ PKG_SUGGESTED_OPTIONS+= inet6
.include "../../mk/bsd.options.mk"
PLIST_VARS+= mysql
PLIST_VARS+= pgsql
PLIST_VARS+= sqlite3
PLIST_VARS+= mysql
PLIST_VARS+= pgsql
.if !empty(PKG_OPTIONS:Minet6)
CONFIGURE_ARGS+= --enable-ipv6
@ -53,5 +52,4 @@ PLIST.pgsql= yes
CONFIGURE_ARGS+= --with-sqlite3=${BUILDLINK_PREFIX.sqlite3}
.include "../../databases/sqlite3/buildlink3.mk"
ZABBIX_DB_TYPE= sqlite3
PLIST.sqlite3= yes
.endif

8
zabbix50-server/Makefile
View File

@ -1,11 +1,13 @@
# $NetBSD: Makefile,v 1.37 2020/06/20 12:43:46 gdt Exp $
# used by sysutils/zabbix50-proxy/Makefile
# used by sysutils/zabbix50-agent/Makefile
#
.include "Makefile.common"
PKGNAME= ${DISTNAME:S/-/-server-/}
COMMENT= Enterprise-class Monitoring Solution for Everyone
CONFLICTS+= zabbix-server-[3-4]*
CONFLICTS+= zabbix-server-[0-9]*
CONFLICTS+= zabbix-proxy-[0-9]*
DEPENDS+= fping-[0-9]*:../../net/fping
@ -41,8 +43,6 @@ CFLAGS.SunOS+= -DDUK_USE_BYTEORDER=1
.include "../../mk/bsd.prefs.mk"
SMF_INSTANCES= server
post-install:
cd ${WRKSRC}/database/${ZABBIX_DB_TYPE}; \
${PAX} -rw . ${DESTDIR}${PREFIX}/share/zabbix/

2
zabbix50-server/files/smf/manifest.xml
View File

@ -14,7 +14,7 @@
<method_context>
<method_credential user="@ZABBIX_USER@" group="@ZABBIX_GROUP@"/>
</method_context>
<instance name="server" enabled="false">
<instance name="@SMF_INSTANCES@" enabled="false">
<dependency name="config-file" grouping="require_all" restart_on="refresh" type="path">
<service_fmri value="file://localhost@PKG_SYSCONFDIR@/zabbix_server.conf"/>
</dependency>