Skip to content

Commit c191650

Browse files
author
Till Brehm
committed
Fixed#5019 LE cert problem in mirror setups. This patch disables the creation of Let's encrypt SSL certs on mirrored slave servers.
1 parent 0643a23 commit c191650

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

server/plugins-available/apache2_plugin.inc.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1187,7 +1187,7 @@ function update($event_name, $data) {
11871187
$vhost_data['ssl_bundle_file'] = $bundle_file;
11881188

11891189
//* Generate Let's Encrypt SSL certificat
1190-
if($data['new']['ssl'] == 'y' && $data['new']['ssl_letsencrypt'] == 'y' && ( // ssl and let's encrypt is active
1190+
if($data['new']['ssl'] == 'y' && $data['new']['ssl_letsencrypt'] == 'y' && $conf['mirror_server_id'] == 0 ( // ssl and let's encrypt is active and no mirror server
11911191
($data['old']['ssl'] == 'n' || $data['old']['ssl_letsencrypt'] == 'n') // we have new let's encrypt configuration
11921192
|| ($data['old']['domain'] != $data['new']['domain']) // we have domain update
11931193
|| ($data['old']['subdomain'] != $data['new']['subdomain']) // we have new or update on "auto" subdomain

server/plugins-available/nginx_plugin.inc.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1270,7 +1270,7 @@ function update($event_name, $data) {
12701270
$vhost_data['ssl_bundle_file'] = $bundle_file;
12711271

12721272
//* Generate Let's Encrypt SSL certificat
1273-
if($data['new']['ssl'] == 'y' && $data['new']['ssl_letsencrypt'] == 'y' && ( // ssl and let's encrypt is active
1273+
if($data['new']['ssl'] == 'y' && $data['new']['ssl_letsencrypt'] == 'y' && $conf['mirror_server_id'] == 0 && ( // ssl and let's encrypt is active and no mirror server
12741274
($data['old']['ssl'] == 'n' || $data['old']['ssl_letsencrypt'] == 'n') // we have new let's encrypt configuration
12751275
|| ($data['old']['domain'] != $data['new']['domain']) // we have domain update
12761276
|| ($data['old']['subdomain'] != $data['new']['subdomain']) // we have new or update on "auto" subdomain

0 commit comments

Comments
 (0)