-- cgit v1.2.3 From 9c0e9e2f192541db06d6559722c64ee740975236 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 5 May 2014 13:30:23 -0300 Subject: propellor spin --- Propellor/Property/Docker.hs | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/Propellor/Property/Docker.hs b/Propellor/Property/Docker.hs index e5b8d64a..6757c7cc 100644 --- a/Propellor/Property/Docker.hs +++ b/Propellor/Property/Docker.hs @@ -346,11 +346,18 @@ provisionContainer cid = containerDesc cid $ property "provision" $ liftIO $ do hPutStrLn stderr s hFlush stderr go Nothing rest - Done -> ret lastline - go lastline [] = ret lastline - - ret lastline = return $ fromMaybe FailedChange $ - readish =<< lastline + Done -> do + debug ["reached Done"] + ret lastline + go lastline [] = do + debug ["reached end of output"] + ret lastline + + ret lastline = do + let v = fromMaybe FailedChange $ + readish =<< lastline + debug ["provisionContainer returning", show v] + return v stopContainer :: ContainerId -> IO Bool stopContainer cid = boolSystem dockercmd [Param "stop", Param $ fromContainerId cid ] -- cgit v1.2.3 From da7ae2521482b04a3813db964074b638c91b7d6a Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 9 May 2014 09:34:09 -0300 Subject: propellor spin --- config-joey.hs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/config-joey.hs b/config-joey.hs index a35f77bd..d4b44834 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -72,14 +72,18 @@ hosts = -- (o) ` & alias "ns9.kitenet.net" & myDnsSecondary - - & Docker.garbageCollected `period` Daily - & Apt.installed ["git-annex", "mtr", "screen"] + + & alias "znc.kitenet.net" + & Apt.installed ["znc"] + & User.accountFor "znc" -- Nothing is using https on clam, so listen on that port -- for ssh, for traveling on bad networks. & "/etc/ssh/sshd_config" `File.containsLine` "Port 443" `onChange` Service.restarted "ssh" + + & Docker.garbageCollected `period` Daily + & Apt.installed ["git-annex", "mtr", "screen"] -- Orca is the main git-annex build box. , standardSystem "orca.kitenet.net" Unstable "amd64" -- cgit v1.2.3 -- cgit v1.2.3 From 1123b9b4693193af9152e7ce6828d31d86decbc6 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 9 May 2014 09:42:45 -0300 Subject: propellor spin --- Propellor/Property/SiteSpecific/JoeySites.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Propellor/Property/SiteSpecific/JoeySites.hs b/Propellor/Property/SiteSpecific/JoeySites.hs index bdc60a5b..1d555537 100644 --- a/Propellor/Property/SiteSpecific/JoeySites.hs +++ b/Propellor/Property/SiteSpecific/JoeySites.hs @@ -105,7 +105,8 @@ kgbServer = withOS desc $ \o -> case o of mumbleServer :: [Host] -> Property mumbleServer hosts = combineProperties "mumble.debian.net" - [ Obnam.latestVersion + [ Apt.serviceInstalledRunning "mumble-server" + , Obnam.latestVersion , Obnam.backup "/var/lib/mumble-server" "55 5 * * *" [ "--repository=sftp://joey@turtle.kitenet.net/~/lib/backup/mumble.debian.net.obnam" , "--client-name=mumble" @@ -113,7 +114,6 @@ mumbleServer hosts = combineProperties "mumble.debian.net" `requires` Ssh.keyImported SshRsa "root" `requires` Ssh.knownHost hosts "turtle.kitenet.net" "root" , trivial $ cmdProperty "chown" ["-R", "mumble-server:mumble-server", "/var/lib/mumble-server"] - , Apt.serviceInstalledRunning "mumble-server" ] obnamLowMem :: Property -- cgit v1.2.3 -- cgit v1.2.3 -- cgit v1.2.3 From 904c58262a75e877dac30f393d6fcf2e96778412 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 9 May 2014 10:17:39 -0300 Subject: propellor spin --- config-joey.hs | 1 + 1 file changed, 1 insertion(+) diff --git a/config-joey.hs b/config-joey.hs index d4b44834..38e9b096 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -334,6 +334,7 @@ monsters = -- but do want to track their public keys etc. & alias "joey.kitenet.net" & alias "annex.kitenet.net" & alias "ipv6.kitenet.net" + & alias "bitlbee.kitenet.net" , host "mouse.kitenet.net" & ipv6 "2001:4830:1600:492::2" , host "beaver.kitenet.net" -- cgit v1.2.3 -- cgit v1.2.3 From 26254bf8c79a83bc5e76deea81a3cabfaec6c8b2 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 9 May 2014 10:31:30 -0300 Subject: propellor spin --- Propellor/Property/SiteSpecific/JoeySites.hs | 12 ++++++++++++ config-joey.hs | 3 +-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/Propellor/Property/SiteSpecific/JoeySites.hs b/Propellor/Property/SiteSpecific/JoeySites.hs index 1d555537..28b3dffd 100644 --- a/Propellor/Property/SiteSpecific/JoeySites.hs +++ b/Propellor/Property/SiteSpecific/JoeySites.hs @@ -300,3 +300,15 @@ twitRss = combineProperties "twitter rss" crontime = "15 * * * *" feed url desc = Cron.job desc crontime "joey" dir $ "./twitRss " ++ shellEscape url ++ " > " ++ shellEscape ("../" ++ desc ++ ".rss") + +ircBouncer :: Property +ircBouncer = propertyList "IRC bouncer" + [ Apt.installed ["znc"] + , User.accountFor "znc" + , File.hasPrivContent conf + , File.ownerGroup conf "znc" "znc" + , Cron.job "znconboot" "@reboot" "znc" "~" "znc" + , Cron.job "zncrunning" "@hourly" "znc" "~" "znc || true" + ] + where + conf = "/home/znc/.znc/configs/znc.conf" diff --git a/config-joey.hs b/config-joey.hs index 38e9b096..c7c3f3be 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -74,8 +74,7 @@ hosts = -- (o) ` & myDnsSecondary & alias "znc.kitenet.net" - & Apt.installed ["znc"] - & User.accountFor "znc" + & JoeySites.ircBouncer -- Nothing is using https on clam, so listen on that port -- for ssh, for traveling on bad networks. -- cgit v1.2.3 From 201aa34d85575ec1a430a4543c3afa1cc37ec88c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 9 May 2014 10:32:19 -0300 Subject: propellor spin --- privdata/clam.kitenet.net.gpg | 142 +++++++++++++++++++++++------------------- 1 file changed, 78 insertions(+), 64 deletions(-) diff --git a/privdata/clam.kitenet.net.gpg b/privdata/clam.kitenet.net.gpg index 052bc6b3..4b85bfa7 100644 --- a/privdata/clam.kitenet.net.gpg +++ b/privdata/clam.kitenet.net.gpg @@ -1,68 +1,82 @@ -----BEGIN PGP MESSAGE----- Version: GnuPG v1 -hQIMA7ODiaEXBlRZAQ//Vbtv4CUUimUJUgEvuTkr+6UL1dk4Kx5KXydHNrguq/hN -Q2QWetPq+AkGbrrmP0LEqJ739kYQBM5Kpv0vTWTUNyeAZ38NY8MqqeXlTYYUitfg -n98tAjubHzp/5rFPx1GPmwFrZUAver7ySZ73s/GqTYnd2IIBJhWWz6joMRhKPLhI -Fyo3LZ1+Cx3COKCqUqknE4CqWwZ/tbUMOq33We8TanWrbNKalr0wJ+7/8zDl8NjH -cu6IuBDFQLakJmPmgZZ+PIehpCfPXzuIJehuuAQ4sKdE8Wgm4zik3bARlg1lqfZE -cW6Bf84RjgdxDzuq7Oc09jcb7+xevEm/lQkxNzh5RqADBfMGzR2NtXpjbKHLr8m7 -NG1uke8CkKHMdZe/Xg0u3WIkqMvaKp1rfboSMSNl+tmDxg3WLERBhZxZSFkwP7/c -VZDmRA10RMn0RawLfCToPzoy7gK9jH7iM67yYpjh5d6gR46IZSpYdAFDCEBqgjm6 -Qxfvh/lzf+btTna5TXc9FnqVuHlY9o2D4/IeM+u2ESydBKBPEcProHIlxk6Vz+1z -EmOvO0kLsFu7YJTEu8GhuEd1wwoeH7Ca4nBes/PF+su1IGXNUNgUc0eS7JLQACK+ -O9dBVKdMN+1/+BtA5N6S+EzmTMvVIkrhSECoF7nu3cUSd9hdCODFnGGXG0ij33bS -6wEeM0smHfrwx8gbgZxDbSTwH9XbuBVqaN3t6r9UMNPEWpJkQQFZ/B9ashaAOReN -8jIiEqwY+UY5KsuFGe8AJkBOsHu7ODb+2ivYdxk6Wo9wv+HB7S51ePkNsboxwQC9 -cB3I4QcDVJA4OUsOMCpaKpRdfoQbqDamnGzxiBeMf+TLpFJ6zLvV1FrFDjcGR2iC -LdATWZb59kA3Fg8uNsip9c1yhERDXIQOKTUdH/meQVngZfSzRfrMFIevvpZS/9Qu -HbLQOXiTQPzUCHUs3oAiN4ggRAGGMcKhLpCdkGx1AJ2EwM3iJI2pSUfYaqHwE8iO -HWVquAKMYYTb7COLL8/rcZc1NeUGq5qfC1bKvlyNVpbeOnWk5N2rSPKbkAbI9dVa -jOzdbtOMVzRhe8qyTxFy4l69P/RvgzrXNYPp3DpnCO/B0ioGCxhSpoxFzDMBNge+ -ogXxaO+TssyFYqyOnNzzarIsR3gM/GH89/7ZO+bvnX2deySJQt4N/7uo5FBMwKCM -lV1WCiXPVa2Agwp+/St0/MthEFypmCn5PgVwDN2PvWR4boITsqnhrurymBQ9nlfa -IPe225V2TIZjaKku0Zv9bR+Knri/tR9582rO6w53UmVcjrcsezPOxIRDAIKm+T2r -EQbfytYVeGaJc/GK7hGM445gzG6pM2R/tl485592bldEWAryeMJJ71IaXQlal2i1 -qUmDNtOODq7wYQd/H1InxV1cHeMUM3nJrNn0JjkMtxsvnlJNU5SyCVX9N0TkkY5T -dNbXkMmzeJSRqvHCLlbRfOudejYxxdp5lQzBbvoInfVx0MGRO3O9D5j3c+VDKO+1 -76gB+sN+8x7mM1r8DzixYcFfaPsnseCQuZy3lh1Le+VBohk+7yv2boKVYF79RB5t -IKDWxmp62pjhOZyNvOCu2e3hdh2KOeUdyW0hQWkzscOJN28o5USnHU+pTguvikez -jIbU73Cefpg4gyDnhTwelZCkRKokXS2gS7bFkVwVqjp5DbdGvBmITW4TfuGCJ1zd -N0fCu3XUFsk0uIhhJJ6kXsRcJFvHCcIhyXCMxW656hlcIjeDUOup1jNWfaQ2LMTC -HSNTmKYXpOuA/A/tkGF9yBzMSwqskMXcnNIVfi8kj+uNq6/1IFoolu5JHJKBxZwi -QqkpWJ5j8qkajCSyZksqQyScMn/T8/g6qK+bprMZP8vc3R9jiCyvehvkKHg3wnBs -G08MKNYiwlzfQm0t3iJ7EBv6k5a+zn2X187NcvignsRrgfcPHpb/XmgvxqmM6DyD -KspIxWwOSCQJSjR0lcYSBX+Efnx1zg6XpOsUtgelaIQ/H6KxF3997tza7x9emniq -j4FJqPeKTyp8rBdJmJJ13dIxfkfqTjuOJ7hth6hrsU0RlKbFfMFP0MrNBpb/aZZa -4lVR9N0sT6kyXbj8dFKwyQrgsQIjlzpXmJB3O6RA3ydaoJycN/AUEf510CQ0dZ7j -yXCxCeCm8PIS+Pcffg9gBLN2kY8NH5PQYww0ydfigRmJMUTBtPW545pAyxilEsxX -rgWeYft6hE447lLwPgJk2DgAKf+E1Osge3qW2VkR6WrOraWiconpoRWbNon31EUs -G3l7CIXVugzjfehMolq3W7jf8VcmYp9eGQcGTo9zdxSI7yZuw9aaKKyMvGYkoKLw -tNWPAZFtSJQ23flGR7Ga5VDS5RGJAtNc6kIzXVP6IXreuEIJajuObFkgavpgZiTx -Tswp3EvaqPaR5TuyWWtmFjxhhVh1Q8fNyY8UsMClwVYhmMcLgn2r8FjL/zy1K/rL -i0izJokwU8/e1g5jPNxGGgzITQEkPVA7qdHdJ75xA8rFer8LUKsAoxEkaJG2TRrj -RuGtSTPXRzX1EqCLc6U/Q51PBmiDJXSe4vhohaqzq68Bb/lc94zdY9/t8rscJLnH -ZJUTkSl46ZyOANIsY/DFsAKLqcKWn4F6vdRzTJ7t/ng+s/xxIYZT9vpA0BQtPf9D -OzfsLj5UUeWW5/T9fV+Ee+mwzhas0yQc507rEUvNIluciwHHKpBN/FpAleakgkJB -5Ion0vI5PBDwiA881fbop7M+EcoHG9Z8/M5W9eG1QNmiA4FFkxSmgsvw3MyartT3 -4Ogmkwd5mmqS4o8i7i0N81Wwh+cX6HU1ifw8MjeE1Yshv4WVxqygqHnw26IybdVn -KWWkWn1jQhfiFm5rzqAXVQb4jlvpueL7DvaQDzpLGQLivSFZfPbkILIvFTdYcZWY -zV1i74TIkHmwf6W17gjGn08bv2QPQyHkRhy8++v7eSWLxzhVeWPD1X5AshvbayBj -udKyC0irZi6R5BZ1T3xodyX4GNXIdp3htNb8VV9djJ57Mc7uBRFAy5hNvhmtJXfA -+qob3p8Zm0wIVwCDgt7z2sHEcGaV2fph3VPibQad1qUImj+7y+hrSbctqL1dmZuU -h2i6Yt5eZ2JJaRQMpooiSCIYVZRgXyNfYsL9T41FQWQhnKiX2JmzCqzQ2EcDNVtX -2k/HZL7KZP4VEXEPXRZcO1uplb+SBuhtn9eNTNz12ajPQhR/EwFJ3KbuuQnamhXL -1kjnCLh6t56TbKltCaL9UMPWt44fmNUOau2Z6wFCiQnB8BUCdwh7Vez10h32iQzN -2J9Jx7bKKwND3nI6FPW+YDJgTYGAdPdS8ihy7CJiDH3vbAfAFDyORUFTTbByMSHt -dpdhjeG3G3O6emdvbl44u7ZXk1HeJNXuaJBG8xWWZHX3wNf34V9C+boK34+yFm0H -b6Z829BtAZZB2l6m+Fz0WWGGNUx9zFBAaQzh21oP+O3EseKVA+Y+8MivFMCuZgEI -Xljhuv/zG1wfYZKn9XJWt9L9gok2T9BoHJWPFj52QmzpH2q/teS26+4HrXiu8uQF -ilP6yV+JTh/qhEeDdzybQA9xZ2aGCKPRNbrCPExjaPu8pMr45+zur+klndS178iU -DMLaNO074WuPFK2o0QuHtF9Z1JM6yRIIgO+T8APzg7cuxh+9xBkOAPTkvFBmoYxP -tzsN9azP5lqy8H34pxk6kQJ9anbq20ZY8t6q5Oreq1VBh/FvJYi5FnCWcSH0zn8O -QD3JRCBQRgbd5EaU9zWgIRr9P032iZePLL1t02y3v9Cgb9Dxf3r3MiZZm5rks8QG -irziXV0IWeM6mPkpwYSrTcc5dQpWD1YdVp3pR8gYr9qmHPaESQ9BlvPK/aLjXhti -SDFgcUHclljFRPHfj/JBB3fvTytQFrlQzjLdvmbzmake07YtcVYK1AnnDQ0oTZsH -rZ/dBe5tZ4HbXw== -=xx7F +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 +=5rkr -----END PGP MESSAGE----- -- cgit v1.2.3 From ee06f4ce46074989b0f65d788805bcb9198ffc82 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 9 May 2014 12:02:05 -0300 Subject: propellor spin --- Propellor/SimpleSh.hs | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/Propellor/SimpleSh.hs b/Propellor/SimpleSh.hs index 73ff41ae..d99268d1 100644 --- a/Propellor/SimpleSh.hs +++ b/Propellor/SimpleSh.hs @@ -35,14 +35,7 @@ simpleSh namedpipe = do maybe noop (run h) . readish =<< hGetLine h where run h (Cmd cmd params) = do - let p = (proc cmd params) - { std_in = Inherit - , std_out = CreatePipe - , std_err = CreatePipe - } - (Nothing, Just outh, Just errh, pid) <- createProcess p chan <- newChan - let runwriter = do v <- readChan chan hPutStrLn h (show v) @@ -52,20 +45,28 @@ simpleSh namedpipe = do _ -> runwriter writer <- async runwriter - let mkreader t from = maybe noop (const $ mkreader t from) - =<< catchMaybeIO (writeChan chan . t =<< hGetLine from) - void $ concurrently - (mkreader StdoutLine outh) - (mkreader StderrLine errh) + flip catchIO (\_e -> writeChan chan Done) $ do + let p = (proc cmd params) + { std_in = Inherit + , std_out = CreatePipe + , std_err = CreatePipe + } + (Nothing, Just outh, Just errh, pid) <- createProcess p + + let mkreader t from = maybe noop (const $ mkreader t from) + =<< catchMaybeIO (writeChan chan . t =<< hGetLine from) + void $ concurrently + (mkreader StdoutLine outh) + (mkreader StderrLine errh) - void $ tryIO $ waitForProcess pid + void $ tryIO $ waitForProcess pid - writeChan chan Done + writeChan chan Done - wait writer + hClose outh + hClose errh - hClose outh - hClose errh + wait writer hClose h simpleShClient :: FilePath -> String -> [String] -> ([Resp] -> IO a) -> IO a -- cgit v1.2.3 -- cgit v1.2.3 From c2375ae087903fb2c956eb046adf857b6b2f4ae2 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 9 May 2014 13:13:59 -0300 Subject: rename file because of OSX brain-damage --- propellor.cabal | 2 +- propellor.hs | 93 --------------------------------------------------------- wrapper.hs | 93 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 94 insertions(+), 94 deletions(-) delete mode 100644 propellor.hs create mode 100644 wrapper.hs diff --git a/propellor.cabal b/propellor.cabal index 30d61af9..f659fa54 100644 --- a/propellor.cabal +++ b/propellor.cabal @@ -34,7 +34,7 @@ Description: It is configured using haskell. Executable propellor - Main-Is: propellor.hs + Main-Is: wrapper.hs GHC-Options: -Wall -threaded Build-Depends: MissingH, directory, filepath, base >= 4.5, base < 5, IfElse, process, bytestring, hslogger, unix-compat, ansi-terminal, diff --git a/propellor.hs b/propellor.hs deleted file mode 100644 index 2478450f..00000000 --- a/propellor.hs +++ /dev/null @@ -1,93 +0,0 @@ --- | Wrapper program for propellor distribution. --- --- Distributions should install this program into PATH. --- (Cabal builds it as dict/build/propellor. --- --- This is not the propellor main program (that's config.hs) --- --- This installs propellor's source into ~/.propellor, --- uses it to build the real propellor program (if not already built), --- and runs it. --- --- The source is either copied from /usr/src/propellor, or is cloned from --- git over the network. - -module Main where - -import Utility.UserInfo -import Utility.Monad -import Utility.Process -import Utility.SafeCommand -import Utility.Directory - -import Control.Monad -import Control.Monad.IfElse -import System.Directory -import System.FilePath -import System.Environment (getArgs) -import System.Exit -import System.Posix.Directory - -srcdir :: FilePath -srcdir = "/usr/src/propellor" - --- Using the github mirror of the main propellor repo because --- it is accessible over https for better security. -srcrepo :: String -srcrepo = "https://github.com/joeyh/propellor.git" - -main :: IO () -main = do - args <- getArgs - home <- myHomeDir - let propellordir = home ".propellor" - let propellorbin = propellordir "propellor" - wrapper args propellordir propellorbin - -wrapper :: [String] -> FilePath -> FilePath -> IO () -wrapper args propellordir propellorbin = do - unlessM (doesDirectoryExist propellordir) $ - makeRepo - buildruncfg - where - chain = do - (_, _, _, pid) <- createProcess (proc propellorbin args) - exitWith =<< waitForProcess pid - makeRepo = do - putStrLn $ "Setting up your propellor repo in " ++ propellordir - putStrLn "" - ifM (doesDirectoryExist srcdir) - ( do - void $ boolSystem "cp" [Param "-a", File srcdir, File propellordir] - changeWorkingDirectory propellordir - void $ boolSystem "git" [Param "init"] - void $ boolSystem "git" [Param "add", Param "."] - setuprepo True - , do - void $ boolSystem "git" [Param "clone", Param srcrepo, File propellordir] - void $ boolSystem "git" [Param "remote", Param "rm", Param "origin"] - setuprepo False - ) - setuprepo fromsrcdir = do - changeWorkingDirectory propellordir - whenM (doesDirectoryExist "privdata") $ - mapM_ nukeFile =<< dirContents "privdata" - void $ boolSystem "git" [Param "commit", Param "--allow-empty", Param "--quiet", Param "-m", Param "setting up propellor git repository"] - void $ boolSystem "git" [Param "remote", Param "add", Param "upstream", Param srcrepo] - -- Connect synthetic git repo with upstream history so - -- merging with upstream will work going forward. - -- Note -s ours is used to avoid getting any divergent - -- changes from upstream. - when fromsrcdir $ do - void $ boolSystem "git" [Param "fetch", Param "upstream"] - version <- readProcess "dpkg-query" ["--showformat", "${Version}", "--show", "propellor"] - void $ boolSystem "git" [Param "merge", Param "-s", Param "ours", Param version] - buildruncfg = do - changeWorkingDirectory propellordir - ifM (boolSystem "make" [Param "build"]) - ( do - putStrLn "" - putStrLn "" - chain - , error "Propellor build failed." - ) diff --git a/wrapper.hs b/wrapper.hs new file mode 100644 index 00000000..f180e855 --- /dev/null +++ b/wrapper.hs @@ -0,0 +1,93 @@ +-- | Wrapper program for propellor distribution. +-- +-- Distributions should install this program into PATH. +-- (Cabal builds it as dist/build/propellor. +-- +-- This is not the propellor main program (that's config.hs) +-- +-- This installs propellor's source into ~/.propellor, +-- uses it to build the real propellor program (if not already built), +-- and runs it. +-- +-- The source is either copied from /usr/src/propellor, or is cloned from +-- git over the network. + +module Main where + +import Utility.UserInfo +import Utility.Monad +import Utility.Process +import Utility.SafeCommand +import Utility.Directory + +import Control.Monad +import Control.Monad.IfElse +import System.Directory +import System.FilePath +import System.Environment (getArgs) +import System.Exit +import System.Posix.Directory + +srcdir :: FilePath +srcdir = "/usr/src/propellor" + +-- Using the github mirror of the main propellor repo because +-- it is accessible over https for better security. +srcrepo :: String +srcrepo = "https://github.com/joeyh/propellor.git" + +main :: IO () +main = do + args <- getArgs + home <- myHomeDir + let propellordir = home ".propellor" + let propellorbin = propellordir "propellor" + wrapper args propellordir propellorbin + +wrapper :: [String] -> FilePath -> FilePath -> IO () +wrapper args propellordir propellorbin = do + unlessM (doesDirectoryExist propellordir) $ + makeRepo + buildruncfg + where + chain = do + (_, _, _, pid) <- createProcess (proc propellorbin args) + exitWith =<< waitForProcess pid + makeRepo = do + putStrLn $ "Setting up your propellor repo in " ++ propellordir + putStrLn "" + ifM (doesDirectoryExist srcdir) + ( do + void $ boolSystem "cp" [Param "-a", File srcdir, File propellordir] + changeWorkingDirectory propellordir + void $ boolSystem "git" [Param "init"] + void $ boolSystem "git" [Param "add", Param "."] + setuprepo True + , do + void $ boolSystem "git" [Param "clone", Param srcrepo, File propellordir] + void $ boolSystem "git" [Param "remote", Param "rm", Param "origin"] + setuprepo False + ) + setuprepo fromsrcdir = do + changeWorkingDirectory propellordir + whenM (doesDirectoryExist "privdata") $ + mapM_ nukeFile =<< dirContents "privdata" + void $ boolSystem "git" [Param "commit", Param "--allow-empty", Param "--quiet", Param "-m", Param "setting up propellor git repository"] + void $ boolSystem "git" [Param "remote", Param "add", Param "upstream", Param srcrepo] + -- Connect synthetic git repo with upstream history so + -- merging with upstream will work going forward. + -- Note -s ours is used to avoid getting any divergent + -- changes from upstream. + when fromsrcdir $ do + void $ boolSystem "git" [Param "fetch", Param "upstream"] + version <- readProcess "dpkg-query" ["--showformat", "${Version}", "--show", "propellor"] + void $ boolSystem "git" [Param "merge", Param "-s", Param "ours", Param version] + buildruncfg = do + changeWorkingDirectory propellordir + ifM (boolSystem "make" [Param "build"]) + ( do + putStrLn "" + putStrLn "" + chain + , error "Propellor build failed." + ) -- cgit v1.2.3 From dd0e3495cc6bf05eee99ecd437ad67bf5f4842c0 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 10 May 2014 10:46:36 -0300 Subject: merge from git-annex --- Utility/Directory.hs | 2 +- Utility/Exception.hs | 2 +- Utility/FileMode.hs | 1 + Utility/LinuxMkLibs.hs | 2 +- Utility/Process.hs | 4 ++++ Utility/ThreadScheduler.hs | 4 +++- 6 files changed, 11 insertions(+), 4 deletions(-) diff --git a/Utility/Directory.hs b/Utility/Directory.hs index f1bcfada..c2a50714 100644 --- a/Utility/Directory.hs +++ b/Utility/Directory.hs @@ -43,7 +43,7 @@ dirContents d = map (d ) . filter (not . dirCruft) <$> getDirectoryContents d - When the directory does not exist, no exception is thrown, - instead, [] is returned. -} dirContentsRecursive :: FilePath -> IO [FilePath] -dirContentsRecursive topdir = dirContentsRecursiveSkipping (const False) True topdir +dirContentsRecursive = dirContentsRecursiveSkipping (const False) True {- Skips directories whose basenames match the skipdir. -} dirContentsRecursiveSkipping :: (FilePath -> Bool) -> Bool -> FilePath -> IO [FilePath] diff --git a/Utility/Exception.hs b/Utility/Exception.hs index cf2c615c..6f3c059f 100644 --- a/Utility/Exception.hs +++ b/Utility/Exception.hs @@ -18,7 +18,7 @@ import Utility.Data {- Catches IO errors and returns a Bool -} catchBoolIO :: IO Bool -> IO Bool -catchBoolIO a = catchDefaultIO False a +catchBoolIO = catchDefaultIO False {- Catches IO errors and returns a Maybe -} catchMaybeIO :: IO a -> IO (Maybe a) diff --git a/Utility/FileMode.hs b/Utility/FileMode.hs index 4302f8bd..9c15da8c 100644 --- a/Utility/FileMode.hs +++ b/Utility/FileMode.hs @@ -13,6 +13,7 @@ import System.IO import Control.Monad import Control.Exception (bracket) import System.PosixCompat.Types +import Utility.PosixFiles #ifndef mingw32_HOST_OS import System.Posix.Files #endif diff --git a/Utility/LinuxMkLibs.hs b/Utility/LinuxMkLibs.hs index 76e6266d..f4744fcb 100644 --- a/Utility/LinuxMkLibs.hs +++ b/Utility/LinuxMkLibs.hs @@ -49,7 +49,7 @@ inTop top f = top ++ f - link to. Note that some of the libraries may not exist - (eg, linux-vdso.so) -} parseLdd :: String -> [FilePath] -parseLdd = catMaybes . map (getlib . dropWhile isSpace) . lines +parseLdd = mapMaybe (getlib . dropWhile isSpace) . lines where getlib l = headMaybe . words =<< lastMaybe (split " => " l) diff --git a/Utility/Process.hs b/Utility/Process.hs index 1945e4b9..3f93dc2f 100644 --- a/Utility/Process.hs +++ b/Utility/Process.hs @@ -31,6 +31,7 @@ module Utility.Process ( stdinHandle, stdoutHandle, stderrHandle, + processHandle, devNull, ) where @@ -313,6 +314,9 @@ bothHandles :: (Maybe Handle, Maybe Handle, Maybe Handle, ProcessHandle) -> (Han bothHandles (Just hin, Just hout, _, _) = (hin, hout) bothHandles _ = error "expected bothHandles" +processHandle :: (Maybe Handle, Maybe Handle, Maybe Handle, ProcessHandle) -> ProcessHandle +processHandle (_, _, _, pid) = pid + {- Debugging trace for a CreateProcess. -} debugProcess :: CreateProcess -> IO () debugProcess p = do diff --git a/Utility/ThreadScheduler.hs b/Utility/ThreadScheduler.hs index 9d4cfd0a..dd88dc87 100644 --- a/Utility/ThreadScheduler.hs +++ b/Utility/ThreadScheduler.hs @@ -11,9 +11,11 @@ module Utility.ThreadScheduler where import Control.Monad +import Control.Concurrent +#ifndef mingw32_HOST_OS import Control.Monad.IfElse import System.Posix.IO -import Control.Concurrent +#endif #ifndef mingw32_HOST_OS import System.Posix.Signals #ifndef __ANDROID__ -- cgit v1.2.3 From 84efb9bdee0460a6f0c7b744c784dcd8cbe37a9a Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 10 May 2014 11:05:28 -0300 Subject: Licence changed from GPL to BSD. --- GPL | 674 ------------------------------------------ LICENSE | 20 ++ Utility/Applicative.hs | 2 +- Utility/Data.hs | 2 +- Utility/Directory.hs | 2 +- Utility/Env.hs | 2 +- Utility/Exception.hs | 2 +- Utility/FileMode.hs | 2 +- Utility/FileSystemEncoding.hs | 2 +- Utility/LinuxMkLibs.hs | 2 +- Utility/Misc.hs | 2 +- Utility/Monad.hs | 2 +- Utility/Path.hs | 2 +- Utility/PosixFiles.hs | 2 +- Utility/Process.hs | 2 +- Utility/QuickCheck.hs | 2 +- Utility/SafeCommand.hs | 2 +- Utility/Scheduled.hs | 2 +- Utility/ThreadScheduler.hs | 2 +- Utility/Tmp.hs | 2 +- Utility/UserInfo.hs | 2 +- debian/changelog | 6 + debian/copyright | 27 +- debian/lintian-overrides | 1 - doc/index.mdwn | 2 +- propellor.cabal | 4 +- 26 files changed, 70 insertions(+), 702 deletions(-) delete mode 100644 GPL create mode 100644 LICENSE diff --git a/GPL b/GPL deleted file mode 100644 index 94a9ed02..00000000 --- a/GPL +++ /dev/null @@ -1,674 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. diff --git a/LICENSE b/LICENSE new file mode 100644 index 00000000..769eb3fc --- /dev/null +++ b/LICENSE @@ -0,0 +1,20 @@ +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY AUTHORS AND CONTRIBUTORS ``AS IS'' AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +SUCH DAMAGE. diff --git a/Utility/Applicative.hs b/Utility/Applicative.hs index 64400c80..fd8944b2 100644 --- a/Utility/Applicative.hs +++ b/Utility/Applicative.hs @@ -2,7 +2,7 @@ - - Copyright 2012 Joey Hess - - - Licensed under the GNU GPL version 3 or higher. + - License: BSD-2-clause -} module Utility.Applicative where diff --git a/Utility/Data.hs b/Utility/Data.hs index 35925829..2df12b36 100644 --- a/Utility/Data.hs +++ b/Utility/Data.hs @@ -2,7 +2,7 @@ - - Copyright 2013 Joey Hess - - - Licensed under the GNU GPL version 3 or higher. + - License: BSD-2-clause -} module Utility.Data where diff --git a/Utility/Directory.hs b/Utility/Directory.hs index c2a50714..d92327c0 100644 --- a/Utility/Directory.hs +++ b/Utility/Directory.hs @@ -2,7 +2,7 @@ - - Copyright 2011-2014 Joey Hess - - - Licensed under the GNU GPL version 3 or higher. + - License: BSD-2-clause -} {-# LANGUAGE CPP #-} diff --git a/Utility/Env.hs b/Utility/Env.hs index 90ed58f6..6763c24e 100644 --- a/Utility/Env.hs +++ b/Utility/Env.hs @@ -2,7 +2,7 @@ - - Copyright 2013 Joey Hess - - - Licensed under the GNU GPL version 3 or higher. + - License: BSD-2-clause -} {-# LANGUAGE CPP #-} diff --git a/Utility/Exception.hs b/Utility/Exception.hs index 6f3c059f..1fecf65d 100644 --- a/Utility/Exception.hs +++ b/Utility/Exception.hs @@ -2,7 +2,7 @@ - - Copyright 2011-2012 Joey Hess - - - Licensed under the GNU GPL version 3 or higher. + - License: BSD-2-clause -} {-# LANGUAGE ScopedTypeVariables #-} diff --git a/Utility/FileMode.hs b/Utility/FileMode.hs index 9c15da8c..c2ef683a 100644 --- a/Utility/FileMode.hs +++ b/Utility/FileMode.hs @@ -2,7 +2,7 @@ - - Copyright 2010-2012 Joey Hess - - - Licensed under the GNU GPL version 3 or higher. + - License: BSD-2-clause -} {-# LANGUAGE CPP #-} diff --git a/Utility/FileSystemEncoding.hs b/Utility/FileSystemEncoding.hs index 690942cb..b81fdc53 100644 --- a/Utility/FileSystemEncoding.hs +++ b/Utility/FileSystemEncoding.hs @@ -2,7 +2,7 @@ - - Copyright 2012-2014 Joey Hess - - - Licensed under the GNU GPL version 3 or higher. + - License: BSD-2-clause -} {-# LANGUAGE CPP #-} diff --git a/Utility/LinuxMkLibs.hs b/Utility/LinuxMkLibs.hs index f4744fcb..1dc4e1ea 100644 --- a/Utility/LinuxMkLibs.hs +++ b/Utility/LinuxMkLibs.hs @@ -2,7 +2,7 @@ - - Copyright 2013 Joey Hess - - - Licensed under the GNU GPL version 3 or higher. + - License: BSD-2-clause -} module Utility.LinuxMkLibs where diff --git a/Utility/Misc.hs b/Utility/Misc.hs index 9c19df83..949f41e7 100644 --- a/Utility/Misc.hs +++ b/Utility/Misc.hs @@ -2,7 +2,7 @@ - - Copyright 2010-2011 Joey Hess - - - Licensed under the GNU GPL version 3 or higher. + - License: BSD-2-clause -} {-# LANGUAGE CPP #-} diff --git a/Utility/Monad.hs b/Utility/Monad.hs index 1ba43c5f..eba3c428 100644 --- a/Utility/Monad.hs +++ b/Utility/Monad.hs @@ -2,7 +2,7 @@ - - Copyright 2010-2012 Joey Hess - - - Licensed under the GNU GPL version 3 or higher. + - License: BSD-2-clause -} module Utility.Monad where diff --git a/Utility/Path.hs b/Utility/Path.hs index 570350d6..99c9438b 100644 --- a/Utility/Path.hs +++ b/Utility/Path.hs @@ -2,7 +2,7 @@ - - Copyright 2010-2014 Joey Hess - - - Licensed under the GNU GPL version 3 or higher. + - License: BSD-2-clause -} {-# LANGUAGE PackageImports, CPP #-} diff --git a/Utility/PosixFiles.hs b/Utility/PosixFiles.hs index 23edc25c..5abbb578 100644 --- a/Utility/PosixFiles.hs +++ b/Utility/PosixFiles.hs @@ -4,7 +4,7 @@ - - Copyright 2014 Joey Hess - - - Licensed under the GNU GPL version 3 or higher. + - License: BSD-2-clause -} {-# LANGUAGE CPP #-} diff --git a/Utility/Process.hs b/Utility/Process.hs index 3f93dc2f..549ae570 100644 --- a/Utility/Process.hs +++ b/Utility/Process.hs @@ -3,7 +3,7 @@ - - Copyright 2012 Joey Hess - - - Licensed under the GNU GPL version 3 or higher. + - License: BSD-2-clause -} {-# LANGUAGE CPP, Rank2Types #-} diff --git a/Utility/QuickCheck.hs b/Utility/QuickCheck.hs index 7f7234c7..a498ee61 100644 --- a/Utility/QuickCheck.hs +++ b/Utility/QuickCheck.hs @@ -2,7 +2,7 @@ - - Copyright 2012-2014 Joey Hess - - - Licensed under the GNU GPL version 3 or higher. + - License: BSD-2-clause -} {-# OPTIONS_GHC -fno-warn-orphans #-} diff --git a/Utility/SafeCommand.hs b/Utility/SafeCommand.hs index c8318ec2..04fcf390 100644 --- a/Utility/SafeCommand.hs +++ b/Utility/SafeCommand.hs @@ -2,7 +2,7 @@ - - Copyright 2010-2013 Joey Hess - - - Licensed under the GNU GPL version 3 or higher. + - License: BSD-2-clause -} module Utility.SafeCommand where diff --git a/Utility/Scheduled.hs b/Utility/Scheduled.hs index d3ae0620..305410c5 100644 --- a/Utility/Scheduled.hs +++ b/Utility/Scheduled.hs @@ -2,7 +2,7 @@ - - Copyright 2013-2014 Joey Hess - - - Licensed under the GNU GPL version 3 or higher. + - License: BSD-2-clause -} module Utility.Scheduled ( diff --git a/Utility/ThreadScheduler.hs b/Utility/ThreadScheduler.hs index dd88dc87..fc026d7e 100644 --- a/Utility/ThreadScheduler.hs +++ b/Utility/ThreadScheduler.hs @@ -3,7 +3,7 @@ - Copyright 2012, 2013 Joey Hess - Copyright 2011 Bas van Dijk & Roel van Dijk - - - Licensed under the GNU GPL version 3 or higher. + - License: BSD-2-clause -} {-# LANGUAGE CPP #-} diff --git a/Utility/Tmp.hs b/Utility/Tmp.hs index f46e1a5e..0dc9f2c0 100644 --- a/Utility/Tmp.hs +++ b/Utility/Tmp.hs @@ -2,7 +2,7 @@ - - Copyright 2010-2013 Joey Hess - - - Licensed under the GNU GPL version 3 or higher. + - License: BSD-2-clause -} {-# LANGUAGE CPP #-} diff --git a/Utility/UserInfo.hs b/Utility/UserInfo.hs index 9c3bfd42..617c3e94 100644 --- a/Utility/UserInfo.hs +++ b/Utility/UserInfo.hs @@ -2,7 +2,7 @@ - - Copyright 2012 Joey Hess - - - Licensed under the GNU GPL version 3 or higher. + - License: BSD-2-clause -} {-# LANGUAGE CPP #-} diff --git a/debian/changelog b/debian/changelog index 8579097d..7a06e2f9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +propellor (0.5.2) UNRELEASED; urgency=medium + + * Licence changed from GPL to BSD. + + -- Joey Hess Sat, 10 May 2014 11:05:19 -0300 + propellor (0.5.1) unstable; urgency=medium * Primary DNS servers now have allow-transfer automatically populated diff --git a/debian/copyright b/debian/copyright index 690a9af8..3bdd0103 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,9 +3,26 @@ Source: native package Files: * Copyright: © 2010-2014 Joey Hess -License: GPL-3+ +License: BSD-2-clause -License: GPL-3+ - The full text of version 3 of the GPL is distributed as GPL in - this package's source, or in /usr/share/common-licenses/GPL-3 on - Debian systems. +License: BSD-2-clause + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + . + THIS SOFTWARE IS PROVIDED BY AUTHORS AND CONTRIBUTORS ``AS IS'' AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + SUCH DAMAGE. diff --git a/debian/lintian-overrides b/debian/lintian-overrides index 9071fe0f..a5ccccae 100644 --- a/debian/lintian-overrides +++ b/debian/lintian-overrides @@ -1,3 +1,2 @@ # These files are used in a git repository that propellor sets up. propellor: package-contains-vcs-control-file usr/src/propellor/.gitignore -propellor: extra-license-file usr/src/propellor/GPL diff --git a/doc/index.mdwn b/doc/index.mdwn index f0e0befe..5311baf7 100644 --- a/doc/index.mdwn +++ b/doc/index.mdwn @@ -24,7 +24,7 @@ hosts :: [Host] -- * \ | | '--------' hosts = -- (o) ` -Propellor is free software, licensed under the terms of the GNU GPL 3. +Propellor is free software, licensed under the BSD license. ## news diff --git a/propellor.cabal b/propellor.cabal index f659fa54..507a0d4b 100644 --- a/propellor.cabal +++ b/propellor.cabal @@ -1,12 +1,12 @@ Name: propellor Version: 0.5.1 Cabal-Version: >= 1.6 -License: GPL +License: BSD Maintainer: Joey Hess Author: Joey Hess Stability: Stable Copyright: 2014 Joey Hess -License-File: GPL +License-File: LICENSE Build-Type: Simple Homepage: https://propellor.branchable.com/ Category: Utility -- cgit v1.2.3 From 3d2207510709deb9e8e1c18ddb4e517c38aac21b Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 10 May 2014 11:10:46 -0300 Subject: update --- doc/todo/docker_todo_list.mdwn | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/todo/docker_todo_list.mdwn b/doc/todo/docker_todo_list.mdwn index 2f215a50..9cb9e4da 100644 --- a/doc/todo/docker_todo_list.mdwn +++ b/doc/todo/docker_todo_list.mdwn @@ -8,4 +8,6 @@ are assigned to the container. * It seems that provisionContainer sometimes hangs when the container is already running. This seems likely to be a problem with the simpleSh - socket hack. + socket hack. (I think this was an uncaught exception crashing the + simpleSh server thread, and if so, it's fixed. Waiting some weeks to see, + as this bug rarely occurred..) -- cgit v1.2.3 From d7ad05acaaf05c7af066c1d41f3e70e61a9bec96 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 10 May 2014 11:13:42 -0300 Subject: add copyright --- LICENSE | 2 ++ 1 file changed, 2 insertions(+) diff --git a/LICENSE b/LICENSE index 769eb3fc..712c4586 100644 --- a/LICENSE +++ b/LICENSE @@ -1,3 +1,5 @@ +Copyright 2014 Joey Hess and contributors. + Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: -- cgit v1.2.3