diff options
| author | Renato Botelho <garga@FreeBSD.org> | 2014-11-25 23:19:35 -0200 |
|---|---|---|
| committer | Renato Botelho <garga@FreeBSD.org> | 2014-11-25 23:19:35 -0200 |
| commit | 4744a0c204854a42630792ca35c81dc9c407882d (patch) | |
| tree | a0d92a12e918c8379aa474a3d132e85f9d61f352 | |
| parent | 9c355a9f2ea48991ae456c0704ba0b2c4fae014c (diff) | |
| parent | 8ddbda625f617a48a768cc9fd99f0fe40b6bab74 (diff) | |
| download | pfsense-packages-4744a0c204854a42630792ca35c81dc9c407882d.tar.gz pfsense-packages-4744a0c204854a42630792ca35c81dc9c407882d.tar.bz2 pfsense-packages-4744a0c204854a42630792ca35c81dc9c407882d.zip | |
Merge pull request #739 from marcelloc/postfix_20141125
| -rwxr-xr-x | config/postfix/postfix.inc | 6 | ||||
| -rw-r--r-- | pkg_config.10.xml | 2 |
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> |