meta: release v1.5.2

tonarino · Dec 5, 2021 · 6be3e61 · 6be3e61
1 parent d2a2e88
commit 6be3e61
Show file tree

Hide file tree

Showing 21 changed files with 203 additions and 35 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/README.md b/README.md
@@ -214,10 +214,10 @@ brew install tonarino/innernet/innernet
 
 ```sh
 # to install innernet:
-cargo install --git https://github.com/tonarino/innernet --tag v1.5.1 client
+cargo install --git https://github.com/tonarino/innernet --tag v1.5.2 client
 
 # to install innernet-server:
-cargo install --git https://github.com/tonarino/innernet --tag v1.5.1 server
+cargo install --git https://github.com/tonarino/innernet --tag v1.5.2 server
 ```
 
 Note that you'll be responsible for updating manually.

diff --git a/client/Cargo.toml b/client/Cargo.toml
@@ -7,7 +7,7 @@ license = "MIT"
 name = "client"
 publish = false
 repository = "https://github.com/tonarino/innernet"
-version = "1.5.1"
+version = "1.5.2"
 
 [[bin]]
 name = "innernet"

diff --git a/doc/innernet-server.8 b/doc/innernet-server.8
@@ -1,25 +1,32 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.48.5.
-.TH INNERNET-SERVER "8" "November 2021" "innernet-server 1.5.1" "System Administration Utilities"
+.TH INNERNET-SERVER "8" "December 2021" "innernet-server 1.5.2" "System Administration Utilities"
 .SH NAME
-innernet-server \- manual page for innernet-server 1.5.1
+innernet-server \- manual page for innernet-server 1.5.2
 .SH DESCRIPTION
-innernet\-server 1.5.1
+innernet\-server 1.5.2
 A server to coordinate innernet networks.
 .SS "USAGE:"
 .IP
 innernet\-server [OPTIONS] <SUBCOMMAND>
 .SS "OPTIONS:"
 .TP
+\fB\-c\fR, \fB\-\-config\-dir\fR <config\-dir>
+[default: /etc/innernet\-server]
+.TP
+\fB\-d\fR, \fB\-\-data\-dir\fR <data\-dir>
+[default: /var/lib/innernet\-server]
+.TP
 \fB\-\-no\-routing\fR
-Whether the routing should be done by innernet or is done by an external tool like e.g.
-babeld
+Whether the routing should be done by innernet or is done by an external tool like
+e.g. babeld
 .TP
 \fB\-\-backend\fR <backend>
 Specify a WireGuard backend to use. If not set, innernet will auto\-select based on
 availability [default: kernel]  [possible values: kernel, userspace]
 .TP
 \fB\-\-mtu\fR <mtu>
-Specify the desired MTU for your interface (default: 1420 for IPv4 and 1400 for IPv6)
+Specify the desired MTU for your interface (default: 1420 for IPv4 and 1400 for
+IPv6)
 .TP
 \fB\-h\fR, \fB\-\-help\fR
 Prints help information

diff --git a/doc/innernet-server.8.gz b/doc/innernet-server.8.gz
diff --git a/doc/innernet-server.completions.bash b/doc/innernet-server.completions.bash
@@ -50,13 +50,29 @@ _innernet-server() {
 
     case "${cmd}" in
         innernet-server)
-            opts=" -h -V  --no-routing --help --version --backend --mtu   new uninstall serve add-peer rename-peer add-cidr delete-cidr completions help  init"
+            opts=" -h -V -c -d  --no-routing --help --version --config-dir --data-dir --backend --mtu   new uninstall serve add-peer rename-peer add-cidr delete-cidr completions help  init"
             if [[ ${cur} == -* || ${COMP_CWORD} -eq 1 ]] ; then
                 COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
                 return 0
             fi
             case "${prev}" in
 
