X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=debian%2Fpostinst;h=b7049bf0595e0e7842e83f503d6423ea53c820df;hb=0b427c0c03e09ecf0a3099318d5578419de74916;hp=78a47ec55077a1dcca4bf1a3d8c08e227b32ce43;hpb=61a9b0bac4e17612f29bea434aaa39511942d0dd;p=bacula-cn.git

diff --git a/debian/postinst b/debian/postinst
index 78a47ec..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
 }
@@ -231,7 +236,7 @@ Client {
   TLS Require = yes
   TLS CA Certificate File = "/etc/bacula/clients.d/$HOST-fd.pem"
   TLS Certificate = "/etc/bacula/bacula.pem"
-  TLS Key = "/etc/bacula/bacula.pem"
+  TLS Key = "/etc/bacula/bacula.key"
 }
 
 Job {