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