From 568b086da4e275231600c979a8ba313156d9bdfa Mon Sep 17 00:00:00 2001
From: Eric Bollengier <eric@eb.homelinux.org>
Date: Sun, 31 Dec 2006 09:26:38 +0000
Subject: [PATCH] ebl  move /etc/bweb/config to /etc/bacula/bweb.conf

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@3873 91ce42f0-d328-0410-95d8-f526ca767f89
---
 gui/bweb/INSTALL          | 12 ++++++------
 gui/bweb/ReleaseNotes     |  5 ++++-
 gui/bweb/cgi/bconsole.pl  |  2 +-
 gui/bweb/cgi/bfileview.pl | 13 ++++++-------
 gui/bweb/cgi/bgraph.pl    |  2 +-
 gui/bweb/cgi/bweb.pl      |  2 +-
 gui/bweb/lib/Bweb.pm      |  2 +-
 7 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/gui/bweb/INSTALL b/gui/bweb/INSTALL
index fd11b7bac4..bfc46e8ab5 100644
--- a/gui/bweb/INSTALL
+++ b/gui/bweb/INSTALL
@@ -28,10 +28,10 @@ Bweb works well with 1.39 release.
  install -m 755 -o root -g root  bweb/cgi/*.pl /usr/lib/cgi-bin/bweb
 
  # get a config file
- mkdir -m 750 /etc/bweb
- chown root:www-data /etc/bweb
- echo '$VAR1 = { template_dir => "/usr/share/bweb/tpl" };' > /etc/bweb/config
- chown www-data /etc/bweb/config
+ mkdir -m 755 /etc/bacula
+ chown root:bacula /etc/bacula
+ echo '$VAR1 = { template_dir => "/usr/share/bweb/tpl" };' > /etc/bacula/bweb.conf
+ chown www-data /etc/bacula/bweb.conf
 
  # copy bweb template file
  mkdir -p /usr/share/bweb/tpl
@@ -87,11 +87,11 @@ Put this in you httpd.conf, and add user with htpasswd
 
 ################ CONFIGURATION #################################
 
-/etc/bweb/config looks like : (you can edit it inside bweb)
+/etc/bacula/bweb.conf looks like : (you can edit it inside bweb)
 $VAR1 = bless( {
   'graph_font' => '/usr/share/fonts/truetype/ttf-bitstream-vera/Vera.ttf',
   'name' => undef,
-  'config_file' => '/etc/bweb/config',
+  'config_file' => '/etc/bacula/bweb.conf',
   'bconsole' => '/usr/sbin/bconsole -n -c /etc/bacula/bconsole.conf',
   'ach_list' => {
      'S1_L80' => bless( {
diff --git a/gui/bweb/ReleaseNotes b/gui/bweb/ReleaseNotes
index 6095a109e0..760b550353 100644
--- a/gui/bweb/ReleaseNotes
+++ b/gui/bweb/ReleaseNotes
@@ -1,4 +1,7 @@
-          Release Notes for bweb 1.39.32
+          Release Notes for bweb 2.0
+
+2006/12/31
+ - Move /etc/bweb/config to /etc/bacula/bweb.conf
 
 2006/12/29
  - Add graphical backup view. See INSTALL to enable it. It's usefull
diff --git a/gui/bweb/cgi/bconsole.pl b/gui/bweb/cgi/bconsole.pl
index 735944b56a..2bc6748130 100755
--- a/gui/bweb/cgi/bconsole.pl
+++ b/gui/bweb/cgi/bconsole.pl
@@ -52,7 +52,7 @@ use File::Temp qw/tempfile/;
 use Bweb;
 use Bconsole;
 
-my $conf = new Bweb::Config(config_file => '/etc/bweb/config');
+my $conf = new Bweb::Config(config_file => $Bweb::config_file);
 $conf->load();
 
 my $bweb = new Bweb(info => $conf);
diff --git a/gui/bweb/cgi/bfileview.pl b/gui/bweb/cgi/bfileview.pl
index 87ca7029ca..5177bbbba7 100755
--- a/gui/bweb/cgi/bfileview.pl
+++ b/gui/bweb/cgi/bfileview.pl
@@ -37,11 +37,6 @@
 
 =cut
 
-# TODO:
-#  Si c'est un fichier selectionne, afficher ses attributs
-#  ajouter le base_fic et base_url dans les options bweb
-#
-
 use strict;
 use POSIX qw/strftime/;
 use Bweb;
@@ -49,7 +44,7 @@ use CCircle ;
 use Digest::MD5 qw(md5_hex);
 use File::Basename qw/basename dirname/;
 
-my $conf = new Bweb::Config(config_file => '/etc/bweb/config');
+my $conf = new Bweb::Config(config_file => $Bweb::config_file);
 $conf->load();
 my $bweb = new Bweb(info => $conf);
 $bweb->connect_db();
@@ -360,4 +355,8 @@ RETURN val;
 END;
 $$ language 'plpgsql';
 
-ALTER TABLE brestore_pathvisibility ADD Size int8;
+ALTER TABLE brestore_pathvisibility ADD Size  int8;
+
+
+
+ALTER TABLE brestore_pathvisibility ADD Files int4;
diff --git a/gui/bweb/cgi/bgraph.pl b/gui/bweb/cgi/bgraph.pl
index 0e07a60578..2e13cf57cf 100755
--- a/gui/bweb/cgi/bgraph.pl
+++ b/gui/bweb/cgi/bgraph.pl
@@ -45,7 +45,7 @@ use CGI;
 
 use POSIX qw/strftime/;
 
-my $conf = new Bweb::Config(config_file => '/etc/bweb/config');
+my $conf = new Bweb::Config(config_file => $Bweb::config_file);
 $conf->load();
 
 my $bweb = new Bweb(info => $conf);
diff --git a/gui/bweb/cgi/bweb.pl b/gui/bweb/cgi/bweb.pl
index 9e7b58b624..d4a8cf573a 100755
--- a/gui/bweb/cgi/bweb.pl
+++ b/gui/bweb/cgi/bweb.pl
@@ -54,7 +54,7 @@ if ($action eq 'restore') {
 }
 
 # loading config file
-my $conf = new Bweb::Config(config_file => '/etc/bweb/config');
+my $conf = new Bweb::Config(config_file => $Bweb::config_file);
 $conf->load();
 
 my $bweb = new Bweb(info => $conf);
diff --git a/gui/bweb/lib/Bweb.pm b/gui/bweb/lib/Bweb.pm
index 74b3c69040..1b2d1deb5e 100644
--- a/gui/bweb/lib/Bweb.pm
+++ b/gui/bweb/lib/Bweb.pm
@@ -52,7 +52,7 @@ package Bweb::Gui;
 
 use HTML::Template;
 our $template_dir='/usr/share/bweb/tpl';
-
+our $config_file='/etc/bacula/bweb.conf';
 
 =head1 FUNCTION
 
-- 
2.39.5