Browse Source

Import exim certificates

Bob Mottram 10 years ago
parent
commit
f0f52e3dca
1 changed files with 9 additions and 4 deletions
  1. 9
    4
      install-freedombone.sh

+ 9
- 4
install-freedombone.sh View File

@@ -443,6 +443,9 @@ function search_for_attached_usb_drive {
443 443
 			  chown root:dovecot /etc/ssl/certs/dovecot.*
444 444
 			  chown root:dovecot /etc/ssl/private/dovecot.*
445 445
 		  fi
446
+		  if [ -f /etc/ssl/private/exim.key ]; then
447
+			  chown root:Debian-exim /etc/ssl/private/exim.key /etc/ssl/certs/exim.crt /etc/ssl/certs/exim.dhparam
448
+		  fi
446 449
       fi
447 450
       if [ -d $USB_MOUNT/personal ]; then
448 451
           echo 'Importing personal directory'
@@ -1077,10 +1080,12 @@ function configure_email {
1077 1080
   /etc/init.d/saslauthd start
1078 1081
 
1079 1082
   # make a tls certificate for email
1080
-  makecert exim
1081
-  mv /etc/ssl/private/exim.key /etc/exim4
1082
-  mv /etc/ssl/certs/exim.crt /etc/exim4
1083
-  mv /etc/ssl/certs/exim.dhparam /etc/exim4
1083
+  if [ ! -f /etc/ssl/private/exim.key ]; then
1084
+	  makecert exim
1085
+  fi
1086
+  cp /etc/ssl/private/exim.key /etc/exim4
1087
+  cp /etc/ssl/certs/exim.crt /etc/exim4
1088
+  cp /etc/ssl/certs/exim.dhparam /etc/exim4
1084 1089
   chown root:Debian-exim /etc/exim4/exim.key /etc/exim4/exim.crt /etc/exim4/exim.dhparam
1085 1090
   chmod 640 /etc/exim4/exim.key /etc/exim4/exim.crt /etc/exim4/exim.dhparam
1086 1091