From b3453bbea901ed02ce3b458883f2f8ab03afc161 Mon Sep 17 00:00:00 2001 From: "kali kaneko (leap communications)" Date: Tue, 9 Nov 2021 19:28:46 +0100 Subject: [pkg] riseup beta provider --- debian/changelog | 4 ++-- pkg/vpn/bonafide/bonafide.go | 2 ++ providers/riseupbeta/assets | 1 + providers/riseupbeta/riseupbeta-ca.crt | 10 ++++++++++ providers/vendor.conf | 19 +++++++++++++++++++ 5 files changed, 34 insertions(+), 2 deletions(-) create mode 120000 providers/riseupbeta/assets create mode 100644 providers/riseupbeta/riseupbeta-ca.crt diff --git a/debian/changelog b/debian/changelog index 5befd48..ba6227a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ -riseup-vpn (0.21.6~focal+5) focal; urgency=medium +riseup-vpn (0.21.10+1) hirsute; urgency=medium - * Release 0.21.6 + * Release 0.21.10 -- Kali Kaneko (leap communications) Tue, 22 Jun 2021 18:26:53 +0200 diff --git a/pkg/vpn/bonafide/bonafide.go b/pkg/vpn/bonafide/bonafide.go index cff5fc2..b4e6af0 100644 --- a/pkg/vpn/bonafide/bonafide.go +++ b/pkg/vpn/bonafide/bonafide.go @@ -79,6 +79,8 @@ func getAPIAddr(provider string) string { switch provider { case "riseup.net": return "198.252.153.107" + case "float.hexacab.org": + return "198.252.153.106" case "calyx.net": return "162.247.73.194" default: diff --git a/providers/riseupbeta/assets b/providers/riseupbeta/assets new file mode 120000 index 0000000..becab2c --- /dev/null +++ b/providers/riseupbeta/assets @@ -0,0 +1 @@ +../riseup/assets \ No newline at end of file diff --git a/providers/riseupbeta/riseupbeta-ca.crt b/providers/riseupbeta/riseupbeta-ca.crt new file mode 100644 index 0000000..4f801cc --- /dev/null +++ b/providers/riseupbeta/riseupbeta-ca.crt @@ -0,0 +1,10 @@ +-----BEGIN CERTIFICATE----- +MIIBYjCCAQigAwIBAgIBATAKBggqhkjOPQQDAjAXMRUwEwYDVQQDEwxMRUFQIFJv +b3QgQ0EwHhcNMjExMTAyMTkwNTM3WhcNMjYxMTAyMTkxMDM3WjAXMRUwEwYDVQQD +EwxMRUFQIFJvb3QgQ0EwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQxOXBGu+gf +pjHzVteGTWL6XnFxtEnKMFpKaJkA/VOHmESzoLsZRQxt88GssxaqC01J17idQiqv +zgNpedmtvFtyo0UwQzAOBgNVHQ8BAf8EBAMCAqQwEgYDVR0TAQH/BAgwBgEB/wIB +ATAdBgNVHQ4EFgQUZdoUlJrCIUNFrpffAq+LQjnwEz4wCgYIKoZIzj0EAwIDSAAw +RQIgfr3w4tnRG+NdI3LsGPlsRktGK20xHTzsB3orB0yC6cICIQCB+/9y8nmSStfN +VUMUyk2hNd7/kC8nL222TTD7VZUtsg== +-----END CERTIFICATE----- diff --git a/providers/vendor.conf b/providers/vendor.conf index 9c2bdd7..fa2f60c 100644 --- a/providers/vendor.conf +++ b/providers/vendor.conf @@ -80,3 +80,22 @@ helpURL = https://float.bitmask.net/ geolocationAPI = https://menshen.float.bitmask.net/json askForDonations = false donateURL = + +[riseupbeta] + +name = riseupbeta +applicationName = RiseupVPN +binaryName = riseup-vpn +auth = anon + +providerURL = float.hexacab.org +apiURL = https://api.float.hexacab.org:4430/ +caURL = https://api.float.hexacab.org/ca.crt + +infoURL = https://float.hexacab.org/ +tosURL = https://float.hexacab.org/ +helpURL = https://float.hexacab.org/ + +geolocationAPI = https://menshen.float.hexacab.org/json +askForDonations = true +donateURL = https://riseup.net/vpn/donate -- cgit v1.2.3