aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorRenato Botelho <garga@FreeBSD.org>2015-04-24 15:30:23 -0300
committerRenato Botelho <garga@FreeBSD.org>2015-04-24 15:30:23 -0300
commitf419a613d7859ac13d273836cbb83502df3fdf36 (patch)
tree584a2bd08d28a74c42cfc6fadfd311b8a1659166 /config
parent1a49cc00311c225215f8f5b44f790b1f459f6d67 (diff)
downloadpfsense-packages-f419a613d7859ac13d273836cbb83502df3fdf36.tar.gz
pfsense-packages-f419a613d7859ac13d273836cbb83502df3fdf36.tar.bz2
pfsense-packages-f419a613d7859ac13d273836cbb83502df3fdf36.zip
Sanitize postfix version, add internal_name, port_category and run_depends. Also fix PBI checks
Diffstat (limited to 'config')
-rwxr-xr-xconfig/postfix/postfix.inc2
-rwxr-xr-xconfig/postfix/postfix_queue.php3
-rw-r--r--config/postfix/postfix_view_config.php4
3 files changed, 6 insertions, 3 deletions
diff --git a/config/postfix/postfix.inc b/config/postfix/postfix.inc
index eb5499aa..e2b5c7df 100755
--- a/config/postfix/postfix.inc
+++ b/config/postfix/postfix.inc
@@ -36,7 +36,7 @@ require_once("pkg-utils.inc");
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.1" || $pfs_version == "2.2") {
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 a737340e..740640d3 100755
--- a/config/postfix/postfix_queue.php
+++ b/config/postfix/postfix_queue.php
@@ -34,7 +34,8 @@ $uname=posix_uname();
if ($uname['machine']=='amd64')
ini_set('memory_limit', '250M');
-if (is_dir('/usr/pbi/postfix-' . php_uname("m"))) {
+$pfs_version = substr(trim(file_get_contents("/etc/version")),0,3);
+if ($pfs_version == "2.1" || $pfs_version == "2.2") {
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 a844ce65..f23937d4 100644
--- a/config/postfix/postfix_view_config.php
+++ b/config/postfix/postfix_view_config.php
@@ -29,7 +29,9 @@
*/
$shortcut_section = "postfix";
require("guiconfig.inc");
-if (is_dir('/usr/pbi/postfix-' . php_uname("m"))) {
+
+$pfs_version = substr(trim(file_get_contents("/etc/version")),0,3);
+if ($pfs_version == "2.1" || $pfs_version == "2.2") {
define('POSTFIX_LOCALBASE', '/usr/pbi/postfix-' . php_uname("m"));
} else {
define('POSTFIX_LOCALBASE','/usr/local');