Merge pull request hestiacp#320 from Lupul/Bugfix-0521

Bugfix 0521

Author: ScIT-Raphael

bin/v-add-letsencrypt-domain

@@ -15,14 +15,18 @@ domain=$2
 aliases=$3
 mail=$4
 
-# LE API
-LE_API='https://acme-v02.api.letsencrypt.org'
-
 # Includes
 source $HESTIA/func/main.sh
 source $HESTIA/func/domain.sh
 source $HESTIA/conf/hestia.conf
 
+# LE API
+LE_API='https://acme-v02.api.letsencrypt.org'
+
+if [[ "$LE_STAGING" =~ ^(YES|TRUE)$ ]]; then
+    LE_API='https://acme-staging-v02.api.letsencrypt.org'
+fi
+
 # encode base64
 encode_base64() {
     cat |base64 |tr '+/' '-_' |tr -d '\r\n='

bin/v-add-letsencrypt-user

@@ -12,13 +12,17 @@
 # Argument definition
 user=$1
 
-# LE API
-LE_API='https://acme-v02.api.letsencrypt.org'
-
 # Includes
 source $HESTIA/func/main.sh
 source $HESTIA/conf/hestia.conf
 
+# LE API
+LE_API='https://acme-v02.api.letsencrypt.org'
+
+if [[ "$LE_STAGING" =~ ^(YES|TRUE)$ ]]; then
+    LE_API='https://acme-staging-v02.api.letsencrypt.org'
+fi
+
 # encode base64
 encode_base64() {
     cat |base64 |tr '+/' '-_' |tr -d '\r\n='

install/deb/apache2/unassigned.conf

@@ -10,4 +10,9 @@
     DocumentRoot /var/www/html/
     Alias /error/ /var/www/document_errors/
 
+    SSLEngine on
+    SSLVerifyClient none
+    SSLCertificateFile         /usr/local/hestia/ssl/certificate.crt
+    SSLCertificateKeyFile      /usr/local/hestia/ssl/certificate.key
+    
 </VirtualHost>