From 8c6a4706f8bf375738197ed83d1f91d8a17032ef Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Thu, 26 May 2016 02:21:46 -0400
Subject: [PATCH] Merge branch 'stable-3.1'

---
 server/lib/classes/cron.d/900-letsencrypt.inc.php |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/server/lib/classes/cron.d/900-letsencrypt.inc.php b/server/lib/classes/cron.d/900-letsencrypt.inc.php
index f00adc2..7e1655e 100644
--- a/server/lib/classes/cron.d/900-letsencrypt.inc.php
+++ b/server/lib/classes/cron.d/900-letsencrypt.inc.php
@@ -36,8 +36,10 @@
 	public function onRunJob() {
 		global $app, $conf;
 
-		if(file_exists("/root/.local/share/letsencrypt/bin/letsencrypt")) {
-			exec('/root/.local/share/letsencrypt/bin/letsencrypt renew');
+		$letsencrypt = array_shift( split("\n", `which letsencrypt /root/.local/share/letsencrypt/bin/letsencrypt`) );
+		if(is_executable($letsencrypt)) {
+			exec($letsencrypt . ' -n renew');
+			$app->services->restartServiceDelayed('httpd', 'reload');
 		}
 		
 		parent::onRunJob();

--
Gitblit v1.9.1