Compare commits
No commits in common. "409ace650ee5b3ba773ae4358add8c104c278d5f" and "54ce58a52ee49e87452041e1103d64cc3ebb3bb9" have entirely different histories.
409ace650e
...
54ce58a52e
@ -360,19 +360,6 @@ mm_udp_ports_out="$stansard_mattermost_udp_ports_out"
|
|||||||
smtpd_ips=""
|
smtpd_ips=""
|
||||||
forward_smtpd_ips=""
|
forward_smtpd_ips=""
|
||||||
|
|
||||||
# Additional Ports on which SMTP Service should lsiten
|
|
||||||
#
|
|
||||||
# blank separated list of ports
|
|
||||||
#
|
|
||||||
smtpd_additional_listen_ports=""
|
|
||||||
|
|
||||||
# Additional Ports for outgoing smtp traffic
|
|
||||||
#
|
|
||||||
# blank separated list of ports
|
|
||||||
#
|
|
||||||
smtpd_additional_outgoung_ports=""
|
|
||||||
|
|
||||||
|
|
||||||
# - Mail Services (smtps/pop(s)/imap(s)
|
# - Mail Services (smtps/pop(s)/imap(s)
|
||||||
# -
|
# -
|
||||||
mail_server_ips=""
|
mail_server_ips=""
|
||||||
|
@ -376,19 +376,6 @@ mm_udp_ports_out="$stansard_mattermost_udp_ports_out"
|
|||||||
smtpd_ips=""
|
smtpd_ips=""
|
||||||
forward_smtpd_ips=""
|
forward_smtpd_ips=""
|
||||||
|
|
||||||
# Additional Ports on which SMTP Service should lsiten
|
|
||||||
#
|
|
||||||
# blank separated list of ports
|
|
||||||
#
|
|
||||||
smtpd_additional_listen_ports=""
|
|
||||||
|
|
||||||
# Additional Ports for outgoing smtp traffic
|
|
||||||
#
|
|
||||||
# blank separated list of ports
|
|
||||||
#
|
|
||||||
smtpd_additional_outgoung_ports=""
|
|
||||||
|
|
||||||
|
|
||||||
# - Mail Services (smtps/pop(s)/imap(s)
|
# - Mail Services (smtps/pop(s)/imap(s)
|
||||||
# -
|
# -
|
||||||
mail_server_ips=""
|
mail_server_ips=""
|
||||||
|
@ -313,24 +313,6 @@ for _ip in $forward_smtpd_ips ; do
|
|||||||
done
|
done
|
||||||
|
|
||||||
|
|
||||||
# ---
|
|
||||||
# Additional SMTP Listen Ports
|
|
||||||
# ---
|
|
||||||
declare -a smtpd_additional_listen_port_arr
|
|
||||||
for _port in $smtpd_additional_listen_ports ; do
|
|
||||||
smtpd_additional_listen_port_arr+=("$_port")
|
|
||||||
done
|
|
||||||
|
|
||||||
|
|
||||||
# ---
|
|
||||||
# Additional SMTP Outgoing Ports
|
|
||||||
# ---
|
|
||||||
declare -a smtpd_additional_outgoung_port_arr
|
|
||||||
for _port in $smtpd_additional_outgoung_ports ; do
|
|
||||||
smtpd_additional_outgoung_ports+=("$_port")
|
|
||||||
don
|
|
||||||
|
|
||||||
|
|
||||||
# ---
|
# ---
|
||||||
# - IP Addresses XMPP Service (Jabber - Prosody)
|
# - IP Addresses XMPP Service (Jabber - Prosody)
|
||||||
# ---
|
# ---
|
||||||
|
@ -1671,29 +1671,6 @@ done
|
|||||||
echo_done
|
echo_done
|
||||||
|
|
||||||
|
|
||||||
# ---
|
|
||||||
# - Mail (additional smtp ports OUT)
|
|
||||||
# ---
|
|
||||||
|
|
||||||
echononl "\t\tMail (additional smtp ports OUT)"
|
|
||||||
|
|
||||||
if [[ ${#smtpd_additional_outgoung_port_arr[@]} -gt 0 ]] ; then
|
|
||||||
|
|
||||||
for _port in ${smtpd_additional_outgoung_port_arr[@]} ; do
|
|
||||||
for _dev in ${ext_if_arr[@]} ; do
|
|
||||||
$ip6t -A OUTPUT -o $_dev -p tcp --dport $_port -m state --state NEW -j ACCEPT
|
|
||||||
if $kernel_forward_between_interfaces ; then
|
|
||||||
$ip6t -A FORWARD -o $_dev -p tcp --dport $_port -m state --state NEW -j ACCEPT
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
done
|
|
||||||
|
|
||||||
echo_done
|
|
||||||
else
|
|
||||||
echo_skipped
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
# ---
|
# ---
|
||||||
# - Mail SMTP Server (Port 25) including Spam Control
|
# - Mail SMTP Server (Port 25) including Spam Control
|
||||||
# ---
|
# ---
|
||||||
@ -1750,29 +1727,6 @@ else
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
# ---
|
|
||||||
# - Mail (additional smtp ports IN)
|
|
||||||
# ---
|
|
||||||
|
|
||||||
echononl "\t\tMail (additional smtp ports IN)"
|
|
||||||
|
|
||||||
if [[ ${#smtpd_additional_listen_ports[@]} -gt 0 ]] ; then
|
|
||||||
|
|
||||||
for _port in ${smtpd_additional_listen_ports[@]} ; do
|
|
||||||
for _dev in ${ext_if_arr[@]} ; do
|
|
||||||
$ip6t -A INPUT -i $_dev -p tcp --dport $_port -m state --state NEW -j ACCEPT
|
|
||||||
if $kernel_forward_between_interfaces ; then
|
|
||||||
$ip6t -A FORWARD -i $_dev -p tcp --dport $_port -m state --state NEW -j ACCEPT
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
done
|
|
||||||
|
|
||||||
echo_done
|
|
||||||
else
|
|
||||||
echo_skipped
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
# ---
|
# ---
|
||||||
# - Mailservice (Submission/SMTPS/POP/IMAP Server)
|
# - Mailservice (Submission/SMTPS/POP/IMAP Server)
|
||||||
# ---
|
# ---
|
||||||
|
@ -1837,29 +1837,6 @@ done
|
|||||||
echo_done
|
echo_done
|
||||||
|
|
||||||
|
|
||||||
# ---
|
|
||||||
# - Mail (additional smtp ports OUT)
|
|
||||||
# ---
|
|
||||||
|
|
||||||
echononl "\t\tMail (additional smtp ports OUT)"
|
|
||||||
|
|
||||||
if [[ ${#smtpd_additional_outgoung_port_arr[@]} -gt 0 ]] ; then
|
|
||||||
|
|
||||||
for _port in ${smtpd_additional_outgoung_port_arr[@]} ; do
|
|
||||||
for _dev in ${ext_if_arr[@]} ; do
|
|
||||||
$ipt -A OUTPUT -o $_dev -p tcp --dport $_port -m state --state NEW -j ACCEPT
|
|
||||||
if $kernel_activate_forwarding ; then
|
|
||||||
$ipt -A FORWARD -o $_dev -p tcp --dport $_port -m state --state NEW -j ACCEPT
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
done
|
|
||||||
|
|
||||||
echo_done
|
|
||||||
else
|
|
||||||
echo_skipped
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
# ---
|
# ---
|
||||||
# - Mail SMTP Server (Port 25) including Spam Control
|
# - Mail SMTP Server (Port 25) including Spam Control
|
||||||
# ---
|
# ---
|
||||||
@ -1916,29 +1893,6 @@ else
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
# ---
|
|
||||||
# - Mail (additional smtp ports IN)
|
|
||||||
# ---
|
|
||||||
|
|
||||||
echononl "\t\tMail (additional smtp ports IN)"
|
|
||||||
|
|
||||||
if [[ ${#smtpd_additional_listen_ports[@]} -gt 0 ]] ; then
|
|
||||||
|
|
||||||
for _port in ${smtpd_additional_listen_ports[@]} ; do
|
|
||||||
for _dev in ${ext_if_arr[@]} ; do
|
|
||||||
$ipt -A INPUT -i $_dev -p tcp --dport $_port -m state --state NEW -j ACCEPT
|
|
||||||
if $kernel_activate_forwarding ; then
|
|
||||||
$ipt -A FORWARD -i $_dev -p tcp --dport $_port -m state --state NEW -j ACCEPT
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
done
|
|
||||||
|
|
||||||
echo_done
|
|
||||||
else
|
|
||||||
echo_skipped
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
# ---
|
# ---
|
||||||
# - Mailservice (Submission/SMTPS/POP/IMAP Server)
|
# - Mailservice (Submission/SMTPS/POP/IMAP Server)
|
||||||
# ---
|
# ---
|
||||||
|
Loading…
x
Reference in New Issue
Block a user