- changed approach for nginx + letsencrypt

Author: Marius Burkard

install/tpl/nginx_ispconfig.vhost.master

@@ -1,10 +1,3 @@
-server {
-	location ~ /\.well-known/acme-challenge/ {
-		root /usr/local/ispconfig/interface/acme/;
-		index index.html index.htm;
-		try_files $uri =404;
-	}
-}
 server {
         listen {vhost_port};
         listen [::]:{vhost_port} ipv6only=on;

interface/web/sites/web_vhost_domain_edit.php

@@ -1340,8 +1340,9 @@ function onBeforeInsert() {
 
 		// Letsencrypt can not be activated before the website has been created
 		// So we deactivate it here and add a datalog update in onAfterInsert
-		if(isset($this->dataRecord['ssl_letsencrypt']) && $this->dataRecord['ssl_letsencrypt'] == 'y') {
+		if(isset($this->dataRecord['ssl_letsencrypt']) && $this->dataRecord['ssl_letsencrypt'] == 'y' && isset($this->dataRecord['ssl']) && $this->dataRecord['ssl'] == 'y') {
 			$this->dataRecord['ssl_letsencrypt'] = 'n';
+			$this->dataRecord['ssl'] = 'n';
 			$this->_letsencrypt_on_insert = true;
 		}
 	}
@@ -1421,6 +1422,7 @@ function onAfterInsert() {
 		if($this->_letsencrypt_on_insert == true) {
 			$tmp = $web_rec;
 			$tmp['ssl_letsencrypt'] = 'y';
+			$tmp['ssl'] = 'y';
 			$app->db->datalogUpdate('web_domain', $tmp, 'domain_id', $this->id);
 			unset($tmp);
 		}