Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig3

Marius Cramer

2015-02-03 9b0ee8d9832edd60b772ee11a18f2e1c4f39e8cf

 server/lib/classes/cron.d/100-monitor_disk_usage.inc.php

@@ -73,8 +73,9 @@
      //$dfData = shell_exec('df -hT 2>/dev/null');
      $app->uses('getconf');
      $web_config = $app->getconf->get_server_config($conf['server_id'], 'web');
      $dfData = shell_exec('df -hT|grep -v "'.$web_config['website_basedir'].'/" 2>/dev/null');

		
      $dfData = shell_exec('df -hT -x simfs | awk \'!x[$1]++\' 2>/dev/null');
		
      // split into array
      $df = explode("\n", $dfData);