From 6dc873309fbd5b19c6a9dc885997fedb322a1a69 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@robotics.uk.to>
Date: Tue, 27 Jan 2015 20:18:39 +0000
Subject: [PATCH] Check dhparam file exists

---
 src/freedombone | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/freedombone b/src/freedombone
index fe52e873..dae579cf 100755
--- a/src/freedombone
+++ b/src/freedombone
@@ -5008,7 +5008,7 @@ function configure_email {
   /etc/init.d/saslauthd start
 
   # make a tls certificate for email
-  if [ ! -f /etc/ssl/private/exim.key ]; then
+  if [ ! -f /etc/ssl/certs/exim.dhparam ]; then
       makecert exim
       check_certificates exim
   fi
@@ -5196,7 +5196,7 @@ function configure_imap {
       exit 48
   fi
 
-  if [ ! -f /etc/ssl/private/dovecot.key ]; then
+  if [ ! -f /etc/ssl/certs/dovecot.dhparam ]; then
       makecert dovecot
       check_certificates dovecot
   fi
@@ -6511,7 +6511,7 @@ quit" > $INSTALL_DIR/batch.sql
 
   configure_php
 
-  if [ ! -f /etc/ssl/private/$OWNCLOUD_DOMAIN_NAME.key ]; then
+  if [ ! -f /etc/ssl/certs/$OWNCLOUD_DOMAIN_NAME.dhparam ]; then
       makecert $OWNCLOUD_DOMAIN_NAME
       check_certificates $OWNCLOUD_DOMAIN_NAME
   fi
@@ -6588,7 +6588,7 @@ function install_xmpp {
       exit 52
   fi
 
-  if [ ! -f "/etc/ssl/private/xmpp.key" ]; then
+  if [ ! -f /etc/ssl/certs/xmpp.dhparam ]; then
       makecert xmpp
       check_certificates xmpp
   fi
@@ -6712,7 +6712,7 @@ function install_irc_server {
       exit 53
   fi
 
-  if [ ! -f /etc/ssl/private/ngircd.key ]; then
+  if [ ! -f /etc/ssl/certs/ngircd.dhparam ]; then
       makecert ngircd
       check_certificates ngircd
   fi
@@ -6801,7 +6801,7 @@ function install_wiki {
   if [ -d /var/www/$WIKI_DOMAIN_NAME/htdocs ]; then
       rm -rf /var/www/$WIKI_DOMAIN_NAME/htdocs
   fi
-  if [ ! -f /etc/ssl/private/$WIKI_DOMAIN_NAME.key ]; then
+  if [ ! -f /etc/ssl/certs/$WIKI_DOMAIN_NAME.dhparam ]; then
       makecert $WIKI_DOMAIN_NAME
       check_certificates $WIKI_DOMAIN_NAME
   fi
@@ -7079,7 +7079,7 @@ function install_blog {
   git clone https://github.com/danpros/htmly htdocs
   chown -R www-data:www-data /var/www/$FULLBLOG_DOMAIN_NAME/htdocs
 
-  if [ ! -f /etc/ssl/private/$FULLBLOG_DOMAIN_NAME.key ]; then
+  if [ ! -f /etc/ssl/certs/$FULLBLOG_DOMAIN_NAME.dhparam ]; then
       makecert $FULLBLOG_DOMAIN_NAME
       check_certificates $FULLBLOG_DOMAIN_NAME
   fi
@@ -7439,7 +7439,7 @@ quit" > $INSTALL_DIR/batch.sql
 
   configure_php
 
-  if [ ! -f /etc/ssl/private/$MICROBLOG_DOMAIN_NAME.key ]; then
+  if [ ! -f /etc/ssl/certs/$MICROBLOG_DOMAIN_NAME.dhparam ]; then
       makecert $MICROBLOG_DOMAIN_NAME
       check_certificates $MICROBLOG_DOMAIN_NAME
   fi
@@ -7711,7 +7711,7 @@ quit" > $INSTALL_DIR/batch.sql
 
   configure_php
 
-  if [ ! -f /etc/ssl/private/$REDMATRIX_DOMAIN_NAME.key ]; then
+  if [ ! -f /etc/ssl/certs/$REDMATRIX_DOMAIN_NAME.dhparam ]; then
       makecert $REDMATRIX_DOMAIN_NAME
       check_certificates $REDMATRIX_DOMAIN_NAME
   fi
@@ -8611,7 +8611,7 @@ function install_voip {
   fi
 
   # Make an ssl cert for the server
-  if [ ! -f /etc/ssl/certs/mumble.crt ]; then
+  if [ ! -f /etc/ssl/certs/mumble.dhparam ]; then
       makecert mumble
       check_certificates mumble
   fi