From f5ea1b4fc06009b47d0647ca36d6bf8f1081680b Mon Sep 17 00:00:00 2001 From: tbrehm <t.brehm@ispconfig.org> Date: Thu, 08 Sep 2011 10:28:07 -0400 Subject: [PATCH] Implemented: FS#1418 - Change optionally the owner of the backup dir to the website user - Added Limit fields for openvz in the database - Limited several vm functions to be used by admin only. --- server/cron_daily.php | 21 +++++++++++++++------ 1 files changed, 15 insertions(+), 6 deletions(-) diff --git a/server/cron_daily.php b/server/cron_daily.php index d8a7b64..c62923b 100644 --- a/server/cron_daily.php +++ b/server/cron_daily.php @@ -501,12 +501,19 @@ $web_group = $rec['system_group']; $web_id = $rec['domain_id']; $web_backup_dir = $backup_dir.'/web'.$web_id; - if(!is_dir($web_backup_dir)) mkdir($web_backup_dir, 0755); - - chmod($web_backup_dir, 0755); - chown($web_backup_dir, 'root'); - chgrp($web_backup_dir, 'root'); + if(!is_dir($web_backup_dir)) mkdir($web_backup_dir, 0750); + chmod($web_backup_dir, 0750); + if(isset($server_config['backup_dir_ftpread']) && $server_config['backup_dir_ftpread'] == 'y') { + chown($web_backup_dir, $rec['system_user']); + chgrp($web_backup_dir, $rec['system_group']); + } else { + chown($web_backup_dir, 'root'); + chgrp($web_backup_dir, 'root'); + } exec('cd '.escapeshellarg($web_path).' && sudo -u '.escapeshellarg($web_user).' find . -group '.escapeshellarg($web_group).' -print | zip -y '.escapeshellarg($web_backup_dir.'/web.zip').' -@'); + chown($web_backup_dir.'/web.zip', $rec['system_user']); + chgrp($web_backup_dir.'/web.zip', $rec['system_group']); + chmod($web_backup_dir.'/web.zip', 0750); // Rename or remove old backups $backup_copies = intval($rec['backup_copies']); @@ -527,7 +534,9 @@ // Create backupdir symlink if(is_link($web_path.'/backup')) unlink($web_path.'/backup'); symlink($web_backup_dir,$web_path.'/backup'); - chmod($web_path.'/backup', 0755); + // chmod($web_path.'/backup', 0755); + chown($web_path.'/backup', $rec['system_user']); + chgrp($web_path.'/backup', $rec['system_group']); } -- Gitblit v1.9.1