From b8ff9fd8f4a15e587e9165c1c3cd2d1748fb3859 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Tue, 7 Mar 2017 14:03:48 +0100
Subject: [PATCH] - for LE reload is not enough, we need force-reload
---
server/lib/classes/cron.d/900-letsencrypt.inc.php | 6 +++---
server/mods-available/web_module.inc.php | 2 ++
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/server/lib/classes/cron.d/900-letsencrypt.inc.php b/server/lib/classes/cron.d/900-letsencrypt.inc.php
index 0f6aaaed6b..0a068dcf7a 100644
--- a/server/lib/classes/cron.d/900-letsencrypt.inc.php
+++ b/server/lib/classes/cron.d/900-letsencrypt.inc.php
@@ -45,19 +45,19 @@ class cronjob_letsencrypt extends cronjob {
$version = $matches[2];
if(($type != 'letsencrypt' && $type != 'certbot') || version_compare($version, '0.7.0', '<')) {
exec($letsencrypt . ' -n renew');
- $app->services->restartServiceDelayed('httpd', 'reload');
+ $app->services->restartServiceDelayed('httpd', 'force-reload');
} else {
$marker_file = '/usr/local/ispconfig/server/le.restart';
$cmd = "echo '1' > " . $marker_file;
exec($letsencrypt . ' -n renew --post-hook ' . escapeshellarg($cmd));
if(file_exists($marker_file) && trim(file_get_contents($marker_file)) == '1') {
unlink($marker_file);
- $app->services->restartServiceDelayed('httpd', 'reload');
+ $app->services->restartServiceDelayed('httpd', 'force-reload');
}
}
} else {
exec($letsencrypt . ' -n renew');
- $app->services->restartServiceDelayed('httpd', 'reload');
+ $app->services->restartServiceDelayed('httpd', 'force-reload');
}
}
diff --git a/server/mods-available/web_module.inc.php b/server/mods-available/web_module.inc.php
index 6d3e8c1083..aecec10579 100644
--- a/server/mods-available/web_module.inc.php
+++ b/server/mods-available/web_module.inc.php
@@ -213,6 +213,8 @@ class web_module {
$retval = array('output' => '', 'retval' => 0);
if($action == 'restart') {
$cmd = $app->system->getinitcommand($daemon, 'restart');
+ } elseif($action == 'force-reload') {
+ $cmd = $app->system->getinitcommand($daemon, 'force-reload');
} else {
$cmd = $app->system->getinitcommand($daemon, 'reload');
}
--
GitLab