From: Zeljko Boros <Zeljko.Boros@carnet.hr>
Date: Fri, 14 May 2021 14:10:48 +0000 (+0200)
Subject: postinst micanje dovecot.conf.*, mkcert.sh na 2048 bita
X-Git-Tag: debian/1%2.3.4.1+cn10u3~2
X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=commitdiff_plain;h=c1961f4fb4746d65968ac20fc77af7a3b13b696d;p=dovecot-cn.git

postinst micanje dovecot.conf.*, mkcert.sh na 2048 bita
---

diff --git a/debian/control b/debian/control
index b4607f4..f146ba7 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.9.8
 
 Package: dovecot-cn
 Architecture: all
-Depends: ${misc:Depends}, dovecot-core (>= 1:2.3.4.1), dovecot-imapd (>= 1:2.3.4.1), dovecot-pop3d (>= 1:2.3.4.1), carnet-tools-cn (>= 3)
+Depends: ${misc:Depends}, dovecot-core (>= 1:2.3.4.1), dovecot-imapd (>= 1:2.3.4.1), dovecot-pop3d (>= 1:2.3.4.1), carnet-tools-cn (>= 3), ssl-cert
 Description: secure mail server that supports mbox and maildir mailboxes
  Dovecot is a mail server whose major goals are security and extreme
  reliability. It tries very hard to handle all error conditions and verify
diff --git a/debian/postinst b/debian/postinst
index f66c3c3..95c1ccb 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -111,6 +111,11 @@ test -f /etc/dovecot/conf.d/95-cn6-upgrade.conf && mv /etc/dovecot/conf.d/95-cn6
 test -f /etc/dovecot/conf.d/95-cn7-upgrade.conf && mv /etc/dovecot/conf.d/95-cn7-upgrade.conf /var/backups || true
 test -f /etc/dovecot/conf.d/95-cn8-upgrade.conf && mv /etc/dovecot/conf.d/95-cn8-upgrade.conf /var/backups || true
 test -f /etc/dovecot/conf.d/95-cn9-upgrade.conf && mv /etc/dovecot/conf.d/95-cn9-upgrade.conf /var/backups || true
+# nije više potrebno editirati dovecot.conf koji je samo hrpa includea
+test -f /etc/dovecot/dovecot.conf.cn6-upgrade && mv /etc/dovecot/dovecot.conf.cn6-upgrade /var/backups || true
+test -f /etc/dovecot/dovecot.conf.cn7-upgrade && mv /etc/dovecot/dovecot.conf.cn7-upgrade /var/backups || true
+test -f /etc/dovecot/dovecot.conf.cn8-upgrade && mv /etc/dovecot/dovecot.conf.cn8-upgrade /var/backups || true
+test -f /etc/dovecot/dovecot.conf.cn9-upgrade && mv /etc/dovecot/dovecot.conf.cn9-upgrade /var/backups || true
 
 # staro, može se brisati
 # dodao ico, gasi SSLv3 protokol
diff --git a/dovecot-openssl.cnf b/dovecot-openssl.cnf
index b2dfebf..4f4d0ca 100644
--- a/dovecot-openssl.cnf
+++ b/dovecot-openssl.cnf
@@ -1,5 +1,5 @@
 [ req ]
-default_bits = 1024
+default_bits = 2048
 encrypt_key = yes
 distinguished_name = req_dn
 x509_extensions = cert_type
@@ -7,7 +7,7 @@ prompt = no
 
 [ req_dn ]
 # country (2 letter code)
-#C=FI
+C=HR
 
 # State or Province Name (full name)
 #ST=