aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcello Coutinho <marcellocoutinho@gmail.com>2014-11-25 17:33:36 -0200
committerMarcello Coutinho <marcellocoutinho@gmail.com>2014-11-25 17:33:36 -0200
commit8ddbda625f617a48a768cc9fd99f0fe40b6bab74 (patch)
treea0d92a12e918c8379aa474a3d132e85f9d61f352
parent9c355a9f2ea48991ae456c0704ba0b2c4fae014c (diff)
downloadpfsense-packages-8ddbda625f617a48a768cc9fd99f0fe40b6bab74.tar.gz
pfsense-packages-8ddbda625f617a48a768cc9fd99f0fe40b6bab74.tar.bz2
pfsense-packages-8ddbda625f617a48a768cc9fd99f0fe40b6bab74.zip
Postix - add etc folder check on pfsense 2.2
-rwxr-xr-xconfig/postfix/postfix.inc6
-rw-r--r--pkg_config.10.xml2
2 files changed, 7 insertions, 1 deletions
diff --git a/config/postfix/postfix.inc b/config/postfix/postfix.inc
index 35087149..eb5499aa 100755
--- a/config/postfix/postfix.inc
+++ b/config/postfix/postfix.inc
@@ -728,6 +728,12 @@ MASTEREOF2;
conf_mount_rw();
+ //check postfix etc dir on 2.2
+ $pfs_version = substr(trim(file_get_contents("/etc/version")),0,3);
+ $postfix_etc_lnk="/usr/local/etc/postfix";
+ if ($pfs_version == 2.2 && !is_dir($postfix_etc_lnk))
+ @symlink(POSTFIX_LOCALBASE.'/etc/postfix',$postfix_etc_lnk);
+
log_error("Writing out configuration");
file_put_contents(POSTFIX_LOCALBASE."/etc/postfix/main.cf", $postfix_main, LOCK_EX);
file_put_contents(POSTFIX_LOCALBASE."/etc/postfix/master.cf", $postfix_master, LOCK_EX);
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index e8a8e6a2..2decacb6 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -415,7 +415,7 @@
<pkginfolink>https://forum.pfsense.org/index.php/topic,40622.0.html</pkginfolink>
<config_file>https://packages.pfsense.org/packages/config/postfix/postfix.xml</config_file>
<depends_on_package_pbi>postfix-2.11.3_2-##ARCH##.pbi</depends_on_package_pbi>
- <version>2.11.3_2 pkg v.2.4.0</version>
+ <version>2.11.3_2 pkg v.2.4.1</version>
<status>Release</status>
<required_version>2.2</required_version>
<configurationfile>postfix.xml</configurationfile>