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

Commit

Permalink
Remove all references to @subsysdir@
Browse files Browse the repository at this point in the history
  • Loading branch information
Marco van Wieringen committed Dec 3, 2014
1 parent 5b3348f commit db70c15
Show file tree
Hide file tree
Showing 64 changed files with 0 additions and 64 deletions.
1 change: 0 additions & 1 deletion configs/allowed-jobcommand-test/bareos-dir.conf.allowed-jobcommand-test.in
View file
Expand Up @@ -16,7 +16,6 @@ Director { # define myself
QueryFile = "@scriptdir@/query.sql"
WorkingDirectory = "@working_dir@"
PidDirectory = "@piddir@"
SubSysDirectory = "@subsysdir@"
Maximum Concurrent Jobs = 4
Password = "pNvX1WiXnwv2C/F7E52LGvw6rKjbbPvu2kyuPa9pVaL3" # Console password
Messages = Standard
Expand Down
1 change: 0 additions & 1 deletion configs/allowed-scriptdir-test/bareos-dir.conf.allowed-scriptdir-test.in
View file
Expand Up @@ -16,7 +16,6 @@ Director { # define myself
QueryFile = "@scriptdir@/query.sql"
WorkingDirectory = "@working_dir@"
PidDirectory = "@piddir@"
SubSysDirectory = "@subsysdir@"
Maximum Concurrent Jobs = 4
Password = "pNvX1WiXnwv2C/F7E52LGvw6rKjbbPvu2kyuPa9pVaL3" # Console password
Messages = Standard
Expand Down
1 change: 0 additions & 1 deletion configs/bandwidth-limit-per-client-test/bareos-dir.conf.in
View file
Expand Up @@ -16,7 +16,6 @@ Director { # define myself
QueryFile = "@scriptdir@/query.sql"
WorkingDirectory = "@working_dir@"
PidDirectory = "@piddir@"
SubSysDirectory = "@subsysdir@"
Maximum Concurrent Jobs = 4
Password = "pNvX1WiXnwv2C/F7E52LGvw6rKjbbPvu2kyuPa9pVaL3" # Console password
Messages = Standard
Expand Down
1 change: 0 additions & 1 deletion configs/quota-hardquota-test/bareos-dir.conf.quota-hardquota-test.in
View file
Expand Up @@ -16,7 +16,6 @@ Director { # define myself
QueryFile = "@scriptdir@/query.sql"
WorkingDirectory = "@working_dir@"
PidDirectory = "@piddir@"
SubSysDirectory = "@subsysdir@"
Maximum Concurrent Jobs = 4
Password = "pNvX1WiXnwv2C/F7E52LGvw6rKjbbPvu2kyuPa9pVaL3" # Console password
Messages = Standard
Expand Down
1 change: 0 additions & 1 deletion configs/quota-includefailed-test/bareos-dir.conf.quota-includefailed-test.in
View file
Expand Up @@ -16,7 +16,6 @@ Director { # define myself
QueryFile = "@scriptdir@/query.sql"
WorkingDirectory = "@working_dir@"
PidDirectory = "@piddir@"
SubSysDirectory = "@subsysdir@"
Maximum Concurrent Jobs = 4
Password = "pNvX1WiXnwv2C/F7E52LGvw6rKjbbPvu2kyuPa9pVaL3" # Console password
Messages = Standard
Expand Down
1 change: 0 additions & 1 deletion configs/quota-softquota-test/bareos-dir.conf.quota-softquota-test.in
View file
Expand Up @@ -16,7 +16,6 @@ Director { # define myself
QueryFile = "@scriptdir@/query.sql"
WorkingDirectory = "@working_dir@"
PidDirectory = "@piddir@"
SubSysDirectory = "@subsysdir@"
Maximum Concurrent Jobs = 4
Password = "pNvX1WiXnwv2C/F7E52LGvw6rKjbbPvu2kyuPa9pVaL3" # Console password
Messages = Standard
Expand Down
1 change: 0 additions & 1 deletion configs/rerun-test/bareos-dir.conf.rerun-test.in
View file
Expand Up @@ -16,7 +16,6 @@ Director { # define myself
QueryFile = "@scriptdir@/query.sql"
WorkingDirectory = "@working_dir@"
PidDirectory = "@piddir@"
SubSysDirectory = "@subsysdir@"
Maximum Concurrent Jobs = 4
Password = "pNvX1WiXnwv2C/F7E52LGvw6rKjbbPvu2kyuPa9pVaL3" # Console password
Messages = Standard
Expand Down
1 change: 0 additions & 1 deletion configs/scsi-crypto-test/bareos-sd.conf.scsi-crypto-test.in
View file
Expand Up @@ -13,7 +13,6 @@ Storage {
SDPort = 8103
WorkingDirectory = "@working_dir@"
Pid Directory = "@piddir@"
SubSys Directory = "@subsysdir@"
Plugin Directory = "@sbindir@/plugins"
Maximum Concurrent Jobs = 100
}
Expand Down
1 change: 0 additions & 1 deletion configs/status-schedule-test/bareos-dir.conf.status-schedule-test.in
View file
Expand Up @@ -16,7 +16,6 @@ Director { # define myself
QueryFile = "@scriptdir@/query.sql"
WorkingDirectory = "@working_dir@"
PidDirectory = "@piddir@"
SubSysDirectory = "@subsysdir@"
Maximum Concurrent Jobs = 4
Password = "pNvX1WiXnwv2C/F7E52LGvw6rKjbbPvu2kyuPa9pVaL3" # Console password
Messages = Standard
Expand Down
1 change: 0 additions & 1 deletion configs/subscription-test/bareos-dir.conf.subscription-test.in
View file
Expand Up @@ -16,7 +16,6 @@ Director { # define myself
QueryFile = "@scriptdir@/query.sql"
WorkingDirectory = "@working_dir@"
PidDirectory = "@piddir@"
SubSysDirectory = "@subsysdir@"
Maximum Concurrent Jobs = 4
Password = "pNvX1WiXnwv2C/F7E52LGvw6rKjbbPvu2kyuPa9pVaL3" # Console password
Messages = Standard
Expand Down
1 change: 0 additions & 1 deletion scripts/ansi-sd-tape.conf.in
View file
Expand Up @@ -13,7 +13,6 @@ Storage { # definition of myself
SDPort = @sdport@ # Director's port
WorkingDirectory = "@working_dir@"
Pid Directory = "@piddir@"
Subsys Directory = "@subsysdir@"
}

#
Expand Down
1 change: 0 additions & 1 deletion scripts/bareos-dir.conf.accurate.in
View file
Expand Up @@ -18,7 +18,6 @@ Director { # define myself
QueryFile = "@scriptdir@/query.sql"
WorkingDirectory = "@working_dir@"
PidDirectory = "@piddir@"
SubSysDirectory = "@subsysdir@"
Maximum Concurrent Jobs = 4
Password = "pNvX1WiXnwv2C/F7E52LGvw6rKjbbPvu2kyuPa9pVaL3" # Console password
Messages = Standard
Expand Down
1 change: 0 additions & 1 deletion scripts/bareos-dir.conf.errors.in
View file
Expand Up @@ -18,7 +18,6 @@ Director { # define myself
QueryFile = "@scriptdir@/query.sql"
WorkingDirectory = "@working_dir@"
PidDirectory = "@piddir@"
SubSysDirectory = "@subsysdir@"
Maximum Concurrent Jobs = 4
Password = "pNvX1WiXnwv2C/F7E52LGvw6rKjbbPvu2kyuPa9pVaL3" # Console password
Messages = Standard
Expand Down
1 change: 0 additions & 1 deletion scripts/bareos-dir.conf.maxruntime.in
View file
Expand Up @@ -18,7 +18,6 @@ Director { # define myself
QueryFile = "@scriptdir@/query.sql"
WorkingDirectory = "@working_dir@"
PidDirectory = "@piddir@"
SubSysDirectory = "@subsysdir@"
Maximum Concurrent Jobs = 1
Password = "pNvX1WiXnwv2C/F7E52LGvw6rKjbbPvu2kyuPa9pVaL3" # Console password
Messages = Standard
Expand Down
1 change: 0 additions & 1 deletion scripts/bareos-dir.conf.maxtime.in
View file
Expand Up @@ -18,7 +18,6 @@ Director { # define myself
QueryFile = "@scriptdir@/query.sql"
WorkingDirectory = "@working_dir@"
PidDirectory = "@piddir@"
SubSysDirectory = "@subsysdir@"
Maximum Concurrent Jobs = 1
Password = "pNvX1WiXnwv2C/F7E52LGvw6rKjbbPvu2kyuPa9pVaL3" # Console password
Messages = Standard
Expand Down
1 change: 0 additions & 1 deletion scripts/bareos-dir.conf.regexwhere.in
View file
Expand Up @@ -8,7 +8,6 @@ Director { # define myself
QueryFile = "@scriptdir@/query.sql"
WorkingDirectory = "@working_dir@"
PidDirectory = "@piddir@"
SubSysDirectory = "@subsysdir@"
Maximum Concurrent Jobs = 4
Password = "pNvX1WiXnwv2C/F7E52LGvw6rKjbbPvu2kyuPa9pVaL3" # Console password
Messages = Standard
Expand Down
1 change: 0 additions & 1 deletion scripts/bareos-dir.conf.testrunscript.in
View file
Expand Up @@ -18,7 +18,6 @@ Director { # define myself
QueryFile = "@scriptdir@/query.sql"
WorkingDirectory = "@working_dir@"
PidDirectory = "@piddir@"
SubSysDirectory = "@subsysdir@"
Maximum Concurrent Jobs = 4
Password = "pNvX1WiXnwv2C/F7E52LGvw6rKjbbPvu2kyuPa9pVaL3" # Console password
Messages = Standard
Expand Down
1 change: 0 additions & 1 deletion scripts/bareos-sd-2d.conf.in
View file
Expand Up @@ -10,7 +10,6 @@ Storage { # definition of myself
SDPort = @sdport@ # Director's port
WorkingDirectory = "@working_dir@"
Pid Directory = "@piddir@"
Subsys Directory = "@subsysdir@"
}

#
Expand Down
1 change: 0 additions & 1 deletion scripts/bareos-sd-2disk-drive.conf.in
View file
Expand Up @@ -13,7 +13,6 @@ Storage { # definition of myself
SDPort = @sdport@ # Director's port
WorkingDirectory = "@working_dir@"
Pid Directory = "@piddir@"
Subsys Directory = "@subsysdir@"
Maximum Concurrent Jobs = 100
}

Expand Down
1 change: 0 additions & 1 deletion scripts/bareos-sd-2disk.conf.in
View file
Expand Up @@ -13,7 +13,6 @@ Storage { # definition of myself
SDPort = @sdport@ # Director's port
WorkingDirectory = "@working_dir@"
Pid Directory = "@piddir@"
Subsys Directory = "@subsysdir@"
}

#
Expand Down
1 change: 0 additions & 1 deletion scripts/bareos-sd-2drive.conf.in
View file
Expand Up @@ -13,7 +13,6 @@ Storage { # definition of myself
SDPort = @sdport@ # Director's port
WorkingDirectory = "@working_dir@"
Pid Directory = "@piddir@"
Subsys Directory = "@subsysdir@"
}

#
Expand Down
1 change: 0 additions & 1 deletion scripts/bareos-sd-2tape.conf.in
View file
Expand Up @@ -13,7 +13,6 @@ Storage { # definition of myself
SDPort = @sdport@ # Director's port
WorkingDirectory = "@working_dir@"
Pid Directory = "@piddir@"
Subsys Directory = "@subsysdir@"
}

#
Expand Down
1 change: 0 additions & 1 deletion scripts/bareos-sd-btape.conf.in
View file
Expand Up @@ -13,7 +13,6 @@ Storage { # definition of myself
SDPort = @sdport@ # Director's port
WorkingDirectory = "@working_dir@"
Pid Directory = "@piddir@"
Subsys Directory = "@subsysdir@"
Maximum Concurrent Jobs = 100
}

Expand Down
1 change: 0 additions & 1 deletion scripts/bareos-sd-fifo.conf.in
View file
Expand Up @@ -13,7 +13,6 @@ Storage { # definition of myself
SDPort = @sdport@ # Director's port
WorkingDirectory = "@working_dir@"
Pid Directory = "@piddir@"
Subsys Directory = "@subsysdir@"
}

#
Expand Down
1 change: 0 additions & 1 deletion scripts/bareos-sd-migration-sd-sd1.conf.in
View file
Expand Up @@ -13,7 +13,6 @@ Storage { # definition of myself
SDPort = @sdport@ # Director's port
WorkingDirectory = "@working_dir@"
Pid Directory = "@piddir@"
Subsys Directory = "@subsysdir@"
}

#
Expand Down
1 change: 0 additions & 1 deletion scripts/bareos-sd-migration-sd-sd2.conf.in
View file
Expand Up @@ -13,7 +13,6 @@ Storage { # definition of myself
SDPort = @sdport2@ # Director's port
WorkingDirectory = "@working_dir@"
Pid Directory = "@piddir@"
Subsys Directory = "@subsysdir@"
}

#
Expand Down
1 change: 0 additions & 1 deletion scripts/bareos-sd-migration.conf.in
View file
Expand Up @@ -13,7 +13,6 @@ Storage { # definition of myself
SDPort = @sdport@ # Director's port
WorkingDirectory = "@working_dir@"
Pid Directory = "@piddir@"
Subsys Directory = "@subsysdir@"
}

#
Expand Down
1 change: 0 additions & 1 deletion scripts/bareos-sd-tape.conf.in
View file
Expand Up @@ -13,7 +13,6 @@ Storage { # definition of myself
SDPort = @sdport@ # Director's port
WorkingDirectory = "@working_dir@"
Pid Directory = "@piddir@"
Subsys Directory = "@subsysdir@"
Maximum Concurrent Jobs = 100
}

Expand Down
1 change: 0 additions & 1 deletion scripts/bareos-sd-virtual.conf.in
View file
Expand Up @@ -13,7 +13,6 @@ Storage { # definition of myself
SDPort = @sdport@ # Director's port
WorkingDirectory = "@working_dir@"
Pid Directory = "@piddir@"
Subsys Directory = "@subsysdir@"
}

#
Expand Down
1 change: 0 additions & 1 deletion scripts/broken-media-bug-2-bareos-dir.conf.in
View file
Expand Up @@ -7,7 +7,6 @@ Director { # define myself
QueryFile = "@scriptdir@/query.sql"
WorkingDirectory = "@working_dir@"
PidDirectory = "@piddir@"
SubSysDirectory = "@subsysdir@"
PluginDirectory = "@sbindir@"
Maximum Concurrent Jobs = 4
Password = "pNvX1WiXnwv2C/F7E52LGvw6rKjbbPvu2kyuPa9pVaL3" # Console password
Expand Down
1 change: 0 additions & 1 deletion scripts/broken-media-bug-2-bareos-sd.conf.in
View file
Expand Up @@ -13,7 +13,6 @@ Storage { # definition of myself
SDPort = @sdport@ # Director's port
WorkingDirectory = "@working_dir@"
Pid Directory = "@piddir@"
Subsys Directory = "@subsysdir@"
}

#
Expand Down
1 change: 0 additions & 1 deletion scripts/broken-media-bug-bareos-dir.conf.in
View file
Expand Up @@ -7,7 +7,6 @@ Director { # define myself
QueryFile = "@scriptdir@/query.sql"
WorkingDirectory = "@working_dir@"
PidDirectory = "@piddir@"
SubSysDirectory = "@subsysdir@"
PluginDirectory = "@sbindir@"
Maximum Concurrent Jobs = 4
Password = "pNvX1WiXnwv2C/F7E52LGvw6rKjbbPvu2kyuPa9pVaL3" # Console password
Expand Down
1 change: 0 additions & 1 deletion scripts/create_sed
View file
Expand Up @@ -38,7 +38,6 @@ echo "s%@sbindir@%${bin}%g" >${out}
echo "s%@scriptdir@%${scripts}%g" >>${out}
echo "s%@working_dir@%${working}%g" >>${out}
echo "s%@piddir@%${working}%g" >>${out}
echo "s%@subsysdir@%${working}%g" >>${out}
echo "s%@job_email@%${EMAIL}%g" >>${out}
echo "s%@tape_drive@%${TAPE_DRIVE}%g" >>${out}
echo "s%@autochanger@%${AUTOCHANGER}%g" >>${out}
Expand Down
1 change: 0 additions & 1 deletion scripts/crypto-bareos-fd.conf.in
View file
Expand Up @@ -21,7 +21,6 @@ FileDaemon { # this is me
FDPort = @fdport@ # where we listen for the director
WorkingDirectory = "@working_dir@"
Pid Directory = "@piddir@"
SubSys Directory = "@subsysdir@"
PKI Signatures = Yes
PKI Encryption = Yes
PKI Keypair = "@scriptdir@/cryptokeypair.pem"
Expand Down
1 change: 0 additions & 1 deletion scripts/multi-client-bareos-dir.conf.in
View file
Expand Up @@ -16,7 +16,6 @@ Director { # define myself
QueryFile = "@scriptdir@/query.sql"
WorkingDirectory = "@working_dir@"
PidDirectory = "@piddir@"
SubSysDirectory = "@subsysdir@"
Maximum Concurrent Jobs = 10
Password = "pNvX1WiXnwv2C/F7E52LGvw6rKjbbPvu2kyuPa9pVaL3" # Console password
Messages = Daemon
Expand Down
1 change: 0 additions & 1 deletion scripts/new-test-bareos-dir.conf.in
View file
Expand Up @@ -16,7 +16,6 @@ Director { # define myself
QueryFile = "@scriptdir@/query.sql"
WorkingDirectory = "@working_dir@"
PidDirectory = "@piddir@"
SubSysDirectory = "@subsysdir@"
PluginDirectory = "@sbindir@"
Maximum Concurrent Jobs = 4
Heartbeat Interval = 330
Expand Down
1 change: 0 additions & 1 deletion scripts/plugin-test-bareos-dir.conf.in
View file
Expand Up @@ -16,7 +16,6 @@ Director { # define myself
QueryFile = "@scriptdir@/query.sql"
WorkingDirectory = "@working_dir@"
PidDirectory = "@piddir@"
SubSysDirectory = "@subsysdir@"
PluginDirectory = "@sbindir@/plugins"
Maximum Concurrent Jobs = 4
Password = "pNvX1WiXnwv2C/F7E52LGvw6rKjbbPvu2kyuPa9pVaL3" # Console password
Expand Down
1 change: 0 additions & 1 deletion scripts/test-bareos-dir.conf.in
View file
Expand Up @@ -16,7 +16,6 @@ Director { # define myself
QueryFile = "@scriptdir@/query.sql"
WorkingDirectory = "@working_dir@"
PidDirectory = "@piddir@"
SubSysDirectory = "@subsysdir@"
Maximum Concurrent Jobs = 4
Password = "pNvX1WiXnwv2C/F7E52LGvw6rKjbbPvu2kyuPa9pVaL3" # Console password
Messages = Daemon
Expand Down
1 change: 0 additions & 1 deletion scripts/test-bareos-fd.conf.in
View file
Expand Up @@ -21,7 +21,6 @@ FileDaemon { # this is me
FDPort = @fdport@ # where we listen for the director
WorkingDirectory = "@working_dir@"
Pid Directory = "@piddir@"
SubSys Directory = "@subsysdir@"
Plugin Directory = "@sbindir@/plugins"
Maximum Concurrent Jobs = 100
}
Expand Down
1 change: 0 additions & 1 deletion scripts/test-bareos-sd.conf.in
View file
Expand Up @@ -13,7 +13,6 @@ Storage { # definition of myself
SDPort = @sdport@ # Director's port
WorkingDirectory = "@working_dir@"
Pid Directory = "@piddir@"
Subsys Directory = "@subsysdir@"
}

#
Expand Down
1 change: 0 additions & 1 deletion scripts/testa-bareos-dir.conf.in
View file
Expand Up @@ -8,7 +8,6 @@ Director { # define myself
QueryFile = "@scriptdir@/query.sql"
WorkingDirectory = "@working_dir@"
PidDirectory = "@piddir@"
SubSysDirectory = "@subsysdir@"
Maximum Concurrent Jobs = 1
Password = "pNvX1WiXnwv2C/F7E52LGvw6rKjbbPvu2kyuPa9pVaL3" # Console password
Messages = Standard
Expand Down
1 change: 0 additions & 1 deletion scripts/testb-bareos-dir.conf.in
View file
Expand Up @@ -8,7 +8,6 @@ Director { # define myself
QueryFile = "@scriptdir@/query.sql"
WorkingDirectory = "@working_dir@"
PidDirectory = "@piddir@"
SubSysDirectory = "@subsysdir@"
Maximum Concurrent Jobs = 20
Password = "pNvX1WiXnwv2C/F7E52LGvw6rKjbbPvu2kyuPa9pVaL3" # Console password
Messages = Standard
Expand Down
1 change: 0 additions & 1 deletion scripts/tls-auth-bareos-dir.conf.in
View file
Expand Up @@ -16,7 +16,6 @@ Director { # define myself
QueryFile = "@scriptdir@/query.sql"
WorkingDirectory = "@working_dir@"
PidDirectory = "@piddir@"
SubSysDirectory = "@subsysdir@"
Maximum Concurrent Jobs = 4
Password = "pNvX1WiXnwv2C/F7E52LGvw6rKjbbPvu2kyuPa9pVaL3" # Console password
Messages = Standard
Expand Down
1 change: 0 additions & 1 deletion scripts/tls-auth-bareos-fd.conf.in
View file
Expand Up @@ -26,7 +26,6 @@ FileDaemon { # this is me
FDPort = @fdport@ # where we listen for the director
WorkingDirectory = "@working_dir@"
Pid Directory = "@piddir@"
SubSys Directory = "@subsysdir@"
TLS Authenticate = yes
TLS Require = no
TLS Certificate = "@scriptdir@/tls-cert.pem"
Expand Down
1 change: 0 additions & 1 deletion scripts/tls-auth-bareos-sd.conf.in
View file
Expand Up @@ -13,7 +13,6 @@ Storage { # definition of myself
SDPort = @sdport@ # Director's port
WorkingDirectory = "@working_dir@"
Pid Directory = "@piddir@"
Subsys Directory = "@subsysdir@"
TLS Authenticate = yes
TLS Require = no
TLS Certificate = "@scriptdir@/tls-cert.pem"
Expand Down
1 change: 0 additions & 1 deletion scripts/tls-bareos-dir.conf.in
View file
Expand Up @@ -16,7 +16,6 @@ Director { # define myself
QueryFile = "@scriptdir@/query.sql"
WorkingDirectory = "@working_dir@"
PidDirectory = "@piddir@"
SubSysDirectory = "@subsysdir@"
Maximum Concurrent Jobs = 10
Password = "pNvX1WiXnwv2C/F7E52LGvw6rKjbbPvu2kyuPa9pVaL3" # Console password
Messages = Standard
Expand Down
1 change: 0 additions & 1 deletion scripts/tls-bareos-fd.conf.in
View file
Expand Up @@ -25,7 +25,6 @@ FileDaemon { # this is me
FDPort = @fdport@ # where we listen for the director
WorkingDirectory = "@working_dir@"
Pid Directory = "@piddir@"
SubSys Directory = "@subsysdir@"
Plugin Directory = "@sbindir@/plugins"
Maximum Concurrent Jobs = 100
TLS Require = yes
Expand Down
1 change: 0 additions & 1 deletion scripts/tls-bareos-sd.conf.in
View file
Expand Up @@ -13,7 +13,6 @@ Storage { # definition of myself
SDPort = @sdport@ # Director's port
WorkingDirectory = "@working_dir@"
Pid Directory = "@piddir@"
Subsys Directory = "@subsysdir@"
TLS Require = yes
TLS Certificate = "@scriptdir@/tls-cert.pem"
TLS Key = "@scriptdir@/tls-cert.pem"
Expand Down
1 change: 0 additions & 1 deletion scripts/win32-bareos-fd.conf.in
View file
Expand Up @@ -21,7 +21,6 @@ FileDaemon { # this is me
FDport = 8102 # where we listen for the director
WorkingDirectory = "/home/kern/bareos/regress/working"
Pid Directory = "/home/kern/bareos/regress/working"
SubSys Directory = "/home/kern/bareos/regress/working"
}

# Send all messages except skipped files back to Director
Expand Down
1 change: 0 additions & 1 deletion scripts/win32-bareos-sd-tape.conf.in
View file
Expand Up @@ -13,7 +13,6 @@ Storage { # definition of myself
SDPort = 8103 # Director's port
WorkingDirectory = "/home/kern/bareos/regress/working"
Pid Directory = "/home/kern/bareos/regress/working"
Subsys Directory = "/home/kern/bareos/regress/working"
}

#
Expand Down

0 comments on commit db70c15

Please sign in to comment.