+                --config-dir)
+                    COMPREPLY=($(compgen -f "${cur}"))
+                    return 0
+                    ;;
+                    -c)
+                    COMPREPLY=($(compgen -f "${cur}"))
+                    return 0
+                    ;;
+                --data-dir)
+                    COMPREPLY=($(compgen -f "${cur}"))
+                    return 0
+                    ;;
+                    -d)
+                    COMPREPLY=($(compgen -f "${cur}"))
+                    return 0
+                    ;;
                 --backend)
                     COMPREPLY=($(compgen -W "kernel userspace" -- "${cur}"))
                     return 0

diff --git a/doc/innernet-server.completions.elvish b/doc/innernet-server.completions.elvish
@@ -15,6 +15,10 @@ edit:completion:arg-completer[innernet-server] = [@words]{
     }
     completions = [
         &'innernet-server'= {
+            cand -c 'c'
+            cand --config-dir 'config-dir'
+            cand -d 'd'
+            cand --data-dir 'data-dir'
             cand --backend 'Specify a WireGuard backend to use. If not set, innernet will auto-select based on availability'
             cand --mtu 'Specify the desired MTU for your interface (default: 1420 for IPv4 and 1400 for IPv6)'
             cand --no-routing 'Whether the routing should be done by innernet or is done by an external tool like e.g. babeld'

diff --git a/doc/innernet-server.completions.fish b/doc/innernet-server.completions.fish
@@ -1,3 +1,5 @@
+complete -c innernet-server -n "__fish_use_subcommand" -s c -l config-dir
+complete -c innernet-server -n "__fish_use_subcommand" -s d -l data-dir
 complete -c innernet-server -n "__fish_use_subcommand" -l backend -d 'Specify a WireGuard backend to use. If not set, innernet will auto-select based on availability' -r -f -a "kernel userspace"
 complete -c innernet-server -n "__fish_use_subcommand" -l mtu -d 'Specify the desired MTU for your interface (default: 1420 for IPv4 and 1400 for IPv6)'
 complete -c innernet-server -n "__fish_use_subcommand" -l no-routing -d 'Whether the routing should be done by innernet or is done by an external tool like e.g. babeld'

diff --git a/doc/innernet-server.completions.powershell b/doc/innernet-server.completions.powershell
@@ -20,6 +20,10 @@ Register-ArgumentCompleter -Native -CommandName 'innernet-server' -ScriptBlock {
 
     $completions = @(switch ($command) {
         'innernet-server' {
+            [CompletionResult]::new('-c', 'c', [CompletionResultType]::ParameterName, 'c')
+            [CompletionResult]::new('--config-dir', 'config-dir', [CompletionResultType]::ParameterName, 'config-dir')
+            [CompletionResult]::new('-d', 'd', [CompletionResultType]::ParameterName, 'd')
+            [CompletionResult]::new('--data-dir', 'data-dir', [CompletionResultType]::ParameterName, 'data-dir')
             [CompletionResult]::new('--backend', 'backend', [CompletionResultType]::ParameterName, 'Specify a WireGuard backend to use. If not set, innernet will auto-select based on availability')
             [CompletionResult]::new('--mtu', 'mtu', [CompletionResultType]::ParameterName, 'Specify the desired MTU for your interface (default: 1420 for IPv4 and 1400 for IPv6)')
             [CompletionResult]::new('--no-routing', 'no-routing', [CompletionResultType]::ParameterName, 'Whether the routing should be done by innernet or is done by an external tool like e.g. babeld')

diff --git a/doc/innernet-server.completions.zsh b/doc/innernet-server.completions.zsh
@@ -15,6 +15,10 @@ _innernet-server() {
 
     local context curcontext="$curcontext" state line
     _arguments "${_arguments_options[@]}" \
+'-c+[]' \
+'--config-dir=[]' \
+'-d+[]' \
+'--data-dir=[]' \
 '--backend=[Specify a WireGuard backend to use. If not set, innernet will auto-select based on availability]: :(kernel userspace)' \
 '--mtu=[Specify the desired MTU for your interface (default: 1420 for IPv4 and 1400 for IPv6)]' \
 '--no-routing[Whether the routing should be done by innernet or is done by an external tool like e.g. babeld]' \

diff --git a/doc/innernet.8 b/doc/innernet.8
@@ -1,9 +1,9 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.48.5.
-.TH INNERNET "8" "November 2021" "innernet 1.5.1" "System Administration Utilities"
+.TH INNERNET "8" "December 2021" "innernet 1.5.2" "System Administration Utilities"
 .SH NAME
-innernet \- manual page for innernet 1.5.1
+innernet \- manual page for innernet 1.5.2
 .SH DESCRIPTION
-innernet 1.5.1
+innernet 1.5.2
 A client to manage innernet network interfaces.
 .SS "USAGE:"
 .IP
@@ -14,6 +14,14 @@ innernet [OPTIONS] [SUBCOMMAND]
 .IP
 Verbose output, use \fB\-vv\fR for even higher verbositude
 .HP
+\fB\-c\fR, \fB\-\-config\-dir\fR <config\-dir>
+.IP
+[default: /etc/innernet]
+.HP
+\fB\-d\fR, \fB\-\-data\-dir\fR <data\-dir>
+.IP
+[default: /var/lib/innernet]
+.HP
 \fB\-\-no\-routing\fR
 .IP
 Whether the routing should be done by innernet or is done by an external tool like e.g. babeld

diff --git a/doc/innernet.8.gz b/doc/innernet.8.gz
diff --git a/doc/innernet.completions.bash b/doc/innernet.completions.bash
@@ -86,13 +86,29 @@ _innernet() {
 
     case "${cmd}" in
         innernet)
-            opts=" -v -h -V  --verbose --no-routing --help --version --backend --mtu   install show up fetch uninstall down add-peer rename-peer add-cidr delete-cidr list-cidrs disable-peer enable-peer add-association delete-association list-associations set-listen-port override-endpoint completions help  redeem  list"
+            opts=" -v -h -V -c -d  --verbose --no-routing --help --version --config-dir --data-dir --backend --mtu   install show up fetch uninstall down add-peer rename-peer add-cidr delete-cidr list-cidrs disable-peer enable-peer add-association delete-association list-associations set-listen-port override-endpoint completions help  redeem  list"
             if [[ ${cur} == -* || ${COMP_CWORD} -eq 1 ]] ; then
                 COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
                 return 0
             fi
             case "${prev}" in
 
+                --config-dir)
+                    COMPREPLY=($(compgen -f "${cur}"))
+                    return 0
+                    ;;
+                    -c)
+                    COMPREPLY=($(compgen -f "${cur}"))
+                    return 0
+                    ;;
+                --data-dir)
+                    COMPREPLY=($(compgen -f "${cur}"))
+                    return 0
+                    ;;
+                    -d)
+                    COMPREPLY=($(compgen -f "${cur}"))
+                    return 0
+                    ;;
                 --backend)
                     COMPREPLY=($(compgen -W "kernel userspace" -- "${cur}"))
                     return 0
@@ -285,7 +301,7 @@ _innernet() {
             return 0
             ;;
         innernet__fetch)
-            opts=" -h -V  --no-write-hosts --help --version --hosts-path  <interface> "
+            opts=" -h -V  --no-write-hosts --no-nat-traversal --no-nat-candidates --help --version --hosts-path --exclude-nat-candidates  <interface> "
             if [[ ${cur} == -* || ${COMP_CWORD} -eq 2 ]] ; then
                 COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
                 return 0
@@ -296,6 +312,10 @@ _innernet() {
                     COMPREPLY=($(compgen -f "${cur}"))
                     return 0
                     ;;
+                --exclude-nat-candidates)
+                    COMPREPLY=($(compgen -f "${cur}"))
+                    return 0
+                    ;;
                 *)
                     COMPREPLY=()
                     ;;
@@ -319,7 +339,7 @@ _innernet() {
             return 0
             ;;
         innernet__install)
-            opts=" -d -h -V  --no-write-hosts --default-name --delete-invite --help --version --hosts-path --name  <invite> "
+            opts=" -d -h -V  --no-write-hosts --default-name --delete-invite --no-nat-traversal --no-nat-candidates --help --version --hosts-path --name --exclude-nat-candidates  <invite> "
             if [[ ${cur} == -* || ${COMP_CWORD} -eq 2 ]] ; then
                 COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
                 return 0
@@ -334,6 +354,10 @@ _innernet() {
                     COMPREPLY=($(compgen -f "${cur}"))
                     return 0
                     ;;
+                --exclude-nat-candidates)
+                    COMPREPLY=($(compgen -f "${cur}"))
+                    return 0
+                    ;;
                 *)
                     COMPREPLY=()
                     ;;
