fix some accidental uses of spaces, rather than tabs, for indentation
This commit is contained in:
parent
21117d5e21
commit
6a674c79d7
|
@ -37,9 +37,9 @@ usage = do
|
||||||
processCmdLine :: IO CmdLine
|
processCmdLine :: IO CmdLine
|
||||||
processCmdLine = go =<< getArgs
|
processCmdLine = go =<< getArgs
|
||||||
where
|
where
|
||||||
go ("--help":_) = usage
|
go ("--help":_) = usage
|
||||||
go ("--spin":h:[]) = return $ Spin h
|
go ("--spin":h:[]) = return $ Spin h
|
||||||
go ("--boot":h:[]) = return $ Boot h
|
go ("--boot":h:[]) = return $ Boot h
|
||||||
go ("--add-key":k:[]) = return $ AddKey k
|
go ("--add-key":k:[]) = return $ AddKey k
|
||||||
go ("--set":f:c:[]) = withprivfield f c Set
|
go ("--set":f:c:[]) = withprivfield f c Set
|
||||||
go ("--dump":f:c:[]) = withprivfield f c Dump
|
go ("--dump":f:c:[]) = withprivfield f c Dump
|
||||||
|
@ -48,7 +48,7 @@ processCmdLine = go =<< getArgs
|
||||||
go ("--continue":s:[]) = case readish s of
|
go ("--continue":s:[]) = case readish s of
|
||||||
Just cmdline -> return $ Continue cmdline
|
Just cmdline -> return $ Continue cmdline
|
||||||
Nothing -> errorMessage "--continue serialization failure"
|
Nothing -> errorMessage "--continue serialization failure"
|
||||||
go ("--chain":h:[]) = return $ Chain h
|
go ("--chain":h:[]) = return $ Chain h
|
||||||
go ("--docker":h:[]) = return $ Docker h
|
go ("--docker":h:[]) = return $ Docker h
|
||||||
go (h:[])
|
go (h:[])
|
||||||
| "--" `isPrefixOf` h = usage
|
| "--" `isPrefixOf` h = usage
|
||||||
|
|
|
@ -114,7 +114,7 @@ listPrivDataFields hosts = do
|
||||||
showtable "Data that would be used if set:" $
|
showtable "Data that would be used if set:" $
|
||||||
map mkrow (M.keys $ M.difference wantedmap m)
|
map mkrow (M.keys $ M.difference wantedmap m)
|
||||||
where
|
where
|
||||||
header = ["Field", "Context", "Used by"]
|
header = ["Field", "Context", "Used by"]
|
||||||
mkrow k@(field, (Context context)) =
|
mkrow k@(field, (Context context)) =
|
||||||
[ shellEscape $ show field
|
[ shellEscape $ show field
|
||||||
, shellEscape context
|
, shellEscape context
|
||||||
|
|
|
@ -31,7 +31,7 @@ propertyList desc ps = Property desc (ensureProperties ps) (combineInfos ps)
|
||||||
combineProperties :: Desc -> [Property] -> Property
|
combineProperties :: Desc -> [Property] -> Property
|
||||||
combineProperties desc ps = Property desc (go ps NoChange) (combineInfos ps)
|
combineProperties desc ps = Property desc (go ps NoChange) (combineInfos ps)
|
||||||
where
|
where
|
||||||
go [] rs = return rs
|
go [] rs = return rs
|
||||||
go (l:ls) rs = do
|
go (l:ls) rs = do
|
||||||
r <- ensureProperty l
|
r <- ensureProperty l
|
||||||
case r of
|
case r of
|
||||||
|
|
|
@ -33,7 +33,7 @@ cmdProperty' cmd params env = property desc $ liftIO $ do
|
||||||
, return FailedChange
|
, return FailedChange
|
||||||
)
|
)
|
||||||
where
|
where
|
||||||
desc = unwords $ cmd : params
|
desc = unwords $ cmd : params
|
||||||
|
|
||||||
-- | A property that can be satisfied by running a series of shell commands.
|
-- | A property that can be satisfied by running a series of shell commands.
|
||||||
scriptProperty :: [String] -> Property
|
scriptProperty :: [String] -> Property
|
||||||
|
|
|
@ -117,7 +117,7 @@ secondaryFor masters hosts domain = RevertableProperty setup cleanup
|
||||||
`requires` servingZones
|
`requires` servingZones
|
||||||
cleanup = namedConfWritten
|
cleanup = namedConfWritten
|
||||||
|
|
||||||
desc = "dns secondary for " ++ domain
|
desc = "dns secondary for " ++ domain
|
||||||
conf = NamedConf
|
conf = NamedConf
|
||||||
{ confDomain = domain
|
{ confDomain = domain
|
||||||
, confDnsServerType = Secondary
|
, confDnsServerType = Secondary
|
||||||
|
@ -420,7 +420,7 @@ domainHost base (AbsDomain d)
|
||||||
addNamedConf :: NamedConf -> Info
|
addNamedConf :: NamedConf -> Info
|
||||||
addNamedConf conf = mempty { _namedconf = NamedConfMap (M.singleton domain conf) }
|
addNamedConf conf = mempty { _namedconf = NamedConfMap (M.singleton domain conf) }
|
||||||
where
|
where
|
||||||
domain = confDomain conf
|
domain = confDomain conf
|
||||||
|
|
||||||
getNamedConf :: Propellor (M.Map Domain NamedConf)
|
getNamedConf :: Propellor (M.Map Domain NamedConf)
|
||||||
getNamedConf = asks $ fromNamedConfMap . _namedconf . hostInfo
|
getNamedConf = asks $ fromNamedConfMap . _namedconf . hostInfo
|
||||||
|
|
|
@ -103,7 +103,7 @@ docked hosts cn = RevertableProperty
|
||||||
where
|
where
|
||||||
go desc a = property (desc ++ " " ++ cn) $ do
|
go desc a = property (desc ++ " " ++ cn) $ do
|
||||||
hn <- asks hostName
|
hn <- asks hostName
|
||||||
let cid = ContainerId hn cn
|
let cid = ContainerId hn cn
|
||||||
ensureProperties [findContainer mhost cid cn $ a cid]
|
ensureProperties [findContainer mhost cid cn $ a cid]
|
||||||
|
|
||||||
mhost = findHost hosts (cn2hn cn)
|
mhost = findHost hosts (cn2hn cn)
|
||||||
|
@ -153,7 +153,7 @@ mkContainer cid@(ContainerId hn _cn) h = Container
|
||||||
<*> pure (map (\a -> a hn) (_dockerRunParams info))
|
<*> pure (map (\a -> a hn) (_dockerRunParams info))
|
||||||
where
|
where
|
||||||
info = _dockerinfo $ hostInfo h'
|
info = _dockerinfo $ hostInfo h'
|
||||||
h' = h
|
h' = h
|
||||||
-- expose propellor directory inside the container
|
-- expose propellor directory inside the container
|
||||||
& volume (localdir++":"++localdir)
|
& volume (localdir++":"++localdir)
|
||||||
-- name the container in a predictable way so we
|
-- name the container in a predictable way so we
|
||||||
|
|
|
@ -379,7 +379,7 @@ obnamRepos :: [String] -> Property
|
||||||
obnamRepos rs = propertyList ("obnam repos for " ++ unwords rs)
|
obnamRepos rs = propertyList ("obnam repos for " ++ unwords rs)
|
||||||
(mkbase : map mkrepo rs)
|
(mkbase : map mkrepo rs)
|
||||||
where
|
where
|
||||||
mkbase = mkdir "/home/joey/lib/backup"
|
mkbase = mkdir "/home/joey/lib/backup"
|
||||||
`requires` mkdir "/home/joey/lib"
|
`requires` mkdir "/home/joey/lib"
|
||||||
mkrepo r = mkdir ("/home/joey/lib/backup/" ++ r ++ ".obnam")
|
mkrepo r = mkdir ("/home/joey/lib/backup/" ++ r ++ ".obnam")
|
||||||
mkdir d = File.dirExists d
|
mkdir d = File.dirExists d
|
||||||
|
|
|
@ -94,7 +94,7 @@ hostKey keytype context = combineProperties desc
|
||||||
]
|
]
|
||||||
`onChange` restarted
|
`onChange` restarted
|
||||||
where
|
where
|
||||||
desc = "known ssh host key (" ++ fromKeyType keytype ++ ")"
|
desc = "known ssh host key (" ++ fromKeyType keytype ++ ")"
|
||||||
installkey p a = withPrivData p context $ \getkey ->
|
installkey p a = withPrivData p context $ \getkey ->
|
||||||
property desc $ getkey a
|
property desc $ getkey a
|
||||||
install writer ext key = do
|
install writer ext key = do
|
||||||
|
|
|
@ -27,6 +27,6 @@ enabledFor user = property desc go `requires` Apt.installed ["sudo"]
|
||||||
| not (sudobaseline `isPrefixOf` l) = True
|
| not (sudobaseline `isPrefixOf` l) = True
|
||||||
| "NOPASSWD" `isInfixOf` l = locked
|
| "NOPASSWD" `isInfixOf` l = locked
|
||||||
| otherwise = True
|
| otherwise = True
|
||||||
modify locked ls
|
modify locked ls
|
||||||
| sudoline locked `elem` ls = ls
|
| sudoline locked `elem` ls = ls
|
||||||
| otherwise = ls ++ [sudoline locked]
|
| otherwise = ls ++ [sudoline locked]
|
||||||
|
|
|
@ -146,4 +146,4 @@ data CmdLine
|
||||||
| Continue CmdLine
|
| Continue CmdLine
|
||||||
| Chain HostName
|
| Chain HostName
|
||||||
| Docker HostName
|
| Docker HostName
|
||||||
deriving (Read, Show, Eq)
|
deriving (Read, Show, Eq)
|
||||||
|
|
Loading…
Reference in New Issue