diff options
| -rw-r--r-- | branding/config/vendor.conf | 7 | ||||
| -rw-r--r-- | gui/providers/providers.json | 32 | ||||
| -rw-r--r-- | pkg/config/gui.go | 3 |
3 files changed, 19 insertions, 23 deletions
diff --git a/branding/config/vendor.conf b/branding/config/vendor.conf index d142852..d9e6a25 100644 --- a/branding/config/vendor.conf +++ b/branding/config/vendor.conf @@ -1,8 +1,6 @@ [default] -provider = demolib -bitmask-providers = [riseup, calyx] - +provider = riseup [riseup] @@ -20,7 +18,6 @@ tosURL = https://riseup.net/tos helpURL = https://riseup.net/support geolocationAPI = https://api.black.riseup.net:9001/json - askForDonations = true donateURL = https://riseup.net/vpn/donate @@ -41,7 +38,6 @@ tosURL = https://calyx.net/tos helpURL = https://calyx.net/support geolocationAPI = https://api.black.riseup.net:9001/json - askForDonations = false donateURL = @@ -63,6 +59,5 @@ tosURL = https://libraryvpn.org/ helpURL = https://libraryvpn.org/ geolocationAPI = https://getmyip.vpnlib.bitmask.net/json - askForDonations = false donateURL = diff --git a/gui/providers/providers.json b/gui/providers/providers.json index 3951bdd..d27a11c 100644 --- a/gui/providers/providers.json +++ b/gui/providers/providers.json @@ -1,21 +1,21 @@ { - "default": "demolib", + "default": "riseup", "providers": [ { - "name": "demolib", - "applicationName": "DemoLibVPN", - "binaryName": "demolib-vpn", - "auth": "sip", - "authEmptyPass": true, - "providerURL": "vpnlib.bitmask.net", - "tosURL": "https://libraryvpn.org/", - "helpURL": "https://libraryvpn.org/", - "askForDonations": false, - "donateURL": "", - "apiURL": "https://api.vpnlib.bitmask.net:4430/", - "geolocationAPI": "https://getmyip.vpnlib.bitmask.net/json", - "caCertString": "-----BEGIN CERTIFICATE-----\nMIIBQzCB6aADAgECAgEBMAoGCCqGSM49BAMCMBcxFTATBgNVBAMTDExFQVAgUm9v\ndCBDQTAeFw0yMDA4MDYxOTA3NDRaFw0yNTA4MDYxOTEyNDRaMBcxFTATBgNVBAMT\nDExFQVAgUm9vdCBDQTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABIG5POr4cAdK\nkTavKpSJr8nW1V7HLpr27qKaShpk1TUy5ipaAlusmavGLxKsPE+i3AMlvf/f6ch3\n1MjAtIf5rYujJjAkMA4GA1UdDwEB/wQEAwICpDASBgNVHRMBAf8ECDAGAQH/AgEB\nMAoGCCqGSM49BAMCA0kAMEYCIQDXj280LNZbSbi0Y2WvtQrJBUw4wdm8qAeOeuH7\n6XiLEwIhAPBRsmst/ujcChsG2t6LpG+p8s4rfIfh8YLo/4qrcc5p\n-----END CERTIFICATE-----", - "timeStamp": "2020-09-25 13:05:47" + "name": "Riseup", + "applicationName": "RiseupVPN", + "binaryName": "riseup-vpn", + "auth": "anon", + "authEmptyPass": null, + "providerURL": "riseup.net", + "tosURL": "https://riseup.net/tos", + "helpURL": "https://riseup.net/support", + "askForDonations": "true", + "donateURL": "https://riseup.net/vpn/donate", + "apiURL": "https://api.black.riseup.net/", + "geolocationAPI": "https://api.black.riseup.net:9001/json", + "caCertString": "-----BEGIN CERTIFICATE-----\nMIIFjTCCA3WgAwIBAgIBATANBgkqhkiG9w0BAQ0FADBZMRgwFgYDVQQKDA9SaXNl\ndXAgTmV0d29ya3MxGzAZBgNVBAsMEmh0dHBzOi8vcmlzZXVwLm5ldDEgMB4GA1UE\nAwwXUmlzZXVwIE5ldHdvcmtzIFJvb3QgQ0EwHhcNMTQwNDI4MDAwMDAwWhcNMjQw\nNDI4MDAwMDAwWjBZMRgwFgYDVQQKDA9SaXNldXAgTmV0d29ya3MxGzAZBgNVBAsM\nEmh0dHBzOi8vcmlzZXVwLm5ldDEgMB4GA1UEAwwXUmlzZXVwIE5ldHdvcmtzIFJv\nb3QgQ0EwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC76J4ciMJ8Sg0m\nTP7DF2DT9zNe0Csk4myoMFC57rfJeqsAlJCv1XMzBmXrw8wq/9z7XHv6n/0sWU7a\n7cF2hLR33ktjwODlx7vorU39/lXLndo492ZBhXQtG1INMShyv+nlmzO6GT7ESfNE\nLliFitEzwIegpMqxCIHXFuobGSCWF4N0qLHkq/SYUMoOJ96O3hmPSl1kFDRMtWXY\niw1SEKjUvpyDJpVs3NGxeLCaA7bAWhDY5s5Yb2fA1o8ICAqhowurowJpW7n5ZuLK\n5VNTlNy6nZpkjt1QycYvNycffyPOFm/Q/RKDlvnorJIrihPkyniV3YY5cGgP+Qkx\nHUOT0uLA6LHtzfiyaOqkXwc4b0ZcQD5Vbf6Prd20Ppt6ei0zazkUPwxld3hgyw58\nm/4UIjG3PInWTNf293GngK2Bnz8Qx9e/6TueMSAn/3JBLem56E0WtmbLVjvko+LF\nPM5xA+m0BmuSJtrD1MUCXMhqYTtiOvgLBlUm5zkNxALzG+cXB28k6XikXt6MRG7q\nhzIPG38zwkooM55yy5i1YfcIi5NjMH6A+t4IJxxwb67MSb6UFOwg5kFokdONZcwj\nshczHdG9gLKSBIvrKa03Nd3W2dF9hMbRu//STcQxOailDBQCnXXfAATj9pYzdY4k\nha8VCAREGAKTDAex9oXf1yRuktES4QIDAQABo2AwXjAdBgNVHQ4EFgQUC4tdmLVu\nf9hwfK4AGliaet5KkcgwDgYDVR0PAQH/BAQDAgIEMAwGA1UdEwQFMAMBAf8wHwYD\nVR0jBBgwFoAUC4tdmLVuf9hwfK4AGliaet5KkcgwDQYJKoZIhvcNAQENBQADggIB\nAGzL+GRnYu99zFoy0bXJKOGCF5XUXP/3gIXPRDqQf5g7Cu/jYMID9dB3No4Zmf7v\nqHjiSXiS8jx1j/6/Luk6PpFbT7QYm4QLs1f4BlfZOti2KE8r7KRDPIecUsUXW6P/\n3GJAVYH/+7OjA39za9AieM7+H5BELGccGrM5wfl7JeEz8in+V2ZWDzHQO4hMkiTQ\n4ZckuaL201F68YpiItBNnJ9N5nHr1MRiGyApHmLXY/wvlrOpclh95qn+lG6/2jk7\n3AmihLOKYMlPwPakJg4PYczm3icFLgTpjV5sq2md9bRyAg3oPGfAuWHmKj2Ikqch\nTd5CHKGxEEWbGUWEMP0s1A/JHWiCbDigc4Cfxhy56CWG4q0tYtnc2GMw8OAUO6Wf\nXu5pYKNkzKSEtT/MrNJt44tTZWbKV/Pi/N2Fx36my7TgTUj7g3xcE9eF4JV2H/sg\ntsK3pwE0FEqGnT4qMFbixQmc8bGyuakr23wjMvfO7eZUxBuWYR2SkcP26sozF9PF\ntGhbZHQVGZUTVPyvwahMUEhbPGVerOW0IYpxkm0x/eaWdTc4vPpf/rIlgbAjarnJ\nUN9SaWRlWKSdP4haujnzCoJbM7dU9bjvlGZNyXEekgeT0W2qFeGGp+yyUWw8tNsp\n0BuC1b7uW/bBn/xKm319wXVDvBgZgcktMolak39V7DVO\n-----END CERTIFICATE-----", + "timeStamp": "2020-10-06 18:29:40" } ] -} +}
\ No newline at end of file diff --git a/pkg/config/gui.go b/pkg/config/gui.go index 3df1197..f5ae7a2 100644 --- a/pkg/config/gui.go +++ b/pkg/config/gui.go @@ -24,6 +24,7 @@ import ( const ( oneDay = time.Hour * 24 + oneWeek = oneDay * 7 oneMonth = oneDay * 30 ) @@ -72,7 +73,7 @@ func (c *Config) SetUserStoppedVPN(vpnStopped bool) error { } func (c *Config) NeedsDonationReminder() bool { - return !c.hasDonated() && c.file.LastReminded.Add(oneDay).Before(time.Now()) + return !c.hasDonated() && c.file.LastReminded.Add(oneWeek).Before(time.Now()) } func (c *Config) hasDonated() bool { |