Commit 2e299c54 authored by Jesse Norell's avatar Jesse Norell
Browse files

restoreFileOwnership() excludes system paths

parent 1adea00f
...@@ -100,12 +100,21 @@ class backup ...@@ -100,12 +100,21 @@ class backup
* @param string $web_user * @param string $web_user
* @author Ramil Valitov <ramilvalitov@gmail.com> * @author Ramil Valitov <ramilvalitov@gmail.com>
*/ */
protected static function restoreFileOwnership($web_document_root, $web_user) protected static function restoreFileOwnership($web_document_root, $web_user, $web_group)
{ {
global $app; global $app;
$blacklist = array('bin', 'dev', 'etc', 'home', 'lib', 'lib32', 'lib64', 'log', 'opt', 'proc', 'net', 'run', 'sbin', 'ssl', 'srv', 'sys', 'usr', 'var');
$find_excludes = '-not -path "." -and -not -path "./web/stats/*"';
foreach ( $blacklist as $dir ) {
$find_excludes .= ' -and -not -path "./'.$dir.'" -and -not -path "./'.$dir.'/*"';
}
$app->log('Restoring permissions for ' . $web_document_root, LOGLEVEL_DEBUG); $app->log('Restoring permissions for ' . $web_document_root, LOGLEVEL_DEBUG);
$app->system->exec_safe('cd ? && find . -not -path "./web/stats/*" -and -not -path "./log" -and -not -path "./log/*" -and -not -path "./ssl" -and -not -path "./ssl/*" -and -not -path "." -exec chown ?:? {} \;', $web_document_root, $web_user, $web_user); $app->system->exec_safe('cd ? && find . '.$find_excludes.' -exec chown ?:? {} \;', $web_document_root, $web_user, $web_group);
} }
/** /**
...@@ -290,7 +299,7 @@ class backup ...@@ -290,7 +299,7 @@ class backup
*/ */
$success = ($retval == 0 || $retval == 50); $success = ($retval == 0 || $retval == 50);
if ($success) { if ($success) {
self::restoreFileOwnership($web_root, $web_user); self::restoreFileOwnership($web_root, $web_user, $web_group);
} }
break; break;
case 'rar': case 'rar':
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment