diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2017-09-22 14:30:43 +0200 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2017-09-22 14:30:43 +0200 |
| commit | b8041e34b2ca3e0da60c96f6d5a1563d2318f76a (patch) | |
| tree | efb2ebb7ad68ba25fd3c292a96814bc866531b99 /app | |
| parent | 611b8e1651700f9a1fc8d21ba8347d544247a2ac (diff) | |
| parent | 8975b355440c654737a2965ef0704243fa0b2215 (diff) | |
| download | mullvadvpn-b8041e34b2ca3e0da60c96f6d5a1563d2318f76a.tar.xz mullvadvpn-b8041e34b2ca3e0da60c96f6d5a1563d2318f76a.zip | |
Merge branch 'fix-server-data'
Diffstat (limited to 'app')
| -rw-r--r-- | app/config.json | 28 | ||||
| -rw-r--r-- | app/lib/backend.js | 6 |
2 files changed, 12 insertions, 22 deletions
diff --git a/app/config.json b/app/config.json index fe8d12d84a..529d68d52e 100644 --- a/app/config.json +++ b/app/config.json @@ -12,8 +12,8 @@ }, "defaultServer": "fastest", "servers": { - "ca1.mullvad.net": { - "address": "ca1.mullvad.net", + "ca.mullvad.net": { + "address": "ca.mullvad.net", "name": "Canada", "city": "Ottawa", "country": "Canada", @@ -22,20 +22,10 @@ -75.697193 ] }, - "ca2.mullvad.net": { - "address": "ca2.mullvad.net", - "name": "Canada (Quebec)", - "city": "Quebec", - "country": "Canada", - "location": [ - 46.810811, - -71.215439 - ] - }, - "da.mullvad.net": { - "address": "da.mullvad.net", + "dk.mullvad.net": { + "address": "dk.mullvad.net", "name": "Denmark", - "city": "\u200eCopenhagen", + "city": "Copenhagen", "country": "Denmark", "location": [ 55.6760968, @@ -112,8 +102,8 @@ -3.7037902 ] }, - "se1.mullvad.net": { - "address": "se1.mullvad.net", + "se.mullvad.net": { + "address": "se.mullvad.net", "name": "Sweden", "city": "Stockholm", "country": "Sweden", @@ -142,8 +132,8 @@ -0.1277583 ] }, - "us1.mullvad.net": { - "address": "us1.mullvad.net", + "us.mullvad.net": { + "address": "us.mullvad.net", "name": "USA", "city": "New York", "country": "USA", diff --git a/app/lib/backend.js b/app/lib/backend.js index 9d451960e4..3acc58928a 100644 --- a/app/lib/backend.js +++ b/app/lib/backend.js @@ -130,10 +130,10 @@ export class Backend { fastestServer(): ServerInfo { return { - address: 'gb.mullvad.net', + address: 'se.mullvad.net', name: 'Fastest', - city: 'London', - country: 'United Kingdom', + city: 'Lund', + country: 'Sweden', location: [51.5073509, -0.1277583] }; } |