From 28dbe42c66cfed94879cab01df0fb7824c7afd7e Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Tue, 28 Apr 2009 06:48:23 +0000 Subject: [PATCH] Remove illegal Options in Exclude of default Win32/64 bacula-dir.conf git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@8756 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/src/version.h | 4 +- .../win32/win32_installer/bacula-dir.conf.in | 4 - .../win32/win64_installer/bacula-dir.conf.in | 764 +++++++++--------- bacula/technotes | 2 + 4 files changed, 384 insertions(+), 390 deletions(-) diff --git a/bacula/src/version.h b/bacula/src/version.h index b02c75667b..2ddecf90d7 100644 --- a/bacula/src/version.h +++ b/bacula/src/version.h @@ -4,8 +4,8 @@ #undef VERSION #define VERSION "3.0.1" -#define BDATE "26 April 2009" -#define LSMDATE "26Apr09" +#define BDATE "28 April 2009" +#define LSMDATE "28Apr09" #define PROG_COPYRIGHT "Copyright (C) %d-2009 Free Software Foundation Europe e.V.\n" #define BYEAR "2009" /* year for copyright messages in progs */ diff --git a/bacula/src/win32/win32_installer/bacula-dir.conf.in b/bacula/src/win32/win32_installer/bacula-dir.conf.in index 8a53eeee08..6b3fe43a48 100644 --- a/bacula/src/win32/win32_installer/bacula-dir.conf.in +++ b/bacula/src/win32/win32_installer/bacula-dir.conf.in @@ -116,10 +116,6 @@ FileSet { # files can be useful # Exclude { - Options { - signature = MD5 - ignore case = yes - } File = C:/Temp File = C:/tmp } diff --git a/bacula/src/win32/win64_installer/bacula-dir.conf.in b/bacula/src/win32/win64_installer/bacula-dir.conf.in index 8a53eeee08..c42f225aed 100644 --- a/bacula/src/win32/win64_installer/bacula-dir.conf.in +++ b/bacula/src/win32/win64_installer/bacula-dir.conf.in @@ -1,384 +1,380 @@ -# -# Default Bacula Director Configuration file -# -# The only thing that MUST be changed is to add one or more -# file or directory names in the Include directive of the -# FileSet resource. -# -# For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@ @DISTVER@ -# -# You might also want to change the default email address -# from root to your address. See the "mail" and "operator" -# directives in the Messages resource. -# - -Director { # define myself - Name = @director_name@ - DIRport = @director_port@ # where we listen for UA connections - QueryFile = "@bin_dir@\\query.sql" - WorkingDirectory = "@working_dir@" - PidDirectory = "@working_dir@" - Maximum Concurrent Jobs = @director_maxjobs@ - Password = "@director_password@" # Console password - Messages = Daemon -} - -JobDefs { - Name = "DefaultJob" - Type = Backup - Level = Incremental - Client = @client_name@ - FileSet = "Test Set" - Schedule = "WeeklyCycle" - Storage = File - Messages = Standard - Pool = Default - Priority = 10 -} - - -# -# Define the main nightly save backup job -# By default, this job will back up to disk in C:/tmp -Job { - Name = "Client1" - JobDefs = "DefaultJob" - Write Bootstrap = "@working_dir@\\Client1.bsr" -} - -#Job { -# Name = "Client2" -# Client = @client_name@2 -# JobDefs = "DefaultJob" -# Write Bootstrap = "@working_dir@\\Client2.bsr" -#} - -# Backup the catalog database (after the nightly save) -Job { - Name = "BackupCatalog" - JobDefs = "DefaultJob" - Level = Full - FileSet="Catalog" - Schedule = "WeeklyCycleAfterBackup" - # This creates an ASCII copy of the catalog - RunBeforeJob = "\"@bin_dir@\\make_catalog_backup\" bacula bacula" - # This deletes the copy of the catalog - RunAfterJob = "\"@bin_dir@\\delete_catalog_backup\"" - Write Bootstrap = "@working_dir@\\BackupCatalog.bsr" - Priority = 11 # run after main backup -} - -# -# Standard Restore template, to be changed by Console program -# Only one such job is needed for all Jobs/Clients/Storage ... -# -Job { - Name = "RestoreFiles" - Type = Restore - Client=@client_name@ - FileSet="Test Set" - Storage = File - Pool = Default - Messages = Standard - Where = "C:\\tmp\\bacula-restores" -} - -# -# Note: Windows path separators do NOT work correctly in FileSets. -# -# List of files to be backed up -FileSet { - Name = "Test Set" - Include { - Options { - signature = MD5 - ignore case = yes - } -# -# Put your list of files here, preceded by 'File =', one per line -# or include an external list with: -# -# File =