bacula/contribs7/bacula-gui-2.2.8-config.patch

--- bimagemgr/config.pm.orig    2007-05-31 17:35:22.000000000 +0200
+++ bimagemgr/config.pm 2007-05-31 17:39:45.000000000 +0200
@@ -37,15 +37,15 @@
        ## web server configuration
        #
        # web server path to program from server root
-       $self->{prog_name} = "/cgi-bin/bimagemgr.pl";
+       $self->{prog_name} = "/bimagemgr/cgi-bin/bimagemgr.pl";
        #
        # web server host
        $self->{http_host}="localhost";
        #
        # path to graphics from document root
-       $self->{logo_graphic} = "/bimagemgr.gif";
-       $self->{spacer_graphic} = "/clearpixel.gif";
-       $self->{burn_graphic} = "/cdrom_spins.gif";
+       $self->{logo_graphic} = "/bimagemgr/bimagemgr.gif";
+       $self->{spacer_graphic} = "/bimagemgr/clearpixel.gif";
+       $self->{burn_graphic} = "/bimagemgr/cdrom_spins.gif";
        ##
 
        ## database configuration
@@ -72,11 +72,11 @@
        # $self->{db_name_param} = "dbname";
        # $self->{catalog_dump} = "pg_dump --host=$self->{'host'} --username=$self->{'user'} --password=$self->{'password'} $self->{'database'}";
        # SQLite
-       $self->{sqlitebindir} = "/usr/lib/bacula/sqlite";
-       $self->{bacula_working_dir} = "/var/bacula";
+       # $self->{sqlitebindir} = "/usr/bin";
+       # $self->{bacula_working_dir} = "/var/lib/bacula";
        # $self->{db_driver} = "SQLite";
        # $self->{db_name_param} = "dbname";
-       # $self->{catalog_dump} = "echo \".dump\" | $self->{'sqlitebindir'}/sqlite $self->{'bacula_working_dir'}/$self->{'database'}.db";
+       # $self->{catalog_dump} = "echo \".dump\" | $self->{'sqlitebindir'}/sqlite3 $self->{'bacula_working_dir'}/$self->{'database'}.db";
        ##
 
        # path to backup files
@@ -93,8 +93,8 @@
        ##
 
        # temporary files
-       $self->{tempfile} = "temp.html";
-       $self->{tempfile_path} = "/var/www/html/temp.html";
+       $self->{tempfile} = "bimagemgr/temp.html";
+       $self->{tempfile_path} = "/var/cache/bimagemgr/temp.html";
        $self->{working_dir} = "/var/tmp";
 
        bless($self);
--- bweb/bweb.conf.orig 1970-01-01 01:00:00.000000000 +0100
+++ bweb/bweb.conf      2007-05-31 14:46:07.000000000 +0200
@@ -0,0 +1,14 @@
+$VAR1 = bless( {
+  'graph_font' => '/usr/share/fonts/bitstream-vera/Vera.ttf',
+  'name' => undef,
+  'config_file' => '/etc/bacula/bweb.conf',
+  'bconsole' => '/usr/bin/bconsole -n -c /etc/bacula/bconsole.conf',
+  'password' => '',
+  'template_dir' => '/usr/share/bacula/bweb/tpl',
+  'dbi' => 'DBI:mysql:database=bacula',
+  'error' => '',
+  'debug' => 0,
+  'user' => 'bacula',
+  'email_media' => 'root@localhost',
+  'fv_write_path' => '/var/cache/bweb'
+}, 'Bweb::Config' );
--- bweb/html/index.html.orig   2007-06-01 10:18:13.000000000 +0200
+++ bweb/html/index.html        2007-06-01 10:18:23.000000000 +0200
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <HTML>
 <HEAD>
-<META HTTP-EQUIV=Refresh CONTENT="0; URL=/cgi-bin/bweb/bweb.pl">
+<META HTTP-EQUIV=Refresh CONTENT="0; URL=/bweb/cgi-bin/bweb.pl">
 </HEAD>
 <BODY TEXT="#000000" BGCOLOR="#FFFFFF" LINK="#0000EF" VLINK="#55188A" ALINK="#FF0000">
 </BODY>
--- brestore/brestore.pl.orig   2008-04-20 20:47:21.000000000 +0200
+++ brestore/brestore.pl        2008-04-20 20:47:52.000000000 +0200
@@ -3310,7 +3310,7 @@
 
 $glade_file = $p->{glade_file} || $glade_file;
 
