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

vpn: rename ovpnd -> ovpnd-us

Browse Source 
this is needed to disambiguate it against the other regions.
This commit is contained in:
colin
2022-07-09 00:52:05 -07:00
parent f790147fb0
commit c6fbe3574d
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/universal/vpn.nix
View File

@@ -1,7 +1,7 @@
{ config, ... }: { config, ... }:
{ {
networking.wg-quick.interfaces.ovpnd = { networking.wg-quick.interfaces.ovpnd-us = {
address = [ address = [
"172.27.237.218/32" "172.27.237.218/32"
"fd00:0000:1337:cafe:1111:1111:ab00:4c8f/128" "fd00:0000:1337:cafe:1111:1111:ab00:4c8f/128"
@@ -20,8 +20,8 @@
publicKey = "VW6bEWMOlOneta1bf6YFE25N/oMGh1E1UFBCfyggd0k="; publicKey = "VW6bEWMOlOneta1bf6YFE25N/oMGh1E1UFBCfyggd0k=";
} }
]; ];
privateKeyFile = config.sops.secrets.wg_ovpnd_privkey.path; privateKeyFile = config.sops.secrets.wg_ovpnd_us_privkey.path;
# to start: `systemctl start wg-quick-ovpnd` # to start: `systemctl start wg-quick-ovpnd-us`
autostart = false; autostart = false;
}; };
@@ -49,7 +49,7 @@
autostart = false; autostart = false;
}; };
sops.secrets."wg_ovpnd_privkey" = { sops.secrets."wg_ovpnd_us_privkey" = {
sopsFile = ../../secrets/universal.yaml; sopsFile = ../../secrets/universal.yaml;
}; };
sops.secrets."wg_ovpnd_ukr_privkey" = { sops.secrets."wg_ovpnd_ukr_privkey" = {

2
pkgs/sane-scripts/src/bin/sane-vpn-down
View File

@@ -6,7 +6,7 @@ case $1 in
ukr) ukr)
iface=wg-quick-ovpnd-ukr;; iface=wg-quick-ovpnd-ukr;;
us) us)
iface=wg-quick-ovpnd;; iface=wg-quick-ovpnd-us;;
*) *)
echo "invalid vpn name '$1'"; exit 1;; echo "invalid vpn name '$1'"; exit 1;;
esac esac

2
pkgs/sane-scripts/src/bin/sane-vpn-up
View File

@@ -6,7 +6,7 @@ case $1 in
ukr) ukr)
iface=wg-quick-ovpnd-ukr;; iface=wg-quick-ovpnd-ukr;;
us) us)
iface=wg-quick-ovpnd;; iface=wg-quick-ovpnd-us;;
*) *)
echo "invalid vpn name '$1'"; exit 1;; echo "invalid vpn name '$1'"; exit 1;;
esac esac

6
secrets/universal.yaml
View File

@@ -1,4 +1,4 @@
wg_ovpnd_privkey: ENC[AES256_GCM,data:qmyCOcD5TA7SKqSDCTZOTahkfYVZMJUGuyselmQbqj1uer3e4cBRSMuIiRI=,iv:jnHvGgVu/8HWT8MkI2wtGqlCs6wTu0C8huHpkdDmBYk=,tag:a0r0f/6LTBUuhvLGu+SFug==,type:str] wg_ovpnd_us_privkey: ENC[AES256_GCM,data:5YkQ4r7HNWiRr/5pa1XfexxtJAz6kDjX+hNiZcheUWCXVIuK0/AuyzcdQ/0=,iv:vr1UHSlsWFnTwEfZj3pBLxvaibQxhSum3SL0Uaqtceo=,tag:dN2U+TkQAgJejgDDYIWdOA==,type:str]
wg_ovpnd_ukr_privkey: ENC[AES256_GCM,data:5zfhsZnBk0Kb9Nb/3igsV/fN0ZDjwTAGTKyMLMly/l7MlJe6MEmd5Lv+JT8=,iv:Mov9eUP8WfvzfZ6NljgLolJ49GSqR7eSV+k0dgE1+1I=,tag:O9UtGX2qt+qEvabcsA0vIA==,type:str] wg_ovpnd_ukr_privkey: ENC[AES256_GCM,data:5zfhsZnBk0Kb9Nb/3igsV/fN0ZDjwTAGTKyMLMly/l7MlJe6MEmd5Lv+JT8=,iv:Mov9eUP8WfvzfZ6NljgLolJ49GSqR7eSV+k0dgE1+1I=,tag:O9UtGX2qt+qEvabcsA0vIA==,type:str]
sops: sops:
kms: [] kms: []
@@ -78,8 +78,8 @@ sops:
T1ZLaWRwWFJkNE82NC80QTdjZ1l1Zm8K7QhAMCO/65Z0N4coN+sc7WYNVI+BvV01 T1ZLaWRwWFJkNE82NC80QTdjZ1l1Zm8K7QhAMCO/65Z0N4coN+sc7WYNVI+BvV01
q5DXWTtePrPRQ8ZCqT7gWdSQc8iS410HEZ2Nya5IA+ktGxMO9h1EXA== q5DXWTtePrPRQ8ZCqT7gWdSQc8iS410HEZ2Nya5IA+ktGxMO9h1EXA==
-----END AGE ENCRYPTED FILE----- -----END AGE ENCRYPTED FILE-----
lastmodified: "2022-07-09T07:40:05Z" lastmodified: "2022-07-09T07:48:24Z"
mac: ENC[AES256_GCM,data:U7kbbCm6I+S86En04h+jKFhqm+++iFHluA0ceChTEJEFaWX4FqMQHAthHl4Bce+AMjhdu5IjTajnAHp2RDvGRMoyissAH0+SwWR5lEKVhHZFl2jQga1T8rmScfCnP5nK8lRUiSBtbEZWPE+Pct63mR7rEUVFLtKIIoqOYfpB6XI=,iv:sa3eUtOnjs49y2EL/ndP/1f9iyOB4wTAc97TZ8zhBXQ=,tag:n91xs8Carw6OO/rk3dO+Fw==,type:str] mac: ENC[AES256_GCM,data:j5Rvh2EcWyi42lWhiKF5/t6isowgPZPqwHQIW+H6T7eb1YCRUusqnK69KSIBUvk/19ZXQXxcYqFSxilAEiuinKglXqmK5Tq2hSF+vJjqW9cunuPgeQl58GeA9PyjxrRo+HNjsXqGND9/fcZf+cqvZEQnhQdPE7mCzZaJ3kAXMKY=,iv:BsDIVtzO8nSStlKYYoFktZs2sRwVk5EgQ3GBkCk+1UE=,tag:pxQyFn6Y8bbDF9hQMJqTvA==,type:str]
pgp: [] pgp: []
unencrypted_suffix: _unencrypted unencrypted_suffix: _unencrypted
version: 3.7.3 version: 3.7.3