From 443614a00f5f21614eed4460557575c5c91a89d0 Mon Sep 17 00:00:00 2001
From: Kevin Mark <kmark937@gmail.com>
Date: Thu, 19 Jan 2017 07:47:51 -0500
Subject: [PATCH 1/2] Do not change SSL certs if enabling Let's Encrypt

Fixes issue noted in serghey-rodin/vesta#1008
---
 web/edit/web/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/edit/web/index.php b/web/edit/web/index.php
index 75b6942c0..11cda0ea2 100644
--- a/web/edit/web/index.php
+++ b/web/edit/web/index.php
@@ -279,7 +279,7 @@ if (!empty($_POST['save'])) {
     }
 
     // Change SSL certificate
-    if (( $v_letsencrypt == 'no' ) && ( $v_ssl == 'yes' ) && (!empty($_POST['v_ssl'])) && (empty($_SESSION['error_msg']))) {
+    if (( $v_letsencrypt == 'no' ) && (empty($_POST['v_letsencrypt'])) && ( $v_ssl == 'yes' ) && (!empty($_POST['v_ssl'])) && (empty($_SESSION['error_msg']))) {
         if (( $v_ssl_crt != str_replace("\r\n", "\n",  $_POST['v_ssl_crt'])) || ( $v_ssl_key != str_replace("\r\n", "\n",  $_POST['v_ssl_key'])) || ( $v_ssl_ca != str_replace("\r\n", "\n",  $_POST['v_ssl_ca']))) {
             exec ('mktemp -d', $mktemp_output, $return_var);
             $tmpdir = $mktemp_output[0];

From d4a4bca6163258f5ab65a27ef6fcc7020984272c Mon Sep 17 00:00:00 2001
From: Kevin Mark <kmark937@gmail.com>
Date: Thu, 19 Jan 2017 08:00:10 -0500
Subject: [PATCH 2/2] Allow checking of nginx domains with force-https

Fixes issue noted in serghey-rodin/vesta#979
---
 bin/v-check-letsencrypt-domain | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/bin/v-check-letsencrypt-domain b/bin/v-check-letsencrypt-domain
index cc8c15aff..ff0a5db8b 100755
--- a/bin/v-check-letsencrypt-domain
+++ b/bin/v-check-letsencrypt-domain
@@ -89,12 +89,16 @@ uri=$(echo "$answer" |grep -A 3 http-01 |grep uri |cut -f 4 -d \")
 # Adding location wrapper for request challenge
 if [ "$WEB_SYSTEM" = 'nginx' ] || [ "$PROXY_SYSTEM" = 'nginx' ]; then
     conf="$HOMEDIR/$user/conf/web/nginx.$r_domain.conf_letsencrypt"
+    sconf="$HOMEDIR/$user/conf/web/snginx.$r_domain.conf_letsencrypt"
     if [ ! -e "$conf" ]; then
         echo 'location ~ "^/\.well-known/acme-challenge/(.*)$" {' > $conf
         echo '    default_type text/plain;' >> $conf
         echo '    return 200 "$1.'$thumb'";' >> $conf
         echo '}' >> $conf
     fi
+    if [ ! -e "$sconf" ]; then
+        ln -s "$conf" "$sconf"
+    fi
 else
     acme="$HOMEDIR/$user/web/$r_domain/public_html/.well-known/acme-challenge"
     mkdir -p $acme