colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

sane-vpn: support "vpn-servo"

Browse Source
This commit is contained in:
Colin
2023-09-19 16:09:46 +00:00
parent 57e35eeab1
commit f3ed9a3452
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
hosts/common/vpn.nix
View File

@@ -34,7 +34,6 @@ let
};
# TODO: this should live in the same file as hosts/modules/wg-home.nix...
# TODO: update sane-vpn script to also allow activating/deactiving this interface
def-servo = def-wg-vpn "vpn-servo" {
endpoint = config.sane.hosts.by-name."servo".wg-home.endpoint;
publicKey = config.sane.hosts.by-name."servo".wg-home.pubkey;

17
pkgs/additional/sane-scripts/src/sane-vpn
View File

@@ -5,23 +5,28 @@ oper="$1"
region="$2"
# region should be e.g. `us` or `ukr`
vpns=$(systemctl list-unit-files | grep wg-quick-ovpnd- | cut -f 1 -d ' ' | sed s'/^wg-quick-ovpnd-\([a-zA-Z-]*\)\.service$/\1/g')
vpns=$(systemctl list-unit-files | grep wg-quick- | cut -f 1 -d ' ' | sed s'/^wg-quick-\([a-zA-Z-]*\)\.service$/\1/g')
if ! [ $(echo "$vpns" | grep "^$region$") ]
then
if [ $(echo "$vpns" | grep "^$region$") ]; then
iface="$region"
elif [ $(echo "$vpns" | grep "^vpn-$region$") ]; then
iface="vpn-$region"
elif [ $(echo "$vpns" | grep "^ovpnd-$region$") ]; then
iface="ovpnd-$region"
else
echo "invalid vpn name '$region'"
echo "choices:"
echo "$vpns"
exit 1
fi
iface=wg-quick-ovpnd-$region.service
service="wg-quick-$iface.service"
echo before: $(sane-ip-check --no-upnp)
if [ "$oper" == up ]; then
sudo systemctl start $iface
sudo systemctl start "$service"
elif [ "$oper" == down ]; then
sudo systemctl stop $iface
sudo systemctl stop "$service"
else
echo "invalid operation '$oper'"
exit 1