diff options
| author | Joey Hess <joeyh@joeyh.name> | 2015-03-22 10:05:03 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-03-22 10:05:03 -0400 |
| commit | fe7b1233f4fef3d9717eaa30e7781b3bdb21c058 (patch) | |
| tree | 31398337ac0b1f65618087966126d4a156573a28 /src | |
| parent | 93fe81bae9a632f19c6d64ecad9c7567821214dd (diff) | |
| parent | b32d05a661ff2b928bf9472abe8a39743ccea1e7 (diff) | |
Merge branch 'joeyconfig'
Diffstat (limited to 'src')
| -rw-r--r-- | src/Propellor/Property/SiteSpecific/JoeySites.hs | 2 | ||||
| -rw-r--r-- | src/wrapper.hs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs index 5f0472ca..235a3a75 100644 --- a/src/Propellor/Property/SiteSpecific/JoeySites.hs +++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs @@ -69,7 +69,7 @@ scrollBox = propertyList "scroll server" $ props , "echo 'or, type comments below (finish with a dot on its own line)'" , "echo" , "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))) & Apt.installed ["bsd-mailx"] -- prevent port forwarding etc by not letting scroll log in via ssh diff --git a/src/wrapper.hs b/src/wrapper.hs index 034eb2bf..a73ed969 100644 --- a/src/wrapper.hs +++ b/src/wrapper.hs @@ -77,7 +77,7 @@ wrapper args propellordir propellorbin = do , 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 changeWorkingDirectory propellordir headknown <- catchMaybeIO $ |