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

propellor spin

This commit is contained in:
Joey Hess 2015-02-10 20:56:57 -04:00
parent d08c98d8b3
commit 0119bf8531
Failed to extract signature
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Propellor/Property/SiteSpecific/JoeySites.hs
View File

@ -150,7 +150,7 @@ gitServer hosts = propertyList "git.kitenet.net setup" $ props
`requires` Ssh.authorizedKeys "family" (Context "git.kitenet.net") `requires` Ssh.authorizedKeys "family" (Context "git.kitenet.net")
`requires` User.accountFor "family" `requires` User.accountFor "family"
& Apt.installed ["git", "rsync", "gitweb"] & Apt.installed ["git", "rsync", "gitweb"]
& Apt.installed ["kgb-client"] & Apt.installed ["kgb-client", "kgb-bot"]
& Apt.installed ["git-annex"] & Apt.installed ["git-annex"]
& File.hasPrivContentExposed "/etc/kgb-bot/kgb-client.conf" anyContext & File.hasPrivContentExposed "/etc/kgb-bot/kgb-client.conf" anyContext
& Git.daemonRunning "/srv/git" & Git.daemonRunning "/srv/git"

7
src/Propellor/Property/Ssh.hs
View File

@ -161,7 +161,12 @@ keyImported' dest keytype user context = combineProperties desc
, installkey (SshPrivKey keytype user) (install writeFileProtected "") , installkey (SshPrivKey keytype user) (install writeFileProtected "")
] ]
where where
desc = user ++ " has ssh key (" ++ fromKeyType keytype ++ ")" desc = unwords $ catMaybes
[ Just user
, Just "has ssh key"
, dest
, Just $ "(" ++ 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