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

Merge branch 'joeyconfig' 

Conflicts:
	privdata.joey/privdata.gpg
This commit is contained in:
Joey Hess 2015-04-23 09:24:53 -04:00
parent 4a187cbd22 89b6629464
commit 2d7c493403
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,7 +35,7 @@ hasPrivContentExposed f = hasPrivContentExposedFrom (PrivDataSourceFile (PrivFil
hasPrivContentExposedFrom :: (IsContext c, IsPrivDataSource s) => s -> FilePath -> c -> Property HasInfo hasPrivContentExposedFrom :: (IsContext c, IsPrivDataSource s) => s -> FilePath -> c -> Property HasInfo
hasPrivContentExposedFrom = hasPrivContent' writeFile hasPrivContentExposedFrom = hasPrivContent' writeFile
hasPrivContent' :: (IsContext c, IsPrivDataSource s) => (String -> FilePath -> IO ()) -> s -> FilePath -> c -> Property HasInfo hasPrivContent' :: (IsContext c, IsPrivDataSource s) => (FilePath -> String -> IO ()) -> s -> FilePath -> c -> Property HasInfo
hasPrivContent' writer source f context = hasPrivContent' writer source f context =
withPrivData source context $ \getcontent -> withPrivData source context $ \getcontent ->
property desc $ getcontent $ \privcontent -> property desc $ getcontent $ \privcontent ->

3
src/Propellor/Property/SiteSpecific/IABak.hs
View File

@ -42,6 +42,9 @@ registrationServer knownhosts = propertyList "iabak registration server" $ props
& cmdProperty "ln" ["-sf", "/home/registrar/IA.BAK/registrar/register.cgi", link] & cmdProperty "ln" ["-sf", "/home/registrar/IA.BAK/registrar/register.cgi", link]
& cmdProperty "chown" ["-h", "registrar:registrar", link] & cmdProperty "chown" ["-h", "registrar:registrar", link]
& File.containsLine "/etc/sudoers" "www-data ALL=(registrar) NOPASSWD:/home/registrar/IA.BAK/registrar/register.pl" & File.containsLine "/etc/sudoers" "www-data ALL=(registrar) NOPASSWD:/home/registrar/IA.BAK/registrar/register.pl"
& Apt.installed ["kgb-client"]
& File.hasPrivContentExposed "/etc/kgb-bot/kgb-client.conf" anyContext
`requires` File.dirExists "/etc/kgb-bot/"
where where
link = "/usr/lib/cgi-bin/register.cgi" link = "/usr/lib/cgi-bin/register.cgi"