allows chroot()ed web interfaces to find the command socket.
- patch constants.conf to use /var/www/var/run/icinga2 as default RunDir - modify startup script to create above RunDir and symlink into /var/run/icinga2
This commit is contained in:
parent
7695bdeaf4
commit
76fa493e77
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.40 2015/11/14 22:56:24 sthen Exp $
|
||||
# $OpenBSD: Makefile,v 1.41 2015/11/16 12:19:12 sthen Exp $
|
||||
|
||||
BROKEN-hppa = needs 64-bit atomic ops; __sync_add_and_fetch_4
|
||||
SHARED_ONLY = Yes
|
||||
@ -9,7 +9,7 @@ COMMENT-pgsql = PostgreSQL support for icinga2
|
||||
|
||||
V = 2.3.11
|
||||
REVISION = 1
|
||||
REVISION-main = 4
|
||||
REVISION-main = 5
|
||||
EPOCH = 0
|
||||
GH_ACCOUNT = Icinga
|
||||
GH_PROJECT = icinga2
|
||||
|
@ -0,0 +1,10 @@
|
||||
$OpenBSD: patch-etc_icinga2_constants_conf_cmake,v 1.1 2015/11/16 12:19:12 sthen Exp $
|
||||
--- etc/icinga2/constants.conf.cmake.orig Mon Nov 16 11:46:58 2015
|
||||
+++ etc/icinga2/constants.conf.cmake Mon Nov 16 11:49:15 2015
|
||||
@@ -26,3 +26,6 @@ const ZoneName = NodeName
|
||||
|
||||
/* Secret key for remote node tickets */
|
||||
const TicketSalt = ""
|
||||
+
|
||||
+/* Location for PID file and UNIX sockets for LiveStatus and the command listener */
|
||||
+const RunDir = "/var/www/var/run"
|
@ -1,6 +1,6 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# $OpenBSD: icinga2.rc,v 1.7 2015/10/20 20:59:40 sthen Exp $
|
||||
# $OpenBSD: icinga2.rc,v 1.8 2015/11/16 12:19:12 sthen Exp $
|
||||
|
||||
daemon="${TRUEPREFIX}/sbin/icinga2 daemon -d"
|
||||
daemon_user="_icinga"
|
||||
@ -10,7 +10,8 @@ daemon_user="_icinga"
|
||||
pexp="${daemon}${daemon_flags:+ ${daemon_flags}}.*"
|
||||
|
||||
rc_pre() {
|
||||
install -d -o ${daemon_user} /var/run/icinga2{,/cmd}
|
||||
install -d -o ${daemon_user} /var/www/var/run/icinga2{,/cmd}
|
||||
ln -s /var/www/var/run/icinga2 /var/run/icinga2
|
||||
}
|
||||
|
||||
rc_cmd $1
|
||||
|
Loading…
Reference in New Issue
Block a user