Adjusting mailleur.conf file

diff --git a/conf/mailleur.conf b/conf/mailleur.conf
index 10ccd0f873bd96e09f87af73f6d01925d0f50b4e..ee36bcb7d93ca1f1ba72889d68a4997ef1478ce6 100644 (file)
--- a/conf/mailleur.conf
+++ b/conf/mailleur.conf
@@ -33,24 +33,24 @@ SMTPPORTS="|||5,smtps||465|3,smtp||587|2"
 #SSL_SECURITY=2
 #------------------------------------------------
 #Defining SERVER mode Certificate data
+CA_ROOT_SRV="/etc/pki/tls/make-ca/ca-bundle.crt"
+CA_VERIFY_SRV=0        #to check PEER/client remote certificate
 #If certificate set via do_dns_tlsa.sh (letsencrypt)
 #CA_CERT_SRV="/etc/certbot/mailleur/mailleur-fullchain.pem"
 #CA_KEY_SRV="/etc/certbot/mailleur/mailleur-key.pem"
 #If certificate are self signed (default installation)
 CA_CERT_SRV="/etc/pki/mailleur/mailleur-cert.pem"
 CA_KEY_SRV="/etc/pki/mailleur/mailleur-key.pem"
-CA_ROOT_SRV="/etc/pki/tls/make-ca/ca-bundle.crt"
-CA_VERIFY_SRV=0        #to check PEER/client remote certificate
 #------------------------------------------------
 #Defining CLIENT mode Certificate data
+CA_ROOT_CLT="/etc/pki/tls/make-ca/ca-bundle.crt"
+CA_VERIFY_CLT=0        #to check PEER/server remote certificate
 #If certificate set via do_dns_tlsa.sh (letsencrypt)
 #CA_CERT_CLT="/etc/certbot/mailleur/mailleur-fullchain.pem"
 #CA_KEY_CLT="/etc/certbot/mailleur/mailleur-key.pem"
 #If certificate are self signed (default installation)
 CA_CERT_CLT="/etc/pki/mailleur/mailleur-cert.pem"
 CA_KEY_CLT="/etc/pki/mailleur/mailleur-key.pem"
-CA_ROOT_CLT="/etc/pki/tls/make-ca/ca-bundle.crt"
-CA_VERIFY_CLT=0        #to check PEER/server remote certificate
 #------------------------------------------------
 #Configured for Postgresql database
 #DB_TYPE can be either POSTGRESQL,MYSQL, default POSTGRESQL

diff --git a/support/addconfig.sh b/support/addconfig.sh
index ab6a7b0b4a9125f13ef7688b16fc550bb26c37b9..22d18700fe6989b7532f8810d79c5e32326ce98b 100755 (executable)
--- a/support/addconfig.sh
+++ b/support/addconfig.sh
@@ -12,8 +12,8 @@ export SPOOLDIR=/var/spool/$APPNAME/mails
 #loading the variable value
 LOCDOM=`dnsdomainname`
 
-sed -i                                         \
-       -e "s/^DFLTDOM.*$/DFLTDOMAIN=$LOCDOM/"  \
+sed -i                                                 \
+       -e "s/^DFLTDOM.*$/DFLTDOMAIN=\"$LOCDOM\"/"      \
        /etc/$APPNAME/$APPNAME.conf
 
 #-----------------------------------------------------------------