update to Icinga 1.6.1
This commit is contained in:
sthen
parent
cdc570f075
commit
ee12a15df7
@ -1,6 +1,6 @@
|
||||
# $OpenBSD: Makefile.inc,v 1.8 2011/09/22 15:25:28 sthen Exp $
|
||||
# $OpenBSD: Makefile.inc,v 1.9 2011/12/03 15:01:38 sthen Exp $
|
||||
|
||||
V ?= 1.5.1
|
||||
V ?= 1.6.1
|
||||
|
||||
CATEGORIES+= net net/icinga
|
||||
|
||||
|
||||
@ -1,21 +1,16 @@
|
||||
# $OpenBSD: Makefile,v 1.17 2011/11/16 15:56:37 robert Exp $
|
||||
# $OpenBSD: Makefile,v 1.18 2011/12/03 15:01:38 sthen Exp $
|
||||
|
||||
COMMENT-main = network monitoring system (improved fork of Nagios)
|
||||
COMMENT-cgi = cgi scripts for Icinga (classic Nagios-style UI)
|
||||
COMMENT-ido = store Icinga configuration and events in a database
|
||||
COMMENT-api = database-backed API for icinga
|
||||
|
||||
DISTNAME = icinga-$V
|
||||
PKGNAME-main = icinga-$V
|
||||
PKGNAME-cgi = icinga-cgi-$V
|
||||
PKGNAME-ido = icinga-idoutils-$V
|
||||
PKGNAME-api = icinga-api-$V
|
||||
|
||||
REVISION = 0
|
||||
|
||||
MULTI_PACKAGES = -main -cgi -api -ido
|
||||
MULTI_PACKAGES = -main -cgi -ido
|
||||
PREFIX-cgi = /var/www
|
||||
PREFIX-api = /var/www
|
||||
|
||||
WANTLIB = c crypto m pthread ssl
|
||||
RUN_DEPENDS = ${BASE_PKGPATH},-main
|
||||
@ -31,8 +26,6 @@ RUN_DEPENDS-ido = ${BASE_PKGPATH},-main \
|
||||
|
||||
MODULES = lang/php
|
||||
|
||||
RUN_DEPENDS-api = ${MODPHP_RUN_DEPENDS}
|
||||
|
||||
# the cgi binaries are linked -static to simplify use in chroot,
|
||||
# but listed as dependency anyway to help pkg_add -u find updates.
|
||||
# these will show as "extra".
|
||||
@ -71,7 +64,7 @@ CFLAGS += -fPIC \
|
||||
CFGDIR = ${SYSCONFDIR}/icinga
|
||||
MAKE_FLAGS = CFGDIR=${CFGDIR} SYSCONFDIR=${CFGDIR}
|
||||
INSTALL_TARGET = install-unstripped install-idoutils \
|
||||
install-config install-webconf install-api
|
||||
install-config install-webconf
|
||||
|
||||
# perl tests work; C tests require --enable-libtap in configure and
|
||||
# fixing up WRKSRC/tap/configure
|
||||
@ -82,10 +75,9 @@ post-install:
|
||||
${INSTALL_DATA_DIR} \
|
||||
${PREFIX}/share/examples/icinga/db/{mysql,pgsql,queries,scripts}
|
||||
cd ${WRKINST}${PREFIX-cgi}; \
|
||||
mv ${WRKINST}${PREFIX-cgi}/icinga-cgi/icinga-api .; \
|
||||
mv conf/modules.sample/icinga.conf \
|
||||
conf/modules.sample/icinga-cgi.conf.dist; \
|
||||
chown -R ${SHAREOWN}:${SHAREGRP} icinga-api icinga-cgi conf
|
||||
chown -R ${SHAREOWN}:${SHAREGRP} icinga-cgi conf
|
||||
cd ${WRKSRC}/module/idoutils; \
|
||||
pax -rw db ${PREFIX}/share/examples/icinga/
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
MD5 (icinga-1.5.1.tar.gz) = /Aef3aQ/whn5tYDCRrZ/VQ==
|
||||
RMD160 (icinga-1.5.1.tar.gz) = ly0eTdSf3d8ylwhovRaWTH482H0=
|
||||
SHA1 (icinga-1.5.1.tar.gz) = Yb1HU16fSeY+DuHvK7VtYuaJNBg=
|
||||
SHA256 (icinga-1.5.1.tar.gz) = sswjq4uW6UCc4+ftSg4aq+p/m06dUh9e0jqZ6hyew3s=
|
||||
SIZE (icinga-1.5.1.tar.gz) = 16518659
|
||||
MD5 (icinga-1.6.0.tar.gz) = /Gdi6YPFx9VI9kFyuGt+dw==
|
||||
RMD160 (icinga-1.6.0.tar.gz) = aHV/0DxNa2qIJZ3kckIQrgYQTKI=
|
||||
SHA1 (icinga-1.6.0.tar.gz) = qWsdUJX1Op5ege8iXPy9qm7oA30=
|
||||
SHA256 (icinga-1.6.0.tar.gz) = ISR4YicyB3YClgvLCLTUuQEWMNhhZbq0UIWdi97WCk8=
|
||||
SIZE (icinga-1.6.0.tar.gz) = 12879051
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-configure,v 1.3 2011/09/22 15:25:28 sthen Exp $
|
||||
--- configure.orig Wed Aug 24 14:57:57 2011
|
||||
+++ configure Wed Aug 24 22:23:40 2011
|
||||
@@ -4821,20 +4821,20 @@ fi
|
||||
$OpenBSD: patch-configure,v 1.4 2011/12/03 15:01:38 sthen Exp $
|
||||
--- configure.orig Wed Nov 30 12:08:58 2011
|
||||
+++ configure Wed Nov 30 19:35:06 2011
|
||||
@@ -4819,20 +4819,20 @@ fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cma_pthread_create" >&5
|
||||
$as_echo "$ac_cv_lib_cma_pthread_create" >&6; }
|
||||
if test "x$ac_cv_lib_cma_pthread_create" = xyes; then :
|
||||
@ -26,7 +26,7 @@ $OpenBSD: patch-configure,v 1.3 2011/09/22 15:25:28 sthen Exp $
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
|
||||
@@ -4865,7 +4865,7 @@ fi
|
||||
@@ -4863,7 +4863,7 @@ fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_create" >&5
|
||||
$as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
|
||||
if test "x$ac_cv_lib_pthread_pthread_create" = xyes; then :
|
||||
@ -35,7 +35,7 @@ $OpenBSD: patch-configure,v 1.3 2011/09/22 15:25:28 sthen Exp $
|
||||
fi
|
||||
|
||||
if test $ac_cv_lib_pthread_pthread_create = yes; then
|
||||
@@ -5156,7 +5156,7 @@ cat >>confdefs.h <<_ACEOF
|
||||
@@ -5154,7 +5154,7 @@ cat >>confdefs.h <<_ACEOF
|
||||
#define DEFAULT_NAGIOS_GROUP "$icinga_grp"
|
||||
_ACEOF
|
||||
|
||||
@ -44,7 +44,7 @@ $OpenBSD: patch-configure,v 1.3 2011/09/22 15:25:28 sthen Exp $
|
||||
|
||||
|
||||
|
||||
@@ -5177,7 +5177,7 @@ fi
|
||||
@@ -5175,7 +5175,7 @@ fi
|
||||
|
||||
|
||||
|
||||
@ -53,7 +53,7 @@ $OpenBSD: patch-configure,v 1.3 2011/09/22 15:25:28 sthen Exp $
|
||||
|
||||
|
||||
|
||||
@@ -5646,7 +5646,7 @@ $as_echo_n "checking for gdImagePng in -lgd (order 1).
|
||||
@@ -5636,7 +5636,7 @@ $as_echo_n "checking for gdImagePng in -lgd (order 1).
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
ac_save_LIBS="$LIBS"
|
||||
@ -62,7 +62,7 @@ $OpenBSD: patch-configure,v 1.3 2011/09/22 15:25:28 sthen Exp $
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
@@ -5677,7 +5677,7 @@ fi
|
||||
@@ -5667,7 +5667,7 @@ fi
|
||||
$as_echo "yes" >&6; }
|
||||
|
||||
GDLIBFOUND=yep
|
||||
@ -71,7 +71,7 @@ $OpenBSD: patch-configure,v 1.3 2011/09/22 15:25:28 sthen Exp $
|
||||
|
||||
else
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
@@ -6941,7 +6941,7 @@ $as_echo_n "checking for SSL libraries... " >&6; }
|
||||
@@ -6931,7 +6931,7 @@ $as_echo_n "checking for SSL libraries... " >&6; }
|
||||
found_ssl=no
|
||||
for dir in $ssl_lib_dir $ssl_dir /usr/lib64 /usr/lib /usr/local/lib /usr/lib/ssl /usr/ssl/lib /usr/openssl/lib /usr/pkg/lib /usr/freeware/lib/openssl; do
|
||||
ssllibdir="$dir"
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-module_idoutils_src_Makefile_in,v 1.1.1.1 2011/03/28 14:06:08 sthen Exp $
|
||||
--- module/idoutils/src/Makefile.in.orig Tue Mar 22 17:53:51 2011
|
||||
+++ module/idoutils/src/Makefile.in Tue Mar 22 17:54:14 2011
|
||||
@@ -97,7 +97,7 @@ devclean: distclean
|
||||
$OpenBSD: patch-module_idoutils_src_Makefile_in,v 1.2 2011/12/03 15:01:38 sthen Exp $
|
||||
--- module/idoutils/src/Makefile.in.orig Wed Nov 30 12:08:58 2011
|
||||
+++ module/idoutils/src/Makefile.in Wed Nov 30 19:35:06 2011
|
||||
@@ -105,7 +105,7 @@ devclean: distclean
|
||||
|
||||
install:
|
||||
$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-sample-config_cgi_cfg_in,v 1.3 2011/09/22 15:25:28 sthen Exp $
|
||||
--- sample-config/cgi.cfg.in.orig Wed Aug 24 14:57:57 2011
|
||||
+++ sample-config/cgi.cfg.in Wed Aug 24 22:23:40 2011
|
||||
@@ -382,7 +382,10 @@ default_statuswrl_layout=4
|
||||
$OpenBSD: patch-sample-config_cgi_cfg_in,v 1.4 2011/12/03 15:01:38 sthen Exp $
|
||||
--- sample-config/cgi.cfg.in.orig Wed Nov 30 12:08:58 2011
|
||||
+++ sample-config/cgi.cfg.in Wed Nov 30 19:35:06 2011
|
||||
@@ -394,7 +394,10 @@ default_statuswrl_layout=4
|
||||
# OS and distribution, so you may have to tweak this to
|
||||
# work on your system.
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-sample-config_icinga_cfg_in,v 1.4 2011/09/22 15:25:28 sthen Exp $
|
||||
--- sample-config/icinga.cfg.in.orig Wed Aug 24 14:57:57 2011
|
||||
+++ sample-config/icinga.cfg.in Wed Aug 24 22:23:40 2011
|
||||
@@ -1263,7 +1263,7 @@ enable_embedded_perl=0
|
||||
$OpenBSD: patch-sample-config_icinga_cfg_in,v 1.5 2011/12/03 15:01:38 sthen Exp $
|
||||
--- sample-config/icinga.cfg.in.orig Wed Nov 30 12:08:58 2011
|
||||
+++ sample-config/icinga.cfg.in Wed Nov 30 19:35:06 2011
|
||||
@@ -1265,7 +1265,7 @@ enable_embedded_perl=0
|
||||
# the HTML documentation on the embedded Perl interpreter for more
|
||||
# information on how this option works.
|
||||
|
||||
@ -10,7 +10,7 @@ $OpenBSD: patch-sample-config_icinga_cfg_in,v 1.4 2011/09/22 15:25:28 sthen Exp
|
||||
|
||||
|
||||
|
||||
@@ -1336,8 +1336,8 @@ use_true_regexp_matching=0
|
||||
@@ -1349,8 +1349,8 @@ use_true_regexp_matching=0
|
||||
# using the $ADMINEMAIL$ and $ADMINPAGER$ macros in your notification
|
||||
# commands.
|
||||
|
||||
|
||||
@ -1 +0,0 @@
|
||||
This package contains the PHP-based API for icinga.
|
||||
@ -1,85 +0,0 @@
|
||||
@comment $OpenBSD: PLIST-api,v 1.1.1.1 2011/03/28 14:06:08 sthen Exp $
|
||||
icinga-api/
|
||||
icinga-api/IcingaApi.php
|
||||
icinga-api/contrib/
|
||||
icinga-api/contrib/ido2dbparser/
|
||||
icinga-api/contrib/ido2dbparser/Ido2dbParser.php
|
||||
@group www
|
||||
icinga-api/log/
|
||||
@comment icinga-api/log/PLACEHOLDER
|
||||
@group
|
||||
icinga-api/objects/
|
||||
icinga-api/objects/IcingaApiConstantsInterface.php
|
||||
icinga-api/objects/command/
|
||||
icinga-api/objects/command/IcingaApiCommand.php
|
||||
icinga-api/objects/command/IcingaApiCommandCollection.php
|
||||
icinga-api/objects/command/IcingaApiCommandDispatcher.php
|
||||
icinga-api/objects/command/IcingaApiCommandInterface.php
|
||||
icinga-api/objects/command/IcingaApiCommandSend.php
|
||||
icinga-api/objects/command/IcingaApiCommandSendPipe.php
|
||||
icinga-api/objects/command/IcingaApiCommandSendSsh.php
|
||||
icinga-api/objects/connection/
|
||||
icinga-api/objects/connection/IcingaApiConnection.php
|
||||
icinga-api/objects/connection/IcingaApiConnectionDatabase.php
|
||||
icinga-api/objects/connection/IcingaApiConnectionFile.php
|
||||
icinga-api/objects/connection/IcingaApiConnectionIdo.php
|
||||
icinga-api/objects/connection/IcingaApiConnectionInterface.php
|
||||
icinga-api/objects/connection/IcingaApiConnectionLivestatus.php
|
||||
icinga-api/objects/conversion/
|
||||
icinga-api/objects/conversion/IcingaApiConversionTime.php
|
||||
icinga-api/objects/debug/
|
||||
icinga-api/objects/debug/debugTargets/
|
||||
icinga-api/objects/debug/debugTargets/icingaApiDebuggerTargetInterface.php
|
||||
icinga-api/objects/debug/debugTargets/icingaApiEchoDebugger.php
|
||||
icinga-api/objects/debug/debugTargets/icingaApiFileDebugger.php
|
||||
icinga-api/objects/debug/icingaApiDebugger.php
|
||||
icinga-api/objects/ociPDO/
|
||||
icinga-api/objects/ociPDO/PDO/
|
||||
icinga-api/objects/ociPDO/PDO/ociPDO.php
|
||||
icinga-api/objects/ociPDO/PDO/ociPDOStatement.php
|
||||
icinga-api/objects/ociPDO/icingaApiPDO.php
|
||||
icinga-api/objects/result/
|
||||
icinga-api/objects/result/IcingaApiResult.php
|
||||
icinga-api/objects/result/IcingaApiResultFile.php
|
||||
icinga-api/objects/result/IcingaApiResultIdo.php
|
||||
icinga-api/objects/result/IcingaApiResultInterface.php
|
||||
icinga-api/objects/result/IcingaApiResultLivestatus.php
|
||||
icinga-api/objects/search/
|
||||
icinga-api/objects/search/IcingaApiSearch.php
|
||||
icinga-api/objects/search/IcingaApiSearchColumnsFile.php
|
||||
icinga-api/objects/search/IcingaApiSearchFile.php
|
||||
icinga-api/objects/search/IcingaApiSearchIdo.php
|
||||
icinga-api/objects/search/IcingaApiSearchInterface.php
|
||||
icinga-api/objects/search/IcingaApiSearchLivestatus.php
|
||||
icinga-api/objects/search/data_interfaces/
|
||||
icinga-api/objects/search/data_interfaces/IcingaApiSearchIdoInterface.php
|
||||
icinga-api/objects/search/data_interfaces/IcingaApiSearchIdoMysql.php
|
||||
icinga-api/objects/search/data_interfaces/IcingaApiSearchIdoOci.php
|
||||
icinga-api/objects/search/data_interfaces/IcingaApiSearchIdoOci8.php
|
||||
icinga-api/objects/search/data_interfaces/IcingaApiSearchIdoPgsql.php
|
||||
icinga-api/objects/search/data_interfaces/IcingaApiSearchLivestatusSocket.php
|
||||
icinga-api/objects/search/filter/
|
||||
icinga-api/objects/search/filter/IcingaApiSearchFilter.php
|
||||
icinga-api/objects/search/filter/IcingaApiSearchFilterGroup.php
|
||||
icinga-api/objects/search/filter/IcingaApiSearchFilterGroupIdo.php
|
||||
icinga-api/objects/search/filter/IcingaApiSearchFilterIdo.php
|
||||
icinga-api/objects/search/filter/IcingaApiSearchFilterInterface.php
|
||||
icinga-api/tests/
|
||||
icinga-api/tests/icingaApiTests.php
|
||||
icinga-api/tests/idoTests/
|
||||
icinga-api/tests/idoTests/apiSearchDefinitions/
|
||||
icinga-api/tests/idoTests/apiSearchDefinitions/custom.ini
|
||||
icinga-api/tests/idoTests/apiSearchDefinitions/icinga-web.ini
|
||||
icinga-api/tests/idoTests/apiSearchDefinitions/objectsearch.ini
|
||||
icinga-api/tests/idoTests/dbConfig.php
|
||||
icinga-api/tests/idoTests/idoConnectionTest.php
|
||||
icinga-api/tests/idoTests/idoCreateSearchTest.php
|
||||
icinga-api/tests/idoTests/testDatabases/
|
||||
icinga-api/tests/idoTests/testDatabases/mysql_delete.sql
|
||||
icinga-api/tests/idoTests/testDatabases/mysql_dump.sql
|
||||
icinga-api/tests/idoTests/testDatabases/mysql_schema.sql
|
||||
icinga-api/tests/idoTests/testDatabases/oci8_delete.sql
|
||||
icinga-api/tests/idoTests/testDatabases/oci8_schema.sql
|
||||
icinga-api/tests/idoTests/testDatabases/oracle_dump.sql
|
||||
icinga-api/tests/idoTests/testDatabases/pgsql.sql
|
||||
icinga-api/tests/idoTests/testSuite.php
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST-cgi,v 1.6 2011/09/22 15:25:28 sthen Exp $
|
||||
@comment $OpenBSD: PLIST-cgi,v 1.7 2011/12/03 15:01:38 sthen Exp $
|
||||
cgi-bin/icinga/
|
||||
@bin cgi-bin/icinga/avail.cgi
|
||||
@bin cgi-bin/icinga/cmd.cgi
|
||||
@ -114,6 +114,7 @@ icinga-cgi/docs/de/clusters.html
|
||||
icinga-cgi/docs/de/components.html
|
||||
icinga-cgi/docs/de/config.html
|
||||
icinga-cgi/docs/de/configcgi.html
|
||||
icinga-cgi/docs/de/configido.html
|
||||
icinga-cgi/docs/de/configmain.html
|
||||
icinga-cgi/docs/de/configobject.html
|
||||
icinga-cgi/docs/de/customobjectvars.html
|
||||
@ -183,6 +184,7 @@ icinga-cgi/docs/de/quickstart-idoutils.html
|
||||
icinga-cgi/docs/de/quickstart.html
|
||||
icinga-cgi/docs/de/redundancy.html
|
||||
icinga-cgi/docs/de/reporting.html
|
||||
icinga-cgi/docs/de/reporting_1.6.html
|
||||
icinga-cgi/docs/de/security.html
|
||||
icinga-cgi/docs/de/servicechecks.html
|
||||
icinga-cgi/docs/de/stalking.html
|
||||
@ -227,6 +229,7 @@ icinga-cgi/docs/en/checkscheduling.html
|
||||
icinga-cgi/docs/en/clusters.html
|
||||
icinga-cgi/docs/en/config.html
|
||||
icinga-cgi/docs/en/configcgi.html
|
||||
icinga-cgi/docs/en/configido.html
|
||||
icinga-cgi/docs/en/configmain.html
|
||||
icinga-cgi/docs/en/configobject.html
|
||||
icinga-cgi/docs/en/customobjectvars.html
|
||||
@ -297,6 +300,7 @@ icinga-cgi/docs/en/quickstart-idoutils.html
|
||||
icinga-cgi/docs/en/quickstart.html
|
||||
icinga-cgi/docs/en/redundancy.html
|
||||
icinga-cgi/docs/en/reporting.html
|
||||
icinga-cgi/docs/en/reporting_1.6.html
|
||||
icinga-cgi/docs/en/security.html
|
||||
icinga-cgi/docs/en/servicechecks.html
|
||||
icinga-cgi/docs/en/stalking.html
|
||||
@ -381,55 +385,80 @@ icinga-cgi/docs/images/flags/de.png
|
||||
icinga-cgi/docs/images/flags/um_gb.png
|
||||
icinga-cgi/docs/images/freshness.png
|
||||
icinga-cgi/docs/images/host-dependencies.png
|
||||
icinga-cgi/docs/images/icinga-reporting_1.6.png
|
||||
icinga-cgi/docs/images/icinga-web-admin_groups1.png
|
||||
icinga-cgi/docs/images/icinga-web-admin_groups1_1.6.png
|
||||
icinga-cgi/docs/images/icinga-web-admin_groups2.png
|
||||
icinga-cgi/docs/images/icinga-web-admin_groups2_1.6.png
|
||||
icinga-cgi/docs/images/icinga-web-admin_logs1.png
|
||||
icinga-cgi/docs/images/icinga-web-admin_principals.png
|
||||
icinga-cgi/docs/images/icinga-web-admin_tasks.png
|
||||
icinga-cgi/docs/images/icinga-web-admin_users1.png
|
||||
icinga-cgi/docs/images/icinga-web-admin_users1_1.6.png
|
||||
icinga-cgi/docs/images/icinga-web-admin_users2.png
|
||||
icinga-cgi/docs/images/icinga-web-admin_users2_1.6.png
|
||||
icinga-cgi/docs/images/icinga-web-commands_hst.png
|
||||
icinga-cgi/docs/images/icinga-web-commands_hst_1.3.png
|
||||
icinga-cgi/docs/images/icinga-web-commands_hst_1.5.png
|
||||
icinga-cgi/docs/images/icinga-web-commands_hst_1.6.png
|
||||
icinga-cgi/docs/images/icinga-web-commands_svc.png
|
||||
icinga-cgi/docs/images/icinga-web-commands_svc_1.3.png
|
||||
icinga-cgi/docs/images/icinga-web-commands_svc_1.5.png
|
||||
icinga-cgi/docs/images/icinga-web-commands_svc_1.6.png
|
||||
icinga-cgi/docs/images/icinga-web-cronks1.png
|
||||
icinga-cgi/docs/images/icinga-web-cronks1_1.3.png
|
||||
icinga-cgi/docs/images/icinga-web-cronks1_1.5.png
|
||||
icinga-cgi/docs/images/icinga-web-cronks1_1.6.png
|
||||
icinga-cgi/docs/images/icinga-web-cronks2.png
|
||||
icinga-cgi/docs/images/icinga-web-cronks2_1.3.png
|
||||
icinga-cgi/docs/images/icinga-web-cronks2_1.5.png
|
||||
icinga-cgi/docs/images/icinga-web-cronks2_1.6.png
|
||||
icinga-cgi/docs/images/icinga-web-cronks2a.png
|
||||
icinga-cgi/docs/images/icinga-web-cronks2a_1.6.png
|
||||
icinga-cgi/docs/images/icinga-web-cronks3.png
|
||||
icinga-cgi/docs/images/icinga-web-cronks3_1.3.png
|
||||
icinga-cgi/docs/images/icinga-web-cronks3_1.5.png
|
||||
icinga-cgi/docs/images/icinga-web-cronks3_1.6.png
|
||||
icinga-cgi/docs/images/icinga-web-filter1.png
|
||||
icinga-cgi/docs/images/icinga-web-filter1_1.3.png
|
||||
icinga-cgi/docs/images/icinga-web-filter1_1.6.png
|
||||
icinga-cgi/docs/images/icinga-web-filter2.png
|
||||
icinga-cgi/docs/images/icinga-web-filter2_1.3.png
|
||||
icinga-cgi/docs/images/icinga-web-filter3.png
|
||||
icinga-cgi/docs/images/icinga-web-host_1.5.png
|
||||
icinga-cgi/docs/images/icinga-web-host_1.6.png
|
||||
icinga-cgi/docs/images/icinga-web-hostgroup_1.5.png
|
||||
icinga-cgi/docs/images/icinga-web-hostgroup_1.6.png
|
||||
icinga-cgi/docs/images/icinga-web-log.png
|
||||
icinga-cgi/docs/images/icinga-web-log_1.3.png
|
||||
icinga-cgi/docs/images/icinga-web-log_1.6.png
|
||||
icinga-cgi/docs/images/icinga-web-login.png
|
||||
icinga-cgi/docs/images/icinga-web-main_bar.png
|
||||
icinga-cgi/docs/images/icinga-web-mainscreen1.png
|
||||
icinga-cgi/docs/images/icinga-web-mainscreen1_1.3.png
|
||||
icinga-cgi/docs/images/icinga-web-mainscreen1_1.5.png
|
||||
icinga-cgi/docs/images/icinga-web-mainscreen1_1.6.png
|
||||
icinga-cgi/docs/images/icinga-web-open_problems.png
|
||||
icinga-cgi/docs/images/icinga-web-overview.png
|
||||
icinga-cgi/docs/images/icinga-web-overview_1.3.png
|
||||
icinga-cgi/docs/images/icinga-web-overview_1.5.png
|
||||
icinga-cgi/docs/images/icinga-web-overview_1.6.png
|
||||
icinga-cgi/docs/images/icinga-web-search1.png
|
||||
icinga-cgi/docs/images/icinga-web-search1_1.3.png
|
||||
icinga-cgi/docs/images/icinga-web-search1_1.6.png
|
||||
icinga-cgi/docs/images/icinga-web-settings.png
|
||||
icinga-cgi/docs/images/icinga-web-settings_1.5.png
|
||||
icinga-cgi/docs/images/icinga-web-srv_1.5.png
|
||||
icinga-cgi/docs/images/icinga-web-srv_1.6.png
|
||||
icinga-cgi/docs/images/icinga-web-statuscronk.png
|
||||
icinga-cgi/docs/images/icinga-web-statuscronk_1.5.png
|
||||
icinga-cgi/docs/images/icinga-web-statuscronk_1.6.png
|
||||
icinga-cgi/docs/images/icinga-web-tackle1.png
|
||||
icinga-cgi/docs/images/icinga-web-tackle2.png
|
||||
icinga-cgi/docs/images/icinga-web-tackle3.png
|
||||
icinga-cgi/docs/images/icinga-web-tackle4.png
|
||||
icinga-cgi/docs/images/icinga-web-topmenu1.png
|
||||
icinga-cgi/docs/images/icinga-web-topmenu1_1.6.png
|
||||
icinga-cgi/docs/images/icinga-web-topmenu2.png
|
||||
icinga-cgi/docs/images/icinga-web-topmenu2_1.3.png
|
||||
icinga-cgi/docs/images/idoutils.png
|
||||
@ -606,19 +635,11 @@ icinga-cgi/images/zoom1.gif
|
||||
icinga-cgi/images/zoom2.gif
|
||||
icinga-cgi/index.html
|
||||
icinga-cgi/js/
|
||||
icinga-cgi/js/builder.js
|
||||
icinga-cgi/js/checkbox_functions.js
|
||||
icinga-cgi/js/controls.js
|
||||
icinga-cgi/js/dragdrop.js
|
||||
icinga-cgi/js/effects.js
|
||||
icinga-cgi/js/htable.js
|
||||
icinga-cgi/js/jquery-1.6.2.min.js
|
||||
icinga-cgi/js/jquery.dd.js
|
||||
icinga-cgi/js/menu.js
|
||||
icinga-cgi/js/mootools.js
|
||||
icinga-cgi/js/skinnytip.js
|
||||
icinga-cgi/js/slider.js
|
||||
icinga-cgi/js/sound.js
|
||||
icinga-cgi/log/
|
||||
icinga-cgi/log/.htaccess
|
||||
icinga-cgi/log/index.htm
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST-ido,v 1.6 2011/09/22 15:25:29 sthen Exp $
|
||||
@comment $OpenBSD: PLIST-ido,v 1.7 2011/12/03 15:01:38 sthen Exp $
|
||||
@bin bin/ido2db
|
||||
@bin bin/idomod.o
|
||||
@bin bin/log2ido
|
||||
@ -17,6 +17,7 @@ share/examples/icinga/db/mysql/upgrade/mysql-upgrade-1.0rc.sql
|
||||
share/examples/icinga/db/mysql/upgrade/mysql-upgrade-1.3.0.sql
|
||||
share/examples/icinga/db/mysql/upgrade/mysql-upgrade-1.4.0.sql
|
||||
share/examples/icinga/db/mysql/upgrade/mysql-upgrade-1.5.0.sql
|
||||
share/examples/icinga/db/mysql/upgrade/mysql-upgrade-1.6.0.sql
|
||||
share/examples/icinga/db/oracle/
|
||||
share/examples/icinga/db/oracle/create_icinga_objects_oracle.sql
|
||||
share/examples/icinga/db/oracle/create_oracle_sys.sql
|
||||
@ -32,6 +33,7 @@ share/examples/icinga/db/oracle/upgrade/oracle-upgrade-1.0.3.sql
|
||||
share/examples/icinga/db/oracle/upgrade/oracle-upgrade-1.3.0.sql
|
||||
share/examples/icinga/db/oracle/upgrade/oracle-upgrade-1.4.0.sql
|
||||
share/examples/icinga/db/oracle/upgrade/oracle-upgrade-1.5.0.sql
|
||||
share/examples/icinga/db/oracle/upgrade/oracle-upgrade-1.6.0.sql
|
||||
share/examples/icinga/db/oracle/upgrade/oracle_alter_icinga13_numbers.sql
|
||||
share/examples/icinga/db/oracle/upgrade/oracle_alter_icinga13_objects.sql
|
||||
share/examples/icinga/db/oracle/upgrade/oracle_recreate_icinga13_functions.sql
|
||||
@ -44,6 +46,7 @@ share/examples/icinga/db/pgsql/upgrade/pgsql-upgrade-1.0.3.sql
|
||||
share/examples/icinga/db/pgsql/upgrade/pgsql-upgrade-1.3.0.sql
|
||||
share/examples/icinga/db/pgsql/upgrade/pgsql-upgrade-1.4.0.sql
|
||||
share/examples/icinga/db/pgsql/upgrade/pgsql-upgrade-1.5.0.sql
|
||||
share/examples/icinga/db/pgsql/upgrade/pgsql-upgrade-1.6.0.sql
|
||||
share/examples/icinga/db/queries/
|
||||
share/examples/icinga/db/queries/comment_history.sql
|
||||
share/examples/icinga/db/queries/comments.sql
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST-main,v 1.5 2011/09/22 15:25:29 sthen Exp $
|
||||
@comment $OpenBSD: PLIST-main,v 1.6 2011/12/03 15:01:38 sthen Exp $
|
||||
@newgroup _icinga:667
|
||||
@newuser _icinga:667:_icinga:daemon:Icinga user:/var/www/icinga:/sbin/nologin
|
||||
@extraunexec rm -rf ${SYSCONFDIR}/icinga/*
|
||||
@ -25,6 +25,8 @@ share/examples/icinga/objects/commands.cfg
|
||||
@sample ${SYSCONFDIR}/icinga/objects/commands.cfg
|
||||
share/examples/icinga/objects/contacts.cfg
|
||||
@sample ${SYSCONFDIR}/icinga/objects/contacts.cfg
|
||||
share/examples/icinga/objects/ido2db_check_proc.cfg
|
||||
@sample ${SYSCONFDIR}/icinga/objects/ido2db_check_proc.cfg
|
||||
share/examples/icinga/objects/localhost.cfg
|
||||
@sample ${SYSCONFDIR}/icinga/objects/localhost.cfg
|
||||
share/examples/icinga/objects/notifications.cfg
|
||||
|
||||
@ -1,20 +1,17 @@
|
||||
# $OpenBSD: Makefile,v 1.8 2011/11/16 15:56:37 robert Exp $
|
||||
# $OpenBSD: Makefile,v 1.9 2011/12/03 15:01:38 sthen Exp $
|
||||
|
||||
# Work in progress. Not yet linked to the build.
|
||||
|
||||
V = 1.6.0
|
||||
COMMENT = web UI for icinga
|
||||
V = 1.4.1
|
||||
REVISION = 1
|
||||
DISTNAME = icinga-web-$V
|
||||
|
||||
MODULES= lang/php
|
||||
|
||||
BUILD_DEPENDS = icinga-api-$V:net/icinga/core,-api
|
||||
RUN_DEPENDS = www/pear \
|
||||
lang/php/${MODPHP_VERSION},-ldap \
|
||||
lang/php/${MODPHP_VERSION},-pdo_mysql \
|
||||
lang/php/${MODPHP_VERSION},-xsl \
|
||||
icinga-api-$V:net/icinga/core,-api
|
||||
lang/php/${MODPHP_VERSION},-xsl
|
||||
# Optional php extensions: gd soap xmlrpc
|
||||
# Does this work with pgo_pgsql? So far haven't worked out how.
|
||||
|
||||
@ -22,9 +19,9 @@ MAKE_FLAGS = PREFIX=/var/www/icinga-web
|
||||
FAKE_FLAGS = CFGDIR=${TRUEPREFIX}/share/examples/icinga
|
||||
|
||||
CONFIGURE_STYLE = gnu
|
||||
CONFIGURE_ENV += PHP="${MODPHP_BIN}"
|
||||
CONFIGURE_ARGS += \
|
||||
--datarootdir=/var/www \
|
||||
--with-icinga-api=/var/www/icinga-api \
|
||||
--localstatedir=/var/icinga \
|
||||
--sbindir=/var/www/cgi-bin/icinga \
|
||||
--with-web-apache-path=/var/www/conf/modules.sample \
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
MD5 (icinga-web-1.4.1.tar.gz) = oLs4vHhnRBgW/awtSg6ctQ==
|
||||
RMD160 (icinga-web-1.4.1.tar.gz) = gKGKF5WXs4bWIXByB9BcjZyAYaY=
|
||||
SHA1 (icinga-web-1.4.1.tar.gz) = WNFs72SVL17T89TCTMxL754UmEA=
|
||||
SHA256 (icinga-web-1.4.1.tar.gz) = RCIR/8CZvnwsijd6iuai7214Ek1FHlJM3rEN7BN2954=
|
||||
SIZE (icinga-web-1.4.1.tar.gz) = 20894316
|
||||
MD5 (icinga-web-1.6.0.tar.gz) = cXHibCHNE+NrlLta16Pt7w==
|
||||
RMD160 (icinga-web-1.6.0.tar.gz) = /O8ZizE6Y2zbkAr6F20mj2b405I=
|
||||
SHA1 (icinga-web-1.6.0.tar.gz) = icNwrV5q0E3N1Ms14XcPxiax0Ao=
|
||||
SHA256 (icinga-web-1.6.0.tar.gz) = WYGfziKrdMMCH/SsGP7TwANP7ssUG/xpLaZQFsbkN/o=
|
||||
SIZE (icinga-web-1.6.0.tar.gz) = 14578472
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-Makefile_in,v 1.1 2011/05/11 13:57:41 sthen Exp $
|
||||
--- Makefile.in.orig Wed May 11 11:59:06 2011
|
||||
+++ Makefile.in Wed May 11 11:59:46 2011
|
||||
@@ -226,7 +226,8 @@ db-purge-userprefs:
|
||||
$OpenBSD: patch-Makefile_in,v 1.2 2011/12/03 15:01:38 sthen Exp $
|
||||
--- Makefile.in.orig Fri Sep 16 09:03:31 2011
|
||||
+++ Makefile.in Fri Sep 16 11:53:07 2011
|
||||
@@ -257,7 +257,8 @@ db-purge-userprefs:
|
||||
$(PHING_CALL) db-purge-userprefs
|
||||
|
||||
make-create-files:
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-app_Makefile_in,v 1.1.1.1 2011/03/28 14:06:06 sthen Exp $
|
||||
--- app/Makefile.in.orig Sun Mar 20 21:41:34 2011
|
||||
+++ app/Makefile.in Sun Mar 20 21:41:45 2011
|
||||
@@ -13,21 +13,21 @@ INSTALL_OPTS_CACHE=@INSTALL_OPTS_CACHE@
|
||||
$OpenBSD: patch-app_Makefile_in,v 1.2 2011/12/03 15:01:38 sthen Exp $
|
||||
--- app/Makefile.in.orig Fri Sep 16 09:03:31 2011
|
||||
+++ app/Makefile.in Fri Sep 16 11:55:18 2011
|
||||
@@ -13,20 +13,20 @@ INSTALL_OPTS_CACHE=@INSTALL_OPTS_CACHE@
|
||||
|
||||
install: installdirs
|
||||
find . -mindepth 1 -type f \
|
||||
@ -21,13 +21,12 @@ $OpenBSD: patch-app_Makefile_in,v 1.1.1.1 2011/03/28 14:06:06 sthen Exp $
|
||||
find . -mindepth 1 -type d \
|
||||
- -not -path "./cache/*" \
|
||||
- -and -not -path "*/data/log*" \
|
||||
- -and -not -path "*/data/tmp*" \
|
||||
- -and -not -path "*Reporting/data*" \
|
||||
+ \! -path "./cache/*" \
|
||||
+ -and \! -path "*/data/log*" \
|
||||
+ -and \! -path "*/data/tmp*" \
|
||||
+ -and \! -path "*Reporting/data*" \
|
||||
-exec $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(prefix)/app/{} \;
|
||||
|
||||
$(INSTALL) -m 755 $(INSTALL_OPTS_CACHE) -d $(DESTDIR)$(prefix)/app/cache
|
||||
$(INSTALL) -m 755 $(INSTALL_OPTS_CACHE) -d $(DESTDIR)$(prefix)/app/cache/config
|
||||
|
||||
- $(INSTALL) -m 755 $(INSTALL_OPTS_WEB) -d $(DESTDIR)$(prefix)/app/data/log
|
||||
\ No newline at end of file
|
||||
+ $(INSTALL) -m 755 $(INSTALL_OPTS_WEB) -d $(DESTDIR)$(prefix)/app/data/log
|
||||
|
||||
@ -1,16 +1,14 @@
|
||||
$OpenBSD: patch-bin_Makefile_in,v 1.1.1.1 2011/03/28 14:06:06 sthen Exp $
|
||||
--- bin/Makefile.in.orig Sun Mar 20 21:41:34 2011
|
||||
+++ bin/Makefile.in Sun Mar 20 21:41:49 2011
|
||||
@@ -10,9 +10,9 @@ INSTALL=@INSTALL@
|
||||
$OpenBSD: patch-bin_Makefile_in,v 1.2 2011/12/03 15:01:38 sthen Exp $
|
||||
--- bin/Makefile.in.orig Fri Sep 16 09:03:31 2011
|
||||
+++ bin/Makefile.in Fri Sep 16 11:57:50 2011
|
||||
@@ -10,8 +10,8 @@ INSTALL=@INSTALL@
|
||||
INSTALL_OPTS=@INSTALL_OPTS@
|
||||
|
||||
install: installdirs
|
||||
- find . -mindepth 1 -type f -not -name "*.in" -and -not -name "Makefile" -exec $(INSTALL) -m 775 $(INSTALL_OPTS) {} $(DESTDIR)$(prefix)/bin/{} \;
|
||||
- find . -mindepth 1 -type f -not -name "*.in" -and -not -name "Makefile" -exec chmod +x $(DESTDIR)$(prefix)/bin/{} \;
|
||||
+ find . -mindepth 1 -type f \! -name "*.in" -and \! -name "Makefile" -exec $(INSTALL) -m 775 $(INSTALL_OPTS) {} $(DESTDIR)$(prefix)/bin/{} \;
|
||||
+ find . -mindepth 1 -type f \! -name "*.in" -and \! -name "Makefile" -exec chmod +x $(DESTDIR)$(prefix)/bin/{} \;
|
||||
|
||||
installdirs:
|
||||
$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(prefix)/bin
|
||||
find . -mindepth 1 -type d -exec $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(prefix)/bin/{} \;
|
||||
-
|
||||
\ No newline at end of file
|
||||
+
|
||||
|
||||
@ -1,13 +0,0 @@
|
||||
$OpenBSD: patch-configure,v 1.2 2011/06/08 14:24:50 sthen Exp $
|
||||
--- configure.orig Wed Jun 8 07:16:30 2011
|
||||
+++ configure Wed Jun 8 10:43:01 2011
|
||||
@@ -3805,7 +3805,8 @@ fi
|
||||
$as_echo "$as_me: Create api config in $FILE" >&6;}
|
||||
for T in $BLOCKS; do
|
||||
|
||||
- $SED -i -e "/###BEGIN_$T###/,/###END_$T###/d" $FILE
|
||||
+ $SED -e "/###BEGIN_$T###/,/###END_$T###/d" < $FILE > $FILE.tmp
|
||||
+ mv $FILE.tmp $FILE
|
||||
|
||||
done
|
||||
|
||||
@ -1,24 +1,16 @@
|
||||
$OpenBSD: patch-etc_Makefile_in,v 1.2 2011/03/31 10:25:25 sthen Exp $
|
||||
--- etc/Makefile.in.orig Wed Mar 30 17:27:10 2011
|
||||
+++ etc/Makefile.in Thu Mar 31 10:57:03 2011
|
||||
@@ -10,10 +10,10 @@ INSTALL=@INSTALL@
|
||||
$OpenBSD: patch-etc_Makefile_in,v 1.3 2011/12/03 15:01:38 sthen Exp $
|
||||
--- etc/Makefile.in.orig Tue Sep 20 15:59:50 2011
|
||||
+++ etc/Makefile.in Tue Sep 20 15:59:57 2011
|
||||
@@ -10,9 +10,9 @@ INSTALL=@INSTALL@
|
||||
INSTALL_OPTS=@INSTALL_OPTS@
|
||||
|
||||
install: installdirs
|
||||
- find . -mindepth 1 -maxdepth 1 -type f -not -name "*.in" -and -not -name "Makefile" -exec $(INSTALL) -m 644 $(INSTALL_OPTS) {} $(DESTDIR)$(prefix)/etc/{} \;
|
||||
- find lib/ -mindepth 1 -type f -not -name "*.in" -and -not -name "Makefile" -exec $(INSTALL) -m 644 $(INSTALL_OPTS) {} $(DESTDIR)$(prefix)/etc/{} \;
|
||||
- find tests/ -mindepth 1 -type f -not -name "*.in" -and -not -name "Makefile" -exec $(INSTALL) -m 644 $(INSTALL_OPTS) {} $(DESTDIR)$(prefix)/etc/{} \;
|
||||
- find schema/ -mindepth 1 -type f -not -name "*.in" -and -not -name "Makefile" -exec $(INSTALL) -m 644 $(INSTALL_OPTS) {} $(DESTDIR)$(prefix)/etc/{} \;
|
||||
+ find . -mindepth 1 -maxdepth 1 -type f \! -name "*.in" -and \! -name "Makefile" -exec $(INSTALL) -m 644 $(INSTALL_OPTS) {} $(DESTDIR)$(prefix)/etc/{} \;
|
||||
+ find lib/ -mindepth 1 -type f \! -name "*.in" -and \! -name "Makefile" -exec $(INSTALL) -m 644 $(INSTALL_OPTS) {} $(DESTDIR)$(prefix)/etc/{} \;
|
||||
+ find tests/ -mindepth 1 -type f \! -name "*.in" -and \! -name "Makefile" -exec $(INSTALL) -m 644 $(INSTALL_OPTS) {} $(DESTDIR)$(prefix)/etc/{} \;
|
||||
+ find schema/ -mindepth 1 -type f \! -name "*.in" -and \! -name "Makefile" -exec $(INSTALL) -m 644 $(INSTALL_OPTS) {} $(DESTDIR)$(prefix)/etc/{} \;
|
||||
|
||||
installdirs:
|
||||
$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(prefix)/etc
|
||||
@@ -22,4 +22,4 @@ installdirs:
|
||||
$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(prefix)/etc/schema
|
||||
find lib/ -mindepth 1 -type d -exec $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(prefix)/etc/{} \;
|
||||
find tests/ -mindepth 1 -type d -exec $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(prefix)/etc/{} \;
|
||||
- find schema/ -mindepth 1 -type d -exec $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(prefix)/etc/{} \;
|
||||
+
|
||||
|
||||
@ -1,26 +1,10 @@
|
||||
$OpenBSD: patch-etc_apache2_icinga-web_conf_in,v 1.1.1.1 2011/03/28 14:06:06 sthen Exp $
|
||||
--- etc/apache2/icinga-web.conf.in.orig Mon Mar 21 00:22:52 2011
|
||||
+++ etc/apache2/icinga-web.conf.in Mon Mar 21 00:23:22 2011
|
||||
@@ -4,15 +4,18 @@
|
||||
# - Add extjs library to alias
|
||||
#
|
||||
|
||||
-Alias @web_path@/js/ext3 @prefix@/lib/ext3
|
||||
-Alias @web_path@ @prefix@/pub
|
||||
$OpenBSD: patch-etc_apache2_icinga-web_conf_in,v 1.2 2011/12/03 15:01:38 sthen Exp $
|
||||
--- etc/apache2/icinga-web.conf.in.orig Fri Sep 16 09:03:31 2011
|
||||
+++ etc/apache2/icinga-web.conf.in Fri Sep 16 11:59:55 2011
|
||||
@@ -1,3 +1,6 @@
|
||||
+<IfModule !mod_rewrite.c>
|
||||
+LoadModule rewrite_module /usr/lib/apache/modules/mod_rewrite.so
|
||||
+LoadModule rewrite_module /usr/lib/apache/modules/mod_rewrite.so
|
||||
+</IfModule>
|
||||
+Alias @web_path@/js/ext3 @prefix@/icinga-web/lib/ext3
|
||||
+Alias @web_path@ @prefix@/icinga-web/pub
|
||||
|
||||
-<Directory @prefix@/lib/ext3>
|
||||
+<Directory @prefix@/icinga-web/lib/ext3>
|
||||
Order allow,deny
|
||||
Allow from all
|
||||
</Directory>
|
||||
|
||||
-<Directory @prefix@/pub>
|
||||
+<Directory @prefix@/icinga-web/pub>
|
||||
DirectoryIndex index.php
|
||||
Options FollowSymLinks
|
||||
AllowOverride all
|
||||
#
|
||||
# icinga-web apache configuration
|
||||
# - Enable all options .htaccess
|
||||
|
||||
Loading…
Reference in New Issue
Block a user