@@ -387,13 +411,21 @@ _innernet() {
             return 0
             ;;
         innernet__override__endpoint)
-            opts=" -u -h -V  --unset --help --version  <interface> "
+            opts=" -u -h -V -e  --unset --yes --help --version --endpoint  <interface> "
             if [[ ${cur} == -* || ${COMP_CWORD} -eq 2 ]] ; then
                 COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
                 return 0
             fi
             case "${prev}" in
 
+                --endpoint)
+                    COMPREPLY=($(compgen -f "${cur}"))
+                    return 0
+                    ;;
+                    -e)
+                    COMPREPLY=($(compgen -f "${cur}"))
+                    return 0
+                    ;;
                 *)
                     COMPREPLY=()
                     ;;
@@ -402,7 +434,7 @@ _innernet() {
             return 0
             ;;
         innernet__redeem)
-            opts=" -d -h -V  --no-write-hosts --default-name --delete-invite --help --version --hosts-path --name  <invite> "
+            opts=" -d -h -V  --no-write-hosts --default-name --delete-invite --no-nat-traversal --no-nat-candidates --help --version --hosts-path --name --exclude-nat-candidates  <invite> "
             if [[ ${cur} == -* || ${COMP_CWORD} -eq 2 ]] ; then
                 COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
                 return 0
