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

Merge branch 'joeyconfig'

This commit is contained in:
Joey Hess 2015-03-22 10:05:03 -04:00
parent 93fe81bae9 b32d05a661
commit fe7b1233f4
3 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
doc/components.mdwn
View File

@ -24,20 +24,9 @@ then copy in `~/.propellor/src/Propellor/` and it will be used. See
[[contributing]] if you want to send your improvements back. [[contributing]] if you want to send your improvements back.
All that really needs to be in `~/.propellor/` though, is a `config.hs` All that really needs to be in `~/.propellor/` though, is a `config.hs`
file, and a cabal file. If you want to set up the repository manually, file, and a cabal file. To use propellor this way, you can first
and don't want it to contain propellor's source code, here's a stub cabal install propellor, and then copy the two files from the
file to get you started: [mininalconfig branch](http://source.propellor.branchable.com/?p=source.git;a=tree;h=refs/heads/minimalconfig;hb=refs/heads/minimalconfig),
or clone it:
<pre> git clone ssh://b-propellor@propellor.branchable.com/propellor.branchable.com .propellor --branch minimalconfig --single-branch
Name: foo
Cabal-Version: >= 1.6
Build-Type: Simple
Version: 0
Executable propellor-config
Main-Is: config.hs
GHC-Options: -Wall -threaded -O0
Build-Depends: propellor, base >= 3
</pre>
See [[haskell_newbie]] for an example config.hs file.

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

@ -69,7 +69,7 @@ scrollBox = propertyList "scroll server" $ props
, "echo 'or, type comments below (finish with a dot on its own line)'" , "echo 'or, type comments below (finish with a dot on its own line)'"
, "echo" , "echo"
, "echo Your comments:" , "echo Your comments:"
, "mail -s \"scroll test $t\" joey@kitenet.net" , "timeout --kill-after 1m --foreground 2h mail -E -s \"scroll test $t\" joey@kitenet.net"
] `onChange` (g `File.mode` (combineModes (ownerWriteMode:readModes ++ executeModes))) ] `onChange` (g `File.mode` (combineModes (ownerWriteMode:readModes ++ executeModes)))
& Apt.installed ["bsd-mailx"] & Apt.installed ["bsd-mailx"]
-- prevent port forwarding etc by not letting scroll log in via ssh -- prevent port forwarding etc by not letting scroll log in via ssh

2
src/wrapper.hs
View File

@ -77,7 +77,7 @@ wrapper args propellordir propellorbin = do
, void $ boolSystem "git" [Param "clone", Param netrepo, File propellordir] , void $ boolSystem "git" [Param "clone", Param netrepo, File propellordir]
) )
checkRepo = whenM (doesFileExist disthead) $ do checkRepo = whenM (doesFileExist disthead <&&> doesFileExist (propellordir </> "propellor.cabal")) $ do
headrev <- takeWhile (/= '\n') <$> readFile disthead headrev <- takeWhile (/= '\n') <$> readFile disthead
changeWorkingDirectory propellordir changeWorkingDirectory propellordir
headknown <- catchMaybeIO $ headknown <- catchMaybeIO $