diff --git a/README.md b/README.md index d0fdbe4c9..1dc7f1fac 100644 --- a/README.md +++ b/README.md @@ -13,12 +13,18 @@ Connect to your server as root via SSH ssh root@your.server ``` -Download the installation script +Download the installation script, and run it: +```bash +curl http://vestacp.com/pub/vst-install.sh | bash +``` + +If the above example does not work, try this 2 step method: + +Download the installation script: ```bash curl -O http://vestacp.com/pub/vst-install.sh ``` - -Run it +Then run it: ```bash bash vst-install.sh ``` diff --git a/bin/v-update-user-quota b/bin/v-update-user-quota index 85330e450..3dffb1220 100755 --- a/bin/v-update-user-quota +++ b/bin/v-update-user-quota @@ -31,9 +31,10 @@ is_object_valid 'user' 'USER' "$user" #----------------------------------------------------------# # Updating disk quota +# Had quota equals package value. Soft quota equals 90% of package value for warnings. quota=$(get_user_value '$DISK_QUOTA') -soft=$((quota * 1000)) -hard=$((quota + 50000)) +soft=$((quota * 1024 * 0.90)) +hard=$((quota * 1024)) # Searching home mount point mnt=$(df -P /home |awk '{print $6}' |tail -n1) diff --git a/src/rpm/conf/nginx.conf b/src/rpm/conf/nginx.conf index 4fea24365..9d4ffbfd6 100644 --- a/src/rpm/conf/nginx.conf +++ b/src/rpm/conf/nginx.conf @@ -37,7 +37,8 @@ http { # SSL PCI Compliance - ssl_ciphers RC4:HIGH:!aNULL:!MD5:!kEDH; + ssl_protocols TLSv1.2 TLSv1.1 TLSv1; + ssl_ciphers EECDH+AES128:RSA+AES128:EECDH+AES256:RSA+AES256:EECDH+3DES:RSA+3DES:!MD5; ssl_session_cache shared:SSL:10m; ssl_prefer_server_ciphers on; diff --git a/web/api/index.php b/web/api/index.php index f78a4e7f2..97f082594 100644 --- a/web/api/index.php +++ b/web/api/index.php @@ -87,5 +87,3 @@ if (isset($_POST['user']) || isset($_POST['hash'])) { } } } - -?> diff --git a/web/file_manager/files.php b/web/file_manager/files.php index c11cd917e..657194dca 100644 --- a/web/file_manager/files.php +++ b/web/file_manager/files.php @@ -4,25 +4,18 @@ //define(LISTING_TIMEOUT, 0.000001); define(LISTING_TIMEOUT, 5); - - - //echo 'files: '; //$files = scandir(__DIR__); - //echo '
'; //print_r($files); - //$_REQUEST['sort_field'] = 'size'; $_REQUEST['sort_field'] = 'name'; //$_REQUEST['sort_field'] = 'atime'; //$_REQUEST['sort_field'] = 'mtime'; $_REQUEST['sort_desc'] = 1; - - /* +- copy file / dir [ recursive ] +- rename(move) file / dir @@ -33,7 +26,7 @@ $_REQUEST['sort_desc'] = 1; +- create dir */ -switch($_REQUEST['action']){ +switch($_REQUEST['action']) { case 'copy': fm_copy($_REQUEST['source'], $_REQUEST['dest']); break; case 'rename': fm_rename($_REQUEST['source'], $_REQUEST['dest']); break; case 'delete': fm_delete($_REQUEST['source']); break; @@ -53,24 +46,12 @@ switch($_REQUEST['action']){ break; } - - - - - //echo $_GET['sort_field']; // if(in_array($_GET['sort_field'], $available_sort_fields)){ // echo '1'; // } - - - - - - - /* upload_file @@ -87,17 +68,16 @@ switch($_REQUEST['action']){ download file / image */ - - -function fm_create_file($filename){ +function fm_create_file($filename) +{ if(is_file($filename)) return array('error' => 'file exists', 'code' => 1); - return !!fopen($filename, 'w'); + return (bool) fopen($filename, 'w'); // (bool) > !!, sorry } - -function fm_create_dir($dirname){ +function fm_create_dir($dirname) +{ if(is_dir($filename)) return array('error' => 'directory exists', 'code' => 1); @@ -105,49 +85,49 @@ function fm_create_dir($dirname){ return mkdir($dirname); } - -function fm_chown($filename, $recursive = 0, $uid = FALSE, $gid = FALSE){ - if(is_dir($filename) && $recursive){ +function fm_chown($filename, $recursive = 0, $uid = FALSE, $gid = FALSE) +{ + if (is_dir($filename) && $recursive) { $dir_handle = opendir($dir); - while ($item = readdir($dir_handle)){ - if (!in_array($item, array('.','..'))){ + while ($item = readdir($dir_handle)) { + if (!in_array($item, array('.','..'))) { $new_item = $filename.'/'.$item; - if($uid !== FALSE) chown($new_item, (int)$uid); - if($gid !== FALSE) chgrp($new_item, (int)$gid); + if ($uid !== FALSE) chown($new_item, (int)$uid); + if ($gid !== FALSE) chgrp($new_item, (int)$gid); - if(is_dir($new_item)){ + if (is_dir($new_item)) { fm_chown($new_item, $recursive, $uid, $gid); } } } - }else{ + } else { if($uid !== FALSE) chown($filename, (int)$uid); if($gid !== FALSE) chgrp($filename, (int)$gid); } } - -function fm_chmod($filename, $recursive = 0, $mode){ - if(is_dir($filename) && $recursive){ +function fm_chmod($filename, $recursive = 0, $mode) +{ + if(is_dir($filename) && $recursive) { $dir_handle = opendir($dir); - while ($item = readdir($dir_handle)){ - if (!in_array($item, array('.','..'))){ + while ($item = readdir($dir_handle)) { + if (!in_array($item, array('.','..'))) { $new_item = $filename.'/'.$item; chmod($new_item, octdec($mode)); - if(is_dir($new_item)){ + if (is_dir($new_item)) { fm_chmod($new_item, $recursive, $mode); } } } - }else{ + } else { chmod($filename, octdec($mode)); } } - -function fm_delete($filename){ +function fm_delete($filename) +{ if(is_dir($filename)){ foreach ( $iterator = new RecursiveIteratorIterator( @@ -162,19 +142,21 @@ function fm_delete($filename){ // copy($item, $dest . DIRECTORY_SEPARATOR . $iterator->getSubPathName()); } } - }else{ + } else { return unlink($filename); } } -function fm_rename($source, $dest){ +function fm_rename($source, $dest) +{ return rename($source, $dest); } -function fm_copy($source, $dest){ - if(is_dir($source)){ +function fm_copy($source, $dest) +{ + if (is_dir($source)) { foreach ( $iterator = new RecursiveIteratorIterator( new RecursiveDirectoryIterator($source, RecursiveDirectoryIterator::SKIP_DOTS), @@ -187,14 +169,13 @@ function fm_copy($source, $dest){ copy($item, $dest . DIRECTORY_SEPARATOR . $iterator->getSubPathName()); } } - }else{ return copy($source, $dest); } } - -function list_dir(){ +function list_dir() +{ $dir_iterator = new RecursiveDirectoryIterator("/path"); $iterator = new RecursiveIteratorIterator($dir_iterator, RecursiveIteratorIterator::SELF_FIRST); // could use CHILD_FIRST if you so wish @@ -214,12 +195,9 @@ function list_dir(){ echo "\nTotal file size: ", $size, " bytes\n"; } - - - /// fast removing directory -function rmrf($dir) { - +function rmrf($dir) +{ foreach (glob($dir) as $file) { if (is_dir($file)) { rmrf("$file/*"); @@ -230,9 +208,6 @@ function rmrf($dir) { } } - - - function dir_list($dir, $sort = 0) { $sort_order_for_filename = SORT_ASC; @@ -252,7 +227,7 @@ function dir_list($dir, $sort = 0) if (!in_array($object, array('.','..'))){ $filename = $dir . $object; $time = microtime(true) - $start; - if($time <= LISTING_TIMEOUT){ + if ($time <= LISTING_TIMEOUT) { $stats = stat($filename); $mode = explain_mode($stats['mode']); $perms = decoct(fileperms($filename)); @@ -274,8 +249,11 @@ function dir_list($dir, $sort = 0) ); }else{ $listing['timeout_exeeded'] = TRUE; - if(is_dir($filename)){ $type = 'd'; - }else{ $type = '-'; } + if (is_dir($filename)) { + $type = 'd'; + } else { + $type = '-'; + } $item = array( 'name' => $object, @@ -294,7 +272,6 @@ function dir_list($dir, $sort = 0) ); } - $listing['count']++; if($item['type'] == 'd'){ @@ -311,7 +288,6 @@ function dir_list($dir, $sort = 0) } $listing['time'] = microtime(TRUE) - $start; - if(!$listing['timeout_exeeded']){ if(in_array($_REQUEST['sort_field'], $available_sort_fields)){ if($_REQUEST['sort_desc']){ @@ -324,7 +300,6 @@ function dir_list($dir, $sort = 0) return $listing; } - function explain_mode($mode) { @@ -355,5 +330,3 @@ function explain_mode($mode) return $info; } - -?> diff --git a/web/generate/ssl/index.php b/web/generate/ssl/index.php index 2d093db2f..3f96ebf9e 100644 --- a/web/generate/ssl/index.php +++ b/web/generate/ssl/index.php @@ -108,5 +108,3 @@ $_SESSION['back'] = $_SERVER['REQUEST_URI']; include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_ssl.html'); include($_SERVER['DOCUMENT_ROOT'].'/templates/footer.html'); unset($_SESSION['ok_msg']); - -?> diff --git a/web/inc/mail-wrapper.php b/web/inc/mail-wrapper.php index bf1c3d9e3..a8c48a09e 100755 --- a/web/inc/mail-wrapper.php +++ b/web/inc/mail-wrapper.php @@ -32,5 +32,3 @@ $mailtext = file_get_contents("php://stdin"); if ((!empty($to)) && (!empty($subject))) { send_email($to,$subject,$mailtext,$from); } - -?> diff --git a/web/inc/main.php b/web/inc/main.php index 87894c7b4..7aa3a0328 100644 --- a/web/inc/main.php +++ b/web/inc/main.php @@ -344,4 +344,3 @@ function list_timezones() { } return $timezone_list; } -?> diff --git a/web/index.php b/web/index.php index 35c889c9f..2f0707473 100644 --- a/web/index.php +++ b/web/index.php @@ -1,8 +1,7 @@ diff --git a/web/list/index.php b/web/list/index.php index 35c889c9f..b0d34a3f8 100644 --- a/web/list/index.php +++ b/web/list/index.php @@ -1,7 +1,7 @@