rpms/bacula
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Rediffed fuzzy patches.

Browse Source
This commit is contained in:
Jon Ciesla 2008-12-10 18:59:21 +00:00
parent d0bfbcb8a5
commit 3bbb33acfa
3 changed files with 73 additions and 222 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

258
bacula-config.patch
View File

@ -1,256 +1,122 @@
--- bacula-2.0.2/src/gnome2-console/bgnome-console.conf.in.orig 2007-02-06 13:35:12.000000000 +0100 --- bacula-2.4.3/src/gnome2-console/bgnome-console.conf.in.orig 2008-12-10 10:12:18.000000000 -0600
+++ bacula-2.0.2/src/gnome2-console/bgnome-console.conf.in 2007-02-06 13:35:25.000000000 +0100 +++ bacula-2.4.3/src/gnome2-console/bgnome-console.conf.in 2008-12-10 10:12:18.000000000 -0600
@@ -3,9 +3,9 @@ @@ -6 +6 @@
#
Director {
- Name = @hostname@-dir - Name = @hostname@-dir
+ Name = bacula-dir + Name = bacula-dir
DIRport = @dir_port@ @@ -8 +8 @@
- address = @hostname@ - address = @hostname@
+ address = server.example.com + address = server.example.com
Password = "@dir_password@" --- bacula-2.4.3/src/dird/bacula-dir.conf.in.orig 2008-12-10 10:17:27.000000000 -0600
} +++ bacula-2.4.3/src/dird/bacula-dir.conf.in 2008-12-10 10:17:27.000000000 -0600
@@ -16 +16 @@
--- bacula-2.0.2/src/dird/bacula-dir.conf.in.orig 2007-02-06 13:33:19.000000000 +0100
+++ bacula-2.0.2/src/dird/bacula-dir.conf.in 2007-02-06 13:34:49.000000000 +0100
@@ -13,7 +13,7 @@
#
Director { # define myself
- Name = @hostname@-dir - Name = @hostname@-dir
+ Name = bacula-dir + Name = bacula-dir
DIRport = @dir_port@ # where we listen for UA connections @@ -30 +30 @@
QueryFile = "@scriptdir@/query.sql"
WorkingDirectory = "@working_dir@"
@@ -27,7 +27,7 @@
Name = "DefaultJob"
Type = Backup
Level = Incremental
- Client = @hostname@-fd - Client = @hostname@-fd
+ Client = bacula-fd + Client = bacula-fd
FileSet = "Full Set" @@ -51 +51 @@
Schedule = "WeeklyCycle"
Storage = File
@@ -48,7 +48,7 @@
#Job {
# Name = "Client2"
-# Client = @hostname@2-fd -# Client = @hostname@2-fd
+# Client = bacula2-fd +# Client = bacula2-fd
# JobDefs = "DefaultJob" @@ -82 +82 @@
# Write Bootstrap = "@working_dir@/Client2.bsr"
#}
@@ -75,7 +75,7 @@
Job {
Name = "RestoreFiles"
Type = Restore
- Client=@hostname@-fd - Client=@hostname@-fd
+ Client=bacula-fd + Client=bacula-fd
FileSet="Full Set" @@ -157,2 +157,2 @@
Storage = File
Pool = Default
@@ -149,8 +149,8 @@
# Client (File Services) to backup
Client {
- Name = @hostname@-fd - Name = @hostname@-fd
- Address = @hostname@ - Address = @hostname@
+ Name = bacula-fd + Name = bacula-fd
+ Address = client.example.com + Address = client.example.com
FDPort = @fd_port@ @@ -172,2 +172,2 @@
Catalog = MyCatalog
Password = "@fd_password@" # password for FileDaemon
@@ -164,8 +164,8 @@
# You should change Name, Address, and Password before using
#
#Client {
-# Name = @hostname@2-fd -# Name = @hostname@2-fd
-# Address = @hostname@2 -# Address = @hostname@2
+# Name = bacula2-fd +# Name = bacula2-fd
+# Address = client2.example.com +# Address = client2.example.com
# FDPort = @fd_port@ @@ -187 +187 @@
# Catalog = MyCatalog
# Password = "@fd_password@2" # password for FileDaemon 2
@@ -179,7 +179,7 @@
Storage {
Name = File
# Do not use "localhost" here
- Address = @hostname@ # N.B. Use a fully qualified name here - Address = @hostname@ # N.B. Use a fully qualified name here
+ Address = storage.example.com # N.B. Use a fully qualified name here + Address = storage.example.com # N.B. Use a fully qualified name here
SDPort = @sd_port@ @@ -200 +200 @@
Password = "@sd_password@"
Device = FileStorage
@@ -192,7 +192,7 @@
#Storage {
# Name = DDS-4
# Do not use "localhost" here
-# Address = @hostname@ # N.B. Use a fully qualified name here -# Address = @hostname@ # N.B. Use a fully qualified name here
+# Address = storage.example.com # N.B. Use a fully qualified name here +# Address = storage.example.com # N.B. Use a fully qualified name here
# SDPort = @sd_port@ @@ -212 +212 @@
# Password = "@sd_password@" # password for Storage daemon
# Device = DDS-4 # must be same as Device in Storage daemon
@@ -204,7 +204,7 @@
#Storage {
# Name = "8mmDrive"
# Do not use "localhost" here
-# Address = @hostname@ # N.B. Use a fully qualified name here -# Address = @hostname@ # N.B. Use a fully qualified name here
+# Address = storage.example.com # N.B. Use a fully qualified name here +# Address = storage.example.com # N.B. Use a fully qualified name here
# SDPort = @sd_port@ @@ -223 +223 @@
# Password = "@sd_password@"
# Device = "Exabyte 8mm"
@@ -215,7 +215,7 @@
#Storage {
# Name = "DVD"
# Do not use "localhost" here
-# Address = @hostname@ # N.B. Use a fully qualified name here -# Address = @hostname@ # N.B. Use a fully qualified name here
+# Address = storage.example.com # N.B. Use a fully qualified name here +# Address = storage.example.com # N.B. Use a fully qualified name here
# SDPort = @sd_port@ @@ -299 +299 @@
# Password = "@sd_password@"
# Device = "DVD Writer"
@@ -285,7 +285,7 @@
# Restricted console used by tray-monitor to get the status of the director
#
Console {
- Name = @hostname@-mon - Name = @hostname@-mon
+ Name = bacula-mon + Name = bacula-mon
Password = "@mon_dir_password@" --- bacula-2.4.3/src/filed/bacula-fd.conf.in.orig 2008-12-10 10:19:12.000000000 -0600
CommandACL = status, .status +++ bacula-2.4.3/src/filed/bacula-fd.conf.in 2008-12-10 10:19:12.000000000 -0600
} @@ -14 +14 @@
--- bacula-2.0.2/src/filed/bacula-fd.conf.in.orig 2007-02-06 13:30:59.000000000 +0100
+++ bacula-2.0.2/src/filed/bacula-fd.conf.in 2007-02-06 13:31:25.000000000 +0100
@@ -11,7 +11,7 @@
# List Directors who are permitted to contact this File daemon
#
Director {
- Name = @hostname@-dir - Name = @hostname@-dir
+ Name = bacula-dir + Name = bacula-dir
Password = "@fd_password@" @@ -23 +23 @@
}
@@ -20,7 +20,7 @@
# status of the file daemon
#
Director {
- Name = @hostname@-mon - Name = @hostname@-mon
+ Name = bacula-mon + Name = bacula-mon
Password = "@mon_fd_password@" @@ -32 +32 @@
Monitor = yes
}
@@ -29,7 +29,7 @@
# "Global" File daemon configuration specifications
#
FileDaemon { # this is me
- Name = @hostname@-fd - Name = @hostname@-fd
+ Name = bacula-fd + Name = bacula-fd
FDport = @fd_port@ # where we listen for the director @@ -42 +42 @@
WorkingDirectory = @working_dir@
Pid Directory = @piddir@
@@ -39,5 +39,5 @@
# Send all messages except skipped files back to Director
Messages {
Name = Standard
- director = @hostname@-dir = all, !skipped, !restored - director = @hostname@-dir = all, !skipped, !restored
+ director = bacula-dir = all, !skipped, !restored + director = bacula-dir = all, !skipped, !restored
} --- bacula-2.4.3/src/stored/bacula-sd.conf.in.orig 2008-12-10 10:21:45.000000000 -0600
--- bacula-2.0.2/src/console/bconsole.conf.in.orig 2007-02-06 13:32:30.000000000 +0100 +++ bacula-2.4.3/src/stored/bacula-sd.conf.in 2008-12-10 10:21:45.000000000 -0600
+++ bacula-2.0.2/src/console/bconsole.conf.in 2007-02-06 13:33:06.000000000 +0100 @@ -14 +14 @@
@@ -3,8 +3,8 @@
#
Director {
- Name = @hostname@-dir
+ Name = bacula-dir
DIRport = @dir_port@
- address = @hostname@
+ address = server.example.com
Password = "@dir_password@"
}
--- bacula-2.0.2/src/stored/bacula-sd.conf.in.orig 2007-02-06 13:31:56.000000000 +0100
+++ bacula-2.0.2/src/stored/bacula-sd.conf.in 2007-02-06 13:32:15.000000000 +0100
@@ -11,7 +11,7 @@
#
Storage { # definition of myself
- Name = @hostname@-sd - Name = @hostname@-sd
+ Name = bacula-sd + Name = bacula-sd
SDPort = @sd_port@ # Director's port @@ -25 +25 @@
WorkingDirectory = "@working_dir@"
Pid Directory = "@piddir@"
@@ -22,7 +22,7 @@
# List Directors who are permitted to contact Storage daemon
#
Director {
- Name = @hostname@-dir - Name = @hostname@-dir
+ Name = bacula-dir + Name = bacula-dir
Password = "@sd_password@" @@ -34 +34 @@
}
@@ -31,7 +31,7 @@
# status of the storage daemon
#
Director {
- Name = @hostname@-mon - Name = @hostname@-mon
+ Name = bacula-mon + Name = bacula-mon
Password = "@mon_sd_password@" @@ -228 +228 @@
Monitor = yes
}
@@ -204,5 +204,5 @@
#
Messages {
Name = Standard
- director = @hostname@-dir = all - director = @hostname@-dir = all
+ director = bacula-dir = all + director = bacula-dir = all
} --- bacula-2.4.3/src/wx-console/bwx-console.conf.in.orig 2008-12-10 10:22:23.000000000 -0600
--- bacula-2.0.2/src/wx-console/bwx-console.conf.in.orig 2007-02-06 13:37:12.000000000 +0100 +++ bacula-2.4.3/src/wx-console/bwx-console.conf.in 2008-12-10 10:22:23.000000000 -0600
+++ bacula-2.0.2/src/wx-console/bwx-console.conf.in 2007-02-06 13:47:02.000000000 +0100 @@ -6 +6 @@
@@ -3,8 +3,8 @@
#
Director {
- Name = @hostname@-dir - Name = @hostname@-dir
+ Name = bacula-dir + Name = bacula-dir
DIRport = @dir_port@ @@ -8 +8 @@
- address = @hostname@ - address = @hostname@
+ address = server.example.com + address = server.example.com
Password = "@dir_password@" --- bacula-2.4.3/src/tray-monitor/tray-monitor.conf.in.orig 2008-12-10 10:28:02.000000000 -0600
} +++ bacula-2.4.3/src/tray-monitor/tray-monitor.conf.in 2008-12-10 10:28:02.000000000 -0600
--- bacula-2.0.2/src/tray-monitor/tray-monitor.conf.in.orig 2007-02-06 13:47:13.000000000 +0100 @@ -6 +6 @@
+++ bacula-2.0.2/src/tray-monitor/tray-monitor.conf.in 2007-02-06 13:47:55.000000000 +0100
@@ -3,27 +3,27 @@
#
Monitor {
- Name = @hostname@-mon - Name = @hostname@-mon
+ Name = bacula-mon + Name = bacula-mon
Password = "@mon_dir_password@" # password for the Directors @@ -12,2 +12,2 @@
RefreshInterval = 5 seconds
}
Client {
- Name = @hostname@-fd - Name = @hostname@-fd
- Address = @hostname@ - Address = @hostname@
+ Name = bacula-fd + Name = bacula-fd
+ Address = client.example.com + Address = client.example.com
FDPort = @fd_port@ @@ -19,2 +19,2 @@
Password = "@mon_fd_password@" # password for FileDaemon
}
Storage {
- Name = @hostname@-sd - Name = @hostname@-sd
- Address = @hostname@ - Address = @hostname@
+ Name = bacula-sd + Name = bacula-sd
+ Address = storage.example.com + Address = storage.example.com
SDPort = @sd_port@ @@ -26 +26 @@
Password = "@mon_sd_password@" # password for StorageDaemon
}
Director {
- Name = @hostname@-dir - Name = @hostname@-dir
+ Name = bacula-dir + Name = bacula-dir
DIRport = @dir_port@ @@ -28 +27,0 @@
- address = @hostname@
--- bacula-2.4.3/src/qt-console/bat.conf.in.orig 2008-12-10 10:27:02.000000000 -0600
+++ bacula-2.4.3/src/qt-console/bat.conf.in 2008-12-10 10:27:02.000000000 -0600
@@ -6 +6 @@
- Name = @hostname@-dir
+ Name = bacula-dir
@@ -8 +8 @@
- address = @hostname@ - address = @hostname@
-}
\ No newline at end of file
+ address = server.example.com + address = server.example.com
+} --- bacula-2.4.3/src/stored/stored.conf.in.orig 2008-12-10 10:27:44.000000000 -0600
+++ bacula-2.4.3/src/stored/stored.conf.in 2008-12-10 10:27:44.000000000 -0600
@@ -11 +11 @@
- Address = @hostname@
+ Address = storage.example.com
@@ -22 +22 @@
- Name = @hostname@-dir
+ Name = bacula-dir
@@ -54 +54 @@
- director = @hostname@-dir = all
+ director = bacula-dir = all

31
bacula-director-configuration.patch
View File

@ -1,34 +1,17 @@
--- bacula-1.38.11/src/dird/bacula-dir.conf.in.orig 2006-09-03 03:13:26.000000000 +0200 --- bacula-2.4.3/src/dird/bacula-dir.conf.in.orig 2008-12-10 08:59:18.000000000 -0600
+++ bacula-1.38.11/src/dird/bacula-dir.conf.in 2006-09-03 03:14:46.000000000 +0200 +++ bacula-2.4.3/src/dird/bacula-dir.conf.in 2008-12-10 08:59:18.000000000 -0600
@@ -15,7 +15,7 @@ @@ -18 +18 @@
Director { # define myself
Name = @hostname@-dir
DIRport = @dir_port@ # where we listen for UA connections
- QueryFile = "@scriptdir@/query.sql" - QueryFile = "@scriptdir@/query.sql"
+ QueryFile = "/etc/bacula/query.sql" + QueryFile = "/etc/bacula/query.sql"
WorkingDirectory = "@working_dir@" @@ -108,3 +108,2 @@
PidDirectory = "@piddir@"
Maximum Concurrent Jobs = 1
@@ -101,11 +101,10 @@
# if you have other partitons such as /usr or /home
# you will probably want to add them too.
#
-# By default this is defined to point to the Bacula build -# By default this is defined to point to the Bacula build
-# directory to give a reasonable FileSet to backup to -# directory to give a reasonable FileSet to backup to
-# disk storage during initial testing. -# disk storage during initial testing.
+# This File-directive would backup your whole filesystem. +# This File-directive would backup your whole filesystem.
+# It is disabled by default +# It is disabled by default
# @@ -112 +111 @@
- File = @BUILD_DIR@ - File = @BUILD_DIR@
+# File = / + File = /
} @@ -263 +262 @@
#
@@ -266,7 +266,7 @@
mailcommand = "@sbindir@/bsmtp -h @smtp_host@ -f \"\(Bacula\) %r\" -s \"Bacula daemon message\" %r"
mail = @job_email@ = all, !skipped
console = all, !skipped, !saved
- append = "@working_dir@/log" = all, !skipped - append = "@working_dir@/log" = all, !skipped
+ append = "/var/log/bacula.log" = all, !skipped + append = "/var/log/bacula.log" = all, !skipped
}

6
bacula.spec
View File

@ -4,12 +4,11 @@
%define docs_version %{version} %define docs_version %{version}
%define gui_version %{version} %define gui_version %{version}
%define config_dir %{_sysconfdir}/bacula %define config_dir %{_sysconfdir}/bacula
%define _default_patch_fuzz 2
Summary: Cross platform network backup for Linux, Unix, Mac and Windows Summary: Cross platform network backup for Linux, Unix, Mac and Windows
Name: bacula Name: bacula
Version: 2.4.3 Version: 2.4.3
Release: 4%{?dist} Release: 5%{?dist}
# See LICENSE for details # See LICENSE for details
License: GPLv2 with exceptions License: GPLv2 with exceptions
Group: System Environment/Daemons Group: System Environment/Daemons
@ -986,6 +985,9 @@ fi
%changelog %changelog
* Wed Dec 10 2008 Jon Ciesla <limb@jcomserv.net - 2.4.3-5
- Re-diffed fuzzy bacula-director-configuration and bacula-config patches.
* Mon Dec 1 2008 Andreas Thienemann <andreas@bawue.net> - 2.4.3-4 * Mon Dec 1 2008 Andreas Thienemann <andreas@bawue.net> - 2.4.3-4
- Fixed dependency "issues" #473627 by adding the sysconfdir subpackage. - Fixed dependency "issues" #473627 by adding the sysconfdir subpackage.