From b5e4cb91d48b27bc0c0c750fd4622a063ffe1946 Mon Sep 17 00:00:00 2001 From: Zeljko Boros Date: Fri, 26 Feb 2021 19:55:40 +0100 Subject: [PATCH] Istekao certifikat, pa je trebalo dodati novi sysbackup.pem --- debian/changelog | 7 ++++--- debian/control | 2 +- debian/po/templates.pot | 4 ++-- debian/postinst | 6 +++++- sysbackup.pem | 25 ++++++++++++------------- 5 files changed, 24 insertions(+), 20 deletions(-) diff --git a/debian/changelog b/debian/changelog index 63c265a..2bfa97a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,10 @@ -bacula-cn (20200825+cn10u1) unstable; urgency=medium +bacula-cn (20210226+cn9u1) unstable; urgency=medium - * Prva inačica za CARNET Debian 10 (buster) * Ovisi o inačici bacule <= 7.4.4 + * Novi certifikat sysbackup.pem + * Javlja veličinu direktorija /media i /mnt - -- Zeljko Boros Tue, 25 Aug 2020 15:39:23 +0200 + -- Zeljko Boros Fri, 26 Feb 2021 15:39:23 +0100 bacula-cn (20190315) unstable; urgency=medium diff --git a/debian/control b/debian/control index cb25c97..911195c 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,7 @@ Vcs-Browser: http://ftp.carnet.hr/carnet-debian/scm/?p=bacula-cn.git;a=summary Package: bacula-cn Architecture: all -Depends: bacula-fd (<= 7.4.4+dfsg-6+deb9u1), bacula-console (<= 7.4.4+dfsg-6+deb9u1), openssl, curl, +Depends: bacula-fd (<= 7.4.4+dfsg-6+deb9u2), bacula-console (<= 7.4.4+dfsg-6+deb9u2), openssl, curl, ca-certificates, debconf (>= 0.5) | debconf-2.0, ${misc:Depends} Suggests: default-mysql-client, postgresql-client-common, mail-transport-agent Description: Mrežno rješenje za backup poslužitelja CARNET-ovih članica diff --git a/debian/po/templates.pot b/debian/po/templates.pot index bf4edfc..8d3cfe2 100644 --- a/debian/po/templates.pot +++ b/debian/po/templates.pot @@ -1,6 +1,6 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. +# This file is distributed under the same license as the bacula-cn package. # FIRST AUTHOR , YEAR. # #, fuzzy @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: bacula-cn\n" "Report-Msgid-Bugs-To: bacula-cn@packages.debian.org\n" -"POT-Creation-Date: 2014-10-09 15:02+0200\n" +"POT-Creation-Date: 2020-08-25 15:47+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/debian/postinst b/debian/postinst index 91a8f1c..d0f161d 100644 --- a/debian/postinst +++ b/debian/postinst @@ -155,7 +155,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 +187,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 diff --git a/sysbackup.pem b/sysbackup.pem index 36fe627..76aba6c 100644 --- a/sysbackup.pem +++ b/sysbackup.pem @@ -1,7 +1,7 @@ -----BEGIN CERTIFICATE----- -MIIDvjCCAqagAwIBAgIJAItXEkopbZMZMA0GCSqGSIb3DQEBBQUAMEgxCzAJBgNV +MIIDvDCCAqSgAwIBAgIJAP0MypFqC4JhMA0GCSqGSIb3DQEBCwUAMEgxCzAJBgNV BAYTAkhSMQowCAYDVQQIEwEgMQ8wDQYDVQQKEwZDQVJOZXQxHDAaBgNVBAMTE3N5 -c2JhY2t1cC5jYXJuZXQuaHIwHhcNMTEwMzAxMTIzMzIwWhcNMjEwMjI2MTIzMzIw +c2JhY2t1cC5jYXJuZXQuaHIwHhcNMjEwMjI2MTgwMjA3WhcNMzEwMjI0MTgwMjA3 WjBIMQswCQYDVQQGEwJIUjEKMAgGA1UECBMBIDEPMA0GA1UEChMGQ0FSTmV0MRww GgYDVQQDExNzeXNiYWNrdXAuY2FybmV0LmhyMIIBIjANBgkqhkiG9w0BAQEFAAOC AQ8AMIIBCgKCAQEAv7eWehDt9gb1y9GJzchDuOxXOktVABkUHJq1ZH2JEsx2MWpQ @@ -9,15 +9,14 @@ AQ8AMIIBCgKCAQEAv7eWehDt9gb1y9GJzchDuOxXOktVABkUHJq1ZH2JEsx2MWpQ rfLr9A9MS0P9D4h6mwyaUahdh1hAXrFLHX3d9kAKjLaqX3yv5/WE7kJyhqYhwi96 F95OBjVC/Ni6Qaxc3JdgeH2uPoQ5TWbB90+VI91j41+AMHm2bHNG8oPcnONci4oQ D0eBrwldk4aGiCG9hTMsAp4j9aGPPafsH8h/dVxIHZuENwVXdGr/F0YtyTj9eIjc -dHghG7G7VyXk3q9zG/lZ1qb3+4Nhr5krXv1UewIDAQABo4GqMIGnMB0GA1UdDgQW -BBR3UAIZsJzyJGQzMLF4RdPu7K4PfDB4BgNVHSMEcTBvgBR3UAIZsJzyJGQzMLF4 -RdPu7K4PfKFMpEowSDELMAkGA1UEBhMCSFIxCjAIBgNVBAgTASAxDzANBgNVBAoT -BkNBUk5ldDEcMBoGA1UEAxMTc3lzYmFja3VwLmNhcm5ldC5ocoIJAItXEkopbZMZ -MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAL6bEQglh70emSr4o5Xp -VAVLxOnDjtochPbWUY44Q5yA1AWyDQW5d+sJ6vGA8cMqpq2IB6G3slZ9kVghEnGK -JC2rEJKGp/sGj8YTXk0sYE8I7Y/+NAFNJ/ov+9pO1N6iNT0I6oxb3nOChoGLtmsr -UXJ4Fgcl25neKKUWVuOtkrHpRp7MhjWie3NLjwxK/J08V7cX/pGhPO37bkA8vdc0 -IUVib8YhnGjGFRDgu37mxQLPoDzImxTjPziLTLeP8tc58Ho1erW3S9vmjhXsD9WJ -T7e4HfH0vlIeTIwYhjtkPB3x0wWAGRssCyU0sql7jar/2UQyJ0YVA3gdf/+Ph9tF -hHo= +dHghG7G7VyXk3q9zG/lZ1qb3+4Nhr5krXv1UewIDAQABo4GoMIGlMAwGA1UdEwQF +MAMBAf8wHQYDVR0OBBYEFHdQAhmwnPIkZDMwsXhF0+7srg98MB8GA1UdIwQYMBaA +FHdQAhmwnPIkZDMwsXhF0+7srg98MFUGA1UdEQROMEykSjBIMQswCQYDVQQGEwJI +UjEKMAgGA1UECAwBIDEPMA0GA1UECgwGQ0FSTkVUMRwwGgYDVQQDDBNzeXNiYWNr +dXAuY2FybmV0LmhyMA0GCSqGSIb3DQEBCwUAA4IBAQANw9DsIsPY4/6JSTtM3wD2 +w04Y7md/Fg8U7OCnwzrQE7HvtjCt+T4lxi5P+33BXK162aKnMgiR48nEDYcRKAxz +W+p9TDNnHpj8l8xmxV4Z11wSzwrNftMJtTMWDoWO3iQ3e+sbtuGx2JIi595eUbR2 +JGVDjHmI5x4Md8mXMqerWrJ9SvpNFNH3juH5yAbPUAuB/ehMf+z5p2QOXG7YkaVz +1qPF6JYJtaXdL1X/JhmJL/lCU1fG8nO0QC+vFtnPY+kI5ncKk+cih5b13apX9IcX +yrtxot030/4nRQmLHFIBVDg/OPFFwd2ag+eRdF978OxWxge1is3ecdDFoLqEZJ2f -----END CERTIFICATE----- -- 1.7.10.4