-r umjesto -f u skripti, chown i chmod u /etc/bacula

[bacula-cn.git] / debian / postinst

diff --git a/debian/postinst b/debian/postinst
index 91a8f1c..a3d4150 100644 (file)
--- a/debian/postinst
+++ b/debian/postinst
@@ -52,7 +52,7 @@ Director {
   # directors to verify the authenticity of this file daemon
   TLS Certificate = "/etc/bacula/bacula-fd.pem"
   TLS Key = "/etc/bacula/bacula-fd.pem"
-  TLS DH File = "/etc/bacula/dh1024.pem"
+  TLS DH File = "/etc/bacula/dh2048.pem"
 }
 
 #
@@ -131,7 +131,7 @@ EOF
 }
 
 generate_dh() {
-    DH_FILE=/etc/bacula/dh1024.pem
+    DH_FILE=/etc/bacula/dh2048.pem
 
     if [ -s $DH_FILE ]; then
         echo $DH_FILE already exists, skipping.
@@ -139,7 +139,9 @@ generate_dh() {
         umask 077
 
         echo Generating $DH_FILE
-        openssl dhparam -out $DH_FILE -5 1024
+        ###openssl dhparam -out $DH_FILE -5 1024
+        openssl dhparam -out $DH_FILE -2 2048
+       
     fi
 }
 
@@ -155,7 +157,7 @@ generate_cert() {
         rm -f $REQUEST_FILE
         openssl req -new -newkey rsa:2048 -nodes -keyout $CERT_FILE \
             -subj "/C=HR/ST=Croatia/O=CARNet/OU=sysbackup/CN=$IP" \
-            -x509 -extensions usr_cert -days $((365*5)) \
+            -x509 -extensions usr_cert -days $((365*10)) \
             -out $CERT_FILE
     fi
 }
@@ -187,6 +189,10 @@ send_request() {
     DF_FILE=$(mktemp bacula-cn.XXXXXXXXXX)
     df -h > $DF_FILE
 
+    # dodaj i /media i /mnt
+    test -d /media && du -hs /media || true >> $DF_FILE
+    test -d /mnt && du -hs /mnt || true >> $DF_FILE
+
     # report database sizes
     DB_FILE=$(mktemp bacula-cn.XXXXXXXXXX)
     if [ -d /var/lib/mysql -o -d /var/lib/postgresql ]; then
@@ -252,6 +258,10 @@ EOF
     # cleanup
     rm -f $DF_FILE $DB_FILE $FD_FILE $PEM_FILE
 
+    ### fix privileges 
+    chown root:bacula /etc/bacula/bacula-fd.pem /etc/bacula/bacula-fd.conf /etc/bacula/bconsole.conf
+    chmod 640 /etc/bacula/bacula-fd.pem /etc/bacula/bacula-fd.conf /etc/bacula/bconsole.conf  
+
     # report problems
     if [ ! -e $REQUEST_FILE ]; then
         db_input high bacula-cn/request-failed || true