losurdo: openvpn: riseup: update remotes

[sourcephile-nix.git] / hosts / losurdo / networking / openvpn / riseup.nix

diff --git a/hosts/losurdo/networking/openvpn/riseup.nix b/hosts/losurdo/networking/openvpn/riseup.nix
index 670d9aaa3a8f40b3b60a9d68ab1d7f80d9b6134a..f2d53a7b96e59f1444b36e17c919b9e2c75f50e5 100644 (file)
--- a/hosts/losurdo/networking/openvpn/riseup.nix
+++ b/hosts/losurdo/networking/openvpn/riseup.nix
@@ -1,4 +1,10 @@
-{ inputs, pkgs, lib, config, ... }:
+{
+  inputs,
+  pkgs,
+  lib,
+  config,
+  ...
+}:
 let
   netns = "riseup";
   inherit (config.services) openvpn;
@@ -9,8 +15,7 @@ in
   services.openvpn.servers.${netns} = {
     inherit netns;
     settings = {
-      # curl -Ls https://api.black.riseup.net/3/config/eip-service.json |
-      # jq .gateways.'[]'.host
+      # curl -Ls https://api.black.riseup.net/3/config/eip-service.json | jq .gateways.'[]'.host
       remote = [
         "vpn01-sea.riseup.net"
         "vpn02-par.riseup.net"
@@ -20,7 +25,6 @@ in
         "vpn06-ams.riseup.net"
         "vpn07-par.riseup.net"
         "vpn08-par.riseup.net"
-        "vpn09-mia.riseup.net"
         "vpn10-mtl.riseup.net"
         "vpn11-par.riseup.net"
         "vpn12-nyc.riseup.net"
@@ -28,19 +32,22 @@ in
         "vpn14-par.riseup.net"
         "vpn15-sea.riseup.net"
         "vpn16-sea.riseup.net"
-        "vpn17-mia.riseup.net"
         "vpn18-mtl.riseup.net"
         "vpn19-ams.riseup.net"
         "vpn20-par.riseup.net"
+        "vpn21-par.riseup.net"
+        "vpn22-mia.riseup.net"
+        "vpn23-mia.riseup.net"
       ];
       remote-random = true;
       port = "53";
       proto = "udp";
-      ca = pkgs.fetchurl
-        {
+      ca =
+        pkgs.fetchurl {
           url = "https://black.riseup.net/ca.crt";
           hash = "sha256-+kzojhwMbFwcf9W6CzXcCaLzBtgeOgXp19XPrP3ZhFM=";
-        } + "";
+        }
+        + "";
       key = key-cert;
       cert = key-cert;
 
@@ -84,7 +91,9 @@ in
   networking.nftables.ruleset = ''
     table inet filter {
       chain output-net {
-        skuid root ${openvpn.servers.${netns}.settings.proto} dport ${openvpn.servers.${netns}.settings.port} counter accept comment "OpenVPN Riseup"
+        skuid root ${openvpn.servers.${netns}.settings.proto} dport ${
+          openvpn.servers.${netns}.settings.port
+        } counter accept comment "OpenVPN Riseup"
       }
     }
   '';