Signed-off-by: moznion <[email protected]>
---
src/man/wg-quick.8 | 5 ++++-
src/wg-quick/darwin.bash | 9 ++++++++-
src/wg-quick/freebsd.bash | 9 ++++++++-
src/wg-quick/linux.bash | 11 +++++++++--
src/wg-quick/openbsd.bash | 9 ++++++++-
5 files changed, 37 insertions(+), 6 deletions(-)
diff --git a/src/man/wg-quick.8 b/src/man/wg-quick.8
index b84eb64..b527ea1 100644
--- a/src/man/wg-quick.8
+++ b/src/man/wg-quick.8
@@ -10,6 +10,8 @@ wg-quick - set up a WireGuard interface simply
|
.I down
|
+.I restart
+|
.I save
|
.I strip
@@ -25,7 +27,8 @@ This is an extremely simple script for easily bringing up a
WireGuard interface,
suitable for a few common use cases.
Use \fIup\fP to add and set up an interface, and use \fIdown\fP to tear down
and remove
-an interface. Running \fIup\fP adds a WireGuard interface, brings up the
interface with the
+an interface. And \fIrestart\fP is a shorthand sub-command to do up and down
at once.
+Running \fIup\fP adds a WireGuard interface, brings up the interface with the
supplied IP addresses, sets up mtu and routes, and optionally runs pre/post up
scripts. Running \fIdown\fP
optionally saves the current configuration, removes the WireGuard interface,
and optionally
runs pre/post down scripts. Running \fIsave\fP saves the configuration of an
existing
diff --git a/src/wg-quick/darwin.bash b/src/wg-quick/darwin.bash
index cde1b54..9e0f286 100755
--- a/src/wg-quick/darwin.bash
+++ b/src/wg-quick/darwin.bash
@@ -418,7 +418,7 @@ execute_hooks() {
cmd_usage() {
cat >&2 <<-_EOF
- Usage: $PROGRAM [ up | down | save | strip ] [ CONFIG_FILE | INTERFACE ]
+ Usage: $PROGRAM [ up | down | restart | save | strip ] [ CONFIG_FILE |
INTERFACE ]
CONFIG_FILE is a configuration file, whose filename is the interface
name
followed by \`.conf'. Otherwise, INTERFACE is an interface name, with
@@ -502,6 +502,13 @@ elif [[ $# -eq 2 && $1 == down ]]; then
auto_su
parse_options "$2"
cmd_down
+elif [[ $# -eq 2 && $1 == restart ]]; then
+ auto_su
+ parse_options "$2"
+ trap 'cmd_up' EXIT
+ cmd_down
+ trap - EXIT
+ cmd_up
elif [[ $# -eq 2 && $1 == save ]]; then
auto_su
parse_options "$2"
diff --git a/src/wg-quick/freebsd.bash b/src/wg-quick/freebsd.bash
index e1ee67f..f2ceb01 100755
--- a/src/wg-quick/freebsd.bash
+++ b/src/wg-quick/freebsd.bash
@@ -387,7 +387,7 @@ execute_hooks() {
cmd_usage() {
cat >&2 <<-_EOF
- Usage: $PROGRAM [ up | down | save | strip ] [ CONFIG_FILE | INTERFACE ]
+ Usage: $PROGRAM [ up | down | restart | save | strip ] [ CONFIG_FILE |
INTERFACE ]
CONFIG_FILE is a configuration file, whose filename is the interface
name
followed by \`.conf'. Otherwise, INTERFACE is an interface name, with
@@ -469,6 +469,13 @@ elif [[ $# -eq 2 && $1 == down ]]; then
auto_su
parse_options "$2"
cmd_down
+elif [[ $# -eq 2 && $1 == restart ]]; then
+ auto_su
+ parse_options "$2"
+ trap 'cmd_up' EXIT
+ cmd_down
+ trap - EXIT
+ cmd_up
elif [[ $# -eq 2 && $1 == save ]]; then
auto_su
parse_options "$2"
diff --git a/src/wg-quick/linux.bash b/src/wg-quick/linux.bash
index e4d4c4f..1c73a58 100755
--- a/src/wg-quick/linux.bash
+++ b/src/wg-quick/linux.bash
@@ -224,7 +224,7 @@ add_default() {
cmd ip $proto rule add not fwmark $table table $table
cmd ip $proto rule add table main suppress_prefixlength 0
- local marker="-m comment --comment \"wg-quick(8) rule for $INTERFACE\""
restore=$'*raw\n' nftable="wg-quick-$INTERFACE" nftcmd
+ local marker="-m comment --comment \"wg-quick(8) rule for $INTERFACE\""
restore=$'*raw\n' nftable="wg-quick-$INTERFACE" nftcmd
printf -v nftcmd '%sadd table %s %s\n' "$nftcmd" "$pf" "$nftable"
printf -v nftcmd '%sadd chain %s %s preraw { type filter hook
prerouting priority -300; }\n' "$nftcmd" "$pf" "$nftable"
printf -v nftcmd '%sadd chain %s %s premangle { type filter hook
prerouting priority -150; }\n' "$nftcmd" "$pf" "$nftable"
@@ -298,7 +298,7 @@ execute_hooks() {
cmd_usage() {
cat >&2 <<-_EOF
- Usage: $PROGRAM [ up | down | save | strip ] [ CONFIG_FILE | INTERFACE ]
+ Usage: $PROGRAM [ up | down | restart | save | strip ] [ CONFIG_FILE |
INTERFACE ]
CONFIG_FILE is a configuration file, whose filename is the interface
name
followed by \`.conf'. Otherwise, INTERFACE is an interface name, with
@@ -373,6 +373,13 @@ elif [[ $# -eq 2 && $1 == down ]]; then
auto_su
parse_options "$2"
cmd_down
+elif [[ $# -eq 2 && $1 == restart ]]; then
+ auto_su
+ parse_options "$2"
+ trap 'cmd_up' EXIT
+ cmd_down
+ trap - EXIT
+ cmd_up
elif [[ $# -eq 2 && $1 == save ]]; then
auto_su
parse_options "$2"
diff --git a/src/wg-quick/openbsd.bash b/src/wg-quick/openbsd.bash
index 15550c8..810b73b 100755
--- a/src/wg-quick/openbsd.bash
+++ b/src/wg-quick/openbsd.bash
@@ -376,7 +376,7 @@ execute_hooks() {
cmd_usage() {
cat >&2 <<-_EOF
- Usage: $PROGRAM [ up | down | save | strip ] [ CONFIG_FILE | INTERFACE ]
+ Usage: $PROGRAM [ up | down | restart | save | strip ] [ CONFIG_FILE |
INTERFACE ]
CONFIG_FILE is a configuration file, whose filename is the interface
name
followed by \`.conf'. Otherwise, INTERFACE is an interface name, with
@@ -453,6 +453,13 @@ elif [[ $# -eq 2 && $1 == down ]]; then
auto_su
parse_options "$2"
cmd_down
+elif [[ $# -eq 2 && $1 == restart ]]; then
+ auto_su
+ parse_options "$2"
+ trap 'cmd_up' EXIT
+ cmd_down
+ trap - EXIT
+ cmd_up
elif [[ $# -eq 2 && $1 == save ]]; then
auto_su
parse_options "$2"
--
2.30.0
