Skip to content
This repository has been archived by the owner on Mar 19, 2021. It is now read-only.

Commit

Permalink
Suppress auditing events.
Browse files Browse the repository at this point in the history 
As we now have preliminary support for audit events we should change the
configs a bit so that these are supressed and not written to the normal
logfiles as that would break some regression checks.
  • Loading branch information
Marco van Wieringen committed Jul 23, 2014
1 parent 286250f commit 1bae4e8
Show file tree
Hide file tree
Showing 48 changed files with 196 additions and 196 deletions.
4 changes: 2 additions & 2 deletions configs/allowed-jobcommand-test/bareos-dir.conf.allowed-jobcommand-test.in
View file
Expand Up @@ -90,8 +90,8 @@ Catalog {

Messages {
Name = Standard
console = all, !skipped, !saved
catalog = all, !skipped
console = all, !skipped, !saved, !audit
catalog = all, !skipped, !audit
}

# Default pool definition
Expand Down
2 changes: 1 addition & 1 deletion configs/allowed-jobcommand-test/bareos-fd.conf.allowed-jobcommand-test.in
View file
Expand Up @@ -34,5 +34,5 @@ FileDaemon { # this is me
# Send all messages except skipped files back to Director
Messages {
Name = Standard
director = @hostname@-dir = all, !skipped, !restored
director = @hostname@-dir = all, !skipped, !restored, !audit
}
4 changes: 2 additions & 2 deletions configs/allowed-scriptdir-test/bareos-dir.conf.allowed-scriptdir-test.in
View file
Expand Up @@ -91,8 +91,8 @@ Catalog {

Messages {
Name = Standard
console = all, !skipped, !saved
catalog = all, !skipped
console = all, !skipped, !saved, !audit
catalog = all, !skipped, !audit
}

# Default pool definition
Expand Down
2 changes: 1 addition & 1 deletion configs/allowed-scriptdir-test/bareos-fd.conf.allowed-scriptdir-test.in
View file
Expand Up @@ -29,5 +29,5 @@ FileDaemon { # this is me
# Send all messages except skipped files back to Director
Messages {
Name = Standard
director = @hostname@-dir = all, !skipped, !restored
director = @hostname@-dir = all, !skipped, !restored, !audit
}
4 changes: 2 additions & 2 deletions configs/bandwidth-limit-per-client-test/bareos-dir.conf.in
View file
Expand Up @@ -91,8 +91,8 @@ Catalog {

Messages {
Name = Standard
console = all, !skipped, !saved
catalog = all, !skipped
console = all, !skipped, !saved, !audit
catalog = all, !skipped, !audit
}

# Default pool definition
Expand Down
4 changes: 2 additions & 2 deletions configs/quota-hardquota-test/bareos-dir.conf.quota-hardquota-test.in
View file
Expand Up @@ -96,8 +96,8 @@ Catalog {

Messages {
Name = Standard
console = all, !skipped, !saved
catalog = all, !skipped
console = all, !skipped, !saved, !audit
catalog = all, !skipped, !audit
}

# Default pool definition
Expand Down
4 changes: 2 additions & 2 deletions configs/quota-includefailed-test/bareos-dir.conf.quota-includefailed-test.in
View file
Expand Up @@ -108,8 +108,8 @@ Catalog {

Messages {
Name = Standard
console = all, !skipped, !saved
catalog = all, !skipped
console = all, !skipped, !saved, !audit
catalog = all, !skipped, !audit
}

# Default pool definition
Expand Down
4 changes: 2 additions & 2 deletions configs/quota-softquota-test/bareos-dir.conf.quota-softquota-test.in
View file
Expand Up @@ -96,8 +96,8 @@ Catalog {

Messages {
Name = Standard
console = all, !skipped, !saved
catalog = all, !skipped
console = all, !skipped, !saved, !audit
catalog = all, !skipped, !audit
}

# Default pool definition
Expand Down
4 changes: 2 additions & 2 deletions configs/rerun-test/bareos-dir.conf.rerun-test.in
View file
Expand Up @@ -106,8 +106,8 @@ Catalog {

Messages {
Name = Standard
console = all, !skipped, !saved
catalog = all, !skipped
console = all, !skipped, !saved, !audit
catalog = all, !skipped, !audit
}

# Default pool definition
Expand Down
12 changes: 6 additions & 6 deletions configs/scsi-crypto-test/bareos-dir.conf.scsi-crypto-test.in
View file
Expand Up @@ -249,24 +249,24 @@ Messages {
Name = Standard
mailcommand = "@sbindir@/bsmtp -h @hostname@ -f \"\(Bareos regression Job %j\) %r\" -s \"Regression: %t %e of %c %l\" %r"
operatorcommand = "@sbindir@/bsmtp -h @hostname@ -f \"\(Bareos regression Job %j\) %r\" -s \"Regression: Intervention needed for %j\" %r"
console = all, !skipped, !terminate, !restored
console = all, !skipped, !terminate, !restored, !audit
#
# WARNING! the following will create a file that you must cycle from
# time to time as it will grow indefinitely. However, it will
# also keep all your messages if the scroll off the console.
#
append = "@working_dir@/log" = all, !skipped
catalog = all, !skipped
append = "@working_dir@/log" = all, !skipped, !audit
catalog = all, !skipped, !audit
}

#
# Message delivery for daemon messages (no job).
Messages {
Name = Daemon
mailcommand = "@sbindir@/bsmtp -h @hostname@ -f \"\(Bareos regression\) %r\" -s \"Regression daemon message\" %r"
console = all, !skipped, !saved
append = "@working_dir@/log" = all, !skipped
catalog = all, !skipped
console = all, !skipped, !saved, !audit
append = "@working_dir@/log" = all, !skipped, !audit
catalog = all, !skipped, !audit
}


Expand Down
4 changes: 2 additions & 2 deletions configs/status-schedule-test/bareos-dir.conf.status-schedule-test.in
View file
Expand Up @@ -88,8 +88,8 @@ Catalog {

Messages {
Name = Standard
console = all, !skipped, !saved
catalog = all, !skipped
console = all, !skipped, !saved, !audit
catalog = all, !skipped, !audit
}

# Default pool definition
Expand Down
4 changes: 2 additions & 2 deletions configs/subscription-test/bareos-dir.conf.subscription-test.in
View file
Expand Up @@ -107,8 +107,8 @@ Catalog {

Messages {
Name = Standard
console = all, !skipped, !saved
catalog = all, !skipped
console = all, !skipped, !saved, !audit
catalog = all, !skipped, !audit
}

# Default pool definition
Expand Down
14 changes: 7 additions & 7 deletions scripts/bareos-dir-2client.conf.in
View file
Expand Up @@ -242,25 +242,25 @@ Messages {
operatorcommand = "@sbindir@/bsmtp -h localhost -f \"\(Bareos regression Job %j\) %r\" -s \"Regression: Intervention needed for %j\" %r"
# MailOnError = @job_email@ = all, !terminate
# operator = @job_email@ = mount
console = all, !skipped, !terminate, !restored
console = all, !skipped, !terminate, !restored, !audit
#
# WARNING! the following will create a file that you must cycle from
# time to time as it will grow indefinitely. However, it will
# also keep all your messages if the scroll off the console.
#
append = "@working_dir@/log" = all, !skipped
catalog = all, !skipped
append = "@working_dir@/log" = all, !skipped, !audit
catalog = all, !skipped, !audit
}

#
# Message delivery for daemon messages (no job).
Messages {
Name = Daemon
mailcommand = "@sbindir@/bsmtp -h @smtp_host@ -f \"\(Bareos regression\) %r\" -s \"Regression daemon message\" %r"
# mail = @job_email@ = all, !skipped
console = all, !skipped, !saved
append = "@working_dir@/log" = all, !skipped
catalog = all, !skipped
# mail = @job_email@ = all, !skipped, !audit
console = all, !skipped, !saved, !audit
append = "@working_dir@/log" = all, !skipped, !audit
catalog = all, !skipped, !audit
}


Expand Down
14 changes: 7 additions & 7 deletions scripts/bareos-dir-2d.conf.in
View file
Expand Up @@ -125,25 +125,25 @@ Messages {
# operatorcommand = "@sbindir@/bsmtp -h localhost -f \"\(Bareos regression Job %j\) %r\" -s \"Regression: Intervention needed for %j\" %r"
# MailOnError = @job_email@ = all, !terminate
# operator = @job_email@ = mount
console = all, !skipped, !terminate, !restored
console = all, !skipped, !terminate, !restored, !audit
#
# WARNING! the following will create a file that you must cycle from
# time to time as it will grow indefinitely. However, it will
# also keep all your messages if the scroll off the console.
#
append = "@working_dir@/log" = all, !skipped
catalog = all, !skipped
append = "@working_dir@/log" = all, !skipped, !audit
catalog = all, !skipped, !audit
}

#
# Message delivery for daemon messages (no job).
Messages {
Name = Daemon
mailcommand = "@sbindir@/bsmtp -h localhost -f \"\(Bareos regression\) %r\" -s \"Regression daemon message\" %r"
# mail = @job_email@ = all, !skipped
console = all, !skipped, !saved
append = "@working_dir@/log" = all, !skipped
catalog = all, !skipped
# mail = @job_email@ = all, !skipped, !audit
console = all, !skipped, !saved, !audit
append = "@working_dir@/log" = all, !skipped, !audit
catalog = all, !skipped, !audit
}


Expand Down
14 changes: 7 additions & 7 deletions scripts/bareos-dir-fifo.conf.in
View file
Expand Up @@ -171,25 +171,25 @@ Messages {
operatorcommand = "@sbindir@/bsmtp -h localhost -f \"\(Bareos Regression Job %j\) %r\" -s \"Regression: Intervention needed for %j\" %r"
# MailOnError = @job_email@ = all, !terminate
# operator = @job_email@ = mount
console = all, !skipped, !terminate, !restored
console = all, !skipped, !terminate, !restored, !audit
#
# WARNING! the following will create a file that you must cycle from
# time to time as it will grow indefinitely. However, it will
# also keep all your messages if the scroll off the console.
#
append = "@working_dir@/log" = all, !skipped
catalog = all, !skipped
append = "@working_dir@/log" = all, !skipped, !audit
catalog = all, !skipped, !audit
}

#
# Message delivery for daemon messages (no job).
Messages {
Name = Daemon
mailcommand = "@sbindir@/bsmtp -h @smtp_host@ -f \"\(Bareos regression\) %r\" -s \"Regression daemon message\" %r"
# mail = @job_email@ = all, !skipped
console = all, !skipped, !saved
append = "@working_dir@/log" = all, !skipped
catalog = all, !skipped
# mail = @job_email@ = all, !skipped, !audit
console = all, !skipped, !saved, !audit
append = "@working_dir@/log" = all, !skipped, !audit
catalog = all, !skipped, !audit
}


Expand Down
14 changes: 7 additions & 7 deletions scripts/bareos-dir-migration-sd-sd.conf.in
View file
Expand Up @@ -194,25 +194,25 @@ Messages {
operatorcommand = "@sbindir@/bsmtp -h localhost -f \"\(Bareos regression Job %j\) %r\" -s \"Regression: Intervention needed for %j\" %r"
# MailOnError = @job_email@ = all, !terminate
# operator = @job_email@ = mount
console = all, !skipped, !terminate, !restored
console = all, !skipped, !terminate, !restored, !audit
#
# WARNING! the following will create a file that you must cycle from
# time to time as it will grow indefinitely. However, it will
# also keep all your messages if the scroll off the console.
#
append = "@working_dir@/log" = all, !skipped
catalog = all, !skipped
append = "@working_dir@/log" = all, !skipped, !audit
catalog = all, !skipped, !audit
}

#
# Message delivery for daemon messages (no job).
Messages {
Name = Daemon
mailcommand = "@sbindir@/bsmtp -h @smtp_host@ -f \"\(Bareos regression\) %r\" -s \"Regression daemon message\" %r"
# mail = @job_email@ = all, !skipped
console = all, !skipped, !saved
append = "@working_dir@/log" = all, !skipped
catalog = all, !skipped
# mail = @job_email@ = all, !skipped, !audit
console = all, !skipped, !saved, !audit
append = "@working_dir@/log" = all, !skipped, !audit
catalog = all, !skipped, !audit
}


Expand Down
14 changes: 7 additions & 7 deletions scripts/bareos-dir-migration.conf.in
View file
Expand Up @@ -194,25 +194,25 @@ Messages {
operatorcommand = "@sbindir@/bsmtp -h localhost -f \"\(Bareos regression Job %j\) %r\" -s \"Regression: Intervention needed for %j\" %r"
# MailOnError = @job_email@ = all, !terminate
# operator = @job_email@ = mount
console = all, !skipped, !terminate, !restored
console = all, !skipped, !terminate, !restored, !audit
#
# WARNING! the following will create a file that you must cycle from
# time to time as it will grow indefinitely. However, it will
# also keep all your messages if the scroll off the console.
#
append = "@working_dir@/log" = all, !skipped
catalog = all, !skipped
append = "@working_dir@/log" = all, !skipped, !audit
catalog = all, !skipped, !audit
}

#
# Message delivery for daemon messages (no job).
Messages {
Name = Daemon
mailcommand = "@sbindir@/bsmtp -h @smtp_host@ -f \"\(Bareos regression\) %r\" -s \"Regression daemon message\" %r"
# mail = @job_email@ = all, !skipped
console = all, !skipped, !saved
append = "@working_dir@/log" = all, !skipped
catalog = all, !skipped
# mail = @job_email@ = all, !skipped, !audit
console = all, !skipped, !saved, !audit
append = "@working_dir@/log" = all, !skipped, !audit
catalog = all, !skipped, !audit
}


Expand Down
12 changes: 6 additions & 6 deletions scripts/bareos-dir-strip.conf.in
View file
Expand Up @@ -177,24 +177,24 @@ Messages {
operatorcommand = "@sbindir@/bsmtp -h localhost -f \"\(Bareos Regression Job %j\) %r\" -s \"Regression: Intervention needed for %j\" %r"
# MailOnError = @job_email@ = all, !terminate
# operator = @job_email@ = mount
console = all, !skipped, !terminate, !restored
console = all, !skipped, !terminate, !restored, !audit
#
# WARNING! the following will create a file that you must cycle from
# time to time as it will grow indefinitely. However, it will
# also keep all your messages if the scroll off the console.
#
append = "@working_dir@/log" = all, !skipped
catalog = all, !skipped
append = "@working_dir@/log" = all, !skipped, !audit
catalog = all, !skipped, !audit
}

#
# Message delivery for daemon messages (no job).
Messages {
Name = Daemon
mailcommand = "@sbindir@/bsmtp -h @smtp_host@ -f \"\(Bareos regression\) %r\" -s \"Regression daemon message\" %r"
# mail = @job_email@ = all, !skipped
console = all, !skipped, !saved
append = "@working_dir@/log" = all, !skipped
# mail = @job_email@ = all, !skipped, !audit
console = all, !skipped, !saved, !audit
append = "@working_dir@/log" = all, !skipped, !audit
}


Expand Down
14 changes: 7 additions & 7 deletions scripts/bareos-dir-tape.conf.in
View file
Expand Up @@ -250,25 +250,25 @@ Messages {
operatorcommand = "@sbindir@/bsmtp -h localhost -f \"\(Bareos regression Job %j\) %r\" -s \"Regression: Intervention needed for %j\" %r"
# MailOnError = @job_email@ = all, !terminate
# operator = @job_email@ = mount
console = all, !skipped, !terminate, !restored
console = all, !skipped, !terminate, !restored, !audit
#
# WARNING! the following will create a file that you must cycle from
# time to time as it will grow indefinitely. However, it will
# also keep all your messages if the scroll off the console.
#
append = "@working_dir@/log" = all, !skipped
catalog = all, !skipped
append = "@working_dir@/log" = all, !skipped, !audit
catalog = all, !skipped, !audit
}

#
# Message delivery for daemon messages (no job).
Messages {
Name = Daemon
mailcommand = "@sbindir@/bsmtp -h @smtp_host@ -f \"\(Bareos regression\) %r\" -s \"Regression daemon message\" %r"
# mail = @job_email@ = all, !skipped
console = all, !skipped, !saved
append = "@working_dir@/log" = all, !skipped
catalog = all, !skipped
# mail = @job_email@ = all, !skipped, !audit
console = all, !skipped, !saved, !audit
append = "@working_dir@/log" = all, !skipped, !audit
catalog = all, !skipped, !audit
}


Expand Down

0 comments on commit 1bae4e8

Please sign in to comment.