mirror of
				https://github.com/hauke68/Magallanes.git
				synced 2025-11-04 09:00:18 +01:00 
			
		
		
		
	Bugfix on host:port config.
This commit is contained in:
		
							parent
							
								
									4863990f68
								
							
						
					
					
						commit
						6bd9d888df
					
				@ -39,7 +39,7 @@ class Mage_Task_BuiltIn_Deployment_Rsync
 | 
				
			|||||||
                 . '--rsh="ssh -p' . $this->_config->getHostPort() . '" '
 | 
					                 . '--rsh="ssh -p' . $this->_config->getHostPort() . '" '
 | 
				
			||||||
                 . $this->_excludes(array_merge($excludes, $userExcludes)) . ' '
 | 
					                 . $this->_excludes(array_merge($excludes, $userExcludes)) . ' '
 | 
				
			||||||
                 . $this->_config->deployment('from') . ' '
 | 
					                 . $this->_config->deployment('from') . ' '
 | 
				
			||||||
                 . $this->_config->deployment('user') . '@' . $this->_config->getHost() . ':' . $deployToDirectory;
 | 
					                 . $this->_config->deployment('user') . '@' . $this->_config->getHostName() . ':' . $deployToDirectory;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        $result = $this->_runLocalCommand($command);
 | 
					        $result = $this->_runLocalCommand($command);
 | 
				
			||||||
        
 | 
					        
 | 
				
			||||||
 | 
				
			|||||||
@ -47,7 +47,7 @@ abstract class Mage_Task_TaskAbstract
 | 
				
			|||||||
        
 | 
					        
 | 
				
			||||||
        $localCommand = 'ssh -p ' . $this->_config->getHostPort() . ' '
 | 
					        $localCommand = 'ssh -p ' . $this->_config->getHostPort() . ' '
 | 
				
			||||||
                      . '-q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no '
 | 
					                      . '-q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no '
 | 
				
			||||||
                      . $this->_config->deployment('user') . '@' . $this->_config->getHost() . ' '
 | 
					                      . $this->_config->deployment('user') . '@' . $this->_config->getHostName() . ' '
 | 
				
			||||||
                      . '"cd ' . rtrim($this->_config->deployment('to'), '/') . $releasesDirectory . ' && '
 | 
					                      . '"cd ' . rtrim($this->_config->deployment('to'), '/') . $releasesDirectory . ' && '
 | 
				
			||||||
                      . $command . '"';
 | 
					                      . $command . '"';
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										2
									
								
								bin/mage
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								bin/mage
									
									
									
									
									
								
							@ -1,5 +1,5 @@
 | 
				
			|||||||
#!/bin/sh
 | 
					#!/bin/sh
 | 
				
			||||||
#VERSION:0.9.5
 | 
					#VERSION:0.9.6
 | 
				
			||||||
 | 
					
 | 
				
			||||||
SCRIPT=$(readlink -f $0)
 | 
					SCRIPT=$(readlink -f $0)
 | 
				
			||||||
DIR=$(dirname $SCRIPT)
 | 
					DIR=$(dirname $SCRIPT)
 | 
				
			||||||
 | 
				
			|||||||
@ -24,7 +24,7 @@ date_default_timezone_set('UTC');
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
$baseDir = dirname(dirname(__FILE__));
 | 
					$baseDir = dirname(dirname(__FILE__));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
define('MAGALLANES_VERSION', '0.9.5');
 | 
					define('MAGALLANES_VERSION', '0.9.6');
 | 
				
			||||||
 | 
					
 | 
				
			||||||
require_once $baseDir . '/Mage/spyc.php';
 | 
					require_once $baseDir . '/Mage/spyc.php';
 | 
				
			||||||
require_once $baseDir . '/Mage/Autoload.php';
 | 
					require_once $baseDir . '/Mage/Autoload.php';
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user