restructure: get the tracker to work again

This should hopefully be the final (major) part of the restructuring: a
tracker no longer has to know which trip it is on (and indeed it has no
idea for now), instead the server keeps state about which trips are
currently running and will insert incoming pings in a hopefully
reasonable manner, based on their geoposition & time.

There's lots of associated TODO items here (especially there should be
manual overrides for all this logic in the web ui), but that's work for
a future me.

(incidentally, this also adds support for sending all log messages out
via ntfy-sh)

1 files changed, 19 insertions, 1 deletions

diff --git a/lib/Config.hs b/lib/Config.hs
index 2349e66..94fdd28 100644
--- a/lib/Config.hs
+++ b/lib/Config.hs
@@ -1,10 +1,11 @@
 {-# LANGUAGE RecordWildCards #-}
 
-module Config where
+module Config (UffdConfig(..), ServerConfig(..), LoggingConfig(..)) where
 import           Conferer                 (DefaultConfig (configDef))
 import           Conferer.FromConfig
 import           Conferer.FromConfig.Warp ()
 import           Data.ByteString          (ByteString)
+import           Data.Functor             ((<&>))
 import           Data.Text                (Text)
 import           GHC.Generics             (Generic)
 import           Network.Wai.Handler.Warp (Settings)
@@ -24,6 +25,13 @@ data ServerConfig = ServerConfig
   , serverConfigAssets       :: FilePath
   , serverConfigZoneinfoPath :: FilePath
   , serverConfigLogin        :: UffdConfig
+  , serverConfigLogging      :: LoggingConfig
+  } deriving (Generic)
+
+data LoggingConfig = LoggingConfig
+  { loggingConfigNtfyToken :: Maybe Text
+  , loggingConfigNtfyTopic :: Text
+  , loggingConfigHostname  :: Text
   } deriving (Generic)
 
 instance FromConfig ServerConfig
@@ -36,6 +44,7 @@ instance DefaultConfig ServerConfig where
     , serverConfigAssets = "./assets"
     , serverConfigZoneinfoPath = "/etc/zoneinfo/"
     , serverConfigLogin = configDef
+    , serverConfigLogging = configDef
     }
 
 instance DefaultConfig UffdConfig where
@@ -50,3 +59,12 @@ instance FromConfig UffdConfig where
     uffdConfigClientSecret <- fetchFromConfig (key /. "clientSecret") config
     uffdConfigEnable <- fetchFromConfig (key /. "enable") config
     pure UffdConfig {..}
+
+instance FromConfig LoggingConfig where
+  fromConfig key config = LoggingConfig
+    <$> fetchFromConfig (key /. "ntfyToken") config
+    <*> fetchFromConfig (key /. "ntfyTopic") config
+    <*> fetchFromConfig (key /. "name") config
+
+instance DefaultConfig LoggingConfig where
+  configDef = LoggingConfig Nothing "tracktrain" ""