From 0939d032a52ccb7ae6ec54f01a670a672ff5428c Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Thu, 12 Nov 2015 08:42:32 +0100 Subject: [PATCH] fix wrong vhost creation with nginx when customer is deactivated and no docroot for deactivated users was given, fixes #1565 Signed-off-by: Michael Kaufmann (d00p) --- scripts/jobs/cron_tasks.inc.http.30.nginx.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scripts/jobs/cron_tasks.inc.http.30.nginx.php b/scripts/jobs/cron_tasks.inc.http.30.nginx.php index 6e6e449f..60e2f91c 100644 --- a/scripts/jobs/cron_tasks.inc.http.30.nginx.php +++ b/scripts/jobs/cron_tasks.inc.http.30.nginx.php @@ -328,6 +328,11 @@ class nginx extends HttpConfigBase { return ''; } + // check whether the customer is deactivated an NO docroot for deactivated users has been set + if ($domain['deactivated'] == '1' && empty(Settings::Get('system.deactivateddocroot'))) { + return '# Customer deactivated and a docroot for deactivated users hasn\'t been set.' . "\n"; + } + $vhost_content = ''; $_vhost_content = '';