diff --git a/Shorewall/help b/Shorewall/help index 292560a8b..4383e8a65 100755 --- a/Shorewall/help +++ b/Shorewall/help @@ -249,12 +249,16 @@ reset) ;; reload) - echo "reload: reload - Causes the shorewall configuration in the current working directory to be - compiled into a program called 'firewall'. If compilation is successful, - the 'firewall' script is copied via scp to the /usr/share/shorewall-lite/ - directory on . If the script is copied successfully, Shorewall - Lite on is restarted via ssh." + echo "reload: reload [ ] + If is omitted, then the current working directory is assumed. + + Requires that Shorewall Lite be installed on the named . + + Causes the shorewall configuration in to be compiled into a + program called '/firewall'. If compilation is successful, + the '/firewall' script is copied via scp to the + /usr/share/shorewall-lite/ directory on . If the script is copied + successfully, Shorewall Lite on is restarted via ssh." ;; restart) diff --git a/Shorewall/shorewall b/Shorewall/shorewall index ca4041cca..60e7107ac 100755 --- a/Shorewall/shorewall +++ b/Shorewall/shorewall @@ -1323,7 +1323,7 @@ usage() # $1 = exit status echo " logwatch []" echo " refresh" echo " reject
..." - echo " reload [ ] [ ]" + echo " reload [ ] " echo " reset" echo " restart [ -n ] [ ]" echo " restore [ -n ] [ ]" @@ -1633,10 +1633,6 @@ case "$COMMAND" in reload) shift case $# in - 0) - directory="." - system="localhost" - ;; 1) directory="." system=$1 diff --git a/docs/starting_and_stopping_shorewall.xml b/docs/starting_and_stopping_shorewall.xml index 9a768aa34..6937fe954 100644 --- a/docs/starting_and_stopping_shorewall.xml +++ b/docs/starting_and_stopping_shorewall.xml @@ -948,16 +948,15 @@ Shorewall Lite) - reload [ [ <directory> ] <system> - ] + reload [ <directory> ] + <system> If <directory> is omitted, the current working directory - is assumed. If <system> is omitted, the local system is - assumed. + is assumed. Allows a non-root user to compile a shorewall script and - install it on a system (provided that the user has access to the - system via ssh). The command is equivalent to: + install it on a system (provided that the user has root access to + the system via ssh). The command is equivalent to: /sbin/shorewall compile -e <directory> @@ -974,9 +973,11 @@ In other words, the configuration in the specified (or defaulted) directory is compiled to a file called firewall in that directory. If compilation - succeeds, then firewall is copied to the - (usually remote) <system> using scp. If the copy succeeds, - Shorewall Lite on <system> is restarted via ssh. + succeeds, then firewall is copied to + <system> using scp. If the copy succeeds, Shorewall Lite on + <system> is restarted via ssh. + + Example: shorewall reload gateway