mirror of
https://github.com/andres-montanez/Magallanes
synced 2024-06-16 12:35:04 +02:00
Merge pull request #45 from drmikecrowe/master
Adds "ssh_needs_tty" general parameter, and rsync copy option
This commit is contained in:
commit
8b43a136dd
|
@ -73,13 +73,15 @@ class InitCommand extends AbstractCommand
|
|||
'%notificationEnabled%',
|
||||
'%loggingEnabled%',
|
||||
'%maxlogs%',
|
||||
'%ssh_needs_tty%',
|
||||
),
|
||||
array(
|
||||
$projectName,
|
||||
$notificationEmail,
|
||||
$notificationEnabled,
|
||||
'true',
|
||||
30
|
||||
30,
|
||||
'false'
|
||||
),
|
||||
$this->getGeneralConfigTemplate()
|
||||
);
|
||||
|
@ -98,7 +100,8 @@ class InitCommand extends AbstractCommand
|
|||
. 'email: %notificationEmail%' . PHP_EOL
|
||||
. 'notifications: %notificationEnabled%' . PHP_EOL
|
||||
. 'logging: %loggingEnabled%' . PHP_EOL
|
||||
. 'maxlogs: %maxlogs%' . PHP_EOL;
|
||||
. 'maxlogs: %maxlogs%' . PHP_EOL
|
||||
. 'ssh_needs_tty: %ssh_needs_tty%' . PHP_EOL;
|
||||
|
||||
return $template;
|
||||
}
|
||||
|
|
|
@ -189,7 +189,10 @@ abstract class AbstractTask
|
|||
$releasesDirectory = '';
|
||||
}
|
||||
|
||||
$localCommand = 'ssh -p ' . $this->getConfig()->getHostPort() . ' '
|
||||
// if general.yml includes "ssy_needs_tty: true", then add "-t" to the ssh command
|
||||
$needs_tty = ($this->getConfig()->general('ssh_needs_tty',false) ? "-t" : "");
|
||||
|
||||
$localCommand = 'ssh ' . $needs_tty . ' -p ' . $this->getConfig()->getHostPort() . ' '
|
||||
. '-q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no '
|
||||
. $this->getConfig()->deployment('user') . '@' . $this->getConfig()->getHostName() . ' '
|
||||
. '"cd ' . rtrim($this->getConfig()->deployment('to'), '/') . $releasesDirectory . ' && '
|
||||
|
|
|
@ -29,9 +29,14 @@ class RsyncTask extends AbstractTask implements IsReleaseAware
|
|||
if ($this->getConfig()->release('enabled', false) == true) {
|
||||
if ($this->getConfig()->getParameter('overrideRelease', false) == true) {
|
||||
return 'Deploy via Rsync (with Releases override) [built-in]';
|
||||
} else {
|
||||
$rsync_copy = $this->getConfig()->deployment("rsync");
|
||||
if ( $rsync_copy && is_array($rsync_copy) && $rsync_copy['copy'] ) {
|
||||
return 'Deploy via Rsync (with Releases) [built-in, incremental]';
|
||||
} else {
|
||||
return 'Deploy via Rsync (with Releases) [built-in]';
|
||||
}
|
||||
}
|
||||
} else {
|
||||
return 'Deploy via Rsync [built-in]';
|
||||
}
|
||||
|
@ -73,8 +78,19 @@ class RsyncTask extends AbstractTask implements IsReleaseAware
|
|||
$deployToDirectory = rtrim($this->getConfig()->deployment('to'), '/')
|
||||
. '/' . $releasesDirectory
|
||||
. '/' . $this->getConfig()->getReleaseId();
|
||||
$resultFetch = $this->runCommandRemote('ls -ld current | cut -d"/" -f2', $releaseToOverride);
|
||||
|
||||
if ( $resultFetch ) {
|
||||
// If deployment configuration is rsync, include a flag to simply sync the deltas between the prior release
|
||||
// rsync: { copy: yes }
|
||||
$rsync_copy = $this->getConfig()->deployment("rsync");
|
||||
if ( $rsync_copy && is_array($rsync_copy) && $rsync_copy['copy'] ) {
|
||||
$this->runCommandRemote('cp -R ' . $releasesDirectory . '/' . $releaseToOverride . ' ' . $releasesDirectory . '/' . $this->getConfig()->getReleaseId());
|
||||
} else {
|
||||
$this->runCommandRemote('mkdir -p ' . $releasesDirectory . '/' . $this->getConfig()->getReleaseId());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$command = 'rsync -avz '
|
||||
. '--rsh="ssh -p' . $this->getConfig()->getHostPort() . '" '
|
||||
|
|
Loading…
Reference in a new issue