diff options
Diffstat (limited to '01-basename.patch')
| -rw-r--r-- | 01-basename.patch | 199 |
1 files changed, 199 insertions, 0 deletions
diff --git a/01-basename.patch b/01-basename.patch new file mode 100644 index 000000000000..e2695d564e88 --- /dev/null +++ b/01-basename.patch @@ -0,0 +1,199 @@ +diff -ru a/bacula-7.2.0/src/console/bconsole.conf.in b/bacula-7.2.0/src/console/bconsole.conf.in +--- a/bacula-7.2.0/src/console/bconsole.conf.in 2015-08-13 09:52:24.000000000 -0400 ++++ b/bacula-7.2.0/src/console/bconsole.conf.in 2015-11-01 17:10:50.385441109 -0500 +@@ -6,7 +6,7 @@ + # + + Director { +- Name = @basename@-dir ++ Name = __BASENAME__-dir + DIRport = @dir_port@ + address = @hostname@ + Password = "@dir_password@" +diff -ru a/bacula-7.2.0/src/dird/bacula-dir.conf.in b/bacula-7.2.0/src/dird/bacula-dir.conf.in +--- a/bacula-7.2.0/src/dird/bacula-dir.conf.in 2015-08-13 09:52:24.000000000 -0400 ++++ b/bacula-7.2.0/src/dird/bacula-dir.conf.in 2015-11-01 17:11:05.367931570 -0500 +@@ -13,7 +13,7 @@ + # + + Director { # define myself +- Name = @basename@-dir ++ Name = __BASENAME__-dir + DIRport = @dir_port@ # where we listen for UA connections + QueryFile = "@scriptdir@/query.sql" + WorkingDirectory = "@working_dir@" +@@ -27,7 +27,7 @@ + Name = "DefaultJob" + Type = Backup + Level = Incremental +- Client = @basename@-fd ++ Client = __BASENAME__-fd + FileSet = "Full Set" + Schedule = "WeeklyCycle" + Storage = File1 +@@ -49,7 +49,7 @@ + + #Job { + # Name = "BackupClient2" +-# Client = @basename@2-fd ++# Client = __BASENAME__2-fd + # JobDefs = "DefaultJob" + #} + +@@ -87,7 +87,7 @@ + Job { + Name = "RestoreFiles" + Type = Restore +- Client=@basename@-fd ++ Client=__BASENAME__-fd + FileSet="Full Set" + Storage = File1 + Pool = File +@@ -165,7 +165,7 @@ + + # Client (File Services) to backup + Client { +- Name = @basename@-fd ++ Name = __BASENAME__-fd + Address = @hostname@ + FDPort = @fd_port@ + Catalog = MyCatalog +@@ -180,7 +180,7 @@ + # You should change Name, Address, and Password before using + # + #Client { +-# Name = @basename@2-fd ++# Name = __BASENAME__2-fd + # Address = @hostname@2 + # FDPort = @fd_port@ + # Catalog = MyCatalog +@@ -309,7 +309,7 @@ + # Restricted console used by tray-monitor to get the status of the director + # + Console { +- Name = @basename@-mon ++ Name = __BASENAME__-mon + Password = "@mon_dir_password@" + CommandACL = status, .status + } +diff -ru a/bacula-7.2.0/src/filed/bacula-fd.conf.in b/bacula-7.2.0/src/filed/bacula-fd.conf.in +--- a/bacula-7.2.0/src/filed/bacula-fd.conf.in 2015-08-13 09:52:24.000000000 -0400 ++++ b/bacula-7.2.0/src/filed/bacula-fd.conf.in 2015-11-01 17:11:11.380926629 -0500 +@@ -15,7 +15,7 @@ + # List Directors who are permitted to contact this File daemon + # + Director { +- Name = @basename@-dir ++ Name = __BASENAME__-dir + Password = "@fd_password@" + } + +@@ -24,7 +24,7 @@ + # status of the file daemon + # + Director { +- Name = @basename@-mon ++ Name = __BASENAME__-mon + Password = "@mon_fd_password@" + Monitor = yes + } +@@ -33,7 +33,7 @@ + # "Global" File daemon configuration specifications + # + FileDaemon { # this is me +- Name = @basename@-fd ++ Name = __BASENAME__-fd + FDport = @fd_port@ # where we listen for the director + WorkingDirectory = @working_dir@ + Pid Directory = @piddir@ +@@ -44,5 +44,5 @@ + # Send all messages except skipped files back to Director + Messages { + Name = Standard +- director = @basename@-dir = all, !skipped, !restored ++ director = __BASENAME__-dir = all, !skipped, !restored + } +diff -ru a/bacula-7.2.0/src/qt-console/bat.conf.in b/bacula-7.2.0/src/qt-console/bat.conf.in +--- a/bacula-7.2.0/src/qt-console/bat.conf.in 2015-08-13 09:52:24.000000000 -0400 ++++ b/bacula-7.2.0/src/qt-console/bat.conf.in 2015-11-01 17:11:25.040158200 -0500 +@@ -3,7 +3,7 @@ + # + + Director { +- Name = @basename@-dir ++ Name = __BASENAME__-dir + DIRport = @dir_port@ + address = @hostname@ + Password = "@dir_password@" +diff -ru a/bacula-7.2.0/src/qt-console/tray-monitor/tray-monitor.conf.in b/bacula-7.2.0/src/qt-console/tray-monitor/tray-monitor.conf.in +--- a/bacula-7.2.0/src/qt-console/tray-monitor/tray-monitor.conf.in 2015-08-13 09:52:24.000000000 -0400 ++++ b/bacula-7.2.0/src/qt-console/tray-monitor/tray-monitor.conf.in 2015-11-01 17:11:31.926437464 -0500 +@@ -3,27 +3,27 @@ + # + + Monitor { +- Name = @basename@-mon ++ Name = __BASENAME__-mon + Password = "@mon_dir_password@" # password for the Directors + RefreshInterval = 30 seconds + } + + Client { +- Name = @basename@-fd ++ Name = __BASENAME__-fd + Address = @hostname@ + FDPort = @fd_port@ + Password = "@mon_fd_password@" # password for FileDaemon + } + + Storage { +- Name = @basename@-sd ++ Name = __BASENAME__-sd + Address = @hostname@ + SDPort = @sd_port@ + Password = "@mon_sd_password@" # password for StorageDaemon + } + + Director { +- Name = @basename@-dir ++ Name = __BASENAME__-dir + DIRport = @dir_port@ + address = @hostname@ + } +diff -ru a/bacula-7.2.0/src/stored/bacula-sd.conf.in b/bacula-7.2.0/src/stored/bacula-sd.conf.in +--- a/bacula-7.2.0/src/stored/bacula-sd.conf.in 2015-08-13 09:52:24.000000000 -0400 ++++ b/bacula-7.2.0/src/stored/bacula-sd.conf.in 2015-11-01 17:11:38.186085314 -0500 +@@ -15,7 +15,7 @@ + # + + Storage { # definition of myself +- Name = @basename@-sd ++ Name = __BASENAME__-sd + SDPort = @sd_port@ # Director's port + WorkingDirectory = "@working_dir@" + Pid Directory = "@piddir@" +@@ -26,7 +26,7 @@ + # List Directors who are permitted to contact Storage daemon + # + Director { +- Name = @basename@-dir ++ Name = __BASENAME__-dir + Password = "@sd_password@" + } + +@@ -35,7 +35,7 @@ + # status of the storage daemon + # + Director { +- Name = @basename@-mon ++ Name = __BASENAME__-mon + Password = "@mon_sd_password@" + Monitor = yes + } +@@ -284,5 +284,5 @@ + # + Messages { + Name = Standard +- director = @basename@-dir = all ++ director = __BASENAME__-dir = all + } |