From: Marcin Haba <marcin.haba@bacula.pl>
Date: Wed, 12 Aug 2015 21:59:42 +0000 (+0200)
Subject: baculum: Fix deb metafiles symbolic link and Lighttpd auth file backend
X-Git-Tag: Release-7.2.0~5
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=5c63846fcf25fc50f866c9b4cd58697c137ebb2c;p=bacula%2Fbacula

baculum: Fix deb metafiles symbolic link and Lighttpd auth file backend
---

diff --git a/gui/baculum/debian/dirs b/gui/baculum/debian/dirs
index 27beed8d57..7b407e78ee 100644
--- a/gui/baculum/debian/dirs
+++ b/gui/baculum/debian/dirs
@@ -1,4 +1,5 @@
 etc/baculum
 usr/share/baculum/htdocs
+usr/share/baculum/htdocs/protected
 var/cache/baculum
 var/log/baculum
\ No newline at end of file
diff --git a/gui/baculum/debian/install b/gui/baculum/debian/install
index 035b76bd96..f9fa9983b3 100644
--- a/gui/baculum/debian/install
+++ b/gui/baculum/debian/install
@@ -1,8 +1,16 @@
-.htaccess  /usr/share/baculum/htdocs/
-AUTHORS    /usr/share/baculum/htdocs/
-framework  /usr/share/baculum/htdocs/
-index.php  /usr/share/baculum/htdocs/
-protected  /usr/share/baculum/htdocs/
-themes     /usr/share/baculum/htdocs/
-examples/deb/baculum.users /etc/baculum/
+.htaccess                          /usr/share/baculum/htdocs/
+AUTHORS                            /usr/share/baculum/htdocs/
+framework                          /usr/share/baculum/htdocs/
+index.php                          /usr/share/baculum/htdocs/
+protected/application.xml          /usr/share/baculum/htdocs/protected/
+protected/Class                    /usr/share/baculum/htdocs/protected/
+protected/Data                     /usr/share/baculum/htdocs/protected/
+protected/.htaccess                /usr/share/baculum/htdocs/protected/
+protected/JavaScript               /usr/share/baculum/htdocs/protected/
+protected/Lang                     /usr/share/baculum/htdocs/protected/
+protected/Layouts                  /usr/share/baculum/htdocs/protected/
+protected/Pages                    /usr/share/baculum/htdocs/protected/
+protected/Portlets                 /usr/share/baculum/htdocs/protected/
+themes                             /usr/share/baculum/htdocs/
+examples/deb/baculum.users         /etc/baculum/
 examples/deb/baculum.lighttpd.conf /etc/baculum/
diff --git a/gui/baculum/debian/rules b/gui/baculum/debian/rules
index 9435d56ab7..251d2cff32 100755
--- a/gui/baculum/debian/rules
+++ b/gui/baculum/debian/rules
@@ -13,3 +13,5 @@ PACKAGE_NAME = baculum
 
 %:
 	dh $@ 
+override_dh_auto_build:
+	true
diff --git a/gui/baculum/examples/deb/baculum.lighttpd.conf b/gui/baculum/examples/deb/baculum.lighttpd.conf
index ef4e5501f6..f0e6f980d7 100644
--- a/gui/baculum/examples/deb/baculum.lighttpd.conf
+++ b/gui/baculum/examples/deb/baculum.lighttpd.conf
@@ -18,9 +18,8 @@ server.modules = (
         "mod_fastcgi",
         "mod_accesslog"
 )
-
-auth.backend          = "plain" 
-auth.backend.plain.userfile = "/usr/share/baculum/htdocs/protected/Data/baculum.users"
+auth.backend          = "htpasswd"
+auth.backend.htpasswd.userfile = "/usr/share/baculum/htdocs/protected/Data/baculum.users"
 auth.require = ( "/" => (
         "method" => "basic",
         "realm" => "Baculum Auth",