summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcyberta <cyberta@riseup.net>2023-01-03 14:50:27 +0000
committercyberta <cyberta@riseup.net>2023-01-03 14:50:27 +0000
commit11dbd85774f49843227814ab5081096eae25d1c1 (patch)
tree635f0c83fdce8e14655871c9555ff102f6f913c0
parent4d9d470a0fca7a921cec8ba9b421e9d04466febe (diff)
parentdc84c01adb7244bcf24d56db5eb73d2ce22970fb (diff)
Merge branch 'update_riseup_defaults' into 'master'
Riseup changes See merge request leap/bitmask_android!240
-rw-r--r--app/build.gradle6
-rw-r--r--app/src/normal/assets/urls/riseup.net.url4
2 files changed, 4 insertions, 6 deletions
diff --git a/app/build.gradle b/app/build.gradle
index 92120f88..a216b041 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -131,12 +131,12 @@ android {
def customProviderUrl = '"https://black.riseup.net"'
buildConfigField "String", "customProviderUrl", customProviderUrl
//static ip address of provider, using a commercially validated CA certificate to serve the provider.json
- def customProviderIp = '"198.252.153.70"'
+ def customProviderIp = '""'
buildConfigField "String", "customProviderIp", customProviderIp
//static ip address of the provider api, using a self signed certificate to serve provider.json, eip-service.json etc.
- def customProviderApiIp = '"198.252.153.107"'
+ def customProviderApiIp = '""'
buildConfigField "String", "customProviderApiIp", customProviderApiIp
- def geoipUrl = '"https://api.black.riseup.net:9001/json"'
+ def geoipUrl = '"https://menshen.riseup.net/json"'
buildConfigField "String", "geoipUrl", geoipUrl
//URL for the message of the day, see https://0xacab.org/leap/motd#motd-message-of-the-day
def customProviderMotdUrl = '"https://static.riseup.net/vpn/motd.json"'
diff --git a/app/src/normal/assets/urls/riseup.net.url b/app/src/normal/assets/urls/riseup.net.url
index ad24ee99..474580da 100644
--- a/app/src/normal/assets/urls/riseup.net.url
+++ b/app/src/normal/assets/urls/riseup.net.url
@@ -1,7 +1,5 @@
{
"main_url" : "https://black.riseup.net",
- "provider_ip" : "198.252.153.70",
- "provider_api_ip" : "198.252.153.107",
- "geoip_url" : "https://api.black.riseup.net:9001/json",
+ "geoip_url" : "https://menshen.riseup.net/json",
"motd_url": "https://static.riseup.net/vpn/motd.json"
}