diff options
| author | Marcello Coutinho <marcellocoutinho@gmail.com> | 2014-11-18 17:57:06 -0200 |
|---|---|---|
| committer | Marcello Coutinho <marcellocoutinho@gmail.com> | 2014-11-18 17:57:06 -0200 |
| commit | e32299eb10722d6b5d232335903061c060b086ed (patch) | |
| tree | 7f81855e6d8962d1dd459e83d9cb2eea9064a539 /config/postfix/postfix_queue.php | |
| parent | 5de63ed7fed8e7e86686da1346fee0590d8316b2 (diff) | |
| download | pfsense-packages-e32299eb10722d6b5d232335903061c060b086ed.tar.gz pfsense-packages-e32299eb10722d6b5d232335903061c060b086ed.tar.bz2 pfsense-packages-e32299eb10722d6b5d232335903061c060b086ed.zip | |
Postfix - Improve package instalation folder checks
Diffstat (limited to 'config/postfix/postfix_queue.php')
| -rwxr-xr-x | config/postfix/postfix_queue.php | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/config/postfix/postfix_queue.php b/config/postfix/postfix_queue.php index 4f072eba..6f8a7e19 100755 --- a/config/postfix/postfix_queue.php +++ b/config/postfix/postfix_queue.php @@ -34,12 +34,15 @@ $uname=posix_uname(); if ($uname['machine']=='amd64') ini_set('memory_limit', '250M'); -$pf_version=substr(trim(file_get_contents("/etc/version")),0,3); -if ($pf_version > 2.0) - define('POSTFIX_LOCALBASE', '/usr/pbi/postfix-' . php_uname("m")); -else - define('POSTFIX_LOCALBASE','/usr/local'); - +$pfs_version = substr(trim(file_get_contents("/etc/version")),0,3); +if (is_dir('/usr/pbi/postfix-' . php_uname("m"))) { + if ($pfs_version == 2.2) + define('POSTFIX_LOCALBASE', '/usr/pbi/postfix-' . php_uname("m")."/local"); + else + define('POSTFIX_LOCALBASE', '/usr/pbi/postfix-' . php_uname("m")); +} else { + define('POSTFIX_LOCALBASE','/usr/local'); +} function get_cmd(){ if ($_REQUEST['cmd'] =='mailq'){ #exec("/usr/local/bin/mailq" . escapeshellarg('^'.$m.$j." ".$hour.".*".$grep)." /var/log/maillog", $lists); |