$err"),"
\n"; diff --git a/postgresql/backup.pl b/postgresql/backup.pl index 71ee70a4e..8d22c49ac 100755 --- a/postgresql/backup.pl +++ b/postgresql/backup.pl @@ -32,9 +32,12 @@ foreach $db (@dbs) { next; } $format = $config{'backup_format_'.$sf}; + $compress = $config{'backup_compress_'.$sf}; $mkdir = $config{'backup_mkdir_'.$sf}; $suf = $format eq "p" ? "sql" : $format eq "t" ? "tar" : "post"; + $suf .= ($compress == 1 ? ".gz" : + $compress == 2 ? ".bz2" : ""); if ($all) { $dir = &date_subs($config{'backup_'}); $file = "$dir/$db.$suf"; @@ -60,7 +63,7 @@ foreach $db (@dbs) { } unlink($file); - $err = &backup_database($db, $file, $format, \@tables); + $err = &backup_database($db, $file, $format, \@tables, undef,$compress); if ($err) { print STDERR "Backup of database $db to file $file failed:\n"; print STDERR $err; diff --git a/postgresql/backup_form.cgi b/postgresql/backup_form.cgi index 1a7437ea1..c5dab0ea1 100755 --- a/postgresql/backup_form.cgi +++ b/postgresql/backup_form.cgi @@ -63,6 +63,13 @@ print &ui_table_row($text{'backup_format'}, [ 't', $text{'backup_format_t'} ], [ 'c', $text{'backup_format_c'} ] ])); +# Show compression option +$c = $c{'backup_compress_'.$in{'db'}} || 0; +print &ui_table_row($text{'backup_compress'}, + &ui_radio("compress", $c, [ [ 0, $text{'backup_compress_0'} ], + [ 1, $text{'backup_compress_1'} ], + [ 2, $text{'backup_compress_2'} ] ])); + if (!$in{'all'}) { # Show input to select tables $t = $c{'backup_tables_'.$in{'db'}}; diff --git a/postgresql/lang/en b/postgresql/lang/en index 270b35b26..1579eb87a 100644 --- a/postgresql/lang/en +++ b/postgresql/lang/en @@ -504,6 +504,10 @@ backup_format=Backup file format backup_format_p=Plain SQL text backup_format_t=Tar archive backup_format_c=Custom archive +backup_compress=Compression type +backup_compress_0=None +backup_compress_1=GZIP +backup_compress_2=BZIP2 backup_ecannot=You are not allowed to create backups backup_done=Successfully backed up $3 bytes from database $1 to file $2. backup_notaccept=Database $1 is not accepting connections. diff --git a/postgresql/postgresql-lib.pl b/postgresql/postgresql-lib.pl index a5de1a21b..b43bf4f56 100755 --- a/postgresql/postgresql-lib.pl +++ b/postgresql/postgresql-lib.pl @@ -1125,22 +1125,33 @@ return $config{'host'} eq '' || $config{'host'} eq 'localhost' || &to_ipaddress($config{'host'}) eq &to_ipaddress(&get_system_hostname()); } -# backup_database(database, dest-path, format, [&only-tables], [run-as-user]) +# backup_database(database, dest-path, format, [&only-tables], [run-as-user], +# [compress-mode]) # Executes the pg_dump command to backup the specified database to the # given destination path. Returns undef on success, or an error message # on failure. sub backup_database { -local ($db, $path, $format, $tables, $user) = @_; -local $tablesarg = join(" ", map { " -t ".quotemeta('"'.$_.'"') } @$tables); -local $cmd = "e_path($config{'dump_cmd'}). +my ($db, $path, $format, $tables, $user, $compress) = @_; +my $tablesarg = join(" ", map { " -t ".quotemeta('"'.$_.'"') } @$tables); +my $writer; +if ($compress == 0) { + $writer = "cat >".quotemeta($path); + } +elsif ($compress == 1) { + $writer = "gzip -c >".quotemeta($path); + } +elsif ($compress == 2) { + $writer = "bzip2 -c >".quotemeta($path); + } +my $cmd = "e_path($config{'dump_cmd'}). (!$postgres_login ? "" : &supports_pgpass() ? " -U $postgres_login" : " -u"). ($config{'host'} ? " -h $config{'host'}" : ""). ($config{'port'} ? " -p $config{'port'}" : ""). ($format eq 'p' ? "" : " -b"). $tablesarg. - " -F$format -f "."e_path($path)." $db"; + " -F$format $db | $writer"; if ($postgres_sameunix && defined(getpwnam($postgres_login))) { # Postgres connections have to be made as the 'postgres' Unix user $cmd = &command_as_user($postgres_login, 0, $cmd); @@ -1150,7 +1161,7 @@ elsif ($user) { $cmd = &command_as_user($user, 0, $cmd); } $cmd = &command_with_login($cmd); -local $out = &backquote_logged("$cmd 2>&1"); +my $out = &backquote_logged("$cmd 2>&1"); if ($? || $out =~ /could not|error|failed/i) { return $out; } @@ -1162,9 +1173,9 @@ return undef; # Returns undef on success, or an error message on failure. sub restore_database { -local ($db, $path, $only, $clean, $tables) = @_; -local $tablesarg = join(" ", map { " -t ".quotemeta('"'.$_.'"') } @$tables); -local $cmd = "e_path($config{'rstr_cmd'}). +my ($db, $path, $only, $clean, $tables) = @_; +my $tablesarg = join(" ", map { " -t ".quotemeta('"'.$_.'"') } @$tables); +my $cmd = "e_path($config{'rstr_cmd'}). (!$postgres_login ? "" : &supports_pgpass() ? " -U $postgres_login" : " -u"). ($config{'host'} ? " -h $config{'host'}" : ""). @@ -1177,7 +1188,7 @@ if ($postgres_sameunix && defined(getpwnam($postgres_login))) { $cmd = &command_as_user($postgres_login, 0, $cmd); } $cmd = &command_with_login($cmd); -local $out = &backquote_logged("$cmd 2>&1"); +my $out = &backquote_logged("$cmd 2>&1"); if ($? || $out =~ /could not|error|failed/i) { return $out; }