Better webacula.conf.

This commit is contained in:
ajacoutot 2011-03-23 07:41:45 +00:00
parent 57e449997b
commit 3235186d3f
5 changed files with 94 additions and 29 deletions

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.3 2011/03/22 15:43:53 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.4 2011/03/23 07:41:45 ajacoutot Exp $
COMMENT= bacula(8) web interface
DISTNAME= webacula-5.0.3
REVISION= 1
REVISION= 2
CATEGORIES= www sysutils
@ -34,15 +34,14 @@ SUBST_VARS= INSTDIR TINSTDIR
do-install:
mv ${WRKSRC} ${INSTDIR}
${SUBST_CMD} ${INSTDIR}/application/config.ini
${SUBST_CMD} ${INSTDIR}/application/config.ini \
${INSTDIR}/install/webacula.conf
.for i in install/webacula_mysql_create_database.sh \
install/webacula_postgresql_create_database.sh \
install/webacula_postgresql_make_tables.sh \
application/config.ini
mv ${INSTDIR}/$i ${INSTDIR}/$i.dist
.endfor
${SUBST_CMD} -c ${FILESDIR}/webacula.conf \
${INSTDIR}/webacula.conf.dist
${SUBST_CMD} -c ${FILESDIR}/webacula-chroot-bconsole.sh \
${INSTDIR}/webacula-chroot-bconsole
find ${INSTDIR} -type f -name \*.orig -or -name \*.gitignore \

View File

@ -1,19 +0,0 @@
Alias /webacula ${TINSTDIR}/html
<IfModule mod_php5.c>
php_value max_execution_time 3600
</IfModule>
<Directory "${TINSTDIR}/html">
RewriteEngine on
Options FollowSymLinks
AllowOverride All
Order deny,allow
# allow authenticated users access from LAN and localhost
Allow from 127.0.0.1
Allow from 192.168.255.0/255.255.255.0
AuthType Basic
AuthName "Webacula"
AuthUserFile /var/www/conf/webacula.users
Require valid-user
</Directory>

View File

@ -0,0 +1,86 @@
$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 @@
# Allows only localhost by default
#
-LoadModule rewrite_module modules/mod_rewrite.so
+LoadModule rewrite_module /usr/lib/apache/modules/mod_rewrite.so
+<IfModule mod_php5.c>
+ php_value max_execution_time 3600
+</IfModule>
+
# AccessFileName .htaccess
-# RewriteLog "/var/log/httpd/rewrite.log"
+# RewriteLog "/var/www/log/rewrite.log"
# RewriteLogLevel 3
# SetEnv APPLICATION_ENV development
SetEnv APPLICATION_ENV production
-Alias /webacula /usr/share/webacula/html
-<Directory /usr/share/webacula/html>
+Alias /webacula ${TINSTDIR}/html
+
+<Directory ${TINSTDIR}/html>
RewriteEngine On
RewriteBase /webacula
@@ -40,42 +45,42 @@ Alias /webacula /usr/share/webacula/html
# AuthType Basic
# AuthName "Webacula"
-# AuthUserFile /etc/httpd/conf/webacula.users
+# AuthUserFile /var/www/conf/webacula.users
# Require valid-user
</Directory>
-<Directory /usr/share/webacula/docs>
+<Directory ${TINSTDIR}/docs>
Order deny,allow
Deny from all
</Directory>
-<Directory /usr/share/webacula/application>
+<Directory ${TINSTDIR}/application>
Order deny,allow
Deny from all
</Directory>
-<Directory /usr/share/webacula/languages>
+<Directory ${TINSTDIR}/languages>
Order deny,allow
Deny from all
</Directory>
-<Directory /usr/share/webacula/library>
+<Directory ${TINSTDIR}/library>
Order deny,allow
Deny from all
</Directory>
-<Directory /usr/share/webacula/install>
+<Directory ${TINSTDIR}/install>
Order deny,allow
Deny from all
</Directory>
-<Directory /usr/share/webacula/tests>
+<Directory ${TINSTDIR}/tests>
Order deny,allow
Deny from all
</Directory>
-<Directory /usr/share/webacula/html/test_mod_rewrite>
+<Directory ${TINSTDIR}/html/test_mod_rewrite>
RewriteEngine On
# for test mod_rewrite
RewriteBase /webacula/test_mod_rewrite
@@ -93,4 +98,3 @@ Alias /webacula /usr/share/webacula/html
Allow from localhost
Allow from ::1
</Directory>
-

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2011/03/21 18:01:09 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.2 2011/03/23 07:41:46 ajacoutot Exp $
webacula/
webacula/4CONTRIBUTORS
webacula/4CONTRIBUTORS.ru
@ -254,6 +254,7 @@ webacula/install/
webacula/install/.htaccess
webacula/install/check_system_requirements.php
webacula/install/webacula.conf
@sample /var/www/conf/modules.sample/webacula.conf
webacula/install/webacula_clean_tmp_files.sh
webacula/install/webacula_mysql_create_database.sh.dist
@mode 0755
@ -316,7 +317,5 @@ webacula/update/webacula_sqlite_update_3.x_to_3.4.sh
@mode 0555
webacula/webacula-chroot-bconsole
@mode
webacula/webacula.conf.dist
@sample /var/www/conf/modules.sample/webacula.conf
@cwd ${LOCALBASE}/share/doc/pkg-readmes
${FULLPKGNAME}

View File

@ -1,4 +1,4 @@
$OpenBSD: README,v 1.1.1.1 2011/03/21 18:01:09 ajacoutot Exp $
$OpenBSD: README,v 1.2 2011/03/23 07:41:46 ajacoutot Exp $
Running webacula under OpenBSD
==============================
@ -91,7 +91,7 @@ After restarting your webserver, you can access webacula at:
http://<hostname>/webacula/
*** WARNING!
By default *anyone* can access the webacula interface.
By default *anyone* can access the webacula interface from localhost.
A sample commented configuration for http basic authentication is
available in /var/www/conf/modules.sample/webacula.conf and you are
STRONGLY ADVISED to enable and edit it to your needs.