From 7417bfdbfa5f0749b2f34f9e6d8a787e6e9138b4 Mon Sep 17 00:00:00 2001 From: Aiden McClelland Date: Wed, 20 Jan 2021 13:38:39 -0700 Subject: [PATCH] agent: invert autoCheckUpdates --- agent/src/Handler/V0.hs | 6 +++--- agent/src/Lib/SystemPaths.hs | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/agent/src/Handler/V0.hs b/agent/src/Handler/V0.hs index 012cf5eff..b27ac09cf 100644 --- a/agent/src/Handler/V0.hs +++ b/agent/src/Handler/V0.hs @@ -58,7 +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 + autoCheckUpdates <- runM $ injectFilesystemBaseFromContext settings $ fmap not (existsSystemPath disableAutoCheckUpdatesPath) let sid = T.drop 7 $ specsNetworkId specs @@ -125,8 +125,8 @@ patchAutoCheckUpdatesR = do settings <- getsYesod appSettings BoolPatchReq val <- requireCheckJsonBody runM $ injectFilesystemBaseFromContext settings $ if val - then writeSystemPath autoCheckUpdatesPath "" - else deleteSystemPath autoCheckUpdatesPath + then deleteSystemPath disableAutoCheckUpdatesPath + else writeSystemPath disableAutoCheckUpdatesPath "" patchFile :: SystemPath -> Handler () patchFile path = do diff --git a/agent/src/Lib/SystemPaths.hs b/agent/src/Lib/SystemPaths.hs index e178102b3..84bf2f59f 100644 --- a/agent/src/Lib/SystemPaths.hs +++ b/agent/src/Lib/SystemPaths.hs @@ -193,8 +193,8 @@ agentTorHiddenServicePrivateKeyPath = agentTorHiddenServiceDirectory <> "/hs_ed2 serverNamePath :: SystemPath serverNamePath = "/root/agent/name.txt" -autoCheckUpdatesPath :: SystemPath -autoCheckUpdatesPath = "/root/agent/.autoCheckUpdates" +disableAutoCheckUpdatesPath :: SystemPath +disableAutoCheckUpdatesPath = "/root/agent/.disableAutoCheckUpdates" altRegistryUrlPath :: SystemPath altRegistryUrlPath = "/root/agent/alt_registry_url.txt"