[pkg-bacula-commits] [bacula] 01/15: Updated debian/patches/fix-default-config

[Carsten Leonhardt]

This is an automated email from the git hooks/post-receive script.

cl-guest pushed a commit to branch master
in repository bacula.

commit 0b770fe00472130c85798051638fcf880ffb9328
Author: Carsten Leonhardt <leo at debian.org>
Date:   Tue Jul 21 10:59:06 2015 +0200

    Updated debian/patches/fix-default-config
---
 debian/patches/fix-default-config | 39 ++++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/debian/patches/fix-default-config b/debian/patches/fix-default-config
index 53eca14..3920216 100644
--- a/debian/patches/fix-default-config
+++ b/debian/patches/fix-default-config
@@ -13,7 +13,7 @@ Last-Update: 2012-06-01
    QueryFile = "@scriptdir@/query.sql"
    WorkingDirectory = "@working_dir@"
 @@ -21,13 +21,14 @@
-   Maximum Concurrent Jobs = 1
+   Maximum Concurrent Jobs = 20
    Password = "@dir_password@"         # Console password
    Messages = Daemon
 +  DirAddress = 127.0.0.1
@@ -23,12 +23,12 @@ Last-Update: 2012-06-01
    Name = "DefaultJob"
    Type = Backup
    Level = Incremental
--  Client = @basename at -fd 
+-  Client = @basename at -fd
 +  Client = @debian_hostname at -fd
    FileSet = "Full Set"
    Schedule = "WeeklyCycle"
-   Storage = File
-@@ -48,7 +49,7 @@
+   Storage = File1
+@@ -49,7 +50,7 @@
  
  #Job {
  #  Name = "BackupClient2"
@@ -37,16 +37,16 @@ Last-Update: 2012-06-01
  #  JobDefs = "DefaultJob"
  #}
  
-@@ -76,7 +77,7 @@
+@@ -87,7 +88,7 @@
  Job {
    Name = "RestoreFiles"
    Type = Restore
--  Client=@basename at -fd                 
+-  Client=@basename at -fd
 +  Client=@debian_hostname at -fd
-   FileSet="Full Set"                  
-   Storage = File                      
-   Pool = Default
-@@ -153,7 +154,7 @@
+   FileSet="Full Set"
+   Storage = File1
+   Pool = File
+@@ -165,7 +166,7 @@
  
  # Client (File Services) to backup
  Client {
@@ -55,16 +55,16 @@ Last-Update: 2012-06-01
    Address = @hostname@
    FDPort = @fd_port@
    Catalog = MyCatalog
-@@ -168,7 +169,7 @@
+@@ -180,7 +181,7 @@
  #  You should change Name, Address, and Password before using
  #
  #Client {
--#  Name = @basename at 2-fd                
+-#  Name = @basename at 2-fd
 +#  Name = @debian_hostname at 2-fd
  #  Address = @hostname at 2
  #  FDPort = @fd_port@
  #  Catalog = MyCatalog
-@@ -307,7 +308,7 @@
+@@ -309,7 +310,7 @@
  # Restricted console used by tray-monitor to get the status of the director
  #
  Console {
@@ -93,7 +93,7 @@ Last-Update: 2012-06-01
    Password = "@mon_fd_password@"
    Monitor = yes
  }
-@@ -29,15 +29,16 @@
+@@ -29,16 +29,17 @@
  # "Global" File daemon configuration specifications
  #
  FileDaemon {                          # this is me
@@ -103,6 +103,7 @@ Last-Update: 2012-06-01
    WorkingDirectory = @working_dir@
    Pid Directory = @piddir@
    Maximum Concurrent Jobs = 20
+ # Plugin Directory = @plugindir@
 +  FDAddress = 127.0.0.1
  }
  
@@ -120,7 +121,7 @@ Last-Update: 2012-06-01
  Storage {                             # definition of myself
 -  Name = @basename at -sd
 +  Name = @debian_hostname at -sd
-   SDPort = @sd_port@                  # Director's port      
+   SDPort = @sd_port@                  # Director's port
    WorkingDirectory = "@working_dir@"
    Pid Directory = "@piddir@"
    Maximum Concurrent Jobs = 20
@@ -145,7 +146,7 @@ Last-Update: 2012-06-01
    Password = "@mon_sd_password@"
    Monitor = yes
  }
-@@ -201,5 +202,5 @@
+@@ -278,5 +279,5 @@
  #
  Messages {
    Name = Standard
@@ -184,8 +185,8 @@ Last-Update: 2012-06-01
    DIRport = @dir_port@
    address = @hostname@
    Password = "@dir_password@"
---- a/src/tray-monitor/tray-monitor.conf.in
-+++ b/src/tray-monitor/tray-monitor.conf.in
+--- a/src/qt-console/tray-monitor/tray-monitor.conf.in
++++ b/src/qt-console/tray-monitor/tray-monitor.conf.in
 @@ -3,27 +3,27 @@
  #
  
@@ -193,7 +194,7 @@ Last-Update: 2012-06-01
 -  Name = @basename at -mon
 +  Name = @debian_hostname at -mon
    Password = "@mon_dir_password@"         # password for the Directors   
-   RefreshInterval = 5 seconds
+   RefreshInterval = 30 seconds
  }
     
  Client {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-bacula/bacula.git