From b1a160b6d11917a10863d3089d31b794db896f08 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 23 Sep 2016 11:09:51 -0400 Subject: server levels --- Servers.hs | 10 +++++++--- Types/Server.hs | 6 +++++- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/Servers.hs b/Servers.hs index bb552b7..d12fc56 100644 --- a/Servers.hs +++ b/Servers.hs @@ -15,13 +15,17 @@ serverUrls srv = map go (serverAddress srv) networkServers :: [Server] networkServers = - [ Server (ServerName "keysafe.joeyh.name") + [ Server (ServerName "keysafe.joeyh.name") Alternate [ServerAddress "vzgrspuxbtnlrtup.onion" 4242] + -- Purism server is not yet deployed, but planned. - , Server (ServerName "keysafe.puri.sm") + , Server (ServerName "keysafe.puri.sm") Alternate [] + -- Unknown yet who will provide this server, but allocate it now -- so keysafe can start queuing uploads to it. - , Server (ServerName "thirdserver") + , Server (ServerName "thirdserver") Recommended [] + -- [ServerAddress "eqi7glyxe5ravak5.onion" 4242] + -- -- ^ still being vetted ] diff --git a/Types/Server.hs b/Types/Server.hs index a6d1ad9..7be29ce 100644 --- a/Types/Server.hs +++ b/Types/Server.hs @@ -26,9 +26,13 @@ newtype ServerName = ServerName String instance ToJSON ServerName instance FromJSON ServerName - + +data ServerLevel = Recommended | Alternate | Untrusted + deriving (Show, Eq, Ord) + data Server = Server { serverName :: ServerName + , serverLevel :: ServerLevel , serverAddress :: [ServerAddress] -- ^ A server may have multiple addresses, or no current address. } -- cgit v1.2.3