Adjusting certificate insertion

diff --git a/support/do_httpd.sh b/support/do_httpd.sh
index 482a3ee36de3d0658f0bd4aaac373eb5c36cf4e9..2f1a532ca28f1992b2b5ebe10d32e21b7e5af762 100755 (executable)
--- a/support/do_httpd.sh
+++ b/support/do_httpd.sh
@@ -72,8 +72,8 @@ SSLSessionCacheTimeout  300
        #----------------------------------------------
        #SSL
        SSLEngine On
-       SSLCertificateKeyFile   /etc/$APPNAME/pki/$APPNAME-key.pem
-       SSLCertificateFile      /etc/$APPNAME/pki/$APPNAME-cert.pem
+       SSLCertificateKeyFile   /etc/pki/$APPNAME/$APPNAME-key.pem
+       SSLCertificateFile      /etc/pki/$APPNAME/$APPNAME-cert.pem
        SSLProtocol             +TLSv1.3 +TLSv1.2
        SSLCompression          OFF
         SSLHonorCipherOrder    ON

diff --git a/support/starting.sh b/support/starting.sh
index 25001d0a2214bce4aa8ed546cc26c07777aa6f30..4161303df9fee8b4519ee7f03e872ffed859d47f 100755 (executable)
--- a/support/starting.sh
+++ b/support/starting.sh
@@ -197,13 +197,6 @@ if [ ! -f /etc/pki/$APPNAME/$APPNAME-cert.pem ] ; then
   chown $APPNAME:mail                                  \
        /etc/pki/$APPNAME/$APPNAME-cert.pem             \
        /etc/pki/$APPNAME/$APPNAME-key.pem
-  mkdir -p /etc/$APPNAME/pki/
-  ln -s                                                        \
-       /etc/pki/$APPNAME/$APPNAME-cert.pem             \
-       /etc/pki/$APPNAME/$APPNAME-cert.pem
-  ln -s                                                        \
-       /etc/pki/$APPNAME/$APPNAME-key.pem              \
-       /etc/pki/$APPNAME/$APPNAME-key.pem
   sh_success $"Preparing $APPNAME server self-signed certificate"
   fi
 }