hauke/Magallanes
1
0
Fork 0
mirror of https://github.com/hauke68/Magallanes.git synced 2025-09-15 05:20:17 +02:00
Code Issues Releases Wiki Activity

Adds a recursive parameter and allows for more chmod possibilities such as +a

Browse Source
This commit is contained in:
Jérémy Huet 2014-12-13 16:22:56 +01:00
parent 89d82b9992
commit e449a4529f
2 changed files with 43 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
Mage/Task/BuiltIn/Filesystem/PermissionsTask.php
View File

@ -10,9 +10,9 @@ use Mage\Task\SkipException;
* *
* Usage : * Usage :
* pre-deploy: * pre-deploy:
* - filesystem/permissions: {paths: /var/www/myapp/app/cache:/var/www/myapp/app/cache, checkPathsExist: true, owner: www-data, group: www-data, rights: 775} * - filesystem/permissions: {paths: /var/www/myapp/app/cache:/var/www/myapp/app/cache, recursive: false, checkPathsExist: true, owner: www-data, group: www-data, rights: 775}
* on-deploy: * on-deploy:
* - filesystem/permissions: {paths: app/cache:app/logs, checkPathsExist: true, owner: www-data, group: www-data, rights: 775} * - filesystem/permissions: {paths: app/cache:app/logs, recursive: false, checkPathsExist: true, owner: www-data, group: www-data, rights: 775}
* *
* @author Jérémy Huet <jeremy.huet@gmail.com> * @author Jérémy Huet <jeremy.huet@gmail.com>
*/ */
@ -57,6 +57,13 @@ class PermissionsTask extends AbstractTask
*/ */
private $rights; private $rights;
/**
* If set to true, will recursively change permissions on given paths.
*
* @var string
*/
private $recursive = false;
/** /**
* Initialize parameters. * Initialize parameters.
* *
@ -86,6 +93,10 @@ class PermissionsTask extends AbstractTask
if (! is_null($this->getParameter('rights'))) { if (! is_null($this->getParameter('rights'))) {
$this->setRights($this->getParameter('rights')); $this->setRights($this->getParameter('rights'));
} }
if (! is_null($this->getParameter('recursive'))) {
$this->setRecursive($this->getParameter('recursive'));
}
} }
/** /**
@ -102,17 +113,18 @@ class PermissionsTask extends AbstractTask
public function run() public function run()
{ {
$command = ''; $command = '';
$recursive = $this->recursive ? '-R' : '';
if ($this->paths && $this->owner) { if ($this->paths && $this->owner) {
$command .= 'chown -R ' . $this->owner . ' ' . $this->getPathsForCmd() . ';'; $command .= 'chown '. $recursive .' ' . $this->owner . ' ' . $this->getPathsForCmd() . ';';
} }
if ($this->paths && $this->group) { if ($this->paths && $this->group) {
$command .= 'chgrp -R ' . $this->group . ' ' . $this->getPathsForCmd() . ';'; $command .= 'chgrp '. $recursive .' ' . $this->group . ' ' . $this->getPathsForCmd() . ';';
} }
if ($this->paths && $this->rights) { if ($this->paths && $this->rights) {
$command .= 'chmod -R ' . $this->rights . ' ' . $this->getPathsForCmd() . ';'; $command .= 'chmod '. $recursive .' ' . $this->rights . ' ' . $this->getPathsForCmd() . ';';
} }
$result = $this->runCommand($command); $result = $this->runCommand($command);
@ -178,7 +190,7 @@ class PermissionsTask extends AbstractTask
*/ */
protected function setCheckPathsExist($checkPathsExist) protected function setCheckPathsExist($checkPathsExist)
{ {
$this->checkPathsExist = $checkPathsExist; $this->checkPathsExist = (bool) $checkPathsExist;
return $this; return $this;
} }
@ -240,17 +252,13 @@ class PermissionsTask extends AbstractTask
/** /**
* Set rights. * Set rights.
* *
* @todo better way to check if $rights is in a correct format. * @todo check if $rights is in a correct format.
* *
* @param string $rights * @param string $rights
* @return PermissionsTask * @return PermissionsTask
*/ */
protected function setRights($rights) protected function setRights($rights)
{ {
if (strlen($rights) != 3 || !is_numeric($rights) || $rights > 777) {
throw new SkipException('Make sure the rights "' . $rights . '" are in a correct format.');
}
$this->rights = $rights; $this->rights = $rights;
return $this; return $this;
@ -263,4 +271,25 @@ class PermissionsTask extends AbstractTask
{ {
return $this->rights; return $this->rights;
} }
/**
* Set recursive.
*
* @param boolean $recursive
* @return PermissionsTask
*/
protected function setRecursive($recursive)
{
$this->recursive = (bool) $recursive;
return $this;
}
/**
* @return boolean
*/
protected function getRecursive()
{
return $this->recursive;
}
} }

6
Mage/Task/BuiltIn/Filesystem/PermissionsWritableByApacheTask.php
View File

@ -6,9 +6,9 @@ namespace Mage\Task\BuiltIn\Filesystem;
* *
* Usage : * Usage :
* pre-deploy: * pre-deploy:
* - filesystem/permissions-writable-by-apache: {paths: /var/www/myapp/app/cache:/var/www/myapp/app/cache, checkPathsExist: true} * - filesystem/permissions-writable-by-apache: {paths: /var/www/myapp/app/cache:/var/www/myapp/app/cache, recursive: false, checkPathsExist: true}
* on-deploy: * on-deploy:
* - filesystem/permissions-writable-by-apache: {paths: app/cache:app/logs, checkPathsExist: true} * - filesystem/permissions-writable-by-apache: {paths: app/cache:app/logs, recursive: false, checkPathsExist: true}
* *
* @author Jérémy Huet <jeremy.huet@gmail.com> * @author Jérémy Huet <jeremy.huet@gmail.com>
*/ */
@ -19,7 +19,7 @@ class PermissionsWritableByApacheTask extends PermissionsTask
parent::init(); parent::init();
$this->setGroup('www-data') $this->setGroup('www-data')
->setRights('775'); ->setRights('g+w');
} }
/** /**