@@ -417,6 +449,10 @@ _innernet() {
                     COMPREPLY=($(compgen -f "${cur}"))
                     return 0
                     ;;
+                --exclude-nat-candidates)
+                    COMPREPLY=($(compgen -f "${cur}"))
+                    return 0
+                    ;;
                 *)
                     COMPREPLY=()
                     ;;
@@ -448,13 +484,21 @@ _innernet() {
             return 0
             ;;
         innernet__set__listen__port)
-            opts=" -u -h -V  --unset --help --version  <interface> "
+            opts=" -u -h -V -l  --unset --yes --help --version --listen-port  <interface> "
             if [[ ${cur} == -* || ${COMP_CWORD} -eq 2 ]] ; then
                 COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
                 return 0
             fi
             case "${prev}" in
 
+                --listen-port)
+                    COMPREPLY=($(compgen -f "${cur}"))
+                    return 0
+                    ;;
+                    -l)
+                    COMPREPLY=($(compgen -f "${cur}"))
+                    return 0
+                    ;;
                 *)
                     COMPREPLY=()
                     ;;
@@ -493,7 +537,7 @@ _innernet() {
             return 0
             ;;
         innernet__up)
-            opts=" -d -h -V  --daemon --no-write-hosts --help --version --interval --hosts-path  <interface> "
+            opts=" -d -h -V  --daemon --no-write-hosts --no-nat-traversal --no-nat-candidates --help --version --interval --hosts-path --exclude-nat-candidates  <interface> "
             if [[ ${cur} == -* || ${COMP_CWORD} -eq 2 ]] ; then
                 COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
                 return 0
@@ -508,6 +552,10 @@ _innernet() {
                     COMPREPLY=($(compgen -f "${cur}"))
                     return 0
                     ;;
+                --exclude-nat-candidates)
+                    COMPREPLY=($(compgen -f "${cur}"))
+                    return 0
+                    ;;
                 *)
                     COMPREPLY=()
                     ;;