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