mirror of
https://github.com/Start9Labs/start-os.git
synced 2026-03-26 10:21:52 +00:00
agent: adds autoCheckUpdates to v0
This commit is contained in:
committed by
Aiden McClelland
parent
7ed220dc51
commit
18f18e3b95
@@ -37,6 +37,7 @@ data ServerRes = ServerRes
|
||||
, serverAlternativeRegistryUrl :: Maybe Text
|
||||
, serverSpecs :: SpecsRes
|
||||
, serverWelcomeAck :: Bool
|
||||
, serverAutoCheckUpdates :: Bool
|
||||
} deriving (Eq, Show)
|
||||
|
||||
type JsonEncoding a = Encoding
|
||||
@@ -57,6 +58,7 @@ instance ToJSON ServerRes where
|
||||
, "alternativeRegistryUrl" .= serverAlternativeRegistryUrl
|
||||
, "specs" .= serverSpecs
|
||||
, "welcomeAck" .= serverWelcomeAck
|
||||
, "autoCheckUpdates" .= serverAutoCheckUpdates
|
||||
]
|
||||
instance ToTypedContent ServerRes where
|
||||
toTypedContent = toTypedContent . toJSON
|
||||
|
||||
@@ -58,6 +58,7 @@ getServerR = handleS9ErrT $ do
|
||||
wifi <- WpaSupplicant.runWlan0 $ liftA2 WifiList WpaSupplicant.getCurrentNetwork WpaSupplicant.listNetworks
|
||||
specs <- getSpecs settings
|
||||
welcomeAck <- fmap isJust . lift . runDB . Persist.get $ WelcomeAckKey agentVersion
|
||||
autoCheckUpdates <- runM $ injectFilesystemBaseFromContext settings $ existsSystemPath autoCheckUpdatesPath
|
||||
|
||||
let sid = T.drop 7 $ specsNetworkId specs
|
||||
|
||||
@@ -72,6 +73,7 @@ getServerR = handleS9ErrT $ do
|
||||
, serverAlternativeRegistryUrl = alternativeRegistryUrl
|
||||
, serverSpecs = specs
|
||||
, serverWelcomeAck = welcomeAck
|
||||
, serverAutoCheckUpdates = autoCheckUpdates
|
||||
}
|
||||
where
|
||||
parseSshKeys :: Text -> S9ErrT Handler [SshKeyFingerprint]
|
||||
|
||||
@@ -80,6 +80,11 @@ readSystemPath path = do
|
||||
$ (Just <$> readFile (toS loadPath))
|
||||
`catch` (\(e :: IOException) -> if isDoesNotExistError e then pure Nothing else throwIO e)
|
||||
|
||||
existsSystemPath :: (HasFilesystemBase sig m, MonadIO m) => SystemPath -> m Bool
|
||||
existsSystemPath path = do
|
||||
checkPath <- getAbsoluteLocationFor path
|
||||
liftIO . doesPathExist $ toS checkPath
|
||||
|
||||
-- like the above, but throws IO error if file not found
|
||||
readSystemPath' :: (HasFilesystemBase sig m, MonadIO m) => SystemPath -> m Text
|
||||
readSystemPath' path = do
|
||||
|
||||
Reference in New Issue
Block a user