[pkg-bacula-commits] [bacula] 02/09: change template variables names
Carsten Leonhardt
leo at moszumanska.debian.org
Wed Jul 20 10:57:37 UTC 2016
This is an automated email from the git hooks/post-receive script.
leo pushed a commit to tag development/migrate-to-ucf-2012-06-07
in repository bacula.
commit e8b89177609328118b991bfc57fd06a399be8160
Author: Alexander Golovko <alexandro at ankalagon.ru>
Date: Tue Jun 5 19:11:25 2012 +0400
change template variables names
It's needed for use new substitute() function
@debian_hostname@ -> XXX_HOSTNAME_XXX
XXX_*PASSWORD_XXX -> XXX_*PASSWD_XXX
---
debian/patches/fix-default-config | 42 +++++++++++++++++++--------------------
debian/rules | 14 ++++++-------
2 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/debian/patches/fix-default-config b/debian/patches/fix-default-config
index 53eca14..be7adf4 100644
--- a/debian/patches/fix-default-config
+++ b/debian/patches/fix-default-config
@@ -8,7 +8,7 @@ Last-Update: 2012-06-01
Director { # define myself
- Name = @basename at -dir
-+ Name = @debian_hostname at -dir
++ Name = XXX_HOSTNAME_XXX-dir
DIRport = @dir_port@ # where we listen for UA connections
QueryFile = "@scriptdir@/query.sql"
WorkingDirectory = "@working_dir@"
@@ -24,7 +24,7 @@ Last-Update: 2012-06-01
Type = Backup
Level = Incremental
- Client = @basename at -fd
-+ Client = @debian_hostname at -fd
++ Client = XXX_HOSTNAME_XXX-fd
FileSet = "Full Set"
Schedule = "WeeklyCycle"
Storage = File
@@ -33,7 +33,7 @@ Last-Update: 2012-06-01
#Job {
# Name = "BackupClient2"
-# Client = @basename at 2-fd
-+# Client = @debian_hostname at 2-fd
++# Client = XXX_HOSTNAME_XXX2-fd
# JobDefs = "DefaultJob"
#}
@@ -42,7 +42,7 @@ Last-Update: 2012-06-01
Name = "RestoreFiles"
Type = Restore
- Client=@basename at -fd
-+ Client=@debian_hostname at -fd
++ Client=XXX_HOSTNAME_XXX-fd
FileSet="Full Set"
Storage = File
Pool = Default
@@ -51,7 +51,7 @@ Last-Update: 2012-06-01
# Client (File Services) to backup
Client {
- Name = @basename at -fd
-+ Name = @debian_hostname at -fd
++ Name = XXX_HOSTNAME_XXX-fd
Address = @hostname@
FDPort = @fd_port@
Catalog = MyCatalog
@@ -60,7 +60,7 @@ Last-Update: 2012-06-01
#
#Client {
-# Name = @basename at 2-fd
-+# Name = @debian_hostname at 2-fd
++# Name = XXX_HOSTNAME_XXX2-fd
# Address = @hostname at 2
# FDPort = @fd_port@
# Catalog = MyCatalog
@@ -69,7 +69,7 @@ Last-Update: 2012-06-01
#
Console {
- Name = @basename at -mon
-+ Name = @debian_hostname at -mon
++ Name = XXX_HOSTNAME_XXX-mon
Password = "@mon_dir_password@"
CommandACL = status, .status
}
@@ -80,7 +80,7 @@ Last-Update: 2012-06-01
#
Director {
- Name = @basename at -dir
-+ Name = @debian_hostname at -dir
++ Name = XXX_HOSTNAME_XXX-dir
Password = "@fd_password@"
}
@@ -89,7 +89,7 @@ Last-Update: 2012-06-01
#
Director {
- Name = @basename at -mon
-+ Name = @debian_hostname at -mon
++ Name = XXX_HOSTNAME_XXX-mon
Password = "@mon_fd_password@"
Monitor = yes
}
@@ -98,7 +98,7 @@ Last-Update: 2012-06-01
#
FileDaemon { # this is me
- Name = @basename at -fd
-+ Name = @debian_hostname at -fd
++ Name = XXX_HOSTNAME_XXX-fd
FDport = @fd_port@ # where we listen for the director
WorkingDirectory = @working_dir@
Pid Directory = @piddir@
@@ -110,7 +110,7 @@ Last-Update: 2012-06-01
Messages {
Name = Standard
- director = @basename at -dir = all, !skipped, !restored
-+ director = @debian_hostname at -dir = all, !skipped, !restored
++ director = XXX_HOSTNAME_XXX-dir = all, !skipped, !restored
}
--- a/src/stored/bacula-sd.conf.in
+++ b/src/stored/bacula-sd.conf.in
@@ -119,7 +119,7 @@ Last-Update: 2012-06-01
Storage { # definition of myself
- Name = @basename at -sd
-+ Name = @debian_hostname at -sd
++ Name = XXX_HOSTNAME_XXX-sd
SDPort = @sd_port@ # Director's port
WorkingDirectory = "@working_dir@"
Pid Directory = "@piddir@"
@@ -132,7 +132,7 @@ Last-Update: 2012-06-01
#
Director {
- Name = @basename at -dir
-+ Name = @debian_hostname at -dir
++ Name = XXX_HOSTNAME_XXX-dir
Password = "@sd_password@"
}
@@ -141,7 +141,7 @@ Last-Update: 2012-06-01
#
Director {
- Name = @basename at -mon
-+ Name = @debian_hostname at -mon
++ Name = XXX_HOSTNAME_XXX-mon
Password = "@mon_sd_password@"
Monitor = yes
}
@@ -150,7 +150,7 @@ Last-Update: 2012-06-01
Messages {
Name = Standard
- director = @basename at -dir = all
-+ director = @debian_hostname at -dir = all
++ director = XXX_HOSTNAME_XXX-dir = all
}
--- a/src/stored/stored.conf.in
+++ b/src/stored/stored.conf.in
@@ -169,7 +169,7 @@ Last-Update: 2012-06-01
Director {
- Name = @basename at -dir
-+ Name = @debian_hostname at -dir
++ Name = XXX_HOSTNAME_XXX-dir
DIRport = @dir_port@
address = @hostname@
Password = "@dir_password@"
@@ -180,7 +180,7 @@ Last-Update: 2012-06-01
Director {
- Name = @basename at -dir
-+ Name = @debian_hostname at -dir
++ Name = XXX_HOSTNAME_XXX-dir
DIRport = @dir_port@
address = @hostname@
Password = "@dir_password@"
@@ -191,14 +191,14 @@ Last-Update: 2012-06-01
Monitor {
- Name = @basename at -mon
-+ Name = @debian_hostname at -mon
++ Name = XXX_HOSTNAME_XXX-mon
Password = "@mon_dir_password@" # password for the Directors
RefreshInterval = 5 seconds
}
Client {
- Name = @basename at -fd
-+ Name = @debian_hostname at -fd
++ Name = XXX_HOSTNAME_XXX-fd
Address = @hostname@
FDPort = @fd_port@
Password = "@mon_fd_password@" # password for FileDaemon
@@ -206,7 +206,7 @@ Last-Update: 2012-06-01
Storage {
- Name = @basename at -sd
-+ Name = @debian_hostname at -sd
++ Name = XXX_HOSTNAME_XXX-sd
Address = @hostname@
SDPort = @sd_port@
Password = "@mon_sd_password@" # password for StorageDaemon
@@ -214,7 +214,7 @@ Last-Update: 2012-06-01
Director {
- Name = @basename at -dir
-+ Name = @debian_hostname at -dir
++ Name = XXX_HOSTNAME_XXX-dir
DIRport = @dir_port@
address = @hostname@
}
diff --git a/debian/rules b/debian/rules
index c37a1e1..c2ac5df 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,15 +25,15 @@ CONF_ALL = \
--libdir=\$${prefix}/lib/bacula \
--enable-batch-insert \
--enable-ipv6 \
- --with-dir-password=XXX_DIRPASSWORD_XXX \
- --with-fd-password=XXX_FDPASSWORD_XXX \
- --with-sd-password=XXX_SDPASSWORD_XXX \
- --with-mon-dir-password=XXX_MONDIRPASSWORD_XXX \
- --with-mon-fd-password=XXX_MONFDPASSWORD_XXX \
- --with-mon-sd-password=XXX_MONSDPASSWORD_XXX \
+ --with-dir-password=XXX_DIRPASSWD_XXX \
+ --with-fd-password=XXX_FDPASSWD_XXX \
+ --with-sd-password=XXX_SDPASSWD_XXX \
+ --with-mon-dir-password=XXX_DIRMPASSWD_XXX \
+ --with-mon-fd-password=XXX_FDMPASSWD_XXX \
+ --with-mon-sd-password=XXX_SDMPASSWD_XXX \
--with-db-name=XXX_DBNAME_XXX \
--with-db-user=XXX_DBUSER_XXX \
- --with-db-password=XXX_DBPASSWORD_XXX \
+ --with-db-password=XXX_DBPASS_XXX \
--config-cache \
--with-archivedir=/nonexistant/path/to/file/archive/dir \
--sysconfdir=/etc/bacula \
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-bacula/bacula.git
More information about the pkg-bacula-commits
mailing list