From c9f45277b894b9eeaa45a2b0057b1c3befce9a2b Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Fri, 23 Dec 2016 09:05:37 -0800 Subject: [PATCH] Move the action files to their own directory Signed-off-by: Tom Eastep --- Shorewall/{ => Actions}/action.A_Drop | 0 Shorewall/{ => Actions}/action.A_REJECT | 0 Shorewall/{ => Actions}/action.A_REJECT! | 0 Shorewall/{ => Actions}/action.A_Reject.deprecated | 0 Shorewall/{ => Actions}/action.AutoBL | 0 Shorewall/{ => Actions}/action.AutoBLL | 0 Shorewall/{ => Actions}/action.Broadcast | 0 Shorewall/{ => Actions}/action.DNSAmp | 0 Shorewall/{ => Actions}/action.Drop | 0 Shorewall/{ => Actions}/action.DropSmurfs | 0 Shorewall/{ => Actions}/action.Established | 0 Shorewall/{ => Actions}/action.GlusterFS | 0 Shorewall/{ => Actions}/action.IfEvent | 0 Shorewall/{ => Actions}/action.Invalid | 0 Shorewall/{ => Actions}/action.New | 0 Shorewall/{ => Actions}/action.NotSyn | 0 Shorewall/{ => Actions}/action.RST | 0 Shorewall/{ => Actions}/action.Reject | 0 Shorewall/{ => Actions}/action.Related | 0 Shorewall/{ => Actions}/action.ResetEvent | 0 Shorewall/{ => Actions}/action.SetEvent | 0 Shorewall/{ => Actions}/action.TCPFlags | 0 Shorewall/{ => Actions}/action.Untracked | 0 Shorewall/{ => Actions}/action.allowInvalid | 0 Shorewall/{ => Actions}/action.dropInvalid | 0 Shorewall/{ => Actions}/action.mangletemplate | 0 Shorewall/{ => Actions}/action.template | 0 Shorewall/install.sh | 8 ++++++-- Shorewall6/{ => Actions}/action.A_AllowICMPs | 0 Shorewall6/{ => Actions}/action.AllowICMPs | 0 Shorewall6/{ => Actions}/action.Broadcast | 0 Shorewall6/{ => Actions}/action.mangletemplate | 0 Shorewall6/{ => Actions}/action.template | 0 33 files changed, 6 insertions(+), 2 deletions(-) rename Shorewall/{ => Actions}/action.A_Drop (100%) rename Shorewall/{ => Actions}/action.A_REJECT (100%) rename Shorewall/{ => Actions}/action.A_REJECT! (100%) rename Shorewall/{ => Actions}/action.A_Reject.deprecated (100%) rename Shorewall/{ => Actions}/action.AutoBL (100%) rename Shorewall/{ => Actions}/action.AutoBLL (100%) rename Shorewall/{ => Actions}/action.Broadcast (100%) rename Shorewall/{ => Actions}/action.DNSAmp (100%) rename Shorewall/{ => Actions}/action.Drop (100%) rename Shorewall/{ => Actions}/action.DropSmurfs (100%) rename Shorewall/{ => Actions}/action.Established (100%) rename Shorewall/{ => Actions}/action.GlusterFS (100%) rename Shorewall/{ => Actions}/action.IfEvent (100%) rename Shorewall/{ => Actions}/action.Invalid (100%) rename Shorewall/{ => Actions}/action.New (100%) rename Shorewall/{ => Actions}/action.NotSyn (100%) rename Shorewall/{ => Actions}/action.RST (100%) rename Shorewall/{ => Actions}/action.Reject (100%) rename Shorewall/{ => Actions}/action.Related (100%) rename Shorewall/{ => Actions}/action.ResetEvent (100%) rename Shorewall/{ => Actions}/action.SetEvent (100%) rename Shorewall/{ => Actions}/action.TCPFlags (100%) rename Shorewall/{ => Actions}/action.Untracked (100%) rename Shorewall/{ => Actions}/action.allowInvalid (100%) rename Shorewall/{ => Actions}/action.dropInvalid (100%) rename Shorewall/{ => Actions}/action.mangletemplate (100%) rename Shorewall/{ => Actions}/action.template (100%) rename Shorewall6/{ => Actions}/action.A_AllowICMPs (100%) rename Shorewall6/{ => Actions}/action.AllowICMPs (100%) rename Shorewall6/{ => Actions}/action.Broadcast (100%) rename Shorewall6/{ => Actions}/action.mangletemplate (100%) rename Shorewall6/{ => Actions}/action.template (100%) diff --git a/Shorewall/action.A_Drop b/Shorewall/Actions/action.A_Drop similarity index 100% rename from Shorewall/action.A_Drop rename to Shorewall/Actions/action.A_Drop diff --git a/Shorewall/action.A_REJECT b/Shorewall/Actions/action.A_REJECT similarity index 100% rename from Shorewall/action.A_REJECT rename to Shorewall/Actions/action.A_REJECT diff --git a/Shorewall/action.A_REJECT! b/Shorewall/Actions/action.A_REJECT! similarity index 100% rename from Shorewall/action.A_REJECT! rename to Shorewall/Actions/action.A_REJECT! diff --git a/Shorewall/action.A_Reject.deprecated b/Shorewall/Actions/action.A_Reject.deprecated similarity index 100% rename from Shorewall/action.A_Reject.deprecated rename to Shorewall/Actions/action.A_Reject.deprecated diff --git a/Shorewall/action.AutoBL b/Shorewall/Actions/action.AutoBL similarity index 100% rename from Shorewall/action.AutoBL rename to Shorewall/Actions/action.AutoBL diff --git a/Shorewall/action.AutoBLL b/Shorewall/Actions/action.AutoBLL similarity index 100% rename from Shorewall/action.AutoBLL rename to Shorewall/Actions/action.AutoBLL diff --git a/Shorewall/action.Broadcast b/Shorewall/Actions/action.Broadcast similarity index 100% rename from Shorewall/action.Broadcast rename to Shorewall/Actions/action.Broadcast diff --git a/Shorewall/action.DNSAmp b/Shorewall/Actions/action.DNSAmp similarity index 100% rename from Shorewall/action.DNSAmp rename to Shorewall/Actions/action.DNSAmp diff --git a/Shorewall/action.Drop b/Shorewall/Actions/action.Drop similarity index 100% rename from Shorewall/action.Drop rename to Shorewall/Actions/action.Drop diff --git a/Shorewall/action.DropSmurfs b/Shorewall/Actions/action.DropSmurfs similarity index 100% rename from Shorewall/action.DropSmurfs rename to Shorewall/Actions/action.DropSmurfs diff --git a/Shorewall/action.Established b/Shorewall/Actions/action.Established similarity index 100% rename from Shorewall/action.Established rename to Shorewall/Actions/action.Established diff --git a/Shorewall/action.GlusterFS b/Shorewall/Actions/action.GlusterFS similarity index 100% rename from Shorewall/action.GlusterFS rename to Shorewall/Actions/action.GlusterFS diff --git a/Shorewall/action.IfEvent b/Shorewall/Actions/action.IfEvent similarity index 100% rename from Shorewall/action.IfEvent rename to Shorewall/Actions/action.IfEvent diff --git a/Shorewall/action.Invalid b/Shorewall/Actions/action.Invalid similarity index 100% rename from Shorewall/action.Invalid rename to Shorewall/Actions/action.Invalid diff --git a/Shorewall/action.New b/Shorewall/Actions/action.New similarity index 100% rename from Shorewall/action.New rename to Shorewall/Actions/action.New diff --git a/Shorewall/action.NotSyn b/Shorewall/Actions/action.NotSyn similarity index 100% rename from Shorewall/action.NotSyn rename to Shorewall/Actions/action.NotSyn diff --git a/Shorewall/action.RST b/Shorewall/Actions/action.RST similarity index 100% rename from Shorewall/action.RST rename to Shorewall/Actions/action.RST diff --git a/Shorewall/action.Reject b/Shorewall/Actions/action.Reject similarity index 100% rename from Shorewall/action.Reject rename to Shorewall/Actions/action.Reject diff --git a/Shorewall/action.Related b/Shorewall/Actions/action.Related similarity index 100% rename from Shorewall/action.Related rename to Shorewall/Actions/action.Related diff --git a/Shorewall/action.ResetEvent b/Shorewall/Actions/action.ResetEvent similarity index 100% rename from Shorewall/action.ResetEvent rename to Shorewall/Actions/action.ResetEvent diff --git a/Shorewall/action.SetEvent b/Shorewall/Actions/action.SetEvent similarity index 100% rename from Shorewall/action.SetEvent rename to Shorewall/Actions/action.SetEvent diff --git a/Shorewall/action.TCPFlags b/Shorewall/Actions/action.TCPFlags similarity index 100% rename from Shorewall/action.TCPFlags rename to Shorewall/Actions/action.TCPFlags diff --git a/Shorewall/action.Untracked b/Shorewall/Actions/action.Untracked similarity index 100% rename from Shorewall/action.Untracked rename to Shorewall/Actions/action.Untracked diff --git a/Shorewall/action.allowInvalid b/Shorewall/Actions/action.allowInvalid similarity index 100% rename from Shorewall/action.allowInvalid rename to Shorewall/Actions/action.allowInvalid diff --git a/Shorewall/action.dropInvalid b/Shorewall/Actions/action.dropInvalid similarity index 100% rename from Shorewall/action.dropInvalid rename to Shorewall/Actions/action.dropInvalid diff --git a/Shorewall/action.mangletemplate b/Shorewall/Actions/action.mangletemplate similarity index 100% rename from Shorewall/action.mangletemplate rename to Shorewall/Actions/action.mangletemplate diff --git a/Shorewall/action.template b/Shorewall/Actions/action.template similarity index 100% rename from Shorewall/action.template rename to Shorewall/Actions/action.template diff --git a/Shorewall/install.sh b/Shorewall/install.sh index 27dc4b59c..512d649c5 100755 --- a/Shorewall/install.sh +++ b/Shorewall/install.sh @@ -1054,6 +1054,8 @@ fi # # Install the Action files # +cd Actions + for f in action.* ; do case $f in *.deprecated) @@ -1066,8 +1068,10 @@ for f in action.* ; do ;; esac done - -cd Macros +# +# Now the Macros +# +cd ../Macros for f in macro.* ; do case $f in diff --git a/Shorewall6/action.A_AllowICMPs b/Shorewall6/Actions/action.A_AllowICMPs similarity index 100% rename from Shorewall6/action.A_AllowICMPs rename to Shorewall6/Actions/action.A_AllowICMPs diff --git a/Shorewall6/action.AllowICMPs b/Shorewall6/Actions/action.AllowICMPs similarity index 100% rename from Shorewall6/action.AllowICMPs rename to Shorewall6/Actions/action.AllowICMPs diff --git a/Shorewall6/action.Broadcast b/Shorewall6/Actions/action.Broadcast similarity index 100% rename from Shorewall6/action.Broadcast rename to Shorewall6/Actions/action.Broadcast diff --git a/Shorewall6/action.mangletemplate b/Shorewall6/Actions/action.mangletemplate similarity index 100% rename from Shorewall6/action.mangletemplate rename to Shorewall6/Actions/action.mangletemplate diff --git a/Shorewall6/action.template b/Shorewall6/Actions/action.template similarity index 100% rename from Shorewall6/action.template rename to Shorewall6/Actions/action.template