From: Valentin Vidic <Valentin.Vidic@CARNet.hr>
Date: Tue, 8 Mar 2011 12:27:46 +0000 (+0100)
Subject: Fix bconsole config.
X-Git-Tag: debian/20110308~3
X-Git-Url: http://ftp.carnet.hr/pub/carnet-debian/scm?a=commitdiff_plain;h=0b427c0c03e09ecf0a3099318d5578419de74916;p=bacula-cn.git

Fix bconsole config.
---

diff --git a/debian/postinst b/debian/postinst
index 021ff8f..b7049bf 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -91,7 +91,7 @@ EOF
 generate_bconsole_config() {
     BCONSOLE_CONFIG=/etc/bacula/bconsole.conf
 
-    if [ -s $BCONSOLE_CONFIG ] && grep -q 'sysbackup-dir' $BCONSOLE_CONFIG; then
+    if [ -s $BCONSOLE_CONFIG ] && grep -q 'Console {' $BCONSOLE_CONFIG; then
         echo $BCONSOLE_CONFIG already exists, skipping.
     else
         umask 077
@@ -111,7 +111,7 @@ Director {
   Name = sysbackup-dir
   DIRport = 9101
   address = sysbackup.carnet.hr
-  Password = "$PASS_BCONSOLE"
+  Password = "__INVALID__"   # not used
 
   # you need these TLS entries so the bconsole and Director can communicate
   TLS Enable = yes
@@ -120,6 +120,11 @@ Director {
   TLS Certificate = "/etc/bacula/bacula-fd.pem"
   TLS Key = "/etc/bacula/bacula-fd.pem"
 }
+
+Console {
+  Name = $HOST-acl
+  Password = "$PASS_BCONSOLE"
+}
 EOF
     fi
 }