Update to Icinga 1.9, thanks to rpe@ for feedback and testing the beta.

Also thanks to Michael Friedrich (upstream) for sending out helpful notes
to package maintainers about changes in the release which may affect them,
we like projects who do that :)
This commit is contained in:
sthen 2013-05-07 15:34:47 +00:00
parent f3a0bbd97a
commit 7d0d033b98
17 changed files with 192 additions and 143 deletions

View File

@ -1,6 +1,6 @@
# $OpenBSD: Makefile,v 1.44 2013/03/29 16:39:34 rpe Exp $
# $OpenBSD: Makefile,v 1.45 2013/05/07 15:34:47 sthen Exp $
V = 1.8.4
V = 1.9.0
COMMENT-main = network monitoring system (improved fork of Nagios)
COMMENT-cgi = cgi scripts for Icinga (classic Nagios-style UI)
@ -8,9 +8,7 @@ COMMENT-ido = store Icinga configuration and events in a database
DISTNAME = icinga-$V
PKGNAME-main = icinga-$V
REVISION-main = 1
PKGNAME-cgi = icinga-cgi-$V
REVISION-cgi = 0
PKGNAME-ido = icinga-idoutils-$V
WANTLIB = c crypto m pthread ssl
@ -54,21 +52,21 @@ CONFIGURE_ARGS += \
--with-checkresult-dir=/var/spool/icinga \
--with-htmurl=/icinga \
--with-httpd-conf=${PREFIX-cgi}/conf/modules.sample \
--with-httpd-conf-file=${PREFIX-cgi}/conf/modules.sample/icinga-cgi.conf.dist \
--with-icinga-group=_icinga \
--with-icinga-user=_icinga \
--with-lockfile=/var/run/icinga/icinga.pid \
--with-log-dir=/var/log/icinga \
--with-p1-file-dir=${PREFIX}/bin \
--enable-embedded-perl \
--enable-idoutils \
--enable-ssl
CFLAGS += -fPIC \
-I${LOCALBASE}/include \
-L${X11BASE}/lib -L${LOCALBASE}/lib
INSTALL_TARGET = install-unstripped install-idoutils \
install-config install-webconf
INSTALL_TARGET = install-unstripped install-idoutils install-config \
install-webconf
# perl tests work; C tests require --enable-libtap in configure and
# fixing up WRKSRC/tap/configure
@ -87,9 +85,7 @@ post-install:
${WRKSRC}/module/idoutils/config/updates/* \
${PREFIX}/share/examples/icinga/updates/
cd ${WRKINST}${PREFIX-cgi}; \
mv conf/modules.sample/icinga.conf \
conf/modules.sample/icinga-cgi.conf.dist; \
chown -R ${SHAREOWN}:${SHAREGRP} icinga-cgi conf
chown -R ${SHAREOWN}:${SHAREGRP} icinga-cgi conf
cd ${WRKSRC}/module/idoutils; \
pax -rw db ${PREFIX}/share/examples/icinga/

View File

@ -1,2 +1,2 @@
SHA256 (icinga-1.8.4.tar.gz) = 4ey8bIO7iy1NKZNBgrEB8wXI1FhzsM7+RS3ZE+5bbeE=
SIZE (icinga-1.8.4.tar.gz) = 7459130
SHA256 (icinga-1.9.0.tar.gz) = yY105Pj5SmZrNdEbxVDu/gthesxSySSXy8caS/nEZiI=
SIZE (icinga-1.9.0.tar.gz) = 17075732

View File

@ -1,16 +1,17 @@
$OpenBSD: patch-Changelog,v 1.4 2013/01/14 02:39:15 sthen Exp $
--- Changelog.orig Sun Jan 13 22:18:37 2013
+++ Changelog Mon Jan 14 02:17:52 2013
@@ -7,10 +7,9 @@ Thanks to all contributers, testers and developers. Pl
$OpenBSD: patch-Changelog,v 1.5 2013/05/07 15:34:47 sthen Exp $
--- Changelog.orig Mon May 6 19:47:17 2013
+++ Changelog Tue May 7 16:04:02 2013
@@ -7,11 +7,9 @@ Thanks to all contributers, testers and developers. Pl
UPGRADE NOTES
* for idoutils database upgrades, check the following for upgrade sql scripts
- - module/idoutils/db/<yourrdbms>/upgrade/
- - ${source}/module/idoutils/db/<yourrdbms>/upgrade/
+ - ${TRUEPREFIX}/share/examples/icinga/db/<yourrdbms>/upgrade/
* for configuration file changes, check the following for added/removed config options
- - core, classic ui: sample-config/updates/
- - idoutils: module/idoutils/config/updates
- - core, classic ui: ${source}/sample-config/updates/
- - idoutils: ${source}/module/idoutils/config/updates
-* package locations may differ!
+ - ${TRUEPREFIX}/share/examples/icinga/updates/
1.8.4 - 13/01/2013
1.9.0 - 07/05/2013

View File

@ -1,14 +0,0 @@
$OpenBSD: patch-base_Makefile_in,v 1.2 2012/05/17 11:05:40 sthen Exp $
--- base/Makefile.in.orig Tue May 15 14:00:56 2012
+++ base/Makefile.in Thu May 17 10:20:30 2012
@@ -209,8 +209,8 @@ install-unstripped:
install-basic:
$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LIBDIR)
- $(INSTALL) -m 774 $(INSTALL_OPTS) @icinga_name@ $(DESTDIR)$(BINDIR)
- $(INSTALL) -m 774 $(INSTALL_OPTS) @icingastats_name@ $(DESTDIR)$(BINDIR)
+ $(BSD_INSTALL_PROGRAM) @icinga_name@ $(DESTDIR)$(BINDIR)
+ $(BSD_INSTALL_PROGRAM) @icingastats_name@ $(DESTDIR)$(BINDIR)
strip-post-install:
$(STRIP) $(DESTDIR)$(BINDIR)/@icinga_name@

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.8 2012/11/29 22:34:16 sthen Exp $
--- configure.orig Wed Nov 28 15:14:51 2012
+++ configure Thu Nov 29 22:24:42 2012
@@ -5189,7 +5189,7 @@ cat >>confdefs.h <<_ACEOF
$OpenBSD: patch-configure,v 1.9 2013/05/07 15:34:47 sthen Exp $
--- configure.orig Fri Apr 19 11:15:19 2013
+++ configure Sat Apr 20 16:37:01 2013
@@ -5224,7 +5224,7 @@ cat >>confdefs.h <<_ACEOF
#define DEFAULT_NAGIOS_GROUP "$icinga_grp"
_ACEOF
@ -10,7 +10,7 @@ $OpenBSD: patch-configure,v 1.8 2012/11/29 22:34:16 sthen Exp $
@@ -5210,7 +5210,7 @@ fi
@@ -5245,7 +5245,7 @@ fi
@ -19,7 +19,7 @@ $OpenBSD: patch-configure,v 1.8 2012/11/29 22:34:16 sthen Exp $
@@ -5797,7 +5797,7 @@ $as_echo_n "checking for gdImagePng in -lgd (order 1).
@@ -5846,7 +5846,7 @@ $as_echo_n "checking for gdImagePng in -lgd (order 1).
$as_echo_n "(cached) " >&6
else
ac_save_LIBS="$LIBS"
@ -28,7 +28,7 @@ $OpenBSD: patch-configure,v 1.8 2012/11/29 22:34:16 sthen Exp $
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any gcc2 internal prototype to avoid an error. */
@@ -5828,7 +5828,7 @@ fi
@@ -5877,7 +5877,7 @@ fi
$as_echo "yes" >&6; }
GDLIBFOUND=yep
@ -37,7 +37,7 @@ $OpenBSD: patch-configure,v 1.8 2012/11/29 22:34:16 sthen Exp $
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
@@ -7057,7 +7057,7 @@ $as_echo_n "checking for SSL libraries... " >&6; }
@@ -7122,7 +7122,7 @@ $as_echo_n "checking for SSL libraries... " >&6; }
found_ssl=no
for dir in $ssl_lib_dir $ssl_dir /usr/lib/*-linux-gnu /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"

View File

@ -1,14 +0,0 @@
$OpenBSD: patch-module_idoutils_src_Makefile_in,v 1.3 2012/05/17 11:05:40 sthen Exp $
--- module/idoutils/src/Makefile.in.orig Tue May 15 14:00:56 2012
+++ module/idoutils/src/Makefile.in Thu May 17 10:22:47 2012
@@ -114,7 +114,7 @@ install:
@echo "Resuming with install..."
$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LIBDIR)
- $(INSTALL) -m 774 $(INSTALL_OPTS) ido2db $(DESTDIR)$(BINDIR)
- $(INSTALL) -m 774 $(INSTALL_OPTS) log2ido $(DESTDIR)$(BINDIR)
- $(INSTALL) -m 774 $(INSTALL_OPTS) idomod.so $(DESTDIR)$(LIBDIR)
+ $(BSD_INSTALL_PROGRAM) ido2db $(DESTDIR)$(BINDIR)
+ $(BSD_INSTALL_PROGRAM) log2ido $(DESTDIR)$(BINDIR)
+ $(BSD_INSTALL_PROGRAM) idomod.so $(DESTDIR)$(LIBDIR)

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-sample-config_icinga_cfg_in,v 1.8 2012/11/29 22:34:16 sthen Exp $
--- sample-config/icinga.cfg.in.orig Wed Nov 28 15:14:51 2012
+++ sample-config/icinga.cfg.in Thu Nov 29 22:24:43 2012
@@ -1297,7 +1297,7 @@ enable_embedded_perl=0
$OpenBSD: patch-sample-config_icinga_cfg_in,v 1.9 2013/05/07 15:34:47 sthen Exp $
--- sample-config/icinga.cfg.in.orig Fri Apr 19 11:15:19 2013
+++ sample-config/icinga.cfg.in Sat Apr 20 16:37:01 2013
@@ -1304,7 +1304,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.8 2012/11/29 22:34:16 sthen Exp
@@ -1396,8 +1396,8 @@ use_true_regexp_matching=0
@@ -1403,8 +1403,8 @@ use_true_regexp_matching=0
# using the $ADMINEMAIL$ and $ADMINPAGER$ macros in your notification
# commands.

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-cgi,v 1.9 2012/10/18 20:04:58 sthen Exp $
@comment $OpenBSD: PLIST-cgi,v 1.10 2013/05/07 15:34:47 sthen Exp $
cgi-bin/icinga/
@bin cgi-bin/icinga/avail.cgi
@bin cgi-bin/icinga/cmd.cgi
@ -123,8 +123,6 @@ icinga-cgi/docs/de/quickstart.html
icinga-cgi/docs/de/recurring_downtimes.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/reporting_1.8.html
icinga-cgi/docs/de/security.html
icinga-cgi/docs/de/servicechecks.html
icinga-cgi/docs/de/stalking.html
@ -245,8 +243,6 @@ icinga-cgi/docs/en/quickstart.html
icinga-cgi/docs/en/recurring_downtimes.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/reporting_1.8.html
icinga-cgi/docs/en/security.html
icinga-cgi/docs/en/servicechecks.html
icinga-cgi/docs/en/stalking.html
@ -263,6 +259,55 @@ icinga-cgi/docs/en/volatileservices.html
icinga-cgi/docs/en/whatsnew.html
icinga-cgi/docs/images/
icinga-cgi/docs/images/Architecture_1.5_800px.png
icinga-cgi/docs/images/IcingaWeb_BusinessProcess-150x150.png
icinga-cgi/docs/images/IcingaWeb_BusinessProcess.png
icinga-cgi/docs/images/IcingaWeb_Commands-150x150.png
icinga-cgi/docs/images/IcingaWeb_Commands.png
icinga-cgi/docs/images/IcingaWeb_CronkBuilder-150x150.png
icinga-cgi/docs/images/IcingaWeb_CronkBuilder.png
icinga-cgi/docs/images/IcingaWeb_Cronk_Configuration-150x150.png
icinga-cgi/docs/images/IcingaWeb_Cronk_Configuration.png
icinga-cgi/docs/images/IcingaWeb_Cronk_HostFiltered-150x150.png
icinga-cgi/docs/images/IcingaWeb_Downtimes-150x150.png
icinga-cgi/docs/images/IcingaWeb_Downtimes.png
icinga-cgi/docs/images/IcingaWeb_HostStatus_Events-150x150.png
icinga-cgi/docs/images/IcingaWeb_HostStatus_Events.png
icinga-cgi/docs/images/IcingaWeb_Host_filtered-150x150.png
icinga-cgi/docs/images/IcingaWeb_Host_filtered.png
icinga-cgi/docs/images/IcingaWeb_LogViewer-150x150.png
icinga-cgi/docs/images/IcingaWeb_LogViewer.png
icinga-cgi/docs/images/IcingaWeb_OpenProblems-150x150.png
icinga-cgi/docs/images/IcingaWeb_OpenProblems.png
icinga-cgi/docs/images/IcingaWeb_Portal2-150x150.png
icinga-cgi/docs/images/IcingaWeb_Portal2.png
icinga-cgi/docs/images/IcingaWeb_Reporting-150x150.png
icinga-cgi/docs/images/IcingaWeb_Reporting.png
icinga-cgi/docs/images/IcingaWeb_Search-150x150.png
icinga-cgi/docs/images/IcingaWeb_Search.png
icinga-cgi/docs/images/IcingaWeb_StatusMap-150x150.png
icinga-cgi/docs/images/IcingaWeb_StatusMap.png
icinga-cgi/docs/images/IcingaWeb_TacticalOverview-150x150.png
icinga-cgi/docs/images/IcingaWeb_TacticalOverview.png
icinga-cgi/docs/images/IcingaWeb_UserAdmin-150x150.png
icinga-cgi/docs/images/IcingaWeb_UserAdmin.png
icinga-cgi/docs/images/Icinga_Classic_CGIConfig-150x150.png
icinga-cgi/docs/images/Icinga_Classic_CGIConfig.png
icinga-cgi/docs/images/Icinga_Classic_Commands-150x150.png
icinga-cgi/docs/images/Icinga_Classic_Commands.png
icinga-cgi/docs/images/Icinga_Classic_DatePicker-150x150.png
icinga-cgi/docs/images/Icinga_Classic_DatePicker.png
icinga-cgi/docs/images/Icinga_Classic_Downtimes-150x150.png
icinga-cgi/docs/images/Icinga_Classic_Downtimes.png
icinga-cgi/docs/images/Icinga_Classic_HostGroup-150x150.png
icinga-cgi/docs/images/Icinga_Classic_HostGroup.png
icinga-cgi/docs/images/Icinga_Classic_PaginationLogs-150x150.png
icinga-cgi/docs/images/Icinga_Classic_PaginationLogs.png
icinga-cgi/docs/images/Icinga_Classic_ServiceStatus-150x150.png
icinga-cgi/docs/images/Icinga_Classic_ServiceStatus.png
icinga-cgi/docs/images/Icinga_Classic_TacticalOverview-150x150.png
icinga-cgi/docs/images/Icinga_Classic_TacticalOverview.png
icinga-cgi/docs/images/Icinga_Classic_Trending-150x150.png
icinga-cgi/docs/images/Icinga_Classic_Trending.png
icinga-cgi/docs/images/MyServiceStatus.png
icinga-cgi/docs/images/activechecks.png
icinga-cgi/docs/images/cachedcheckgraphs.png
@ -338,6 +383,7 @@ icinga-cgi/docs/images/icinga-reporting-overview_1.8.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_groups1_1.9.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
@ -345,6 +391,7 @@ 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_users1_1.9.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
@ -355,16 +402,19 @@ 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-cronks-settings_1.9.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-cronks1_1.7.png
icinga-cgi/docs/images/icinga-web-cronks1_1.9.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-cronks2_1.7.png
icinga-cgi/docs/images/icinga-web-cronks2_1.9.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-cronks2a_1.7.png
@ -373,12 +423,20 @@ 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-cronks3_1.7.png
icinga-cgi/docs/images/icinga-web-cronks3_1.9.png
icinga-cgi/docs/images/icinga-web-cronks4_1.9.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-filter1_1.9.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-filter2_1.9.png
icinga-cgi/docs/images/icinga-web-filter3.png
icinga-cgi/docs/images/icinga-web-filter3_1.9.png
icinga-cgi/docs/images/icinga-web-filter4_1.9.png
icinga-cgi/docs/images/icinga-web-filter5_1.9.png
icinga-cgi/docs/images/icinga-web-filter6_1.9.png
icinga-cgi/docs/images/icinga-web-host-obj.png
icinga-cgi/docs/images/icinga-web-host-obj1.png
icinga-cgi/docs/images/icinga-web-host_1.5.png
@ -404,6 +462,7 @@ 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-overview_1.7.png
icinga-cgi/docs/images/icinga-web-overview_1.8.png
icinga-cgi/docs/images/icinga-web-overview_1.9.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
@ -426,6 +485,8 @@ icinga-cgi/docs/images/icinga-web-topmenu1_1.6.png
icinga-cgi/docs/images/icinga-web-topmenu1_1.7.png
icinga-cgi/docs/images/icinga-web-topmenu2.png
icinga-cgi/docs/images/icinga-web-topmenu2_1.3.png
icinga-cgi/docs/images/icinga-web-topmenuadmin1_1.9.png
icinga-cgi/docs/images/icinga-web-user-prefs-logout.png
icinga-cgi/docs/images/idoutils.png
icinga-cgi/docs/images/important.gif
icinga-cgi/docs/images/important.png
@ -600,34 +661,37 @@ icinga-cgi/images/zoom1.gif
icinga-cgi/images/zoom2.gif
icinga-cgi/index.html
icinga-cgi/jquery-ui/
icinga-cgi/jquery-ui/jquery.ui.core.min.js
icinga-cgi/jquery-ui/jquery.ui.datepicker.min.js
icinga-cgi/jquery-ui/jquery.ui.mouse.min.js
icinga-cgi/jquery-ui/jquery.ui.slider.min.js
icinga-cgi/jquery-ui/jquery.ui.timepicker-addon.min.js
icinga-cgi/jquery-ui/jquery.ui.widget.min.js
icinga-cgi/jquery-ui/theme/
icinga-cgi/jquery-ui/theme/images/
icinga-cgi/jquery-ui/theme/images/ui-bg_flat_0_aaaaaa_40x100.png
icinga-cgi/jquery-ui/theme/images/ui-bg_flat_75_ffffff_40x100.png
icinga-cgi/jquery-ui/theme/images/ui-bg_glass_55_fbf9ee_1x400.png
icinga-cgi/jquery-ui/theme/images/ui-bg_glass_65_ffffff_1x400.png
icinga-cgi/jquery-ui/theme/images/ui-bg_glass_75_dadada_1x400.png
icinga-cgi/jquery-ui/theme/images/ui-bg_glass_75_e6e6e6_1x400.png
icinga-cgi/jquery-ui/theme/images/ui-bg_glass_95_fef1ec_1x400.png
icinga-cgi/jquery-ui/theme/images/ui-bg_highlight-soft_75_cccccc_1x100.png
icinga-cgi/jquery-ui/theme/images/ui-icons_222222_256x240.png
icinga-cgi/jquery-ui/theme/images/ui-icons_2e83ff_256x240.png
icinga-cgi/jquery-ui/theme/images/ui-icons_454545_256x240.png
icinga-cgi/jquery-ui/theme/images/ui-icons_888888_256x240.png
icinga-cgi/jquery-ui/theme/images/ui-icons_cd0a0a_256x240.png
icinga-cgi/jquery-ui/theme/jquery.ui.all.css
icinga-cgi/jquery-ui/theme/jquery.ui.base.css
icinga-cgi/jquery-ui/theme/jquery.ui.core.css
icinga-cgi/jquery-ui/theme/jquery.ui.datepicker.css
icinga-cgi/jquery-ui/theme/jquery.ui.slider.css
icinga-cgi/jquery-ui/theme/jquery.ui.theme.css
icinga-cgi/jquery-ui/theme/jquery.ui.timepicker-addon.css
icinga-cgi/jquery-ui-addon/
icinga-cgi/jquery-ui-addon/jquery.ui.timepicker-addon.css
icinga-cgi/jquery-ui-addon/jquery.ui.timepicker-addon.min.js
icinga-cgi/jquery-ui/themes/
icinga-cgi/jquery-ui/themes/base/
icinga-cgi/jquery-ui/themes/base/images/
icinga-cgi/jquery-ui/themes/base/images/ui-bg_flat_0_aaaaaa_40x100.png
icinga-cgi/jquery-ui/themes/base/images/ui-bg_flat_75_ffffff_40x100.png
icinga-cgi/jquery-ui/themes/base/images/ui-bg_glass_55_fbf9ee_1x400.png
icinga-cgi/jquery-ui/themes/base/images/ui-bg_glass_65_ffffff_1x400.png
icinga-cgi/jquery-ui/themes/base/images/ui-bg_glass_75_dadada_1x400.png
icinga-cgi/jquery-ui/themes/base/images/ui-bg_glass_75_e6e6e6_1x400.png
icinga-cgi/jquery-ui/themes/base/images/ui-bg_glass_95_fef1ec_1x400.png
icinga-cgi/jquery-ui/themes/base/images/ui-bg_highlight-soft_75_cccccc_1x100.png
icinga-cgi/jquery-ui/themes/base/images/ui-icons_222222_256x240.png
icinga-cgi/jquery-ui/themes/base/images/ui-icons_2e83ff_256x240.png
icinga-cgi/jquery-ui/themes/base/images/ui-icons_454545_256x240.png
icinga-cgi/jquery-ui/themes/base/images/ui-icons_888888_256x240.png
icinga-cgi/jquery-ui/themes/base/images/ui-icons_cd0a0a_256x240.png
icinga-cgi/jquery-ui/themes/base/jquery.ui.all.css
icinga-cgi/jquery-ui/themes/base/jquery.ui.base.css
icinga-cgi/jquery-ui/themes/base/jquery.ui.core.css
icinga-cgi/jquery-ui/themes/base/jquery.ui.datepicker.css
icinga-cgi/jquery-ui/themes/base/jquery.ui.slider.css
icinga-cgi/jquery-ui/themes/base/jquery.ui.theme.css
icinga-cgi/jquery-ui/ui/
icinga-cgi/jquery-ui/ui/jquery.ui.core.js
icinga-cgi/jquery-ui/ui/jquery.ui.datepicker.js
icinga-cgi/jquery-ui/ui/jquery.ui.mouse.js
icinga-cgi/jquery-ui/ui/jquery.ui.slider.js
icinga-cgi/jquery-ui/ui/jquery.ui.widget.js
icinga-cgi/js/
icinga-cgi/js/checkbox_functions.js
icinga-cgi/js/jquery-1.8.0.min.js

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-ido,v 1.10 2012/10/18 20:04:58 sthen Exp $
@comment $OpenBSD: PLIST-ido,v 1.11 2013/05/07 15:34:47 sthen Exp $
@bin bin/ido2db
@bin bin/log2ido
lib/idomod.so
@ -20,6 +20,7 @@ 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/mysql/upgrade/mysql-upgrade-1.7.0.sql
share/examples/icinga/db/mysql/upgrade/mysql-upgrade-1.8.0.sql
share/examples/icinga/db/mysql/upgrade/mysql-upgrade-1.9.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
@ -38,6 +39,7 @@ 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-upgrade-1.7.0.sql
share/examples/icinga/db/oracle/upgrade/oracle-upgrade-1.8.0.sql
share/examples/icinga/db/oracle/upgrade/oracle-upgrade-1.9.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
@ -54,6 +56,7 @@ 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/pgsql/upgrade/pgsql-upgrade-1.7.0.sql
share/examples/icinga/db/pgsql/upgrade/pgsql-upgrade-1.8.0.sql
share/examples/icinga/db/pgsql/upgrade/pgsql-upgrade-1.9.0.sql
share/examples/icinga/db/queries/
share/examples/icinga/db/queries/comment_history.sql
share/examples/icinga/db/queries/comments.sql
@ -105,4 +108,5 @@ share/examples/icinga/idomod.cfg-sample
share/examples/icinga/modules/idoutils.cfg-sample
@sample ${SYSCONFDIR}/modules/idoutils.cfg
share/examples/icinga/updates/ido2db.cfg_added_1.7_to_1.8.cfg
share/examples/icinga/updates/ido2db.cfg_added_1.8_to_1.9.cfg
@rcscript ${RCDIR}/ido2db

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.12 2013/03/06 18:34:58 zhuk Exp $
@comment $OpenBSD: PLIST-main,v 1.13 2013/05/07 15:34:47 sthen Exp $
@newgroup _icinga:667
@newuser _icinga:667:_icinga:daemon:Icinga user:/var/icinga:/sbin/nologin
@comment done this way (rather than SYSCONFDIR/*) for safety...
@ -54,6 +54,7 @@ share/examples/icinga/resource.cfg
@sample ${SYSCONFDIR}/resource.cfg
share/examples/icinga/updates/
share/examples/icinga/updates/cgi.cfg_added_1.7_to_1.8.cfg
share/examples/icinga/updates/cgi.cfg_added_1.8_to_1.9.cfg
share/examples/icinga/updates/cgi.cfg_removed_1.7_to_1.8.cfg
share/examples/icinga/updates/icinga.cfg_added_1.7_to_1.8.cfg
@mode 755

View File

@ -1,4 +1,4 @@
$OpenBSD: README-main,v 1.12 2013/03/29 16:39:34 rpe Exp $
$OpenBSD: README-main,v 1.13 2013/05/07 15:34:47 sthen Exp $
+-----------------------------------------------------------------------
| Running ${FULLPKGNAME} on OpenBSD
@ -106,8 +106,8 @@ Two web-based user interfaces are available for Icinga:
$ sudo /etc/rc.d/ido2db start
2.3) Enable the broker_module idomod.so in /etc/icinga/icinga.cfg
and restart icinga:
2.3) Enable the "broker_module=${TRUEPREFIX}/lib/idomod.so ..." line in
${SYSCONFDIR}/icinga.cfg and restart icinga:
$ sudo /etc/rc.d/icinga restart

View File

@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.17 2013/03/28 12:43:14 sthen Exp $
# $OpenBSD: Makefile,v 1.18 2013/05/07 15:34:47 sthen Exp $
COMMENT = web UI for icinga
DISTNAME = icinga-web-1.8.3
DISTNAME = icinga-web-1.9.0
MODULES= lang/php

View File

@ -1,2 +1,2 @@
SHA256 (icinga-web-1.8.3.tar.gz) = JK7taV5FXly7eTFTg6oq0XiZ+j0hwUqhfNs1pIobGxs=
SIZE (icinga-web-1.8.3.tar.gz) = 14614191
SHA256 (icinga-web-1.9.0.tar.gz) = tVKIu45dNgy0FYJ1MzRzmg6kftoUU6c/89W0yEsy8GI=
SIZE (icinga-web-1.9.0.tar.gz) = 14642077

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_in,v 1.4 2012/10/18 20:04:58 sthen Exp $
--- Makefile.in.orig Thu Oct 18 10:43:14 2012
+++ Makefile.in Thu Oct 18 13:34:42 2012
@@ -287,7 +287,7 @@ db-purge-userprefs:
$OpenBSD: patch-Makefile_in,v 1.5 2013/05/07 15:34:47 sthen Exp $
--- Makefile.in.orig Mon Apr 29 18:54:16 2013
+++ Makefile.in Fri May 3 13:31:02 2013
@@ -288,7 +288,7 @@ db-purge-userprefs:
$(PHING_CALL) db-purge-userprefs
make-create-files:

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.4 2012/10/18 20:04:58 sthen Exp $
--- configure.orig Thu Oct 18 13:53:51 2012
+++ configure Thu Oct 18 13:53:32 2012
@@ -2214,6 +2214,7 @@ fi
$OpenBSD: patch-configure,v 1.5 2013/05/07 15:34:47 sthen Exp $
--- configure.orig Mon Apr 29 18:54:16 2013
+++ configure Fri May 3 13:31:02 2013
@@ -2232,6 +2232,7 @@ fi
# Checks for library functions.
@ -9,7 +9,7 @@ $OpenBSD: patch-configure,v 1.4 2012/10/18 20:04:58 sthen Exp $
for x in sockets xsl xml json;do
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if php has $x module" >&5
$as_echo_n "checking if php has $x module... " >&6; }
@@ -2224,6 +2225,7 @@ else
@@ -2242,6 +2243,7 @@ else
as_fn_error $? "not found" "$LINENO" 5
fi
done

View File

@ -1,18 +1,18 @@
$OpenBSD: patch-etc_apache2_icinga-web_conf_in,v 1.3 2012/05/17 11:06:33 sthen Exp $
--- etc/apache2/icinga-web.conf.in.orig Tue Dec 20 07:22:32 2011
+++ etc/apache2/icinga-web.conf.in Wed Feb 8 16:17:25 2012
@@ -1,10 +1,13 @@
$OpenBSD: patch-etc_apache2_icinga-web_conf_in,v 1.4 2013/05/07 15:34:47 sthen Exp $
--- etc/apache2/icinga-web.conf.in.orig Mon Apr 29 18:54:16 2013
+++ etc/apache2/icinga-web.conf.in Fri May 3 13:38:52 2013
@@ -10,9 +10,13 @@
# Markus Frosch <markus@lazyfrosch.de>
###
+<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>
#
# icinga-web apache configuration
# - Enable all options .htaccess
# - Add extjs library to alias
#
AliasMatch @web_path@/modules/([A-Za-z0-9]*)/resources/styles/([A-Za-z0-9]*\.css)$ @prefix@/app/modules/$1/pub/styles/$2
-AliasMatch @web_path@/modules/([A-Za-z0-9]*)/resources/images/([A-Za-z_\-0-9]*\.(png|gif|jpg))$ @prefix@/app/modules/$1/pub/images/$2
+AliasMatch @web_path@/modules/([A-Za-z0-9]*)/resources/images/([-_A-Za-z0-9]*\.(png|gif|jpg))$ @prefix@/app/modules/$1/pub/images/$2
+
# Matching for module stylesheet and images
AliasMatch "^@web_path@/modules/([A-Za-z0-9]+)/resources/styles/([A-Za-z0-9]+\.css)$" "@prefix@/app/modules/$1/pub/styles/$2"
-AliasMatch "^@web_path@/modules/([A-Za-z0-9]+)/resources/images/([A-Za-z_\-0-9]+\.(?:png|gif|jpg))$" "@prefix@/app/modules/$1/pub/images/$2"
+AliasMatch "^@web_path@/modules/([A-Za-z0-9]+)/resources/images/([-_A-Za-z0-9]+\.(png|gif|jpg))$" "@prefix@/app/modules/$1/pub/images/$2"
Alias @web_path@/js/ext3 @prefix@/lib/ext3
# Matching for Icinga Web and the ext3 framework
Alias @web_path@/js/ext3/ @prefix@/lib/ext3/

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.12 2013/03/28 12:43:14 sthen Exp $
@comment $OpenBSD: PLIST,v 1.13 2013/05/07 15:34:47 sthen Exp $
@conflict icinga-api-*
@pkgpath net/icinga/core,-api
app/
@ -120,8 +120,6 @@ app/modules/Api/actions/ApiSearchAction.class.php
app/modules/Api/actions/IcingaInstanceControllerAction.class.php
app/modules/Api/actions/RelationProviderAction.class.php
app/modules/Api/actions/SLAProviderAction.class.php
app/modules/Api/actions/Test/
app/modules/Api/actions/Test/RequestTestAction.class.php
app/modules/Api/config/
app/modules/Api/config/access.xml
app/modules/Api/config/action_filters.xml
@ -147,6 +145,7 @@ app/modules/Api/config/views/host.xml
app/modules/Api/config/views/hostgroups.xml
app/modules/Api/config/views/misc.xml
app/modules/Api/config/views/notifications.xml
app/modules/Api/config/views/overview.xml
app/modules/Api/config/views/service.xml
app/modules/Api/config/views/servicegroups.xml
app/modules/Api/lib/
@ -176,6 +175,7 @@ app/modules/Api/lib/database/IcingaDoctrineDatabase.class.php
app/modules/Api/lib/database/IcingaDoctrineTable.class.php
app/modules/Api/lib/database/IcingaDoctrine_Query.class.php
app/modules/Api/lib/database/filter/
app/modules/Api/lib/database/filter/IcingaDQLViewFilter.class.php
app/modules/Api/lib/database/filter/IcingaDoctrineFilterMap.class.php
app/modules/Api/lib/database/filter/IcingaDoctrineQueryFilterChain.class.php
app/modules/Api/lib/database/filter/IcingaIDoctrineQueryFilter.interface.php
@ -370,6 +370,7 @@ app/modules/Api/lib/datastore/AbstractDataStoreModel.class.php
app/modules/Api/lib/datastore/DataStoreFilterModifier.class.php
app/modules/Api/lib/datastore/IcingaApiDataStoreModel.class.php
app/modules/Api/lib/datastore/IcingaStoreTargetModifierModel.class.php
app/modules/Api/lib/datastore/StoreFilterField.class.php
app/modules/Api/lib/datastore/filter/
app/modules/Api/lib/datastore/filter/ApiStoreFilter.class.php
app/modules/Api/lib/datastore/filter/ApiStoreFilterGroup.class.php
@ -428,8 +429,6 @@ app/modules/Api/models/Console/ConsoleCommandModel.class.php
app/modules/Api/models/Console/ConsoleInterfaceModel.class.php
app/modules/Api/models/DBALMetaManagerModel.class.php
app/modules/Api/models/DeprecatedApiContainerModel.class.php
app/modules/Api/models/Filter/
app/modules/Api/models/Filter/UserObjectIdModel.class.php
app/modules/Api/models/IcingaControlTaskModel.class.php
app/modules/Api/models/LegacyApiContainerModel.class.php
app/modules/Api/models/Relation/
@ -442,7 +441,6 @@ app/modules/Api/models/SLA/SLAFilterModel.class.php
app/modules/Api/models/SLA/SLAQueryBuilderModel.class.php
app/modules/Api/models/Store/
app/modules/Api/models/Store/DataStoreResultModel.class.php
app/modules/Api/models/Store/HostStoreModel.class.php
app/modules/Api/models/Store/LegacyLayer/
app/modules/Api/models/Store/LegacyLayer/IcingaApiModel.class.php
app/modules/Api/models/Store/LegacyLayer/LegacyApiResultModel.class.php
@ -456,8 +454,7 @@ app/modules/Api/models/Views/
app/modules/Api/models/Views/ApiDQLViewModel.class.php
app/modules/Api/models/Views/Extender/
app/modules/Api/models/Views/Extender/CustomVariableExtenderModel.class.php
app/modules/Api/models/Views/Extender/NotificationCustomVariableExtenderModel.class.php
app/modules/Api/models/Views/Extender/UserObjectIdExtenderModel.class.php
app/modules/Api/models/Views/Extender/MultiLikeExtenderModel.class.php
app/modules/Api/models/Views/Merger/
app/modules/Api/models/Views/Merger/ForeignKeyMergerModel.class.php
app/modules/Api/templates/
@ -471,8 +468,6 @@ app/modules/Api/validate/ApiSearch.xml
app/modules/Api/validate/IcingaInstanceController.xml
app/modules/Api/validate/RelationProvider.xml
app/modules/Api/validate/SLAProvider.xml
app/modules/Api/validate/Test/
app/modules/Api/validate/Test/RequestTest.xml
app/modules/Api/validate/test.php
app/modules/Api/views/
app/modules/Api/views/ApiCommandErrorView.class.php
@ -486,8 +481,6 @@ app/modules/Api/views/GenericErrorView.class.php
app/modules/Api/views/IcingaInstanceControllerSuccessView.class.php
app/modules/Api/views/RelationProviderSuccessView.class.php
app/modules/Api/views/SLAProviderSuccessView.class.php
app/modules/Api/views/Test/
app/modules/Api/views/Test/RequestTestSuccessView.class.php
app/modules/AppKit/
app/modules/AppKit/actions/
app/modules/AppKit/actions/Admin/
@ -648,6 +641,9 @@ app/modules/AppKit/lib/js/admin/components/RoleInheritanceView.js
app/modules/AppKit/lib/js/admin/components/RoleListingGrid.js
app/modules/AppKit/lib/js/admin/components/UserListingGrid.js
app/modules/AppKit/lib/js/admin/components/UserSelectionGrid.js
app/modules/AppKit/lib/js/compatibility/
app/modules/AppKit/lib/js/compatibility/Object.js
app/modules/AppKit/lib/js/compatibility/README
app/modules/AppKit/lib/js/form/
app/modules/AppKit/lib/js/form/action/
app/modules/AppKit/lib/js/form/action/JSONSubmit.js
@ -738,8 +734,6 @@ app/modules/AppKit/models/Auth/Provider/DatabaseModel.class.php
app/modules/AppKit/models/Auth/Provider/HTTPBasicAuthenticationModel.class.php
app/modules/AppKit/models/Auth/Provider/LDAPModel.class.php
app/modules/AppKit/models/BulkLoaderModel.class.php
app/modules/AppKit/models/Credential/
app/modules/AppKit/models/Credential/AggregatorModel.class.php
app/modules/AppKit/models/Ext/
app/modules/AppKit/models/Ext/ApplicationStateModel.class.php
app/modules/AppKit/models/HeaderDataModel.class.php
@ -1113,6 +1107,14 @@ app/modules/Cronks/lib/js/Icinga/Cronks/util/CategoryEditorForm.js
app/modules/Cronks/lib/js/Icinga/Cronks/util/CategoryPermissionWindow.js
app/modules/Cronks/lib/js/Icinga/Cronks/util/CronkPermissionWindow.js
app/modules/Cronks/lib/js/Icinga/Cronks/util/CronkUrlWindow.js
app/modules/Cronks/lib/js/Icinga/Cronks/util/FilterEditor.js
app/modules/Cronks/lib/js/Icinga/Cronks/util/FilterEditorWindow.js
app/modules/Cronks/lib/js/Icinga/Cronks/util/FilterState.js
app/modules/Cronks/lib/js/Icinga/Cronks/util/FilterTypes/
app/modules/Cronks/lib/js/Icinga/Cronks/util/FilterTypes/Api.js
app/modules/Cronks/lib/js/Icinga/Cronks/util/FilterTypes/Base.js
app/modules/Cronks/lib/js/Icinga/Cronks/util/FilterTypes/FieldProvider.js
app/modules/Cronks/lib/js/Icinga/Cronks/util/FilterTypes/Status.js
app/modules/Cronks/lib/js/rmd160.js
app/modules/Cronks/lib/js/search/
app/modules/Cronks/lib/js/search/SearchHandler.js
@ -1504,6 +1506,7 @@ doc/AUTHORS
doc/CHANGELOG-1.6
doc/CHANGELOG-1.7
doc/CHANGELOG-1.8
doc/CHANGELOG-1.9
doc/CHANGELOG-1.x
doc/GPL
doc/INSTALL
@ -1550,9 +1553,15 @@ etc/conf.d/sla.xml.dist
@sample etc/conf.d/sla.xml
etc/conf.d/translation.xml.dist
@sample etc/conf.d/translation.xml
etc/conf.d/userpreferences.xml.dist
@sample etc/conf.d/userpreferences.xml
etc/icinga-web.conf
@sample /var/www/conf/modules.sample/icinga-web.conf
etc/lib/
etc/lib/CronkDropLayoutTask.php
etc/lib/CronkStruct.php
etc/lib/CronkUpgradeAbstract.php
etc/lib/CronkUpgradeFilterTask.php
etc/lib/agaviClearCache.php
etc/lib/agaviConsoleTask.php
etc/lib/agaviDBExtractorTask.php
@ -1582,6 +1591,7 @@ etc/schema/updates/mysql/mysql_v1-7-1_to_v1-7-2.sql
etc/schema/updates/mysql/mysql_v1-7-2_to_v1-8-0.sql
etc/schema/updates/mysql/mysql_v1-8-0_to_v-1-8-1.sql
etc/schema/updates/mysql/mysql_v1-8-1_to_v1-8-3.sql
etc/schema/updates/mysql/mysql_v1-8-3_to_v1-9.sql
etc/schema/updates/oracle/
etc/schema/updates/oracle/oracle_v1-0-3_to_v1-2.sql
etc/schema/updates/oracle/oracle_v1-2_to_1-3.sql
@ -1594,6 +1604,7 @@ etc/schema/updates/oracle/oracle_v1-7-0_to_v1-7-1.sql
etc/schema/updates/oracle/oracle_v1-7-1_to_v1-7-2.sql
etc/schema/updates/oracle/oracle_v1-7-2_to_v1-8-0.sql
etc/schema/updates/oracle/oracle_v1-8-0_to_v1-8-3.sql
etc/schema/updates/oracle/oracle_v1-8-3_to_v1-9.sql
etc/schema/updates/pgsql/
etc/schema/updates/pgsql/pgsql_v1-0-3_to_v1-2.sql
etc/schema/updates/pgsql/pgsql_v1-2_to_v1-3.sql
@ -1607,6 +1618,7 @@ etc/schema/updates/pgsql/pgsql_v1-7-1_to_v1-7-2.sql
etc/schema/updates/pgsql/pgsql_v1-7-2_to_v1-8-0.sql
etc/schema/updates/pgsql/pgsql_v1-8-0_to_v-1-8-1.sql
etc/schema/updates/pgsql/pgsql_v1-8-1_to_v1-8-3.sql
etc/schema/updates/pgsql/pgsql_v1-8-3_to_v1-9.sql
lib/
lib/agavi/
lib/agavi/src/
@ -4869,6 +4881,7 @@ pub/images/ext3-ux/tab-scroller-menu.gif
pub/images/icinga/
pub/images/icinga/bug_big.png
pub/images/icinga/bugreport.png
pub/images/icinga/docs.png
pub/images/icinga/favicon.ico
pub/images/icinga/icinga-logo-big.png
pub/images/icinga/icinga-logo-small.png
@ -7936,8 +7949,6 @@ pub/images/icons/zone.png
pub/images/icons/zones-stack.png
pub/images/icons/zones.png
pub/index.php
pub/soap/
pub/soap/.htaccess
pub/styles/
pub/styles/exception.css
pub/styles/icinga-cronk-icons.css