From 82d50a57968c73adaa4feb1a245d93403c72ce09 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 18 Nov 2014 00:19:11 -0400 Subject: Avoid outputting color setting sequences when not run on a terminal. Currently TERM is checked for every message. Could be memoized, but it would add complexity, and typical propellor output is not going to be more than a few hundred messages, and likely this will be swamped by the actual work. --- debian/changelog | 1 + 1 file changed, 1 insertion(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 3858ac2f..b0d5f7e1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ propellor (0.9.3) UNRELEASED; urgency=medium * Convert GpgKeyId to newtype. * DigitalOcean.distroKernel property now reboots into the distribution kernel when necessary. + * Avoid outputting color setting sequences when not run on a terminal. -- Joey Hess Mon, 10 Nov 2014 11:15:27 -0400 -- cgit v1.3-2-g0d8e From 40f6d06f1a65b3a12adb853ab924e1181b0855b2 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 18 Nov 2014 01:01:50 -0400 Subject: Run remote propellor --spin with a controlling terminal. Avoids need for hack to make ansi colors work, but also things like apt-get and wget process bars will be displayed. --- debian/changelog | 1 + src/Propellor/CmdLine.hs | 21 +++++++++++++-------- src/Propellor/Message.hs | 8 +------- src/Propellor/Types.hs | 2 +- 4 files changed, 16 insertions(+), 16 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index b0d5f7e1..1778338c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ propellor (0.9.3) UNRELEASED; urgency=medium * DigitalOcean.distroKernel property now reboots into the distribution kernel when necessary. * Avoid outputting color setting sequences when not run on a terminal. + * Run remote propellor --spin with a controlling terminal. -- Joey Hess Mon, 10 Nov 2014 11:15:27 -0400 diff --git a/src/Propellor/CmdLine.hs b/src/Propellor/CmdLine.hs index 21c4d95e..3a354098 100644 --- a/src/Propellor/CmdLine.hs +++ b/src/Propellor/CmdLine.hs @@ -41,7 +41,7 @@ processCmdLine = go =<< getArgs where go ("--help":_) = usage go ("--spin":h:[]) = return $ Spin h - go ("--boot":h:[]) = return $ Boot h + go ("--sync":[]) = return $ Sync go ("--add-key":k:[]) = return $ AddKey k go ("--set":f:c:[]) = withprivfield f c Set go ("--dump":f:c:[]) = withprivfield f c Dump @@ -91,7 +91,7 @@ defaultMain hostlist = do ( onlyProcess $ withhost hn mainProperties , go True (Spin hn) ) - go False (Boot hn) = onlyProcess $ withhost hn boot + go False Sync = onlyProcess sync withhost :: HostName -> (Host -> IO ()) -> IO () withhost hn a = maybe (unknownhost hn hostlist) a (findHost hostlist hn) @@ -186,6 +186,8 @@ spin hn hst = do void $ boolSystem "git" [Param "push"] cacheparams <- toCommand <$> sshCachingParams hn go cacheparams url =<< hostprivdata + unlessM (boolSystem "ssh" (map Param (cacheparams ++ ["-t", user, spincmd]))) $ + error "remote propellor failed" where hostprivdata = show . filterPrivData hst <$> decryptPrivData @@ -209,7 +211,9 @@ spin hn hst = do user = "root@"++hn - bootstrapcmd = shellWrap $ intercalate " ; " + mkcmd = shellWrap . intercalate " ; " + + bootstrapcmd = mkcmd [ "if [ ! -d " ++ localdir ++ " ]" , "then " ++ intercalate " && " [ "apt-get update" @@ -219,11 +223,14 @@ spin hn hst = do , "else " ++ intercalate " && " [ "cd " ++ localdir , "if ! test -x ./propellor; then make deps build; fi" - , "./propellor --boot " ++ hn + , "./propellor --sync" ] , "fi" ] + spincmd = mkcmd + [ "cd " ++ localdir ++ " && ./propellor --spin " ++ hn ] + getstatus :: Handle -> IO BootStrapStatus getstatus h = do l <- hGetLine h @@ -295,16 +302,14 @@ fromMarked marker s len = length marker matches = filter (marker `isPrefixOf`) $ lines s -boot :: Host -> IO () -boot h = do +sync :: IO () +sync = do sendMarked stdout statusMarker $ show Ready reply <- hGetContentsStrict stdin makePrivDataDir maybe noop (writeFileProtected privDataLocal) $ fromMarked privDataMarker reply - forceConsoleMode - mainProperties h getUrl :: IO String getUrl = maybe nourl return =<< getM get urls diff --git a/src/Propellor/Message.hs b/src/Propellor/Message.hs index 3671e05b..e184a59e 100644 --- a/src/Propellor/Message.hs +++ b/src/Propellor/Message.hs @@ -6,26 +6,20 @@ import System.Console.ANSI import System.IO import System.Log.Logger import "mtl" Control.Monad.Reader -import Control.Applicative -import Data.Maybe import Propellor.Types import Utility.Monad -import Utility.Env data MessageHandle = ConsoleMessageHandle | TextMessageHandle mkMessageHandle :: IO MessageHandle -mkMessageHandle = ifM (hIsTerminalDevice stdout <||> (isJust <$> getEnv "TERM")) +mkMessageHandle = ifM (hIsTerminalDevice stdout) ( return ConsoleMessageHandle , return TextMessageHandle ) -forceConsoleMode :: IO () -forceConsoleMode = void $ setEnv "TERM" "vt100" False - whenConsole :: MessageHandle -> IO () -> IO () whenConsole ConsoleMessageHandle a = a whenConsole _ _ = return () diff --git a/src/Propellor/Types.hs b/src/Propellor/Types.hs index b606cef2..b3636eb4 100644 --- a/src/Propellor/Types.hs +++ b/src/Propellor/Types.hs @@ -137,7 +137,6 @@ instance ActionResult Result where data CmdLine = Run HostName | Spin HostName - | Boot HostName | Set PrivDataField Context | Dump PrivDataField Context | Edit PrivDataField Context @@ -145,5 +144,6 @@ data CmdLine | AddKey String | Continue CmdLine | Chain HostName + | Sync | Docker HostName deriving (Read, Show, Eq) -- cgit v1.3-2-g0d8e From a0ea904ecb43e4fef4ea13d68d7dd41ebbdf5b54 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 18 Nov 2014 14:01:13 -0400 Subject: changelog for last commit's changes --- debian/changelog | 3 +++ 1 file changed, 3 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 1778338c..4a3853f8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,9 @@ propellor (0.9.3) UNRELEASED; urgency=medium kernel when necessary. * Avoid outputting color setting sequences when not run on a terminal. * Run remote propellor --spin with a controlling terminal. + * The git repo url is updated whenever propellor --spin is used, + and a central git repo does not need to be set up before using --spin + for the first time. -- Joey Hess Mon, 10 Nov 2014 11:15:27 -0400 -- cgit v1.3-2-g0d8e From 74e067fa7640847cb0395ab4bf17c1d01c3b9349 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 18 Nov 2014 17:26:02 -0400 Subject: propellor spin --- debian/changelog | 9 ++++++--- doc/README.mdwn | 45 +++++++++++++++++++++++++++++++++------------ src/Propellor/CmdLine.hs | 6 ++---- 3 files changed, 41 insertions(+), 19 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 4a3853f8..2e5a8bbd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,11 @@ propellor (0.9.3) UNRELEASED; urgency=medium + * propellor --spin can now be used to update remote hosts, without + any central git repository being used. The git repository is updated + over propellor's ssh connection to the remote host. The central + git repository is still useful for running propellor from cron, + but this simplifies getting started with propellor. + * The git repo url, if any, is updated whenever propellor --spin is used. * Added prosody module, contributed by Félix Sipma. * Can be used to configure tor hidden services. Thanks, Félix Sipma. * When multiple gpg keys are added, ensure that the privdata file @@ -9,9 +15,6 @@ propellor (0.9.3) UNRELEASED; urgency=medium kernel when necessary. * Avoid outputting color setting sequences when not run on a terminal. * Run remote propellor --spin with a controlling terminal. - * The git repo url is updated whenever propellor --spin is used, - and a central git repo does not need to be set up before using --spin - for the first time. -- Joey Hess Mon, 10 Nov 2014 11:15:27 -0400 diff --git a/doc/README.mdwn b/doc/README.mdwn index a0742f78..47fa8e40 100644 --- a/doc/README.mdwn +++ b/doc/README.mdwn @@ -35,7 +35,7 @@ see [configuration for the Haskell newbie](https://propellor.branchable.com/hask ## quick start -1. Get propellor installed +1. Get propellor installed on your laptop. `cabal install propellor` or `apt-get install propellor` @@ -44,25 +44,46 @@ see [configuration for the Haskell newbie](https://propellor.branchable.com/hask 3. If you don't have a gpg private key already, generate one: `gpg --gen-key` 4. Run: `propellor --add-key $KEYID`, which will make propellor trust your gpg key, and will sign your `~/.propellor` repository using it. -5. Push the git repository to a central server (github or your own): - `cd ~/.propellor/; git remote add origin ssh://git.example.com/propellor.git; git push -u origin master` -6. Edit `~/.propellor/config.hs`, and add a host you want to manage. +5. Edit `~/.propellor/config.hs`, and add a host you want to manage. You can start by not adding any properties, or only a few. -7. Pick a host and run: `propellor --spin $HOST` -8. Now you have a simple propellor deployment, but it doesn't do +6. Pick a host and run: `propellor --spin $HOST` +7. Now you have a simple propellor deployment, but it doesn't do much to the host yet, besides installing propellor. So, edit `~/.propellor/config.hs` to configure the host (maybe - start with a few simple properties), and re-run step 7. + start with a few simple properties), and re-run step 6. Repeat until happy and move on to the next host. :) -9. To move beyond manually running `propellor --spin` against hosts - when you change their properties, add a property to your hosts - like: `Cron.runPropellor "30 * * * *"` - +8. Write some neat new properties and send patches! + +## adding a central git repository + +The above quick start uses propellor without any central git repository. +Instead, the git repo on a host gets updated from the repo on your laptop +whenever you run `propellor --spin $HOST`. + +A central git repository allows hosts to run propellor from cron and pick +up any updates you may have pushed. This is useful when managing several +hosts with propellor. + +You can add a central git repository to your existing propellor setup easily: + +1. Push propellor's git repository to a central server (github or your own): + `cd ~/.propellor/; git remote add origin ssh://git.example.com/propellor.git; git push -u origin master` + +2. Configure the url your hosts should use for the git repisitory, if + it differs from the url above, by setting up a remote named "deploy": + `cd ~/.propellor/; git remote add deploy git://git.example.com/propellor.git` + +2. Add a property to your hosts like: + `Cron.runPropellor "30 * * * *"` + +3. Let your hosts know about the changed configuration (including the url + to the central repository), by running `proellor --spin $HOST` for each + of your hosts. + Now they'll automatically update every 30 minutes, and you can `git commit -S` and `git push` changes that affect any number of hosts. -10. Write some neat new properties and send patches! ## debugging diff --git a/src/Propellor/CmdLine.hs b/src/Propellor/CmdLine.hs index db7d93ae..e7da0a80 100644 --- a/src/Propellor/CmdLine.hs +++ b/src/Propellor/CmdLine.hs @@ -315,10 +315,8 @@ boot = do hout <- dup stdOutput hClose stdin hClose stdout - unlessM (boolSystem "git" [Param "fetch", Param "--progress", Param "--upload-pack", Param $ "./propellor --gitpush " ++ show hin ++ " " ++ show hout, Param "."]) $ - errorMessage "git fetch from client failed" - unlessM (boolSystem "git" [Param "merge", Param "--quiet", Param "FETCH_HEAD"]) $ - errorMessage "git merge failed" + unlessM (boolSystem "git" [Param "pull", Param "--progress", Param "--upload-pack", Param $ "./propellor --gitpush " ++ show hin ++ " " ++ show hout, Param "."]) $ + errorMessage "git pull from client failed" -- Shim for git push over the propellor ssh channel. -- Reads from stdin and sends it to hout; -- cgit v1.3-2-g0d8e