From 2865b4c13b699e3fb46729b983f80da59eb8d178 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 4 Oct 2017 14:04:49 -0400 Subject: override deploy url with PropellorRepo.hasOriginUrl info * Made the PropellorRepo.hasOriginUrl property override the repository url that --spin passes to a host. * PropellorRepo.hasOriginUrl type changed to include HasInfo. (API change) This commit was sponsored by Jake Vosloo on Patreon. --- src/Propellor/Property/PropellorRepo.hs | 30 +++++++++++++++++++----------- src/Propellor/Spin.hs | 11 ++++++++--- 2 files changed, 27 insertions(+), 14 deletions(-) (limited to 'src') diff --git a/src/Propellor/Property/PropellorRepo.hs b/src/Propellor/Property/PropellorRepo.hs index e60e7848..504ff395 100644 --- a/src/Propellor/Property/PropellorRepo.hs +++ b/src/Propellor/Property/PropellorRepo.hs @@ -2,18 +2,26 @@ module Propellor.Property.PropellorRepo where import Propellor.Base import Propellor.Git.Config +import Propellor.Types.Info -- | Sets the url to use as the origin of propellor's git repository. -- --- When propellor --spin is used to update a host, the url is taken from --- the repository that --spin is run in, and passed to the host. So, you --- don't need to specifiy this property then. +-- By default, the url is taken from the deploy or origin remote of +-- the repository that propellor --spin is run in. Setting this property +-- overrides that default behavior with a different url. -- --- This property is useful when hosts are being updated without using --- --spin, eg when using the `Propellor.Property.Cron.runPropellor` cron job. -hasOriginUrl :: String -> Property UnixLike -hasOriginUrl u = property ("propellor repo url " ++ u) $ do - curru <- liftIO getRepoUrl - if curru == Just u - then return NoChange - else makeChange $ setRepoUrl u +-- When hosts are being updated without using -- --spin, eg when using +-- the `Propellor.Property.Cron.runPropellor` cron job, this property can +-- be set to redirect them to a new git repository url. +hasOriginUrl :: String -> Property (HasInfo + UnixLike) +hasOriginUrl u = setInfoProperty p (toInfo (InfoVal (OriginUrl u))) + where + p :: Property UnixLike + p = property ("propellor repo url " ++ u) $ do + curru <- liftIO getRepoUrl + if curru == Just u + then return NoChange + else makeChange $ setRepoUrl u + +newtype OriginUrl = OriginUrl String + deriving (Show) diff --git a/src/Propellor/Spin.hs b/src/Propellor/Spin.hs index 88d2b473..4a945e82 100644 --- a/src/Propellor/Spin.hs +++ b/src/Propellor/Spin.hs @@ -29,6 +29,7 @@ import Propellor.Gpg import Propellor.Bootstrap import Propellor.Types.CmdLine import Propellor.Types.Info +import Propellor.Property.PropellorRepo (OriginUrl(..)) import qualified Propellor.Shim as Shim import Utility.FileMode import Utility.SafeCommand @@ -220,7 +221,7 @@ updateServer target relay hst connect haveprecompiled privdata = do v <- maybe Nothing readish <$> getMarked fromh statusMarker case v of (Just NeedRepoUrl) -> do - sendRepoUrl toh + sendRepoUrl hst toh loop (Just NeedPrivData) -> do sendPrivData hn toh privdata @@ -242,8 +243,12 @@ updateServer target relay hst connect haveprecompiled privdata = do done Nothing -> done -sendRepoUrl :: Handle -> IO () -sendRepoUrl toh = sendMarked toh repoUrlMarker =<< (fromMaybe "" <$> getRepoUrl) +sendRepoUrl :: Host -> Handle -> IO () +sendRepoUrl hst toh = sendMarked toh repoUrlMarker =<< geturl + where + geturl = case fromInfoVal (fromInfo (hostInfo hst)) of + Nothing -> fromMaybe "" <$> getRepoUrl + Just (OriginUrl u) -> return u sendPrivData :: HostName -> Handle -> PrivMap -> IO () sendPrivData hn toh privdata = void $ actionMessage msg $ do -- cgit v1.2.3