mirror of
https://gitlab.com/shorewall/code.git
synced 2025-06-19 17:28:35 +02:00
Time the shorewall restart by default; minor comment adjustment
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@4321 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
parent
3d81581c01
commit
0e3398d1dd
@ -26,6 +26,7 @@
|
|||||||
VERBOSE=0
|
VERBOSE=0
|
||||||
RESTART=0
|
RESTART=0
|
||||||
CHECK=1
|
CHECK=1
|
||||||
|
TIME=1
|
||||||
|
|
||||||
usage()
|
usage()
|
||||||
{
|
{
|
||||||
@ -57,6 +58,11 @@ while :; do
|
|||||||
shift
|
shift
|
||||||
;;
|
;;
|
||||||
|
|
||||||
|
-t|--notime)
|
||||||
|
TIME=0
|
||||||
|
shift
|
||||||
|
;;
|
||||||
|
|
||||||
--)
|
--)
|
||||||
shift
|
shift
|
||||||
break 2
|
break 2
|
||||||
@ -94,10 +100,15 @@ PATH=$PATH:
|
|||||||
for HOST; do
|
for HOST; do
|
||||||
shoregen $HOST
|
shoregen $HOST
|
||||||
rsync $RSYNC_ARGS SPOOL/$HOST/ $USER@$HOST:$DIR/
|
rsync $RSYNC_ARGS SPOOL/$HOST/ $USER@$HOST:$DIR/
|
||||||
|
if [ "$TIME" -gt 0 ]; then
|
||||||
|
TIME=time
|
||||||
|
else
|
||||||
|
TIME=""
|
||||||
|
fi
|
||||||
if [ "$CHECK" -gt 0 ]; then
|
if [ "$CHECK" -gt 0 ]; then
|
||||||
ssh -l $USER -t $HOST $SW_PATH check
|
$TIME ssh -l $USER -t $HOST $SW_PATH check
|
||||||
fi
|
fi
|
||||||
if [ "$RESTART" -gt 0 ]; then
|
if [ "$RESTART" -gt 0 ]; then
|
||||||
ssh -l $USER -t $HOST $SW_PATH restart
|
$TIME ssh -l $USER -t $HOST $SW_PATH restart
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
@ -99,6 +99,9 @@ sub stripfile
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
#
|
||||||
|
# Construct a configuration file given a number of input files
|
||||||
|
#
|
||||||
sub constructfile
|
sub constructfile
|
||||||
{
|
{
|
||||||
my $confname = shift;
|
my $confname = shift;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user