diff options
author | Renato Botelho <garga@FreeBSD.org> | 2014-11-18 22:08:39 -0200 |
---|---|---|
committer | Renato Botelho <garga@FreeBSD.org> | 2014-11-18 22:08:39 -0200 |
commit | 47ab066c5a81d7833eda22229e2ef2ed925429c1 (patch) | |
tree | 968c563797d183fd6d20d37591a23a7ba1aac1b0 /config/postfix/postfix_view_config.php | |
parent | fa5eabb9ffff905b72b85360eb43f716d745e9ad (diff) | |
parent | c039b33454e93ebdb8ec6447bdd3fca1568c2838 (diff) | |
download | pfsense-packages-47ab066c5a81d7833eda22229e2ef2ed925429c1.tar.gz pfsense-packages-47ab066c5a81d7833eda22229e2ef2ed925429c1.tar.bz2 pfsense-packages-47ab066c5a81d7833eda22229e2ef2ed925429c1.zip |
Merge pull request #733 from marcelloc/master
Diffstat (limited to 'config/postfix/postfix_view_config.php')
-rw-r--r-- | config/postfix/postfix_view_config.php | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/config/postfix/postfix_view_config.php b/config/postfix/postfix_view_config.php index f82c9371..f50ae991 100644 --- a/config/postfix/postfix_view_config.php +++ b/config/postfix/postfix_view_config.php @@ -29,11 +29,15 @@ */ $shortcut_section = "postfix"; require("guiconfig.inc"); -$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_file($file){ $files['main']=POSTFIX_LOCALBASE."/etc/postfix/main.cf"; |