diff options
| author | Christian Poessinger <christian@poessinger.com> | 2021-02-11 08:53:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-11 08:53:12 +0100 |
| commit | 6648b03c41186fd9de6604ca096b46fb7aa53f09 (patch) | |
| tree | 1ba33aa0c2cb2ae2ad8f14abdce6e4c88472229b | |
| parent | e51142bdf998270c377e19bdbe237f4e1eb5a29b (diff) | |
| parent | 21bf2576345974b92689b78ee8b67444c9af3d44 (diff) | |
| download | vyatta-conntrack-6648b03c41186fd9de6604ca096b46fb7aa53f09.tar.gz vyatta-conntrack-6648b03c41186fd9de6604ca096b46fb7aa53f09.zip | |
Merge pull request #3 from bstepler/T3290
conntrack: T3290: remove references to removed GRE plugins
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | cfg-version/conntrack@2 (renamed from cfg-version/conntrack@1) | 0 | ||||
| -rw-r--r-- | templates-cfg/system/conntrack/modules/gre/disable/node.def | 21 | ||||
| -rw-r--r-- | templates-cfg/system/conntrack/modules/gre/node.def | 1 | ||||
| -rw-r--r-- | templates-cfg/system/conntrack/modules/pptp/disable/node.def | 21 |
5 files changed, 5 insertions, 40 deletions
diff --git a/Makefile.am b/Makefile.am index 73e1a09..0a490bb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -28,7 +28,7 @@ bin_sudo_users_SCRIPTS += scripts/vyatta-cthelper.pl bin_sudo_users_SCRIPTS += scripts/vyatta-conntrack-ignore.pl bin_sudo_users_SCRIPTS += scripts/vyatta-show-ignore.pl -curver_DATA = cfg-version/conntrack@1 +curver_DATA = cfg-version/conntrack@2 modprobe_DATA = etc/modprobe.d/vyatta_nf_conntrack.conf diff --git a/cfg-version/conntrack@1 b/cfg-version/conntrack@2 index e69de29..e69de29 100644 --- a/cfg-version/conntrack@1 +++ b/cfg-version/conntrack@2 diff --git a/templates-cfg/system/conntrack/modules/gre/disable/node.def b/templates-cfg/system/conntrack/modules/gre/disable/node.def deleted file mode 100644 index f6f9546..0000000 --- a/templates-cfg/system/conntrack/modules/gre/disable/node.def +++ /dev/null @@ -1,21 +0,0 @@ -help: Disable GRE connection tracking - -# GRE shouldn't be disabled when PPTP is enabled because PPTP depends on it -create: cli-shell-api exists system conntrack modules pptp disable - if [ $? == 0 ]; then - # Unload PPTP modules if they are loaded - lsmod | grep -e "^nf_nat_pptp" 2>&1 >/dev/null - if [ $? == 0 ]; then - sudo rmmod nf_nat_pptp - sudo rmmod nf_conntrack_pptp - fi - # And GRE modules then - sudo rmmod nf_nat_proto_gre - sudo rmmod nf_conntrack_proto_gre - else - echo "Error: can not disable GRE connection tracking when PPTP connection tracking is enabled!" - exit 1 - fi - -delete: sudo modprobe nf_conntrack_proto_gre - sudo modprobe nf_nat_proto_gre diff --git a/templates-cfg/system/conntrack/modules/gre/node.def b/templates-cfg/system/conntrack/modules/gre/node.def deleted file mode 100644 index 0906a68..0000000 --- a/templates-cfg/system/conntrack/modules/gre/node.def +++ /dev/null @@ -1 +0,0 @@ -help: GRE connection tracking settings diff --git a/templates-cfg/system/conntrack/modules/pptp/disable/node.def b/templates-cfg/system/conntrack/modules/pptp/disable/node.def index 4ffd980..8051889 100644 --- a/templates-cfg/system/conntrack/modules/pptp/disable/node.def +++ b/templates-cfg/system/conntrack/modules/pptp/disable/node.def @@ -1,20 +1,7 @@ help: Disable PPTP connection tracking -create: cli-shell-api exists system conntrack modules gre disable - if [ $? == 0 ]; then - # Do nothing, this case is handled in GRE module templates - :; - else - sudo rmmod nf_nat_pptp - sudo rmmod nf_conntrack_pptp - fi +create: sudo rmmod nf_nat_pptp + sudo rmmod nf_conntrack_pptp -# PPTP shouldn't be enabled when GRE is disabled because PPTP depends on it -delete: cli-shell-api exists system conntrack modules gre disable - if [ $? == 0 ]; then - echo "Error: can not enable PPTP connection tracking when GRE connection tracking is disabled!" - exit 1 - else - sudo modprobe nf_conntrack_pptp - sudo modprobe nf_nat_pptp - fi +delete: sudo modprobe nf_conntrack_pptp + sudo modprobe nf_nat_pptp |