diff --git a/modules/mullvad/default.nix b/modules/mullvad/default.nix index 91fdd61..73174e3 100644 --- a/modules/mullvad/default.nix +++ b/modules/mullvad/default.nix @@ -5,7 +5,7 @@ let cfg = config.sbruder.mullvad; relayConfigs = lib.mapAttrs' - (name: configuration: lib.nameValuePair "mullvad-${name}.conf" (with configuration; '' + (name: configuration: lib.nameValuePair "mlv-${name}.conf" (with configuration; '' [Interface] DNS = ${cfg.dnsServer} diff --git a/modules/mullvad/mullvad.sh b/modules/mullvad/mullvad.sh index 37ec422..c17733a 100755 --- a/modules/mullvad/mullvad.sh +++ b/modules/mullvad/mullvad.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # This reads wg-quick compatible configuration files from -# /etc/wireguard/mullvad-LOCATION.conf +# /etc/wireguard/mlv-LOCATION.conf # # Since they are autogenerated by nix and therefore world-readable, they do not # include secrets like the private key and client address. Instead, they are @@ -18,7 +18,7 @@ if (( $# < 1 )); then exit 1 fi -INTERFACE="mullvad-$1" +INTERFACE="mlv-$1" cmd() { echo "[#] $*" >&2 @@ -27,7 +27,7 @@ cmd() { for interface in /sys/class/net/*; do interface="${interface#/sys/class/net/}" - [[ $interface =~ ^mullvad-(v6-)?[a-z]{2}[0-9]*$ ]] && cmd wg-quick down "$interface" + [[ $interface =~ ^mlv-(v6-)?[a-z]{2}(-[a-z]{3}-)?[0-9]*$ ]] && cmd wg-quick down "$interface" done if [ "$1" != "off" ]; then diff --git a/modules/mullvad/relays.json b/modules/mullvad/relays.json index 4560ed0..525ee31 100644 --- a/modules/mullvad/relays.json +++ b/modules/mullvad/relays.json @@ -29,6 +29,21 @@ "endpoint6": "2001:ac8:29:54::a09f", "pubkey": "f4t0xU1DsADjvHsAeB0pJAOdq+FkYZ5IhHvWom+/dGI=" }, + "at-vie-001": { + "endpoint4": "146.70.116.98", + "endpoint6": "2001:ac8:29:84::a01f", + "pubkey": "TNrdH73p6h2EfeXxUiLOCOWHcjmjoslLxZptZpIPQXU=" + }, + "at-vie-002": { + "endpoint4": "146.70.116.130", + "endpoint6": "2001:ac8:29:85::a02f", + "pubkey": "ehXBc726YX1N6Dm7fDAVMG5cIaYAFqCA4Lbpl4VWcWE=" + }, + "at-vie-003": { + "endpoint4": "146.70.116.162", + "endpoint6": "2001:ac8:29:86::a03f", + "pubkey": "ddllelPu2ndjSX4lHhd/kdCStaSJOQixs9z551qN6B8=" + }, "au10": { "endpoint4": "89.44.10.114", "endpoint6": "2001:ac8:84:33::a10f", @@ -82,7 +97,7 @@ "au9": { "endpoint4": "89.44.10.82", "endpoint6": "2001:ac8:84:32::a09f", - "pubkey": "ehLDGUmJM2l0t1dei1/yhrUsWzwkwLAJrP09+grALhE=" + "pubkey": "JrJ6lqsze0Y4lao8w+3P3PLOhzfo+g5PT8AWNkK6wSs=" }, "be1": { "endpoint4": "193.9.114.2", @@ -92,7 +107,7 @@ "be2": { "endpoint4": "5.253.205.162", "endpoint6": "2001:ac8:27:51::a02f", - "pubkey": "3qRUb3wL07NDNE1GmriASES5ogDcoxz2LyJQVGubF18=" + "pubkey": "6Esqc4ElaNIde9OODzKBd1/rgsNqjwnLAJ6wp571vTQ=" }, "be3": { "endpoint4": "37.120.218.154", @@ -104,6 +119,21 @@ "endpoint6": "2001:ac8:27:57::a04f", "pubkey": "zotbXj8reba/gId9QDZ9Az8RsGLyAskCHVVM3HYhGQw=" }, + "be-bru-101": { + "endpoint4": "91.90.123.2", + "endpoint6": "2001:ac8:27:88::a01f", + "pubkey": "GE2WP6hmwVggSvGVWLgq2L10T3WM2VspnUptK5F4B0U=" + }, + "be-bru-102": { + "endpoint4": "194.110.115.34", + "endpoint6": "2001:ac8:27:89::a02f", + "pubkey": "IY+FKw487MEWqMGNyyrT4PnTrJxce8oiGNHT0zifam8=" + }, + "be-bru-103": { + "endpoint4": "194.110.115.2", + "endpoint6": "2001:ac8:27:92::a03f", + "pubkey": "b5A1ela+BVI+AbNXz7SWekZHvdWWpt3rqUKTJj0SqCU=" + }, "bg4": { "endpoint4": "217.138.221.178", "endpoint6": "2001:ac8:30:28::a04f", @@ -129,10 +159,15 @@ "endpoint6": "2804:5364:3100:9::a01f", "pubkey": "2eYsuY/H7kpeam31OG+eQ7s43BeuyzoVgqwdeGXMd3A=" }, - "br3": { - "endpoint4": "189.1.172.64", - "endpoint6": "2804:391c:12::a03f", - "pubkey": "1ASK3o4gNQ4aVs7HgiERRGl032eyEc0P2WKYT48vi0A=" + "br-sao-201": { + "endpoint4": "169.150.198.66", + "endpoint6": "2a02:6ea0:d00e:1::a01f", + "pubkey": "8c9M6w1BQbgMVr/Zgrj4GwSdU6q3qfQfWs17kMLC9y4=" + }, + "br-sao-202": { + "endpoint4": "169.150.198.79", + "endpoint6": "2a02:6ea0:d00e:2::a02f", + "pubkey": "jWURoz8SLBUlRTQnAFTA/LDZUTpvlO0ghiVWH7MgaHQ=" }, "ca10": { "endpoint4": "89.36.78.146", @@ -224,21 +259,16 @@ "endpoint6": "2607:9000:6000:20::a27f", "pubkey": "ptnLZbreIzTZrSyPD0XhOAAmN194hcPSG5TI5TTiL08=" }, - "ca28": { - "endpoint4": "178.249.214.2", - "endpoint6": "2a02:6ea0:de08:1::a28f", - "pubkey": "/ukKnQanjsX5MHbbhe7dJYIrSdPyP5UY7DMGStAznwk=" - }, - "ca29": { - "endpoint4": "178.249.214.15", - "endpoint6": "2a02:6ea0:de08:2::a29f", - "pubkey": "JrDXNOO4YQoWvZK2UbpkmxQqvV36Wp/ehlSxCaZlixw=" - }, "ca7": { "endpoint4": "71.19.249.31", "endpoint6": "2605:80:19:4::a07f", "pubkey": "uPz+Jh+cXpTmNOmCvBJOFWzzygtCcnkAZ0jyFQF9pFQ=" }, + "ca-tor-002": { + "endpoint4": "178.249.214.15", + "endpoint6": "2a02:6ea0:de08:2::a29f", + "pubkey": "iqZSgVlU9H67x/uYE5xsnzLCDXf7FL9iMfyKfl6WsV8=" + }, "ch10": { "endpoint4": "91.193.4.82", "endpoint6": "2001:ac8:28:88::a10f", @@ -279,31 +309,41 @@ "endpoint6": "2001:ac8:28:95::a17f", "pubkey": "4cr4WJxUbl5EqayrN2EecNROHjiXGkZKEProFeyaPWo=" }, - "ch18": { - "endpoint4": "138.199.6.194", - "endpoint6": "2a02:6ea0:d406:1::a18f", - "pubkey": "DMMY46sOiyCKaY+8BPUyDGqgyAk9jyw/qkwGQO3+I1U=" - }, - "ch19": { - "endpoint4": "138.199.6.207", - "endpoint6": "2a02:6ea0:d406:2::a19f", - "pubkey": "AUqDi4OgZKUsJMmggT8CgO4psXKRSwm6vspDVlGWDwM=" - }, - "ch20": { - "endpoint4": "138.199.6.220", - "endpoint6": "2a02:6ea0:d406:3::a20f", - "pubkey": "CrVsR/GimomhjhSaBJaM9nRQSRoztLMuEMjZgnoq7ng=" - }, - "ch21": { - "endpoint4": "138.199.6.233", - "endpoint6": "2a02:6ea0:d406:4::a21f", - "pubkey": "nt4J55Ndxvrr+ZHQ0EDRh1L+gYynqNFKaJS2hUX4pQg=" - }, "ch2": { "endpoint4": "31.7.59.250", "endpoint6": "2a02:29b8:dc01:1641::a02f", "pubkey": "bmy9vGzMqc0yS3IiMMyOONyXRwPCMiyhR/bnNQ2LsCE=" }, + "ch30": { + "endpoint4": "146.70.126.162", + "endpoint6": "2001:ac8:28:a1::a30f", + "pubkey": "SBbljxCZkalFGf2abrAsflkqCxromW/dHbkFI6cz30Q=" + }, + "ch31": { + "endpoint4": "146.70.126.194", + "endpoint6": "2001:ac8:28:a2::a31f", + "pubkey": "RIEfhD/bJovOHA/FB03orNZ98/5AAcQq48ofMWpb/g8=" + }, + "ch32": { + "endpoint4": "146.70.126.226", + "endpoint6": "2001:ac8:28:a3::a32f", + "pubkey": "I5XiRYHPmxnmGtPJ90Yio6QXL441C/+kYV6UH6wU+jk=" + }, + "ch33": { + "endpoint4": "146.70.134.2", + "endpoint6": "2001:ac8:28:a4::a33f", + "pubkey": "RdRmzC/dFLnWae7oHeHvC3QoLoapoFwwANjCE1jShm4=" + }, + "ch34": { + "endpoint4": "146.70.134.34", + "endpoint6": "2001:ac8:28:a5::a34f", + "pubkey": "oSSHqICfNSsRK6vdIcw00cx5G4KnHDtnZD7ieriPYhQ=" + }, + "ch35": { + "endpoint4": "146.70.134.66", + "endpoint6": "2001:ac8:28:a6::a35f", + "pubkey": "/PLVCdGatn3Jl4lQ/btcG9sQRhczOzgAza2fwuJ2WX8=" + }, "ch5": { "endpoint4": "193.32.127.66", "endpoint6": "2a03:1b20:a:f011::a01f", @@ -329,6 +369,31 @@ "endpoint6": "2a03:1b20:a:f011::a05f", "pubkey": "dV/aHhwG0fmp0XuvSvrdWjCtdyhPDDFiE/nuv/1xnRM=" }, + "ch-zrh-401": { + "endpoint4": "138.199.6.194", + "endpoint6": "2a02:6ea0:d406:1::a18f", + "pubkey": "45ud3I5O6GmPXTrMJiqkiPMI/ubucDqzGaiq3CHJXk8=" + }, + "ch-zrh-402": { + "endpoint4": "138.199.6.207", + "endpoint6": "2a02:6ea0:d406:2::a19f", + "pubkey": "7VCMEE+Oljm/qKfQJSUCOYPtRSwdOnuPyqo5Vob+GRY=" + }, + "ch-zrh-403": { + "endpoint4": "138.199.6.220", + "endpoint6": "2a02:6ea0:d406:3::a20f", + "pubkey": "Jmhds6oPu6/j94hjllJCIaKLDyWu6V+ZNRrVVFhWJkI=" + }, + "ch-zrh-404": { + "endpoint4": "138.199.6.233", + "endpoint6": "2a02:6ea0:d406:4::a21f", + "pubkey": "zfNQqDyPmSUY8+20wxACe/wpk4Q5jpZm5iBqjXj2hk8=" + }, + "ch-zrh-501": { + "endpoint4": "146.70.134.98", + "endpoint6": "2001:ac8:28:a7::a36f", + "pubkey": "HQzvIK88XSsRujBlwoYvvZ7CMKwiYuOqLXyuckkTPHg=" + }, "cz1": { "endpoint4": "185.242.6.18", "endpoint6": "2001:ac8:33:a::a01f", @@ -354,6 +419,16 @@ "endpoint6": "2001:ac8:33:42::a05f", "pubkey": "uZTF1+bM/EiXMBbvvZ7qGMtC7PMmHez1XHOomYSQbCs=" }, + "cz-prg-101": { + "endpoint4": "146.70.129.98", + "endpoint6": "2001:ac8:33:c::a01f", + "pubkey": "wLBxTaISMJ++vUht4hlAOUog9fhZxDql16TaYWaboDc=" + }, + "cz-prg-102": { + "endpoint4": "146.70.129.130", + "endpoint6": "2001:ac8:33:d::a02f", + "pubkey": "cRCJ0vULwKRbTfzuo9W+fIt0fJGQE7DLvojIiURIpiI=" + }, "de10": { "endpoint4": "185.209.196.69", "endpoint6": "2a03:1b20:6:f011::a10f", @@ -394,41 +469,6 @@ "endpoint6": "2001:ac8:20:309::a17f", "pubkey": "Fp3bDkNLmmTajbN3cSVM9zi0OeSuOZySMGypk7HOO3E=" }, - "de20": { - "endpoint4": "185.254.75.3", - "endpoint6": "2a03:d9c0:3000::a20f", - "pubkey": "b4ydGDYUtJvF39yqaeZjsDTJOG8E7759miI1/MB2HyE=" - }, - "de21": { - "endpoint4": "185.254.75.4", - "endpoint6": "2a03:d9c0:3000::a21f", - "pubkey": "z6092d1MB6zI9V6azuFhvQCLQjq+RM7uYT0lEVG98zI=" - }, - "de22": { - "endpoint4": "185.254.75.5", - "endpoint6": "2a03:d9c0:3000::a22f", - "pubkey": "4vPUFgKyrXKEZwhL7AUmXNN37NBkvIolp0Kfnrf4AVo=" - }, - "de23": { - "endpoint4": "194.36.25.3", - "endpoint6": "2a07:fe00:1::a23f", - "pubkey": "EpiZKShr92zHOHRyMzHpw1fONtbk9uppMkxklU3SxhY=" - }, - "de24": { - "endpoint4": "194.36.25.18", - "endpoint6": "2a07:fe00:1::a24f", - "pubkey": "9hIGjit4ApkNGuEWYBLpahxokEoP0cT9CMZ+ELEygzo=" - }, - "de25": { - "endpoint4": "194.36.25.33", - "endpoint6": "2a07:fe00:1::a25f", - "pubkey": "Rc+VTdcBPg7i7dy7MAp6TOhwJP3g1/TilK+IaE7Aojc=" - }, - "de26": { - "endpoint4": "194.36.25.48", - "endpoint6": "2a07:fe00:1::a26f", - "pubkey": "UXKb8MiyaWHI1k9ayZH0i206Pc+/gKUhAwCORDqonkE=" - }, "de30": { "endpoint4": "146.70.117.194", "endpoint6": "2001:ac8:20:275::a30f", @@ -454,21 +494,6 @@ "endpoint6": "2001:ac8:20:270::a34f", "pubkey": "9ldhvN7r4xGZkGehbsNfYb5tpyTJ5KBb5B3TbxCwklw=" }, - "de35": { - "endpoint4": "169.150.201.2", - "endpoint6": "2a02:6ea0:c762:1::a35f", - "pubkey": "5IKgD53jf94S5XagqkqOo9VWTrDe7iOBGtKj2/EAqFo=" - }, - "de36": { - "endpoint4": "169.150.201.15", - "endpoint6": "2a02:6ea0:c762:2::a36f", - "pubkey": "DIr7Q97daEFRsGaQNmmDqd4Ef4Zt7DSLoj/r0YspIVo=" - }, - "de37": { - "endpoint4": "169.150.201.28", - "endpoint6": "2a02:6ea0:c762:3::a37f", - "pubkey": "6sUHBVNdpFzz6qHLF0fISsvtwiG0RZQVVgVC5CEYslg=" - }, "de4": { "endpoint4": "185.213.155.130", "endpoint6": "2a03:1b20:6:f011::a01f", @@ -489,6 +514,61 @@ "endpoint6": "2a03:1b20:6:f011::a08f", "pubkey": "XIge3HgGEHf52e4Jpzk8iFOrrp6q7trq0udhufFlDVo=" }, + "de-dus-001": { + "endpoint4": "185.254.75.3", + "endpoint6": "2a03:d9c0:3000::a20f", + "pubkey": "ku1NYeOAGbY65YL/JKZhrqVzDJKXQiVj9USXbfkOBA0=" + }, + "de-dus-002": { + "endpoint4": "185.254.75.4", + "endpoint6": "2a03:d9c0:3000::a21f", + "pubkey": "TPAIPTgu9jIitgX1Bz5xMCZJ9pRRZTdtZEOIxArO0Hc=" + }, + "de-dus-003": { + "endpoint4": "185.254.75.5", + "endpoint6": "2a03:d9c0:3000::a22f", + "pubkey": "XgSe9UwEV4JJNPPzFFOVYS6scMTL4DeNlwqBl32lDw0=" + }, + "de-fra-101": { + "endpoint4": "146.70.117.162", + "endpoint6": "2001:ac8:20:274::a99f", + "pubkey": "Voioje9Gfb7aTiK2/H6VyHFK1AFap1glIX0Z1EX2mRQ=" + }, + "de-fra-301": { + "endpoint4": "194.36.25.3", + "endpoint6": "2a07:fe00:1::a23f", + "pubkey": "dNKRyh2MkJGZdg9jyUJtf9w5GHjX3+/fYatg+xi9TUM=" + }, + "de-fra-302": { + "endpoint4": "194.36.25.18", + "endpoint6": "2a07:fe00:1::a24f", + "pubkey": "A3DbIgPycEJhJ1fQ4zzcajLOKTZsJMeawjdPQiWav20=" + }, + "de-fra-303": { + "endpoint4": "194.36.25.33", + "endpoint6": "2a07:fe00:1::a25f", + "pubkey": "2P+9SjwVCEnMDnBiYfZtQLq9p2S2TFhCM0xJBoevYk4=" + }, + "de-fra-304": { + "endpoint4": "194.36.25.48", + "endpoint6": "2a07:fe00:1::a26f", + "pubkey": "VgNcwWy8MRhfEZY+XSisDM1ykX+uXlHQScOLqqGMLkc=" + }, + "de-fra-401": { + "endpoint4": "169.150.201.2", + "endpoint6": "2a02:6ea0:c762:1::a35f", + "pubkey": "AbM8fnQWmmX6Nv0Tz68LigPbGkamJgNjxgzPfENOdXU=" + }, + "de-fra-402": { + "endpoint4": "169.150.201.15", + "endpoint6": "2a02:6ea0:c762:2::a36f", + "pubkey": "6/PBbPtoeWpJA+HZc9Iqg/PPQWD7mGVvZdwQlr1vtRk=" + }, + "de-fra-403": { + "endpoint4": "169.150.201.28", + "endpoint6": "2a02:6ea0:c762:3::a37f", + "pubkey": "HWzSNMbQOQafkVp68B7aLRirhNJ6x5Wjw8/y7oUuHW0=" + }, "dk2": { "endpoint4": "45.129.56.67", "endpoint6": "2a03:1b20:8:f011::a02f", @@ -519,20 +599,20 @@ "endpoint6": "2a00:9080:1:98c::1f", "pubkey": "H7tZk6jMQps9WHn8opffvYmt6XN3v1614EGpsMZoA3w=" }, - "ee1": { + "ee-tll-001": { "endpoint4": "194.127.167.67", "endpoint6": "2a07:d880:2::a01f", - "pubkey": "4GQKt+LP7Yi+pZw6dvNmfmOPc849B5l/bOhM4rmwz0c=" + "pubkey": "bdq37KtfoG1Tm7yQcfitdRyGeZOn/c7PwLN+LgG/6nA=" }, - "ee2": { + "ee-tll-002": { "endpoint4": "194.127.167.87", "endpoint6": "2a07:d880:2::a02f", - "pubkey": "ieRSMiS5tm0o6p93m2FtF2JKIANui1EvhnFOJ6bbnhI=" + "pubkey": "vqGmmcERr/PAKDzy6Dxax8g4150rC93kmKYabZuAzws=" }, - "ee3": { + "ee-tll-003": { "endpoint4": "194.127.167.107", "endpoint6": "2a07:d880:2::a03f", - "pubkey": "BS7BvaABAmX2EqndNQOxJRHWfGZsUt+uQ2tjTHKGiGs=" + "pubkey": "+8dUgpD7YA4wMPnRQkO7EI7AeYd30QPMKh/hOaaGIXY=" }, "es1": { "endpoint4": "194.99.104.10", @@ -554,15 +634,25 @@ "endpoint6": "2001:ac8:23:5b::a05f", "pubkey": "/u0n1ETjberX5jYv0W94zLvX5Qzn+pPL/8umey/iIlE=" }, - "es6": { + "es-mad-101": { "endpoint4": "45.134.213.194", "endpoint6": "2a02:6ea0:c318:1::a06f", - "pubkey": "1GQLeOWjHgzflfONrXlj1iUKo4uWHe6VAsOAzsp1hgw=" + "pubkey": "oPpPeyiQhUYqtOxwR387dmFfII8OK5LX2RPyns1rx2U=" }, - "es7": { + "es-mad-102": { "endpoint4": "45.134.213.207", "endpoint6": "2a02:6ea0:c318:2::a07f", - "pubkey": "azJb0GofbDjSh2KTPReEeVdB8QVs4QC7E57P7MC7dQg=" + "pubkey": "1Wo/cQeVHX2q9k95nxN+48lgkGLsPQ+uesRb/9XdY1Y=" + }, + "es-mad-201": { + "endpoint4": "146.70.128.194", + "endpoint6": "2001:ac8:23:85::a01f", + "pubkey": "LyO4Xs1eV8JwFr63a1FRnKboQn2Tu/oeMzHhbr7Y6GU=" + }, + "es-mad-202": { + "endpoint4": "146.70.128.226", + "endpoint6": "2001:ac8:23:86::a02f", + "pubkey": "iehXacO91FbBqni2IFxedEYPlW2Wvvt9GtRPPPMo9zc=" }, "fi1": { "endpoint4": "185.204.1.203", @@ -604,16 +694,6 @@ "endpoint6": "2001:ac8:25:d7::a14f", "pubkey": "2N0hu5kBMUCTBtEp81yMdfFTDpNvklQP3qaq3tuRaXk=" }, - "fr15": { - "endpoint4": "138.199.15.162", - "endpoint6": "2a02:6ea0:dc05::a15f", - "pubkey": "fOrw0hU1D3Wc2A7AsLVdozlDlxwYOHZo6ZJ9OiNmGxU=" - }, - "fr16": { - "endpoint4": "138.199.15.146", - "endpoint6": "2a02:6ea0:dc06::a16f", - "pubkey": "fzwXRcbEE7+zZkDcWaR3fpx84+S1cWYzdiSE/1z4V3Q=" - }, "fr4": { "endpoint4": "193.32.126.66", "endpoint6": "2a03:1b20:9:f011::a01f", @@ -639,6 +719,16 @@ "endpoint6": "2a03:1b20:9:f011::a05f", "pubkey": "cmqtSjWUa4/0bENQDKxdr0vQqf4nFVDodarHm0Pc0hY=" }, + "fr-mrs-001": { + "endpoint4": "138.199.15.162", + "endpoint6": "2a02:6ea0:dc05::a15f", + "pubkey": "MOk2OTDEaFFN4vsCAgf+qQi6IlY99nCeDEzpXyo65wg=" + }, + "fr-mrs-002": { + "endpoint4": "138.199.15.146", + "endpoint6": "2a02:6ea0:dc06::a16f", + "pubkey": "Z0LEgZIPhNj0+/VWknU3roHlVI3qqAfoV6th9NSC0F0=" + }, "gb11": { "endpoint4": "185.195.232.66", "endpoint6": "2a03:1b20:7:f011::a11f", @@ -769,11 +859,6 @@ "endpoint6": "2001:ac8:31:f006::a38f", "pubkey": "QY3xZuhOqhQXiaYjO0Jp4Cdl41pHOz68xPS54rM0Q1M=" }, - "gb39": { - "endpoint4": "146.70.119.66", - "endpoint6": "2001:ac8:31:f007::a39f", - "pubkey": "41AMWF5wy5Id1yRFBoQU5PdL0cm9n9goehVI7gn7/28=" - }, "gb40": { "endpoint4": "146.70.132.130", "endpoint6": "2001:ac8:8b:26::a40f", @@ -809,11 +894,6 @@ "endpoint6": "2001:ac8:8b:2c::a46f", "pubkey": "2bciRobW0TPtjrZ2teilr+7PjyiBMUGfixvAKOE52Xo=" }, - "gb47": { - "endpoint4": "146.70.133.98", - "endpoint6": "2001:ac8:8b:2d::a47f", - "pubkey": "C2klRB4jY5BK9hVPlBfy+45dGEhDS1Nut5pFj7JA73w=" - }, "gb4": { "endpoint4": "141.98.252.130", "endpoint6": "2a03:1b20:7:f011::a01f", @@ -824,6 +904,16 @@ "endpoint6": "2a03:1b20:7:f011::a02f", "pubkey": "J57ba81Q8bigy9RXBXvl0DgABTrbl81nb37GuX50gnY=" }, + "gb-lon-101": { + "endpoint4": "146.70.119.66", + "endpoint6": "2001:ac8:31:f007::a39f", + "pubkey": "MPZX0ZQtB5r1pmcvIcsAt1AMvenios2ICBz9rjbN/l4=" + }, + "gb-mnc-001": { + "endpoint4": "146.70.133.98", + "endpoint6": "2001:ac8:8b:2d::a47f", + "pubkey": "Q2khJLbTSFxmppPGHgq2HdxMQx7CczPZCgVpYZMoNnM=" + }, "hk1": { "endpoint4": "209.58.188.180", "endpoint6": "2001:df1:801:a009:10::a01f", @@ -844,15 +934,15 @@ "endpoint6": "2001:ac8:92:5::a04f", "pubkey": "NpthstUXmLmwkfbKvl8XvpCtKm4yfRk55D07s223UX0=" }, - "hk5": { - "endpoint4": "103.125.233.3", - "endpoint6": "2403:2c81:1000::a05f", - "pubkey": "X85DJrRdJXdF7YDW73h/+3umt9DOn9sAAu0ImxPED18=" - }, - "hk6": { + "hk-hkg-201": { "endpoint4": "103.125.233.18", "endpoint6": "2403:2c81:1000::a06f", - "pubkey": "p1euu5uYTGiqNjDYVylnTEWlRdQlwR+YQEw8uQ/p4WU=" + "pubkey": "Oxh13dmwY6nNUa5rVHr7sLiFOj0fjzsaAUAUV87/nGs=" + }, + "hk-hkg-202": { + "endpoint4": "103.125.233.3", + "endpoint6": "2403:2c81:1000::a05f", + "pubkey": "zmhMPHfkgo+uQxP+l919Gw7cj5NTatg9nMU37eEUWis=" }, "hu3": { "endpoint4": "86.106.74.66", @@ -879,15 +969,20 @@ "endpoint6": "2001:ac8:88:5e::a02f", "pubkey": "DOunbHw/O5gnTNo1Ov/6rknpvJck9BlQ1zTMHE4JA38=" }, - "it10": { - "endpoint4": "178.249.211.79", - "endpoint6": "2a02:6ea0:d509:2::a10f", - "pubkey": "aBj4bBGwll8lmqQKaeWBwL1KXiChRLXUWXscyWvI9GM=" + "il-tlv-101": { + "endpoint4": "169.150.227.197", + "endpoint6": "2a02:6ea0:3b00:1::a01f", + "pubkey": "XOedjVJaT2IrEDJbzvtZeL4hP5uPRHzFxvD1cwVwUFo=" }, - "it11": { - "endpoint4": "178.249.211.92", - "endpoint6": "2a02:6ea0:d509:3::a11f", - "pubkey": "lSgzPzjTnUgsIcu+iJYfZgeR2n2VjVuj7imwT5qYJhA=" + "il-tlv-102": { + "endpoint4": "169.150.227.210", + "endpoint6": "2a02:6ea0:3b00:2::a02f", + "pubkey": "UNeML4rXjvOerAstTNf4gG5B+OfjVzjSQrWE6mrswD0=" + }, + "il-tlv-103": { + "endpoint4": "169.150.227.222", + "endpoint6": "2a02:6ea0:3b00:3::a03f", + "pubkey": "11FJ/NY3jaAw1PSYG9w7bxsMxAzlI+1p8/juh1LJPT0=" }, "it4": { "endpoint4": "91.193.5.2", @@ -914,10 +1009,20 @@ "endpoint6": "2001:ac8:24:49::a08f", "pubkey": "hW+QDgH+88xUCgMSZkdMqTIuUossLmopwu6nWqHCsXc=" }, - "it9": { + "it-mil-001": { "endpoint4": "178.249.211.66", "endpoint6": "2a02:6ea0:d509:1::a09f", - "pubkey": "NgwNcjxnm7XEBo/6YTrMzChhUG9KEwZ9RRReShYBF2s=" + "pubkey": "Sa9fFFthvihGMO4cPExJ7ZaWSHNYoXmOqZMvJsaxOVk=" + }, + "it-mil-002": { + "endpoint4": "178.249.211.79", + "endpoint6": "2a02:6ea0:d509:2::a10f", + "pubkey": "RJ7e37UEP6hfyLQM/lJ2K5wcZOJQFhm2VhFaBniH1kg=" + }, + "it-mil-003": { + "endpoint4": "178.249.211.92", + "endpoint6": "2a02:6ea0:d509:3::a11f", + "pubkey": "WOyki5Gzoez07X7D3jAhG68hpoiYIWAx1yypVbkQaVY=" }, "jp10": { "endpoint4": "91.193.7.34", @@ -939,36 +1044,6 @@ "endpoint6": "2001:ac8:40:bd::a13f", "pubkey": "MirGjkQpzD6c6yxgbcvECZlECFvgO0hx5p+QhpOJYRQ=" }, - "jp14": { - "endpoint4": "138.199.21.226", - "endpoint6": "2a02:6ea0:d31b::a14f", - "pubkey": "0lZx6k2I6+jhZHyBfI7IXHgHqRDWcSo86QH4EdRsanU=" - }, - "jp15": { - "endpoint4": "138.199.21.239", - "endpoint6": "2a02:6ea0:d31c::a15f", - "pubkey": "pJA2YAQQwxSywiZyjvaWVB+2ToGJGL5VDO6wMT5Ztgc=" - }, - "jp1": { - "endpoint4": "45.8.223.195", - "endpoint6": "2400:ddc0:c000::a01f", - "pubkey": "C2TUHPoZlT08iceLM2coBDTbcfg9tTKrUt7tRBWP0nk=" - }, - "jp2": { - "endpoint4": "45.8.223.210", - "endpoint6": "2400:ddc0:c000::a02f", - "pubkey": "SKSP2p2pmtAbLF5QsiULdcqVaeiI/IOOvU06gQRNVUs=" - }, - "jp3": { - "endpoint4": "45.8.223.225", - "endpoint6": "2400:ddc0:c000::a03f", - "pubkey": "oWo/Ljb6SYqJYHHhRd8nKDjFJx9MqfouEYSJvba4XH4=" - }, - "jp4": { - "endpoint4": "45.8.223.240", - "endpoint6": "2400:ddc0:c000::a04f", - "pubkey": "EDkvP9v1ZX0eCTPStNC6PtbHvFk2t1b8iud+UQNe3Es=" - }, "jp6": { "endpoint4": "217.138.252.226", "endpoint6": "2001:ac8:40:b6::a06f", @@ -989,6 +1064,36 @@ "endpoint6": "2001:ac8:40:b9::a09f", "pubkey": "6qBkfoucP2xtTJo5hiXl+1b5pbAHPVMcbng/DIhJEiw=" }, + "jp-osa-001": { + "endpoint4": "45.8.223.195", + "endpoint6": "2400:ddc0:c000::a01f", + "pubkey": "uhbuY1A7g0yNu0lRhLTi020kYeAx34ED30BA5DQRHFo=" + }, + "jp-osa-002": { + "endpoint4": "45.8.223.210", + "endpoint6": "2400:ddc0:c000::a02f", + "pubkey": "wzGXxsYOraTCPZuRxfXVTNmoWsRkMFLqMqDxI4PutBg=" + }, + "jp-osa-003": { + "endpoint4": "45.8.223.225", + "endpoint6": "2400:ddc0:c000::a03f", + "pubkey": "Pt18GnBffElW0sqnd6IDRr5r0B/NDezy6NicoPI+fG8=" + }, + "jp-osa-004": { + "endpoint4": "45.8.223.240", + "endpoint6": "2400:ddc0:c000::a04f", + "pubkey": "JpDAtRuR39GLFKoQNiKvpzuJ65jOOLD7h85ekZ3reVc=" + }, + "jp-tyo-001": { + "endpoint4": "138.199.21.239", + "endpoint6": "2a02:6ea0:d31c::a15f", + "pubkey": "AUo2zhQ0wCDy3/jmZgOe4QMncWWqrdME7BbY2UlkgyI=" + }, + "jp-tyo-002": { + "endpoint4": "138.199.21.226", + "endpoint6": "2a02:6ea0:d31b::a14f", + "pubkey": "zdlqydCbeR7sG1y5L8sS65X1oOtRKvfVbAuFgqEGhi4=" + }, "lu1": { "endpoint4": "92.223.89.181", "endpoint6": "2a03:90c0:83:2953::a01f", @@ -1009,56 +1114,16 @@ "endpoint6": "2a00:1dc0:2925:10::a01f", "pubkey": "BQobp2UXHJguYGz06WWJGJV6QytNIZlgMwr6Joufhx8=" }, - "mk1": { - "endpoint4": "185.225.28.146", - "endpoint6": "2a0d:4500::a01f", - "pubkey": "bBpLzsGFejooiGku1yzNIvRb3U8Upr032I3nxCCkzn4=" - }, "nl1": { "endpoint4": "193.32.249.66", "endpoint6": "2a03:1b20:3:f011::a01f", "pubkey": "UrQiI9ISdPPzd4ARw1NHOPKKvKvxUhjwRjaI0JpJFgM=" }, - "nl20": { - "endpoint4": "92.60.40.194", - "endpoint6": "2a0c:59c0:18::a20f", - "pubkey": "StMPmol1+QQQQCJyAkm7t+l/QYTKe5CzXUhw0I6VX14=" - }, - "nl21": { - "endpoint4": "92.60.40.209", - "endpoint6": "2a0c:59c0:18::a21f", - "pubkey": "RodGkT2Xqiumwb7pg4WmiTjkZgJq0hW9okaJUyNBong=" - }, - "nl22": { - "endpoint4": "92.60.40.224", - "endpoint6": "2a0c:59c0:18::a22f", - "pubkey": "xwANpTKjog2nflBgA+HWplQfUXgbvh+b4a53P83nmX0=" - }, - "nl23": { - "endpoint4": "92.60.40.239", - "endpoint6": "2a0c:59c0:18::a23f", - "pubkey": "PaU5gPqZnj9XQ2csZK2oiyNz/cOUZM3yk6qHm67wbmA=" - }, "nl2": { "endpoint4": "185.65.134.222", "endpoint6": "2a03:1b20:3:f011::a02f", "pubkey": "P0NpAUCe/gfL4lgs/PH4nDd5kA5zNDtHbUcqfYmSdmg=" }, - "nl30": { - "endpoint4": "169.150.196.2", - "endpoint6": "2a02:6ea0:c034:1::a30f", - "pubkey": "C6SfQFOfq6/q9nHRdLDN98U/BTxH47Ec1l/PaQZuRk4=" - }, - "nl31": { - "endpoint4": "169.150.196.15", - "endpoint6": "2a02:6ea0:c034:2::a31f", - "pubkey": "LMmlMjPQXY886ER2Rsjot4UZL44+1CqoI5niOhBU9mc=" - }, - "nl32": { - "endpoint4": "169.150.196.28", - "endpoint6": "2a02:6ea0:c034:3::a32f", - "pubkey": "+VYWObpgrc9F30Nwz/L8Y7RlTMTTN/cXh68ClCHBJlE=" - }, "nl3": { "endpoint4": "185.65.134.223", "endpoint6": "2a03:1b20:3:f011::a03f", @@ -1074,6 +1139,41 @@ "endpoint6": "2a03:1b20:3:f011::a05f", "pubkey": "33BoONMGCm2vknq2eq72eozRsHmHQY6ZHEEZ4851TkY=" }, + "nl-ams-101": { + "endpoint4": "92.60.40.194", + "endpoint6": "2a0c:59c0:18::a20f", + "pubkey": "m9w2Fr0rcN6R1a9HYrGnUTU176rTZIq2pcsovPd9sms=" + }, + "nl-ams-102": { + "endpoint4": "92.60.40.209", + "endpoint6": "2a0c:59c0:18::a21f", + "pubkey": "uUYbYGKoA6UBh1hfkAz5tAWFv4SmteYC9kWh7/K6Ah0=" + }, + "nl-ams-103": { + "endpoint4": "92.60.40.224", + "endpoint6": "2a0c:59c0:18::a22f", + "pubkey": "CE7mlfDJ4gpwLPB/CyPfIusITnGZwDI9v4IlVueGT24=" + }, + "nl-ams-104": { + "endpoint4": "92.60.40.239", + "endpoint6": "2a0c:59c0:18::a23f", + "pubkey": "qZMttTUfrGT1kX5x/RYqY/y3xy2gt06seTxMJF30Q2k=" + }, + "nl-ams-201": { + "endpoint4": "169.150.196.2", + "endpoint6": "2a02:6ea0:c034:1::a30f", + "pubkey": "vt+yTcpxWvH8qiSncd1wSPV/78vt2aE2BBU8ZbG7x1Q=" + }, + "nl-ams-202": { + "endpoint4": "169.150.196.15", + "endpoint6": "2a02:6ea0:c034:2::a31f", + "pubkey": "BChJDLOwZu9Q1oH0UcrxcHP6xxHhyRbjrBUsE0e07Vk=" + }, + "nl-ams-203": { + "endpoint4": "169.150.196.28", + "endpoint6": "2a02:6ea0:c034:3::a32f", + "pubkey": "M5z8TKjJYpIJ3FXoXy7k58IUaoVro2tWMKSgC5WIqR8=" + }, "no1": { "endpoint4": "176.125.235.71", "endpoint6": "2a02:20c8:4124::a01f", @@ -1094,6 +1194,26 @@ "endpoint6": "2a02:20c8:4124::a04f", "pubkey": "veeEoYS9a2T6K8WMs/MvRCdNJG580XbhnLfbFjp3B0M=" }, + "no-svg-001": { + "endpoint4": "194.127.199.2", + "endpoint6": "2a02:20c8:4120::a01f", + "pubkey": "kduYoE/b1mA2Pjszx1CzE4Lktsdc2zsUU8Relul2m2U=" + }, + "no-svg-002": { + "endpoint4": "194.127.199.31", + "endpoint6": "2a02:20c8:4120::a02f", + "pubkey": "U9fbFesIIr2HotWdkfMpKyOEPk+RYtE2oYn3KoLmkj4=" + }, + "no-svg-003": { + "endpoint4": "194.127.199.62", + "endpoint6": "2a02:20c8:4120::a03f", + "pubkey": "btc4mh3n9jVCW6yikw3cOPct0x3B5cDK+kKnvgCV0S0=" + }, + "no-svg-004": { + "endpoint4": "194.127.199.93", + "endpoint6": "2a02:20c8:4120::a04f", + "pubkey": "Fu98PLCZw/FTcQqyTy0vzaepkfxuSLAah7wnafGVO1g=" + }, "nz1": { "endpoint4": "103.108.94.34", "endpoint6": "2400:fa80:4:10::a01f", @@ -1124,20 +1244,30 @@ "endpoint6": "2a0d:5600:13:3c::a04f", "pubkey": "fOEmuT2M++Qnk1riHmce8DCriSlO5G5BQZVmzK7tq2E=" }, - "pl5": { + "pl-waw-101": { "endpoint4": "45.134.212.66", "endpoint6": "2a02:6ea0:ce08:1::a05f", - "pubkey": "TYQ2DDoazWSxCO4JvtIdj86YUoQ4g5MfQ/m6lTg5SQQ=" + "pubkey": "fO4beJGkKZxosCZz1qunktieuPyzPnEVKVQNhzanjnA=" }, - "pl6": { + "pl-waw-102": { "endpoint4": "45.134.212.79", "endpoint6": "2a02:6ea0:ce08:2::a06f", - "pubkey": "idpB87uLzIFTwjhBWJ4HnO+biSb3k7UgrpajQoDUP2c=" + "pubkey": "nJEWae9GebEY7yJONXQ1j4gbURV4QULjx388woAlbDs=" }, - "pl7": { + "pl-waw-103": { "endpoint4": "45.134.212.92", "endpoint6": "2a02:6ea0:ce08:3::a07f", - "pubkey": "KtjnCWDsf9R7rJSPUCFEDSE8PFj/t7mEnscCm8DSsBY=" + "pubkey": "07eUtSNhiJ9dQXBmUqFODj0OqhmbKQGbRikIq9f90jM=" + }, + "pl-waw-201": { + "endpoint4": "45.128.38.226", + "endpoint6": "2a0d:5600:13:67::a01f", + "pubkey": "XwFAczY5LdogFwE9soDecXWqywSCDGuRyJhr/0psI00=" + }, + "pl-waw-202": { + "endpoint4": "146.70.144.34", + "endpoint6": "2a0d:5600:13:c47::a02f", + "pubkey": "nyfOkamv1ryTS62lsmyU96cqI0dtqek84DhyxWgAQGY=" }, "pt1": { "endpoint4": "94.46.24.33", @@ -1174,6 +1304,16 @@ "endpoint6": "2a04:9dc0:0:98::a08f", "pubkey": "fdEVvu79A9F/VcI0sDK+7RNWBt1Yg2OYXo7O+fliKF8=" }, + "ro-buh-001": { + "endpoint4": "146.70.124.130", + "endpoint6": "2a04:9dc0:0:133::a01f", + "pubkey": "xpKhRTf9JI269S2PujLbrJm1TwIe67HD5CLe+sP4tUU=" + }, + "ro-buh-002": { + "endpoint4": "146.70.124.194", + "endpoint6": "2a04:9dc0:0:135::a02f", + "pubkey": "Ekc3+qU88FuMfkEMyLlgRqDYv+WHJvUsfOMI/C0ydE4=" + }, "rs3": { "endpoint4": "152.89.160.178", "endpoint6": "2001:ac8:7d:1b::a03f", @@ -1214,11 +1354,6 @@ "endpoint6": "2a03:1b20:1:f410::a18f", "pubkey": "fZFAcd8vqWOBpRqlXifsjzGf16gMTg2GuwKyZtkG6UU=" }, - "se19": { - "endpoint4": "45.83.220.66", - "endpoint6": "2a03:1b20:1:e011::a19f", - "pubkey": "oaIh0j5LHNtoBWeFKOa+l1QBt+fNu2rHN9ALubSakyg=" - }, "se1": { "endpoint4": "193.138.218.220", "endpoint6": "2a03:1b20:1:f410::a01f", @@ -1244,11 +1379,6 @@ "endpoint6": "2a03:1b20:4:f011::a26f", "pubkey": "1493vtFUbIfSpQKRBki/1d0YgWIQwMV4AQAvGxjCNVM=" }, - "se27": { - "endpoint4": "185.195.233.67", - "endpoint6": "2a03:1b20:4:f011::a27f", - "pubkey": "3UPY4O7hJ31aEi9BVWbJTGKK5pjh9lBm++vquG34owo=" - }, "se28": { "endpoint4": "185.195.233.68", "endpoint6": "2a03:1b20:4:f011::a28f", @@ -1294,15 +1424,15 @@ "endpoint6": "2a03:1b20:5:f011::a09f", "pubkey": "BLNHNoGO88LjV/wDBa7CUUwUzPq/fO2UwcGLy56hKy4=" }, - "sg10": { - "endpoint4": "138.199.60.15", - "endpoint6": "2a02:6ea0:d13e:2::a10f", - "pubkey": "He9tN5WZongjobHp7yamvXFVYzRExwFPplqAeq0g4As=" + "se-got-101": { + "endpoint4": "185.213.154.70", + "endpoint6": "2a03:1b20:5:f011::aaaf", + "pubkey": "B8UVAeNkAW4NiGHd1lpl933Drh4y7pMqpXJpH0SrGjQ=" }, - "sg11": { - "endpoint4": "138.199.60.28", - "endpoint6": "2a02:6ea0:d13e:3::a11f", - "pubkey": "dnmvpTXpcFy4SQdrqnHODhD3j0kZ0fijSGtwxvLd0R8=" + "se-sto-001": { + "endpoint4": "185.195.233.76", + "endpoint6": "2a03:1b20:4:f011::999f", + "pubkey": "MkP/Jytkg51/Y/EostONjIN6YaFRpsAYiNKMX27/CAY=" }, "sg4": { "endpoint4": "94.198.43.34", @@ -1329,65 +1459,70 @@ "endpoint6": "2a0a:b640:1:5b::a08f", "pubkey": "VxROoDxnI3XS5DBgXEucl+iEd964v//8p7dHGMWGbkE=" }, - "sg9": { + "sg-sin-001": { "endpoint4": "138.199.60.2", "endpoint6": "2a02:6ea0:d13e:1::a09f", - "pubkey": "EOiOD9V5YFsvhfLIPrrAK5yAcSL2I8raX3JMS+gx5UQ=" + "pubkey": "sFHv/qzG7b6ds5pow+oAR3G5Wqp9eFbBD3BmEGBuUWU=" }, - "sk1": { + "sg-sin-002": { + "endpoint4": "138.199.60.15", + "endpoint6": "2a02:6ea0:d13e:2::a10f", + "pubkey": "WM5I4IFwQcVysM4fF4NXZtQXNrSkqVWkQxNPPygOiF0=" + }, + "sg-sin-003": { + "endpoint4": "138.199.60.28", + "endpoint6": "2a02:6ea0:d13e:3::a11f", + "pubkey": "3HtGdhEXUPKQIDRW49wCUoTK2ZXfq+QfzjfYoldNchg=" + }, + "sk-bts-001": { "endpoint4": "138.199.34.129", "endpoint6": "2a02:6ea0:2901:1::a01f", - "pubkey": "fPs3PsvwF/bxeWaGjsgFh88f/m2cdytuaUTl0o9OllA=" + "pubkey": "QEVIaIycN8p5twXCuZeQTEj9utozakw/MU8H6+/whls=" }, - "sk2": { + "sk-bts-002": { "endpoint4": "138.199.34.143", "endpoint6": "2a02:6ea0:2901::a02f", - "pubkey": "hff2rFJHAyzSPfQMcv/3bL44c7wGy1LYDRvTX+R62Fs=" + "pubkey": "JeEuObwimNmoVtPn4kpMI1y1UM+IChGVBLtmP3CNNVQ=" }, "us101": { "endpoint4": "86.106.121.158", "endpoint6": "2a0d:5600:24:aa5::b01f", - "pubkey": "iuFDwOiNNnWfTmtprPCLscUjonu+KKfXu39TL/SSzh4=" + "pubkey": "UJMSoBnY0wPwiv9vVMJzQJ7OVBWYu/A/Kb1dP3CHk2M=" }, "us102": { "endpoint4": "86.106.121.171", "endpoint6": "2a0d:5600:24:aa6::b02f", - "pubkey": "w/wxejfsFw2YFSYohzUB+Avtw0nW9RAkQjQyLExcfB0=" + "pubkey": "iyizPwlAPqocE5AN8vMpTEaM1AHjWdYMjucq/vWuNlM=" }, "us103": { "endpoint4": "86.106.121.184", "endpoint6": "2a0d:5600:24:aa7::b03f", - "pubkey": "dl5Xf/oCHVDVnzzb5i1/NyAct191DT5qqRtOAJZpOlw=" + "pubkey": "Xn6infIF/0BCHjlHLHLQP4EwQ2U4L3tlTREVCbmrTkU=" }, "us104": { "endpoint4": "86.106.121.197", "endpoint6": "2a0d:5600:24:aa8::b04f", - "pubkey": "7gzFk0q3W/GOUhBRQ/CVaUfYUw4jnH4o83+Q7mRPRFY=" + "pubkey": "M+9Hzk0/OZXjrcrh43cMfoQoPR0gVdfNkzFL3DxafEY=" }, "us105": { "endpoint4": "86.106.121.210", "endpoint6": "2a0d:5600:24:aa9::b05f", - "pubkey": "f2C9CzsFx3nJii34l7i7pXMdpzp9cHEpkCZ3es+S+V4=" + "pubkey": "WiE50yOURC8fidt45l64WcGCbUshydXK5eKodwq2n3U=" }, "us106": { "endpoint4": "86.106.121.223", "endpoint6": "2a0d:5600:24:aaa::b06f", - "pubkey": "vyMlF2Un/Fr1hJC3iYYvyaq1oaVMziCNAhZYkSjbylM=" + "pubkey": "wkO/RF0VeIw4D2ipzo+AB92lHuVHiYZC9b6hIg3jSFY=" }, "us107": { "endpoint4": "86.106.121.236", "endpoint6": "2a0d:5600:24:aab::b07f", - "pubkey": "EZGBydcOeP/lS3jXfkVohMG78z9qUx4SqLFQVMONSSM=" + "pubkey": "NS1nBz5b5vY0kX8lhws8ThLL5a2YKf/imbf3DwAeOCQ=" }, "us108": { "endpoint4": "86.106.121.249", "endpoint6": "2a0d:5600:24:aac::b08f", - "pubkey": "Sq5u3QIxgLGvoo9sCv5revDYTNKcGFzmeip4DnKcpCE=" - }, - "us109": { - "endpoint4": "89.45.224.2", - "endpoint6": "2a0d:5600:24:aad::b09f", - "pubkey": "TWKuLyEKPghVo5xdjzA5X2TWjpLlzATC0Sd2VFSWNDQ=" + "pubkey": "amrczbHyG3drrWZWNmqTQgvYgai/b+S0koW8gw3T30I=" }, "us10": { "endpoint4": "198.54.128.82", @@ -1397,52 +1532,52 @@ "us110": { "endpoint4": "89.45.224.15", "endpoint6": "2a0d:5600:24:aae::b10f", - "pubkey": "tT4SYF5SX0U9nVjC/9HWIqrvixReJCgkqawvk2CJiW8=" + "pubkey": "lUVsbRT2Hr5TrBpJ10A+5CELy3vBuQD6T9U8ugGjjxg=" }, "us111": { "endpoint4": "89.45.224.28", "endpoint6": "2a0d:5600:24:aaf::b11f", - "pubkey": "r03nZ+5rVtqatadUs783W1LU6WInJlpbjW3r8E2MPzo=" + "pubkey": "D/RNeclyNIc/7MYYiPVem8b7fq6dl7CBXWKiGuxeI24=" }, "us112": { "endpoint4": "89.45.224.41", "endpoint6": "2a0d:5600:24:ab1::b12f", - "pubkey": "K2chJLdNAgSOLlBXA3aHDwKxxpPaqcgp6XGN8yRYPl8=" + "pubkey": "hlORU2FfEiLVKZ6l+Y+xTl1jb2RJ44Zkx0Yo1fu25F0=" }, "us113": { "endpoint4": "89.45.224.54", "endpoint6": "2a0d:5600:24:ab2::b13f", - "pubkey": "IJ4cae+w9SuGUmYbkH1jwnTCQ6bbphUG2cM1UpP96Ek=" + "pubkey": "j1+O4eNoLsYijHy0chsS3JooJ5kIBSb4eiJnYjRfBSk=" }, "us114": { "endpoint4": "89.45.224.67", "endpoint6": "2a0d:5600:24:ab3::b14f", - "pubkey": "OjMVxFNSRjZC5dwCU+hK6oEGOF9rZBE3GbJ7Y1CkFmM=" + "pubkey": "MiLbvPXMv8Wj6P28gibGTyqHDPMHRnDSQud2/w/EpF4=" }, "us115": { "endpoint4": "89.45.224.80", "endpoint6": "2a0d:5600:24:ab4::b15f", - "pubkey": "HfvVMtGke52M9yqqQvuIEwd0NxXAfe0ZqgHLPqT9ShE=" + "pubkey": "AhBAK9BM0hsgwTO87ym060O+MUJRMGkzRQh7NbmVk10=" }, "us116": { "endpoint4": "89.45.224.93", "endpoint6": "2a0d:5600:24:ab5::b16f", - "pubkey": "sIB3ajbcYSGYby0JJO7l8zjZMm/FbqHZh620Ln4spTQ=" + "pubkey": "vSAviJq8DWTRqHcpXWgyEP12mG99IW76SvnPPI9scxY=" }, "us117": { "endpoint4": "89.45.224.106", "endpoint6": "2a0d:5600:24:ab6::b17f", - "pubkey": "gW5zLgLNCtypRmHfeSIHN5j1SS7ymoUqjt7YBhVWZkg=" + "pubkey": "mvbH1lEY18SLbkh1yOoKGKJr7uxKEl8G92bxkmyulCg=" }, "us118": { "endpoint4": "89.45.224.119", "endpoint6": "2a0d:5600:24:ab7::b18f", - "pubkey": "jaJS7IFuOco51K89tEkrabi80CC4gOdf+1y8NjWFw30=" + "pubkey": "3z24/Gh6esJfpndNxnUmexwjsINfIQOPH+NDPNKemVs=" }, "us119": { "endpoint4": "89.45.224.132", "endpoint6": "2a0d:5600:24:ab8::b19f", - "pubkey": "3akIB2iC31EHstfYVYILp6l6kavjnZ8a66xAxujHNF4=" + "pubkey": "d7//MrBJQIozdjePL7P3QnzqfcLfDnwW0UxvcrnA9Ws=" }, "us11": { "endpoint4": "198.54.128.90", @@ -1452,42 +1587,42 @@ "us120": { "endpoint4": "89.45.224.145", "endpoint6": "2a0d:5600:24:ab9::b20f", - "pubkey": "WNAKxc1A0oHd2CwxBhsbErLYxIau28YuRp9f3QUtUkA=" + "pubkey": "MvddXAa3aXgVT54Jc9sT9YFw/ZCEh8VWZkJbxnadRQY=" }, "us121": { "endpoint4": "89.45.224.158", "endpoint6": "2a0d:5600:24:aba::b21f", - "pubkey": "hbLv5Ec+ebWkLfpMkrfQi3yBZt+QtzUM73A21/KsXDk=" + "pubkey": "PlgdYkuyERUOOBUBlBFt+S/FyvU1YOTsQWobC3Fl70A=" }, "us122": { "endpoint4": "89.45.224.171", "endpoint6": "2a0d:5600:24:abb::b22f", - "pubkey": "xGN1FCQVDNywOx6124UCdh2Us1iBu/2FzVNhVOjJMj4=" + "pubkey": "rkG5usMK3vr7PvwV7Cco3+EJ2PDaOTSw67vB72tc9ig=" }, "us123": { "endpoint4": "89.45.224.184", "endpoint6": "2a0d:5600:24:abc::b23f", - "pubkey": "btzdd6JSFFCnkmCd49zXWrIDEo1wZvxLSfqvF2eilX0=" + "pubkey": "CgjcZsG3LQxmfEQVuzHpLKAetyB/AGiyT/O5UuO+KgE=" }, "us124": { "endpoint4": "89.45.224.197", "endpoint6": "2a0d:5600:24:abd::b24f", - "pubkey": "PHYy+c8lDKwU1A2LYw6mZKXOuxR2+6DPrBv4hd9auSA=" + "pubkey": "45hQDC8nOLC0Aa1utKNJTETNanbEzpvlJhdQ/jjuQTI=" }, "us125": { "endpoint4": "89.45.224.210", "endpoint6": "2a0d:5600:24:abe::b25f", - "pubkey": "J8QaV8tZyFBrb9atVg3mI2Vb3/DtWVJSHFYSrdy6w2w=" + "pubkey": "6pO+0KxNHjzB5XuW4U0NYiuVSuZJ0cX50Fav38BLFAo=" }, "us126": { "endpoint4": "89.45.224.223", "endpoint6": "2a0d:5600:24:abf::b26f", - "pubkey": "gBNBBb4vgJG4NX0/nCs8bdkVshQGadVA8YTHr+0+aFo=" + "pubkey": "8gzcDfKpG+MxQbz7waFfo9oQstqppes8ebTrEYrFST8=" }, "us127": { "endpoint4": "89.45.224.236", "endpoint6": "2a0d:5600:24:ac1::b27f", - "pubkey": "aUn8FOe9q2LSm41mi9b4VXTIOISaDT4hfUqDnzk4Jk0=" + "pubkey": "P/oO8/UBL5rUEUt5CZieP9khFOJaUV6hwRm42biy2TI=" }, "us128": { "endpoint4": "68.235.44.2", @@ -1754,11 +1889,6 @@ "endpoint6": "2607:9000:5000:17::b79f", "pubkey": "+DIu6EMVk9QEsy6/NppxcDjuLSG6rTJ3TywYN3wXDkQ=" }, - "us17": { - "endpoint4": "50.2.184.146", - "endpoint6": "2607:ff28:800f:10::a02f", - "pubkey": "XihrmIgj3/yCGr/NW0wNJm9haS3FQl6p5MvSB8mWdjc=" - }, "us180": { "endpoint4": "198.54.131.130", "endpoint6": "2607:9000:5000:18::b80f", @@ -1834,36 +1964,6 @@ "endpoint6": "2607:9000:7000:20::b94f", "pubkey": "Zs07i3DIinREejSjUA7dXpDZvu00YRVNJakTEgckpVs=" }, - "us195": { - "endpoint4": "198.54.134.82", - "endpoint6": "2607:9000:8000:15::b95f", - "pubkey": "7PBJv+IH8NbH1WTCbptgzghi8hH7E8WsrqVH/cl0FBY=" - }, - "us196": { - "endpoint4": "198.54.134.98", - "endpoint6": "2607:9000:8000:16::b96f", - "pubkey": "3mQ+bBKGgX+7eunw64OhpWUz+UHL7Is2fcJWXO5UHQY=" - }, - "us197": { - "endpoint4": "198.54.134.114", - "endpoint6": "2607:9000:8000:17::b97f", - "pubkey": "U20kRb33zBR15Gsd6bP9hQccDL0O4HysxMa5QjubxC0=" - }, - "us198": { - "endpoint4": "198.54.134.130", - "endpoint6": "2607:9000:8000:18::b98f", - "pubkey": "e66QrzHRv/dFmGj8dyGEKxaZiC6Vt3MzLiiRcYJqVjQ=" - }, - "us199": { - "endpoint4": "198.54.134.146", - "endpoint6": "2607:9000:8000:19::b99f", - "pubkey": "FSd0QIqNsLGf+B/IqQzg9wyjKpfVwXiy/P9vt8Zylmg=" - }, - "us200": { - "endpoint4": "198.54.134.162", - "endpoint6": "2607:9000:8000:20::c00f", - "pubkey": "jHaXA+nq2od3uwNPzOUuGeLTuXBTTyXdPsi0lib4pVg=" - }, "us201": { "endpoint4": "66.115.165.211", "endpoint6": "2607:f7a0:16:5::c01f", @@ -1974,11 +2074,6 @@ "endpoint6": "2607:fcd0:bb80:402::b31f", "pubkey": "tZzQt3tfqG+yZlvbcqPuUtwM23mKiI7ncNnKV8/+7xM=" }, - "us232": { - "endpoint4": "66.63.167.114", - "endpoint6": "2607:fcd0:bb80:403::b32f", - "pubkey": "Ou6ayqTmV9H8rf2waNbaJKsGCRy4NjcvCZjgJPvtx0Y=" - }, "us233": { "endpoint4": "104.129.24.98", "endpoint6": "2607:fcd0:aa80:1302::b33f", @@ -2027,7 +2122,7 @@ "us241": { "endpoint4": "23.226.135.50", "endpoint6": "2607:fcd0:ccc0:1d05::c41f", - "pubkey": "5njOFkRNvSm3C3FOCvdvicXjf7/4kEYFGOtU2sy0ThU=" + "pubkey": "G+dXbJ9kpsiJSDN+wcS6/nRH+O9nYCMZi8KgL7QiPE0=" }, "us242": { "endpoint4": "69.174.103.162", @@ -2039,16 +2134,6 @@ "endpoint6": "2607:fcd0:aa80:1305::b43f", "pubkey": "7SsdOV15w0po1smXcXYlX9F+bjDHt3mbrZk8zgl0uh4=" }, - "us244": { - "endpoint4": "66.63.167.162", - "endpoint6": "2607:fcd0:bb80:404::b44f", - "pubkey": "JzNqgbWfRSnPjiktdB9XnuErkg8WY9P+oN+J62D9/1Q=" - }, - "us245": { - "endpoint4": "66.63.167.146", - "endpoint6": "2607:fcd0:bb80:405::b45f", - "pubkey": "4VYPzFR+2bgw2g8pKwJlF3vUm4sKo51m3D72ruBua0s=" - }, "us246": { "endpoint4": "198.54.135.34", "endpoint6": "2607:9000:9000:12::b46f", @@ -2084,6 +2169,11 @@ "endpoint6": "2a02:6ea0:c43f:2::b52f", "pubkey": "eR7g2lqwupyyhHWEIV67k/SEHRF2AtQ1bIac6m8ClmY=" }, + "us253": { + "endpoint4": "37.19.221.130", + "endpoint6": "2a02:6ea0:e001::b53f", + "pubkey": "iBNkQJyjw1iTZ9P7XxODXQgUXLqfGTVRjos3eQ+6jGk=" + }, "us254": { "endpoint4": "37.19.221.143", "endpoint6": "2a02:6ea0:e001:1::b54f", @@ -2094,11 +2184,6 @@ "endpoint6": "2a02:6ea0:e001:2::b55f", "pubkey": "arh7i4ptcw/4pzHLSJgfH5B5GI7c4J8yaZ3UJbch3X8=" }, - "us256": { - "endpoint4": "37.19.221.169", - "endpoint6": "2a02:6ea0:e001:3::b56f", - "pubkey": "STIUJn8A0SY8caTGd6rZFt2GLO79iZVY6HCYJ+kYMWw=" - }, "us257": { "endpoint4": "37.19.210.1", "endpoint6": "2a02:6ea0:d70a::b57f", @@ -2124,11 +2209,6 @@ "endpoint6": "2a02:6ea0:cc1f:1::b61f", "pubkey": "bPWuD5x0UiL5ygkIY7g0bBlYlF93HPGyao8oZC+rpV4=" }, - "us262": { - "endpoint4": "45.134.142.219", - "endpoint6": "2a02:6ea0:cc1f:2::b62f", - "pubkey": "m4oIpBxNQLJJUMmOqq/bjPMmIBrkJhrY8gnL07s2Olk=" - }, "us263": { "endpoint4": "87.249.134.1", "endpoint6": "2a02:6ea0:c61f::b63f", @@ -2144,26 +2224,6 @@ "endpoint6": "2a02:6ea0:c61f:2::b65f", "pubkey": "E7RPtlWcWKVhvLmqPBLPb8P5mmsf847wpJCcwKwrj2E=" }, - "us266": { - "endpoint4": "142.147.89.195", - "endpoint6": "2604:e8c0:7::b66f", - "pubkey": "Om8AEOXjMke1QiCWNhlXDwgOqVudV8nV5vnzAuCUbgI=" - }, - "us267": { - "endpoint4": "142.147.89.210", - "endpoint6": "2604:e8c0:7::b67f", - "pubkey": "+Mr9wOLNPhQ8L/M4uN5YDGSlJzWvPh2SG9cbAu3kBxs=" - }, - "us268": { - "endpoint4": "142.147.89.225", - "endpoint6": "2604:e8c0:7::b68f", - "pubkey": "ACFcenuLuWKHpyWIrnF9iU0RQqRDXvy93Uvz+RjBghg=" - }, - "us269": { - "endpoint4": "142.147.89.240", - "endpoint6": "2604:e8c0:7::b69f", - "pubkey": "+JJBzQMxFFQ2zu+WN8rbFH4ZpqY2u6WNBGBFHwsxkzs=" - }, "us270": { "endpoint4": "37.19.200.130", "endpoint6": "2a02:6ea0:d20c:1::b70f", @@ -2174,26 +2234,11 @@ "endpoint6": "2a02:6ea0:d20c:2::b71f", "pubkey": "sPi2QiA6l7mamZYtgLnEgPIQ6g8cqEpx4SBimVVgPnA=" }, - "us272": { - "endpoint4": "37.19.200.156", - "endpoint6": "2a02:6ea0:d20c:3::b72f", - "pubkey": "hkNRfPW5rqrjP3WLfO9XfNoRKavUs/rVg6KBK/MiaFc=" - }, - "us273": { - "endpoint4": "138.199.43.65", - "endpoint6": "2a02:6ea0:d80b:1::b73f", - "pubkey": "DsLLwr1DSaxSxvkc4TcYW2WUKJqbAcfLBJb/fYvRMDc=" - }, "us274": { "endpoint4": "138.199.43.78", "endpoint6": "2a02:6ea0:d80b:2::b74f", "pubkey": "ujasJmDuU0t4y6JmBLrdDxakKuaHvPRupRDfyywSWyw=" }, - "us275": { - "endpoint4": "138.199.43.91", - "endpoint6": "2a02:6ea0:d80b:3::b75f", - "pubkey": "qPLwDs9Mzk9Oi+7hoLWUm67Ec0pLPxAs0eQ8I0m6+Go=" - }, "us276": { "endpoint4": "198.44.136.34", "endpoint6": "2607:9000:a000:12::b76f", @@ -2553,5 +2598,125 @@ "endpoint4": "86.106.143.236", "endpoint6": "2a0d:5600:24:a96::a99f", "pubkey": "EPLh6pVel06dND8cE4Prix9GP4hGLYNhQhn5mSN2yzM=" + }, + "us-chi-101": { + "endpoint4": "66.63.167.114", + "endpoint6": "2607:fcd0:bb80:403::b32f", + "pubkey": "P1Y04kVMViwZrMhjcX8fDmuVWoKl3xm2Hv/aQOmPWH0=" + }, + "us-chi-103": { + "endpoint4": "66.63.167.162", + "endpoint6": "2607:fcd0:bb80:404::b44f", + "pubkey": "GO7SMFDm9Z29PLeX7cw8QndfUsdAe3jYQ8zDr91zt0U=" + }, + "us-dal-401": { + "endpoint4": "37.19.200.156", + "endpoint6": "2a02:6ea0:d20c:3::b72f", + "pubkey": "xZsnCxFN7pOvx6YlTbi92copdsY5xgekTCp//VUMyhE=" + }, + "us-hou-004": { + "endpoint4": "37.19.221.169", + "endpoint6": "2a02:6ea0:e001:3::b56f", + "pubkey": "NkZMYUEcHykPkAFdm3dE8l2U9P2mt58Dw6j6BWhzaCc=" + }, + "us-lax-001": { + "endpoint4": "89.46.114.197", + "endpoint6": "2a0d:5600:8:e::a02f", + "pubkey": "Ev1YD8MjlDPEfx2I1koG82QvUKGdttym/Sxu0+Udu1g=" + }, + "us-lax-201": { + "endpoint4": "169.150.203.2", + "endpoint6": "2a02:6ea0:c859:1::a01f", + "pubkey": "xWobY7DWTL+vL1yD4NWwbQ3V4e8qz10Yz+EFdkIjq0Y=" + }, + "us-lax-202": { + "endpoint4": "169.150.203.15", + "endpoint6": "2a02:6ea0:c859:2::a02f", + "pubkey": "SDnciTlujuy2APFTkhzfq5X+LDi+lhfU38wI2HBCxxs=" + }, + "us-lax-203": { + "endpoint4": "169.150.203.28", + "endpoint6": "2a02:6ea0:c859:3::a03f", + "pubkey": "W6/Yamxmfx3geWTwwtBbJe/J8UdEzOfa6M+cEpNPIwg=" + }, + "us-mia-001": { + "endpoint4": "45.134.142.219", + "endpoint6": "2a02:6ea0:cc1f:2::b62f", + "pubkey": "FVEKAMJqaJU2AwWn5Mg9TK9IAfJc4XDUmSzEeC/VXGs=" + }, + "us-qas-101": { + "endpoint4": "185.156.46.130", + "endpoint6": "2a02:6ea0:e206:1::a01f", + "pubkey": "NODBnzBgLO5Itv+HOyQer7jpVn1UdCKfv9uwAAvvMkA=" + }, + "us-qas-102": { + "endpoint4": "185.156.46.143", + "endpoint6": "2a02:6ea0:e206:2::a02f", + "pubkey": "5hlEb3AjTzVIJyYWCYvJvbgA4p25Ltfp2cYnys90LQ0=" + }, + "us-qas-103": { + "endpoint4": "185.156.46.156", + "endpoint6": "2a02:6ea0:e206:3::a03f", + "pubkey": "oD9IFZsA5sync37K/sekVXaww76MwA3IvDRpR/irZWQ=" + }, + "us-sea-001": { + "endpoint4": "138.199.43.91", + "endpoint6": "2a02:6ea0:d80b:3::b75f", + "pubkey": "bZQF7VRDRK/JUJ8L6EFzF/zRw2tsqMRk6FesGtTgsC0=" + }, + "us-sea-003": { + "endpoint4": "138.199.43.65", + "endpoint6": "2a02:6ea0:d80b:1::b73f", + "pubkey": "4ke8ZSsroiI6Sp23OBbMAU6yQmdF3xU2N8CyzQXE/Qw=" + }, + "us-sjc-001": { + "endpoint4": "198.54.134.82", + "endpoint6": "2607:9000:8000:15::b95f", + "pubkey": "Ow25Pdtyqbv/Y0I0myNixjJ2iljsKcH04PWvtJqbmCk=" + }, + "us-sjc-002": { + "endpoint4": "198.54.134.98", + "endpoint6": "2607:9000:8000:16::b96f", + "pubkey": "aOt3gFGc0a0UMAdcxhBWX9TCnEabe2s66MHzjXU50Tc=" + }, + "us-sjc-003": { + "endpoint4": "198.54.134.114", + "endpoint6": "2607:9000:8000:17::b97f", + "pubkey": "Vim/OUBT3Bogv+FF623pAHXc/vmRwur2JKcNsLHQH1o=" + }, + "us-sjc-004": { + "endpoint4": "198.54.134.130", + "endpoint6": "2607:9000:8000:18::b98f", + "pubkey": "lPnCLtB/gjy6Bw3Ah56z1k5pD93GezPGDCR+dO+Lhyk=" + }, + "us-sjc-005": { + "endpoint4": "198.54.134.146", + "endpoint6": "2607:9000:8000:19::b99f", + "pubkey": "L8b2Ju1C0uiHiRgz0dl9hUxuWxXn8TsAOPuGJyfMPnk=" + }, + "us-sjc-006": { + "endpoint4": "198.54.134.162", + "endpoint6": "2607:9000:8000:20::c00f", + "pubkey": "rmcpQE8UFN6cdvIsSnOGXG2tLde/F1eQD7mrc0mEhz4=" + }, + "us-sjc-301": { + "endpoint4": "142.147.89.195", + "endpoint6": "2604:e8c0:7::b66f", + "pubkey": "f3bMFNG3xcXRN/i0jHxo68CXFcNNlennuf1jdkPMEVM=" + }, + "us-sjc-302": { + "endpoint4": "142.147.89.210", + "endpoint6": "2604:e8c0:7::b67f", + "pubkey": "8wVb4HUgmpQEa5a1Q8Ff1hTDTJVaHts487bksJVugEo=" + }, + "us-sjc-303": { + "endpoint4": "142.147.89.225", + "endpoint6": "2604:e8c0:7::b68f", + "pubkey": "2ZQTRk/3jT+ccfG3G/QoJV3NFC4CFHQwGBCSokOvBnA=" + }, + "us-sjc-304": { + "endpoint4": "142.147.89.240", + "endpoint6": "2604:e8c0:7::b69f", + "pubkey": "NOTCmusO1jXEHv8MnEGnuANdjgkw45CZWB9VQmNEqGA=" } } diff --git a/modules/mullvad/update.sh b/modules/mullvad/update.sh index cd458d6..5010c41 100755 --- a/modules/mullvad/update.sh +++ b/modules/mullvad/update.sh @@ -3,7 +3,7 @@ # it into a format that takes up less space than the original response. set -euo pipefail curl -s 'https://api.mullvad.net/www/relays/wireguard/' | jq '. | map({ - key: .hostname | split("-")[0], + key: (if .hostname | endswith("-wireguard") then .hostname | split("-")[0] else .hostname | sub("-wg-"; "-") end), value: { endpoint4: .ipv4_addr_in, endpoint6: .ipv6_addr_in, diff --git a/users/simon/modules/sway/waybar.nix b/users/simon/modules/sway/waybar.nix index cc10ce7..2612a14 100644 --- a/users/simon/modules/sway/waybar.nix +++ b/users/simon/modules/sway/waybar.nix @@ -183,7 +183,7 @@ in exec = pkgs.writeShellScript "vpn-state" '' ${pkgs.iproute}/bin/ip -j link \ | ${pkgs.jq}/bin/jq --unbuffered --compact-output ' - [[.[].ifname | select(. | startswith("mullvad"))][] | split("-")[1] + " ${thinsp}"] as $conns + [[.[].ifname | select(. | startswith("mlv"))][] | sub("mlv-"; "") + " ${thinsp}"] as $conns | { text: ($conns[0] // ""), class: (if $conns | length > 0 then "connected" else "disconnected" end) }' ''; return-type = "json";