From 90ff9f8872b0b4157a7e755e00eedf88907c98f1 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 26 Sep 2016 15:13:04 -0400 Subject: small updates --- Servers.hs | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) (limited to 'Servers.hs') diff --git a/Servers.hs b/Servers.hs index 7edc7af..08789ce 100644 --- a/Servers.hs +++ b/Servers.hs @@ -9,11 +9,14 @@ import Types.Server import Servant.Client import System.Random.Shuffle -serverUrls :: Server -> [BaseUrl] -serverUrls srv = map go (serverAddress srv) - where - go (ServerAddress addr port) = BaseUrl Http addr port "" - +-- | Keysafe's server list. +-- +-- Note: Avoid removing servers from this list, as that will break +-- restores. If necessary, a server can be set to Untrusted to prevent +-- uploads to it. +-- +-- Also, avoid changing the ServerName of any server, as that will +-- cause any uploads queued under that name to not go through. networkServers :: [Server] networkServers = [ Server (ServerName "keysafe.joeyh.name") Alternate @@ -24,8 +27,6 @@ networkServers = [] "Purism server is not yet deployed, but planned." - -- Provided by https://faelix.net/ - -- Marek Isalski , Server (ServerName "thirdserver") Alternate -- still being vetted [ServerAddress "eqi7glyxe5ravak5.onion" 4242] "Provided by Marek Isalski at Faelix. Currently located in UK, but planned move to CH" @@ -37,3 +38,8 @@ shuffleServers :: [Server] -> IO [Server] shuffleServers l = concat <$> mapM shuf [minBound..maxBound] where shuf sl = shuffleM (filter (\s -> serverLevel s == sl) l) + +serverUrls :: Server -> [BaseUrl] +serverUrls srv = map go (serverAddress srv) + where + go (ServerAddress addr port) = BaseUrl Http addr port "" -- cgit v1.2.3