Merge branch 'stable-3.1'

Marius Burkard

2016-05-26 8c6a4706f8bf375738197ed83d1f91d8a17032ef

 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();