cadey
/
propellor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix ssh authorizied_keys

This commit is contained in:
Joey Hess 2014-05-20 13:37:03 -04:00
parent 5ace43fb4a
commit 7eeb58dab9
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs
View File

@ -72,9 +72,15 @@ cabalDeps = flagFile go cabalupdated
go = userScriptProperty builduser ["cabal update && cabal install git-annex --only-dependencies || true"] go = userScriptProperty builduser ["cabal update && cabal install git-annex --only-dependencies || true"]
cabalupdated = homedir </> ".cabal" </> "packages" </> "hackage.haskell.org" </> "00-index.cache" cabalupdated = homedir </> ".cabal" </> "packages" </> "hackage.haskell.org" </> "00-index.cache"
-- Ensure a ssh key is set up. -- Ensure a ssh key is set up, and allow it to be used to ssh in
sshKeyGen :: Property sshKeyGen :: Property
sshKeyGen = flagFile gen f sshKeyGen = combineProperties "sshkeygen"
[ flagFile gen privkey
, flagFile auth authkeys
]
where where
gen = userScriptProperty builduser ["ssh-keygen -t RSA -N '' -f " ++ f] gen = userScriptProperty builduser ["ssh-keygen -t RSA -N '' -f " ++ f]
f = homedir </> ".ssh" </> "id_rsa" auth = userScriptProperty builduser ["cp " ++ pubkey ++ " " ++ authkeys]
privkey = homedir </> ".ssh" </> "id_rsa"
pubkey = privkey ++ ".pub"
authkeys = homedir </> ".ssh" </> "authorized_keys"