don't hardcode path to mod_rewrite.so so that the default config

works with openbsd-httd-openbsd again.

ok sthen@ rpe@
This commit is contained in:
jasper 2014-08-10 11:12:26 +00:00
parent a798a9cdd9
commit 4c746b924a
2 changed files with 7 additions and 6 deletions

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.26 2014/05/30 13:20:13 sthen Exp $
# $OpenBSD: Makefile,v 1.27 2014/08/10 11:12:26 jasper Exp $
COMMENT = web UI for icinga
V = 1.11.0
REVISION = 0
REVISION = 1
DISTNAME = icinga-web-$V
MASTER_SITES = https://github.com/Icinga/icinga-web/releases/download/v$V/
@ -58,6 +58,7 @@ pre-configure:
post-configure:
find ${WRKSRC}/bin -name '*.sh' -print0 | xargs -0r \
perl -pi -e 's,^#!/bin/bash,#!${LOCALBASE}/bin/bash,g'
${SUBST_CMD} ${WRKSRC}/etc/apache2/icinga-web.conf.in
pre-install:
${INSTALL_DATA_DIR} ${WRKINST}${VARBASE}/www/conf/modules.sample

View File

@ -1,12 +1,12 @@
$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
$OpenBSD: patch-etc_apache2_icinga-web_conf_in,v 1.5 2014/08/10 11:12:26 jasper Exp $
--- etc/apache2/icinga-web.conf.in.orig Thu Mar 13 12:24:09 2014
+++ etc/apache2/icinga-web.conf.in Thu Aug 7 20:25:17 2014
@@ -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 ${LOCALBASE}/lib/apache/modules/mod_rewrite.so
+</IfModule>
+
# Matching for module stylesheet and images