Merge branch 'stable-3.1' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.1

Author: Till Brehm

interface/web/sites/web_vhost_domain_edit.php

@@ -1341,8 +1341,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;
 		}
 	}
@@ -1422,6 +1423,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);
 		}

server/plugins-available/nginx_plugin.inc.php

@@ -932,6 +932,7 @@ function update($event_name, $data) {
 		$tpl->newTemplate('nginx_vhost.conf.master');
 
 		// IPv4
+		if($data['new']['ip_address'] == '') $data['new']['ip_address'] = '*';
 
 		//* use ip-mapping for web-mirror
 		if($data['new']['ip_address'] != '*' && $conf['mirror_server_id'] > 0) {