cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not try to load rewrite_module if it's already loaded.

Browse Source 
Tighten zendframework dependency.
This commit is contained in:
ajacoutot 2011-03-28 13:38:38 +00:00
parent d3923a817c
commit aecc5f034e
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
www/webacula/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.6 2011/03/28 13:24:51 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.7 2011/03/28 13:38:38 ajacoutot Exp $
COMMENT= bacula(8) web interface
DISTNAME= webacula-5.0.3
REVISION= 4
REVISION= 5
CATEGORIES= www sysutils
@ -20,7 +20,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=webacula/}
RUN_DEPENDS= www/php5/extensions,-gd \
php5-pdo_pgsql-*|php5-pdo_mysql-*|php5-pdo_sqlite-*:www/php5/extensions,-pdo_pgsql \
www/zendframework \
www/zendframework>=1.10.8p1 \
sysutils/bacula,pgsql,-server
NO_BUILD= Yes

16
www/webacula/patches/patch-install_webacula_conf
View File

@ -1,12 +1,14 @@
$OpenBSD: patch-install_webacula_conf,v 1.1 2011/03/23 07:41:45 ajacoutot Exp $
--- install/webacula.conf.orig Wed Mar 23 08:31:24 2011
+++ install/webacula.conf Wed Mar 23 08:33:10 2011
@@ -3,17 +3,22 @@
$OpenBSD: patch-install_webacula_conf,v 1.2 2011/03/28 13:38:38 ajacoutot Exp $
--- install/webacula.conf.orig Mon Jan 24 11:58:16 2011
+++ install/webacula.conf Mon Mar 28 15:35:25 2011
@@ -3,17 +3,24 @@
# Allows only localhost by default
#
-LoadModule rewrite_module modules/mod_rewrite.so
+LoadModule rewrite_module /usr/lib/apache/modules/mod_rewrite.so
+<IfModule !mod_rewrite.c>
+ LoadModule rewrite_module /usr/lib/apache/modules/mod_rewrite.so
+</IfModule>
+<IfModule mod_php5.c>
+ php_value max_execution_time 3600
@ -28,7 +30,7 @@ $OpenBSD: patch-install_webacula_conf,v 1.1 2011/03/23 07:41:45 ajacoutot Exp $
RewriteEngine On
RewriteBase /webacula
@@ -40,42 +45,42 @@ Alias /webacula /usr/share/webacula/html
@@ -40,42 +47,42 @@ Alias /webacula /usr/share/webacula/html
# AuthType Basic
# AuthName "Webacula"
@ -79,7 +81,7 @@ $OpenBSD: patch-install_webacula_conf,v 1.1 2011/03/23 07:41:45 ajacoutot Exp $
RewriteEngine On
# for test mod_rewrite
RewriteBase /webacula/test_mod_rewrite
@@ -93,4 +98,3 @@ Alias /webacula /usr/share/webacula/html
@@ -93,4 +100,3 @@ Alias /webacula /usr/share/webacula/html
Allow from localhost
Allow from ::1
</Directory>