From f45ba58e483ec4061e5a98e87341d608f279cb8c Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Sun, 11 Dec 2011 18:28:18 +0100 Subject: [PATCH] Pass hostname through configure --- bacula-5.2.2-config.patch | 129 ------------------------------------ bacula-5.2.2-hostname.patch | 19 ++++++ bacula.spec | 8 ++- 3 files changed, 25 insertions(+), 131 deletions(-) delete mode 100644 bacula-5.2.2-config.patch create mode 100644 bacula-5.2.2-hostname.patch diff --git a/bacula-5.2.2-config.patch b/bacula-5.2.2-config.patch deleted file mode 100644 index de8c817..0000000 --- a/bacula-5.2.2-config.patch +++ /dev/null @@ -1,129 +0,0 @@ -diff -Naur bacula-5.2.2.old/src/dird/bacula-dir.conf.in bacula-5.2.2/src/dird/bacula-dir.conf.in ---- bacula-5.2.2.old/src/dird/bacula-dir.conf.in 2011-12-05 13:30:02.993111136 +0100 -+++ bacula-5.2.2/src/dird/bacula-dir.conf.in 2011-12-05 13:37:34.149637004 +0100 -@@ -154,7 +154,7 @@ - # Client (File Services) to backup - Client { - Name = @basename@-fd -- Address = @hostname@ -+ Address = client.example.com - FDPort = @fd_port@ - Catalog = MyCatalog - Password = "@fd_password@" # password for FileDaemon -@@ -169,7 +169,7 @@ - # - #Client { - # Name = @basename@2-fd --# Address = @hostname@2 -+# Address = client.example.com2 - # FDPort = @fd_port@ - # Catalog = MyCatalog - # Password = "@fd_password@2" # password for FileDaemon 2 -@@ -183,7 +183,7 @@ - Storage { - Name = File - # Do not use "localhost" here -- Address = @hostname@ # N.B. Use a fully qualified name here -+ Address = storage.example.com # N.B. Use a fully qualified name here - SDPort = @sd_port@ - Password = "@sd_password@" - Device = FileStorage -@@ -196,7 +196,7 @@ - #Storage { - # Name = DDS-4 - # Do not use "localhost" here --# Address = @hostname@ # N.B. Use a fully qualified name here -+# Address = storage.example.com # N.B. Use a fully qualified name here - # SDPort = @sd_port@ - # Password = "@sd_password@" # password for Storage daemon - # Device = DDS-4 # must be same as Device in Storage daemon -@@ -208,7 +208,7 @@ - #Storage { - # Name = "8mmDrive" - # Do not use "localhost" here --# Address = @hostname@ # N.B. Use a fully qualified name here -+# Address = storage.example.com # N.B. Use a fully qualified name here - # SDPort = @sd_port@ - # Password = "@sd_password@" - # Device = "Exabyte 8mm" -@@ -219,7 +219,7 @@ - #Storage { - # Name = "DVD" - # Do not use "localhost" here --# Address = @hostname@ # N.B. Use a fully qualified name here -+# Address = storage.example.com # N.B. Use a fully qualified name here - # SDPort = @sd_port@ - # Password = "@sd_password@" - # Device = "DVD Writer" -diff -Naur bacula-5.2.2.old/src/qt-console/bat.conf.in bacula-5.2.2/src/qt-console/bat.conf.in ---- bacula-5.2.2.old/src/qt-console/bat.conf.in 2011-12-05 13:30:03.128113691 +0100 -+++ bacula-5.2.2/src/qt-console/bat.conf.in 2011-12-05 13:39:38.359990302 +0100 -@@ -5,6 +5,6 @@ - Director { - Name = @basename@-dir - DIRport = @dir_port@ -- address = @hostname@ -+ address = director.example.com - Password = "@dir_password@" - } -diff -Naur bacula-5.2.2.old/src/stored/stored.conf.in bacula-5.2.2/src/stored/stored.conf.in ---- bacula-5.2.2.old/src/stored/stored.conf.in 2011-12-05 13:30:03.112113391 +0100 -+++ bacula-5.2.2/src/stored/stored.conf.in 2011-12-05 13:40:04.777491664 +0100 -@@ -8,7 +8,7 @@ - # - Storage { - Name = "Storage daemon" -- Address = @hostname@ -+ Address = storage.example.com - SDPort = @sd_port@ # Directors port - WorkingDirectory = "@working_dir@" - Pid Directory = "@piddir@" -diff -Naur bacula-5.2.2.old/src/tray-monitor/tray-monitor.conf.in bacula-5.2.2/src/tray-monitor/tray-monitor.conf.in ---- bacula-5.2.2.old/src/tray-monitor/tray-monitor.conf.in 2011-12-05 13:30:02.984110966 +0100 -+++ bacula-5.2.2/src/tray-monitor/tray-monitor.conf.in 2011-12-05 13:39:13.096510765 +0100 -@@ -10,20 +10,20 @@ - - Client { - Name = @basename@-fd -- Address = @hostname@ -+ Address = client.example.com - FDPort = @fd_port@ - Password = "@mon_fd_password@" # password for FileDaemon - } - - Storage { - Name = @basename@-sd -- Address = @hostname@ -+ Address = storage.example.com - SDPort = @sd_port@ - Password = "@mon_sd_password@" # password for StorageDaemon - } - - Director { - Name = @basename@-dir -- DIRport = @dir_port@ -+ DIRport = director.example.com - address = @hostname@ - } -diff -Naur bacula-5.2.2.old/src/wx-console/bwx-console.conf.in bacula-5.2.2/src/wx-console/bwx-console.conf.in ---- bacula-5.2.2.old/src/wx-console/bwx-console.conf.in 2011-12-05 13:30:03.090112973 +0100 -+++ bacula-5.2.2/src/wx-console/bwx-console.conf.in 2011-12-05 13:40:37.193106792 +0100 -@@ -5,6 +5,6 @@ - Director { - Name = @basename@-dir - DIRport = @dir_port@ -- address = @hostname@ -+ address = director.example.com - Password = "@dir_password@" - } -diff -Naur bacula-5.2.2.old/src/console/bconsole.conf.in bacula-5.2.2/src/console/bconsole.conf.in ---- bacula-5.2.2.old/src/console/bconsole.conf.in 2011-12-07 18:16:49.956086547 +0100 -+++ bacula-5.2.2/src/console/bconsole.conf.in 2011-12-07 18:17:15.458575195 +0100 -@@ -5,6 +5,6 @@ - Director { - Name = @basename@-dir - DIRport = @dir_port@ -- address = @hostname@ -+ address = director.example.com - Password = "@dir_password@" - } diff --git a/bacula-5.2.2-hostname.patch b/bacula-5.2.2-hostname.patch new file mode 100644 index 0000000..2ceae2b --- /dev/null +++ b/bacula-5.2.2-hostname.patch @@ -0,0 +1,19 @@ +diff -Naur bacula-5.2.2.old/configure bacula-5.2.2/configure +--- bacula-5.2.2.old/configure 2011-11-26 15:08:12.000000000 +0100 ++++ bacula-5.2.2/configure 2011-12-11 18:17:30.530625327 +0100 +@@ -30019,15 +30019,6 @@ + MACOSX= + COMPRESS_MANPAGES=yes + +-hostname=`uname -n | cut -d '.' -f 1` +-if test x${hostname} = x ; then +- hostname="localhost" +-fi +-ping -c 1 $hostname 2>/dev/null 1>/dev/null +-if test ! $? = 0; then +- hostname="localhost" +-fi +- + case "$DISTNAME" in + aix) + DISTVER=`uname -r` diff --git a/bacula.spec b/bacula.spec index 0748e8a..e0236f7 100644 --- a/bacula.spec +++ b/bacula.spec @@ -22,7 +22,8 @@ Source15: bacula-fd.sysconfig Source16: bacula-dir.sysconfig Source17: bacula-sd.sysconfig Source18: bacula-checkconf -Patch1: bacula-5.2.2-config.patch +# Bug: hostname is ignored during configure, always picks "uname -n" +Patch1: bacula-5.2.2-hostname.patch Patch2: bacula-5.0.2-openssl.patch Patch3: bacula-5.2.2-queryfile.patch Patch4: bacula-5.2.2-mysql.patch @@ -293,7 +294,7 @@ Provides check_bacula support for Nagios. %prep %setup -q %setup -q -a 1 -D -T -%patch1 -p1 -b .config +%patch1 -p1 -b .hostname %patch2 -p2 -b .openssl %patch3 -p1 -b .queryfile %patch4 -p1 -b .mysql @@ -316,6 +317,7 @@ export CPPFLAGS="$RPM_OPT_FLAGS -I%{_includedir}/ncurses" --with-sd-group=disk \ --with-fd-user=root \ --with-fd-group=root \ + --with-hostname=localhost \ --with-basename=bacula \ --with-dir-password=@@DIR_PASSWORD@@ \ --with-fd-password=@@FD_PASSWORD@@ \ @@ -832,6 +834,8 @@ fi - Add bat html docs so the help button works. - Minor packaging changes. - Default permissions on bconsole and bat. +- Use localhost as default on config files instead of patching fake + example.com hostnames. * Sat Dec 10 2011 Simone Caronni - 5.2.2-10 - Added patch for mysql 5.5.18 from Oliver Falk.