diff options
| author | Joey Hess <joeyh@joeyh.name> | 2015-01-06 19:07:40 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-01-06 19:07:40 -0400 |
| commit | 16a5f561f52f35f95a59976b5ee61d99945b0d55 (patch) | |
| tree | 791803645efedbc481cafcd907d2bcf73c03d1af /src/Propellor | |
| parent | f4a57ca27d2009b3069c6b33904d198e6aa73f79 (diff) | |
Merge Utiity modules from git-annex.
Except for a few that are using the other exception handling library,
that propellor has not switched to yet.
Diffstat (limited to 'src/Propellor')
| -rw-r--r-- | src/Propellor/Property/SiteSpecific/JoeySites.hs | 4 | ||||
| -rw-r--r-- | src/Propellor/Shim.hs | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs index 3933262f..2accfdba 100644 --- a/src/Propellor/Property/SiteSpecific/JoeySites.hs +++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs @@ -17,7 +17,6 @@ import qualified Propellor.Property.Apache as Apache import qualified Propellor.Property.Postfix as Postfix import Utility.SafeCommand import Utility.FileMode -import Utility.Path import Data.List import System.Posix.Files @@ -313,6 +312,7 @@ twitRss = combineProperties "twitter rss" "./twitRss " ++ shellEscape url ++ " > " ++ shellEscape ("../" ++ desc ++ ".rss") -- Work around for expired ssl cert. +-- (no longer expired, TODO remove this and change urls) pumpRss :: Property pumpRss = Cron.job "pump rss" "15 * * * *" "joey" "/srv/web/tmp.kitenet.net/" "wget https://pump2rss.com/feed/joeyh@identi.ca.atom -O pump.atom --no-check-certificate 2>/dev/null" @@ -321,7 +321,7 @@ ircBouncer :: Property ircBouncer = propertyList "IRC bouncer" [ Apt.installed ["znc"] , User.accountFor "znc" - , File.dirExists (parentDir conf) + , File.dirExists (takeDirectory conf) , File.hasPrivContent conf anyContext , File.ownerGroup conf "znc" "znc" , Cron.job "znconboot" "@reboot" "znc" "~" "znc" diff --git a/src/Propellor/Shim.hs b/src/Propellor/Shim.hs index a97bf5c8..da4c96eb 100644 --- a/src/Propellor/Shim.hs +++ b/src/Propellor/Shim.hs @@ -9,7 +9,6 @@ module Propellor.Shim (setup, cleanEnv, file) where import Propellor import Utility.LinuxMkLibs import Utility.SafeCommand -import Utility.Path import Utility.FileMode import Utility.FileSystemEncoding @@ -34,7 +33,7 @@ setup propellorbin propellorbinpath dest = checkAlreadyShimmed propellorbin $ do let linker = (dest ++) $ fromMaybe (error "cannot find ld-linux linker") $ headMaybe $ filter ("ld-linux" `isInfixOf`) libs' - let gconvdir = (dest ++) $ parentDir $ + let gconvdir = (dest ++) $ takeDirectory $ fromMaybe (error "cannot find gconv directory") $ headMaybe $ filter ("/gconv/" `isInfixOf`) glibclibs let linkerparams = ["--library-path", intercalate ":" libdirs ] @@ -75,5 +74,5 @@ installFile top f = do createLink f dest `catchIO` (const copy) where copy = void $ boolSystem "cp" [Param "-a", Param f, Param dest] - destdir = inTop top $ parentDir f + destdir = inTop top $ takeDirectory f dest = inTop top f |