From 59172a530ae0350bf65273a22564b31e2ed4e0bb Mon Sep 17 00:00:00 2001
From: Zeljko Boros <Zeljko.Boros@carnet.hr>
Date: Wed, 5 Jul 2023 15:05:43 +0200
Subject: [PATCH] =?utf8?q?Prva=20ina=C4=8Dica=20za=20bullseye?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 bacula-check-cert |   12 ++++++++++--
 debian/changelog  |    8 ++++++++
 debian/install    |    2 ++
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/bacula-check-cert b/bacula-check-cert
index 3ada58c..a96fa7c 100755
--- a/bacula-check-cert
+++ b/bacula-check-cert
@@ -21,11 +21,19 @@ fi
 SSL=$(openssl x509 -checkend $DAYS -in $BACULACRT)
 
 if [ $? -eq 1 ];  then
-        mailx -s "BACULA: Certifikat za Baculu zahtijeva PROVJERU!" -a 'Content-Type: text/plain; charset="utf-8"' root <<EOF
+        mailx -s "BACULA: Provjerite certifikat za Baculu!" -a 'Content-Type: text/plain; charset="utf-8"' root <<EOF
         
         Valjanost certifikata za Baculu je istekla ili će isteći na dan: $(date --date="$(openssl x509 -in $BACULACRT -noout -enddate | cut -d= -f 2)" --iso-8601)
+
+	Datum kada ističe certifikat možete vidjeti s naredbom:
+
+	openssl x509 -enddate -noout -in /etc/bacula/bacula-fd.pem
         
-        Certifikat obnovite po uputama na https://sysportal.carnet.hr/node/834
+        Ukoliko je certifikat istekao ili je pred istekom, obnovite ga uz pomoć skripte renew_cert.sh, koja se nalazi unutar ovog paketa.
+
+	Certifikat pošaljite na adresu sysbackup@carnet.hr i ne zaboravite restartati servis bacula-fd.
+
+	Više informacija možete pronaći na adresi https://sysportal.carnet.hr/node/834 .
         
 EOF
         exit 1
diff --git a/debian/changelog b/debian/changelog
index c1da15d..afdb3ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+bacula-cn (20230705+cn11u1) unstable; urgency=medium
+
+  * Prva inačica za Debian bullseye
+  * Dodana skripta za generiranje certifikata za baculu u /usr/bin
+  * Dodana skripta cp-update u /usr/bin
+
+ -- Zeljko Boros <Zeljko.Boros@carnet.hr>  Wed, 05 Jul 2023 14:36:16 +0200
+
 bacula-cn (20210419+cn10u1) unstable; urgency=medium
 
   * Prva inačica za Debian buster
diff --git a/debian/install b/debian/install
index 1ff490c..f9cbe65 100644
--- a/debian/install
+++ b/debian/install
@@ -2,3 +2,5 @@ sysbackup.pem etc/bacula/
 db-dump etc/bacula/run-before-job.d/
 bacula-check-cert usr/sbin/
 bacula-cn etc/cron.d
+renew_cert.sh usr/bin/
+cp-update usr/bin/
-- 
1.7.10.4