From 6a674c79d7d9f58c683695114bca2bdffe671bf7 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 8 Oct 2014 13:14:21 -0400 Subject: fix some accidental uses of spaces, rather than tabs, for indentation --- src/Propellor/CmdLine.hs | 8 ++++---- src/Propellor/PrivData.hs | 2 +- src/Propellor/Property.hs | 2 +- src/Propellor/Property/Cmd.hs | 2 +- src/Propellor/Property/Dns.hs | 4 ++-- src/Propellor/Property/Docker.hs | 4 ++-- src/Propellor/Property/SiteSpecific/JoeySites.hs | 2 +- src/Propellor/Property/Ssh.hs | 2 +- src/Propellor/Property/Sudo.hs | 2 +- src/Propellor/Types.hs | 2 +- 10 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/Propellor/CmdLine.hs b/src/Propellor/CmdLine.hs index e1684c38..415b8576 100644 --- a/src/Propellor/CmdLine.hs +++ b/src/Propellor/CmdLine.hs @@ -37,9 +37,9 @@ usage = do processCmdLine :: IO CmdLine processCmdLine = go =<< getArgs where - go ("--help":_) = usage - go ("--spin":h:[]) = return $ Spin h - go ("--boot":h:[]) = return $ Boot h + go ("--help":_) = usage + go ("--spin":h:[]) = return $ Spin h + go ("--boot":h:[]) = return $ Boot h go ("--add-key":k:[]) = return $ AddKey k go ("--set":f:c:[]) = withprivfield f c Set go ("--dump":f:c:[]) = withprivfield f c Dump @@ -48,7 +48,7 @@ processCmdLine = go =<< getArgs go ("--continue":s:[]) = case readish s of Just cmdline -> return $ Continue cmdline Nothing -> errorMessage "--continue serialization failure" - go ("--chain":h:[]) = return $ Chain h + go ("--chain":h:[]) = return $ Chain h go ("--docker":h:[]) = return $ Docker h go (h:[]) | "--" `isPrefixOf` h = usage diff --git a/src/Propellor/PrivData.hs b/src/Propellor/PrivData.hs index f85ded15..f55ab74c 100644 --- a/src/Propellor/PrivData.hs +++ b/src/Propellor/PrivData.hs @@ -114,7 +114,7 @@ listPrivDataFields hosts = do showtable "Data that would be used if set:" $ map mkrow (M.keys $ M.difference wantedmap m) where - header = ["Field", "Context", "Used by"] + header = ["Field", "Context", "Used by"] mkrow k@(field, (Context context)) = [ shellEscape $ show field , shellEscape context diff --git a/src/Propellor/Property.hs b/src/Propellor/Property.hs index 68b6f6a9..ce825192 100644 --- a/src/Propellor/Property.hs +++ b/src/Propellor/Property.hs @@ -31,7 +31,7 @@ propertyList desc ps = Property desc (ensureProperties ps) (combineInfos ps) combineProperties :: Desc -> [Property] -> Property combineProperties desc ps = Property desc (go ps NoChange) (combineInfos ps) where - go [] rs = return rs + go [] rs = return rs go (l:ls) rs = do r <- ensureProperty l case r of diff --git a/src/Propellor/Property/Cmd.hs b/src/Propellor/Property/Cmd.hs index bcd08246..725f5757 100644 --- a/src/Propellor/Property/Cmd.hs +++ b/src/Propellor/Property/Cmd.hs @@ -33,7 +33,7 @@ cmdProperty' cmd params env = property desc $ liftIO $ do , return FailedChange ) where - desc = unwords $ cmd : params + desc = unwords $ cmd : params -- | A property that can be satisfied by running a series of shell commands. scriptProperty :: [String] -> Property diff --git a/src/Propellor/Property/Dns.hs b/src/Propellor/Property/Dns.hs index ddfcf8e6..fb6d8b56 100644 --- a/src/Propellor/Property/Dns.hs +++ b/src/Propellor/Property/Dns.hs @@ -117,7 +117,7 @@ secondaryFor masters hosts domain = RevertableProperty setup cleanup `requires` servingZones cleanup = namedConfWritten - desc = "dns secondary for " ++ domain + desc = "dns secondary for " ++ domain conf = NamedConf { confDomain = domain , confDnsServerType = Secondary @@ -420,7 +420,7 @@ domainHost base (AbsDomain d) addNamedConf :: NamedConf -> Info addNamedConf conf = mempty { _namedconf = NamedConfMap (M.singleton domain conf) } where - domain = confDomain conf + domain = confDomain conf getNamedConf :: Propellor (M.Map Domain NamedConf) getNamedConf = asks $ fromNamedConfMap . _namedconf . hostInfo diff --git a/src/Propellor/Property/Docker.hs b/src/Propellor/Property/Docker.hs index 003b7f5b..f441197e 100644 --- a/src/Propellor/Property/Docker.hs +++ b/src/Propellor/Property/Docker.hs @@ -103,7 +103,7 @@ docked hosts cn = RevertableProperty where go desc a = property (desc ++ " " ++ cn) $ do hn <- asks hostName - let cid = ContainerId hn cn + let cid = ContainerId hn cn ensureProperties [findContainer mhost cid cn $ a cid] mhost = findHost hosts (cn2hn cn) @@ -153,7 +153,7 @@ mkContainer cid@(ContainerId hn _cn) h = Container <*> pure (map (\a -> a hn) (_dockerRunParams info)) where info = _dockerinfo $ hostInfo h' - h' = h + h' = h -- expose propellor directory inside the container & volume (localdir++":"++localdir) -- name the container in a predictable way so we diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs index fe961ac5..77af65fa 100644 --- a/src/Propellor/Property/SiteSpecific/JoeySites.hs +++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs @@ -379,7 +379,7 @@ obnamRepos :: [String] -> Property obnamRepos rs = propertyList ("obnam repos for " ++ unwords rs) (mkbase : map mkrepo rs) where - mkbase = mkdir "/home/joey/lib/backup" + mkbase = mkdir "/home/joey/lib/backup" `requires` mkdir "/home/joey/lib" mkrepo r = mkdir ("/home/joey/lib/backup/" ++ r ++ ".obnam") mkdir d = File.dirExists d diff --git a/src/Propellor/Property/Ssh.hs b/src/Propellor/Property/Ssh.hs index 3ce67783..4ecdf23e 100644 --- a/src/Propellor/Property/Ssh.hs +++ b/src/Propellor/Property/Ssh.hs @@ -94,7 +94,7 @@ hostKey keytype context = combineProperties desc ] `onChange` restarted where - desc = "known ssh host key (" ++ fromKeyType keytype ++ ")" + desc = "known ssh host key (" ++ fromKeyType keytype ++ ")" installkey p a = withPrivData p context $ \getkey -> property desc $ getkey a install writer ext key = do diff --git a/src/Propellor/Property/Sudo.hs b/src/Propellor/Property/Sudo.hs index 68b56608..3651891d 100644 --- a/src/Propellor/Property/Sudo.hs +++ b/src/Propellor/Property/Sudo.hs @@ -27,6 +27,6 @@ enabledFor user = property desc go `requires` Apt.installed ["sudo"] | not (sudobaseline `isPrefixOf` l) = True | "NOPASSWD" `isInfixOf` l = locked | otherwise = True - modify locked ls + modify locked ls | sudoline locked `elem` ls = ls | otherwise = ls ++ [sudoline locked] diff --git a/src/Propellor/Types.hs b/src/Propellor/Types.hs index 037cd962..0cb02793 100644 --- a/src/Propellor/Types.hs +++ b/src/Propellor/Types.hs @@ -146,4 +146,4 @@ data CmdLine | Continue CmdLine | Chain HostName | Docker HostName - deriving (Read, Show, Eq) + deriving (Read, Show, Eq) -- cgit v1.2.3