diff --git a/Shorewall/helpers b/Shorewall/helpers new file mode 100644 index 000000000..fb8b27e8d --- /dev/null +++ b/Shorewall/helpers @@ -0,0 +1,74 @@ +# +# Shorewall version 4 - Helpers File +# +# /usr/share/shorewall/helpers +# +# This file loads the kernel helper modules. +# +# THE ORDER OF THE COMMANDS BELOW IS IMPORTANT!!!!!! You MUST load in +# dependency order. i.e., if M2 depends on M1 then you must load M1 +# before you load M2. +# +# If you need to modify this file, copy it to /etc/shorewall and modify the +# copy. +# +############################################################################### + +# Helpers +# +loadmodule ip_conntrack_amanda +loadmodule ip_conntrack_ftp +loadmodule ip_conntrack_h323 +loadmodule ip_conntrack_irc +loadmodule ip_conntrack_netbios_ns +loadmodule ip_conntrack_pptp +loadmodule ip_conntrack_sip +loadmodule ip_conntrack_tftp +loadmodule ip_nat_amanda +loadmodule ip_nat_ftp +loadmodule ip_nat_h323 +loadmodule ip_nat_irc +loadmodule ip_nat_pptp +loadmodule ip_nat_sip +loadmodule ip_nat_snmp_basic +loadmodule ip_nat_tftp +loadmodule ip_set +loadmodule ip_set_iphash +loadmodule ip_set_ipmap +loadmodule ip_set_macipmap +loadmodule ip_set_portmap +# +# 2.6.20+ helpers +# +loadmodule nf_conntrack_ftp +loadmodule nf_conntrack_h323 +loadmodule nf_conntrack_irc +loadmodule nf_conntrack_netbios_ns +loadmodule nf_conntrack_netlink +loadmodule nf_conntrack_pptp +loadmodule nf_conntrack_proto_gre +loadmodule nf_conntrack_proto_sctp +loadmodule nf_conntrack_sip sip_direct_media=0 +loadmodule nf_conntrack_tftp +loadmodule nf_conntrack_sane +loadmodule nf_nat_amanda +loadmodule nf_nat_ftp +loadmodule nf_nat_h323 +loadmodule nf_nat_irc +loadmodule nf_nat +loadmodule nf_nat_pptp +loadmodule nf_nat_proto_gre +loadmodule nf_nat_sip +loadmodule nf_nat_snmp_basic +loadmodule nf_nat_tftp +# +# Traffic Shaping +# +loadmodule sch_sfq +loadmodule sch_ingress +loadmodule sch_hfsc +loadmodule sch_htb +loadmodule cls_u32 +loadmodule cls_fw +loadmodule cls_flow +loadmodule act_police diff --git a/Shorewall/install.sh b/Shorewall/install.sh index fa6068be6..5a2ac5b07 100755 --- a/Shorewall/install.sh +++ b/Shorewall/install.sh @@ -421,6 +421,12 @@ fi run_install $OWNERSHIP -m 0600 modules ${PREFIX}/usr/share/shorewall/modules echo "Modules file installed as ${PREFIX}/usr/share/shorewall/modules" +# +# Install the Module Helpers file +# +run_install $OWNERSHIP -m 0600 helpers ${PREFIX}/usr/share/shorewall/helpers +echo "Helper modules file installed as ${PREFIX}/usr/share/shorewall/helpers" + # # Install the TC Rules file # diff --git a/Shorewall/shorewall.spec b/Shorewall/shorewall.spec index 638510d48..6a9969f51 100644 --- a/Shorewall/shorewall.spec +++ b/Shorewall/shorewall.spec @@ -91,6 +91,7 @@ fi %attr(0644,root,root) /usr/share/shorewall/lib.cli %attr(0644,root,root) /usr/share/shorewall/macro.* %attr(0644,root,root) /usr/share/shorewall/modules +%attr(0644,root,root) /usr/share/shorewall/helpers %attr(0644,root,root) /usr/share/shorewall/configpath %attr(0755,root,root) /usr/share/shorewall/wait4ifup @@ -106,6 +107,8 @@ fi %doc COPYING INSTALL changelog.txt releasenotes.txt Contrib/* Samples %changelog +* Thu Jan 21 2010 Tom Eastep tom@shorewall.net +- Add /usr/share/shorewall/helpers * Sun Jan 17 2010 Tom Eastep tom@shorewall.net - Updated to 4.4.7-0Beta1 * Wed Jan 13 2010 Tom Eastep tom@shorewall.net