move privdata Property to toplevel so its Info propigates

Ugh, that's a nasty gotcha but I cannot see a way to fix it generally right
now.
This commit is contained in:
Joey Hess 2014-07-06 17:15:27 -04:00
parent 95c99b490d
commit e6ce744078
4 changed files with 160 additions and 89 deletions

View File

@ -1,79 +1,144 @@
-----BEGIN PGP MESSAGE-----
Version: GnuPG v1
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
=WDbE
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
3YaY1bDsqV+tJmeicQ==
=G40h
-----END PGP MESSAGE-----

View File

@ -186,7 +186,7 @@ spin hn = do
where
go cacheparams url privdata = withBothHandles createProcessSuccess (proc "ssh" $ cacheparams ++ [user, bootstrapcmd]) $ \(toh, fromh) -> do
let finish = do
senddata toh privDataLocal privDataMarker privdata
senddata toh "privdata" privDataMarker privdata
hClose toh
-- Display remaining output.
@ -228,8 +228,8 @@ spin hn = do
Just status -> return status
showremote s = putStrLn s
senddata toh f marker s = void $
actionMessage ("Sending " ++ f ++ " (" ++ show (length s) ++ " bytes) to " ++ hn) $ do
senddata toh desc marker s = void $
actionMessage ("Sending " ++ desc ++ " (" ++ show (length s) ++ " bytes) to " ++ hn) $ do
sendMarked toh marker s
return True

View File

@ -42,6 +42,10 @@ import Utility.Table
-- Note that if the value is not available, the action is not run
-- and instead it prints a message to help the user make the necessary
-- private data available.
--
-- The resulting Property includes Info about the PrivDataField
-- being used, which is necessary to ensure that the privdata is sent to
-- the remote host by propellor.
withPrivData
:: PrivDataField
-> Context

View File

@ -93,17 +93,19 @@ oldUseNetInstalled pkg = check (not <$> Apt.isInstalled pkg) $
kgbServer :: Property
kgbServer = withOS desc $ \o -> case o of
(Just (System (Debian Unstable) _)) ->
ensureProperty $ propertyList desc
[ Apt.serviceInstalledRunning "kgb-bot"
, File.hasPrivContent "/etc/kgb-bot/kgb.conf" anyContext
`onChange` Service.restarted "kgb-bot"
, "/etc/default/kgb-bot" `File.containsLine` "BOT_ENABLED=1"
`describe` "kgb bot enabled"
`onChange` Service.running "kgb-bot"
]
_ -> error "kgb server needs Debian unstable (for kgb-bot 1.31+)"
kgbServer = propertyList desc
[ withOS desc $ \o -> case o of
(Just (System (Debian Unstable) _)) ->
ensureProperty $ propertyList desc
[ Apt.serviceInstalledRunning "kgb-bot"
, "/etc/default/kgb-bot" `File.containsLine` "BOT_ENABLED=1"
`describe` "kgb bot enabled"
`onChange` Service.running "kgb-bot"
]
_ -> error "kgb server needs Debian unstable (for kgb-bot 1.31+)"
, File.hasPrivContent "/etc/kgb-bot/kgb.conf" anyContext
`onChange` Service.restarted "kgb-bot"
]
where
desc = "kgb.kitenet.net setup"