Jon Ciesla 3bbb33
--- bacula-2.4.3/src/gnome2-console/bgnome-console.conf.in.orig	2008-12-10 10:12:18.000000000 -0600
Jon Ciesla 3bbb33
+++ bacula-2.4.3/src/gnome2-console/bgnome-console.conf.in	2008-12-10 10:12:18.000000000 -0600
Jon Ciesla 3bbb33
@@ -6 +6 @@
Andreas Thienemann 074524
-  Name = @hostname@-dir
Andreas Thienemann 074524
+  Name = bacula-dir
Jon Ciesla 3bbb33
@@ -8 +8 @@
Andreas Thienemann 074524
-  address = @hostname@
Andreas Thienemann 074524
+  address = server.example.com
Jon Ciesla 3bbb33
--- bacula-2.4.3/src/dird/bacula-dir.conf.in.orig	2008-12-10 10:17:27.000000000 -0600
Jon Ciesla 3bbb33
+++ bacula-2.4.3/src/dird/bacula-dir.conf.in	2008-12-10 10:17:27.000000000 -0600
Jon Ciesla 3bbb33
@@ -16 +16 @@
Andreas Thienemann 074524
-  Name = @hostname@-dir
Andreas Thienemann 074524
+  Name = bacula-dir
Jon Ciesla 3bbb33
@@ -30 +30 @@
Andreas Thienemann 074524
-  Client = @hostname@-fd 
Andreas Thienemann 074524
+  Client = bacula-fd 
Jon Ciesla 3bbb33
@@ -51 +51 @@
Andreas Thienemann 074524
-#  Client = @hostname@2-fd
Andreas Thienemann 074524
+#  Client = bacula2-fd
Jon Ciesla 3bbb33
@@ -82 +82 @@
Andreas Thienemann 074524
-  Client=@hostname@-fd                 
Andreas Thienemann 074524
+  Client=bacula-fd                 
Jon Ciesla 3bbb33
@@ -157,2 +157,2 @@
Andreas Thienemann 074524
-  Name = @hostname@-fd
Andreas Thienemann 074524
-  Address = @hostname@
Andreas Thienemann 074524
+  Name = bacula-fd
Andreas Thienemann 074524
+  Address = client.example.com
Jon Ciesla 3bbb33
@@ -172,2 +172,2 @@
Andreas Thienemann 074524
-#  Name = @hostname@2-fd                
Andreas Thienemann 074524
-#  Address = @hostname@2
Andreas Thienemann 074524
+#  Name = bacula2-fd                
Andreas Thienemann 074524
+#  Address = client2.example.com
Jon Ciesla 3bbb33
@@ -187 +187 @@
Andreas Thienemann 074524
-  Address = @hostname@                # N.B. Use a fully qualified name here
Jon Ciesla 3bbb33
+  Address = storage.example.com                # N.B. Use a fully qualified name here
Jon Ciesla 3bbb33
@@ -200 +200 @@
Andreas Thienemann 074524
-#  Address = @hostname@                # N.B. Use a fully qualified name here
Jon Ciesla 3bbb33
+#  Address = storage.example.com                # N.B. Use a fully qualified name here
Jon Ciesla 3bbb33
@@ -212 +212 @@
Andreas Thienemann 074524
-#  Address = @hostname@                # N.B. Use a fully qualified name here
Jon Ciesla 3bbb33
+#  Address = storage.example.com                # N.B. Use a fully qualified name here
Jon Ciesla 3bbb33
@@ -223 +223 @@
Andreas Thienemann 074524
-#  Address = @hostname@                # N.B. Use a fully qualified name here
Jon Ciesla 3bbb33
+#  Address = storage.example.com                # N.B. Use a fully qualified name here
Jon Ciesla 3bbb33
@@ -299 +299 @@
Andreas Thienemann 074524
-  Name = @hostname@-mon
Andreas Thienemann 074524
+  Name = bacula-mon
Jon Ciesla 3bbb33
--- bacula-2.4.3/src/filed/bacula-fd.conf.in.orig	2008-12-10 10:19:12.000000000 -0600
Jon Ciesla 3bbb33
+++ bacula-2.4.3/src/filed/bacula-fd.conf.in	2008-12-10 10:19:12.000000000 -0600
Jon Ciesla 3bbb33
@@ -14 +14 @@
Andreas Thienemann 074524
-  Name = @hostname@-dir
Andreas Thienemann 074524
+  Name = bacula-dir
Jon Ciesla 3bbb33
@@ -23 +23 @@
Andreas Thienemann 074524
-  Name = @hostname@-mon
Andreas Thienemann 074524
+  Name = bacula-mon
Jon Ciesla 3bbb33
@@ -32 +32 @@
Andreas Thienemann 074524
-  Name = @hostname@-fd
Andreas Thienemann 074524
+  Name = bacula-fd
Jon Ciesla 3bbb33
@@ -42 +42 @@
Andreas Thienemann 074524
-  director = @hostname@-dir = all, !skipped, !restored
Andreas Thienemann 074524
+  director = bacula-dir = all, !skipped, !restored
Jon Ciesla 3bbb33
--- bacula-2.4.3/src/stored/bacula-sd.conf.in.orig	2008-12-10 10:21:45.000000000 -0600
Jon Ciesla 3bbb33
+++ bacula-2.4.3/src/stored/bacula-sd.conf.in	2008-12-10 10:21:45.000000000 -0600
Jon Ciesla 3bbb33
@@ -14 +14 @@
Andreas Thienemann 074524
-  Name = @hostname@-sd
Andreas Thienemann 074524
+  Name = bacula-sd
Jon Ciesla 3bbb33
@@ -25 +25 @@
Andreas Thienemann 074524
-  Name = @hostname@-dir
Andreas Thienemann 074524
+  Name = bacula-dir
Jon Ciesla 3bbb33
@@ -34 +34 @@
Andreas Thienemann 074524
-  Name = @hostname@-mon
Andreas Thienemann 074524
+  Name = bacula-mon
Jon Ciesla 3bbb33
@@ -228 +228 @@
Andreas Thienemann 074524
-  director = @hostname@-dir = all
Andreas Thienemann 074524
+  director = bacula-dir = all
Jon Ciesla 3bbb33
--- bacula-2.4.3/src/wx-console/bwx-console.conf.in.orig	2008-12-10 10:22:23.000000000 -0600
Jon Ciesla 3bbb33
+++ bacula-2.4.3/src/wx-console/bwx-console.conf.in	2008-12-10 10:22:23.000000000 -0600
Jon Ciesla 3bbb33
@@ -6 +6 @@
Andreas Thienemann 074524
-  Name = @hostname@-dir
Andreas Thienemann 074524
+  Name = bacula-dir
Jon Ciesla 3bbb33
@@ -8 +8 @@
Andreas Thienemann 074524
-  address = @hostname@
Andreas Thienemann 074524
+  address = server.example.com
Jon Ciesla 3bbb33
--- bacula-2.4.3/src/tray-monitor/tray-monitor.conf.in.orig	2008-12-10 10:28:02.000000000 -0600
Jon Ciesla 3bbb33
+++ bacula-2.4.3/src/tray-monitor/tray-monitor.conf.in	2008-12-10 10:28:02.000000000 -0600
Jon Ciesla 3bbb33
@@ -6 +6 @@
Andreas Thienemann 074524
-  Name = @hostname@-mon
Andreas Thienemann 074524
+  Name = bacula-mon
Jon Ciesla 3bbb33
@@ -12,2 +12,2 @@
Andreas Thienemann 074524
-  Name = @hostname@-fd
Andreas Thienemann 074524
-  Address = @hostname@
Andreas Thienemann 074524
+  Name = bacula-fd
Andreas Thienemann 074524
+  Address = client.example.com
Jon Ciesla 3bbb33
@@ -19,2 +19,2 @@
Andreas Thienemann 074524
-  Name = @hostname@-sd
Andreas Thienemann 074524
-  Address = @hostname@
Andreas Thienemann 074524
+  Name = bacula-sd
Andreas Thienemann 074524
+  Address = storage.example.com
Jon Ciesla 3bbb33
@@ -26 +26 @@
Jon Ciesla 3bbb33
-  Name = @hostname@-dir
Jon Ciesla 3bbb33
+  Name = bacula-dir
Jon Ciesla 3bbb33
@@ -28 +27,0 @@
Jon Ciesla 3bbb33
-  address = @hostname@
Jon Ciesla 3bbb33
--- bacula-2.4.3/src/qt-console/bat.conf.in.orig	2008-12-10 10:27:02.000000000 -0600
Jon Ciesla 3bbb33
+++ bacula-2.4.3/src/qt-console/bat.conf.in	2008-12-10 10:27:02.000000000 -0600
Jon Ciesla 3bbb33
@@ -6 +6 @@
Andreas Thienemann 074524
-  Name = @hostname@-dir
Andreas Thienemann 074524
+  Name = bacula-dir
Jon Ciesla 3bbb33
@@ -8 +8 @@
Andreas Thienemann 074524
-  address = @hostname@
Andreas Thienemann 074524
+  address = server.example.com
Jon Ciesla 3bbb33
--- bacula-2.4.3/src/stored/stored.conf.in.orig	2008-12-10 10:27:44.000000000 -0600
Jon Ciesla 3bbb33
+++ bacula-2.4.3/src/stored/stored.conf.in	2008-12-10 10:27:44.000000000 -0600
Jon Ciesla 3bbb33
@@ -11 +11 @@
Jon Ciesla 3bbb33
-  Address = @hostname@
Jon Ciesla 3bbb33
+  Address = storage.example.com
Jon Ciesla 3bbb33
@@ -22 +22 @@
Jon Ciesla 3bbb33
-  Name = @hostname@-dir
Jon Ciesla 3bbb33
+  Name = bacula-dir
Jon Ciesla 3bbb33
@@ -54 +54 @@
Jon Ciesla 3bbb33
-  director = @hostname@-dir = all
Jon Ciesla 3bbb33
+  director = bacula-dir = all