diff --git a/hosts/common/vpn.nix b/hosts/common/vpn.nix index bcca81bd..7362ab42 100644 --- a/hosts/common/vpn.nix +++ b/hosts/common/vpn.nix @@ -41,6 +41,7 @@ in lib.mkMerge [ "fd00:0000:1337:cafe:1111:1111:ab00:4c8f/128" ]; }) + # NB: us-* share the same wg key and link-local addrs, but distinct public addresses (def-ovpn "us-atl" { endpoint = "vpn18.prd.atlanta.ovpn.com:9929"; publicKey = "Dpg/4v5s9u0YbrXukfrMpkA+XQqKIFpf8ZFgyw0IkE0="; @@ -49,6 +50,14 @@ in lib.mkMerge [ "fd00:0000:1337:cafe:1111:1111:cfcb:27e3/128" ]; }) + (def-ovpn "us-mi" { + endpoint = "vpn34.prd.miami.ovpn.com:9929"; + publicKey = "VtJz2irbu8mdkIQvzlsYhU+k9d55or9mx4A2a14t0V0="; + address = [ + "172.21.182.178/32" + "fd00:0000:1337:cafe:1111:1111:cfcb:27e3/128" + ]; + }) (def-ovpn "ukr" { endpoint = "vpn96.prd.kyiv.ovpn.com:9929"; publicKey = "CjZcXDxaaKpW8b5As1EcNbI6+42A6BjWahwXDCwfVFg="; diff --git a/secrets/universal.yaml b/secrets/universal.yaml index 33b63a19..19dbb14b 100644 --- a/secrets/universal.yaml +++ b/secrets/universal.yaml @@ -1,7 +1,13 @@ #ENC[AES256_GCM,data:3Swm4ixzL+sg9UVl0VWUq5HmXoLFFY2tkfCLeACB,iv:brZxrQmInGekhv+sX72Ne2ow1katiT4upDBuTPStLuA=,tag:ORcRds8Fo86S5DkAHeeGKw==,type:comment] #ENC[AES256_GCM,data:LA3vDETFSVN8HZ9dieFHAvV3oP4lmG2Hpiz50MF6NHpSf7mCLbgikTv7UFohKM3vLpU=,iv:rby8r8+ELAV5ZSxALxbRTeXn0u+gv8b5wlxLwbwHt2o=,tag:50csomwWpHmSvLEGiPBAdA==,type:comment] +#ENC[AES256_GCM,data:03yoGnxvrxifgY2sPWVo4AoqJzOfmDw4dGG+/gfbdhnymsYK7MC8Dr9g6sAdXk2r22rtPh97Wz+lkKekAxB8EX6/XIQMvUSFoAOFOKjOyC43hl0=,iv:9QKJNnZT9joQJ0klbluaVc3V3KcgqfJgrX+yn0/VgkM=,tag:TKNubbb0yGFyAbXenUvtbg==,type:comment] +#ENC[AES256_GCM,data:UfEMJoxSCGajodTRERNT9UWHIw==,iv:dG/UI4AW8ZwmI0fr8dAOWRkSyrNwX1GOI1MCYcIVBy8=,tag:rONazGrpRolwttbTEX3Y1A==,type:comment] +#ENC[AES256_GCM,data:NQA7bJoU,iv:nufPTe+1v70yQhznqJ/rf9C4p8oFYZDTDMsR0yrLp7U=,tag:MAG3g70Rxu9QEQilC/Ij1w==,type:comment] +#ENC[AES256_GCM,data:IK/8v+Y=,iv:hhqaIkH13dFmTUPjkS5OEvR93ymDj9zKsOBlMNOgiq4=,tag:sCR4a5pJBhQIFTZnI8awzw==,type:comment] +#ENC[AES256_GCM,data:O1Unbl8lDfY8,iv:u7V1SQQ7Z0D6D077yJdVjg7mMqAc1RLnj3YjLTD62b0=,tag:VNQDVP3YTur674N0tQzFRw==,type:comment] wg_ovpnd_us_privkey: ENC[AES256_GCM,data:5YkQ4r7HNWiRr/5pa1XfexxtJAz6kDjX+hNiZcheUWCXVIuK0/AuyzcdQ/0=,iv:vr1UHSlsWFnTwEfZj3pBLxvaibQxhSum3SL0Uaqtceo=,tag:dN2U+TkQAgJejgDDYIWdOA==,type:str] wg_ovpnd_us-atl_privkey: ENC[AES256_GCM,data:NMguzx35VvOAo37U9pGD5bYa/ghWeSK5tVh2XRNsfKjMPhMa44lm3pTscdU=,iv:f9hBhMksL0VGT8k2RsztU9AjR2AIIL+Z2Ls24UOPeNA=,tag:C46xDGb2d32mmHWl7WQb2g==,type:str] +wg_ovpnd_us-mi_privkey: ENC[AES256_GCM,data:uEC3UOOqn1l7KwGmOxKvXccPR9Gu8/BNTlpXxXlNWf19/pIX1CLPORUWme0=,iv:cnPGghGBAsIsR86F1hPZawLWlY/pLCNF/1cg6gjrIKE=,tag:LqMbpGklQH0GX7dNNV3/8Q==,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: kms: [] @@ -81,8 +87,8 @@ sops: YmhsY0FaSW5oWVNJMlhUSDRCeWQ4KzAKaQp321XYtAZ98f4QMl5PxivAYm6VMF43 wCThiQgvYAP59jvVDTZngvfWAD5PyWVVvMNbjHGvAzK5WnsTPmxlsg== -----END AGE ENCRYPTED FILE----- - lastmodified: "2022-12-13T04:05:58Z" - mac: ENC[AES256_GCM,data:j9rDIOKJP3nEU3NF3oD2rDyEr9G8mUfG0DqCyt6e5DsA0FPHk345VxLal1T9t1Am4gfjhLmmB74RdLr2+Ow8EXCSuXOMggjcXwDSJiupkCIXO2eRmT6X3cf42vSNEixU0FGFSfue/FQtafdZe1uhHnNq+FEktODtGHw/WgPjT/k=,iv:2WENb7Nc2YL06FDhK9KYuQ5AG+Ss0THgShePFQSS0yY=,tag:dqIF7Oe7QoYVY33VJIXqnQ==,type:str] + lastmodified: "2022-12-13T04:18:45Z" + mac: ENC[AES256_GCM,data:+bgqYl0vq03phE2rQveHVHgMU38Wsw56JE0c37aGVsVKWu4hd0TWAYv1Triam1gS5pzwCP4SSd9m2lHNR00HEs3E+GmdtcuDlQn4cVGjGL0DPZDS5f/F8UXSrru98+BrULmJlB67kGFAwF5HZqAvUs2kWUrApeyBov/dNGEyY9w=,iv:cOxqJUaPxPFk8UxPfMQniYkefD6QQaFPrvcekwWZGiA=,tag:6TILEX2wn3rMyQYo0L8ZCQ==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.7.3