Fixed #5099 letsencrypt bug on multihost system

Till Brehm · Till Brehm · commit 7a7ba27a4719 · 2018-08-17T10:23:33.000+02:00
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
@@ -1220,7 +1220,7 @@ function update($event_name, $data) {
 				/* Update the DB of the (local) Server */
 				$app->db->query("UPDATE web_domain SET `ssl` = ?, `ssl_letsencrypt` = ? WHERE `domain` = ?", $data['new']['ssl'], 'n', $data['new']['domain']);
 				/* Update also the master-DB of the Server-Farm */
-				$app->dbmaster->query("UPDATE web_domain SET `ssl` = ?, `ssl_letsencrypt` = ? WHERE `domain` = ?", $data['new']['ssl'], 'n', $data['new']['domain']);
+				$app->dbmaster->query("UPDATE web_domain SET `ssl` = ?, `ssl_letsencrypt` = ? WHERE `domain` = ? AND `server_id` = ?", $data['new']['ssl'], 'n', $data['new']['domain'], $conf['server_id']);
  			}
 		}
 
diff --git a/server/plugins-available/nginx_plugin.inc.php b/server/plugins-available/nginx_plugin.inc.php
@@ -1298,7 +1298,7 @@ function update($event_name, $data) {
 				$data['new']['ssl_letsencrypt'] = 'n';
 				if($data['old']['ssl'] == 'n') $data['new']['ssl'] = 'n';
 				/* Update the DB of the (local) Server */
-				$app->db->query("UPDATE web_domain SET `ssl` = ?, `ssl_letsencrypt` = ? WHERE `domain` = ?", $data['new']['ssl'], 'n', $data['new']['domain']);
+				$app->db->query("UPDATE web_domain SET `ssl` = ?, `ssl_letsencrypt` = ? WHERE `domain` = ? AND `server_id` = ?", $data['new']['ssl'], 'n', $data['new']['domain'], $conf['server_id']);
 				/* Update also the master-DB of the Server-Farm */
 				$app->dbmaster->query("UPDATE web_domain SET `ssl` = ?, `ssl_letsencrypt` = ? WHERE `domain` = ?", $data['new']['ssl'], 'n', $data['new']['domain']);
 			}

Original file line number	Diff line number	Diff line change
`@@ -1220,7 +1220,7 @@ function update($event_name, $data) {`
`1220`	`1220`	`/* Update the DB of the (local) Server */`
`1221`	`1221`	$app->db->query("UPDATE web_domain SET `ssl` = ?, `ssl_letsencrypt` = ? WHERE `domain` = ?", $data['new']['ssl'], 'n', $data['new']['domain']);
`1222`	`1222`	`/* Update also the master-DB of the Server-Farm */`
`1223`		- $app->dbmaster->query("UPDATE web_domain SET `ssl` = ?, `ssl_letsencrypt` = ? WHERE `domain` = ?", $data['new']['ssl'], 'n', $data['new']['domain']);
	`1223`	+ $app->dbmaster->query("UPDATE web_domain SET `ssl` = ?, `ssl_letsencrypt` = ? WHERE `domain` = ? AND `server_id` = ?", $data['new']['ssl'], 'n', $data['new']['domain'], $conf['server_id']);
`1224`	`1224`	`}`
`1225`	`1225`	`}`
`1226`	`1226`
Original file line number	Diff line number	Diff line change
`@@ -1298,7 +1298,7 @@ function update($event_name, $data) {`
`1298`	`1298`	`$data['new']['ssl_letsencrypt'] = 'n';`
`1299`	`1299`	`if($data['old']['ssl'] == 'n') $data['new']['ssl'] = 'n';`
`1300`	`1300`	`/* Update the DB of the (local) Server */`
`1301`		- $app->db->query("UPDATE web_domain SET `ssl` = ?, `ssl_letsencrypt` = ? WHERE `domain` = ?", $data['new']['ssl'], 'n', $data['new']['domain']);
	`1301`	+ $app->db->query("UPDATE web_domain SET `ssl` = ?, `ssl_letsencrypt` = ? WHERE `domain` = ? AND `server_id` = ?", $data['new']['ssl'], 'n', $data['new']['domain'], $conf['server_id']);
`1302`	`1302`	`/* Update also the master-DB of the Server-Farm */`
`1303`	`1303`	$app->dbmaster->query("UPDATE web_domain SET `ssl` = ?, `ssl_letsencrypt` = ? WHERE `domain` = ?", $data['new']['ssl'], 'n', $data['new']['domain']);
`1304`	`1304`	`}`