[pkg-bacula-commits] [SCM] Bacula, a network backup, recovery and verification program branch, master, updated. debian/5.0.3-1-6-gab5fc63

[Luca Capello]

The following commit has been merged in the master branch:
commit ab5fc635a1fb5fbc44b48e84351e45e8ba44960c
Author: Luca Capello <luca at pca.it>
Date:   Wed May 2 14:30:45 2012 +0200

    debian/patches/fix-default-config: missing basename replacements
    
    This complements 8fd8ebd.

diff --git a/debian/patches/fix-default-config b/debian/patches/fix-default-config
index df0f6ad..5d0dcf8 100644
--- a/debian/patches/fix-default-config
+++ b/debian/patches/fix-default-config
@@ -184,3 +184,59 @@
 #@@ -0,0 +1,2 @@
 #+# What actual file?  Defaults to LogPath if not absolute path....
 #+LogFile = /var/lib/bacula/log
+--- a/src/console/bconsole.conf.in
++++ b/src/console/bconsole.conf.in
+@@ -3,7 +3,7 @@
+ #
+ 
+ Director {
+-  Name = @basename at -dir
++  Name = @debian_hostname at -dir
+   DIRport = @dir_port@
+   address = @hostname@
+   Password = "@dir_password@"
+--- a/src/qt-console/bat.conf.in
++++ b/src/qt-console/bat.conf.in
+@@ -3,7 +3,7 @@
+ #
+ 
+ Director {
+-  Name = @basename at -dir
++  Name = @debian_hostname at -dir
+   DIRport = @dir_port@
+   address = @hostname@
+   Password = "@dir_password@"
+--- a/src/tray-monitor/tray-monitor.conf.in
++++ b/src/tray-monitor/tray-monitor.conf.in
+@@ -3,27 +3,27 @@
+ #
+ 
+ Monitor {
+-  Name = @basename at -mon
++  Name = @debian_hostname at -mon
+   Password = "@mon_dir_password@"         # password for the Directors   
+   RefreshInterval = 5 seconds
+ }
+    
+ Client {
+-  Name = @basename at -fd
++  Name = @debian_hostname at -fd
+   Address = @hostname@
+   FDPort = @fd_port@
+   Password = "@mon_fd_password@"          # password for FileDaemon
+ }
+ 
+ Storage {
+-  Name = @basename at -sd
++  Name = @debian_hostname at -sd
+   Address = @hostname@
+   SDPort = @sd_port@
+   Password = "@mon_sd_password@"          # password for StorageDaemon
+ }
+ 
+ Director {
+-  Name = @basename at -dir
++  Name = @debian_hostname at -dir
+   DIRport = @dir_port@
+   address = @hostname@
+ }

-- 
Bacula, a network backup, recovery and verification program