Compare commits
6 Commits
0674fb1231
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
| b99844c1b5 | |||
| 691c34fa18 | |||
| 1ca6031fea | |||
| 8234254094 | |||
| afff836253 | |||
|
|
7c05201520 |
@@ -2731,7 +2731,7 @@ EOF
|
|||||||
|
|
||||||
if [[ -n "$(which postfwd)" ]] ; then
|
if [[ -n "$(which postfwd)" ]] ; then
|
||||||
cat <<EOF >> /etc/postfix/main.cf
|
cat <<EOF >> /etc/postfix/main.cf
|
||||||
127.0.0.1:10040_time_limit = 3600
|
#127.0.0.1:10040_time_limit = 3600
|
||||||
EOF
|
EOF
|
||||||
else
|
else
|
||||||
cat <<EOF >> /etc/postfix/main.cf
|
cat <<EOF >> /etc/postfix/main.cf
|
||||||
@@ -2749,7 +2749,7 @@ if [[ -n "$(which policyd-spf)" ]] ; then
|
|||||||
# policyd-spf unix - n n - 0 spawn
|
# policyd-spf unix - n n - 0 spawn
|
||||||
# user=policyd-spf argv=/usr/bin/policyd-spf
|
# user=policyd-spf argv=/usr/bin/policyd-spf
|
||||||
#
|
#
|
||||||
policyd-spf_time_limit = 3600
|
#policyd-spf_time_limit = 3600
|
||||||
EOF
|
EOF
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -3049,7 +3049,7 @@ else
|
|||||||
EOF
|
EOF
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if ${IS_SYMPA_LIST_SERVER} ; then
|
if ${IS_SYMPA_LIST_SERVER} || ${IS_RELAY_HOST}; then
|
||||||
|
|
||||||
cat <<EOF >> /etc/postfix/main.cf
|
cat <<EOF >> /etc/postfix/main.cf
|
||||||
|
|
||||||
|
|||||||
@@ -2208,7 +2208,11 @@ fi
|
|||||||
|
|
||||||
echo -e "\n\n\t\033[37m\033[1mConfigure Postfix Admin\033[m\n"
|
echo -e "\n\n\t\033[37m\033[1mConfigure Postfix Admin\033[m\n"
|
||||||
|
|
||||||
if [[ $MAJOR_VERSION -gt 3 ]] || [[ $MAJOR_VERSION -eq 3 ]] && [[ $MINOR_VERSION -gt 0 ]]; then
|
if [[ $MAJOR_VERSION -gt 3 ]] ; then
|
||||||
|
pfa_conf_file="${WEBSITE_BASEDIR}/postfixadmin-${PF_ADMIN_VERSION}/config.local.php"
|
||||||
|
cp -a "${WEBSITE_BASEDIR}/postfixadmin-${PF_ADMIN_VERSION}/config.inc.php" "$pfa_conf_file"
|
||||||
|
|
||||||
|
elif [[ $MAJOR_VERSION -eq 3 ]] && [[ $MINOR_VERSION -gt 0 ]] ; then
|
||||||
pfa_conf_file="${WEBSITE_BASEDIR}/postfixadmin-${PF_ADMIN_VERSION}/config.local.php"
|
pfa_conf_file="${WEBSITE_BASEDIR}/postfixadmin-${PF_ADMIN_VERSION}/config.local.php"
|
||||||
cp -a "${WEBSITE_BASEDIR}/postfixadmin-${PF_ADMIN_VERSION}/config.inc.php" "$pfa_conf_file"
|
cp -a "${WEBSITE_BASEDIR}/postfixadmin-${PF_ADMIN_VERSION}/config.inc.php" "$pfa_conf_file"
|
||||||
else
|
else
|
||||||
@@ -2217,7 +2221,6 @@ else
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# - Use 'Re: $SUBJECT' as the default subject template for vacation
|
# - Use 'Re: $SUBJECT' as the default subject template for vacation
|
||||||
# - in postfixadmin
|
# - in postfixadmin
|
||||||
# -
|
# -
|
||||||
|
|||||||
Reference in New Issue
Block a user