-foreach my $path ('','.','/usr/share/brestore','/usr/local/share/brestore') {
+foreach my $path ('','.','/usr/share/brestore','/usr/share/bacula/brestore','/usr/local/share/brestore') {
     if (-f "$path/$glade_file") {
        $glade_file = "$path/$glade_file" ;
        last;
1	slords	1.1	--- bimagemgr/config.pm.orig 2007-05-31 17:35:22.000000000 +0200
2			+++ bimagemgr/config.pm 2007-05-31 17:39:45.000000000 +0200
3			@@ -37,15 +37,15 @@
4			## web server configuration
5			#
6			# web server path to program from server root
7			- $self->{prog_name} = "/cgi-bin/bimagemgr.pl";
8			+ $self->{prog_name} = "/bimagemgr/cgi-bin/bimagemgr.pl";
9			#
10			# web server host
11			$self->{http_host}="localhost";
12			#
13			# path to graphics from document root
14			- $self->{logo_graphic} = "/bimagemgr.gif";
15			- $self->{spacer_graphic} = "/clearpixel.gif";
16			- $self->{burn_graphic} = "/cdrom_spins.gif";
17			+ $self->{logo_graphic} = "/bimagemgr/bimagemgr.gif";
18			+ $self->{spacer_graphic} = "/bimagemgr/clearpixel.gif";
19			+ $self->{burn_graphic} = "/bimagemgr/cdrom_spins.gif";
20			##
21
22			## database configuration
23			@@ -72,11 +72,11 @@
24			# $self->{db_name_param} = "dbname";
25			# $self->{catalog_dump} = "pg_dump --host=$self->{'host'} --username=$self->{'user'} --password=$self->{'password'} $self->{'database'}";
26			# SQLite
27			- $self->{sqlitebindir} = "/usr/lib/bacula/sqlite";
28			- $self->{bacula_working_dir} = "/var/bacula";
29			+ # $self->{sqlitebindir} = "/usr/bin";
30			+ # $self->{bacula_working_dir} = "/var/lib/bacula";
31			# $self->{db_driver} = "SQLite";
32			# $self->{db_name_param} = "dbname";
33			- # $self->{catalog_dump} = "echo \".dump\" \| $self->{'sqlitebindir'}/sqlite $self->{'bacula_working_dir'}/$self->{'database'}.db";
34			+ # $self->{catalog_dump} = "echo \".dump\" \| $self->{'sqlitebindir'}/sqlite3 $self->{'bacula_working_dir'}/$self->{'database'}.db";
35			##
36
37			# path to backup files
38			@@ -93,8 +93,8 @@
39			##
40
41			# temporary files
42			- $self->{tempfile} = "temp.html";
43			- $self->{tempfile_path} = "/var/www/html/temp.html";
44			+ $self->{tempfile} = "bimagemgr/temp.html";
45			+ $self->{tempfile_path} = "/var/cache/bimagemgr/temp.html";
46			$self->{working_dir} = "/var/tmp";
47
48			bless($self);
49			--- bweb/bweb.conf.orig 1970-01-01 01:00:00.000000000 +0100
50			+++ bweb/bweb.conf 2007-05-31 14:46:07.000000000 +0200
51			@@ -0,0 +1,14 @@
52			+$VAR1 = bless( {
53			+ 'graph_font' => '/usr/share/fonts/bitstream-vera/Vera.ttf',
54			+ 'name' => undef,
55			+ 'config_file' => '/etc/bacula/bweb.conf',
56			+ 'bconsole' => '/usr/bin/bconsole -n -c /etc/bacula/bconsole.conf',
57			+ 'password' => '',
58			+ 'template_dir' => '/usr/share/bacula/bweb/tpl',
59			+ 'dbi' => 'DBI:mysql:database=bacula',
60			+ 'error' => '',
61			+ 'debug' => 0,
62			+ 'user' => 'bacula',
63			+ 'email_media' => 'root@localhost',
64			+ 'fv_write_path' => '/var/cache/bweb'
65			+}, 'Bweb::Config' );
66			--- bweb/html/index.html.orig 2007-06-01 10:18:13.000000000 +0200
67			+++ bweb/html/index.html 2007-06-01 10:18:23.000000000 +0200
68			@@ -1,7 +1,7 @@
69			<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
70			<HTML>
71			<HEAD>
72			-<META HTTP-EQUIV=Refresh CONTENT="0; URL=/cgi-bin/bweb/bweb.pl">
73			+<META HTTP-EQUIV=Refresh CONTENT="0; URL=/bweb/cgi-bin/bweb.pl">
74			</HEAD>
75			<BODY TEXT="#000000" BGCOLOR="#FFFFFF" LINK="#0000EF" VLINK="#55188A" ALINK="#FF0000">
76			</BODY>
77			--- brestore/brestore.pl.orig 2008-04-20 20:47:21.000000000 +0200
78			+++ brestore/brestore.pl 2008-04-20 20:47:52.000000000 +0200
79			@@ -3310,7 +3310,7 @@
80
81			$glade_file = $p->{glade_file} \|\| $glade_file;
82
83			-foreach my $path ('','.','/usr/share/brestore','/usr/local/share/brestore') {
84			+foreach my $path ('','.','/usr/share/brestore','/usr/share/bacula/brestore','/usr/local/share/brestore') {
85			if (-f "$path/$glade_file") {
86			$glade_file = "$path/$glade_file" ;
87			last;