aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorMarcello Coutinho <marcellocoutinho@gmail.com>2014-11-25 16:40:24 -0200
committerMarcello Coutinho <marcellocoutinho@gmail.com>2014-11-25 16:40:24 -0200
commita2f2b7ee10b95866455953d297e0ab97b5468295 (patch)
tree7b50ff0fd0e1912513e50e6d1b4236651bee6193 /config
parent2dc85fc7519fe17550841919a6a1447495561e4c (diff)
parentc1a92316095d36d6413bfe86f219902f78ed2692 (diff)
downloadpfsense-packages-a2f2b7ee10b95866455953d297e0ab97b5468295.tar.gz
pfsense-packages-a2f2b7ee10b95866455953d297e0ab97b5468295.tar.bz2
pfsense-packages-a2f2b7ee10b95866455953d297e0ab97b5468295.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'config')
-rwxr-xr-xconfig/postfix/postfix.inc5
-rwxr-xr-xconfig/postfix/postfix_queue.php6
-rw-r--r--config/postfix/postfix_view_config.php6
3 files changed, 3 insertions, 14 deletions
diff --git a/config/postfix/postfix.inc b/config/postfix/postfix.inc
index 99af671b..35087149 100755
--- a/config/postfix/postfix.inc
+++ b/config/postfix/postfix.inc
@@ -37,10 +37,7 @@ require_once("globals.inc");
$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"));
+ define('POSTFIX_LOCALBASE', '/usr/pbi/postfix-' . php_uname("m"));
} else {
define('POSTFIX_LOCALBASE','/usr/local');
}
diff --git a/config/postfix/postfix_queue.php b/config/postfix/postfix_queue.php
index 6f8a7e19..1db2b8e2 100755
--- a/config/postfix/postfix_queue.php
+++ b/config/postfix/postfix_queue.php
@@ -34,12 +34,8 @@ $uname=posix_uname();
if ($uname['machine']=='amd64')
ini_set('memory_limit', '250M');
-$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"));
+ define('POSTFIX_LOCALBASE', '/usr/pbi/postfix-' . php_uname("m"));
} else {
define('POSTFIX_LOCALBASE','/usr/local');
}
diff --git a/config/postfix/postfix_view_config.php b/config/postfix/postfix_view_config.php
index f50ae991..a844ce65 100644
--- a/config/postfix/postfix_view_config.php
+++ b/config/postfix/postfix_view_config.php
@@ -29,12 +29,8 @@
*/
$shortcut_section = "postfix";
require("guiconfig.inc");
-$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"));
+ define('POSTFIX_LOCALBASE', '/usr/pbi/postfix-' . php_uname("m"));
} else {
define('POSTFIX_LOCALBASE','/usr/local');
}