Browse Source

Only use letsencrypt certs for hubzilla and gnusocial

Bob Mottram 9 years ago
parent
commit
1951eafc40
1 changed files with 2 additions and 10 deletions
  1. 2
    10
      src/freedombone

+ 2
- 10
src/freedombone View File

7549
   configure_php
7549
   configure_php
7550
 
7550
 
7551
   if [ ! -f /etc/ssl/certs/$MICROBLOG_DOMAIN_NAME.dhparam ]; then
7551
   if [ ! -f /etc/ssl/certs/$MICROBLOG_DOMAIN_NAME.dhparam ]; then
7552
-      if [[ $LETSENCRYPT_ENABLED != "yes" ]]; then
7553
-          ${PROJECT_NAME}-addcert -h $MICROBLOG_DOMAIN_NAME --dhkey $DH_KEYLENGTH
7554
-      else
7555
-          ${PROJECT_NAME}-addcert -e $MICROBLOG_DOMAIN_NAME -s $LETSENCRYPT_SERVER --dhkey $DH_KEYLENGTH
7556
-      fi
7552
+      ${PROJECT_NAME}-addcert -e $MICROBLOG_DOMAIN_NAME -s $LETSENCRYPT_SERVER --dhkey $DH_KEYLENGTH
7557
       check_certificates $MICROBLOG_DOMAIN_NAME
7553
       check_certificates $MICROBLOG_DOMAIN_NAME
7558
   fi
7554
   fi
7559
 
7555
 
7855
   configure_php
7851
   configure_php
7856
 
7852
 
7857
   if [ ! -f /etc/ssl/certs/$HUBZILLA_DOMAIN_NAME.dhparam ]; then
7853
   if [ ! -f /etc/ssl/certs/$HUBZILLA_DOMAIN_NAME.dhparam ]; then
7858
-      if [[ $LETSENCRYPT_ENABLED != "yes" ]]; then
7859
-          ${PROJECT_NAME}-addcert -h $HUBZILLA_DOMAIN_NAME --dhkey $DH_KEYLENGTH
7860
-      else
7861
-          ${PROJECT_NAME}-addcert -e $HUBZILLA_DOMAIN_NAME -s $LETSENCRYPT_SERVER --dhkey $DH_KEYLENGTH
7862
-      fi
7854
+      ${PROJECT_NAME}-addcert -e $HUBZILLA_DOMAIN_NAME -s $LETSENCRYPT_SERVER --dhkey $DH_KEYLENGTH
7863
       check_certificates $HUBZILLA_DOMAIN_NAME
7855
       check_certificates $HUBZILLA_DOMAIN_NAME
7864
   fi
7856
   fi
7865
 
7857