On 9/18/2013 4:27 PM, Tom Eastep wrote: > On 9/18/2013 12:11 PM, matt darfeuille wrote: >> after some troubles with my gmail acount(unread emails gone ...) I >> apologize for my late answer! >> >> on the shorewall-lite note >> with the spindir option set to /sbin in shorewallrc it is also >> working with a newer version of shorewall (shorewall 4.5.20 for >> instence) >> >> the only "problem" with shorewall-4.5.20 is that the load/reload >> command SCPed firewall firewall.conf to var/lib/shorewall-lite but >> with shorewall-lite4.5.7 they need to be in >> /etc/shorewall-lite/state/. >> >> Is there a way to change where scp send the files? > > There is, but it can't specify /etc/shorewall/state at the moment. I'll > include in 4.5.21.
Please apply the attached patch and see if it works correctly. Thanks, -Tom -- Tom Eastep \ When I die, I want to go like my Grandfather who Shoreline, \ died peacefully in his sleep. Not screaming like Washington, USA \ all of the passengers in his car http://shorewall.net \________________________________________________
diff --git a/Shorewall/lib.cli-std b/Shorewall/lib.cli-std
index 1613657..eb7faf5 100644
--- a/Shorewall/lib.cli-std
+++ b/Shorewall/lib.cli-std
@@ -1362,8 +1362,7 @@ reload_command() # $* = original arguments less the command.
sbindir=${SBINDIR}
local sharedir
sharedir=${SHAREDIR}
-
- litedir=${VARLIB}/${g_program}-lite
+ local litedir
while [ $finished -eq 0 -a $# -gt 0 ]; do
option=$1
@@ -1432,7 +1431,7 @@ reload_command() # $* = original arguments less the command.
error_message " WARNING: $g_shorewalldir/shorewallrc does not exist; using settings from $SHAREDIR/shorewall" >&2
fi
- if [ -f $g_shorewalldir/${g_program}.conf ]; then
+ if [ -f $g_shorewalldir/${g_program}.conf ]; then
if [ -f $g_shorewalldir/params ]; then
. $g_shorewalldir/params
fi
@@ -1468,6 +1467,12 @@ reload_command() # $* = original arguments less the command.
g_export=Yes
+ temp=$(rsh_command ${g_program}-lite show config 2> /dev/null | grep ^LITEDIR | sed 's/LITEDIR is //')
+
+ [ -n "$temp" ] && litedir="$temp"
+
+ [ -n "$litedir" ] && litedir=${VARLIB}/${g_program}-lite
+
if compiler $g_debugging compiler $g_shorewalldir/firewall && \
progress_message3 "Copying $file and ${file}.conf to ${system}:${litedir}..." && \
rcp_command "$g_shorewalldir/firewall $g_shorewalldir/firewall.conf" ${litedir}
signature.asc
Description: OpenPGP digital signature
------------------------------------------------------------------------------ LIMITED TIME SALE - Full Year of Microsoft Training For Just $49.99! 1,500+ hours of tutorials including VisualStudio 2012, Windows 8, SharePoint 2013, SQL 2012, MVC 4, more. BEST VALUE: New Multi-Library Power Pack includes Mobile, Cloud, Java, and UX Design. Lowest price ever! Ends 9/20/13. http://pubads.g.doubleclick.net/gampad/clk?id=58041151&iu=/4140/ostg.clktrk
_______________________________________________ Shorewall-users mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/shorewall-users
