forked from ungleich-public/cdist
		
	Revert "Add ssh multiplexing options to default REMOTE_EXEC and REMOTE_COPY."
This reverts commit bb43a8f47f.
	
	
This commit is contained in:
		
					parent
					
						
							
								bb43a8f47f
							
						
					
				
			
			
				commit
				
					
						2dfc30e3c4
					
				
			
		
					 1 changed files with 2 additions and 4 deletions
				
			
		| 
						 | 
					@ -41,10 +41,8 @@ BANNER = """
 | 
				
			||||||
   "P'        ""         ""
 | 
					   "P'        ""         ""
 | 
				
			||||||
"""
 | 
					"""
 | 
				
			||||||
 | 
					
 | 
				
			||||||
SSH_MUX_OPTS = ("-o ControlPath=~/.ssh/master-%l-%r@%h:%p"
 | 
					REMOTE_COPY = "scp -o User=root -q"
 | 
				
			||||||
    " -o ControlMaster=auto -o ControlPersist=125")
 | 
					REMOTE_EXEC = "ssh -o User=root -q"
 | 
				
			||||||
REMOTE_COPY = "scp -o User=root -q " + SSH_MUX_OPTS
 | 
					 | 
				
			||||||
REMOTE_EXEC = "ssh -o User=root -q " + SSH_MUX_OPTS
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
class Error(Exception):
 | 
					class Error(Exception):
 | 
				
			||||||
    """Base exception class for this project"""
 | 
					    """Base exception class for this project"""
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue