On Mon, March 21, 2016 22:34, Kirill Bychkov wrote:
> On Mon, March 21, 2016 11:53, Vadim Zhukov wrote:
>> 2016-03-20 10:35 GMT+03:00 Kirill Bychkov <[email protected]>:
>>> On Fri, March 11, 2016 12:16, Kirill Bychkov wrote:
>>>> On Thu, March 10, 2016 23:22, Vadim Zhukov wrote:
>>>>> 2016-03-09 17:08 GMT+03:00 Kirill Bychkov <[email protected]>:
>>>>>> On Thu, March 3, 2016 16:57, Kirill Bychkov wrote:
>>>>>>> Him guys!
>>>>>>> This is a port of PNP4Nagios, an addon for Nafios and Oconga for
>>>>>>> analyzing
>>>>>>> performance data and storing it in RRD.
>>>>>>> Current port is partially based on an old one from henning@ [1] and
>>>>>>> tested
>>>>>>> for more than a month with Icinga 1.x processing data from about 400
>>>>>>> hosts.
>>>>>>> It could be splitted to Nagios and Icinga 2.x flavors if there are some
>>>>>>> interest in them and one can test it with.
>>>>>>>
>>>>>>> [1] http://marc.info/?l=openbsd-ports&m=140803165912579&w=2
>>>>>>>
>>>>>>> Comments? OKs?
>>>>>> Objections? :)
>>>
ping
>>>
>>>>>>
>>[...]
>
>> Now it looks like more or less fine. I don't understand why ${VARBASE}
>> and ${LOCALSTATEDIR} are used in, say, PREFIX-www, but not in
>> CONFIGURE_ARGS.
>>
>
> Changed hardcoded paths to make Makefile look consistent (and please
> portcheck).
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/www/pnp4nagios/Makefile,v
> retrieving revision 1.9
> diff -u -p -r1.9 Makefile
> --- Makefile 21 Mar 2016 09:57:27 -0000 1.9
> +++ Makefile 21 Mar 2016 19:31:52 -0000
> @@ -37,11 +37,11 @@ LOCALSTATEDIR = ${BASELOCALSTATEDIR}/pn
>
> CONFIGURE_STYLE = gnu
> CONFIGURE_ARGS += --with-nagios-user=_icinga --with-nagios-group=_icinga
> \
> - --datarootdir=/var/www/pnp4nagios/ \
> + --datarootdir=${VARBASE}/www/pnp4nagios/ \
> --libexecdir=${PREFIX}/libexec/nagios \
> - --with-perfdata-dir=/var/www/pnp4nagios/rrd \
> - --with-perfdata-spool-dir=/var/spool/icinga \
> -
> --with-perfdata-logfile=/var/log/pnp4nagios/pnp4nagios.log
> + --with-perfdata-dir=${VARBASE}/www/pnp4nagios/rrd \
> + --with-perfdata-spool-dir=${VARBASE}/spool/icinga \
> +
> --with-perfdata-logfile=${VARBASE}/log/pnp4nagios/pnp4nagios.log
>
> MULTI_PACKAGES = -main -cgi
> PREFIX-cgi = ${VARBASE}/www
> @@ -51,6 +51,8 @@ NO_TEST = Yes
> PKG_ARCH-cgi = *
>
> INSTALL_TARGET = install install-config
> +
> +SUBST_VARS += VARBASE
>
> # fix broken symlink in tarbal
> post-extract:
> cvs server: Diffing patches
> cvs server: Diffing pkg
> Index: pkg/README-cgi
> ===================================================================
> RCS file: /cvs/ports/www/pnp4nagios/pkg/README-cgi,v
> retrieving revision 1.3
> diff -u -p -r1.3 README-cgi
> --- pkg/README-cgi 21 Mar 2016 09:57:27 -0000 1.3
> +++ pkg/README-cgi 21 Mar 2016 19:31:52 -0000
> @@ -7,10 +7,10 @@ $OpenBSD: README.template,v 1.4 2011/06/
> Apache2
> -------
> Apache2 configuration for PNP4Nagios is stored under:
> - /var/www/conf/modules.sample/pnp4nagios.conf
> + ${VARBASE}/www/conf/modules.sample/pnp4nagios.conf
>
> It needs to be enabled by running the following command:
> -# ln -s ../modules.sample/pnp4nagios.conf /var/www/conf/modules
> +# ln -s ../modules.sample/pnp4nagios.conf ${VARBASE}/www/conf/modules
> # rcctl restart apache2
>
>
> @@ -18,6 +18,6 @@ Icinga-web
> ----------
> To integrate PNP4Nagios into the Icinga Web frontend you will need to
> install templates extensions which comes with icinga-web package:
> -% cd /var/www/icinga-web/app/modules/Cronks/data/xml/extensions
> +% cd ${VARBASE}/www/icinga-web/app/modules/Cronks/data/xml/extensions
> # ln -s pnp-host-extension.xml.dist pnp-host-extension.xml
> # ln -s pnp-service-extension.xml.dist pnp-service-extension.xml
>
>> WBR,
>> Vadim Zhukov
>>
>
