Merge pull request #247 from bareos/dev/franku/bareos-18.2/cleanup

regress: removed user specific paths in config files

core/src/tests/configs/console-director/tls_disabled/bareos-dir.d/director/bareos-dir.conf → core/src/tests/configs/console-director/tls_disabled/bareos-dir.d/director/bareos-dir.conf.in

@@ -1,6 +1,6 @@
 Director {                            # define myself
   Name = bareos-dir
-  QueryFile = "/home/franku/01-prj/git/bareos-18.2-release-fixes/regress/bin/query.sql"
+  QueryFile = "@regressdir@/bin/query.sql"
   Maximum Concurrent Jobs = 10
   Password = "bareos"         # Console password
   Messages = Daemon
@@ -15,12 +15,12 @@ Director {                            # define myself
   # Heartbeat Interval = 1 min
 
   # remove comment in next line to load dynamic backends from specified directory
-  # Backend Directory = /home/franku/01-prj/git/bareos-18.2-release-fixes/regress/usr/lib/bareos/backends
+  # Backend Directory = @regressdir@/usr/lib/bareos/backends
 
   # remove comment from "Plugin Directory" to load plugins from specified directory.
   # if "Plugin Names" is defined, only the specified plugins will be loaded,
   # otherwise all director plugins (*-dir.so) from the "Plugin Directory".
   #
-  # Plugin Directory = "/home/franku/01-prj/git/bareos-18.2-release-fixes/regress/bin/plugins"
+  # Plugin Directory = "@regressdir@/bin/plugins"
   # Plugin Names = ""
 }

core/src/tests/configs/console-director/tls_disabled/bareos-dir.d/fileset/Catalog.conf.in

@@ -0,0 +1,11 @@
+FileSet {
+  Name = "Catalog"
+  Description = "Backup the catalog dump and Bareos configuration files."
+  Include {
+    Options {
+      signature = MD5
+    }
+    File = "@regressdir@/working/regress.sql" # database dump
+    File = "@regressdir@/bin"                   # configuration
+  }
+}

core/src/tests/configs/console-director/tls_psk_default_enabled/bareos-dir.d/fileset/LinuxAll.conf → core/src/tests/configs/console-director/tls_disabled/bareos-dir.d/fileset/LinuxAll.conf.in

@@ -17,11 +17,11 @@ FileSet {
     File = /
   }
   # Things that usually have to be excluded
-  # You have to exclude /home/franku/01-prj/git/bareos-18.2-release-fixes/regress/tmp
+  # You have to exclude @regressdir@/tmp
   # on your bareos server
   Exclude {
-    File = /home/franku/01-prj/git/bareos-18.2-release-fixes/regress/working
-    File = /home/franku/01-prj/git/bareos-18.2-release-fixes/regress/tmp
+    File = @regressdir@/working
+    File = @regressdir@/tmp
     File = /proc
     File = /tmp
     File = /var/tmp

core/src/tests/configs/console-director/tls_psk_default_enabled/bareos-dir.d/fileset/SelfTest.conf → core/src/tests/configs/console-director/tls_disabled/bareos-dir.d/fileset/SelfTest.conf.in

@@ -5,6 +5,6 @@ FileSet {
     Options {
       Signature = MD5 # calculate md5 checksum per file
     }
-    File = "/home/franku/01-prj/git/bareos-18.2-release-fixes/regress/bin"
+    File = "@regressdir@/bin"
   }
 }

core/src/tests/configs/console-director/tls_psk_default_enabled/bareos-dir.d/job/BackupCatalog.conf → core/src/tests/configs/console-director/tls_disabled/bareos-dir.d/job/BackupCatalog.conf.in

@@ -9,13 +9,13 @@ Job {
   # This creates an ASCII copy of the catalog
   # Arguments to make_catalog_backup.pl are:
   #  make_catalog_backup.pl <catalog-name>
-  RunBeforeJob = "/home/franku/01-prj/git/bareos-18.2-release-fixes/regress/bin/make_catalog_backup.pl MyCatalog"
+  RunBeforeJob = "@regressdir@/bin/make_catalog_backup.pl MyCatalog"
 
   # This deletes the copy of the catalog
-  RunAfterJob  = "/home/franku/01-prj/git/bareos-18.2-release-fixes/regress/bin/delete_catalog_backup"
+  RunAfterJob  = "@regressdir@/bin/delete_catalog_backup"
 
   # This sends the bootstrap via mail for disaster recovery.
   # Should be sent to another system, please change recipient accordingly
-  Write Bootstrap = "|/home/franku/01-prj/git/bareos-18.2-release-fixes/regress/bin/bsmtp -h localhost -f \"\(Bareos\) \" -s \"Bootstrap for Job %j\" my-name@domain.com" # (#01)
+  Write Bootstrap = "|@regressdir@/bin/bsmtp -h localhost -f \"\(Bareos\) \" -s \"Bootstrap for Job %j\" my-name@domain.com" # (#01)
   Priority = 11                   # run after main backup
 }

core/src/tests/configs/console-director/tls_disabled/bareos-dir.d/jobdefs/DefaultJob.conf → core/src/tests/configs/console-director/tls_disabled/bareos-dir.d/jobdefs/DefaultJob.conf.in

@@ -9,7 +9,7 @@ JobDefs {
   Messages = Standard
   Pool = Incremental
   Priority = 10
-  Write Bootstrap = "/home/franku/01-prj/git/bareos-18.2-release-fixes/regress/working/%c.bsr"
+  Write Bootstrap = "@regressdir@/working/%c.bsr"
   Full Backup Pool = Full                  # write Full Backups into "Full" Pool         (#05)
   Differential Backup Pool = Differential  # write Diff Backups into "Differential" Pool (#08)
   Incremental Backup Pool = Incremental    # write Incr Backups into "Incremental" Pool  (#11)

core/src/tests/configs/console-director/tls_disabled/bareos-dir.d/messages/Daemon.conf.in

@@ -0,0 +1,9 @@
+Messages {
+  Name = Daemon
+  Description = "Message delivery for daemon messages (no job)."
+  mailcommand = "@regressdir@/bin/bsmtp -h localhost -f \"\(Bareos\) \<%r\>\" -s \"Bareos daemon message\" %r"
+  mail = my-name@domain.com = all, !skipped, !audit # (#02)
+  console = all, !skipped, !saved, !audit
+  append = "@regressdir@/working/bareos.log" = all, !skipped, !audit
+  append = "@regressdir@/working/bareos-audit.log" = audit
+}

core/src/tests/configs/console-director/tls_disabled/bareos-dir.d/messages/Standard.conf.in

@@ -0,0 +1,11 @@
+Messages {
+  Name = Standard
+  Description = "Reasonable message delivery -- send most everything to email address and to the console."
+  operatorcommand = "@regressdir@/bin/bsmtp -h localhost -f \"\(Bareos\) \<%r\>\" -s \"Bareos: Intervention needed for %j\" %r"
+  mailcommand = "@regressdir@/bin/bsmtp -h localhost -f \"\(Bareos\) \<%r\>\" -s \"Bareos: %t %e of %c %l\" %r"
+  operator = my-name@domain.com = mount                                 # (#03)
+  mail = my-name@domain.com = all, !skipped, !saved, !audit             # (#02)
+  console = all, !skipped, !saved, !audit
+  append = "@regressdir@/working/bareos.log" = all, !skipped, !saved, !audit
+  catalog = all, !skipped, !saved, !audit
+}

core/src/tests/configs/console-director/tls_psk_default_enabled/bareos-dir.d/director/bareos-dir.conf → core/src/tests/configs/console-director/tls_psk_default_enabled/bareos-dir.d/director/bareos-dir.conf.in

@@ -1,6 +1,6 @@
 Director {                            # define myself
   Name = bareos-dir
-  QueryFile = "/home/franku/01-prj/git/bareos-18.2-release-fixes/regress/bin/query.sql"
+  QueryFile = "@regressdir@/bin/query.sql"
   Maximum Concurrent Jobs = 10
   Password = "bareos"         # Console password
   Messages = Daemon
@@ -14,12 +14,12 @@ Director {                            # define myself
   # Heartbeat Interval = 1 min
 
   # remove comment in next line to load dynamic backends from specified directory
-  # Backend Directory = /home/franku/01-prj/git/bareos-18.2-release-fixes/regress/usr/lib/bareos/backends
+  # Backend Directory = @regressdir@/usr/lib/bareos/backends
 
   # remove comment from "Plugin Directory" to load plugins from specified directory.
   # if "Plugin Names" is defined, only the specified plugins will be loaded,
   # otherwise all director plugins (*-dir.so) from the "Plugin Directory".
   #
-  # Plugin Directory = "/home/franku/01-prj/git/bareos-18.2-release-fixes/regress/bin/plugins"
+  # Plugin Directory = "@regressdir@/bin/plugins"
   # Plugin Names = ""
 }

core/src/tests/configs/console-director/tls_psk_default_enabled/bareos-dir.d/fileset/Catalog.conf.in

@@ -0,0 +1,11 @@
+FileSet {
+  Name = "Catalog"
+  Description = "Backup the catalog dump and Bareos configuration files."
+  Include {
+    Options {
+      signature = MD5
+    }
+    File = "@regressdir@/working/regress.sql" # database dump
+    File = "@regressdir@/bin"                   # configuration
+  }
+}

core/src/tests/configs/console-director/tls_disabled/bareos-dir.d/fileset/LinuxAll.conf → core/src/tests/configs/console-director/tls_psk_default_enabled/bareos-dir.d/fileset/LinuxAll.conf.in

@@ -17,11 +17,11 @@ FileSet {
     File = /
   }
   # Things that usually have to be excluded
-  # You have to exclude /home/franku/01-prj/git/bareos-18.2-release-fixes/regress/tmp
+  # You have to exclude @regressdir@/tmp
   # on your bareos server
   Exclude {
-    File = /home/franku/01-prj/git/bareos-18.2-release-fixes/regress/working
-    File = /home/franku/01-prj/git/bareos-18.2-release-fixes/regress/tmp
+    File = @regressdir@/working
+    File = @regressdir@/tmp
     File = /proc
     File = /tmp
     File = /var/tmp

core/src/tests/configs/console-director/tls_disabled/bareos-dir.d/fileset/SelfTest.conf → core/src/tests/configs/console-director/tls_psk_default_enabled/bareos-dir.d/fileset/SelfTest.conf.in

@@ -5,6 +5,6 @@ FileSet {
     Options {
       Signature = MD5 # calculate md5 checksum per file
     }
-    File = "/home/franku/01-prj/git/bareos-18.2-release-fixes/regress/bin"
+    File = "@regressdir@/bin"
   }
 }

core/src/tests/configs/console-director/tls_disabled/bareos-dir.d/job/BackupCatalog.conf → core/src/tests/configs/console-director/tls_psk_default_enabled/bareos-dir.d/job/BackupCatalog.conf.in

@@ -9,13 +9,13 @@ Job {
   # This creates an ASCII copy of the catalog
   # Arguments to make_catalog_backup.pl are:
   #  make_catalog_backup.pl <catalog-name>
-  RunBeforeJob = "/home/franku/01-prj/git/bareos-18.2-release-fixes/regress/bin/make_catalog_backup.pl MyCatalog"
+  RunBeforeJob = "@regressdir@/bin/make_catalog_backup.pl MyCatalog"
 
   # This deletes the copy of the catalog
-  RunAfterJob  = "/home/franku/01-prj/git/bareos-18.2-release-fixes/regress/bin/delete_catalog_backup"
+  RunAfterJob  = "@regressdir@/bin/delete_catalog_backup"
 
   # This sends the bootstrap via mail for disaster recovery.
   # Should be sent to another system, please change recipient accordingly
-  Write Bootstrap = "|/home/franku/01-prj/git/bareos-18.2-release-fixes/regress/bin/bsmtp -h localhost -f \"\(Bareos\) \" -s \"Bootstrap for Job %j\" my-name@domain.com" # (#01)
+  Write Bootstrap = "|@regressdir@/bin/bsmtp -h localhost -f \"\(Bareos\) \" -s \"Bootstrap for Job %j\" my-name@domain.com" # (#01)
   Priority = 11                   # run after main backup
 }

core/src/tests/configs/console-director/tls_psk_default_enabled/bareos-dir.d/jobdefs/DefaultJob.conf → core/src/tests/configs/console-director/tls_psk_default_enabled/bareos-dir.d/jobdefs/DefaultJob.conf.in

@@ -9,7 +9,7 @@ JobDefs {
   Messages = Standard
   Pool = Incremental
   Priority = 10
-  Write Bootstrap = "/home/franku/01-prj/git/bareos-18.2-release-fixes/regress/working/%c.bsr"
+  Write Bootstrap = "@regressdir@/working/%c.bsr"
   Full Backup Pool = Full                  # write Full Backups into "Full" Pool         (#05)
   Differential Backup Pool = Differential  # write Diff Backups into "Differential" Pool (#08)
   Incremental Backup Pool = Incremental    # write Incr Backups into "Incremental" Pool  (#11)

core/src/tests/configs/console-director/tls_psk_default_enabled/bareos-dir.d/messages/Daemon.conf.in

@@ -0,0 +1,9 @@
+Messages {
+  Name = Daemon
+  Description = "Message delivery for daemon messages (no job)."
+  mailcommand = "@regressdir@/bin/bsmtp -h localhost -f \"\(Bareos\) \<%r\>\" -s \"Bareos daemon message\" %r"
+  mail = my-name@domain.com = all, !skipped, !audit # (#02)
+  console = all, !skipped, !saved, !audit
+  append = "@regressdir@/working/bareos.log" = all, !skipped, !audit
+  append = "@regressdir@/working/bareos-audit.log" = audit
+}

core/src/tests/configs/console-director/tls_psk_default_enabled/bareos-dir.d/messages/Standard.conf.in

@@ -0,0 +1,11 @@
+Messages {
+  Name = Standard
+  Description = "Reasonable message delivery -- send most everything to email address and to the console."
+  operatorcommand = "@regressdir@/bin/bsmtp -h localhost -f \"\(Bareos\) \<%r\>\" -s \"Bareos: Intervention needed for %j\" %r"
+  mailcommand = "@regressdir@/bin/bsmtp -h localhost -f \"\(Bareos\) \<%r\>\" -s \"Bareos: %t %e of %c %l\" %r"
+  operator = my-name@domain.com = mount                                 # (#03)
+  mail = my-name@domain.com = all, !skipped, !saved, !audit             # (#02)
+  console = all, !skipped, !saved, !audit
+  append = "@regressdir@/working/bareos.log" = all, !skipped, !saved, !audit
+  catalog = all, !skipped, !saved, !audit
+}

regress/configs/tray-monitor-connection-test-cleartext/bareos-sd.conf.in

@@ -13,13 +13,13 @@
 Storage {                             # definition of myself
   Name = 127.0.0.1-sd
   Maximum Concurrent Jobs = 20
-  Secure Erase Command = "/home/franku/01-prj/git/bareos-18.2-release-fixes/regress/bin/wipe-sd.sh"
+  Secure Erase Command = "@regressdir@/bin/wipe-sd.sh"
 
   # remove comment from "Plugin Directory" to load plugins from specified directory.
   # if "Plugin Names" is defined, only the specified plugins will be loaded,
   # otherwise all storage plugins (*-sd.so) from the "Plugin Directory".
   #
-  # Plugin Directory = /home/franku/01-prj/git/bareos-18.2-release-fixes/regress/bin/plugins
+  # Plugin Directory = @regressdir@/bin/plugins
   # Plugin Names = ""
 }
 
@@ -49,8 +49,8 @@ Director {
 Device {
   Name = FileStorage
   Media Type = File
-  Archive Device = /home/franku/01-prj/git/bareos-18.2-release-fixes/regress/tmp
-  Spool Directory = /home/franku/01-prj/git/bareos-18.2-release-fixes/regress/tmp
+  Archive Device = @regressdir@/tmp
+  Spool Directory = @regressdir@/tmp
   Maximum Spool Size = 10M
   LabelMedia = yes;                   # lets Bareos label unlabeled media
   Random Access = yes;

regress/configs/tray-monitor-connection-test-tls-psk/bareos-sd.conf.in

@@ -13,13 +13,13 @@
 Storage {                             # definition of myself
   Name = 127.0.0.1-sd
   Maximum Concurrent Jobs = 20
-  Secure Erase Command = "/home/franku/01-prj/git/bareos-18.2-release-fixes/regress/bin/wipe-sd.sh"
+  Secure Erase Command = "@regressdir@/bin/wipe-sd.sh"
 
   # remove comment from "Plugin Directory" to load plugins from specified directory.
   # if "Plugin Names" is defined, only the specified plugins will be loaded,
   # otherwise all storage plugins (*-sd.so) from the "Plugin Directory".
   #
-  # Plugin Directory = /home/franku/01-prj/git/bareos-18.2-release-fixes/regress/bin/plugins
+  # Plugin Directory = @regressdir@/bin/plugins
   # Plugin Names = ""
 }
 
@@ -48,8 +48,8 @@ Director {
 Device {
   Name = FileStorage
   Media Type = File
-  Archive Device = /home/franku/01-prj/git/bareos-18.2-release-fixes/regress/tmp
-  Spool Directory = /home/franku/01-prj/git/bareos-18.2-release-fixes/regress/tmp
+  Archive Device = @regressdir@/tmp
+  Spool Directory = @regressdir@/tmp
   Maximum Spool Size = 10M
   LabelMedia = yes;                   # lets Bareos label unlabeled media
   Random Access = yes;