Pfad zum Kopano-Zertifikat an invis-Version 13.5 und älter angepasst.

invisserver · Jan 20, 2019 · de52bf7 · de52bf7
1 parent 4ef8639
commit de52bf7
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/usr/bin/inviscerts b/usr/bin/inviscerts
@@ -98,8 +98,8 @@ deploycerts() {
 	    openssl rsa -in $ersadir/private/$cn.key -out $confdir/private/mail-key.pem
 	    # Kopano
 	    # Mail-Zertifikat und -Schluesel für Kopano in einer Datei kombinieren
-	    cp $confdir/private/mail-key.pem $confdir/private/kopano.pem
-	    cat $confdir/certs/mail-cert.pem >> $confdir/private/kopano.pem
+	    cp $confdir/private/mail-key.pem $confdir/certs/kopano.pem
+	    cat $confdir/certs/mail-cert.pem >> $confdir/certs/kopano.pem
 	    ;;
 	"vpn")
 	    mv $ersadir/private/$cn.p12 /srv/shares/service/VPN-Clients/Zertifikate/

diff --git a/usr/bin/mkkopanokey b/usr/bin/mkkopanokey
@@ -21,5 +21,5 @@ keypath="/etc/invis/private"
 certpath="/etc/invis/certs"
 
 # Standardschluessel kopieren
-cp $keypath/mail-key.pem $keypath/kopano.pem
-cat $certpath/mail-cert.pem >> $keypath/kopano.pem
+cp $keypath/mail-key.pem $certpath/kopano.pem
+cat $certpath/mail-cert.pem >> $certpath/kopano.pem
diff --git a/usr/share/sine/templates/groupware/kopano/server.cfg b/usr/share/sine/templates/groupware/kopano/server.cfg
@@ -192,7 +192,7 @@ attachment_compression	= 6
 server_listen_tls = *:237
 
 # Required Server certificate, contains the certificate and the private key parts
-server_ssl_key_file	= /etc/invis/private/kopano.pem
+server_ssl_key_file	= /etc/invis/certs/kopano.pem
 
 # Password of Server certificate
 server_ssl_key_pass	= replace-with-server-cert-password