summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJoey Hess <joeyh@joeyh.name>2016-09-23 11:09:51 -0400
committerJoey Hess <joeyh@joeyh.name>2016-09-23 11:09:51 -0400
commitb1a160b6d11917a10863d3089d31b794db896f08 (patch)
tree512cde2cb4eb4bf3eded3f376e55b598e136abe3
parent9c18c1315ea3160fe7c9c7ba5be0bd21059b3777 (diff)
downloadkeysafe-b1a160b6d11917a10863d3089d31b794db896f08.tar.gz
server levels
-rw-r--r--Servers.hs10
-rw-r--r--Types/Server.hs6
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.
}