Add ssh multiplexing options to default REMOTE_EXEC and REMOTE_COPY.

9 years ago · bb43a8f47f
parent 36d6ffbe74
commit bb43a8f47f
1 changed files with 4 additions and 2 deletions
--- a/cdist/init.py
+++ b/cdist/init.py
@ -41,8 +41,10 @@ BANNER = """
   "P'        ""         ""
 """

-REMOTE_COPY = "scp -o User=root -q"
-REMOTE_EXEC = "ssh -o User=root -q"
+SSH_MUX_OPTS = ("-o ControlPath=~/.ssh/master-%l-%r@%h:%p"
+    " -o ControlMaster=auto -o ControlPersist=125")
+REMOTE_COPY = "scp -o User=root -q " + SSH_MUX_OPTS
+REMOTE_EXEC = "ssh -o User=root -q " + SSH_MUX_OPTS

 class Error(Exception):
    """Base exception class for this project"""