--- 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 @@ - + --- 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;