From 29f5cc6aca70744e404d981ad29a32d5becd8988 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Sun, 21 Jun 2015 21:28:01 +0300 Subject: [PATCH 001/264] lowercase on sort_by text --- web/css/styles.min.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/css/styles.min.css b/web/css/styles.min.css index 223fcee6f..79a481217 100644 --- a/web/css/styles.min.css +++ b/web/css/styles.min.css @@ -989,7 +989,7 @@ div.l-content > div.l-separator:nth-of-type(4) { } .l-sort-toolbar .sort-by b { - text-transform: uppercase; + text-transform: lowercase; padding-left: 3px; } From 2289b2d8bb0a6de252a46be7adc48d93fd7b577c Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Wed, 1 Jul 2015 01:31:06 +0300 Subject: [PATCH 002/264] added sort-star class --- web/templates/admin/add_cron.html | 1 + web/templates/admin/add_db.html | 1 + web/templates/admin/add_dns.html | 1 + web/templates/admin/add_dns_rec.html | 1 + web/templates/admin/add_firewall.html | 2 + web/templates/admin/add_firewall_banlist.html | 1 + web/templates/admin/add_ip.html | 1 + web/templates/admin/add_mail.html | 1 + web/templates/admin/add_mail_acc.html | 1 + web/templates/admin/add_package.html | 1 + web/templates/admin/add_user.html | 1 + web/templates/admin/add_web.html | 2 + .../admin/edit_backup_exclusions.html | 1 + web/templates/admin/edit_cron.html | 1 + web/templates/admin/edit_db.html | 1 + web/templates/admin/edit_dns.html | 2 +- web/templates/admin/edit_dns_rec.html | 1 + web/templates/admin/edit_firewall.html | 1 + web/templates/admin/edit_ip.html | 1 + web/templates/admin/edit_mail.html | 1 + web/templates/admin/edit_mail_acc.html | 1 + web/templates/admin/edit_package.html | 1 + web/templates/admin/edit_server.html | 1 + web/templates/admin/edit_user.html | 1 + web/templates/admin/edit_web.html | 1 + web/templates/admin/generate_ssl.html | 1 + web/templates/admin/list_cron.html | 4 +- web/templates/admin/list_db.html | 7 +- web/templates/admin/list_dns.html | 3 +- web/templates/admin/list_firewall.html | 3 +- web/templates/admin/list_ip.html | 3 +- web/templates/admin/list_mail.html | 3 +- web/templates/admin/list_mail_acc.html | 3 +- web/templates/admin/list_packages.html | 3 +- web/templates/admin/list_search.html | 25 +- web/templates/admin/list_user.html | 3 +- web/templates/admin/list_web.html | 6 +- web/templates/footer.html | 425 +++++++++++++++++- web/templates/header.html | 141 +----- web/templates/user/edit_dns.html | 1 + web/templates/user/edit_user.html | 1 + web/templates/user/edit_web.html | 1 + web/templates/user/list_cron.html | 3 +- web/templates/user/list_db.html | 3 +- web/templates/user/list_dns.html | 3 +- web/templates/user/list_mail.html | 3 +- web/templates/user/list_mail_acc.html | 3 +- web/templates/user/list_search.html | 22 +- web/templates/user/list_user.html | 3 +- web/templates/user/list_web.html | 3 +- 50 files changed, 525 insertions(+), 179 deletions(-) diff --git a/web/templates/admin/add_cron.html b/web/templates/admin/add_cron.html index 638edba22..1de9aba3f 100644 --- a/web/templates/admin/add_cron.html +++ b/web/templates/admin/add_cron.html @@ -31,6 +31,7 @@ ?>
+ + +
diff --git a/web/templates/admin/add_db.html b/web/templates/admin/add_db.html index bebcb304b..a69a6c140 100644 --- a/web/templates/admin/add_db.html +++ b/web/templates/admin/add_db.html @@ -31,6 +31,7 @@ ?> + + + + + diff --git a/web/templates/header.html b/web/templates/header.html index 16b73ffd1..310efbd08 100644 --- a/web/templates/header.html +++ b/web/templates/header.html @@ -11,11 +11,14 @@ + + - - - - + \ No newline at end of file diff --git a/web/templates/user/edit_dns.html b/web/templates/user/edit_dns.html index 3466228ef..f590ab890 100644 --- a/web/templates/user/edit_dns.html +++ b/web/templates/user/edit_dns.html @@ -31,6 +31,7 @@ ?> + - - + '; + + if($v_ns4) + echo ' + + '; + + if($v_ns5) + echo ' + + '; + + if($v_ns6) + echo ' + + '; + + if($v_ns7) + echo ' + + '; + + if($v_ns8) + echo ' + + '; + ?> + + > + + +
diff --git a/web/templates/user/edit_user.html b/web/templates/user/edit_user.html index aff17cabf..7bdbca7f1 100644 --- a/web/templates/user/edit_user.html +++ b/web/templates/user/edit_user.html @@ -31,6 +31,7 @@ ?> + - + + + + + + + + + + + + + + + diff --git a/web/file_manager/fm_api.php b/web/file_manager/fm_api.php index b8e40fa20..80615df91 100644 --- a/web/file_manager/fm_api.php +++ b/web/file_manager/fm_api.php @@ -27,18 +27,29 @@ $fm->setRootDir($panel[$user]['HOME']); $_REQUEST['action'] = empty($_REQUEST['action']) ? '' : $_REQUEST['action']; switch ($_REQUEST['action']) { + case 'cd': + $dir = $_REQUEST['dir']; + print json_encode($fm->ls($dir)); + break; case 'rename_file': $dir = $_REQUEST['dir']; $item = $_REQUEST['item']; $target_name = $_REQUEST['target_name']; - print json_encode($fm->renameItem($dir, $item, $target_name)); + print json_encode($fm->renameFile($dir, $item, $target_name)); + break; + case 'rename_directory': + $dir = $_REQUEST['dir']; + $item = $_REQUEST['item']; + $target_name = $_REQUEST['target_name']; + + print json_encode($fm->renameDirectory($dir, $item, $target_name)); break; case 'delete_files': $dir = $_REQUEST['dir']; $item = $_REQUEST['item']; - print json_encode($fm->deleteItems($dir, $item)); + print json_encode($fm->deleteItem($dir, $item)); break; case 'create_file': $dir = $_REQUEST['dir']; @@ -50,19 +61,38 @@ switch ($_REQUEST['action']) { $dirname = $_REQUEST['dirname']; print json_encode($fm->createDir($dir, $dirname)); break; - case 'cd': - $dir = $_REQUEST['dir']; - print json_encode($fm->ls($dir)); - break; + case 'open_file': $dir = $_REQUEST['dir']; print json_encode($fm->open_file($dir)); break; - case 'copy_files': + case 'copy_file': $dir = $_REQUEST['dir']; $target_dir = $_REQUEST['dir_target']; $filename = $_REQUEST['filename']; - print json_encode($fm->copyFile($dir, $target_dir, $filename)); + $item = $_REQUEST['item']; + print json_encode($fm->copyFile($item, $dir, $target_dir, $filename)); + break; + case 'copy_directory': + $dir = $_REQUEST['dir']; + $target_dir = $_REQUEST['dir_target']; + $filename = $_REQUEST['filename']; + $item = $_REQUEST['item']; + print json_encode($fm->copyDirectory($item, $dir, $target_dir, $filename)); + break; + case 'unpack_item': + $dir = $_REQUEST['dir']; + $target_dir = $_REQUEST['dir_target']; + $filename = $_REQUEST['filename']; + $item = $_REQUEST['item']; + print json_encode($fm->unpackItem($item, $dir, $target_dir, $filename)); + break; + case 'pack_item': + $dir = $_REQUEST['dir']; + $target_dir = $_REQUEST['dir_target']; + $filename = $_REQUEST['filename']; + $item = $_REQUEST['item']; + print json_encode($fm->packItem($item, $dir, $target_dir, $filename)); break; default: //print json_encode($fm->init()); diff --git a/web/file_manager/fm_core.php b/web/file_manager/fm_core.php index 61871b1bd..67ca31d51 100644 --- a/web/file_manager/fm_core.php +++ b/web/file_manager/fm_core.php @@ -32,7 +32,7 @@ class FileManager { $path = !empty($_REQUEST['dir']) ? $_REQUEST['dir'] : ''; $start_url = !empty($path) ? $this->ROOT_DIR . '/' . $path : $this->ROOT_DIR; $listing = $this->getDirectoryListing($path); - + return $data = array( 'result' => true, 'ROOT_DIR' => $this->ROOT_DIR, @@ -50,11 +50,34 @@ class FileManager { $path = $this->ROOT_DIR . '/' . $path_part; } //var_dump($path);die(); + //$path = str_replace(' ', '\ ', $path); return escapeshellarg($path); } - function deleteItems($dir, $item) { - if (is_readable($item)) { + function deleteItem($dir, $item) { + $dir = $this->formatFullPath($item); + if (is_dir($item)) { + exec (VESTA_CMD . "v-delete-fs-directory {$this->user} {$dir}", $output, $return_var); + } + else { + exec (VESTA_CMD . "v-delete-fs-file {$this->user} {$dir}", $output, $return_var); + } + + $error = self::check_return_code($return_var, $output); + + if (empty($error)) { + return array( + 'result' => true + ); + } + else { + return array( + 'result' => false, + 'message' => $error + ); + } + + /*if (is_readable($item)) { unlink($item); } if (is_readable($item)) { @@ -65,93 +88,194 @@ class FileManager { } return array( 'result' => true - ); + );*/ } - function copyFile($dir, $target_dir, $filename) { - // todo: checks - // todo: vesta method "create file" - if (empty($dir)) { - $dir = $this->ROOT_DIR; - } + function copyFile($item, $dir, $target_dir, $filename) { + $src = $this->formatFullPath($item); + $dst = $this->formatFullPath($target_dir); + + exec (VESTA_CMD . "v-copy-fs-file {$this->user} {$src} {$dst}", $output, $return_var); + + $error = self::check_return_code($return_var, $output); - if (empty($target_dir)) { - $target_dir = $this->ROOT_DIR; - } - copy($dir . '/' . $filename, $target_dir.'/'.$filename); - - if (!is_readable($target_dir . '/' .$filename)) { + if (empty($error)) { return array( - 'result' => false, - 'message' => 'item was not created' + 'result' => true ); } + else { + return array( + 'result' => false, + 'message' => $error + ); + } + } + + + function copyDirectory($item, $dir, $target_dir, $filename) { + $src = $this->formatFullPath($item); + $dst = $this->formatFullPath($target_dir); + + exec (VESTA_CMD . "v-copy-fs-directory {$this->user} {$src} {$dst}", $output, $return_var); + + + $error = self::check_return_code($return_var, $output); - return array( - 'result' => true, - 'bla' => $target_dir.'/'.$filename, - 'bla2' => $dir . '/' . $filename - ); + if (empty($error)) { + return array( + 'result' => true + ); + } + else { + return array( + 'result' => false, + 'message' => $error + ); + } + } + + static function check_return_code($return_var, $output) { + if ($return_var != 0) { + $error = implode('
', $output); + return $error; + //if (empty($error)) $error = __('Error code:',$return_var); + //$_SESSION['error_msg'] = $error; + } + + return null; } function createFile($dir, $filename) { - // todo: checks - // todo: vesta method "create file" - if (empty($dir)) { - $dir = $this->ROOT_DIR; - } - file_put_contents($dir . '/' . $filename, ''); + $dir = $this->formatFullPath($dir . '/' . $filename); + + exec (VESTA_CMD . "v-add-fs-file {$this->user} {$dir}", $output, $return_var); + + $error = self::check_return_code($return_var, $output); - if (!is_readable($dir . '/' .$filename)) { + if (empty($error)) { return array( - 'result' => false, - 'message' => 'item was not created' + 'result' => true + ); + } + else { + return array( + 'result' => false, + 'message' => $error ); } - - return array( - 'result' => true - ); } - function renameItem($dir, $item, $target_name) { - if (empty($dir)) { - $dir = $this->ROOT_DIR; - } - if (is_readable($dir . '/' . $item)) { - rename($dir . '/' . $item, $dir . '/' . $target_name); - } - if (!is_readable($dir . '/' .$target_name)) { + function packItem($item, $dir, $target_dir, $filename) { + $item = $this->formatFullPath($item); + $dst_item = $this->formatFullPath($target_dir); +//print VESTA_CMD . "v-add-fs-archive {$this->user} {$item} {$dst_item}";die(); + exec (VESTA_CMD . "v-add-fs-archive {$this->user} {$item} {$dst_item}", $output, $return_var); + + $error = self::check_return_code($return_var, $output); + + if (empty($error)) { return array( - 'result' => false, - 'message' => 'item was not renamed' + 'result' => true ); } + else { + return array( + 'result' => false, + 'message' => $error + ); + } + } + + function unpackItem($item, $dir, $target_dir, $filename) { + $item = $this->formatFullPath($item); + $dst_item = $this->formatFullPath($target_dir); + + exec (VESTA_CMD . "v-extract-fs-archive {$this->user} {$item} {$dst_item}", $output, $return_var); + + $error = self::check_return_code($return_var, $output); - return array( - 'result' => true - ); + if (empty($error)) { + return array( + 'result' => true + ); + } + else { + return array( + 'result' => false, + 'message' => $error + ); + } + } + + function renameFile($dir, $item, $target_name) { + $item = $this->formatFullPath($dir . '/' . $item); + $dst_item = $this->formatFullPath($dir . '/' . $target_name); + +// var_dump(VESTA_CMD . "v-move-fs-file {$this->user} {$item} {$dst_item}");die(); + + exec (VESTA_CMD . "v-move-fs-file {$this->user} {$item} {$dst_item}", $output, $return_var); + + $error = self::check_return_code($return_var, $output); + + if (empty($error)) { + return array( + 'result' => true + ); + } + else { + return array( + 'result' => false, + 'message' => $error + ); + } + } + function renameDirectory($dir, $item, $target_name) { + $item = $this->formatFullPath($dir . $item); + $dst_item = $this->formatFullPath($dir . $target_name); + + if ($item == $dst_item) { + return array( + 'result' => true + ); + } + + + exec (VESTA_CMD . "v-move-fs-directory {$this->user} {$item} {$dst_item}", $output, $return_var); + + $error = self::check_return_code($return_var, $output); + + if (empty($error)) { + return array( + 'result' => true + ); + } + else { + return array( + 'result' => false, + 'message' => $error + ); + } } function createDir($dir, $dirname) { - // todo: checks - // todo: vesta method "create file" - if (empty($dir)) { - $dir = $this->ROOT_DIR; - } + $dir = $this->formatFullPath($dir . '/' . $dirname); - mkdir($dir . '/' . $dirname); + exec (VESTA_CMD . "v-add-fs-directory {$this->user} {$dir}", $output, $return_var); + + $error = self::check_return_code($return_var, $output); - if (!is_readable($dir . '/' .$dirname)) { + if (empty($error)) { return array( - 'result' => false, - 'message' => 'item was not created' + 'result' => true + ); + } + else { + return array( + 'result' => false, + 'message' => $error ); } - - return array( - 'result' => true - ); } function getDirectoryListing($dir = '') { diff --git a/web/images/flat_icons.png b/web/images/flat_icons.png index 631f3b3c55405a9eeb6ba8f83c7260dd704afe3d..3b10800029ccd1df931a5fe3a5f5cd978cd45cf8 100644 GIT binary patch literal 12399 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 LDiDOM>4*OZ)LO`b literal 9853 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 diff --git a/web/images/in_progress.gif b/web/images/in_progress.gif new file mode 100644 index 0000000000000000000000000000000000000000..d6819abfb34a3db6ebce765603d607b14e33651e GIT binary patch literal 404 zcmZ?wbhEHb)Mnsj_{hLuWnl3C|Nog&rT|IBe^Smxsfi`2DGKG8B^e5dS&0=n`H3ld znR#jX42nNl7`PZ17!?0=`?-b$J39ur8tEA@GXjNlfS3VfAOn+8OCQJSX*X{)e?H13 zeJ||u>DC8kZ4r?R)6{G4&Dyt|CtcU`diyE8Uq?3owA-;j!N^AxXd>8TMr31bj{uEP z;7?56IIHFOnwrlu67PNQNtrQY{;7pt&RzvNJJ_?&Ze06Pg>MsMs)$s6#HZT6Q+}5p z&C*E81%TGdiiN4(8Lw%U?wsno9F=b>WnG7*rn?>{@R)9v%+M)yIi1FiTcrX vD}VECG@HG3ZvWp+k0+)$$G&~0?NxTdRajt8g3>tw(O*m=3=Gzwa03GX(6yK< literal 0 HcmV?d00001 diff --git a/web/js/app.js b/web/js/app.js index f75ee7806..1a3f18198 100644 --- a/web/js/app.js +++ b/web/js/app.js @@ -800,6 +800,38 @@ App.Ajax.request = function(method, data, callback, onError){ }*/ //App.Helpers.setAjaxBusy(method, data); data = data || {}; + + var prgs = $('.progress-container'); + + switch (method) { + case 'cd': + prgs.find('title').text('Opening dir'); + prgs.show(); + break; + case 'delete_files': + prgs.find('title').text('Deleting'); + prgs.show(); + break; + case 'unpack_item': + prgs.find('title').text('Unpacking'); + prgs.show(); + break; + case 'create_file': + prgs.find('title').text('Creating file'); + prgs.show(); + break; + case 'create_dir': + prgs.find('title').text('Creating directory'); + prgs.show(); + break; + case 'rename_file': + prgs.find('title').text('Renaming file'); + prgs.show(); + break; + default: + + break; + } jQuery.ajax({ url: GLOBAL.ajax_url, @@ -816,6 +848,7 @@ App.Ajax.request = function(method, data, callback, onError){ cache: false, error: function(jqXHR, textStatus, errorThrown) { + prgs.hide(); onError && onError(); if ('undefined' != typeof onError) { fb.error(textStatus); @@ -824,9 +857,11 @@ App.Ajax.request = function(method, data, callback, onError){ complete: function() { //App.Helpers.setAjaxFree(method, data); + prgs.hide(); }, success: function(reply) { + prgs.hide(); //App.Helpers.setAjaxFree(method, data); try { callback && callback(reply); diff --git a/web/js/file_manager.js b/web/js/file_manager.js index c355a7d06..361f111de 100644 --- a/web/js/file_manager.js +++ b/web/js/file_manager.js @@ -1,9 +1,13 @@ var FM = {}; +FM.Env = {}; + GLOBAL.ajax_url = '/file_manager/fm_api.php'; FM.DIR_MARKER = '  /'; +FM.errorMessageTimeout = 3500; + FM.CURRENT_TAB = ''; FM.CURRENT_A_LINE = -1; FM.CURRENT_B_LINE = -1; @@ -32,13 +36,45 @@ FM.IMAGES = {'A':[], 'B': []}; FM.IMG_FILETYPES = 'png, jpg, jpeg, gif'; +FM.SUPPORTED_ARCHIEVES = [ + 'zip', 'tgz', 'tar.gz', + 'gzip', 'tbz', 'tar.bz', + 'gz', 'zip', 'tar', 'rar' +]; + +FM.EDITABLE_FILETYPES = [ + 'txt', 'php', 'js', 'html' +]; + +FM.preselectedItems = {'A': [], 'B': []}; + FM.directoryNotAvailable = function(reply) { alert('Directory not available'); // todo: translate } FM.showError = function(type, message) { - alert(message); + if (FM.isPopupOpened()) { + var ref = FM.getPopupReference(); + if (ref.find('.warning-message').length > 0) { + ref.find('.warning-message').html('

' + message + '

'); + ref.find('.warning-message').show(); + + clearInterval(FM.Env.errorMessageHideTimeout); + FM.Env.errorMessageHideTimeout = + setTimeout(function() { + ref.find('.warning-message').fadeOut(); + }, FM.errorMessageTimeout); + return; + } + } + else { + FM.popupClose(); + var tpl = Tpl.get('popup_alert', 'FM'); + tpl.set(':TEXT', message); + + FM.popupOpen(tpl.finalize()); + } } FM.formatPath = function(dir) { @@ -95,8 +131,8 @@ FM.setActive = function(index, box) { //console.log(pos); var wwh = w_height - w_offset + pos.top; //console.info(wwh); - console.info((pos.top + w_offset) + ' > ' + w_height); - console.log((pos.top + w_offset) > w_height); + //console.info((pos.top + w_offset) + ' > ' + w_height); + //console.log((pos.top + w_offset) > w_height); /* if (pos.top > w_height) { var cur_elm = $(box).find('li.selected').position(); var cur_elm_height = $(box).find('li.selected').height(); @@ -114,6 +150,10 @@ FM.setActive = function(index, box) { FM['CURRENT_' + tab + '_LINE'] = index; FM.CURRENT_TAB = box; + + $(FM.preselectedItems[tab]).each(function(i, index) { + $(box).find('.dir:eq(' + index + ')').addClass('selected'); + }); } FM.setSecondInactive = function(index, box) { @@ -156,7 +196,8 @@ FM.open = function(dir, box, callback) { 'dir': dir }; App.Ajax.request('cd', params, function(reply) { - if (reply.result) { + FM.preselectedItems[tab] = []; + if (reply.result == true) { var html = FM.generate_listing(reply.listing, box); } else { @@ -167,10 +208,31 @@ FM.open = function(dir, box, callback) { var current_pwd = dir.trim() == '' ? FM.ROOT_DIR : dir; - $('.pwd-tab-' + tab).html(current_pwd); + FM.updateTopLevelPathBar(box, tab, current_pwd); + + + var path_a = FM['TAB_A_CURRENT_PATH'] == '' ? FM.ROOT_DIR : FM['TAB_A_CURRENT_PATH']; + var path_b = FM['TAB_B_CURRENT_PATH'] == '' ? FM.ROOT_DIR : FM['TAB_B_CURRENT_PATH']; + var url = '/list/directory/?dir_a='+path_a+'&dir_b='+path_b; + history.pushState({}, null, url); + + }); +} + +FM.updateTopLevelPathBar = function(box, tab, path) { + console.log(path); + var formattedPath = []; + path = path.replace(FM.ROOT_DIR, ''); + formattedPath.push(''+FM.ROOT_DIR+''); + + $.each(path.split('/'), function(i, part) { + if (part.trim() == '') { + return; + } + formattedPath.push(''+part+''); }); - + $('.pwd-tab-' + tab).html(formattedPath.join('/')); } FM.isItemFile = function(item) { @@ -302,28 +364,58 @@ FM.sortItems = function(items, box) { return sorted; } +FM.isFileEditable = function(src) { + if ('undefined' == typeof src.filetype) { + return false; + } + + if ($.inArray(src.filetype, FM.EDITABLE_FILETYPES) != -1) { + return true; + } + + return false; +} + +FM.editFileFromSubcontext = function(elm) { + var elm = $(elm).hasClass('dir') ? $(elm) : $(elm).closest('.dir'); + var src = $.parseJSON($(elm).find('.source').val()); + + var myWindow = window.open('/edit/file/?path=' + src.full_path, '_blank');//, src.full_path, "width=900, height=700"); +} + +FM.downloadFileFromSubcontext = function(elm) { + var elm = $(elm).hasClass('dir') ? $(elm) : $(elm).closest('.dir'); + var src = $.parseJSON($(elm).find('.source').val()); + + var path = src.full_path; + var win = window.open('/download/file/?path=' + path, '_blank'); + win.focus(); +} + FM.openFile = function(dir, box, elm) { var tab = FM.getTabLetter(box); FM['TAB_'+tab+'_CURRENT_PATH'] = dir; + + var elm = $(elm).hasClass('dir') ? $(elm) : $(elm).closest('.dir'); var src = $.parseJSON($(elm).find('.source').val()); + console.log(elm); + if (FM.isItemPseudo(src)) { + FM.open(FM['TAB_' + tab + '_CURRENT_PATH'], FM['TAB_' + tab]); + } + + if (FM.isFileEditable(src)) { + var myWindow = window.open('/edit/file/?path=' + src.full_path, '_blank');//, src.full_path, "width=900, height=700"); + } + else { + var path = src.full_path; + var win = window.open('/download/file/?path=' + path, '_blank'); + win.focus(); + } + - var myWindow = window.open('/edit/file/?path=' + src.full_path, '_blank');//, src.full_path, "width=900, height=700"); - /*var params = { - 'dir': dir - }; - App.Ajax.request('open_file', params, function(reply) { - if (reply.result) { - - //var html = FM.generate_listing(reply.listing, box); - } - else { - //FM.directoryNotAvailable(reply); - alert('Cannot open file'); - } - });*/ } FM.getTabLetter = function(box) { @@ -335,6 +427,10 @@ FM.getTabLetter = function(box) { return tab; } +FM.toggleSubContextMenu = function(ref) { + $(ref).find('.subcontext-menu').toggleClass('subcontext-menu-hidden'); +} + FM.generate_listing = function(reply, box) { var tab = FM.getTabLetter(box); FM.IMAGES[tab] = []; @@ -361,9 +457,12 @@ FM.generate_listing = function(reply, box) { } reply = FM.sortItems(reply, box); + $(reply).each(function(i, o) { var path = FM.formatPath(FM['TAB_'+tab+'_CURRENT_PATH']+'/'+o.name); var cl_act = o.type == 'd' ? 'onClick="FM.open(\'' + path + '\', \'' + box + '\')"' : 'onClick="FM.openFile(\''+path+'\', \'' + box + '\', this)"'; + //var cl_act = o.type == 'd' ? 'onDblClick="FM.open(\'' + path + '\', \'' + box + '\')"' : 'onDblClick="FM.openFile(\''+path+'\', \'' + box + '\', this)"'; + //var cl_act = ''; if (o.name == '') { path = FM.formatPath(back_path); @@ -382,14 +481,17 @@ FM.generate_listing = function(reply, box) { var time = o.time.split('.'); time = time[0]; + var psDate = new Date(o.date); + o.full_path = path; - o.filetype = FM.getFileType(o.name); - if(FM.IMG_FILETYPES.indexOf(o.filetype) >= 0 && o.filetype.length > 0) { - FM.IMAGES[tab][FM.IMAGES[tab].length] = {'img': "/view/file/?path=/home/admin/"+o.name+"&raw=true", 'thumb': "/view/file/?path=/home/admin/"+o.name+"&raw=true", 'id': 'img-'+i}; - cl_act = 'onClick="FM.fotoramaOpen(\'' + tab + '\', \'img-' + i +'\')"'; - } - + o.filetype = FM.getFileType(o.name); + if(FM.IMG_FILETYPES.indexOf(o.filetype) >= 0 && o.filetype.length > 0) { + FM.IMAGES[tab][FM.IMAGES[tab].length] = {'img': "/view/file/?path=/home/admin/"+o.name+"&raw=true", 'thumb': "/view/file/?path=/home/admin/"+o.name+"&raw=true", 'id': 'img-'+i}; + cl_act = 'onClick="FM.fotoramaOpen(\'' + tab + '\', \'img-' + i +'\')"'; + } + + var t_index = tab + '_' + i; var tpl = Tpl.get('entry_line', 'FM'); tpl.set(':CL_ACTION_1', cl_act); @@ -397,9 +499,21 @@ FM.generate_listing = function(reply, box) { tpl.set(':NAME', o.name); tpl.set(':PERMISSIONS', o.permissions); tpl.set(':OWNER', o.owner); - tpl.set(':SIZE', o.size); - tpl.set(':TIME', time); - tpl.set(':DATE', o.date); + tpl.set(':SIZE_VALUE', o.type == 'f' ? FM.humanFileSizeValue(o.size) : ' '); + tpl.set(':SIZE_UNIT', o.type == 'f' ? FM.humanFileSizeUnit(o.size) : ' '); + tpl.set(':TIME', (psDate.getFullYear() != new Date().getFullYear()) ? psDate.getFullYear() || "" : time); + tpl.set(':DATE', o.date.trim() != '' ? psDate.format('mmm d') : ' '/*o.date*/); + + + if (o.name == '..' || o.type == 'd') { + tpl.set(':SUBMENU_CLASS', 'hidden'); + } + else { + tpl.set(':SUBMENU_CLASS', ''); + } + /*tpl.set(':index', t_index); + tpl.set(':index1', t_index); + tpl.set(':index2', t_index);*/ if (FM.isItemDir(o)) { tpl.set(':ITEM_TYPE', 'filetype-dir'); @@ -416,17 +530,25 @@ FM.generate_listing = function(reply, box) { FM['CURRENT_'+tab+'_LINE'] = -1; } +FM.toggleCheck = function(uid) { + var ref = $('#check' + uid); + if (ref.length > 0) { + //ref.attr('checked', true); + $(ref).hasClass('checkbox-selected') ? $(ref).addClass('checkbox-selected') : $(ref).removeClass('checkbox-selected'); + } +} + FM.fotoramaOpen = function(tab, img_index) { console.log('index: ' + img_index); $('.fotorama').fotorama({ - nav: 'thumbs', - arrows: true, - click: true, - allowfullscreen: true, - fit: 'scaledown', - thumbfit: 'scaledown', - data: FM.IMAGES[tab] + nav: 'thumbs', + arrows: true, + click: true, + allowfullscreen: true, + fit: 'scaledown', + thumbfit: 'scaledown', + data: FM.IMAGES[tab] }); $('.fotorama').on('fotorama:fullscreenexit', function (e, fotorama) { @@ -437,21 +559,300 @@ FM.fotoramaOpen = function(tab, img_index) { $('.fotorama').fotorama().data('fotorama').show(img_index); } -FM.selectItem = function(item, box) { +FM.bulkOperation = function(ref) { + //console.log(ref); + var box = $(ref).parents('.menu').hasClass('menu-left') ? FM.setTabActive(FM.TAB_A, 'skip_highlights') : FM.setTabActive(FM.TAB_B, 'skip_highlights'); - if (FM.CURRENT_TAB == FM.TAB_A) { - FM.setTabActive(FM.TAB_B); - $(FM.TAB_B).find('.selected-inactive').removeClass('selected-inactive'); - $(FM.TAB_A).find('.selected').addClass('selected-inactive'); + var operation = $(ref).val(); + if ('function' == typeof FM[operation]) { + FM[operation] && FM[operation](ref); + } + + $(ref).find('option[value=-1]').attr('selected', true); +} + +FM.checkBulkStatus = function(bulkStatuses, acc) { + var status = false; + var msg = ''; + if (bulkStatuses.length == acc.length) { + $.each(bulkStatuses, function(i, o) { + if (o != true) { + msg += '

'+o+'

'; + } + }); + + if (msg == '') { + status = true; + } + } + + if (status == true) { + $('#popup .results').html(msg); + $('.controls p').replaceWith('

close

'); } else { - FM.setTabActive(FM.TAB_A); + $('#popup .results').html(msg); + $('.controls p').replaceWith('

close

'); + } +} + +FM.bulkPopupClose = function() { + FM.popupClose(); + FM.open(FM['TAB_A_CURRENT_PATH'], FM['TAB_A']); + FM.open(FM['TAB_B_CURRENT_PATH'], FM['TAB_B']); +} + +FM.humanFileSize = function(size) { + var sizes = [' Bytes', ' KB', ' MB', ' GB', ' TB', ' PB', ' EB', ' ZB', ' YB']; + for (var i = 1; i < sizes.length; i++) { + if (size < Math.pow(1024, i)) return (Math.round((size/Math.pow(1024, i-1))*100)/100) + sizes[i-1]; + } + return size; +} + +FM.humanFileSizeValue = function(size) { + var sizes = ['b', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB']; + for (var i = 1; i < sizes.length; i++) { + if (size < Math.pow(1024, i)) return (Math.round((size/Math.pow(1024, i-1))*100)/100); + } + return size; +} + +FM.humanFileSizeUnit = function(size) { + if (!parseInt(size)) return " "; + + var sizes = ['b', ' kb', ' Mb', ' Gb', ' Tb', ' Pb', ' Eb', ' Zb', ' Yb']; + for (var i = 1; i < sizes.length; i++) { + if (size < Math.pow(1024, i)) return sizes[i-1]; + } + return sizes[i]; +} + + +FM.bulkCopy = function() { + var acc = $(FM.CURRENT_TAB).find('.dir.selected'); + if (acc.length > 0) { + //FM.popupClose(); + + var cfr_html = ''; + + $.each(acc, function(i, o) { + var ref = $(o).parents('.dir'); + var src = $(ref).find('.source').val(); + src = $.parseJSON(src); + + if (!FM.isItemPseudo(o)) { + cfr_html += '
'+src.name+'
'; + } + }); + + var tpl = Tpl.get('popup_bulk', 'FM'); + tpl.set(':ACTION', 'YOU ARE COPYING'); + tpl.set(':TEXT', cfr_html); + + FM.popupOpen(tpl.finalize()); + + var bulkStatuses = []; + $.each(acc, function(i, o) { + var ref = $(o).parents('.dir'); + var src = $(ref).find('.source').val(); + src = $.parseJSON(src); + + /*if (!FM.isItemPseudo(o)) { + cfr_html += '
'+src.name+'
'; + }*/ + var tab = FM.getTabLetter(FM.CURRENT_TAB); + + var opposite_tab = 'A'; + if (tab == 'A') { + opposite_tab = 'B'; + } + + if (FM.isItemPseudo(src)) { + return FM.displayError( + App.Constants.FM_NO_FILE_OR_DIRECTORY_SELECTED + ); + } + + var dest = FM['TAB_' + opposite_tab + '_CURRENT_PATH' ]; + if (dest == '') { + dest = GLOBAL.ROOT_DIR; + } + + var action = FM.isItemFile(src) ? 'copy_file' : 'copy_directory'; + + var params = { + item: src.full_path, + filename: src.name, + dir: FM['TAB_' + tab + '_CURRENT_PATH'], + dir_target: dest + }; + + App.Ajax.request(action, params, function(reply) { + if (reply.result == true) { + bulkStatuses.push(true); + } + else { + //FM.showError('copy-items', reply.message); + bulkStatuses.push(reply.message); + } + + FM.checkBulkStatus(bulkStatuses, acc); + }); + }); + + } +} + +FM.bulkRemove = function() { + var acc = $(FM.CURRENT_TAB).find('.dir.selected'); + if (acc.length > 0) { + //FM.popupClose(); + + var cfr_html = ''; + + $.each(acc, function(i, o) { + var ref = $(o).parents('.dir'); + var src = $(ref).find('.source').val(); + src = $.parseJSON(src); + + if (!FM.isItemPseudo(o)) { + cfr_html += '
'+src.name+'
'; + } + }); + + var tpl = Tpl.get('popup_bulk', 'FM'); + tpl.set(':ACTION', 'YOU ARE REMOVING'); + tpl.set(':TEXT', cfr_html); + + FM.popupOpen(tpl.finalize()); + + var bulkStatuses = []; + $.each(acc, function(i, o) { + var ref = $(o).parents('.dir'); + var src = $(ref).find('.source').val(); + src = $.parseJSON(src); + + /*if (!FM.isItemPseudo(o)) { + cfr_html += '
'+src.name+'
'; + }*/ + var tab = FM.getTabLetter(FM.CURRENT_TAB); + + var opposite_tab = 'A'; + if (tab == 'A') { + opposite_tab = 'B'; + } + + if (FM.isItemPseudo(src)) { + return FM.displayError( + App.Constants.FM_NO_FILE_OR_DIRECTORY_SELECTED + ); + } + + var dest = FM['TAB_' + opposite_tab + '_CURRENT_PATH' ]; + if (dest == '') { + dest = GLOBAL.ROOT_DIR; + } + + var params = { + item: src.full_path, + dir: FM['TAB_' + tab + '_CURRENT_PATH'] + }; + + App.Ajax.request('delete_files', params, function(reply) { + if (reply.result == true) { + bulkStatuses.push(true); + } + else { + //FM.showError('copy-items', reply.message); + bulkStatuses.push(reply.message); + } + + FM.checkBulkStatus(bulkStatuses, acc); + }); + }); + + } +} + +FM.toggleAllItemsSelected = function() { + var tab = FM.getTabLetter(FM.CURRENT_TAB); + var box = FM['TAB_' + tab]; + var selected = $(FM['TAB_' + tab] ).find('.dir.selected'); + var dir_items = $(FM['TAB_' + tab] ).find('.dir'); + if (selected.length == dir_items.length) { + $(box).find('.dir').removeClass('selected'); + var index = FM['CURRENT_' + tab + '_LINE']; + $(box).find('.dir:eq(' + index + ')').addClass('selected'); + } + else { + $(box).find('.dir').addClass('selected'); + } +} + +FM.selectCurrentElementAndGoToNext = function () { + var tab = FM.getTabLetter(FM.CURRENT_TAB); + var box = FM['TAB_' + tab]; + + var index = FM['CURRENT_' + tab + '_LINE']; + + if ($.inArray(index, FM.preselectedItems[tab]) != -1) { + FM.preselectedItems[tab] = $.grep(FM.preselectedItems[tab], function(i) { + return i != index; + }); + + $(box).find('.dir:eq(' + index + ')').removeClass('selected'); + //FM.preselectedItems[tab].push(index); + } + else { + $(box).find('.dir:eq(' + index + ')').addClass('selected'); + FM.preselectedItems[tab].push(index); + } + + FM.goDown(); +} + +FM.selectItem = function(item, box) { + //console.log(item); + /*if ($(item).hasClass('ch-toggle')) { + if ($(item).parents('.dir').prev('.dir').length == 0) { + var checked = $(item).parents('.dir').find('.ch-toggle').is(':checked'); + $(item).parents('.listing').find('.ch-toggle').prop('checked', checked); + } + + return; + }*/ + + + + if (FM.CURRENT_TAB == FM.TAB_A) { + FM.setTabActive(FM.TAB_B, 'skip_highlights'); + $(FM.TAB_B).find('.selected-inactive').removeClass('selected-inactive'); + // tmp + //$(FM.TAB_A).find('.selected-inactive').removeClass('selected-inactive'); + $(FM.TAB_B).find('.selected').removeClass('selected'); + + //$(FM.TAB_A).find('.selected').addClass('selected-inactive'); + $(FM.TAB_B).find('.selected').addClass('selected-inactive').removeClass('selected'); + } + else { + FM.setTabActive(FM.TAB_A, 'skip_highlights'); $(FM.TAB_A).find('.selected-inactive').removeClass('selected-inactive'); - $(FM.TAB_B).find('.selected').addClass('selected-inactive'); + //$(FM.TAB_B).find('.selected-inactive').removeClass('selected-inactive'); + //$(FM.TAB_B).find('.selected').addClass('selected-inactive'); + $(FM.TAB_A).find('.selected').removeClass('selected'); + + $(FM.TAB_A).find('.selected').addClass('selected-inactive').removeClass('selected'); } $(box).find('.active').removeClass('active'); $(box).find('.selected').removeClass('selected'); + + // + // tmp + //$(FM.TAB_A).find('.selected-inactive').removeClass('selected-inactive'); + //$(FM.TAB_B).find('.selected-inactive').removeClass('selected-inactive'); + /*if ($(item).hasClass('active')) { $(item).removeClass('active'); } @@ -465,10 +866,115 @@ FM.selectItem = function(item, box) { $(item).addClass('selected'); } + + FM.setTabActive(box); + + var item = $(item).hasClass('dir') ? item : $(item).parents('.dir'); + var tab = FM.getTabLetter(FM.CURRENT_TAB); + var src = $(item).find('.source').val(); + src = $.parseJSON(src); + var tab = FM.getTabLetter(FM.CURRENT_TAB); + if (FM.itemIsArchieve(src)) { + $('.menu-'+tab+' .extract-btn').show(); + } + else { + $('.menu-'+tab+' .extract-btn').hide(); + } + } +FM.isItemPseudo = function(item) { + if (item.name == '.' || item.name == '..') { + return true; + } + return false; +} + +FM.itemIsArchieve = function(item) { + + if ($.inArray(item.filetype, FM.SUPPORTED_ARCHIEVES) != -1) { + return true; + } + + return false; +} + +FM.unpackItem = function() { + var tab = FM.getTabLetter(FM.CURRENT_TAB); + var box = FM['TAB_' + tab]; + var selected = $(FM['TAB_' + tab] ).find('.dir.selected'); + if (selected.length == 0) { + return alert('No file selected'); + } + + + var src = selected.find('.source').val(); + src = $.parseJSON(src); + + if (FM.isItemPseudo(src)) { + return FM.displayError( + App.Constants.FM_NO_FILE_SELECTED + ); + } + + if (!FM.itemIsArchieve(src)) { + return FM.displayError( + App.Constants.FM_FILE_TYPE_NOT_SUPPORTED + ); + } + + var dst = FM['TAB_' + tab + '_CURRENT_PATH']; + if (dst == '') { + dst = GLOBAL.ROOT_DIR; + } + + var tpl = Tpl.get('popup_unpack', 'FM'); + tpl.set(':FILENAME', src.name); + tpl.set(':DST_DIRNAME', dst + '/' + src.name + '_extracted'); + FM.popupOpen(tpl.finalize()); +} + +FM.packItem = function() { + var tab = FM.getTabLetter(FM.CURRENT_TAB); + var box = FM['TAB_' + tab]; + var selected = $(FM['TAB_' + tab] ).find('.dir.selected'); + if (selected.length == 0) { + return FM.displayError( + App.Constants.FM_NO_FILE_SELECTED + ); + } + + + var src = selected.find('.source').val(); + src = $.parseJSON(src); + + if (FM.isItemPseudo(src)) { + return FM.displayError( + App.Constants.FM_NO_FILE_OR_DIRECTORY_SELECTED + ); + } + + if (FM.isItemPseudo(src)) { + return FM.displayError( + App.Constants.FM_NO_FILE_OR_DIRECTORY_SELECTED + ); + } + + + var dst = FM['TAB_' + tab + '_CURRENT_PATH']; + if (dst == '') { + dst = GLOBAL.ROOT_DIR; + } + + var tpl = Tpl.get('popup_pack', 'FM'); + tpl.set(':FILENAME', src.name); + tpl.set(':DST_DIRNAME', dst + '/' + src.name + '_packed.tar.gz'); + FM.popupOpen(tpl.finalize()); +} + + FM.switchTab = function() { if (FM.CURRENT_TAB == FM.TAB_A) { @@ -489,13 +995,24 @@ FM.switchTab = function() { } } -FM.setTabActive = function(box) { +FM.setTabActive = function(box, action) { FM.CURRENT_TAB = box; $('.window.active').removeClass('active'); $('.listing-left.active').removeClass('active'); $('.listing-right.active').removeClass('active'); $(FM.CURRENT_TAB).addClass('active'); $(FM.CURRENT_TAB).closest('.window').addClass('active'); + + if (action == 'skip_highlights') { + return true; + } + + if (FM.CURRENT_TAB == FM.TAB_A) { + $(FM.TAB_B).find('.selected').addClass('selected-inactive').removeClass('selected'); + } + else { + $(FM.TAB_A).find('.selected').addClass('selected-inactive').removeClass('selected'); + } } FM.confirmRename = function() { @@ -503,7 +1020,9 @@ FM.confirmRename = function() { var box = FM['TAB_' + tab]; var selected = $(FM['TAB_' + tab] ).find('.dir.selected'); if (!selected) { - return alert('No file selected'); + return FM.displayError( + App.Constants.FM_NO_FILE_OR_DIRECTORY_SELECTED + ); } var src = selected.find('.source').val(); @@ -512,23 +1031,27 @@ FM.confirmRename = function() { var target_name = $('#rename-title').val(); if (target_name.trim().length == 0) { - return alert('Cannot be renamed.'); + return FM.displayError( + App.Constants.FM_FILE_NAME_CANNOT_BE_EMPTY + ); } + + var action = FM.isItemFile(src) ? 'rename_file' : 'rename_directory'; var params = { item: src.name, target_name: target_name, - dir: FM['TAB_' + tab + '_CURRENT_PATH'] + dir: FM['TAB_' + tab + '_CURRENT_PATH'] + '/' }; - App.Ajax.request('rename_file', params, function(reply) { - if (reply.result) { + App.Ajax.request(action, params, function(reply) { + if (reply.result == true) { + FM.popupClose(); FM.open(FM['TAB_' + tab + '_CURRENT_PATH'], box); } else { FM.showError('rename-items', reply.message); } - FM.popupClose(); }); } @@ -536,44 +1059,189 @@ FM.renameItems = function() { var tab = FM.getTabLetter(FM.CURRENT_TAB); var selected = $(FM['TAB_' + tab] ).find('.dir.selected'); if (selected.length == 0) { - return alert('No file selected'); + return FM.displayError( + App.Constants.FM_NO_FILE_OR_DIRECTORY_SELECTED + ); } var src = selected.find('.source').val(); src = $.parseJSON(src); + + if (FM.isItemPseudo(src)) { + return FM.displayError( + App.Constants.FM_NO_FILE_OR_DIRECTORY_SELECTED + ); + } var tpl = Tpl.get('popup_rename', 'FM'); tpl.set(':FILENAME', src.name); + tpl.set(':NEW_NAME', src.name); FM.popupOpen(tpl.finalize()); - /*var tab = FM.getTabLetter(FM.CURRENT_TAB); - var box = FM.CURRENT_TAB; - - var delete_list = $(box).find('.active'); - if (delete_list.length == 0) { - return FM.showError('hint', 'No selected items'); - } - - $(delete_list).each(function(i, o) { - var opt = $(o).find('.source').val(); - opt = $.parseJSON(opt); - prompt('Rename "' + opt.name + '" to:'); - });*/ } FM.popupOpen = function(html) { - $('
').attr('id', 'popup').html(html).flayer(); + $('
').attr('id', 'popup').html(html).flayer({ + afterStart: function(elm) { + elm.find('input[type="text"]:first').focus(); + } + }); } FM.popupClose = function() { + clearTimeout(FM.Env.errorMessageHideTimeout); return $('#popup').flayer_close(); } FM.copyItems = function() { var tab = FM.getTabLetter(FM.CURRENT_TAB); var selected = $(FM['TAB_' + tab] ).find('.dir.selected'); + if (selected.length == 0) { + return FM.displayError( + App.Constants.FM_NO_FILE_OR_DIRECTORY_SELECTED + ); + } + + if (selected.length > 1) { // multi operation + return FM.bulkCopy(); + } + + + var src = selected.find('.source').val(); + src = $.parseJSON(src); + + if (FM.isItemPseudo(src)) { + return FM.displayError( + App.Constants.FM_NO_FILE_OR_DIRECTORY_SELECTED + ); + } + + var opposite_tab = 'A'; + if (tab == 'A') { + opposite_tab = 'B'; + } + + var dst = FM['TAB_' + opposite_tab + '_CURRENT_PATH']; + if (dst == '') { + dst = GLOBAL.ROOT_DIR; + } + + var tpl = Tpl.get('popup_copy', 'FM'); + tpl.set(':SRC_FILENAME', src.full_path); + tpl.set(':DST_FILENAME', dst + '/' + src.name); + FM.popupOpen(tpl.finalize()); +} + +FM.confirmUnpackItem = function () { + var tab = FM.getTabLetter(FM.CURRENT_TAB); + var box = FM['TAB_' + tab]; + var selected = $(FM['TAB_' + tab] ).find('.dir.selected'); + if (selected.length == 0) { + return FM.displayError( + App.Constants.FM_NO_FILE_SELECTED + ); + } + + var opposite_tab = 'A'; + if (tab == 'A') { + opposite_tab = 'B'; + } + + var src = selected.find('.source').val(); + src = $.parseJSON(src); + + if (FM.isItemPseudo(src)) { + return FM.displayError( + App.Constants.FM_NO_FILE_SELECTED + ); + } + + if (!FM.itemIsArchieve(src)) { + return FM.displayError( + App.Constants.FM_FILE_TYPE_NOT_SUPPORTED + ); + } + + var dst = FM['TAB_' + tab + '_CURRENT_PATH']; + if (dst == '') { + dst = GLOBAL.ROOT_DIR; + } + + var params = { + item: src.full_path, + filename: src.name, + dir: FM['TAB_' + tab + '_CURRENT_PATH'], + dir_target: $('#unpack-destination').val() + }; + + App.Ajax.request('unpack_item', params, function(reply) { + if (reply.result == true) { + FM.popupClose(); + FM.open(FM['TAB_' + tab + '_CURRENT_PATH'], FM['TAB_' + tab]); + FM.open(FM['TAB_' + opposite_tab + '_CURRENT_PATH'], FM['TAB_' + opposite_tab]); + } + else { + FM.showError('unpack_item', reply.message); + } + }); +} + +FM.confirmPackItem = function () { + var tab = FM.getTabLetter(FM.CURRENT_TAB); + var box = FM['TAB_' + tab]; + var selected = $(FM['TAB_' + tab] ).find('.dir.selected'); + if (selected.length == 0) { + return FM.displayError( + App.Constants.FM_NO_FILE_OR_DIRECTORY_SELECTED + ); + } + + var opposite_tab = 'A'; + if (tab == 'A') { + opposite_tab = 'B'; + } + + var src = selected.find('.source').val(); + src = $.parseJSON(src); + + if (FM.isItemPseudo(src)) { + return FM.displayError( + App.Constants.FM_NO_FILE_OR_DIRECTORY_SELECTED + ); + } + + var dst = FM['TAB_' + tab + '_CURRENT_PATH']; + if (dst == '') { + dst = GLOBAL.ROOT_DIR; + } + + var params = { + item: src.full_path, + filename: src.name, + dir: FM['TAB_' + tab + '_CURRENT_PATH'], + dir_target: $('#pack-destination').val() + }; + + + App.Ajax.request('pack_item', params, function(reply) { + if (reply.result == true) { + FM.popupClose(); + FM.open(FM['TAB_' + tab + '_CURRENT_PATH'], FM['TAB_' + tab]); + FM.open(FM['TAB_' + opposite_tab + '_CURRENT_PATH'], FM['TAB_' + opposite_tab]); + } + else { + FM.showError('unpack_item', reply.message); + } + }); +} + +FM.confirmCopyItems = function () { + var tab = FM.getTabLetter(FM.CURRENT_TAB); + var selected = $(FM['TAB_' + tab] ).find('.dir.selected'); if (!selected) { - return alert('No file selected'); + return FM.displayError( + App.Constants.FM_NO_FILE_OR_DIRECTORY_SELECTED + ); } var opposite_tab = 'A'; @@ -583,24 +1251,36 @@ FM.copyItems = function() { var src = selected.find('.source').val(); src = $.parseJSON(src); - console.log(src); + + if (FM.isItemPseudo(src)) { + return FM.displayError( + App.Constants.FM_NO_FILE_OR_DIRECTORY_SELECTED + ); + } + + var dest = $('#copy_dest').val(); + if (dest == '') { + dest = GLOBAL.ROOT_DIR; + } + + var action = FM.isItemFile(src) ? 'copy_file' : 'copy_directory'; var params = { item: src.full_path, filename: src.name, dir: FM['TAB_' + tab + '_CURRENT_PATH'], - dir_target: FM['TAB_' + opposite_tab + '_CURRENT_PATH'] + dir_target: dest }; - App.Ajax.request('copy_files', params, function(reply) { - if (reply.result) { + App.Ajax.request(action, params, function(reply) { + if (reply.result == true) { + FM.popupClose(); FM.open(FM['TAB_' + tab + '_CURRENT_PATH'], FM['TAB_' + tab]); FM.open(FM['TAB_' + opposite_tab + '_CURRENT_PATH'], FM['TAB_' + opposite_tab]); } else { - FM.showError('delete-items', reply.message); + FM.showError('copy-items', reply.message); } - //FM.popupClose(); }); } @@ -608,14 +1288,24 @@ FM.downloadFiles = function() { var tab = FM.getTabLetter(FM.CURRENT_TAB); var selected = $(FM['TAB_' + tab] ).find('.dir.selected'); if (!selected) { - return alert('No file selected'); + return FM.displayError( + App.Constants.FM_NO_FILE_OR_DIRECTORY_SELECTED + ); } var src = selected.find('.source').val(); src = $.parseJSON(src); - - if (src.type != 'f') { - return alert('Only files can be dosnloaded in this version'); + + if (FM.isItemPseudo(src) || FM.isItemDir(src)) { + alert('Folder downloads are in progress atm'); + } + + if (FM.isItemPseudo(src)) { + if (FM.isItemPseudo(src)) { + return FM.displayError( + App.Constants.FM_NO_FILE_OR_DIRECTORY_SELECTED + ); + } } var path = src.full_path; @@ -633,11 +1323,19 @@ FM.confirmDelete = function() { var box = FM['TAB_' + tab]; var selected = $(FM['TAB_' + tab] ).find('.dir.selected'); if (!selected) { - return alert('No file selected'); + return FM.displayError( + App.Constants.FM_NO_FILE_OR_DIRECTORY_SELECTED + ); } var src = selected.find('.source').val(); src = $.parseJSON(src); + + if (FM.isItemPseudo(src)) { + return FM.displayError( + App.Constants.FM_NO_FILE_OR_DIRECTORY_SELECTED + ); + } var params = { item: src.full_path, @@ -645,13 +1343,13 @@ FM.confirmDelete = function() { }; App.Ajax.request('delete_files', params, function(reply) { - if (reply.result) { + if (reply.result == true) { + FM.popupClose(); FM.open(FM['TAB_' + tab + '_CURRENT_PATH'], box); } else { FM.showError('delete-items', reply.message); } - FM.popupClose(); }); } @@ -659,62 +1357,66 @@ FM.deleteItems = function() { var tab = FM.getTabLetter(FM.CURRENT_TAB); var selected = $(FM['TAB_' + tab] ).find('.dir.selected'); if (selected.length == 0) { - return alert('No file selected'); + return FM.displayError( + App.Constants.FM_NO_FILE_OR_DIRECTORY_SELECTED + ); } + if (selected.length > 1) { // multi operation + return FM.bulkRemove(); + } + + + var src = selected.find('.source').val(); src = $.parseJSON(src); + + if (FM.isItemPseudo(src)) { + return FM.displayError( + App.Constants.FM_NO_FILE_OR_DIRECTORY_SELECTED + ); + } var tpl = Tpl.get('popup_delete', 'FM'); tpl.set(':FILENAME', src.name); FM.popupOpen(tpl.finalize()); - - - /*var tab = FM.getTabLetter(FM.CURRENT_TAB); - var confirmed = confirm(App.i18n.ARE_YOU_SURE); - var box = FM.CURRENT_TAB; - - var delete_list = $(box).find('.selected'); - if (delete_list.length == 0) { - return FM.showError('hint', 'No selected items'); - } - - var params = { - items: [], - dir: FM['TAB_' + tab + '_CURRENT_PATH'] - }; - $(delete_list).each(function(i, opt){ - var opt = $(o).find('.source').val(); - opt = $.parseJSON(opt); - params.items.push(opt.name); - }); - - App.Ajax.request('delete_files', params, function(reply) { - if (reply.result) { - FM.open(FM['TAB_' + tab + '_CURRENT_PATH'], box); - } - else { - FM.showError('delete-items', reply.message); - } - });*/ } +FM.displayError = function(msg) { + if (FM.isPopupOpened()) { + var ref = FM.getPopupReference(); + if (ref.find('.warning-message').length > 0) { + ref.find('.warning-message').html('

' + msg + '

'); + ref.find('.warning-message').show(); + + clearInterval(FM.Env.errorMessageHideTimeout); + FM.Env.errorMessageHideTimeout = + setTimeout(function() { + ref.find('.warning-message').fadeOut(); + }, FM.errorMessageTimeout); + return; + } + } + + FM.popupClose(); + var tpl = Tpl.get('popup_alert', 'FM'); + tpl.set(':TEXT', msg); + + FM.popupOpen(tpl.finalize()); + //return alert(msg); +} + FM.confirmCreateDir = function() { var tab = FM.getTabLetter(FM.CURRENT_TAB); var box = FM['TAB_' + tab]; - /*var selected = $(FM['TAB_' + tab] ).find('.dir.selected'); - if (!selected) { - return alert('No file selected'); - } - - var src = selected.find('.source').val(); - src = $.parseJSON(src);*/ var dirname = $('#rename-title').val(); if (dirname.trim().length == 0) { - return alert('Cannot be created.'); + return FM.displayError( + App.Constants.FM_DIRECTORY_NAME_CANNOT_BE_EMPTY + ); } var params = { @@ -723,13 +1425,13 @@ FM.confirmCreateDir = function() { }; App.Ajax.request('create_dir', params, function(reply) { - if (reply.result) { + if (reply.result == true) { + FM.popupClose(); FM.open(FM['TAB_' + tab + '_CURRENT_PATH'], box); } else { - FM.showError('create-file', reply.message); + FM.showError('create-dir', reply.message); } - FM.popupClose(); }); } @@ -738,44 +1440,18 @@ FM.createDir = function() { var tpl = Tpl.get('popup_create_dir', 'FM'); FM.popupOpen(tpl.finalize()); - /*var dirname = prompt('Enter dir name:'); - if (dirname.trim() != '') { - - var box = FM.CURRENT_TAB; - var tab = FM.getTabLetter(box); - var params = { - 'dirname': dirname, - 'dir': FM['TAB_' + tab + '_CURRENT_PATH'] - }; - App.Ajax.request('create_dir', params, function(reply) { - if (reply.result) { - FM.open(FM['TAB_' + tab + '_CURRENT_PATH'], box); - } - else { - FM.showError('create-dir', reply.message); - } - }); - } - else { - FM.showError('dirname-empty', 'Dirname cannot be empty'); - }*/ } FM.confirmCreateFile = function() { var tab = FM.getTabLetter(FM.CURRENT_TAB); var box = FM['TAB_' + tab]; - /*var selected = $(FM['TAB_' + tab] ).find('.dir.selected'); - if (!selected) { - return alert('No file selected'); - } - - var src = selected.find('.source').val(); - src = $.parseJSON(src);*/ var filename = $('#rename-title').val(); if (filename.trim().length == 0) { - return alert('Cannot be created.'); + return FM.displayError( + App.Constants.FM_FILE_NAME_CANNOT_BE_EMPTY + ); } var params = { @@ -784,13 +1460,13 @@ FM.confirmCreateFile = function() { }; App.Ajax.request('create_file', params, function(reply) { - if (reply.result) { + if (reply.result == true) { + FM.popupClose(); FM.open(FM['TAB_' + tab + '_CURRENT_PATH'], box); } else { FM.showError('create-file', reply.message); } - FM.popupClose(); }); } @@ -799,27 +1475,6 @@ FM.createFile = function() { var tpl = Tpl.get('popup_create_file', 'FM'); FM.popupOpen(tpl.finalize()); - /*var filename = prompt('Enter file name:'); - if (filename.trim() != '') { - - var box = FM.CURRENT_TAB; - var tab = FM.getTabLetter(box); - var params = { - 'filename': filename, - 'dir': FM['TAB_' + tab + '_CURRENT_PATH'] - }; - App.Ajax.request('create_file', params, function(reply) { - if (reply.result) { - FM.open(FM['TAB_' + tab + '_CURRENT_PATH'], box); - } - else { - FM.showError('create-file', reply.message); - } - }); - } - else { - FM.showError('filename-empty', 'Filename cannot be empty'); - }*/ } FM.showOrderBox = function(elm, tab) { @@ -885,12 +1540,47 @@ FM.reOrderList = function(elm){ FM.open(path, tab); } +FM.isPopupOpened = function() { + var ref = $('#popup'); + if (ref.length > 0) { + return true; + } + + return false; +} + +FM.getPopupReference = function() { + var ref = $('#popup'); + + return ref; +} + +FM.handlePopupSubmit = function() { + try { + var method = $('#popup').find('.ok').attr('onClick'); + if (method) { + method = method.replace('\(\);', '').replace('FM.', ''); + if ('function' == typeof FM[method]) { + FM[method](); + } + } + } + catch(e) { + + } +} + +FM.handlePopupCancel = function() { + FM.popupClose(); +} + FM.init(); $(document).ready(function() { + $('.progress-container').hide(); //return alert('statechange: Back'); /*$(document).bind('keydown.up', function() { @@ -915,6 +1605,17 @@ $(document).ready(function() { $('.window ul').outerHeight(hgt); + shortcut.add("Esc",function() { + if (FM.isPopupOpened()) { + return FM.handlePopupCancel(); + } + },{ + 'type': 'keydown', + 'propagate': false, + 'disable_in_input': false, + 'target': document + }); + shortcut.add("Down",function() { FM.goDown(); },{ @@ -941,8 +1642,39 @@ $(document).ready(function() { 'disable_in_input': false, 'target': document }); + + shortcut.add("Space",function() { + FM.selectCurrentElementAndGoToNext(); + },{ + 'type': 'keydown', + 'propagate': false, + 'disable_in_input': false, + 'target': document + }); + + shortcut.add("Insert",function() { + FM.selectCurrentElementAndGoToNext(); + },{ + 'type': 'keydown', + 'propagate': false, + 'disable_in_input': false, + 'target': document + }); + + + shortcut.add("ctrl+a",function() { + FM.toggleAllItemsSelected(); + },{ + 'type': 'keydown', + 'propagate': false, + 'disable_in_input': false, + 'target': document + }); shortcut.add("Enter",function() { + if (FM.isPopupOpened()) { + return FM.handlePopupSubmit(); + } var tab = FM.getTabLetter(FM.CURRENT_TAB); var elm = $(FM.CURRENT_TAB).find('.dir:eq('+FM['CURRENT_'+tab+'_LINE']+')'); @@ -964,6 +1696,8 @@ $(document).ready(function() { }); + + /* is jQuery .live() has been removed in version 1.9 onwards $(FM.TAB_A + ' .dir').live('click', function(evt) { FM.selectItem(evt.target, FM.TAB_A); @@ -973,12 +1707,19 @@ $(document).ready(function() { }); */ - $(FM.TAB_A).on('click', '.dir', function(evt) { + /*$(FM.TAB_A).on('click', '.dir', function(evt) { + //console.log(evt); + if (evt.ctrlKey || evt.metaKey || evt.altKey) { + return; + } FM.selectItem(evt.target, FM.TAB_A); }); $(FM.TAB_B).on('click', '.dir', function(evt) { + if (evt.ctrlKey || evt.metaKey || evt.altKey) { + return; + } FM.selectItem(evt.target, FM.TAB_B); - }); + });*/ $(FM.TAB_A_MENU).on('click', '.sort-by', function(evt){ FM.showOrderBox($(evt.target), FM.TAB_A); @@ -996,6 +1737,10 @@ $(document).ready(function() { $(evt.target).closest('.warning-box').hide(); }); + $('.menu-A .extract-btn').hide(); + $('.menu-B .extract-btn').hide(); + + }); diff --git a/web/js/floating_layer.js b/web/js/floating_layer.js index b0af2a903..84f6c91f7 100644 --- a/web/js/floating_layer.js +++ b/web/js/floating_layer.js @@ -2,7 +2,12 @@ { jQuery.fn.flayer_close = function() { - jQuery(this).flayer.close(); + try { + jQuery(this).flayer.close(); + } + catch (e) { + fb.error(e); + } } jQuery.fn.flayer = function(params) { @@ -15,8 +20,9 @@ id : 'floating-box', className : 'floating-box-class', zIndex : 5000, - beforeStart : function(){}, - beforeEnd : function(){}, + beforeStart : function() {}, + beforeEnd : function() {}, + afterStart: function() {}, close : null, closeClass : 'close-floating-layer', outerClose : false, @@ -207,6 +213,7 @@ jQuery(ref.content).append(jQuery(elm).removeClass('hidden')); start_ovservers(); jQuery(ref.container).removeClass('hidden').css({'display':'block'}); + config.afterStart(elm); } // diff --git a/web/js/i18n.js.php b/web/js/i18n.js.php index 7fe3b6192..dcf372709 100644 --- a/web/js/i18n.js.php +++ b/web/js/i18n.js.php @@ -46,3 +46,10 @@ if (!function_exists('__')) { App.i18n.ARE_YOU_SURE = ''; App.Constants.UNLIM_TRANSLATED_VALUE = ''; + +App.Constants.FM_DIRECTORY_NAME_CANNOT_BE_EMPTY = ''; +App.Constants.FM_FILE_NAME_CANNOT_BE_EMPTY = ''; +App.Constants.FM_NO_FILE_SELECTED = ''; +App.Constants.FM_NO_FILE_OR_DIRECTORY_SELECTED = ''; +App.Constants.FM_FILE_TYPE_NOT_SUPPORTED = ''; + diff --git a/web/js/templates.js b/web/js/templates.js index 21b8dbef2..9cc360b1d 100644 --- a/web/js/templates.js +++ b/web/js/templates.js @@ -7,31 +7,65 @@ App.Templates.html = { hint: [''] }, // file manager + // + +//\ + FM: { entry_line: ['
  • \ - \ + \ + \ \ \ ~!:NAME~!\ ~!:PERMISSIONS~!\ ~!:OWNER~!\ - ~!:SIZE~!\ + ~!:SIZE_UNIT~!\ + ~!:SIZE_VALUE~!\ ~!:DATE~!\ ~!:TIME~!\ + ••• \ +
    • Download
    • Edit
    \ +     \
    • '], + popup_alert: ['
    \ +
    ~!:TEXT~!
    \ +
    \ +

    close

    \ +
    \ +
    '], + popup_bulk: ['
    \ +
    ~!:ACTION~!:
    ~!:TEXT~!
    \ +
    \ +
    \ + \ +

    \ +
    \ +
    '], popup_delete: ['
    \ -
    Are you sure you want to delete file "~!:FILENAME~!"?
    \ +
    Are you sure you want to delete "~!:FILENAME~!"?
    \
    \

    cancel

    \

    delete

    \
    \
    '], - popup_rename_: ['
    \ -
    Rename file "~!:FILENAME~!"
    \ - \ -
    \ + popup_copy: ['
    \ +
    Are you sure you want to copy "~!:SRC_FILENAME~!" into:
    \
    \ - \ + \ +
    \ +
    existing files will be replaced
    \ +
    \ +

    cancel

    \ +

    copy

    \ +
    \ +
    '], + popup_rename: ['
    \ +
    Original name: "~!:FILENAME~!"
    \ + \ +
    \ +
    \ + \
    \
    \

    cancel

    \ @@ -43,15 +77,33 @@ App.Templates.html = {
    \
    '], - popup_rename: ['
    \ -
    Extract archive "~!:FILENAME~!" to "~!:DIRNAME~!"
    \ -
    \ + popup_pack: ['
    \ +
    Pack "~!:FILENAME~!" into:
    \
    \ - \ + \
    \ +
    \ + \
    \

    cancel

    \ -

    Extract

    \ +

    Pack

    \ +
    \ +
    '], + + popup_unpack: ['
    \ +
    Extract archive "~!:FILENAME~!" to:
    \ +
    \ + \ +
    \ +
    \ + \ +
    \ +

    cancel

    \ +

    Extract

    \
    \
    '], @@ -59,7 +111,7 @@ App.Templates.html = { popup_create_file: ['
    \
    Create file
    \ \ -
    \ +
    \
    \ \
    \ @@ -71,7 +123,7 @@ App.Templates.html = { popup_create_dir: ['
    \
    Create directory
    \ \ -
    \ +
    \
    \ \
    \ @@ -79,6 +131,12 @@ App.Templates.html = {

    cancel

    \

    create

    \
    \ +
    '], + popup_no_file_selected: ['
    \ +
    Please select a file
    \ +
    \ +

    ok

    \ +
    \
    '] } }; diff --git a/web/templates/file_manager/main.php b/web/templates/file_manager/main.php index c2cfe315d..426cf4e96 100644 --- a/web/templates/file_manager/main.php +++ b/web/templates/file_manager/main.php @@ -16,19 +16,19 @@
    -
    + +
    '.$dir.''; } ?> */ ?>
    -
    +
    - - +
      - 1){ echo '
    • @@ -66,10 +66,10 @@
      -
      +
      varwwwhtmlsitespublic html */ ?>
      -
      +
      @@ -81,214 +81,214 @@
      - + - + - + - + - + -
      +
      + - - - - - - + + + + - @@ -307,9 +307,14 @@ $(['A', 'B']).each(function(k, letter) { var url = '/upload/'; $('#file_upload_' + letter).fileupload({ + singleFileUploads: false, add: function (e, data) { + FM.setTabActive(FM['TAB_'+letter]); + var tab = FM.getTabLetter(FM.CURRENT_TAB); var file_relocation = FM['TAB_'+tab+'_CURRENT_PATH']; + + $('#file_upload_' + letter).fileupload("option", "url", url + '?dir=' + file_relocation); acc = $('
      '); @@ -320,18 +325,39 @@ url: url, dataType: 'json', done: function (e, data) { - /*$.each(data.result.files, function (index, file) { - $(acc).append($('

      ').text(file.name + ' uploaded.')); - });*/ + var msg = ''; + $.each(data.result.files, function (index, file) { + if ('undefined' != typeof file.error) { + msg += '

      ' + file.name + ': ' + file.error + '

      '; + } + }); + + if (msg != '') { + var tpl = Tpl.get('popup_alert', 'FM'); + tpl.set(':TEXT', msg); + FM.popupOpen(tpl.finalize()); + } + //console.log(e); + //console.log(data); }, fail: function(e, data) { + var msg = ''; $.each(data.result.files, function (index, file) { - $(acc).append($('

      ').text(file.name + ' failed to upload.')); + if ('undefined' != typeof file.error) { + msg += '

      ' + file.name + ': ' + file.error + '

      '; + } }); - show_msg = true; + + if (msg != '') { + var tpl = Tpl.get('popup_alert', 'FM'); + tpl.set(':TEXT', msg); + FM.popupOpen(tpl.finalize()); + } + //console.log(e); + //console.log(data); }, always: function(e, data) { - if (show_msg) { + /*if (show_msg) { clearTimeout(window.ht_fd); var info = $('.warning-box.inform').clone(true); $(info).attr('id', 'file-upload-msg'); @@ -346,7 +372,7 @@ window.ht_fd = setTimeout(function() { $('#file-upload-msg').fadeOut(); }, 3000); - } + }*/ var tab = FM.getTabLetter(FM.CURRENT_TAB); var box = FM['TAB_' + tab]; @@ -371,7 +397,99 @@ .prop('disabled', !$.support.fileInput) .parent().addClass($.support.fileInput ? undefined : 'disabled'); }); + + $.widget("shift.selectable", $.ui.selectable, { + options: {}, // required + previousIndex: -1, // additional attribute to store previous selection index + currentIndex: -1, // additional attribute to store current selection index + _create: function() { // required + var self = this; + + $.ui.selectable.prototype._create.call(this); // default implementation + + // here is our addition, we are catching "selecting" event with shift key + $(this.element).on('selectableselecting', function(event, ui){ + self.currentIndex = $(ui.selecting.tagName, event.target).index(ui.selecting); + if(event.shiftKey && self.previousIndex > -1) { + $(ui.selecting.tagName, event.target).slice(Math.min(self.previousIndex, self.currentIndex), 1 + Math.max(self.previousIndex, self.currentIndex)).addClass('ui-selected'); + self.previousIndex = -1; + } else { + self.previousIndex = self.currentIndex; + } + }); + }, + destroy: function() { // required, default implementation + $.ui.selectable.prototype.destroy.call(this); + }, + _setOption: function() { // required, default implementation + $.ui.selectable.prototype._setOption.apply(this, arguments); + } + }); + + + var checkIfArchive = function(item) {console.log(item); + var item = $(item).hasClass('dir') ? item : $(item).parents('.dir'); + var tab = FM.getTabLetter(FM.CURRENT_TAB); + var src = $(item).find('.source').val(); + src = $.parseJSON(src); + var tab = FM.getTabLetter(FM.CURRENT_TAB); + if (FM.itemIsArchieve(src)) { + $('.menu-'+tab+' .extract-btn').show(); + } + else { + $('.menu-'+tab+' .extract-btn').hide(); + } + } + + + $(".listing-left").selectable({ + selected: function (event, ui) { + FM.setTabActive(FM.TAB_A, 'skip_highlights'); + $(".listing-left .selected").each(function(i, o) { + if (!$(o).hasClass('ui-selected')) { + $(o).removeClass('selected'); + } + }); + $(ui.selected).addClass('selected'); + checkIfArchive(ui.selected); + $(".listing-left .ui-selected").addClass('selected'); + }, + unselected: function (event, ui) { + $(".listing-left .selected").each(function(i, o) { + if (!$(o).hasClass('ui-selected')) { + $(o).removeClass('selected'); + } + }); + FM.setTabActive(FM.TAB_A, 'skip_highlights'); + $(ui.unselected).removeClass('selected'); + } + }); + $(".listing-right").selectable({ + selected: function (event, ui) { + $(".listing-left .selected").each(function(i, o) { + if (!$(o).hasClass('ui-selected')) { + $(o).removeClass('selected'); + } + }); + FM.setTabActive(FM.TAB_B, 'skip_highlights'); + $(ui.selected).addClass('selected'); + checkIfArchive(ui.selected); + $(".listing-left .ui-selected").addClass('selected'); + }, + unselected: function (event, ui) { + $(".listing-left .selected").each(function(i, o) { + if (!$(o).hasClass('ui-selected')) { + $(o).removeClass('selected'); + } + }); + FM.setTabActive(FM.TAB_B, 'skip_highlights'); + $(ui.unselected).removeClass('selected'); + } + }); + + }); + diff --git a/web/templates/file_manager/tab_menu.php b/web/templates/file_manager/tab_menu.php index 8ae1d08fc..187788ef1 100644 --- a/web/templates/file_manager/tab_menu.php +++ b/web/templates/file_manager/tab_menu.php @@ -6,12 +6,31 @@ -
      CREATE FILE
      -
      CREATE DIR
      -
      DELETE
      -
      RENAME
      +
      NEW FILE
      +
      +
      NEW DIR
      +
      +
      DELETE
      +
      +
      RENAME
      +
      +
      COPY
      +
      +
      ARCHIVE
      +
      +
      EXRACT
      +
      +
      DOWNLOAD
      -
      COPY
      -
      DOWNLOAD
      -
      SORT BYtype
      + + +
      + + +
      type
      + From 841c97982fe1f53efcad527914283976348e0e6c Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Wed, 9 Sep 2015 16:45:09 +0300 Subject: [PATCH 053/264] Server monitoring tools --- bin/v-list-sys-cpu-status | 42 +++++++ bin/v-list-sys-db-status | 83 +++++++++++++ bin/v-list-sys-disk-status | 40 +++++++ bin/v-list-sys-dns-status | 75 ++++++++++++ bin/v-list-sys-mail-status | 46 ++++++++ bin/v-list-sys-memory-status | 40 +++++++ bin/v-list-sys-network-status | 40 +++++++ bin/v-list-sys-web-status | 49 ++++++++ web/list/server/index.php | 136 ++++++++++++++++++++-- web/templates/admin/list_server_info.html | 44 +++++++ 10 files changed, 586 insertions(+), 9 deletions(-) create mode 100755 bin/v-list-sys-cpu-status create mode 100755 bin/v-list-sys-db-status create mode 100755 bin/v-list-sys-disk-status create mode 100755 bin/v-list-sys-dns-status create mode 100755 bin/v-list-sys-mail-status create mode 100755 bin/v-list-sys-memory-status create mode 100755 bin/v-list-sys-network-status create mode 100755 bin/v-list-sys-web-status create mode 100644 web/templates/admin/list_server_info.html diff --git a/bin/v-list-sys-cpu-status b/bin/v-list-sys-cpu-status new file mode 100755 index 000000000..fa925f8b5 --- /dev/null +++ b/bin/v-list-sys-cpu-status @@ -0,0 +1,42 @@ +#!/bin/bash +# info: list system cpu info +# options: [FORMAT] +# +# The function lists cpu information + + +#----------------------------------------------------------# +# Variable&Function # +#----------------------------------------------------------# + +# Argument defenition +#format=${1-shell} + +# Includes +#source $VESTA/func/main.sh + + +#----------------------------------------------------------# +# Action # +#----------------------------------------------------------# + +# Displaying top 30 +top -b -n1 | head -n 37 +echo -en "\n-------------------------------------" +echo -en "-------------------------------------\n\n" + +# Displaying process tree +pstree -s +echo -en "\n-------------------------------------" +echo -en "-------------------------------------\n\n" + +# Displaying CPU information +grep 'model name' /proc/cpuinfo|cut -f 2 -d : | sed "s/ //" +echo +lscpu 2>/dev/null + +#----------------------------------------------------------# +# Vesta # +#----------------------------------------------------------# + +exit diff --git a/bin/v-list-sys-db-status b/bin/v-list-sys-db-status new file mode 100755 index 000000000..755ff5c40 --- /dev/null +++ b/bin/v-list-sys-db-status @@ -0,0 +1,83 @@ +#!/bin/bash +# info: list db status +# options: [FORMAT] +# +# The function lists db server status + + +#----------------------------------------------------------# +# Variable&Function # +#----------------------------------------------------------# + +# Argument defenition +#format=${1-shell} + +# Includes +#source $VESTA/func/main.sh +source $VESTA/conf/vesta.conf + +#----------------------------------------------------------# +# Action # +#----------------------------------------------------------# + +# Checking db system +if [ -z "$DB_SYSTEM" ]; then + exit +fi + +# Checking supported database systems +for db in $(echo $DB_SYSTEM| tr ',' '\n'); do + OLD_IFS="$IFS" + IFS=$'\n' + + # Checking database config + if [ -e "$VESTA/conf/$db.conf" ]; then + + # Checking server status + for host_str in $(cat $VESTA/conf/$db.conf); do + eval $host_str + + # Checking MySQL + if [ "$db" = 'mysql' ]; then + mycnf="$VESTA/conf/.mysql.$HOST" + if [ ! -e "$mycnf" ]; then + echo "[client]">$mycnf + echo "host='$HOST'" >> $mycnf + echo "user='$USER'" >> $mycnf + echo "password='$PASSWORD'" >> $mycnf + chmod 600 $mycnf + else + mypw=$(grep password $mycnf|cut -f 2 -d \') + if [ "$mypw" != "$PASSWORD" ]; then + echo "[client]">$mycnf + echo "host='$HOST'" >> $mycnf + echo "user='$USER'" >> $mycnf + echo "password='$PASSWORD'" >> $mycnf + chmod 660 $mycnf + fi + fi + echo "MySQL $HOST status" + mysqladmin --defaults-file=$mycnf status |sed -e "s/ /\n/g" + echo + mysqladmin --defaults-file=$mycnf processlist + echo -en "\n-------------------------------------" + echo -en "-------------------------------------\n\n" + fi + + # Checking PostgreSQL + if [ "$db" = 'pgsql' ]; then + echo "PostgreSQL $HOST status" + export PGPASSWORD="$PASSWORD" + psql -h $HOST -U $USER -c "SELECT * FROM pg_stat_activity" + fi + done + fi + IFS="$OLD_IFS" +done + + +#----------------------------------------------------------# +# Vesta # +#----------------------------------------------------------# + +exit diff --git a/bin/v-list-sys-disk-status b/bin/v-list-sys-disk-status new file mode 100755 index 000000000..c8b50f856 --- /dev/null +++ b/bin/v-list-sys-disk-status @@ -0,0 +1,40 @@ +#!/bin/bash +# info: list disk information +# options: [FORMAT] +# +# The function lists disk information + + +#----------------------------------------------------------# +# Variable&Function # +#----------------------------------------------------------# + +# Argument defenition +#format=${1-shell} + +# Includes +#source $VESTA/func/main.sh + + +#----------------------------------------------------------# +# Action # +#----------------------------------------------------------# + +# Displaying disk usage +df -h +echo -en "\n-------------------------------------" +echo -en "-------------------------------------\n\n" + +# Displaying I/O usage +iostat -m +echo -en "\n-------------------------------------" +echo -en "-------------------------------------\n\n" + +# Displaying disk information +fdisk -l + +#----------------------------------------------------------# +# Vesta # +#----------------------------------------------------------# + +exit diff --git a/bin/v-list-sys-dns-status b/bin/v-list-sys-dns-status new file mode 100755 index 000000000..d39cd40a7 --- /dev/null +++ b/bin/v-list-sys-dns-status @@ -0,0 +1,75 @@ +#!/bin/bash +# info: list dns status +# options: [FORMAT] +# +# The function lists dns server status + + +#----------------------------------------------------------# +# Variable&Function # +#----------------------------------------------------------# + +# Argument defenition +#format=${1-shell} + +# Includes +#source $VESTA/func/main.sh +source $VESTA/conf/vesta.conf + +#----------------------------------------------------------# +# Action # +#----------------------------------------------------------# + +# Checking dns system +if [ -z "$DNS_SYSTEM" ]; then + exit +fi + +# Checking statistics-file on RHEL/CentOS +if [ -e "/etc/named/named.conf" ]; then + conf="/etc/named/named.conf" + dump_file='/var/named/data/named_stats.txt' + dump_option=" dump-file \"$dump_file\";" + opt_check=$(grep $dump_file $conf |grep -v //) + if [ -z "$opt_check" ]; then + sed -i "s|options {|options {\n$dump_option|" $conf + service named restart >/dev/null 2>&1 + fi +fi +if [ -e "/etc/named.conf" ]; then + conf="/etc/named.conf" + dump_file='/var/named/data/named_stats.txt' + dump_option=" dump-file \"$dump_file\";" + opt_check=$(grep $dump_file $conf |grep -v //) + if [ -z "$opt_check" ]; then + sed -i "s|options {|options {\n$dump_option|" $conf + service named restart >/dev/null 2>&1 + fi +fi + +# Checking statistics-file on Debian/Ubuntu +if [ -e "/etc/bind/named.conf" ]; then + conf="/etc/bind/named.conf.options" + dump_file='/var/cache/bind/named.stats' + #dump_option=" dump-file \"$dump_file\";" + #opt_check=$(grep $dump_file $conf |grep -v //) + #if [ -z "$opt_check" ]; then + # sed -i "s|options {|options {\n$dump_option|" $conf + # service named restart >/dev/null 2>&1 + #fi +fi + +# Generating dns stats +rm -f $dump_file 2>/dev/null +/usr/sbin/rndc stats 2>/dev/null + +# Displaying dns status +if [ -e "$dump_file" ]; then + cat $dump_file +fi + +#----------------------------------------------------------# +# Vesta # +#----------------------------------------------------------# + +exit diff --git a/bin/v-list-sys-mail-status b/bin/v-list-sys-mail-status new file mode 100755 index 000000000..802f24bec --- /dev/null +++ b/bin/v-list-sys-mail-status @@ -0,0 +1,46 @@ +#!/bin/bash +# info: list mail status +# options: [FORMAT] +# +# The function lists mail server status + + +#----------------------------------------------------------# +# Variable&Function # +#----------------------------------------------------------# + +# Argument defenition +#format=${1-shell} + +# Includes +#source $VESTA/func/main.sh +source $VESTA/conf/vesta.conf + +#----------------------------------------------------------# +# Action # +#----------------------------------------------------------# + +# Checking mail system +if [ -z "$MAIL_SYSTEM" ]; then + exit +fi + +# Displaying exim queue status +echo "Exim queue status" +exim -bp +echo -en "\n-------------------------------------" +echo -en "-------------------------------------\n\n" + +# Displaying exim stats +if [ -e "/var/log/exim4/mainlog" ]; then + eximstats /var/log/exim4/mainlog 2>/dev/null +else + eximstats /var/log/exim/main.log 2>/dev/null +fi + + +#----------------------------------------------------------# +# Vesta # +#----------------------------------------------------------# + +exit diff --git a/bin/v-list-sys-memory-status b/bin/v-list-sys-memory-status new file mode 100755 index 000000000..f6a8e0773 --- /dev/null +++ b/bin/v-list-sys-memory-status @@ -0,0 +1,40 @@ +#!/bin/bash +# info: list virtual memory info +# options: [FORMAT] +# +# The function lists virtual memory information + + +#----------------------------------------------------------# +# Variable&Function # +#----------------------------------------------------------# + +# Argument defenition +#format=${1-shell} + +# Includes +#source $VESTA/func/main.sh + + +#----------------------------------------------------------# +# Action # +#----------------------------------------------------------# + +# Displaying memory and swap usage +free -t -m +echo -en "\n-------------------------------------" +echo -en "-------------------------------------\n\n" + +# Displaying memory stats +vmstat -S m -s +echo -en "\n-------------------------------------" +echo -en "-------------------------------------\n\n" + +# Displaying ram information +dmidecode -t 17 2>/dev/null + +#----------------------------------------------------------# +# Vesta # +#----------------------------------------------------------# + +exit diff --git a/bin/v-list-sys-network-status b/bin/v-list-sys-network-status new file mode 100755 index 000000000..2050da575 --- /dev/null +++ b/bin/v-list-sys-network-status @@ -0,0 +1,40 @@ +#!/bin/bash +# info: list system network status +# options: [FORMAT] +# +# The function lists network status + + +#----------------------------------------------------------# +# Variable&Function # +#----------------------------------------------------------# + +# Argument defenition +#format=${1-shell} + +# Includes +#source $VESTA/func/main.sh + + +#----------------------------------------------------------# +# Action # +#----------------------------------------------------------# + +# Displaying network stats +ss -s +echo -en "\n-------------------------------------" +echo -en "-------------------------------------\n\n" + +# Displaying network usage +lsof -itcp -n -P +echo -en "\n-------------------------------------" +echo -en "-------------------------------------\n\n" + +# Displaying network interfaces +ifconfig + +#----------------------------------------------------------# +# Vesta # +#----------------------------------------------------------# + +exit diff --git a/bin/v-list-sys-web-status b/bin/v-list-sys-web-status new file mode 100755 index 000000000..b243437a4 --- /dev/null +++ b/bin/v-list-sys-web-status @@ -0,0 +1,49 @@ +#!/bin/bash +# info: list web status +# options: [FORMAT] +# +# The function lists web server status + + +#----------------------------------------------------------# +# Variable&Function # +#----------------------------------------------------------# + +# Argument defenition +#format=${1-shell} + +# Includes +#source $VESTA/func/main.sh +source $VESTA/conf/vesta.conf + +#----------------------------------------------------------# +# Action # +#----------------------------------------------------------# + +# Checking web system +if [ -z "$WEB_SYSTEM" ]; then + exit +fi + +# Displaying proxy status +if [ "$PROXY_SYSTEM" = 'nginx' ]; then + echo "

      $PROXY_SYSTEM STATUS

      "| tr '[:lower:]' '[:upper:]' + wget -qO- http://localhost:8084/ + echo "


      " +fi + +# Displaying web server status +echo "

      $WEB_SYSTEM STATUS

      "| tr '[:lower:]' '[:upper:]' +if [ "$WEB_SYSTEM" != 'nginx' ]; then + wget -qO- http://localhost:8081/server-status/ |\ + egrep -v "html|DOCTYPE|h1>|title|head" +else + wget -qO- http://localhost:8084/ +fi + + +#----------------------------------------------------------# +# Vesta # +#----------------------------------------------------------# + +exit diff --git a/web/list/server/index.php b/web/list/server/index.php index 57e0c5f51..c34a8b0e3 100644 --- a/web/list/server/index.php +++ b/web/list/server/index.php @@ -5,6 +5,126 @@ $TAB = 'SERVER'; // Main include include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); +// Check user +if ($_SESSION['user'] != 'admin') { + header("Location: /list/user"); + exit; +} + +// CPU info +if (isset($_GET['cpu'])) { + $TAB = 'CPU'; + include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_server_info.html'); + exec (VESTA_CMD.'v-list-sys-cpu-status', $output, $return_var); + if ($return_var == 0 ) { + foreach($output as $file) { + echo $file . "\n"; + } + } + echo " \n\n\n"; + exit(); +} + +// Memory info +if (isset($_GET['mem'])) { + $TAB = 'MEMORY'; + include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_server_info.html'); + exec (VESTA_CMD.'v-list-sys-memory-status', $output, $return_var); + if ($return_var == 0 ) { + foreach($output as $file) { + echo $file . "\n"; + } + } + echo " \n\n\n"; + exit(); +} + +// Disk info +if (isset($_GET['disk'])) { + $TAB = 'MEMORY'; + include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_server_info.html'); + exec (VESTA_CMD.'v-list-sys-disk-status', $output, $return_var); + if ($return_var == 0 ) { + foreach($output as $file) { + echo $file . "\n"; + } + } + echo " \n\n\n"; + exit(); +} + +// Network info +if (isset($_GET['net'])) { + $TAB = 'MEMORY'; + include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_server_info.html'); + exec (VESTA_CMD.'v-list-sys-network-status', $output, $return_var); + if ($return_var == 0 ) { + foreach($output as $file) { + echo $file . "\n"; + } + } + echo " \n\n\n"; + exit(); +} + +// Web info +if (isset($_GET['web'])) { + $TAB = 'WEB'; + include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_server_info.html'); + exec (VESTA_CMD.'v-list-sys-web-status', $output, $return_var); + if ($return_var == 0 ) { + foreach($output as $file) { + echo $file . "\n"; + } + } + echo " \n\n\n"; + exit(); +} + + +// DNS info +if (isset($_GET['dns'])) { + $TAB = 'DNS'; + include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_server_info.html'); + exec (VESTA_CMD.'v-list-sys-dns-status', $output, $return_var); + if ($return_var == 0 ) { + foreach($output as $file) { + echo $file . "\n"; + } + } + echo " \n\n\n"; + exit(); +} + +// Mail info +if (isset($_GET['mail'])) { + $TAB = 'MAIL'; + include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_server_info.html'); + exec (VESTA_CMD.'v-list-sys-mail-status', $output, $return_var); + if ($return_var == 0 ) { + foreach($output as $file) { + echo $file . "\n"; + } + } + echo " \n\n\n"; + exit(); +} + +// DB info +if (isset($_GET['db'])) { + $TAB = 'DB'; + include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_server_info.html'); + exec (VESTA_CMD.'v-list-sys-db-status', $output, $return_var); + if ($return_var == 0 ) { + foreach($output as $file) { + echo $file . "\n"; + } + } + echo " \n\n\n"; + exit(); +} + + // Header include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html'); @@ -12,15 +132,13 @@ include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html'); top_panel($user,$TAB); // Data -if ($_SESSION['user'] == 'admin') { - exec (VESTA_CMD."v-list-sys-info json", $output, $return_var); - $sys = json_decode(implode('', $output), true); - unset($output); - exec (VESTA_CMD."v-list-sys-services json", $output, $return_var); - $data = json_decode(implode('', $output), true); - unset($output); - include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_services.html'); -} +exec (VESTA_CMD."v-list-sys-info json", $output, $return_var); +$sys = json_decode(implode('', $output), true); +unset($output); +exec (VESTA_CMD."v-list-sys-services json", $output, $return_var); +$data = json_decode(implode('', $output), true); +unset($output); +include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_services.html'); // Back uri $_SESSION['back'] = $_SERVER['REQUEST_URI']; diff --git a/web/templates/admin/list_server_info.html b/web/templates/admin/list_server_info.html new file mode 100644 index 000000000..94d5e833d --- /dev/null +++ b/web/templates/admin/list_server_info.html @@ -0,0 +1,44 @@ + + + + + + Vesta - <?=__($TAB)?> + + + + + + + + + + + + +
      +
      + + +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      + +
      + + +
      + +
      +
      + + +
      .
      + 
      \ No newline at end of file

From ac7de9d6190b84c052bf6695ef4659ec3f3860e0 Mon Sep 17 00:00:00 2001
From: Serghey Rodin 
Date: Wed, 9 Sep 2015 16:45:20 +0300
Subject: [PATCH 054/264] File Manager stuff

---
 web/js/file_manager.js | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/web/js/file_manager.js b/web/js/file_manager.js
index 361f111de..2f0e2d419 100644
--- a/web/js/file_manager.js
+++ b/web/js/file_manager.js
@@ -120,7 +120,7 @@ FM.init = function() {
 FM.setActive = function(index, box) {
     var tab = FM.getTabLetter(box);
     $(box + ' .selected').removeClass('selected');
-    $(box).find('li:eq('+index+')').addClass('selected');
+    $(box).find('li.dir:eq('+index+')').addClass('selected');
     //$(box).find('li:eq('+index+')').addClass('selected');
     //var w_h = $(window).height() - 100;
     var w_offset = $(box).scrollTop();
@@ -1009,9 +1009,11 @@ FM.setTabActive = function(box, action) {
     
     if (FM.CURRENT_TAB == FM.TAB_A) {
         $(FM.TAB_B).find('.selected').addClass('selected-inactive').removeClass('selected');
+        $(FM.TAB_A).find('.selected-inactive').addClass('selected').removeClass('selected-inactive');
     }
     else {
         $(FM.TAB_A).find('.selected').addClass('selected-inactive').removeClass('selected');
+        $(FM.TAB_B).find('.selected-inactive').addClass('selected').removeClass('selected-inactive');
     }
 }
 
@@ -1634,6 +1636,24 @@ $(document).ready(function() {
         'target':           document
     });
     
+    shortcut.add("Left",function() {
+        FM.setTabActive(FM.TAB_A);
+    },{
+        'type':             'keydown',
+        'propagate':        false,
+        'disable_in_input': false,
+        'target':           document
+    });
+    
+    shortcut.add("Right",function() {
+        FM.setTabActive(FM.TAB_B);
+    },{
+        'type':             'keydown',
+        'propagate':        false,
+        'disable_in_input': false,
+        'target':           document
+    });
+    
     shortcut.add("Tab",function() {
         FM.switchTab();
     },{

From 15a3d9486ec3c7761e6bd6d12f6f0d46b8b4277c Mon Sep 17 00:00:00 2001
From: Serghey Rodin 
Date: Wed, 9 Sep 2015 16:50:23 +0300
Subject: [PATCH 055/264] list dir

---
 bin/v-list-fs-directory      |  3 ++-
 web/list/directory/index.php | 24 ++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 web/list/directory/index.php

diff --git a/bin/v-list-fs-directory b/bin/v-list-fs-directory
index 05b7e5210..65102888d 100755
--- a/bin/v-list-fs-directory
+++ b/bin/v-list-fs-directory
@@ -39,7 +39,8 @@ fi
 
 # Listing directory
 sudo -u $user find "$path" -maxdepth 1 \
-    -printf "%y|%m|%TY-%Tm-%Td|%TH:%TM:%TS|%u|%g|%s|%P\n" 2>/dev/null
+    -printf "%y|%m|%TY-%Tm-%Td|%TH:%TM|%u|%g|%s|%P\n" 2>/dev/null
+#    -printf "%y|%m|%TY-%Tm-%Td|%TH:%TM:%TS|%u|%g|%s|%P\n" 2>/dev/null
 
 # Exiting
 exit $?
diff --git a/web/list/directory/index.php b/web/list/directory/index.php
new file mode 100644
index 000000000..4c8a0795b
--- /dev/null
+++ b/web/list/directory/index.php
@@ -0,0 +1,24 @@
+ 0 ) {
+        header("Location: /error/");
+        exit;
+    }
+    $panel = json_decode(implode('', $output), true);
+}
+
+$path_a = !empty($_REQUEST['dir_a']) ? $_REQUEST['dir_a'] : '';
+$path_b = !empty($_REQUEST['dir_b']) ? $_REQUEST['dir_b'] : '';
+$GLOBAL_JS  = '';
+$GLOBAL_JS .= '';
+$GLOBAL_JS .= '';
+
+// Footer
+include($_SERVER['DOCUMENT_ROOT'].'/templates/file_manager/main.php');

From cad14057cc2d290249bb1e960175f4ae34a64ce8 Mon Sep 17 00:00:00 2001
From: Serghey Rodin 
Date: Thu, 10 Sep 2015 14:34:37 +0300
Subject: [PATCH 056/264] API for user favourites

---
 bin/v-add-user-favourites    | 111 +++++++++++++++++++++++++++++++++++
 bin/v-delete-user-favourites | 111 +++++++++++++++++++++++++++++++++++
 bin/v-list-user-favourites   | 102 ++++++++++++++++++++++++++++++++
 func/main.sh                 |   3 +-
 4 files changed, 326 insertions(+), 1 deletion(-)
 create mode 100755 bin/v-add-user-favourites
 create mode 100755 bin/v-delete-user-favourites
 create mode 100755 bin/v-list-user-favourites

diff --git a/bin/v-add-user-favourites b/bin/v-add-user-favourites
new file mode 100755
index 000000000..d6a92aa24
--- /dev/null
+++ b/bin/v-add-user-favourites
@@ -0,0 +1,111 @@
+#!/bin/bash
+# info: adding user favourites
+# options: USER SYSTEM OBJECT
+#
+# The function adds object to users favourites
+
+
+#----------------------------------------------------------#
+#                    Variable&Function                     #
+#----------------------------------------------------------#
+
+# Argument defenition
+user=$1
+system=$(echo "$2" |tr '[:lower:]' '[:upper:]')
+object=$3
+
+# Includes
+source $VESTA/func/main.sh
+source $VESTA/conf/vesta.conf
+
+
+#----------------------------------------------------------#
+#                    Verifications                         #
+#----------------------------------------------------------#
+
+check_args '3' "$#" 'USER SYSTEM OBJECT'
+validate_format 'user' 'system' 'object'
+is_object_valid 'user' 'USER' "$user"
+is_object_unsuspended 'user' 'USER' "$user"
+
+# Checking system
+case $system in
+    USER)       check='ok' ;;
+    WEB)        check='ok' ;;
+    DNS)        check='ok' ;;
+    MAIL)       check='ok' ;;
+    DB)         check='ok' ;;
+    CRON)       check='ok' ;;
+    BACKUP)     check='ok' ;;
+    IP)         check='ok' ;;
+    PACKAGE)    check='ok' ;;
+    FIREWALL)   check='ok' ;;
+    *)      check_args '2' '0' 'USER SYSTEM OBJECT'
+esac
+
+
+#----------------------------------------------------------#
+#                       Action                             #
+#----------------------------------------------------------#
+
+# Flushing vars
+USER=''
+WEB=''
+DNS=''
+MAIL=''
+DB=''
+CRON=''
+BACKUP=''
+IP=''
+PACKAGE=''
+FIREWALL=''
+
+# Creating config just in case
+touch $USER_DATA/favourites.conf
+
+# Reading current values
+source $USER_DATA/favourites.conf
+
+# Assigning current system value
+eval value=\$$system
+
+# Checking if object is new
+check_fav=$(echo "$value" |tr ',' '\n'| grep "^$object$")
+if [ ! -z "$check_fav" ]; then
+    exit 0
+fi
+
+# Adding object to favorites
+if [ -z "$value" ]; then
+    value="$object"
+else
+    value="$value,$object"
+fi
+
+# Updating sytem
+eval $system=$value
+
+# Updating user favorites
+echo "USER='$USER'
+WEB='$WEB'
+DNS='$DNS'
+MAIL='$MAIL'
+DB='$DB'
+CRON='$CRON'
+BACKUP='$BACKUP'
+IP='$IP'
+PACKAGE='$PACKAGE'
+FIREWALL='$FIREWALL'" > $USER_DATA/favourites.conf
+
+# Changing file permission
+chmod 640 $USER_DATA/favourites.conf
+
+#----------------------------------------------------------#
+#                       Vesta                              #
+#----------------------------------------------------------#
+
+# Logging
+log_history "added starred $object in $system listing"
+log_event "$OK" "$EVENT"
+
+exit
diff --git a/bin/v-delete-user-favourites b/bin/v-delete-user-favourites
new file mode 100755
index 000000000..5c69b8897
--- /dev/null
+++ b/bin/v-delete-user-favourites
@@ -0,0 +1,111 @@
+#!/bin/bash
+# info: deleting user favourites
+# options: USER SYSTEM OBJECT
+#
+# The function deletes object from users favourites
+
+
+#----------------------------------------------------------#
+#                    Variable&Function                     #
+#----------------------------------------------------------#
+
+# Argument defenition
+user=$1
+system=$(echo "$2" |tr '[:lower:]' '[:upper:]')
+object=$3
+
+# Includes
+source $VESTA/func/main.sh
+source $VESTA/conf/vesta.conf
+
+
+#----------------------------------------------------------#
+#                    Verifications                         #
+#----------------------------------------------------------#
+
+check_args '3' "$#" 'USER SYSTEM OBJECT'
+validate_format 'user' 'system' 'object'
+is_object_valid 'user' 'USER' "$user"
+is_object_unsuspended 'user' 'USER' "$user"
+
+# Checking system
+case $system in
+    USER)       check='ok' ;;
+    WEB)        check='ok' ;;
+    DNS)        check='ok' ;;
+    MAIL)       check='ok' ;;
+    DB)         check='ok' ;;
+    CRON)       check='ok' ;;
+    BACKUP)     check='ok' ;;
+    IP)         check='ok' ;;
+    PACKAGE)    check='ok' ;;
+    FIREWALL)   check='ok' ;;
+    *)      check_args '2' '0' 'USER SYSTEM OBJECT'
+esac
+
+
+#----------------------------------------------------------#
+#                       Action                             #
+#----------------------------------------------------------#
+
+# Flushing vars
+USER=''
+WEB=''
+DNS=''
+MAIL=''
+DB=''
+CRON=''
+BACKUP=''
+IP=''
+PACKAGE=''
+FIREWALL=''
+
+# Creating config just in case
+touch $USER_DATA/favourites.conf
+
+# Reading current values
+source $USER_DATA/favourites.conf
+
+# Assigning current system value
+eval value=\$$system
+
+# Checking if object is new
+check_fav=$(echo "$value" |tr ',' '\n'| grep "^$object$")
+if [ -z "$check_fav" ]; then
+    exit 0
+fi
+
+# Deleting object from favorites
+value=$(echo "$value" |\
+    sed -e "s/,/\n/g"|\
+    sed -e "s/^$object$//g"|\
+    sed -e "/^$/d"|\
+    sed -e ':a;N;$!ba;s/\n/,/g')
+
+# Updating sytem
+eval $system=$value
+
+# Updating user favorites
+echo "USER='$USER'
+WEB='$WEB'
+DNS='$DNS'
+MAIL='$MAIL'
+DB='$DB'
+CRON='$CRON'
+BACKUP='$BACKUP'
+IP='$IP'
+PACKAGE='$PACKAGE'
+FIREWALL='$FIREWALL'" > $USER_DATA/favourites.conf
+
+# Changing file permission
+chmod 640 $USER_DATA/favourites.conf
+
+#----------------------------------------------------------#
+#                       Vesta                              #
+#----------------------------------------------------------#
+
+# Logging
+log_history "deleted starred $object from $system listing"
+log_event "$OK" "$EVENT"
+
+exit
diff --git a/bin/v-list-user-favourites b/bin/v-list-user-favourites
new file mode 100755
index 000000000..e87fcbefc
--- /dev/null
+++ b/bin/v-list-user-favourites
@@ -0,0 +1,102 @@
+#!/bin/bash
+# info: list user favourites
+# options: USER [FORMAT]
+#
+# The function for getting the list of favourite user objects
+
+
+#----------------------------------------------------------#
+#                    Variable&Function                     #
+#----------------------------------------------------------#
+
+# Argument defenition
+user=$1
+format=${2-shell}
+
+# Includes
+source $VESTA/func/main.sh
+
+# Json function
+json_list_favourites() {
+    i=1
+    fileds_count=$(echo "$fields" | wc -w)
+    fvrt_data=$(cat $USER_DATA/favourites.conf >/dev/null)
+    echo '{'
+    eval $fvrt_data
+    for field in $fields; do
+        eval value=$field
+        if [ $i -eq 1 ]; then
+            echo -e "\t\"$value\": {"
+        else
+            if [ $fileds_count -eq $i ]; then
+                echo -e "\t\t\"${field//$/}\": \"${value//,/, }\""
+            else
+                echo -e "\t\t\"${field//$/}\": \"${value//,/, }\","
+            fi
+        fi
+    (( ++i))
+    done
+    if [ -n "$value" ]; then
+        echo -e '        }'
+    fi
+    echo -e '}'
+}
+
+# Shell function
+shell_list_favourites() {
+    line=$(cat $USER_DATA/favourites.conf 2>/dev/null)
+    eval $line
+    for field in $fields; do
+        eval key="$field"
+        if [ -z "$key" ]; then
+            key='NULL'
+        fi
+        echo "${field//$/}: $key "
+    done
+}
+
+
+#----------------------------------------------------------#
+#                    Verifications                         #
+#----------------------------------------------------------#
+
+# Checking args
+check_args '1' "$#" 'USER [FORMAT]'
+validate_format 'user'
+is_object_valid 'user' 'USER' "$user"
+
+
+#----------------------------------------------------------#
+#                       Action                             #
+#----------------------------------------------------------#
+
+# Flushing vars
+USER=''
+WEB=''
+DNS=''
+MAIL=''
+DB=''
+CRON=''
+BACKUP=''
+IP=''
+PACKAGE=''
+FIREWALL=''
+
+# Defining fileds to select
+OBJ='Favourites'
+fields='$OBJ $USER $WEB $DNS $MAIL $DB $CRON $BACKUP $IP $PACKAGE $FIREWALL'
+
+# Listing favourites
+case $format in
+    json)   json_list_favourites ;;
+    plain)  shell_list_favourites ;;
+    shell)  shell_list_favourites | column -t ;;
+    *)      check_args '1' '0' 'USER [FORMAT]'
+esac
+
+
+#----------------------------------------------------------#
+#                       Vesta                              #
+#----------------------------------------------------------#
+
+exit
diff --git a/func/main.sh b/func/main.sh
index 1edbb3eca..a97f5000f 100644
--- a/func/main.sh
+++ b/func/main.sh
@@ -670,7 +670,7 @@ validate_format_domain() {
 validate_format_domain_alias() {
     exclude="[!|@|#|$|^|&|(|)|+|=|{|}|:|,|<|>|?|_|/|\|\"|'|;|%|\`| ]"
     if [[ "$1" =~ $exclude ]] || [[ "$1" =~ "^[0-9]+$" ]]; then
-        echo "Error: domain alias $1 is not valid"
+        echo "Error: $2 $1 is not valid"
         log_event "$E_INVALID" "$EVENT"
         exit $E_INVALID
     fi
@@ -916,6 +916,7 @@ validate_format(){
             ns2)            validate_format_domain "$arg" 'name_server';;
             ns3)            validate_format_domain "$arg" 'name_server';;
             ns4)            validate_format_domain "$arg" 'name_server';;
+            object)         validate_format_domain_alias "$arg" 'object';;
             package)        validate_format_name "$arg" "$arg_name" ;;
             password)       validate_format_password "$arg" ;;
             port)           validate_format_int "$arg" 'port' ;;

From 55eb1ec16a4fc84e8688ebb6e222b0c4abd22d3d Mon Sep 17 00:00:00 2001
From: Serghey Rodin 
Date: Thu, 10 Sep 2015 14:35:17 +0300
Subject: [PATCH 057/264] File Manager stuff

---
 bin/v-get-fs-file-type       | 40 +++++++++++++++++++
 web/file_manager/fm_api.php  |  5 +++
 web/file_manager/fm_core.php | 20 ++++++++++
 web/js/file_manager.js       | 74 +++++++++++++++++++++++++++++++-----
 web/js/templates.js          |  4 +-
 5 files changed, 131 insertions(+), 12 deletions(-)
 create mode 100755 bin/v-get-fs-file-type

diff --git a/bin/v-get-fs-file-type b/bin/v-get-fs-file-type
new file mode 100755
index 000000000..04d28d343
--- /dev/null
+++ b/bin/v-get-fs-file-type
@@ -0,0 +1,40 @@
+#!/bin/bash
+# info: get file type
+# options: USER FILE
+#
+# The function shows file type
+
+user=$1
+path=$2
+
+# Checking arguments
+if [ -z "$path" ]; then
+    echo "Usage: USER FILE"
+    exit 1
+fi
+
+# Checking vesta user
+if [ ! -e "$VESTA/data/users/$user" ]; then
+    echo "Error: vesta user $user doesn't exist"
+    exit 3
+fi
+
+# Checking user homedir
+homedir=$(grep "^$user:" /etc/passwd | cut -f 6 -d :)
+if [ -z $homedir ]; then
+    echo "Error: user home directory doesn't exist"
+    exit 12
+fi
+
+# Checking path
+rpath=$(readlink -f "$path")
+if [ -z "$(echo $rpath |grep $homedir)" ]; then
+    echo "Error: invalid path $path"
+    exit 2
+fi
+
+# Listing file type
+sudo -u $user file -i -b $path 2>/dev/null
+
+# Exiting
+exit $?
diff --git a/web/file_manager/fm_api.php b/web/file_manager/fm_api.php
index 80615df91..f4fc28b2f 100644
--- a/web/file_manager/fm_api.php
+++ b/web/file_manager/fm_api.php
@@ -31,6 +31,11 @@ switch ($_REQUEST['action']) {
         $dir = $_REQUEST['dir'];
         print json_encode($fm->ls($dir));
         break;
+    case 'check_file_type':
+        $dir = $_REQUEST['dir'];
+        
+        print json_encode($fm->checkFileType($dir));
+        break;
     case 'rename_file':
         $dir = $_REQUEST['dir'];
         $item = $_REQUEST['item'];
diff --git a/web/file_manager/fm_core.php b/web/file_manager/fm_core.php
index 67ca31d51..5a9e39b7d 100644
--- a/web/file_manager/fm_core.php
+++ b/web/file_manager/fm_core.php
@@ -42,6 +42,26 @@ class FileManager {
         );
     }*/
     
+    public function checkFileType($dir) {
+        $dir = $this->formatFullPath($dir);
+
+        exec(VESTA_CMD . "v-delete-fs-file {$this->user} {$dir}", $output, $return_var);
+        
+        $error = self::check_return_code($return_var, $output);
+        
+        if (empty($error)) {
+            return array(
+                'result' => true
+            );
+        }
+        else {
+            return array(
+                'result'   => false,
+                'message'  => $error
+            );
+        }
+    }
+    
     public function formatFullPath($path_part = '') {
         if (substr($path_part, 0, strlen($this->ROOT_DIR)) === $this->ROOT_DIR) {
             $path = $path_part;
diff --git a/web/js/file_manager.js b/web/js/file_manager.js
index 2f0e2d419..263902740 100644
--- a/web/js/file_manager.js
+++ b/web/js/file_manager.js
@@ -164,12 +164,26 @@ FM.setSecondInactive = function(index, box) {
     FM.BG_TAB  = box;
 }
 
+FM.goToTop = function() {
+    var tab = FM.getTabLetter(FM.CURRENT_TAB);
+    var index = 0;
+
+    FM.setActive(index, FM.CURRENT_TAB);
+}
+
+FM.goToBottom = function() {
+    var tab = FM.getTabLetter(FM.CURRENT_TAB);
+    var index = $(FM.CURRENT_TAB).find('.dir').length - 1;
+
+    FM.setActive(index, FM.CURRENT_TAB);
+}
+
 FM.goUp = function() {
     var tab = FM.getTabLetter(FM.CURRENT_TAB);
     var index = FM['CURRENT_' + tab + '_LINE'];
     index -= 1;
     if (index < 0) {
-        index = $(FM.CURRENT_TAB).find('li').length - 1;
+        index = $(FM.CURRENT_TAB).find('li.dir').length - 1;
     }
     
     FM.setActive(index, FM.CURRENT_TAB);
@@ -179,7 +193,7 @@ FM.goDown = function() {
     var tab = FM.getTabLetter(FM.CURRENT_TAB);
     var index = FM['CURRENT_' + tab + '_LINE'];
     index += 1;
-    if (index > ($(FM.CURRENT_TAB).find('li').length - 1)) {
+    if (index > ($(FM.CURRENT_TAB).find('li.dir').length - 1)) {
         index = 0;
     }
     
@@ -196,6 +210,7 @@ FM.open = function(dir, box, callback) {
         'dir': dir
     };
     App.Ajax.request('cd', params, function(reply) {
+        var tab = FM.getTabLetter(FM.CURRENT_TAB);
         FM.preselectedItems[tab] = [];
         if (reply.result == true) {
             var html = FM.generate_listing(reply.listing, box);
@@ -216,6 +231,9 @@ FM.open = function(dir, box, callback) {
         var url = '/list/directory/?dir_a='+path_a+'&dir_b='+path_b;
         history.pushState({}, null, url);
         
+        if (FM['CURRENT_' + tab + '_LINE'] == -1) {
+           FM.setActive(0, FM.CURRENT_TAB);
+        }
     });
 }
 
@@ -401,7 +419,7 @@ FM.openFile = function(dir, box, elm) {
     
     var elm = $(elm).hasClass('dir') ? $(elm) : $(elm).closest('.dir');
     var src = $.parseJSON($(elm).find('.source').val());
-    console.log(elm);
+
     if (FM.isItemPseudo(src)) {
         FM.open(FM['TAB_' + tab + '_CURRENT_PATH'], FM['TAB_' + tab]);
     }
@@ -552,7 +570,7 @@ FM.fotoramaOpen = function(tab, img_index) {
     });
 
     $('.fotorama').on('fotorama:fullscreenexit', function (e, fotorama) {
-	$('.fotorama').data('fotorama').destroy();
+    $('.fotorama').data('fotorama').destroy();
     });
 
     $('.fotorama').fotorama().data('fotorama').requestFullScreen();
@@ -587,7 +605,7 @@ FM.checkBulkStatus = function(bulkStatuses, acc) {
     }
 
     if (status == true) {
-        $('#popup .results').html(msg);
+        $('#popup .results').html('Done');
         $('.controls p').replaceWith('
      close
      ');
     }
     else {
@@ -637,7 +655,7 @@ FM.bulkCopy = function() {
         var cfr_html = '';
         
         $.each(acc, function(i, o) {
-            var ref = $(o).parents('.dir');
+            var ref = $(o);
             var src = $(ref).find('.source').val();
             src = $.parseJSON(src);
           
@@ -654,7 +672,7 @@ FM.bulkCopy = function() {
         
         var bulkStatuses = [];
         $.each(acc, function(i, o) {
-            var ref = $(o).parents('.dir');
+            var ref = $(o);
             var src = $(ref).find('.source').val();
             src = $.parseJSON(src);
           
@@ -712,7 +730,7 @@ FM.bulkRemove = function() {
         var cfr_html = '';
         
         $.each(acc, function(i, o) {
-            var ref = $(o).parents('.dir');
+            var ref = $(o);
             var src = $(ref).find('.source').val();
             src = $.parseJSON(src);
           
@@ -729,7 +747,7 @@ FM.bulkRemove = function() {
         
         var bulkStatuses = [];
         $.each(acc, function(i, o) {
-            var ref = $(o).parents('.dir');
+            var ref = $(o);
             var src = $(ref).find('.source').val();
             src = $.parseJSON(src);
           
@@ -784,6 +802,10 @@ FM.toggleAllItemsSelected = function() {
         $(box).find('.dir').removeClass('selected');
         var index = FM['CURRENT_' + tab + '_LINE'];
         $(box).find('.dir:eq(' + index + ')').addClass('selected');
+        
+        $(FM.preselectedItems[tab]).each(function(i, index) {
+            $(box).find('.dir:eq(' + index + ')').addClass('selected');
+        });
     }
     else {
         $(box).find('.dir').addClass('selected');
@@ -1010,6 +1032,10 @@ FM.setTabActive = function(box, action) {
     if (FM.CURRENT_TAB == FM.TAB_A) {
         $(FM.TAB_B).find('.selected').addClass('selected-inactive').removeClass('selected');
         $(FM.TAB_A).find('.selected-inactive').addClass('selected').removeClass('selected-inactive');
+
+        if ($(FM.TAB_A).find('.selected-inactive').length == 0 && $(FM.TAB_A).find('.selected').length == 0) {
+            
+        }
     }
     else {
         $(FM.TAB_A).find('.selected').addClass('selected-inactive').removeClass('selected');
@@ -1277,7 +1303,7 @@ FM.confirmCopyItems = function () {
     App.Ajax.request(action, params, function(reply) {
         if (reply.result == true) {
             FM.popupClose();
-            FM.open(FM['TAB_' + tab + '_CURRENT_PATH'], FM['TAB_' + tab]);
+            // FM.open(FM['TAB_' + tab + '_CURRENT_PATH'], FM['TAB_' + tab]);
             FM.open(FM['TAB_' + opposite_tab + '_CURRENT_PATH'], FM['TAB_' + opposite_tab]);
         }
         else {
@@ -1638,6 +1664,11 @@ $(document).ready(function() {
     
     shortcut.add("Left",function() {
         FM.setTabActive(FM.TAB_A);
+        
+        var tab = FM.getTabLetter(FM.CURRENT_TAB);
+        if (FM['CURRENT_' + tab + '_LINE'] == -1) {
+           FM.setActive(0, FM.CURRENT_TAB);
+        }
     },{
         'type':             'keydown',
         'propagate':        false,
@@ -1647,6 +1678,29 @@ $(document).ready(function() {
     
     shortcut.add("Right",function() {
         FM.setTabActive(FM.TAB_B);
+        
+        var tab = FM.getTabLetter(FM.CURRENT_TAB);
+        if (FM['CURRENT_' + tab + '_LINE'] == -1) {
+           FM.setActive(0, FM.CURRENT_TAB);
+        }
+    },{
+        'type':             'keydown',
+        'propagate':        false,
+        'disable_in_input': false,
+        'target':           document
+    });
+    
+    shortcut.add("Home",function() {
+        FM.goToTop();
+    },{
+        'type':             'keydown',
+        'propagate':        false,
+        'disable_in_input': false,
+        'target':           document
+    });
+    
+    shortcut.add("End",function() {
+        FM.goToBottom();
     },{
         'type':             'keydown',
         'propagate':        false,
diff --git a/web/js/templates.js b/web/js/templates.js
index 9cc360b1d..0b97136f5 100644
--- a/web/js/templates.js
+++ b/web/js/templates.js
@@ -24,9 +24,9 @@ App.Templates.html = {
                         ~!:SIZE_VALUE~!\
                         ~!:DATE~!\
                         ~!:TIME~!\
-                        ••• \
+                        \
      • '], popup_alert: ['
      \
      ~!:TEXT~!
      \ From df2c0baf6316abbddc621d7f20c719051f4f78b1 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Thu, 10 Sep 2015 17:07:05 +0300 Subject: [PATCH 058/264] fix for /32 netmask --- bin/v-update-sys-ip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/v-update-sys-ip b/bin/v-update-sys-ip index 5f60be8b3..5e6d48729 100755 --- a/bin/v-update-sys-ip +++ b/bin/v-update-sys-ip @@ -102,7 +102,7 @@ for ip in $ip_list; do if [ ! -e "$VESTA/data/ips/$ip" ]; then interface=$(/sbin/ip addr |grep $ip |awk '{print $NF}') interface=$(echo $interface |cut -f 1 -d :) - netmask=$(/sbin/ip addr |grep $ip |awk '{print $2}' |cut -f 2 -d /) + netmask=$(/sbin/ip addr |grep $ip |cut -f 2 -d / |cut -f 1 -d \ ) netmask=$(convert_cidr $netmask) $BIN/v-add-sys-ip $ip $netmask $interface fi From fb619f1f3b3b9b7e35c6961e0a7acd2238b14ee9 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Thu, 10 Sep 2015 17:07:28 +0300 Subject: [PATCH 059/264] Link to system monitoring page --- web/templates/admin/list_services.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/web/templates/admin/list_services.html b/web/templates/admin/list_services.html index ad1ee6f16..9106b06c2 100644 --- a/web/templates/admin/list_services.html +++ b/web/templates/admin/list_services.html @@ -5,6 +5,9 @@
      + @@ -143,4 +189,34 @@
      + +
      From eea2bf23068c3cebb0485caa5c3238d3102cb5d3 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Mon, 14 Sep 2015 17:05:58 +0300 Subject: [PATCH 060/264] Fixed favourites config name --- bin/v-list-user-favourites | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/v-list-user-favourites b/bin/v-list-user-favourites index e87fcbefc..6117d26eb 100755 --- a/bin/v-list-user-favourites +++ b/bin/v-list-user-favourites @@ -20,7 +20,7 @@ source $VESTA/func/main.sh json_list_favourites() { i=1 fileds_count=$(echo "$fields" | wc -w) - fvrt_data=$(cat $USER_DATA/favourites.conf >/dev/null) + fvrt_data=$(cat $USER_DATA/favourites.conf 2>/dev/null) echo '{' eval $fvrt_data for field in $fields; do From 587b12ceac0a34e24ff1ee6b3270c53d13afd3d6 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Mon, 14 Sep 2015 17:06:34 +0300 Subject: [PATCH 061/264] ketboard shortcuts for vesta control panel --- web/hotkeys.html | 489 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 489 insertions(+) create mode 100644 web/hotkeys.html diff --git a/web/hotkeys.html b/web/hotkeys.html new file mode 100644 index 000000000..899272c21 --- /dev/null +++ b/web/hotkeys.html @@ -0,0 +1,489 @@ + +Vesta Keyboard Shortcuts +
      +

      Keyboard Shortcuts

      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From f451b8a99a24519327c1bdcfb3deb26e25e9f2a1 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Mon, 14 Sep 2015 17:07:34 +0300 Subject: [PATCH 062/264] Updated template header --- web/templates/admin/panel.html | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/web/templates/admin/panel.html b/web/templates/admin/panel.html index f739bc85b..f883dd13d 100644 --- a/web/templates/admin/panel.html +++ b/web/templates/admin/panel.html @@ -5,19 +5,20 @@
      -
      +
      -
      +
      +
      -
      +
      @@ -100,4 +101,4 @@
      - \ No newline at end of file + From 93b2a8617aff4b3ad51c616cb85b33755ca3e259 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Fri, 18 Sep 2015 17:42:48 +0300 Subject: [PATCH 063/264] Jailed SFTP via OpenSSH --- bin/v-add-sys-sftp-jail | 106 ++++++++++++++++++++++++++++++++++++ bin/v-add-user | 5 ++ bin/v-add-user-sftp-jail | 66 ++++++++++++++++++++++ bin/v-add-web-domain-ftp | 5 ++ bin/v-change-user-shell | 5 ++ bin/v-delete-sys-sftp-jail | 89 ++++++++++++++++++++++++++++++ bin/v-delete-user-sftp-jail | 63 +++++++++++++++++++++ bin/v-delete-web-domain-ftp | 5 ++ 8 files changed, 344 insertions(+) create mode 100755 bin/v-add-sys-sftp-jail create mode 100755 bin/v-add-user-sftp-jail create mode 100755 bin/v-delete-sys-sftp-jail create mode 100755 bin/v-delete-user-sftp-jail diff --git a/bin/v-add-sys-sftp-jail b/bin/v-add-sys-sftp-jail new file mode 100755 index 000000000..1a207efcf --- /dev/null +++ b/bin/v-add-sys-sftp-jail @@ -0,0 +1,106 @@ +#!/bin/bash +# info: add system sftp jail +# opions: NONE +# +# The script enables sftp jailed environment + + +#----------------------------------------------------------# +# Variable&Function # +#----------------------------------------------------------# + +# Importing system enviroment as we run this script +# mostly by cron wich do not read it by itself +source /etc/profile + +# Includes +source $VESTA/func/main.sh +source $VESTA/conf/vesta.conf + + +#----------------------------------------------------------# +# Verifications # +#----------------------------------------------------------# + +if [ -z "$SFTPJAIL_KEY" ]; then + exit +fi + + +#----------------------------------------------------------# +# Action # +#----------------------------------------------------------# + +# Checking sshd directives +config='/etc/ssh/sshd_config' +sftp_n=$(grep -n "Subsystem.*sftp" $config |grep -v internal |grep -v ":#") +sftp_i=$(grep -n "Subsystem.*sftp" $config |grep internal |grep -v ":#") + +# Disabling normal sftp +if [ ! -z "$sftp_n" ]; then + fline=$(echo $sftp_n |cut -f 1 -d :) + sed -i "${fline}s/Subsystem.*sftp/#Subsystem sftp/" $config + restart='yes' +fi + +# Enabling jailed sftp +if [ -z "$sftp_i" ]; then + echo "Subsystem sftp internal-sftp" >> $config + echo "Match Group sftp-only" >> $config + echo "ChrootDirectory /chroot/%u" >> $config + echo " AllowTCPForwarding no" >> $config + echo " X11Forwarding no" >> $config + echo " ForceCommand internal-sftp" >> $config + restart='yes' +fi + +# Validating opensshd config +if [ "$restart" = 'yes' ]; then + subj="OpenSSH restart failed" + email=$(grep CONTACT $VESTA/data/users/admin/user.conf |cut -f 2 -d \') + send_mail="$VESTA/web/inc/mail-wrapper.php" + /usr/sbin/sshd -t >/dev/null 2>&1 + if [ "$?" -ne 0 ]; then + mail_text="OpenSSH can not be restarted. Please check config: + \n\n$(/usr/sbin/sshd -t)" + echo -e "$mail_text" | $send_mail -s "$subj" $email + else + service ssh restart >/dev/null 2>&1 + service sshd restart >/dev/null 2>&1 + fi +fi + +# Adding sftp group +groupadd sftp-only 2>/dev/null + +# Checking users +shells="rssh|nologin" +for user in $(grep "$HOMEDIR" /etc/passwd |egrep "$shells" |cut -f 1 -d:); do + $BIN/v-add-user-sftp-jail $user +done + +# Adding v-add-sys-sftp-jail to startup +if [ -e "/etc/rc.local" ]; then + check_sftp=$(grep $0 /etc/rc.local) + check_exit=$(grep ^exit /etc/rc.local) + if [ -z "$check_sftp" ]; then + if [ -z "$check_exit" ]; then + echo "$BIN/v-add-sys-sftp-jail" >> /etc/rc.local + else + sed -i "s|^exit|$BIN/v-add-sys-sftp-jail\nexit|" /etc/rc.local + fi + fi + chmod +x /etc/rc.local +else + echo "$BIN/v-add-sys-sftp-jail" > /etc/rc.local + chmod +x /etc/rc.local +fi + +#----------------------------------------------------------# +# Vesta # +#----------------------------------------------------------# + +# Logging +log_event "$OK" "$EVENT" + +exit diff --git a/bin/v-add-user b/bin/v-add-user index 09367c622..568d7bbe5 100755 --- a/bin/v-add-user +++ b/bin/v-add-user @@ -207,6 +207,11 @@ if [ -x "$VESTA/data/packages/$package.sh" ]; then $VESTA/data/packages/$package.sh "$user" "$email" "$fname" "$lname" fi +# Adding jailed sftp env +if [ ! -z "$SFTPJAIL_KEY" ]; then + $BIN/v-add-user-sftp-jail $user +fi + # Logging log_history "added system user $user" '' 'admin' log_event "$OK" "$EVENT" diff --git a/bin/v-add-user-sftp-jail b/bin/v-add-user-sftp-jail new file mode 100755 index 000000000..6d0b87e8b --- /dev/null +++ b/bin/v-add-user-sftp-jail @@ -0,0 +1,66 @@ +#!/bin/bash +# info: add user sftp jail +# opions: USER +# +# The script enables sftp jailed environment + + +#----------------------------------------------------------# +# Variable&Function # +#----------------------------------------------------------# + +# Argument defenition +user=$1 + +# Includes +source $VESTA/func/main.sh +source $VESTA/conf/vesta.conf + + +#----------------------------------------------------------# +# Verifications # +#----------------------------------------------------------# + +check_args '1' "$#" 'USER' +validate_format 'user' +if [ -z "$SFTPJAIL_KEY" ]; then + exit +fi +user_str=$(grep "^$user:" /etc/passwd |egrep "rssh|nologin") +if [ -z "$user_str" ]; then + exit +fi + +#----------------------------------------------------------# +# Action # +#----------------------------------------------------------# + +# Defining user homedir +home="$(echo $user_str |cut -f 6 -d :)" + +# Adding chroot directory +if [ ! -d "/chroot/$user/$home" ]; then + mkdir -p /chroot/$user/$home + chmod 750 /chroot/$user + chmod 775 /chroot/$user/$home + chown root:sftp-only /chroot/$user + chown $user:sftp-only /chroot/$user/$home +fi + +# Adding user to sftp group +usermod -a -G sftp-only $user + +# Mouting home directory +if [ -z "$(mount |grep $home)" ]; then + mount -o bind $home /chroot/$user/$home/ +fi + + +#----------------------------------------------------------# +# Vesta # +#----------------------------------------------------------# + +# Logging +#log_event "$OK" "$EVENT" + +exit diff --git a/bin/v-add-web-domain-ftp b/bin/v-add-web-domain-ftp index 5626e7ac3..1eaace855 100755 --- a/bin/v-add-web-domain-ftp +++ b/bin/v-add-web-domain-ftp @@ -94,6 +94,11 @@ fi echo "$ftp_user:$password" | /usr/sbin/chpasswd ftp_md5=$(awk -v user=$ftp_user -F : 'user == $1 {print $2}' /etc/shadow) +# Adding jailed sftp env +if [ ! -z "$SFTPJAIL_KEY" ]; then + $BIN/v-add-user-sftp-jail $ftp_user +fi + #----------------------------------------------------------# # Vesta # diff --git a/bin/v-change-user-shell b/bin/v-change-user-shell index f533d43c3..513e55243 100755 --- a/bin/v-change-user-shell +++ b/bin/v-change-user-shell @@ -39,6 +39,11 @@ shell_path=$(grep -w "$shell" /etc/shells | head -n1) /usr/bin/chsh -s "$shell_path" "$user" &>/dev/null shell=$(basename $shell_path) +# Adding jailed sftp env +if [ ! -z "$SFTPJAIL_KEY" ]; then + $BIN/v-add-user-sftp-jail $user +fi + #----------------------------------------------------------# # Vesta # diff --git a/bin/v-delete-sys-sftp-jail b/bin/v-delete-sys-sftp-jail new file mode 100755 index 000000000..ef4292ef8 --- /dev/null +++ b/bin/v-delete-sys-sftp-jail @@ -0,0 +1,89 @@ +#!/bin/bash +# info: delete system sftp jail +# opions: NONE +# +# The script enables sftp jailed environment + + +#----------------------------------------------------------# +# Variable&Function # +#----------------------------------------------------------# + +# Importing system enviroment as we run this script +# mostly by cron wich do not read it by itself +source /etc/profile + +# Includes +source $VESTA/func/main.sh +source $VESTA/conf/vesta.conf + + +#----------------------------------------------------------# +# Verifications # +#----------------------------------------------------------# + +if [ -z "$SFTPJAIL_KEY" ]; then + exit +fi + + +#----------------------------------------------------------# +# Action # +#----------------------------------------------------------# + +# Checking users +for user in $(grep "$HOMEDIR" /etc/passwd |cut -f 1 -d:); do + $BIN/v-delete-user-sftp-jail $user +done + +# Checking sshd directives +config='/etc/ssh/sshd_config' +sftp_n=$(grep -n "Subsystem.*sftp" $config |grep -v internal |grep ":#") +sftp_i=$(grep -n "Subsystem.*sftp" $config |grep internal |grep -v ":#") + +# Backing up config +cp $config $config.bak-$(date +%s) + +# Enabling normal sftp +if [ ! -z "$sftp_n" ]; then + fline=$(echo $sftp_n |cut -f 1 -d :) + sed -i "${fline}s/#Subsystem/Subsystem sftp/" $config + restart='yes' +fi + +# Disabling jailed sftp +if [ ! -z "$sftp_i" ]; then + fline=$(echo $sftp_i |cut -f 1 -d :) + lline=$((fline + 5)) + sed -i "${fline},${lline}d" $config + restart='yes' +fi + +# Validating opensshd config +if [ "$restart" = 'yes' ]; then + subj="OpenSSH restart failed" + email=$(grep CONTACT $VESTA/data/users/admin/user.conf |cut -f 2 -d \') + send_mail="$VESTA/web/inc/mail-wrapper.php" + /usr/sbin/sshd -t >/dev/null 2>&1 + if [ "$?" -ne 0 ]; then + mail_text="OpenSSH can not be restarted. Please check config: + \n\n$(/usr/sbin/sshd -t)" + echo -e "$mail_text" | $send_mail -s "$subj" $email + else + service ssh restart >/dev/null 2>&1 + service sshd restart >/dev/null 2>&1 + fi +fi + +# Deleting v-add-sys-sftp-jail from startup +sed -i "/v-add-sys-sftp-jail/d" /etc/rc.local 2>/dev/null + + +#----------------------------------------------------------# +# Vesta # +#----------------------------------------------------------# + +# Logging +log_event "$OK" "$EVENT" + +exit diff --git a/bin/v-delete-user-sftp-jail b/bin/v-delete-user-sftp-jail new file mode 100755 index 000000000..49ff07e86 --- /dev/null +++ b/bin/v-delete-user-sftp-jail @@ -0,0 +1,63 @@ +#!/bin/bash +# info: delete user sftp jail +# opions: USER +# +# The script enables sftp jailed environment + + +#----------------------------------------------------------# +# Variable&Function # +#----------------------------------------------------------# + +# Argument defenition +user=$1 + +# Includes +source $VESTA/func/main.sh +source $VESTA/conf/vesta.conf + + +#----------------------------------------------------------# +# Verifications # +#----------------------------------------------------------# + +check_args '1' "$#" 'USER' +validate_format 'user' +user_str=$(grep "^$user:" /etc/passwd) +if [ -z "$user_str" ]; then + exit +fi + +#----------------------------------------------------------# +# Action # +#----------------------------------------------------------# + +# Defining user homedir +home="$(echo $user_str |cut -f 6 -d :)" + +# Unmounting home directory +mount_dir=$(mount |grep /chroot/$user/ |awk '{print $3}') +if [ ! -z "$mount_dir" ]; then + umount -f $mount_dir 2>/dev/null + if [ $? -ne 0 ]; then + gpasswd -d $user sftp-only >/dev/null 2>&1 + exit 1 + fi +fi + +# Deleting chroot dir +rmdir $mount_dir 2>/dev/null +rm -rf /chroot/$user + +# Deleting user from sftp group +gpasswd -d $user sftp-only >/dev/null 2>&1 + + +#----------------------------------------------------------# +# Vesta # +#----------------------------------------------------------# + +# Logging +#log_event "$OK" "$EVENT" + +exit diff --git a/bin/v-delete-web-domain-ftp b/bin/v-delete-web-domain-ftp index 01b8ac479..4d9e9feba 100755 --- a/bin/v-delete-web-domain-ftp +++ b/bin/v-delete-web-domain-ftp @@ -51,6 +51,11 @@ if [ "$?" != 0 ]; then sed -i "/^$ftp_user:/d" /etc/shadow fi +# Deleting sftp jail +if [ ! -z "$SFTPJAIL_KEY" ]; then + $BINv-delete-user-sftp-jail $ftp_user +fi + #----------------------------------------------------------# # Vesta # From 7734c6cf04416f44300d2308f312f7e6f6c3f439 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Fri, 18 Sep 2015 17:44:17 +0300 Subject: [PATCH 064/264] user favourites --- bin/v-add-user-favourites | 16 ++++++- bin/v-delete-user-favourites | 15 +++++- bin/v-list-user-favourites | 9 ++-- func/main.sh | 2 +- web/add/favorite/index.php | 65 ++++++++++++++++++++++++++ web/css/styles.min.css | 44 ++++++++++++++++- web/delete/favorite/index.php | 19 ++++++++ web/list/favorites/index.php | 25 ++++++++++ web/templates/admin/list_cron.html | 4 +- web/templates/admin/list_db.html | 4 +- web/templates/admin/list_dns.html | 4 +- web/templates/admin/list_dns_rec.html | 6 ++- web/templates/admin/list_firewall.html | 4 +- web/templates/admin/list_ip.html | 5 +- web/templates/admin/list_mail.html | 4 +- web/templates/admin/list_mail_acc.html | 4 +- web/templates/admin/list_packages.html | 4 +- web/templates/admin/list_user.html | 4 +- web/templates/admin/list_web.html | 6 +-- web/templates/user/list_cron.html | 3 +- web/templates/user/list_db.html | 4 +- web/templates/user/list_dns.html | 4 +- web/templates/user/list_dns_rec.html | 6 ++- web/templates/user/list_mail.html | 4 +- web/templates/user/list_mail_acc.html | 4 +- web/templates/user/list_user.html | 4 +- web/templates/user/list_web.html | 4 +- 27 files changed, 248 insertions(+), 29 deletions(-) create mode 100644 web/add/favorite/index.php create mode 100644 web/delete/favorite/index.php create mode 100644 web/list/favorites/index.php diff --git a/bin/v-add-user-favourites b/bin/v-add-user-favourites index d6a92aa24..53620d57d 100755 --- a/bin/v-add-user-favourites +++ b/bin/v-add-user-favourites @@ -13,6 +13,8 @@ user=$1 system=$(echo "$2" |tr '[:lower:]' '[:upper:]') object=$3 +email=$3 +id=$3 # Includes source $VESTA/func/main.sh @@ -24,7 +26,13 @@ source $VESTA/conf/vesta.conf #----------------------------------------------------------# check_args '3' "$#" 'USER SYSTEM OBJECT' -validate_format 'user' 'system' 'object' +validate_format 'user' 'system' +case $system in + MAIL_ACC) validate_format 'email' ;; + CRON) validate_format 'id' ;; + DNS_REC) validate_format 'id' ;; + *) validate_format 'object' +esac is_object_valid 'user' 'USER' "$user" is_object_unsuspended 'user' 'USER' "$user" @@ -33,7 +41,9 @@ case $system in USER) check='ok' ;; WEB) check='ok' ;; DNS) check='ok' ;; + DNS_REC) check='ok' ;; MAIL) check='ok' ;; + MAIL_ACC) check='ok' ;; DB) check='ok' ;; CRON) check='ok' ;; BACKUP) check='ok' ;; @@ -52,7 +62,9 @@ esac USER='' WEB='' DNS='' +DNS_REC='' MAIL='' +MAIL_ACC='' DB='' CRON='' BACKUP='' @@ -89,7 +101,9 @@ eval $system=$value echo "USER='$USER' WEB='$WEB' DNS='$DNS' +DNS_REC='$DNS_REC' MAIL='$MAIL' +MAIL_ACC='$MAIL_ACC' DB='$DB' CRON='$CRON' BACKUP='$BACKUP' diff --git a/bin/v-delete-user-favourites b/bin/v-delete-user-favourites index 5c69b8897..cd515e955 100755 --- a/bin/v-delete-user-favourites +++ b/bin/v-delete-user-favourites @@ -13,6 +13,8 @@ user=$1 system=$(echo "$2" |tr '[:lower:]' '[:upper:]') object=$3 +email=$3 +id=$3 # Includes source $VESTA/func/main.sh @@ -24,7 +26,12 @@ source $VESTA/conf/vesta.conf #----------------------------------------------------------# check_args '3' "$#" 'USER SYSTEM OBJECT' -validate_format 'user' 'system' 'object' +case $system in + MAIL_ACC) validate_format 'email' ;; + CRON) validate_format 'id' ;; + DNS_REC) validate_format 'id' ;; + *) validate_format 'object' +esac is_object_valid 'user' 'USER' "$user" is_object_unsuspended 'user' 'USER' "$user" @@ -33,7 +40,9 @@ case $system in USER) check='ok' ;; WEB) check='ok' ;; DNS) check='ok' ;; + DNS_REC) check='ok' ;; MAIL) check='ok' ;; + MAIL_ACC) check='ok' ;; DB) check='ok' ;; CRON) check='ok' ;; BACKUP) check='ok' ;; @@ -52,7 +61,9 @@ esac USER='' WEB='' DNS='' +DNS_REC='' MAIL='' +MAIL_ACC='' DB='' CRON='' BACKUP='' @@ -89,7 +100,9 @@ eval $system=$value echo "USER='$USER' WEB='$WEB' DNS='$DNS' +DNS_REC='$DNS_REC' MAIL='$MAIL' +MAIL_ACC='$MAIL_ACC' DB='$DB' CRON='$CRON' BACKUP='$BACKUP' diff --git a/bin/v-list-user-favourites b/bin/v-list-user-favourites index 6117d26eb..8e1b8dee3 100755 --- a/bin/v-list-user-favourites +++ b/bin/v-list-user-favourites @@ -36,9 +36,9 @@ json_list_favourites() { fi (( ++i)) done - if [ -n "$value" ]; then + #if [ -n "$value" ]; then echo -e ' }' - fi + #fi echo -e '}' } @@ -74,7 +74,9 @@ is_object_valid 'user' 'USER' "$user" USER='' WEB='' DNS='' +DNS_REC='' MAIL='' +MAIL_ACC='' DB='' CRON='' BACKUP='' @@ -84,7 +86,8 @@ FIREWALL='' # Defining fileds to select OBJ='Favourites' -fields='$OBJ $USER $WEB $DNS $MAIL $DB $CRON $BACKUP $IP $PACKAGE $FIREWALL' +fields='$OBJ $USER $WEB $DNS $DNS_REC $MAIL $MAIL_ACC $DB $CRON $BACKUP + $IP $PACKAGE $FIREWALL' # Listing favourites case $format in diff --git a/func/main.sh b/func/main.sh index a97f5000f..2873f704c 100644 --- a/func/main.sh +++ b/func/main.sh @@ -916,7 +916,7 @@ validate_format(){ ns2) validate_format_domain "$arg" 'name_server';; ns3) validate_format_domain "$arg" 'name_server';; ns4) validate_format_domain "$arg" 'name_server';; - object) validate_format_domain_alias "$arg" 'object';; + object) validate_format_name_s "$arg" 'object';; package) validate_format_name "$arg" "$arg_name" ;; password) validate_format_password "$arg" ;; port) validate_format_int "$arg" 'port' ;; diff --git a/web/add/favorite/index.php b/web/add/favorite/index.php new file mode 100644 index 000000000..5cfe582d0 --- /dev/null +++ b/web/add/favorite/index.php @@ -0,0 +1,65 @@ +
      '; + +// Init +error_reporting(NULL); +ob_start(); +session_start(); + + +// mail_acc +// firewall + +include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); + +// Check POST request +//if (!empty($_POST['ok'])) { + + // Check token +// if ((!isset($_POST['token'])) || ($_SESSION['token'] != $_POST['token'])) { +// header('location: /login/'); +// exit(); +// } + + + // v-list-user-favourites + // v-delete-user-favourites admin web test0011.com + + // Protect input +// $v_section = escapeshellarg($_POST['v_section']); +// $v_unit_id = escapeshellarg($_POST['v_unit_id']); + + $v_section = escapeshellarg($_REQUEST['v_section']); + $v_unit_id = escapeshellarg($_REQUEST['v_unit_id']); + +// $v_section = 'web'; +// $v_unit_id = 'test0011.com'; + + + echo VESTA_CMD."v-add-user-favourites ".$_SESSION['user']." ".$v_section." ".$v_unit_id; + + echo ' - '; + + // Add cron job + exec (VESTA_CMD."v-add-user-favourites ".$_SESSION['user']." ".$v_section." ".$v_unit_id, $output, $return_var); + check_return_code($return_var,$output); + + var_dump($return_var); + echo '
      --------------------
      '; + + var_dump($output); + echo '
      --------------------
      '; + + +/* + echo '
      favorites:
      '; + + // Data + exec (VESTA_CMD."v-list-user-favourites $user json", $output, $return_var); + $data = json_decode(implode('', $output), true); + $data = array_reverse($data,true); + print_r($data); +*/ +//} +?> \ No newline at end of file diff --git a/web/css/styles.min.css b/web/css/styles.min.css index 571a0061d..b0b348984 100644 --- a/web/css/styles.min.css +++ b/web/css/styles.min.css @@ -1890,8 +1890,8 @@ div.l-content > div.l-separator:nth-of-type(4) { width: 36px; height: 36px; background-position: -216px 560px; - display: none; cursor: pointer; + display: none; } .l-unit--starred .l-icon-star { display: inline-block; @@ -1912,7 +1912,7 @@ div.l-content > div.l-separator:nth-of-type(4) { } .l-unit:hover .l-icon-star { - /*display: inline-block;*/ + display: inline-block; } @@ -2144,6 +2144,13 @@ div.l-content > div.l-separator:nth-of-type(4) { .step-top { padding-top: 42px; } +.step-top-small { + padding-top: 22px; +} +.jump-top { + margin-top: -60px; +} + .data a { text-decoration: none; } @@ -2341,14 +2348,30 @@ a.vst-text:active b{ .additional-control.ftp-remove-user { padding: 2px 0 0 0; } + +.additional-control.delete:hover, .additional-control.ftp-remove-user:hover { background-color: #FF3438; border-color: #FF3438; } +.additional-control.delete:active, .additional-control.ftp-remove-user:active { background-color: #FF5F5F; border-color: #FF5F5F; } +.additional-control.add:hover { + background-color: #9FBF0C; + border-color: #9FBF0C; +} +.additional-control.add:active{ + background-color: #c0e60f; + border-color: #c0e60f; +} + +.additional-control.remove-ns { + display: none; +} + .data .step-left { padding-left: 50px; } @@ -2478,6 +2501,23 @@ td.hint { .data-dotted { vertical-align: top; } +.mail-infoblock-td { + vertical-align: top; +} +.mail-infoblock { + padding-top: 76px; + margin-left: -100px; + font-size: 12px; + color: #777; +} +.mail-infoblock td { + color: #777; + font-size: 14px; + height: 20px; + padding-right: 25px; + font-weight: normal; +} + :focus {outline:none;} ::-moz-focus-inner {border:0;} diff --git a/web/delete/favorite/index.php b/web/delete/favorite/index.php new file mode 100644 index 000000000..0b61b2c44 --- /dev/null +++ b/web/delete/favorite/index.php @@ -0,0 +1,19 @@ +'; + + + error_reporting(NULL); + ob_start(); + session_start(); + + include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); + + $v_section = escapeshellarg($_REQUEST['v_section']); + $v_unit_id = escapeshellarg($_REQUEST['v_unit_id']); + + exec (VESTA_CMD."v-delete-user-favourites ".$_SESSION['user']." ".$v_section." ".$v_unit_id, $output, $return_var); + check_return_code($return_var,$output); + + +?> \ No newline at end of file diff --git a/web/list/favorites/index.php b/web/list/favorites/index.php new file mode 100644 index 000000000..1c30fa665 --- /dev/null +++ b/web/list/favorites/index.php @@ -0,0 +1,25 @@ + Favorites:
      '; + + // Data + exec (VESTA_CMD."v-list-user-favourites ".$_SESSION['user']." json", $output, $return_var); + + +// print_r(implode('', $output)); +// $json = '{ "Favourites": { "USER": "", "WEB": "bulletfarm.com", "DNS": "", "MAIL": "", "DB": "", "CRON": "", "BACKUP": "", "IP": "", "PACKAGE": "", "FIREWALL": ""}}'; +// $data = json_decode($json, true); + + + $data = json_decode(implode('', $output).'}', true); + $data = array_reverse($data,true); + + print_r($data); +// $data = array_reverse($data,true); + +// $data = json_decode(implode('', $output), true); + +?> \ No newline at end of file diff --git a/web/templates/admin/list_cron.html b/web/templates/admin/list_cron.html index 4a1198c8f..524af349e 100644 --- a/web/templates/admin/list_cron.html +++ b/web/templates/admin/list_cron.html @@ -79,7 +79,9 @@ } ?> -
      +
      diff --git a/web/templates/admin/list_db.html b/web/templates/admin/list_db.html index 7e0c64bb9..617632556 100644 --- a/web/templates/admin/list_db.html +++ b/web/templates/admin/list_db.html @@ -109,7 +109,9 @@ ?> -
      +
      diff --git a/web/templates/admin/list_dns.html b/web/templates/admin/list_dns.html index 23c078f15..34fc39eff 100644 --- a/web/templates/admin/list_dns.html +++ b/web/templates/admin/list_dns.html @@ -69,7 +69,9 @@ } ?> -
      +
      diff --git a/web/templates/admin/list_dns_rec.html b/web/templates/admin/list_dns_rec.html index 6bc95b11a..f12500fa0 100644 --- a/web/templates/admin/list_dns_rec.html +++ b/web/templates/admin/list_dns_rec.html @@ -67,7 +67,8 @@ ?> -
      +
      @@ -96,6 +97,9 @@
      +
      + +
      diff --git a/web/templates/admin/list_firewall.html b/web/templates/admin/list_firewall.html index b1d515d73..324b4996b 100644 --- a/web/templates/admin/list_firewall.html +++ b/web/templates/admin/list_firewall.html @@ -72,7 +72,9 @@ } ?> -
      +
      diff --git a/web/templates/admin/list_ip.html b/web/templates/admin/list_ip.html index c5d1a662e..f095a7c1f 100644 --- a/web/templates/admin/list_ip.html +++ b/web/templates/admin/list_ip.html @@ -60,7 +60,10 @@ ++$i; ?> -
      +
      diff --git a/web/templates/admin/list_mail.html b/web/templates/admin/list_mail.html index 17a6ba239..73ee54e18 100644 --- a/web/templates/admin/list_mail.html +++ b/web/templates/admin/list_mail.html @@ -86,7 +86,9 @@ ?> -
      "> +
      ">
      diff --git a/web/templates/admin/list_mail_acc.html b/web/templates/admin/list_mail_acc.html index b9de63180..253e0194a 100644 --- a/web/templates/admin/list_mail_acc.html +++ b/web/templates/admin/list_mail_acc.html @@ -82,7 +82,9 @@ ?> -
      +
      " + v_unit_id="" v_section="mail_acc" sort-date="" sort-name="" sort-disk="" +sort-star="">
      diff --git a/web/templates/admin/list_packages.html b/web/templates/admin/list_packages.html index 111bd21a7..65d19fa48 100644 --- a/web/templates/admin/list_packages.html +++ b/web/templates/admin/list_packages.html @@ -56,7 +56,9 @@ ?> -
      +
      diff --git a/web/templates/admin/list_user.html b/web/templates/admin/list_user.html index 97e4a6c5b..1d70c1e38 100644 --- a/web/templates/admin/list_user.html +++ b/web/templates/admin/list_user.html @@ -81,7 +81,9 @@ } ?> -
      +
      diff --git a/web/templates/admin/list_web.html b/web/templates/admin/list_web.html index 4919a3dad..c2da185a4 100644 --- a/web/templates/admin/list_web.html +++ b/web/templates/admin/list_web.html @@ -115,10 +115,10 @@ } ?> -
      +sort-name="" sort-bandwidth="" sort-disk="" sort-star="">
      diff --git a/web/templates/user/list_cron.html b/web/templates/user/list_cron.html index 6ba70842c..a91caafc2 100644 --- a/web/templates/user/list_cron.html +++ b/web/templates/user/list_cron.html @@ -80,7 +80,8 @@ ?> -
      +
      diff --git a/web/templates/user/list_db.html b/web/templates/user/list_db.html index 52ac74f83..dff13d0dd 100644 --- a/web/templates/user/list_db.html +++ b/web/templates/user/list_db.html @@ -109,7 +109,9 @@ ?> -
      +
      diff --git a/web/templates/user/list_dns.html b/web/templates/user/list_dns.html index 6c1c89099..432d0d83c 100644 --- a/web/templates/user/list_dns.html +++ b/web/templates/user/list_dns.html @@ -70,7 +70,9 @@ } ?> -
      +
      diff --git a/web/templates/user/list_dns_rec.html b/web/templates/user/list_dns_rec.html index 0c8622876..6a7a82700 100644 --- a/web/templates/user/list_dns_rec.html +++ b/web/templates/user/list_dns_rec.html @@ -67,7 +67,8 @@ ?> -
      +
      @@ -96,6 +97,9 @@
      +
      + +
      diff --git a/web/templates/user/list_mail.html b/web/templates/user/list_mail.html index c011bacff..e45c2eb62 100644 --- a/web/templates/user/list_mail.html +++ b/web/templates/user/list_mail.html @@ -86,7 +86,9 @@ ?> -
      +
      diff --git a/web/templates/user/list_mail_acc.html b/web/templates/user/list_mail_acc.html index 8517adba6..d510445ab 100644 --- a/web/templates/user/list_mail_acc.html +++ b/web/templates/user/list_mail_acc.html @@ -83,7 +83,9 @@ ?> -
      +
      " v_unit_id="" v_section="mail_acc" +sort-date="" sort-name="" sort-disk="" +sort-star="">
      diff --git a/web/templates/user/list_user.html b/web/templates/user/list_user.html index cceb2de23..cdf2c2d87 100644 --- a/web/templates/user/list_user.html +++ b/web/templates/user/list_user.html @@ -81,7 +81,9 @@ } ?> -
      +
      diff --git a/web/templates/user/list_web.html b/web/templates/user/list_web.html index 34e98bbde..3ee9c16ba 100644 --- a/web/templates/user/list_web.html +++ b/web/templates/user/list_web.html @@ -119,7 +119,9 @@ -
      +
      From 6e193e08526848282170bca3849172a2b9d2ba17 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Fri, 18 Sep 2015 17:45:03 +0300 Subject: [PATCH 065/264] FM updates --- web/file_manager/fm_core.php | 6 +- web/js/file_manager.js | 115 ++++++++++++++++++++++------------- web/js/i18n.js.php | 26 ++++++++ web/js/templates.js | 52 ++++++++-------- web/upload/UploadHandler.php | 13 ++-- 5 files changed, 135 insertions(+), 77 deletions(-) diff --git a/web/file_manager/fm_core.php b/web/file_manager/fm_core.php index 5a9e39b7d..fb827d481 100644 --- a/web/file_manager/fm_core.php +++ b/web/file_manager/fm_core.php @@ -45,13 +45,13 @@ class FileManager { public function checkFileType($dir) { $dir = $this->formatFullPath($dir); - exec(VESTA_CMD . "v-delete-fs-file {$this->user} {$dir}", $output, $return_var); + exec(VESTA_CMD . "v-get-fs-file-type {$this->user} {$dir}", $output, $return_var); $error = self::check_return_code($return_var, $output); - if (empty($error)) { return array( - 'result' => true + 'result' => true, + 'data' => implode('', $output) ); } else { diff --git a/web/js/file_manager.js b/web/js/file_manager.js index 263902740..2702b92d2 100644 --- a/web/js/file_manager.js +++ b/web/js/file_manager.js @@ -46,11 +46,37 @@ FM.EDITABLE_FILETYPES = [ 'txt', 'php', 'js', 'html' ]; +FM.EDITABLE_MIMETYPES = [ + 'application/emma+xml', + 'application/epp+xml', + 'application/javascript', + 'application/json', + 'application/jsonml+json ', + 'application/lost+xml', + 'application/marc', + 'application/msword', + 'application/sru+xml', + 'application/vnd.android.package-archive', + 'text/csv', + 'text/css', + 'text/javascript', + 'text/html', + 'text/x-java-source' +]; + +FM.EDITABLE_MIMETYPES_MASKS = [ + /(.)*text(.)*/, + /(.)*inode(.)*/ +]; + FM.preselectedItems = {'A': [], 'B': []}; FM.directoryNotAvailable = function(reply) { - alert('Directory not available'); // todo: translate + var tpl = Tpl.get('popup_alert', 'FM'); + tpl.set(':TEXT', App.Constants.FM_DIRECTORY_NOT_AVAILABLE); + + FM.popupOpen(tpl.finalize()); } FM.showError = function(type, message) { @@ -382,7 +408,8 @@ FM.sortItems = function(items, box) { return sorted; } -FM.isFileEditable = function(src) { +FM.isFileEditable = function(src, mime) { + if ('undefined' == typeof src.filetype) { return false; } @@ -391,7 +418,21 @@ FM.isFileEditable = function(src) { return true; } - return false; + var mime_type = mime.split(';'); + mime_type = mime_type[0]; + + if ($.inArray(mime_type, FM.EDITABLE_MIMETYPES) != -1) { + return true; + } + + var editable = false; + $.each(FM.EDITABLE_MIMETYPES_MASKS, function(i, mask) { + if (mime_type.search(mask) != -1) { + editable = true; + } + }); + + return editable; } FM.editFileFromSubcontext = function(elm) { @@ -414,26 +455,36 @@ FM.openFile = function(dir, box, elm) { var tab = FM.getTabLetter(box); FM['TAB_'+tab+'_CURRENT_PATH'] = dir; - - - + var elm = $(elm).hasClass('dir') ? $(elm) : $(elm).closest('.dir'); var src = $.parseJSON($(elm).find('.source').val()); - + if (FM.isItemPseudo(src)) { - FM.open(FM['TAB_' + tab + '_CURRENT_PATH'], FM['TAB_' + tab]); - } - - if (FM.isFileEditable(src)) { - var myWindow = window.open('/edit/file/?path=' + src.full_path, '_blank');//, src.full_path, "width=900, height=700"); - } - else { - var path = src.full_path; - var win = window.open('/download/file/?path=' + path, '_blank'); - win.focus(); + return FM.open(FM['TAB_' + tab + '_CURRENT_PATH'], FM['TAB_' + tab]); } + var params = { + dir: src.full_path + }; + App.Ajax.request('check_file_type', params, function(reply) { + if (reply.result) { + if (FM.isFileEditable(src, reply.data)) { + var myWindow = window.open('/edit/file/?path=' + src.full_path, '_blank');//, src.full_path, "width=900, height=700"); + } + else { + var path = src.full_path; + var win = window.open('/download/file/?path=' + path, '_blank'); + //win.focus(); + } + } + else { + // force download file + var path = src.full_path; + var win = window.open('/download/file/?path=' + path, '_blank'); + //win.focus(); + } + }); } FM.getTabLetter = function(box) { @@ -551,7 +602,6 @@ FM.generate_listing = function(reply, box) { FM.toggleCheck = function(uid) { var ref = $('#check' + uid); if (ref.length > 0) { - //ref.attr('checked', true); $(ref).hasClass('checkbox-selected') ? $(ref).addClass('checkbox-selected') : $(ref).removeClass('checkbox-selected'); } } @@ -605,7 +655,7 @@ FM.checkBulkStatus = function(bulkStatuses, acc) { } if (status == true) { - $('#popup .results').html('Done'); + $('#popup .results').html(App.Constants.FM_DONE); $('.controls p').replaceWith('

      close

      '); } else { @@ -665,7 +715,7 @@ FM.bulkCopy = function() { }); var tpl = Tpl.get('popup_bulk', 'FM'); - tpl.set(':ACTION', 'YOU ARE COPYING'); + tpl.set(':ACTION', App.Constants.FM_YOU_ARE_COPYING); tpl.set(':TEXT', cfr_html); FM.popupOpen(tpl.finalize()); @@ -740,7 +790,7 @@ FM.bulkRemove = function() { }); var tpl = Tpl.get('popup_bulk', 'FM'); - tpl.set(':ACTION', 'YOU ARE REMOVING'); + tpl.set(':ACTION', App.Constants.FM_YOU_ARE_REMOVING); tpl.set(':TEXT', cfr_html); FM.popupOpen(tpl.finalize()); @@ -750,10 +800,7 @@ FM.bulkRemove = function() { var ref = $(o); var src = $(ref).find('.source').val(); src = $.parseJSON(src); - - /*if (!FM.isItemPseudo(o)) { - cfr_html += '
      '+src.name+'
      '; - }*/ + var tab = FM.getTabLetter(FM.CURRENT_TAB); var opposite_tab = 'A'; @@ -1610,22 +1657,6 @@ FM.init(); $(document).ready(function() { $('.progress-container').hide(); - //return alert('statechange: Back'); - /*$(document).bind('keydown.up', function() { - console.log(1); - //try{FM.goUp();}catch(e){console.log(e);} - //console.log(FM); - FM.goUp(); - }); - - $(document).bind('keydown.down', function() { - console.log(1); - //try{FM.goUp();}catch(e){console.log(e);} - //console.log(FM); - FM.goDown(); - });*/ - - var ph = $('.window .pwd').outerHeight(); var mh = $('.window .menu').outerHeight(); var wh = $(window).outerHeight(); @@ -1825,5 +1856,5 @@ $(document).ready(function() { $(window).bind('statechange', function(evt){ $(evt).stopPropagation(); // History.getState() - alert('No way back yet'); + //alert('No way back yet'); }) diff --git a/web/js/i18n.js.php b/web/js/i18n.js.php index dcf372709..500b98f0c 100644 --- a/web/js/i18n.js.php +++ b/web/js/i18n.js.php @@ -53,3 +53,29 @@ App.Constants.FM_NO_FILE_SELECTED = ''; App.Constants.FM_FILE_TYPE_NOT_SUPPORTED = ''; +App.Constants.FM_DIRECTORY_NOT_AVAILABLE = ''; +App.Constants.FM_DONE = ''; +App.Constants.FM_CLOSE = ''; +App.Constants.FM_COPY = ''; +App.Constants.FM_CANCEL = ''; +App.Constants.FM_RENAME = ''; +App.Constants.FM_DELETE = ''; +App.Constants.FM_EXTRACT = ''; +App.Constants.FM_CREATE = ''; +App.Constants.FM_PACK = ''; +App.Constants.FM_OK = ''; +App.Constants.FM_YOU_ARE_COPYING = ''; +App.Constants.FM_YOU_ARE_REMOVING = ''; + +App.Constants.FM_CONFIRM_COPY = ''; +App.Constants.FM_CONFIRM_DELETE = ''; +App.Constants.FM_INTO_KEYWORD = ''; +App.Constants.FM_EXISTING_FILES_WILL_BE_DELETED = ''; +App.Constants.FM_ORIGINAL_NAME = ''; +App.Constants.FM_FILE = ''; +App.Constants.FM_ALREADY_EXISTS = ''; +App.Constants.FM_EXTRACT = ''; +App.Constants.FM_CREATE_FILE = ''; + + + diff --git a/web/js/templates.js b/web/js/templates.js index 0b97136f5..dd33f790e 100644 --- a/web/js/templates.js +++ b/web/js/templates.js @@ -38,47 +38,47 @@ App.Templates.html = {
      ~!:ACTION~!:
      ~!:TEXT~!
      \
      \
      \ - \ + \

      \
      \
      '], popup_delete: ['
      \ -
      Are you sure you want to delete "~!:FILENAME~!"?
      \ +
      '+App.Constants.FM_CONFIRM_DELETE+' "~!:FILENAME~!"?
      \
      \ -

      cancel

      \ -

      delete

      \ +

      '+App.Constants.FM_CANCEL+'

      \ +

      '+App.Constants.FM_DELETE+'

      \
      \
      '], popup_copy: ['
      \ -
      Are you sure you want to copy "~!:SRC_FILENAME~!" into:
      \ +
      '+App.Constants.FM_CLOSE+' "~!:SRC_FILENAME~!" '+App.Constants.FM_INTO_KEYWORD+':
      \
      \ \
      \ -
      existing files will be replaced
      \ +
      '+App.Constants.FM_EXISTING_FILES_WILL_BE_DELETED+'
      \
      \ -

      cancel

      \ -

      copy

      \ +

      '+App.Constants.FM_CANCEL+'

      \ +

      '+App.Constants.FM_COPY+'

      \
      \
      '], popup_rename: ['
      \ -
      Original name: "~!:FILENAME~!"
      \ - \ +
      '+App.Constants.FM_ORIGINAL_NAME+': "~!:FILENAME~!"
      \ + \
      \
      \ \
      \
      \ -

      cancel

      \ -

      rename

      \ +

      '+App.Constants.FM_CANCEL+'

      \ +

      '+App.Constants.FM_RENAME+'

      \
      \
      \ -

      cancel

      \ -

      rename

      \ +

      '+App.Constants.FM_CANCEL+'

      \ +

      '+App.Constants.FM_Rename+'

      \
      \
      '], popup_pack: ['
      \ -
      Pack "~!:FILENAME~!" into:
      \ +
      '+App.Constants.FM_PACK+' "~!:FILENAME~!" '+App.Constants.FM_INTO_KEYWORD+':
      \
      \ \
      \ @@ -87,13 +87,13 @@ App.Templates.html = { \
      \
      \ -

      cancel

      \ -

      Pack

      \ +

      '+App.Constants.FM_CANCEL+'

      \ +

      '+App.Constants.FM_PACK+'

      \
      \
      '], popup_unpack: ['
      \ -
      Extract archive "~!:FILENAME~!" to:
      \ +
      '+App.Constants.FM_EXTRACT+' "~!:FILENAME~!" '+App.Constants.FM_INTO_KEYWORD+':
      \
      \ \
      \ @@ -102,22 +102,22 @@ App.Templates.html = { \
      \
      \ -

      cancel

      \ -

      Extract

      \ +

      '+App.Constants.FM_CANCEL+'

      \ +

      '+App.Constants.FM_EXTRACT+'

      \
      \
      '], popup_create_file: ['
      \ -
      Create file
      \ +
      '+App.Constants.FM_CREATE_FILE+'
      \ \
      \
      \ \
      \
      \ -

      cancel

      \ -

      create

      \ +

      '+App.Constants.FM_CANCEL+'

      \ +

      '+App.Constants.FM_CREATE+'

      \
      \
      '], popup_create_dir: ['
      \ @@ -128,14 +128,14 @@ App.Templates.html = { \
      \
      \ -

      cancel

      \ -

      create

      \ +

      '+App.Constants.FM_CANCEL+'

      \ +

      '+App.Constants.FM_CREATE+'

      \
      \
      '], popup_no_file_selected: ['
      \
      Please select a file
      \
      \ -

      ok

      \ +

      '+App.Constants.FM_OK+'

      \
      \
      '] } diff --git a/web/upload/UploadHandler.php b/web/upload/UploadHandler.php index fa7947654..1f170eca2 100755 --- a/web/upload/UploadHandler.php +++ b/web/upload/UploadHandler.php @@ -210,7 +210,7 @@ class UploadHandler protected function get_upload_path($file_name = null, $version = null) { $relocate_directory = $_GET['dir']; if (empty($relocate_directory)) { - $relocate_directory = '/home/admin/'; + $relocate_directory = '/home/admin/'; // fallback dir } if ($relocate_directory[strlen($relocate_directory) -1] != '/') { $relocate_directory .= '/'; @@ -1041,7 +1041,7 @@ class UploadHandler } protected function handle_file_upload($uploaded_file, $name, $size, $type, $error, - $index = null, $content_range = null) { + $index = null, $content_range = null) { $file = new \stdClass(); $file->name = $this->get_file_name($uploaded_file, $name, $size, $type, $error, $index, $content_range); @@ -1076,12 +1076,13 @@ class UploadHandler ); } $file_size = $this->get_file_size($file_path, $append_file); - //var_dump($file_size);die(); + if ($file_size === $file->size) { $file->url = $this->get_download_url($file->name); - if ($this->is_valid_image_file($file_path)) { - $this->handle_image_file($file_path, $file); - } + // uncomment if images also need to be resized + //if ($this->is_valid_image_file($file_path)) { + // $this->handle_image_file($file_path, $file); + //} } else { $file->size = $file_size; if (!$content_range && $this->options['discard_aborted_uploads']) { From bfd900a6228b9eacf25df68be3dc7d4238a4edcc Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Mon, 28 Sep 2015 01:58:05 +0300 Subject: [PATCH 066/264] fix for php-fpm stack --- bin/v-add-web-domain | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bin/v-add-web-domain b/bin/v-add-web-domain index bd58d24bd..3fabd59f7 100755 --- a/bin/v-add-web-domain +++ b/bin/v-add-web-domain @@ -39,7 +39,7 @@ source $VESTA/conf/vesta.conf #----------------------------------------------------------# check_args '3' "$#" 'USER DOMAIN IP [RESTART] [ALIASES] [PROXY_EXTENTIONS]' -validate_format 'user' 'domain' 'ip' 'extentions' +validate_format 'user' 'domain' 'ip' is_system_enabled "$WEB_SYSTEM" 'WEB_SYSTEM' is_object_valid 'user' 'USER' "$user" is_object_unsuspended 'user' 'USER' "$user" @@ -55,6 +55,7 @@ if [ ! -z "$aliases" ]; then done fi if [ ! -z "$PROXY_SYSTEM" ]; then + validate_format 'extentions' proxy=$(get_user_value '$PROXY_TEMPLATE') is_proxy_template_valid $proxy fi From 808d2c3849703f6021ce0db1dcc7190788c01f7b Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Mon, 28 Sep 2015 01:58:31 +0300 Subject: [PATCH 067/264] search api for file manager --- bin/v-search-fs-object | 47 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100755 bin/v-search-fs-object diff --git a/bin/v-search-fs-object b/bin/v-search-fs-object new file mode 100755 index 000000000..3c7785682 --- /dev/null +++ b/bin/v-search-fs-object @@ -0,0 +1,47 @@ +#!/bin/bash +# info: search file or directory +# options: USER OBJECT [PATH] +# +# The function search files and directories on the file system + +user=$1 +object=$2 +path=$3 + +# Checking arguments +if [ -z "$object" ]; then + echo "Usage: USER OBJECT [PATH]" + exit 1 +fi + +# Checking vesta user +if [ ! -e "$VESTA/data/users/$user" ]; then + echo "Error: vesta user $user doesn't exist" + exit 3 +fi + +# Checking user homedir +homedir=$(grep "^$user:" /etc/passwd | cut -f 6 -d :) +if [ -z $homedir ]; then + echo "Error: user home directory doesn't exist" + exit 12 +fi + +# Checking path +if [ ! -z "$path" ]; then + rpath=$(readlink -f "$path") + if [ -z "$(echo $rpath |grep $homedir)" ]; then + echo "Error: invalid path $dst_dir" + exit 2 + fi +else + path=$homedir +fi + +# Listing directory +sudo -u $user find "$path" -name "$object" \ + -printf "%y|%m|%TY-%Tm-%Td|%TH:%TM|%u|%g|%s|%P\n" 2>/dev/null +# -printf "%y|%m|%TY-%Tm-%Td|%TH:%TM:%TS|%u|%g|%s|%P\n" 2>/dev/null + +# Exiting +exit $? From 99a403a2efb5966bc95c45cc68e9267ca0e53fd0 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Mon, 28 Sep 2015 02:00:45 +0300 Subject: [PATCH 068/264] multiple name servers --- web/add/dns/index.php | 29 +++++-- web/add/package/index.php | 8 ++ web/templates/admin/add_dns.html | 102 +++++++++++++++++++++---- web/templates/admin/edit_package.html | 98 +++++++++++++++++++++--- web/templates/admin/edit_user.html | 104 ++++++++++++++++++++++---- web/templates/footer.html | 22 ++++-- web/templates/header.html | 2 +- 7 files changed, 318 insertions(+), 47 deletions(-) diff --git a/web/add/dns/index.php b/web/add/dns/index.php index ee41bdb52..629e2ec57 100644 --- a/web/add/dns/index.php +++ b/web/add/dns/index.php @@ -39,14 +39,19 @@ if (!empty($_POST['ok'])) { if (!empty($_POST['v_ns2'])) $v_ns2 = escapeshellarg($_POST['v_ns2']); if (!empty($_POST['v_ns3'])) $v_ns3 = escapeshellarg($_POST['v_ns3']); if (!empty($_POST['v_ns4'])) $v_ns4 = escapeshellarg($_POST['v_ns4']); + if (!empty($_POST['v_ns5'])) $v_ns5 = escapeshellarg($_POST['v_ns5']); + if (!empty($_POST['v_ns6'])) $v_ns6 = escapeshellarg($_POST['v_ns6']); + if (!empty($_POST['v_ns7'])) $v_ns7 = escapeshellarg($_POST['v_ns7']); + if (!empty($_POST['v_ns8'])) $v_ns8 = escapeshellarg($_POST['v_ns8']); // Add dns domain if (empty($_SESSION['error_msg'])) { - exec (VESTA_CMD."v-add-dns-domain ".$user." ".$v_domain." ".$v_ip." ".$v_ns1." ".$v_ns2." ".$v_ns3." ".$v_ns4." no", $output, $return_var); + exec (VESTA_CMD."v-add-dns-domain ".$user." ".$v_domain." ".$v_ip." ".$v_ns1." ".$v_ns2." ".$v_ns3." ".$v_ns4." ".$v_ns5." ".$v_ns6." ".$v_ns7." ".$v_ns8." no", $output, $return_var); check_return_code($return_var,$output); unset($output); } + // Set expiriation date if (empty($_SESSION['error_msg'])) { if ((!empty($_POST['v_exp'])) && ($_POST['v_exp'] != date('Y-m-d', strtotime('+1 year')))) { @@ -139,6 +144,16 @@ include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html'); // Panel top_panel($user,$TAB); +$v_ns1 = str_replace("'", "", $v_ns1); +$v_ns2 = str_replace("'", "", $v_ns2); +$v_ns3 = str_replace("'", "", $v_ns3); +$v_ns4 = str_replace("'", "", $v_ns4); +$v_ns5 = str_replace("'", "", $v_ns5); +$v_ns6 = str_replace("'", "", $v_ns6); +$v_ns7 = str_replace("'", "", $v_ns7); +$v_ns8 = str_replace("'", "", $v_ns8); + + // Display body for dns domain if (empty($_GET['domain'])) { if (empty($v_ttl)) $v_ttl = 14400; @@ -146,10 +161,14 @@ if (empty($_GET['domain'])) { if (empty($v_ns1)) { exec (VESTA_CMD."v-list-user-ns ".$user." json", $output, $return_var); $nameservers = json_decode(implode('', $output), true); - $v_ns1 = $nameservers[0]; - $v_ns2 = $nameservers[1]; - $v_ns3 = $nameservers[2]; - $v_ns4 = $nameservers[3]; + $v_ns1 = str_replace("'", "", $nameservers[0]); + $v_ns2 = str_replace("'", "", $nameservers[1]); + $v_ns3 = str_replace("'", "", $nameservers[2]); + $v_ns4 = str_replace("'", "", $nameservers[3]); + $v_ns5 = str_replace("'", "", $nameservers[4]); + $v_ns6 = str_replace("'", "", $nameservers[5]); + $v_ns7 = str_replace("'", "", $nameservers[6]); + $v_ns8 = str_replace("'", "", $nameservers[7]); unset($output); } include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/add_dns.html'); diff --git a/web/add/package/index.php b/web/add/package/index.php index b38b7b23a..f620b4711 100644 --- a/web/add/package/index.php +++ b/web/add/package/index.php @@ -79,9 +79,17 @@ if (!empty($_POST['ok'])) { $v_ns2 = trim($_POST['v_ns2'], '.'); $v_ns3 = trim($_POST['v_ns3'], '.'); $v_ns4 = trim($_POST['v_ns4'], '.'); + $v_ns5 = trim($_POST['v_ns5'], '.'); + $v_ns6 = trim($_POST['v_ns6'], '.'); + $v_ns7 = trim($_POST['v_ns7'], '.'); + $v_ns8 = trim($_POST['v_ns8'], '.'); $v_ns = $v_ns1.",".$v_ns2; if (!empty($v_ns3)) $v_ns .= ",".$v_ns3; if (!empty($v_ns4)) $v_ns .= ",".$v_ns4; + if (!empty($v_ns5)) $v_ns .= ",".$v_ns5; + if (!empty($v_ns6)) $v_ns .= ",".$v_ns6; + if (!empty($v_ns7)) $v_ns .= ",".$v_ns7; + if (!empty($v_ns8)) $v_ns .= ",".$v_ns8; $v_ns = escapeshellarg($v_ns); $v_time = escapeshellarg(date('H:i:s')); $v_date = escapeshellarg(date('Y-m-d')); diff --git a/web/templates/admin/add_dns.html b/web/templates/admin/add_dns.html index 4e97c2450..8ad414fbe 100644 --- a/web/templates/admin/add_dns.html +++ b/web/templates/admin/add_dns.html @@ -107,24 +107,70 @@
      + + + '; + + if($v_ns4) + echo ' + + '; + + if($v_ns5) + echo ' + + '; + + if($v_ns6) + echo ' + + '; + + if($v_ns7) + echo ' + + '; + + if($v_ns8) + echo ' + + '; + ?> + > + + +
      1. Control Panel

      + ↑ + + Move cursor up +
      + ↓ + + Move cursor down +
      + 1 + + List user accounts / USER +
      + 2 + + List web domains / WEB +
      + 3 + + List dns domains / DNS +
      + 4 + + List mail domains / MAIL +
      + 5 + + List databases / DB +
      + 6 + + List cron jobs / CRON +
      + 7 + + List user backups / BACKUP +
      + ctr + 1 + + List hosting packages / Packages +
      + ctr + 2 + + List ip addresses / IP +
      + ctr + 3 + + List rrd graphs / Grapsh +
      + ctr + 4 + + List user stats / Statistics +
      + ctr + 5 + + List user action log / Log +
      + ctr + 6 + + List software updates / Updates +
      + ctr + 7 + + List firewall rules / Firewall +
      + ctr + 8 + + List services / Server +
      + ctr + 9 + + List server status / CPU MEM NET DISK +
      + ctr + 0 + + List user files / File Manager +
      + f + + Find user objects / Focus on search bar +
      + h + + Show help / Help +
      + n + + Add new object +
      + e + + Edit selected object +
      + s + + Suspend selected object +
      + d + + Delete selected object +
      + ctr + a + + Select/deselect all objects +
      + shift + ↑ + + Select/deselect object above cursor +
      + shift + ↓ + + Select/deselect object below cursor +
      + ctrl + enter + + Save form +
      + ctrl + backspace + + Go back to previous listing +



      2. File Manager

      + tab + + Switch between left and right file list +
      + ← + + Switch between left and right file list +
      + → + + Switch between left and right file list +
      + ↑ + + Move cursor up +
      + ↓ + + Move cursor down +
      + insert + + Select file or directory +
      + space + + Select file or directory (as INSERT) +
      + shift + ↑ + + Select/deselect file above cursor +
      + shift + ↓ + + Select/deselect file below cursor +
      + enter + + Change directory / run association action +
      + ctr + a + + Select all files and directories +
      + ctr + c + + Copy selected files from active tab to inactive +
      + ctr + x + + Cut selected files to clipboard +
      + ctr + v + + Paste from clipboard to current dir +
      + ctr + m + + Move selected files from active tab to inactive +
      + ctr + d + + Delete selected files +
      + del + + Delete selected files +
      + n + + Create new file +
      + e + + Edit selected file +
      + r + + Rename selected file +
      + m + + Move selected file +
      + d + + Delete selected file +
      + g + + Download selected file +
      + f + + Search file +



      3. File Editor

      + ctr + s + + Save file +
      + ctr + n + + New file +
      + ctr + o + + Open file +
      - > + delete
      - > + delete
      + + delete +
      + + delete +
      + + delete +
      + + delete +
      + + delete +
      + + delete +
      + Add one more Name Server +
      -
      \ No newline at end of file +
      + diff --git a/web/templates/admin/edit_package.html b/web/templates/admin/edit_package.html index 541891922..6082af056 100644 --- a/web/templates/admin/edit_package.html +++ b/web/templates/admin/edit_package.html @@ -305,23 +305,71 @@
    delete
    delete
    - + delete +
    + + delete +
    + + delete +
    + + delete +
    + + delete +
    + + delete +
    + Add one more Name Server +
    @@ -339,3 +387,33 @@ + \ No newline at end of file diff --git a/web/templates/admin/edit_user.html b/web/templates/admin/edit_user.html index 1a41af01e..c85e7c222 100644 --- a/web/templates/admin/edit_user.html +++ b/web/templates/admin/edit_user.html @@ -182,24 +182,72 @@ + + + '; + + if($v_ns4) + echo ' + + '; + + if($v_ns5) + echo ' + + '; + + if($v_ns6) + echo ' + + '; + + if($v_ns7) + echo ' + + '; + + if($v_ns8) + echo ' + + '; + ?> + + > + + + +
    - > + delete
    - > + delete
    + + delete +
    + + delete +
    + + delete +
    + + delete +
    + + delete +
    + + delete +
    + Add one more Name Server +
    @@ -215,4 +263,34 @@
    - \ No newline at end of file + + \ No newline at end of file diff --git a/web/templates/footer.html b/web/templates/footer.html index 59b99ec9e..3f7079c34 100644 --- a/web/templates/footer.html +++ b/web/templates/footer.html @@ -115,14 +115,25 @@ if(l_unit.hasClass('l-unit--starred')){ // removing star - $.removeCookie(l_unit.attr('uniq-id')); - l_unit.removeClass('l-unit--starred'); + + $.ajax({ + method: "POST", + url: "/delete/favorite/index.php", + data: { v_section: l_unit.attr('v_section'), v_unit_id: l_unit.attr('v_unit_id') } + }); + l_unit.attr({'sort-star': 0}); + l_unit.removeClass('l-unit--starred'); } else{ - $.cookie(l_unit.attr('uniq-id'), 1, {expires: 3650, path: '/'}); - l_unit.addClass('l-unit--starred'); + $.ajax({ + method: "POST", + url: "/add/favorite/index.php", + data: { v_unit_id: l_unit.attr('v_unit_id'), v_section: l_unit.attr('v_section') } + }); + l_unit.attr({'sort-star': 1}); + l_unit.addClass('l-unit--starred'); } }); @@ -456,7 +467,8 @@ VE.core.register(); if (location.href.search(/list/) != -1) { - var shift_select_ref = $('body').finderSelect({children: '.l-unit', + var shift_select_ref = $('body').finderSelect({ + children: '.l-unit', 'onFinish': function(evt) { var ref = $(evt.target); $('.l-content').find('.l-unit .ch-toggle').attr('checked', false); diff --git a/web/templates/header.html b/web/templates/header.html index ce0995f1d..ab11d821d 100644 --- a/web/templates/header.html +++ b/web/templates/header.html @@ -61,4 +61,4 @@ - \ No newline at end of file + From 9d2ebe561a8f304b0fbef91301129d77e154c998 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Mon, 28 Sep 2015 02:01:19 +0300 Subject: [PATCH 069/264] file manager stuff --- web/css/file_manager.css | 118 ++++++---- web/edit/package/index.php | 12 + web/edit/user/index.php | 25 ++- web/file_manager/fm_api.php | 2 - web/inc/main.php | 26 +++ web/js/file_manager.js | 278 +++++++++++++++++++++--- web/js/i18n.js.php | 7 +- web/js/jquery.finder.js | 4 +- web/js/templates.js | 21 +- web/list/directory/index.php | 15 +- web/templates/file_manager/main.php | 4 + web/templates/file_manager/tab_menu.php | 2 +- 12 files changed, 419 insertions(+), 95 deletions(-) diff --git a/web/css/file_manager.css b/web/css/file_manager.css index 9770b537a..3a43db98a 100644 --- a/web/css/file_manager.css +++ b/web/css/file_manager.css @@ -2,15 +2,17 @@ body { margin: 0; padding: 0; } .hidden { display: none; } .l-logo { + background-color: #7B7B7B; background-image: url("/images/sprite.png"); - background-position: -118px -59px; + background-position: -117px -57px; background-repeat: no-repeat; + border: 9px solid #7B7B7B; display: inline-block; float: left; height: 22px; - margin-left: 10px; - margin-top: 11px; - width: 73px; + margin-left: 0; + margin-top: 0; + width: 59px; } #main{ display: inline-block; font-family: Arial; font-size: 15px; color: #777; width: 100%; } @@ -18,10 +20,13 @@ body { margin: 0; padding: 0; } .window { display: inline-block; float: left; /*border: 1px solid #eee;*/ width: 50%; height: 100%; background-color: #ececec; /*background: url(/images/background-dots.png) #ececec;*/ } .window.active { background: #fff; } -.pwd { background-color: #7b7b7b; height: 28px; padding: 12px 0 0 17px; color: #eee; font-size: 14px; } -.window.active .pwd { background-color: #333; } +.window.active .l-logo { background-color: #333; border-color: #333; } + + +.pwd { background-color: #7b7b7b; height: 28px; padding: 12px 0 0 17px; color: #eee; font-size: 14px; overflow: hidden; } +.window.active .pwd { background-color: #333; box-shadow: -2px 0 5px -3px rgba(0, 0, 0, 0.7); } .window.active .pwd a { color: #FFF; } -.pwd a { color: #CFCFCF; margin-right: 6px; padding: 0 7px; cursor: pointer; text-decoration: none; } +.pwd a { color: #CFCFCF; cursor: pointer; text-decoration: none; } .window.active .pwd a:hover, .pwd a:hover { color: #FFCC00; } @@ -57,10 +62,14 @@ body { margin: 0; padding: 0; } .menu div.button.disabled:hover, -.menu div.button { cursor: pointer; transition: box-shadow 0.28s cubic-bezier(0.4, 0, 0.2, 1) 0s; -webkit-transition: box-shadow 0.28s cubic-bezier(0.4, 0, 0.2, 1) 0s; box-shadow: none; color: #999 -} +.menu div.button { cursor: pointer; transition: box-shadow 0.28s cubic-bezier(0.4, 0, 0.2, 1) 0s; -webkit-transition: box-shadow 0.28s cubic-bezier(0.4, 0, 0.2, 1) 0s; box-shadow: none; color: #999; } .window.active .menu div.button:hover, -.menu div.button:hover { text-decoration: none; color: #1FB9CA; border-radius: 0; } +.menu div.button:hover { text-decoration: none; color: #1FB9CA; } + +.window.active .menu div.button.del:hover, +.menu div.button.del:hover { color: #FF5A5A; } + + .menu div.button.disabled:hover, .menu div.button.disabled { opacity: 0.5; cursor: default; text-decoration: none; } @@ -92,7 +101,7 @@ body { margin: 0; padding: 0; } .menu .not-writable:hover { border: 1px solid #E2E2E0; } ul.listing { list-style-type: none; padding: 18px 0 0; margin: -4px 0 0 -1px; border-left: 1px solid #DDDDDD; overflow: auto; } -.listing li { color: #999999; display: block; height: 32px; margin: 1px 0 0; line-height: 30px; border: 1px solid transparent; } +.listing li { color: #999999; display: block; height: 34px; margin: 1px 0 0; line-height: 30px; padding: 0; } .listing li span { display: inline-block; float: right; } .listing li .marker { width: 4px; float: left; height: 100%; margin-right: 31px; } .listing li.back { } @@ -100,8 +109,8 @@ ul.listing { list-style-type: none; padding: 18px 0 0; margin: -4px 0 0 -1px; b /* .listing li .icon { background: url("/images/document.png") no-repeat scroll -2px 6px; float: left; margin-left: -17px; width: 13px; height: 24px; }*/ -.listing li .icon { background: url("/images/flat_icons.png") no-repeat scroll -97px -100px/*-97px -100px*/; float: left; margin-left: -17px; width: 31px; height: 31px; } -.listing li .icon.filetype-dir { background: url("/images/flat_icons.png") no-repeat scroll -24px -99px /*-99px 0px 25px -69px */; } +.listing li .icon { background: url("/images/flat_icons.png") no-repeat scroll -97px -100px; float: left; margin-left: -17px; width: 31px; height: 31px; margin-top: 1px; } +.listing li .icon.filetype-dir { background: url("/images/flat_icons.png") no-repeat scroll -24px -98px; } .listing li .icon.filetype-tif, .listing li .icon.filetype-gif, @@ -113,7 +122,7 @@ ul.listing { list-style-type: none; padding: 18px 0 0; margin: -4px 0 0 -1px; b .listing li .icon.filetype-yuv, .listing li .icon.filetype-ai, .listing li .icon.filetype-svg, -.listing li .icon.filetype-png { background: url("/images/flat_icons.png") no-repeat scroll -138px -69px; } +.listing li .icon.filetype-png { background: url("/images/flat_icons.png") no-repeat scroll -138px -68px; } .listing li .icon.filetype-txt, .listing li .icon.filetype-csv, @@ -125,12 +134,12 @@ ul.listing { list-style-type: none; padding: 18px 0 0; margin: -4px 0 0 -1px; b .listing li .icon.filetype-ppt, .listing li .icon.filetype-sdf, .listing li .icon.filetype-vcf, -.listing li .icon.filetype-db { background: url("/images/flat_icons.png") no-repeat scroll -97px -150px; } +.listing li .icon.filetype-db { background: url("/images/flat_icons.png") no-repeat scroll -97px -149px; } .listing li .icon.filetype-xlr, .listing li .icon.filetype-xls, -.listing li .icon.filetype-xlsx { background: url("/images/flat_icons.png") no-repeat scroll -138px -147px; } +.listing li .icon.filetype-xlsx { background: url("/images/flat_icons.png") no-repeat scroll -138px -146px; } .listing li .icon.filetype-jar, .listing li .icon.filetype-tar, @@ -144,12 +153,12 @@ ul.listing { list-style-type: none; padding: 18px 0 0; margin: -4px 0 0 -1px; b .listing li .icon.filetype-sitx, .listing li .icon.filetype-zip, .listing li .icon.filetype-zipx, -.listing li .icon.filetype-jar { background: url("/images/flat_icons.png") no-repeat scroll -176px -34px; } +.listing li .icon.filetype-jar { background: url("/images/flat_icons.png") no-repeat scroll -176px -33px; } .listing li .icon.filetype-fnt, .listing li .icon.filetype-otf, .listing li .icon.filetype-ttf, -.listing li .icon.filetype-fon { background: url("/images/flat_icons.png") no-repeat scroll -97px -100px; } +.listing li .icon.filetype-fon { background: url("/images/flat_icons.png") no-repeat scroll -97px -99px; } .listing li .icon.filetype-3g2, .listing li .icon.filetype-3gp, @@ -164,7 +173,7 @@ ul.listing { list-style-type: none; padding: 18px 0 0; margin: -4px 0 0 -1px; b .listing li .icon.filetype-rm, .listing li .icon.filetype-swf, .listing li .icon.filetype-vob, -.listing li .icon.filetype-wmv { background: url("/images/flat_icons.png") no-repeat scroll -97px -100px; } +.listing li .icon.filetype-wmv { background: url("/images/flat_icons.png") no-repeat scroll -97px -99px; } .listing li .icon.filetype-aif, .listing li .icon.filetype-iff, @@ -175,23 +184,23 @@ ul.listing { list-style-type: none; padding: 18px 0 0; margin: -4px 0 0 -1px; b .listing li .icon.filetype-mpa, .listing li .icon.filetype-ra, .listing li .icon.filetype-wav, -.listing li .icon.filetype-wma { background: url("/images/flat_icons.png") no-repeat scroll -97px -100px; } +.listing li .icon.filetype-wma { background: url("/images/flat_icons.png") no-repeat scroll -97px -99px; } .listing li .icon.filetype-rtf, .listing li .icon.filetype-doc, -.listing li .icon.filetype-docx { background: url("/images/flat_icons.png") no-repeat scroll -138px -123px; } -.listing li .icon.filetype-pdf { background: url("/images/flat_icons.png") no-repeat scroll -138px -96px; } +.listing li .icon.filetype-docx { background: url("/images/flat_icons.png") no-repeat scroll -138px -122px; } +.listing li .icon.filetype-pdf { background: url("/images/flat_icons.png") no-repeat scroll -138px -95px; } -.listing li .icon.filetype-js { background: url("/images/flat_icons.png") no-repeat scroll -138px -204px; } -.listing li .icon.filetype-css { background: url("/images/flat_icons.png") no-repeat scroll -138px -254px; } -.listing li .icon.filetype-php { background: url("/images/flat_icons.png") no-repeat scroll -138px -179px; } +.listing li .icon.filetype-js { background: url("/images/flat_icons.png") no-repeat scroll -138px -203px; } +.listing li .icon.filetype-css { background: url("/images/flat_icons.png") no-repeat scroll -138px -253px; } +.listing li .icon.filetype-php { background: url("/images/flat_icons.png") no-repeat scroll -138px -178px; } .listing li .icon.filetype-html, .listing li .icon.filetype-htm, -.listing li .icon.filetype-xhtml { background: url("/images/flat_icons.png") no-repeat scroll -138px -228px; } +.listing li .icon.filetype-xhtml { background: url("/images/flat_icons.png") no-repeat scroll -138px -227px; } -.listing li .filename { color: #555; cursor: pointer; height: 32px; max-width: 40%; overflow: hidden; float: left; padding: 0 7px 0 7px; border-radius: 3px; transition: all 0.18s cubic-bezier(0.4, 0, 0.2, 1) 0s; -webkit-transition: all 0.18s cubic-bezier(0.4, 0, 0.2, 1) 0s; } +.listing li .filename { color: #555; cursor: pointer; height: 32px; max-width: 40%; overflow: hidden; float: left; padding: 2px 7px 0 7px; border-radius: 3px; transition: all 0.18s cubic-bezier(0.4, 0, 0.2, 1) 0s; -webkit-transition: all 0.18s cubic-bezier(0.4, 0, 0.2, 1) 0s; } /* .listing li .filename { background: url("/images/folder_.png") no-repeat scroll -2px 6px; color: #555; cursor: pointer; float: left; margin-left: -27px; padding-left: 19px; }*/ .listing li .filename:hover { color: #333; background-color: #D1D0CF; } @@ -202,48 +211,62 @@ ul.listing { list-style-type: none; padding: 18px 0 0; margin: -4px 0 0 -1px; b .listing li.active.selected .filename:hover { color: #FFF; background-color: #60A885; } */ .listing li .filename a { color: #7D7D7D; text-decoration: none; } -.listing li .mode { width: 51px; font-size: 11px; } -.listing li .owner { width: 11%; font-style: italic; color: #81A64F; font-size: 12px; } -.listing li .size-value { width: 70px; color: #44a8b3; font-size: 12px; padding-right: 7px; text-align: right; } -.listing li .size-unit { width: 30px; font-size: 11px; font-weight: bold; color: #A7A7A7; text-align: left; } -.listing li .date { width: 50px; font-size: 11px; } -.listing li .time { width: 50px; font-size: 11px; } +.listing li .mode { width: 51px; font-size: 11px; padding-top: 2px; } +.listing li .owner { width: 11%; font-style: italic; color: #81A64F; font-size: 12px; padding-top: 2px; } +.listing li .size-value { width: 70px; color: #44a8b3; font-size: 12px; padding-right: 7px; text-align: right; padding-top: 2px; } +.listing li .size-unit { width: 30px; font-size: 11px; font-weight: bold; color: #A7A7A7; text-align: left; padding-top: 2px; } +.listing li .date { width: 50px; font-size: 11px; padding-top: 2px; } +.listing li .time { width: 50px; font-size: 11px; padding-top: 2px; } +.window.active .listing li.selected .mode { color: #7F7550; } +.window.active .listing li.selected .owner { /* color: #7F7550; */ } +.window.active .listing li.selected .size-value { color: #7F7550; } +.window.active .listing li.selected .size-unit { color: #7F7550; } +.window.active .listing li.selected .date { color: #7F7550; } +.window.active .listing li.selected .time { color: #7F7550; } + + +/* .listing li.selected-inactive.selected { background-color: #e9e9e9; border-top: 1px solid #ccc; border-bottom: 1px solid #ccc; } .listing li.selected-inactive .mode, .listing li.selected-inactive .time, .listing li.selected-inactive .date { color: #999 !important; } -.window.active .listing li.selected.active { background-color: #73CAA0; } +*/ -.listing li.selected { background-color: #777 /*#7FD5D9*/; } +.listing li.selected { background-color: #DEDEDE; } .listing.active li.selected { background-color: #ffd437 /*#7FD5D9*/; } .listing li.selected .filename:hover { color: #333; background-color: #F0B607; } -.listing li.selected-inactive.selected.active { background-color: #dfc891; border-top: 1px solid #cdb885; border-bottom: 1px solid #cdb885; } -.listing li.active { background-color: #e7cf96; } -.window.active .listing li.active { background-color: #ffe06c; } -.listing li.active .filename{ color: #31775A; } +/* ///.listing li.selected-inactive.selected.active { background-color: #dfc891; border-top: 1px solid #cdb885; border-bottom: 1px solid #cdb885; }*/ + +/* .listing li.selected .filename { color: #333; } .listing li.selected .date, .listing li.selected .mode, .listing li.selected .time { color: #777; } .listing li.selected .owner { color: #31775A; } .listing li.selected .size { color: #31775A; } +*/ +.window.active .listing li.active { background-color: #FFDC5A; } +.window.active .listing li.active .marker { background-color: #C2A84B; } +.listing li.active { background-color: #DEDEDE; } +.listing li.active .marker { background-color: #C2C2C2; } -.listing li.selected.active .filename { color: #fff29c; } +/* ///.listing li.selected.active .filename { color: #fff29c; } */ .listing li.selected.active .marker { background-color: #3a8a96; } -.listing li.selected-inactive .marker { background-color: #7FD5D9; } -.listing li.selected-inactive .filename { color: #54A9A9; } +.listing li.selected-inactive { background-color: #DEDEDE; } +/*///.listing li.selected-inactive .marker { background-color: #7FD5D9; } +.listing li.selected-inactive .filename { color: #54A9A9; } */ .listing li .filename a:hover { color: #3399FF; } .listing li:hover { background-color: #E5E5E5; cursor: pointer; } -.listing li.active:hover { background-color: #FFD63F; } +.window.active .listing li.active:hover { background-color: #FFE570; } .listing li.selected:hover { background-color: /*#89E6EA*/#FFE570; } -.listing li.selected.active:hover { background-color: #77D1A6; } +.listing li.selected.active:hover { background-color: #FFE570; } @@ -358,10 +381,13 @@ ul.listing { list-style-type: none; padding: 18px 0 0; margin: -4px 0 0 -1px; b .warning-box { width: 60%; background-color: #ff9f89; border-bottom: 5px solid #ff6c6e; color: #FFF; font-family: arial; margin-left: auto; margin-right: auto; padding-bottom: 30px; margin-bottom: 50px; left: 20%; position: absolute; top: 0; box-shadow: 0 2px 11px 0 rgba(0, 0, 0, 0.5); } .warning-box.inform { background-color: #72c5b2; border-color: #019174; } +.warning-box.reload { width: 100px; background-color: #333; border-color: #222; z-index: 5000; left: 45%; opacity: 0.9; padding: 17px 27px; border-radius: 0 0 6px 6px; border: none; opacity: 0.9; } .warning-box .message { width: 100%; padding: 30px 0 5px; text-align: center; font-size: 14px; text-transform: uppercase; font-weight: bold; } +.warning-box.reload .message-small { color: #ccc; } +.warning-box.reload .message-small span { color: #72C5B2; font-weight: bold; } .warning-box .message-small { width: 100%; text-align: center; font-size: 13px; color: #9D3407; } .warning-box.inform .message-small { color: #555; } -.warning-box .close { width: 30px; height: 30px; top: 5px; right: -5px; background-color: #FFF; float: right; cursor: pointer; background: url("/images/flat_icons.png") repeat scroll -258px -174px; } +.warning-box .close { width: 30px; height: 30px; top: 5px; right: -5px; background-color: #FFF; float: right; cursor: pointer; background: url("/images/flat_icons.png") repeat scroll -382px -174px; } .warning-box .close:hover { background-color: #DC5D5F; } .warning-box.inform .close:hover { background-color: #019174; } @@ -432,7 +458,7 @@ ul.listing { list-style-type: none; padding: 18px 0 0; margin: -4px 0 0 -1px; b } .progress-container .progress-elm .progress { - background: #ebebeb url("/images/progress.gif") no-repeat scroll -60px 0; + background: #ebebeb url("/images/progress.gif") no-repeat scroll 0px 0; border-color: #8a9079; border-radius: 3px; color: transparent; diff --git a/web/edit/package/index.php b/web/edit/package/index.php index 5662d19c9..e8ecaf686 100644 --- a/web/edit/package/index.php +++ b/web/edit/package/index.php @@ -50,6 +50,10 @@ $v_ns1 = $nameservers[0]; $v_ns2 = $nameservers[1]; $v_ns3 = $nameservers[2]; $v_ns4 = $nameservers[3]; +$v_ns5 = $nameservers[4]; +$v_ns6 = $nameservers[5]; +$v_ns7 = $nameservers[6]; +$v_ns8 = $nameservers[7]; $v_backups = $data[$v_package]['BACKUPS']; $v_date = $data[$v_package]['DATE']; $v_time = $data[$v_package]['TIME']; @@ -155,9 +159,17 @@ if (!empty($_POST['save'])) { $v_ns2 = trim($_POST['v_ns2'], '.'); $v_ns3 = trim($_POST['v_ns3'], '.'); $v_ns4 = trim($_POST['v_ns4'], '.'); + $v_ns5 = trim($_POST['v_ns5'], '.'); + $v_ns6 = trim($_POST['v_ns6'], '.'); + $v_ns7 = trim($_POST['v_ns7'], '.'); + $v_ns8 = trim($_POST['v_ns8'], '.'); $v_ns = $v_ns1.",".$v_ns2; if (!empty($v_ns3)) $v_ns .= ",".$v_ns3; if (!empty($v_ns4)) $v_ns .= ",".$v_ns4; + if (!empty($v_ns5)) $v_ns .= ",".$v_ns5; + if (!empty($v_ns6)) $v_ns .= ",".$v_ns6; + if (!empty($v_ns7)) $v_ns .= ",".$v_ns7; + if (!empty($v_ns8)) $v_ns .= ",".$v_ns8; $v_ns = escapeshellarg($v_ns); $v_time = escapeshellarg(date('H:i:s')); $v_date = escapeshellarg(date('Y-m-d')); diff --git a/web/edit/user/index.php b/web/edit/user/index.php index fcb16072b..83d0c8663 100644 --- a/web/edit/user/index.php +++ b/web/edit/user/index.php @@ -43,6 +43,11 @@ $v_ns1 = $nameservers[0]; $v_ns2 = $nameservers[1]; $v_ns3 = $nameservers[2]; $v_ns4 = $nameservers[3]; +$v_ns5 = $nameservers[4]; +$v_ns6 = $nameservers[5]; +$v_ns7 = $nameservers[6]; +$v_ns8 = $nameservers[7]; + $v_suspended = $data[$v_username]['SUSPENDED']; if ( $v_suspended == 'yes' ) { $v_status = 'suspended'; @@ -142,17 +147,35 @@ if (!empty($_POST['save'])) { } // Change NameServers - if (($v_ns1 != $_POST['v_ns1']) || ($v_ns2 != $_POST['v_ns2']) || ($v_ns3 != $_POST['v_ns3']) || ($v_ns4 != $_POST['v_ns4']) && (empty($_SESSION['error_msg']))) { + if (($v_ns1 != $_POST['v_ns1']) || ($v_ns2 != $_POST['v_ns2']) || ($v_ns3 != $_POST['v_ns3']) || ($v_ns4 != $_POST['v_ns4']) || ($v_ns5 != $_POST['v_ns5']) + || ($v_ns6 != $_POST['v_ns6']) || ($v_ns7 != $_POST['v_ns7']) || ($v_ns8 != $_POST['v_ns8']) && (empty($_SESSION['error_msg']))) { $v_ns1 = escapeshellarg($_POST['v_ns1']); $v_ns2 = escapeshellarg($_POST['v_ns2']); $v_ns3 = escapeshellarg($_POST['v_ns3']); $v_ns4 = escapeshellarg($_POST['v_ns4']); + $v_ns5 = escapeshellarg($_POST['v_ns5']); + $v_ns6 = escapeshellarg($_POST['v_ns6']); + $v_ns7 = escapeshellarg($_POST['v_ns7']); + $v_ns8 = escapeshellarg($_POST['v_ns8']); $ns_cmd = VESTA_CMD."v-change-user-ns ".$v_username." ".$v_ns1." ".$v_ns2; if (!empty($_POST['v_ns3'])) $ns_cmd = $ns_cmd." ".$v_ns3; if (!empty($_POST['v_ns4'])) $ns_cmd = $ns_cmd." ".$v_ns4; + if (!empty($_POST['v_ns5'])) $ns_cmd = $ns_cmd." ".$v_ns5; + if (!empty($_POST['v_ns6'])) $ns_cmd = $ns_cmd." ".$v_ns6; + if (!empty($_POST['v_ns7'])) $ns_cmd = $ns_cmd." ".$v_ns7; + if (!empty($_POST['v_ns8'])) $ns_cmd = $ns_cmd." ".$v_ns8; exec ($ns_cmd, $output, $return_var); check_return_code($return_var,$output); unset($output); + + $v_ns1 = str_replace("'","", $v_ns1); + $v_ns2 = str_replace("'","", $v_ns2); + $v_ns3 = str_replace("'","", $v_ns3); + $v_ns4 = str_replace("'","", $v_ns4); + $v_ns5 = str_replace("'","", $v_ns5); + $v_ns6 = str_replace("'","", $v_ns6); + $v_ns7 = str_replace("'","", $v_ns7); + $v_ns8 = str_replace("'","", $v_ns8); } // Set success message diff --git a/web/file_manager/fm_api.php b/web/file_manager/fm_api.php index f4fc28b2f..92acfa282 100644 --- a/web/file_manager/fm_api.php +++ b/web/file_manager/fm_api.php @@ -4,8 +4,6 @@ //error_reporting(NULL); -session_start(); - include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); include($_SERVER['DOCUMENT_ROOT']."/file_manager/fm_core.php"); diff --git a/web/inc/main.php b/web/inc/main.php index ae103cf26..87894c7b4 100644 --- a/web/inc/main.php +++ b/web/inc/main.php @@ -1,4 +1,5 @@ $favourite){ + $favourites[$key] = array(); + + $items = explode(',', $favourite); + foreach($items as $item){ + if($item) + $favourites[$key][trim($item)] = 1; + } + } + + $_SESSION['favourites'] = $favourites; +} + + function check_error($return_var) { if ( $return_var > 0 ) { @@ -144,6 +169,7 @@ function humanize_time($usage) { $usage = $usage / 60; if ( $usage > 24 ) { $usage = $usage / 24; + $usage = number_format($usage); if ( $usage == 1 ) { $usage = $usage." ".__('day'); diff --git a/web/js/file_manager.js b/web/js/file_manager.js index 2702b92d2..008d13bc5 100644 --- a/web/js/file_manager.js +++ b/web/js/file_manager.js @@ -29,11 +29,16 @@ FM.ORDER_BOX_B = $('.context-menu.sort-order.tab-b'); FM.ORDER_TAB_A = 'type_asc'; FM.ORDER_TAB_B = 'type_asc'; +FM.Env.RELOAD_IN_TIME = false; + + FM.TAB_A_CURRENT_PATH = GLOBAL.TAB_A__PATH; FM.TAB_B_CURRENT_PATH = GLOBAL.TAB_B_PATH; FM.IMAGES = {'A':[], 'B': []}; +FM.RELOAD_IN_TIME_SECONDS = 3; + FM.IMG_FILETYPES = 'png, jpg, jpeg, gif'; FM.SUPPORTED_ARCHIEVES = [ @@ -91,6 +96,7 @@ FM.showError = function(type, message) { setTimeout(function() { ref.find('.warning-message').fadeOut(); }, FM.errorMessageTimeout); + return; } } @@ -98,7 +104,7 @@ FM.showError = function(type, message) { FM.popupClose(); var tpl = Tpl.get('popup_alert', 'FM'); tpl.set(':TEXT', message); - + FM.popupOpen(tpl.finalize()); } } @@ -147,6 +153,10 @@ FM.setActive = function(index, box) { var tab = FM.getTabLetter(box); $(box + ' .selected').removeClass('selected'); $(box).find('li.dir:eq('+index+')').addClass('selected'); + + $(box + ' .active').removeClass('active'); + $(box).find('li.dir:eq('+index+')').addClass('active'); + //$(box).find('li:eq('+index+')').addClass('selected'); //var w_h = $(window).height() - 100; var w_offset = $(box).scrollTop(); @@ -173,6 +183,9 @@ FM.setActive = function(index, box) { $(box).scrollTo(w_offset + cur_elm.top - w_height/2 + cur_elm_height/2); //} + + + FM['CURRENT_' + tab + '_LINE'] = index; FM.CURRENT_TAB = box; @@ -180,6 +193,21 @@ FM.setActive = function(index, box) { $(FM.preselectedItems[tab]).each(function(i, index) { $(box).find('.dir:eq(' + index + ')').addClass('selected'); }); + + + var src = $(box).find('.dir:eq('+index+')').find('.source').val(); + src = $.parseJSON(src); + var tab = FM.getTabLetter(FM.CURRENT_TAB); + + if (FM.itemIsArchieve(src)) { + if($('.menu-'+tab+' .archive.button').first().is(':visible')) + $('.menu-'+tab+' .extract-btn').first().show(); + else + $('.menu-'+tab+' .extract-btn.small').show(); + } + else { + $('.menu-'+tab+' .extract-btn').hide(); + } } FM.setSecondInactive = function(index, box) { @@ -190,7 +218,29 @@ FM.setSecondInactive = function(index, box) { FM.BG_TAB = box; } +FM.goBackwards = function() { + if (FM.isPopupOpened()) { + return; + } + + var tab = FM.getTabLetter(FM.CURRENT_TAB); + var box = FM['TAB_' + tab]; + $(box).find('.dir:eq(0)').find('.source').val(); + + var src = $.parseJSON($(box).find('.dir:eq(0)').find('.source').val()); + var dir = src.full_path; + + FM.open(dir, box); +} + FM.goToTop = function() { + if (FM.isPopupOpened()) { + return; + } + if (FM.isPopupOpened()) { + return; + } + var tab = FM.getTabLetter(FM.CURRENT_TAB); var index = 0; @@ -198,6 +248,9 @@ FM.goToTop = function() { } FM.goToBottom = function() { + if (FM.isPopupOpened()) { + return; + } var tab = FM.getTabLetter(FM.CURRENT_TAB); var index = $(FM.CURRENT_TAB).find('.dir').length - 1; @@ -205,22 +258,35 @@ FM.goToBottom = function() { } FM.goUp = function() { + if (FM.isPopupOpened()) { + return; + } var tab = FM.getTabLetter(FM.CURRENT_TAB); var index = FM['CURRENT_' + tab + '_LINE']; index -= 1; - if (index < 0) { + /*if (index < 0) { index = $(FM.CURRENT_TAB).find('li.dir').length - 1; + }*/ + if (index < 0) { + index = 0; } - + FM.setActive(index, FM.CURRENT_TAB); } FM.goDown = function() { + if (FM.isPopupOpened()) { + return; + } + var tab = FM.getTabLetter(FM.CURRENT_TAB); var index = FM['CURRENT_' + tab + '_LINE']; index += 1; - if (index > ($(FM.CURRENT_TAB).find('li.dir').length - 1)) { + /*if (index > ($(FM.CURRENT_TAB).find('li.dir').length - 1)) { index = 0; + }*/ + if (index > ($(FM.CURRENT_TAB).find('li.dir').length - 1)) { + index = $(FM.CURRENT_TAB).find('li.dir').length - 1; } FM.setActive(index, FM.CURRENT_TAB); @@ -236,7 +302,7 @@ FM.open = function(dir, box, callback) { 'dir': dir }; App.Ajax.request('cd', params, function(reply) { - var tab = FM.getTabLetter(FM.CURRENT_TAB); + //var tab = FM.getTabLetter(FM.CURRENT_TAB); FM.preselectedItems[tab] = []; if (reply.result == true) { var html = FM.generate_listing(reply.listing, box); @@ -264,19 +330,20 @@ FM.open = function(dir, box, callback) { } FM.updateTopLevelPathBar = function(box, tab, path) { - console.log(path); + var formattedPath = []; path = path.replace(FM.ROOT_DIR, ''); formattedPath.push(''+FM.ROOT_DIR+''); - + $.each(path.split('/'), function(i, part) { if (part.trim() == '') { return; } + console.log("part - " + part); formattedPath.push(''+part+''); }); - - $('.pwd-tab-' + tab).html(formattedPath.join('/')); + + $('.pwd-tab-' + tab).html(formattedPath.join(' / ')); } FM.isItemFile = function(item) { @@ -607,7 +674,6 @@ FM.toggleCheck = function(uid) { } FM.fotoramaOpen = function(tab, img_index) { - console.log('index: ' + img_index); $('.fotorama').fotorama({ nav: 'thumbs', @@ -860,6 +926,9 @@ FM.toggleAllItemsSelected = function() { } FM.selectCurrentElementAndGoToNext = function () { + if (FM.isPopupOpened()) { + return; + } var tab = FM.getTabLetter(FM.CURRENT_TAB); var box = FM['TAB_' + tab]; @@ -946,6 +1015,7 @@ FM.selectItem = function(item, box) { var src = $(item).find('.source').val(); src = $.parseJSON(src); var tab = FM.getTabLetter(FM.CURRENT_TAB); + if (FM.itemIsArchieve(src)) { $('.menu-'+tab+' .extract-btn').show(); } @@ -1046,6 +1116,10 @@ FM.packItem = function() { FM.switchTab = function() { + if (FM.isPopupOpened()) { + return; + } + if (FM.CURRENT_TAB == FM.TAB_A) { FM.setTabActive(FM.TAB_B); $(FM.TAB_B).find('.selected-inactive').removeClass('selected-inactive'); @@ -1154,7 +1228,12 @@ FM.renameItems = function() { FM.popupOpen(tpl.finalize()); } +FM.isPopupOpened = function() { + return $('#popup').length > 0 ? true : false; +} + FM.popupOpen = function(html) { + //$('#popup').flayer_close(); $('
    ').attr('id', 'popup').html(html).flayer({ afterStart: function(elm) { elm.find('input[type="text"]:first').focus(); @@ -1482,6 +1561,31 @@ FM.displayError = function(msg) { //return alert(msg); } +FM.triggerRefreshActionTrick = function() { + // reload-in-time + $('#reload-in-time').remove(); + FM.Env.RELOAD_IN_TIME = true; + var tpl = Tpl.get('reload_in_time', 'FM'); + //tpl.set(':TIME_LEFT', FM.RELOAD_IN_TIME_SECONDS + 1); + + $('body').append(tpl.finalize()); + + var ref = $('#reload-in-time').find('.reload-in-time-counter'); + + var timeleft = FM.RELOAD_IN_TIME_SECONDS; + FM.Env.reload_in_time_interval = + setInterval(function() { + if (timeleft <= 0) { + clearInterval(FM.Env.reload_in_time_interval); + $('#reload-in-time').remove(); + FM.Env.RELOAD_IN_TIME = false; + } + //ref.text(timeleft); + timeleft -= 1; + }, 1000); +} + + FM.confirmCreateDir = function() { var tab = FM.getTabLetter(FM.CURRENT_TAB); var box = FM['TAB_' + tab]; @@ -1680,7 +1784,7 @@ $(document).ready(function() { },{ 'type': 'keydown', 'propagate': false, - 'disable_in_input': false, + 'disable_in_input': true, 'target': document }); @@ -1689,35 +1793,40 @@ $(document).ready(function() { },{ 'type': 'keydown', 'propagate': false, - 'disable_in_input': false, + 'disable_in_input': true, 'target': document }); shortcut.add("Left",function() { - FM.setTabActive(FM.TAB_A); + if (!FM.isPopupOpened()) { + FM.setTabActive(FM.TAB_A); - var tab = FM.getTabLetter(FM.CURRENT_TAB); - if (FM['CURRENT_' + tab + '_LINE'] == -1) { - FM.setActive(0, FM.CURRENT_TAB); - } + var tab = FM.getTabLetter(FM.CURRENT_TAB); + if (FM['CURRENT_' + tab + '_LINE'] == -1) { + FM.setActive(0, FM.CURRENT_TAB); + } + } },{ 'type': 'keydown', 'propagate': false, - 'disable_in_input': false, + 'disable_in_input': true, 'target': document }); shortcut.add("Right",function() { - FM.setTabActive(FM.TAB_B); + if (!FM.isPopupOpened()) { + FM.setTabActive(FM.TAB_B); + + var tab = FM.getTabLetter(FM.CURRENT_TAB); + if (FM['CURRENT_' + tab + '_LINE'] == -1) { + FM.setActive(0, FM.CURRENT_TAB); + } + } - var tab = FM.getTabLetter(FM.CURRENT_TAB); - if (FM['CURRENT_' + tab + '_LINE'] == -1) { - FM.setActive(0, FM.CURRENT_TAB); - } },{ 'type': 'keydown', 'propagate': false, - 'disable_in_input': false, + 'disable_in_input': true, 'target': document }); @@ -1726,7 +1835,7 @@ $(document).ready(function() { },{ 'type': 'keydown', 'propagate': false, - 'disable_in_input': false, + 'disable_in_input': true, 'target': document }); @@ -1735,7 +1844,7 @@ $(document).ready(function() { },{ 'type': 'keydown', 'propagate': false, - 'disable_in_input': false, + 'disable_in_input': true, 'target': document }); @@ -1744,7 +1853,7 @@ $(document).ready(function() { },{ 'type': 'keydown', 'propagate': false, - 'disable_in_input': false, + 'disable_in_input': true, 'target': document }); @@ -1753,7 +1862,7 @@ $(document).ready(function() { },{ 'type': 'keydown', 'propagate': false, - 'disable_in_input': false, + 'disable_in_input': true, 'target': document }); @@ -1762,7 +1871,7 @@ $(document).ready(function() { },{ 'type': 'keydown', 'propagate': false, - 'disable_in_input': false, + 'disable_in_input': true, 'target': document }); @@ -1772,7 +1881,7 @@ $(document).ready(function() { },{ 'type': 'keydown', 'propagate': false, - 'disable_in_input': false, + 'disable_in_input': true, 'target': document }); @@ -1800,6 +1909,115 @@ $(document).ready(function() { 'target': document }); + shortcut.add("n",function() { + FM.createFile(); + },{ + 'type': 'keydown', + 'propagate': false, + 'disable_in_input': true, + 'target': document + }); + shortcut.add("F7",function() { + FM.createDir(); + },{ + 'type': 'keydown', + 'propagate': false, + 'disable_in_input': false, + 'target': document + }); + shortcut.add("F8",function() { + FM.deleteItems(); + },{ + 'type': 'keydown', + 'propagate': false, + 'disable_in_input': false, + 'target': document + }); + shortcut.add("Delete",function() { + FM.deleteItems(); + },{ + 'type': 'keydown', + 'propagate': false, + 'disable_in_input': true, + 'target': document + }); + shortcut.add("shift+F6",function() { + FM.renameItems(); + },{ + 'type': 'keydown', + 'propagate': false, + 'disable_in_input': false, + 'target': document + }); + shortcut.add("F2",function() { + FM.renameItems(); + },{ + 'type': 'keydown', + 'propagate': false, + 'disable_in_input': false, + 'target': document + }); + shortcut.add("F5",function() { + if (FM.Env.RELOAD_IN_TIME == true) { + location.reload(); + return; + } + else { + FM.copyItems(); + FM.triggerRefreshActionTrick(); + } + },{ + 'type': 'keydown', + 'propagate': false, + 'disable_in_input': false, + 'target': document + }); + shortcut.add("a",function() { + FM.packItem(); + },{ + 'type': 'keydown', + 'propagate': false, + 'disable_in_input': true, + 'target': document + }); + + shortcut.add("u",function() { +/// TODO upload file FM.uploadFile(); + },{ + 'type': 'keydown', + 'propagate': false, + 'disable_in_input': true, + 'target': document + }); + + shortcut.add("d",function() { + FM.downloadFiles(); + },{ + 'type': 'keydown', + 'propagate': false, + 'disable_in_input': true, + 'target': document + }); + shortcut.add("Backspace",function() { + FM.goBackwards(); + },{ + 'type': 'keydown', + 'propagate': false, + 'disable_in_input': true, + 'target': document + }); + /*shortcut.add("Y",function() { + if (FM.Env.RELOAD_IN_TIME == true) { + location.reload(); + } + },{ + 'type': 'keydown', + 'propagate': false, + 'disable_in_input': true, + 'target': document + });*/ + + diff --git a/web/js/i18n.js.php b/web/js/i18n.js.php index 500b98f0c..0ca35378f 100644 --- a/web/js/i18n.js.php +++ b/web/js/i18n.js.php @@ -62,7 +62,8 @@ App.Constants.FM_RENAME = ''; App.Constants.FM_DELETE = ''; App.Constants.FM_EXTRACT = ''; App.Constants.FM_CREATE = ''; -App.Constants.FM_PACK = ''; +App.Constants.FM_PACK = ''; +App.Constants.FM_PACK_BUTTON = ''; App.Constants.FM_OK = ''; App.Constants.FM_YOU_ARE_COPYING = ''; App.Constants.FM_YOU_ARE_REMOVING = ''; @@ -70,12 +71,12 @@ App.Constants.FM_YOU_ARE_REMOVING = ''; App.Constants.FM_CONFIRM_DELETE = ''; App.Constants.FM_INTO_KEYWORD = ''; -App.Constants.FM_EXISTING_FILES_WILL_BE_DELETED = ''; +App.Constants.FM_EXISTING_FILES_WILL_BE_REPLACED= ''; App.Constants.FM_ORIGINAL_NAME = ''; App.Constants.FM_FILE = ''; App.Constants.FM_ALREADY_EXISTS = ''; -App.Constants.FM_EXTRACT = ''; App.Constants.FM_CREATE_FILE = ''; +App.Constants.FM_CREATE_DIRECTORY = ''; diff --git a/web/js/jquery.finder.js b/web/js/jquery.finder.js index fdf6a2979..745013700 100644 --- a/web/js/jquery.finder.js +++ b/web/js/jquery.finder.js @@ -203,10 +203,10 @@ }, selectAll: function(p,o) { p.on('mouseover', function(){ - d.on("keydown", turnOff); + //d.on("keydown", turnOff); }); p.on('mouseout', function(){ - d.off("keydown", turnOff); + //d.off("keydown", turnOff); }); function turnOff(e) { diff --git a/web/js/templates.js b/web/js/templates.js index dd33f790e..df0ad188e 100644 --- a/web/js/templates.js +++ b/web/js/templates.js @@ -12,6 +12,13 @@ App.Templates.html = { //\ FM: { + reload_in_time: [ + //'
    If you want to reload, hit key "Y" to reload.
    You have ~!:TIME_LEFT~!s. to do this.
    Hurry up!
    ' + '
    \ + \ +
    Hit F5 to reload the page
    \ +
    ' + ], entry_line: ['
  • \ \ \ @@ -50,18 +57,18 @@ App.Templates.html = {
    • \ '], popup_copy: ['
    \ -
    '+App.Constants.FM_CLOSE+' "~!:SRC_FILENAME~!" '+App.Constants.FM_INTO_KEYWORD+':
    \ +
    '+App.Constants.FM_COPY+' "~!:SRC_FILENAME~!" '+App.Constants.FM_INTO_KEYWORD+':
    \
    \ \
    \ -
    '+App.Constants.FM_EXISTING_FILES_WILL_BE_DELETED+'
    \ +
    '+App.Constants.FM_EXISTING_FILES_WILL_BE_REPLACED+'
    \
    \

    '+App.Constants.FM_CANCEL+'

    \

    '+App.Constants.FM_COPY+'

    \
    \
    '], popup_rename: ['
    \ -
    '+App.Constants.FM_ORIGINAL_NAME+': "~!:FILENAME~!"
    \ +
    '+App.Constants.FM_RENAME+': "~!:FILENAME~!"
    \ \
    \
    \ @@ -73,12 +80,12 @@ App.Templates.html = {
    \
    \

    '+App.Constants.FM_CANCEL+'

    \ -

    '+App.Constants.FM_Rename+'

    \ +

    '+App.Constants.FM_RENAME+'

    \
    \
    '], popup_pack: ['
    \ -
    '+App.Constants.FM_PACK+' "~!:FILENAME~!" '+App.Constants.FM_INTO_KEYWORD+':
    \ +
    '+App.Constants.FM_PACK+' "~!:FILENAME~!"
    \
    \ \
    \ @@ -88,7 +95,7 @@ App.Templates.html = {
    \
    \

    '+App.Constants.FM_CANCEL+'

    \ -

    '+App.Constants.FM_PACK+'

    \ +

    '+App.Constants.FM_PACK_BUTTON+'

    \
    \ '], @@ -121,7 +128,7 @@ App.Templates.html = { \ '], popup_create_dir: ['
    \ -
    Create directory
    \ +
    '+App.Constants.FM_CREATE_DIRECTORY+'
    \ \
    \
    \ diff --git a/web/list/directory/index.php b/web/list/directory/index.php index 4c8a0795b..96c0cf51c 100644 --- a/web/list/directory/index.php +++ b/web/list/directory/index.php @@ -1,9 +1,17 @@ GLOBAL.START_DIR_A = "' . $path_a $GLOBAL_JS .= ''; $GLOBAL_JS .= ''; + // Footer -include($_SERVER['DOCUMENT_ROOT'].'/templates/file_manager/main.php'); +include($_SERVER['DOCUMENT_ROOT'].'/templates/file_manager/main.php'); \ No newline at end of file diff --git a/web/templates/file_manager/main.php b/web/templates/file_manager/main.php index 426cf4e96..1e1dea2f3 100644 --- a/web/templates/file_manager/main.php +++ b/web/templates/file_manager/main.php @@ -250,6 +250,10 @@
    writing the reading text at the reading write writing the reading text at the reading write!
    + +
    		+
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Username:william.cage@
    Password:******
    IMAP hostname:
    IMAP port:143
    IMAP security:STARTTLS
    IMAP auth method:Normal password
    SMTP hostname
    SMTP port:587
    SMTP security:STARTTLS
    SMTP auth method:Normal password
    +
    +
    From 1ce7c69383165959eb72d2251a5295d98c4ecdfc Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Mon, 28 Sep 2015 02:02:13 +0300 Subject: [PATCH 071/264] multiple name servers --- web/templates/admin/add_package.html | 97 +++++++++++++++++++++++++--- 1 file changed, 87 insertions(+), 10 deletions(-) diff --git a/web/templates/admin/add_package.html b/web/templates/admin/add_package.html index 722b3d663..ec4e675c3 100644 --- a/web/templates/admin/add_package.html +++ b/web/templates/admin/add_package.html @@ -22,6 +22,8 @@
    delete delete - - - + delete + + '; + + if($v_ns4) + echo ' + + + delete + + '; + + if($v_ns5) + echo ' + + + delete + + '; + + if($v_ns6) + echo ' + + + delete + + '; + + if($v_ns7) + echo ' + + + delete + + '; + + if($v_ns8) + echo ' + + + delete + + '; + ?> + > + + Add one more Name Server + + @@ -334,3 +381,33 @@ + \ No newline at end of file From 687f36688a29bb39e6db74fafae2ac321f497419 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Tue, 29 Sep 2015 14:25:28 +0300 Subject: [PATCH 072/264] File Manager update --- web/js/file_manager.js | 21 ++++++++++++++------- web/js/i18n.js.php | 1 + web/templates/file_manager/main.php | 8 ++++++-- 3 files changed, 21 insertions(+), 9 deletions(-) diff --git a/web/js/file_manager.js b/web/js/file_manager.js index 008d13bc5..d6b935015 100644 --- a/web/js/file_manager.js +++ b/web/js/file_manager.js @@ -339,7 +339,6 @@ FM.updateTopLevelPathBar = function(box, tab, path) { if (part.trim() == '') { return; } - console.log("part - " + part); formattedPath.push(''+part+''); }); @@ -1043,9 +1042,12 @@ FM.itemIsArchieve = function(item) { FM.unpackItem = function() { var tab = FM.getTabLetter(FM.CURRENT_TAB); var box = FM['TAB_' + tab]; - var selected = $(FM['TAB_' + tab] ).find('.dir.selected'); + var selected = $(FM['TAB_' + tab] ).find('.dir.active'); if (selected.length == 0) { - return alert('No file selected'); + //return alert('No file selected'); + return FM.displayError( + App.Constants.FM_NO_FILE_SELECTED + ); } @@ -1078,7 +1080,7 @@ FM.unpackItem = function() { FM.packItem = function() { var tab = FM.getTabLetter(FM.CURRENT_TAB); var box = FM['TAB_' + tab]; - var selected = $(FM['TAB_' + tab] ).find('.dir.selected'); + var selected = $(FM['TAB_' + tab] ).find('.dir.active'); if (selected.length == 0) { return FM.displayError( App.Constants.FM_NO_FILE_SELECTED @@ -1206,7 +1208,7 @@ FM.confirmRename = function() { FM.renameItems = function() { var tab = FM.getTabLetter(FM.CURRENT_TAB); - var selected = $(FM['TAB_' + tab] ).find('.dir.selected'); + var selected = $(FM['TAB_' + tab] ).find('.dir.active'); if (selected.length == 0) { return FM.displayError( App.Constants.FM_NO_FILE_OR_DIRECTORY_SELECTED @@ -1440,7 +1442,7 @@ FM.confirmCopyItems = function () { FM.downloadFiles = function() { var tab = FM.getTabLetter(FM.CURRENT_TAB); - var selected = $(FM['TAB_' + tab] ).find('.dir.selected'); + var selected = $(FM['TAB_' + tab] ).find('.dir.active'); if (!selected) { return FM.displayError( App.Constants.FM_NO_FILE_OR_DIRECTORY_SELECTED @@ -1451,7 +1453,10 @@ FM.downloadFiles = function() { src = $.parseJSON(src); if (FM.isItemPseudo(src) || FM.isItemDir(src)) { - alert('Folder downloads are in progress atm'); + //alert('Folder downloads are in progress atm'); + return FM.displayError( + App.Constants.FM_DIRECTORY_DOWNLOAD_NOT_READY + ); } if (FM.isItemPseudo(src)) { @@ -1769,6 +1774,8 @@ $(document).ready(function() { shortcut.add("Esc",function() { + FM.Env.RELOAD_IN_TIME = false; + $('#reload-in-time').remove(); if (FM.isPopupOpened()) { return FM.handlePopupCancel(); } diff --git a/web/js/i18n.js.php b/web/js/i18n.js.php index 0ca35378f..dc7952341 100644 --- a/web/js/i18n.js.php +++ b/web/js/i18n.js.php @@ -52,6 +52,7 @@ App.Constants.FM_FILE_NAME_CANNOT_BE_EMPTY = ''; App.Constants.FM_NO_FILE_OR_DIRECTORY_SELECTED = ''; App.Constants.FM_FILE_TYPE_NOT_SUPPORTED = ''; +App.Constants.FM_DIRECTORY_DOWNLOAD_NOT_READY = ''; App.Constants.FM_DIRECTORY_NOT_AVAILABLE = ''; App.Constants.FM_DONE = ''; diff --git a/web/templates/file_manager/main.php b/web/templates/file_manager/main.php index 1e1dea2f3..8a533a028 100644 --- a/web/templates/file_manager/main.php +++ b/web/templates/file_manager/main.php @@ -449,23 +449,27 @@ $(".listing-left").selectable({ selected: function (event, ui) { FM.setTabActive(FM.TAB_A, 'skip_highlights'); - $(".listing-left .selected").each(function(i, o) { + $(".listing-left .selected, .listing-left .ui-selectee").each(function(i, o) { if (!$(o).hasClass('ui-selected')) { $(o).removeClass('selected'); + $(o).removeClass('active'); } }); $(ui.selected).addClass('selected'); + $(ui.selected).addClass('active'); checkIfArchive(ui.selected); $(".listing-left .ui-selected").addClass('selected'); }, unselected: function (event, ui) { - $(".listing-left .selected").each(function(i, o) { + $(".listing-left .selected, .listing-left .ui-selectee").each(function(i, o) { if (!$(o).hasClass('ui-selected')) { $(o).removeClass('selected'); + $(o).removeClass('active'); } }); FM.setTabActive(FM.TAB_A, 'skip_highlights'); $(ui.unselected).removeClass('selected'); + $(ui.selected).addClass('active'); } }); $(".listing-right").selectable({ From 51125fc904ad7f77b45dfadd7d29800697c6dc4d Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Tue, 29 Sep 2015 17:59:04 +0300 Subject: [PATCH 073/264] fix for symlinked /tmp dir --- web/login/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/login/index.php b/web/login/index.php index 461f1f92e..0c9e48fa9 100644 --- a/web/login/index.php +++ b/web/login/index.php @@ -35,7 +35,7 @@ if (isset($_POST['user']) && isset($_POST['password'])) { $v_user = escapeshellarg($_POST['user']); // Send password via tmp file - $v_password = tempnam("/tmp","vst"); + $v_password = exec('mktemp -p /tmp'); $fp = fopen($v_password, "w"); fwrite($fp, $_POST['password']."\n"); fclose($fp); From a320b1f32c834d0f3e111713091d45216df22d87 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Tue, 29 Sep 2015 22:24:22 +0300 Subject: [PATCH 074/264] hotkeys for filemanager --- web/js/file_manager.js | 68 ++++++++++++++----- web/templates/file_manager/main.php | 100 +++++++++++++++++++++++++--- 2 files changed, 143 insertions(+), 25 deletions(-) diff --git a/web/js/file_manager.js b/web/js/file_manager.js index d6b935015..4501fd591 100644 --- a/web/js/file_manager.js +++ b/web/js/file_manager.js @@ -292,6 +292,32 @@ FM.goDown = function() { FM.setActive(index, FM.CURRENT_TAB); } +// reloads provided tab +// reloads opposite tab if its needed +FM.openAndSync = function(dir, box, callback) { + var tab = FM.getTabLetter(box); + + var opposite_tab = 'A'; + if (tab == 'A') { + opposite_tab = 'B'; + } + + var oppositeSyncNeeded = false; + + if (FM.TAB_A_CURRENT_PATH == FM.TAB_B_CURRENT_PATH) { + oppositeSyncNeeded = true; + } + + + if (oppositeSyncNeeded) { + FM.open(dir, FM['TAB_' + opposite_tab], callback); + return FM.open(dir, box, callback); + } + else { + return FM.open(dir, box, callback); + } +} + FM.open = function(dir, box, callback) { var tab = FM.getTabLetter(box); @@ -662,7 +688,14 @@ FM.generate_listing = function(reply, box) { $(box).html(acc.done()); - FM['CURRENT_'+tab+'_LINE'] = -1; + //////// + /*if (FM['CURRENT_'+tab+'_LINE'] > -1 && $(box).find('.dir:eq(' + FM['CURRENT_'+tab+'_LINE'] + ')').lrngth > 0) { + + } + else { + FM['CURRENT_'+tab+'_LINE'] = -1; + }*/ + FM['CURRENT_'+tab+'_LINE'] = -1; } FM.toggleCheck = function(uid) { @@ -1111,7 +1144,7 @@ FM.packItem = function() { var tpl = Tpl.get('popup_pack', 'FM'); tpl.set(':FILENAME', src.name); - tpl.set(':DST_DIRNAME', dst + '/' + src.name + '_packed.tar.gz'); + tpl.set(':DST_DIRNAME', dst + '/' + src.name + '.tar.gz'); FM.popupOpen(tpl.finalize()); } @@ -1198,7 +1231,7 @@ FM.confirmRename = function() { App.Ajax.request(action, params, function(reply) { if (reply.result == true) { FM.popupClose(); - FM.open(FM['TAB_' + tab + '_CURRENT_PATH'], box); + FM.openAndSync(FM['TAB_' + tab + '_CURRENT_PATH'], box); } else { FM.showError('rename-items', reply.message); @@ -1235,6 +1268,7 @@ FM.isPopupOpened = function() { } FM.popupOpen = function(html) { + FM.popupClose(); //$('#popup').flayer_close(); $('
    ').attr('id', 'popup').html(html).flayer({ afterStart: function(elm) { @@ -1432,7 +1466,7 @@ FM.confirmCopyItems = function () { if (reply.result == true) { FM.popupClose(); // FM.open(FM['TAB_' + tab + '_CURRENT_PATH'], FM['TAB_' + tab]); - FM.open(FM['TAB_' + opposite_tab + '_CURRENT_PATH'], FM['TAB_' + opposite_tab]); + FM.openAndSync(FM['TAB_' + opposite_tab + '_CURRENT_PATH'], FM['TAB_' + opposite_tab]); } else { FM.showError('copy-items', reply.message); @@ -1504,7 +1538,7 @@ FM.confirmDelete = function() { App.Ajax.request('delete_files', params, function(reply) { if (reply.result == true) { FM.popupClose(); - FM.open(FM['TAB_' + tab + '_CURRENT_PATH'], box); + FM.openAndSync(FM['TAB_' + tab + '_CURRENT_PATH'], box); } else { FM.showError('delete-items', reply.message); @@ -1611,7 +1645,7 @@ FM.confirmCreateDir = function() { App.Ajax.request('create_dir', params, function(reply) { if (reply.result == true) { FM.popupClose(); - FM.open(FM['TAB_' + tab + '_CURRENT_PATH'], box); + FM.openAndSync(FM['TAB_' + tab + '_CURRENT_PATH'], box); } else { FM.showError('create-dir', reply.message); @@ -1646,7 +1680,7 @@ FM.confirmCreateFile = function() { App.Ajax.request('create_file', params, function(reply) { if (reply.result == true) { FM.popupClose(); - FM.open(FM['TAB_' + tab + '_CURRENT_PATH'], box); + FM.openAndSync(FM['TAB_' + tab + '_CURRENT_PATH'], box); } else { FM.showError('create-file', reply.message); @@ -1948,6 +1982,7 @@ $(document).ready(function() { 'disable_in_input': true, 'target': document }); + shortcut.add("shift+F6",function() { FM.renameItems(); },{ @@ -1988,14 +2023,7 @@ $(document).ready(function() { 'target': document }); - shortcut.add("u",function() { -/// TODO upload file FM.uploadFile(); - },{ - 'type': 'keydown', - 'propagate': false, - 'disable_in_input': true, - 'target': document - }); + shortcut.add("d",function() { FM.downloadFiles(); @@ -2025,7 +2053,15 @@ $(document).ready(function() { });*/ - + shortcut.add("u",function() { + var tab_letter = FM.getTabLetter(FM.CURRENT_TAB); + $('#file_upload_'+tab_letter).trigger('click'); + },{ + 'type': 'keydown', + 'propagate': false, + 'disable_in_input': true, + 'target': document + }); /* is jQuery .live() has been removed in version 1.9 onwards diff --git a/web/templates/file_manager/main.php b/web/templates/file_manager/main.php index 8a533a028..634e7fc12 100644 --- a/web/templates/file_manager/main.php +++ b/web/templates/file_manager/main.php @@ -380,16 +380,16 @@ var tab = FM.getTabLetter(FM.CURRENT_TAB); var box = FM['TAB_' + tab]; - FM.open(FM['TAB_' + tab + '_CURRENT_PATH'], box); - + FM.openAndSync(FM['TAB_' + tab + '_CURRENT_PATH'], box); + //$('.file-upload-button-' + tab).removeClass('progress'); $('.file-upload-button-' + tab).addClass('done'); - + setTimeout(function() { $('.file-upload-button-' + tab).removeClass('progress'); $('.file-upload-button-' + tab).removeClass('done'); }, 2000); - + $('.file-upload-button-' + tab).css('background-position', '-96px 0'); }, progressall: function (e, data) { @@ -448,7 +448,34 @@ $(".listing-left").selectable({ selected: function (event, ui) { - FM.setTabActive(FM.TAB_A, 'skip_highlights'); + //console.log(ui); + //console.log($(".listing-left .selected")); + FM.setTabActive(FM.TAB_A, 'skip_highlights'); + + $(".listing-left .active").removeClass('active'); + + $(".listing-left .selected").each(function(i, o) { + if (!$(o).hasClass('ui-selected')) { + $(o).removeClass('selected'); + $(o).removeClass('active'); + } + }); + $(ui.selected).addClass('selected'); + $(ui.selected).addClass('active'); + + + //$(ui.selected).addClass('active'); + checkIfArchive(ui.selected); + $(".listing-left .ui-selected").addClass('selected'); + + if ($(".listing-left .active").length > 0) { + FM['CURRENT_A_LINE'] = $(".listing-left .active").index(); + } + else { + FM['CURRENT_A_LINE'] = 0; + } + + /*FM.setTabActive(FM.TAB_A, 'skip_highlights'); $(".listing-left .selected, .listing-left .ui-selectee").each(function(i, o) { if (!$(o).hasClass('ui-selected')) { $(o).removeClass('selected'); @@ -458,10 +485,22 @@ $(ui.selected).addClass('selected'); $(ui.selected).addClass('active'); checkIfArchive(ui.selected); - $(".listing-left .ui-selected").addClass('selected'); + $(".listing-left .ui-selected").addClass('selected');*/ }, unselected: function (event, ui) { - $(".listing-left .selected, .listing-left .ui-selectee").each(function(i, o) { + FM.setTabActive(FM.TAB_A, 'skip_highlights'); + + $(ui.unselected).removeClass('selected'); + $(ui.unselected).removeClass('active'); + + if ($(".listing-left .active").length > 0) { + FM['CURRENT_A_LINE'] = $(".listing-left .active").index(); + } + else { + FM['CURRENT_A_LINE'] = 0; + } + + /*$(".listing-left .selected, .listing-left .ui-selectee").each(function(i, o) { if (!$(o).hasClass('ui-selected')) { $(o).removeClass('selected'); $(o).removeClass('active'); @@ -469,10 +508,53 @@ }); FM.setTabActive(FM.TAB_A, 'skip_highlights'); $(ui.unselected).removeClass('selected'); - $(ui.selected).addClass('active'); + $(ui.selected).addClass('active');*/ } }); $(".listing-right").selectable({ + selected: function (event, ui) { + FM.setTabActive(FM.TAB_B, 'skip_highlights'); + + $(".listing-right .active").removeClass('active'); + + $(".listing-right .selected").each(function(i, o) { + if (!$(o).hasClass('ui-selected')) { + $(o).removeClass('selected'); + $(o).removeClass('active'); + } + }); + $(ui.selected).addClass('selected'); + $(ui.selected).addClass('active'); + + + //$(ui.selected).addClass('active'); + checkIfArchive(ui.selected); + $(".listing-right .ui-selected").addClass('selected'); + + + if ($(".listing-right .active").length > 0) { + FM['CURRENT_B_LINE'] = $(".listing-right .active").index(); + } + else { + FM['CURRENT_B_LINE'] = 0; + } + + }, + unselected: function (event, ui) { + FM.setTabActive(FM.TAB_B, 'skip_highlights'); + + $(ui.unselected).removeClass('selected'); + $(ui.unselected).removeClass('active'); + + if ($(".listing-right .active").length > 0) { + FM['CURRENT_B_LINE'] = $(".listing-right .active").index(); + } + else { + FM['CURRENT_B_LINE'] = 0; + } + } + }); + /*$(".listing-right").selectable({ selected: function (event, ui) { $(".listing-left .selected").each(function(i, o) { if (!$(o).hasClass('ui-selected')) { @@ -493,7 +575,7 @@ FM.setTabActive(FM.TAB_B, 'skip_highlights'); $(ui.unselected).removeClass('selected'); } - }); + });*/ }); From 362efbe902f5b00b58591b4c82b7aff0136e0176 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Serta=C3=A7=20=C3=87EL=C4=B0K?= Date: Sat, 3 Oct 2015 02:45:43 +0300 Subject: [PATCH 075/264] Update v-update-user-quota --- bin/v-update-user-quota | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/v-update-user-quota b/bin/v-update-user-quota index 85330e450..013ee3869 100755 --- a/bin/v-update-user-quota +++ b/bin/v-update-user-quota @@ -33,7 +33,7 @@ is_object_valid 'user' 'USER' "$user" # Updating disk quota quota=$(get_user_value '$DISK_QUOTA') soft=$((quota * 1000)) -hard=$((quota + 50000)) +hard=$((soft + 50000)) # Searching home mount point mnt=$(df -P /home |awk '{print $6}' |tail -n1) From b6dd534b60e20b7300031f72da367cb6c97920f7 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Mon, 5 Oct 2015 23:31:53 +0300 Subject: [PATCH 076/264] fix for caching template --- bin/v-add-web-domain | 4 ++-- bin/v-backup-user | 6 +++--- func/domain.sh | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/bin/v-add-web-domain b/bin/v-add-web-domain index 3fabd59f7..58d48e55c 100755 --- a/bin/v-add-web-domain +++ b/bin/v-add-web-domain @@ -188,8 +188,8 @@ if [ ! -z "$PROXY_SYSTEM" ]; then if [ -z "$(grep "$conf" $proxy_conf)" ]; then echo "include $conf;" >> $proxy_conf fi - if [ -x $WEBTPL/$PROXY_SYSTEM/$template.sh ]; then - $WEBTPL/$PROXY_SYSTEM/$template.sh $user $domain $ip $HOMEDIR $docroot + if [ -x $WEBTPL/$PROXY_SYSTEM/$proxy.sh ]; then + $WEBTPL/$PROXY_SYSTEM/$proxy.sh $user $domain $ip $HOMEDIR $docroot fi fi diff --git a/bin/v-backup-user b/bin/v-backup-user index 859ff67d1..dd86cea77 100755 --- a/bin/v-backup-user +++ b/bin/v-backup-user @@ -227,7 +227,7 @@ if [ ! -z "$WEB_SYSTEM" ] && [ "$WEB" != '*' ]; then # Backup files cd $HOMEDIR/$user/web/$domain - find . ${fargs[@]} -type f -print0 |\ + find . ${fargs[@]} -type f -or -type l -print0 |\ tar -cpf $tmpdir/web/$domain/domain_data.tar --null -T - # Backup empty folders @@ -490,7 +490,7 @@ if [ "$USER" != '*' ]; then IFS=$'\n' set -f i=0 - for udir in $(ls |egrep -v "conf|web|dns|mail"); do + for udir in $(ls -a |egrep -v "conf|web|dns|mail|^\.\.$|^\.$"); do check_exl=$(echo -e "${USER//,/\n}" |grep "^$udir$") if [ -z "$check_exl" ]; then ((i ++)) @@ -499,7 +499,7 @@ if [ "$USER" != '*' ]; then msg="$msg\n$(date "+%F %T") adding directory $udir" # Backup files - find ./$udir ${fargs[@]} -type f -print0 |\ + find ./$udir ${fargs[@]} -type f -or -type l -print0 |\ tar -cpf $tmpdir/user_dir/$udir.tar --null -T - # Backup empty folders diff --git a/func/domain.sh b/func/domain.sh index ec520b729..43eae6c1d 100644 --- a/func/domain.sh +++ b/func/domain.sh @@ -11,11 +11,11 @@ is_web_template_valid() { # Proxy template check is_proxy_template_valid() { - template=$1 - t="$WEBTPL/$PROXY_SYSTEM/$template.tpl" - s="$WEBTPL/$PROXY_SYSTEM/$template.stpl" + proxy=$1 + t="$WEBTPL/$PROXY_SYSTEM/$proxy.tpl" + s="$WEBTPL/$PROXY_SYSTEM/$proxy.stpl" if [ ! -e $t ] || [ ! -e $s ]; then - echo "Error: proxy template $template not found" + echo "Error: proxy template $proxy not found" log_event "$E_NOTEXIST" "$EVENT" exit $E_NOTEXIST fi From 52db853acf7923cb113d99107956e72f7f0de245 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Mon, 5 Oct 2015 23:32:25 +0300 Subject: [PATCH 077/264] FileManger stuff --- bin/v-check-fs-permission | 54 ++++++++ web/css/styles.min.css | 53 ++++++++ web/edit/file/index.php | 101 ++++++++++++-- web/file_manager/fm_api.php | 4 + web/file_manager/fm_core.php | 41 ++++++ web/file_manager/upload_file.php | 43 +++--- web/js/file_manager.js | 194 +++++++++++++-------------- web/login/index.php | 3 + web/templates/admin/edit_server.html | 29 +++- web/templates/file_manager/main.php | 4 + web/view/file/index.php | 22 ++- 11 files changed, 417 insertions(+), 131 deletions(-) create mode 100755 bin/v-check-fs-permission diff --git a/bin/v-check-fs-permission b/bin/v-check-fs-permission new file mode 100755 index 000000000..59e491cf3 --- /dev/null +++ b/bin/v-check-fs-permission @@ -0,0 +1,54 @@ +#!/bin/bash +# info: open file +# options: USER FILE +# +# The function opens/reads files on the file system + +user=$1 +src_file=$2 + +# Checking arguments +if [ -z "$src_file" ]; then + echo "Usage: USER FILE" + exit 1 +fi + +# Checking vesta user +if [ ! -e "$VESTA/data/users/$user" ]; then + echo "Error: vesta user $user doesn't exist" + exit 3 +fi + +# Checking user homedir +homedir=$(grep "^$user:" /etc/passwd | cut -f 6 -d :) +if [ -z $homedir ]; then + echo "Error: user home directory doesn't exist" + exit 12 +fi + +# Checking path +if [ ! -z "$src_file" ]; then + rpath=$(readlink -f "$src_file") + if [ -z "$(echo $rpath |egrep "^/tmp|^$homedir")" ]; then + echo "Error: invalid source path $src_file" + exit 2 + fi +fi + +# Reading file +#sudo -u $user cat "$src_file" 2>/dev/null +#if [ $? -ne 0 ]; then +# echo "Error: file $src_file was not opened" +# exit 3 +#fi + +# Checking if file has readable permission +if [[ ! -r $src_file ]] +then +# echo "File is readable" +#else + echo "Cannot read file" +fi + +# Exiting +exit diff --git a/web/css/styles.min.css b/web/css/styles.min.css index b0b348984..df532d8c2 100644 --- a/web/css/styles.min.css +++ b/web/css/styles.min.css @@ -2787,3 +2787,56 @@ form#vstobjects.suspended { text-align: right; width: 140px; } + +.description { + font-weight: normal; + line-height: 25px; + padding-bottom: 20px; + margin-left: 50px; +} +.description ul{ + margin-top: 15px; + list-style: none; + padding-left: 0; +} + +.description li{ + margin: 10px 0; +} + +.description a { + line-height: 30px; + text-decoration: underline; + color: #2c9491; +} +.description a.purchase { + color: #86A307; + background-color: #9fbf0c; + border-radius: 3px; + color: #fff; + font-size: 13px; + font-weight: bold; + padding: 7px; + text-transform: capitalize; + text-decoration: none; +} +.description a.purchase:hover { + background-color: #c0e60f; + color: #555; +} +.description .licence { + padding: 20px 0; + color: #2c9491; +} + +.description .licence input { + margin-left: 17px; + width: 137px; +} + +.description span { + font-style: italic; + line-height: 45px; + padding-top: 20px; +} + diff --git a/web/edit/file/index.php b/web/edit/file/index.php index 8b3f49a00..ea90079cc 100644 --- a/web/edit/file/index.php +++ b/web/edit/file/index.php @@ -3,6 +3,17 @@ session_start(); include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); /* +if (empty($panel)) { + $command = VESTA_CMD."v-list-user '".$user."' 'json'"; + exec ($command, $output, $return_var); + if ( $return_var > 0 ) { + header("Location: /error/"); + exit; + } + $panel = json_decode(implode('', $output), true); +} +*/ +/* // Check user session if ((!isset($_SESSION['user'])) && (!defined('NO_AUTH_REQUIRED'))) { $_SESSION['request_uri'] = $_SERVER['REQUEST_URI']; @@ -23,13 +34,15 @@ if ((!isset($_SESSION['user'])) && (!defined('NO_AUTH_REQUIRED'))) { + + + -
    + + - + diff --git a/web/file_manager/fm_api.php b/web/file_manager/fm_api.php index 92acfa282..f4629794f 100644 --- a/web/file_manager/fm_api.php +++ b/web/file_manager/fm_api.php @@ -97,6 +97,10 @@ switch ($_REQUEST['action']) { $item = $_REQUEST['item']; print json_encode($fm->packItem($item, $dir, $target_dir, $filename)); break; + case 'backup': + $path = $_REQUEST['path']; + print json_encode($fm->backupItem($path)); + break; default: //print json_encode($fm->init()); break; diff --git a/web/file_manager/fm_core.php b/web/file_manager/fm_core.php index fb827d481..1b3c09f91 100644 --- a/web/file_manager/fm_core.php +++ b/web/file_manager/fm_core.php @@ -206,6 +206,47 @@ class FileManager { ); } } + + function backupItem($item) { + + $src_item = $this->formatFullPath($item); + + $dst_item_name = $item . '~' . date('Ymd_His'); + + $dst_item = $this->formatFullPath($dst_item_name); + +//print VESTA_CMD . "v-add-fs-archive {$this->user} {$item} {$dst_item}";die(); + exec (VESTA_CMD . "v-copy-fs-file {$this->user} {$src_item} {$dst_item}", $output, $return_var); + + $error = self::check_return_code($return_var, $output); + + if (empty($error)) { + return array( + 'result' => true, + 'filename' => $dst_item_name + ); + } + else { + return array( + 'result' => false, + 'message' => $error + ); + } + + $error = self::check_return_code($return_var, $output); + + if (empty($error)) { + return array( + 'result' => true + ); + } + else { + return array( + 'result' => false, + 'message' => $error + ); + } + } function unpackItem($item, $dir, $target_dir, $filename) { $item = $this->formatFullPath($item); diff --git a/web/file_manager/upload_file.php b/web/file_manager/upload_file.php index f3970985c..16fa7c5fa 100644 --- a/web/file_manager/upload_file.php +++ b/web/file_manager/upload_file.php @@ -1,25 +1,38 @@ 0 ) { + header("Location: /error/"); + exit; + } + $panel = json_decode(implode('', $output), true); +} + + // Define a destination -$targetFolder = '/home/admin/'; // Relative to the root +//$targetFolder = '/home/admin/'; // Relative to the root +$targetFolder = $panel[$user]['HOME']; // Relative to the root $verifyToken = md5('unique_salt' . $_POST['timestamp']); if (!empty($_FILES) && $_POST['token'] == $verifyToken) { - $tempFile = $_FILES['Filedata']['tmp_name']; - $targetPath = $targetFolder; - $targetFile = rtrim($targetPath,'/') . '/' . $_FILES['Filedata']['name']; - - // Validate the file type - //$fileTypes = array('jpg','jpeg','gif','png'); // File extensions - //$fileParts = pathinfo($_FILES['Filedata']['name']); - - //if (in_array($fileParts['extension'],$fileTypes)) { - move_uploaded_file($tempFile,$targetFile); - echo '1'; - //} else { - // echo 'Invalid file type.'; -// } + $tempFile = $_FILES['Filedata']['tmp_name']; + $targetPath = $targetFolder; + $targetFile = rtrim($targetPath,'/') . '/' . $_FILES['Filedata']['name']; + + exec (VESTA_CMD . "v-copy-fs-file {$user} {$tempFile} {$targetFile}", $output, $return_var); + + $error = self::check_return_code($return_var, $output); + if ($return_var != 0) { + echo '0'; + } else { + echo '1'; + } } ?> diff --git a/web/js/file_manager.js b/web/js/file_manager.js index 4501fd591..f7093c427 100644 --- a/web/js/file_manager.js +++ b/web/js/file_manager.js @@ -56,7 +56,7 @@ FM.EDITABLE_MIMETYPES = [ 'application/epp+xml', 'application/javascript', 'application/json', - 'application/jsonml+json ', + 'application/jsonml+json ', 'application/lost+xml', 'application/marc', 'application/msword', @@ -219,9 +219,9 @@ FM.setSecondInactive = function(index, box) { } FM.goBackwards = function() { - if (FM.isPopupOpened()) { - return; - } + if (FM.isPopupOpened()) { + return; + } var tab = FM.getTabLetter(FM.CURRENT_TAB); var box = FM['TAB_' + tab]; @@ -234,13 +234,13 @@ FM.goBackwards = function() { } FM.goToTop = function() { - if (FM.isPopupOpened()) { - return; - } - if (FM.isPopupOpened()) { - return; - } - + if (FM.isPopupOpened()) { + return; + } + if (FM.isPopupOpened()) { + return; + } + var tab = FM.getTabLetter(FM.CURRENT_TAB); var index = 0; @@ -248,9 +248,9 @@ FM.goToTop = function() { } FM.goToBottom = function() { - if (FM.isPopupOpened()) { - return; - } + if (FM.isPopupOpened()) { + return; + } var tab = FM.getTabLetter(FM.CURRENT_TAB); var index = $(FM.CURRENT_TAB).find('.dir').length - 1; @@ -258,9 +258,9 @@ FM.goToBottom = function() { } FM.goUp = function() { - if (FM.isPopupOpened()) { - return; - } + if (FM.isPopupOpened()) { + return; + } var tab = FM.getTabLetter(FM.CURRENT_TAB); var index = FM['CURRENT_' + tab + '_LINE']; index -= 1; @@ -275,10 +275,10 @@ FM.goUp = function() { } FM.goDown = function() { - if (FM.isPopupOpened()) { - return; - } - + if (FM.isPopupOpened()) { + return; + } + var tab = FM.getTabLetter(FM.CURRENT_TAB); var index = FM['CURRENT_' + tab + '_LINE']; index += 1; @@ -295,27 +295,27 @@ FM.goDown = function() { // reloads provided tab // reloads opposite tab if its needed FM.openAndSync = function(dir, box, callback) { - var tab = FM.getTabLetter(box); + var tab = FM.getTabLetter(box); - var opposite_tab = 'A'; - if (tab == 'A') { - opposite_tab = 'B'; - } - - var oppositeSyncNeeded = false; + var opposite_tab = 'A'; + if (tab == 'A') { + opposite_tab = 'B'; + } + + var oppositeSyncNeeded = false; - if (FM.TAB_A_CURRENT_PATH == FM.TAB_B_CURRENT_PATH) { - oppositeSyncNeeded = true; - } + if (FM.TAB_A_CURRENT_PATH == FM.TAB_B_CURRENT_PATH) { + oppositeSyncNeeded = true; + } - if (oppositeSyncNeeded) { - FM.open(dir, FM['TAB_' + opposite_tab], callback); - return FM.open(dir, box, callback); - } - else { - return FM.open(dir, box, callback); - } + if (oppositeSyncNeeded) { + FM.open(dir, FM['TAB_' + opposite_tab], callback); + return FM.open(dir, box, callback); + } + else { + return FM.open(dir, box, callback); + } } @@ -690,12 +690,12 @@ FM.generate_listing = function(reply, box) { //////// /*if (FM['CURRENT_'+tab+'_LINE'] > -1 && $(box).find('.dir:eq(' + FM['CURRENT_'+tab+'_LINE'] + ')').lrngth > 0) { - - } - else { - FM['CURRENT_'+tab+'_LINE'] = -1; - }*/ - FM['CURRENT_'+tab+'_LINE'] = -1; + + } + else { + FM['CURRENT_'+tab+'_LINE'] = -1; + }*/ + FM['CURRENT_'+tab+'_LINE'] = -1; } FM.toggleCheck = function(uid) { @@ -958,9 +958,9 @@ FM.toggleAllItemsSelected = function() { } FM.selectCurrentElementAndGoToNext = function () { - if (FM.isPopupOpened()) { - return; - } + if (FM.isPopupOpened()) { + return; + } var tab = FM.getTabLetter(FM.CURRENT_TAB); var box = FM['TAB_' + tab]; @@ -1106,7 +1106,7 @@ FM.unpackItem = function() { var tpl = Tpl.get('popup_unpack', 'FM'); tpl.set(':FILENAME', src.name); - tpl.set(':DST_DIRNAME', dst + '/' + src.name + '_extracted'); + tpl.set(':DST_DIRNAME', dst + '/' + src.name); FM.popupOpen(tpl.finalize()); } @@ -1151,10 +1151,10 @@ FM.packItem = function() { FM.switchTab = function() { - if (FM.isPopupOpened()) { - return; - } - + if (FM.isPopupOpened()) { + return; + } + if (FM.CURRENT_TAB == FM.TAB_A) { FM.setTabActive(FM.TAB_B); $(FM.TAB_B).find('.selected-inactive').removeClass('selected-inactive'); @@ -1264,12 +1264,12 @@ FM.renameItems = function() { } FM.isPopupOpened = function() { - return $('#popup').length > 0 ? true : false; + return $('#popup').length > 0 ? true : false; } FM.popupOpen = function(html) { - FM.popupClose(); - //$('#popup').flayer_close(); + FM.popupClose(); + //$('#popup').flayer_close(); $('
    ').attr('id', 'popup').html(html).flayer({ afterStart: function(elm) { elm.find('input[type="text"]:first').focus(); @@ -1601,12 +1601,12 @@ FM.displayError = function(msg) { } FM.triggerRefreshActionTrick = function() { - // reload-in-time - $('#reload-in-time').remove(); - FM.Env.RELOAD_IN_TIME = true; - var tpl = Tpl.get('reload_in_time', 'FM'); - //tpl.set(':TIME_LEFT', FM.RELOAD_IN_TIME_SECONDS + 1); - + // reload-in-time + $('#reload-in-time').remove(); + FM.Env.RELOAD_IN_TIME = true; + var tpl = Tpl.get('reload_in_time', 'FM'); + //tpl.set(':TIME_LEFT', FM.RELOAD_IN_TIME_SECONDS + 1); + $('body').append(tpl.finalize()); var ref = $('#reload-in-time').find('.reload-in-time-counter'); @@ -1614,14 +1614,14 @@ FM.triggerRefreshActionTrick = function() { var timeleft = FM.RELOAD_IN_TIME_SECONDS; FM.Env.reload_in_time_interval = setInterval(function() { - if (timeleft <= 0) { - clearInterval(FM.Env.reload_in_time_interval); - $('#reload-in-time').remove(); - FM.Env.RELOAD_IN_TIME = false; - } - //ref.text(timeleft); - timeleft -= 1; - }, 1000); + if (timeleft <= 0) { + clearInterval(FM.Env.reload_in_time_interval); + $('#reload-in-time').remove(); + FM.Env.RELOAD_IN_TIME = false; + } + //ref.text(timeleft); + timeleft -= 1; + }, 1000); } @@ -1808,7 +1808,7 @@ $(document).ready(function() { shortcut.add("Esc",function() { - FM.Env.RELOAD_IN_TIME = false; + FM.Env.RELOAD_IN_TIME = false; $('#reload-in-time').remove(); if (FM.isPopupOpened()) { return FM.handlePopupCancel(); @@ -1839,14 +1839,14 @@ $(document).ready(function() { }); shortcut.add("Left",function() { - if (!FM.isPopupOpened()) { - FM.setTabActive(FM.TAB_A); + if (!FM.isPopupOpened()) { + FM.setTabActive(FM.TAB_A); - var tab = FM.getTabLetter(FM.CURRENT_TAB); - if (FM['CURRENT_' + tab + '_LINE'] == -1) { - FM.setActive(0, FM.CURRENT_TAB); - } - } + var tab = FM.getTabLetter(FM.CURRENT_TAB); + if (FM['CURRENT_' + tab + '_LINE'] == -1) { + FM.setActive(0, FM.CURRENT_TAB); + } + } },{ 'type': 'keydown', 'propagate': false, @@ -1855,14 +1855,14 @@ $(document).ready(function() { }); shortcut.add("Right",function() { - if (!FM.isPopupOpened()) { - FM.setTabActive(FM.TAB_B); + if (!FM.isPopupOpened()) { + FM.setTabActive(FM.TAB_B); - var tab = FM.getTabLetter(FM.CURRENT_TAB); - if (FM['CURRENT_' + tab + '_LINE'] == -1) { - FM.setActive(0, FM.CURRENT_TAB); - } - } + var tab = FM.getTabLetter(FM.CURRENT_TAB); + if (FM['CURRENT_' + tab + '_LINE'] == -1) { + FM.setActive(0, FM.CURRENT_TAB); + } + } },{ 'type': 'keydown', @@ -2000,14 +2000,14 @@ $(document).ready(function() { 'target': document }); shortcut.add("F5",function() { - if (FM.Env.RELOAD_IN_TIME == true) { - location.reload(); - return; - } - else { - FM.copyItems(); - FM.triggerRefreshActionTrick(); - } + if (FM.Env.RELOAD_IN_TIME == true) { + location.reload(); + return; + } + else { + FM.copyItems(); + FM.triggerRefreshActionTrick(); + } },{ 'type': 'keydown', 'propagate': false, @@ -2043,8 +2043,8 @@ $(document).ready(function() { }); /*shortcut.add("Y",function() { if (FM.Env.RELOAD_IN_TIME == true) { - location.reload(); - } + location.reload(); + } },{ 'type': 'keydown', 'propagate': false, @@ -2053,9 +2053,9 @@ $(document).ready(function() { });*/ - shortcut.add("u",function() { - var tab_letter = FM.getTabLetter(FM.CURRENT_TAB); - $('#file_upload_'+tab_letter).trigger('click'); + shortcut.add("u",function() { + var tab_letter = FM.getTabLetter(FM.CURRENT_TAB); + $('#file_upload_'+tab_letter).trigger('click'); },{ 'type': 'keydown', 'propagate': false, diff --git a/web/login/index.php b/web/login/index.php index 0c9e48fa9..23790033e 100644 --- a/web/login/index.php +++ b/web/login/index.php @@ -3,9 +3,12 @@ define('NO_AUTH_REQUIRED',true); + // Main include include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); +//echo $_SESSION['request_uri']; + $TAB = 'LOGIN'; diff --git a/web/templates/admin/edit_server.html b/web/templates/admin/edit_server.html index 484fbafe6..8886717b2 100644 --- a/web/templates/admin/edit_server.html +++ b/web/templates/admin/edit_server.html @@ -684,8 +684,21 @@


    +
    @@ -700,7 +713,7 @@ - + @@ -708,4 +721,16 @@ -
    \ No newline at end of file + + + \ No newline at end of file diff --git a/web/templates/file_manager/main.php b/web/templates/file_manager/main.php index 634e7fc12..20fb1c107 100644 --- a/web/templates/file_manager/main.php +++ b/web/templates/file_manager/main.php @@ -474,6 +474,8 @@ else { FM['CURRENT_A_LINE'] = 0; } + + FM.preselectedItems.A = []; /*FM.setTabActive(FM.TAB_A, 'skip_highlights'); $(".listing-left .selected, .listing-left .ui-selectee").each(function(i, o) { @@ -538,6 +540,8 @@ else { FM['CURRENT_B_LINE'] = 0; } + + FM.preselectedItems.B = []; }, unselected: function (event, ui) { diff --git a/web/view/file/index.php b/web/view/file/index.php index 40e314920..2e8fd58f7 100644 --- a/web/view/file/index.php +++ b/web/view/file/index.php @@ -1,7 +1,17 @@ - fotorama - - - + + +
    - + class="fotoram" data-fit="scaledown" data-allowfullscreen="true" data-nav="false"> +
    From 897606631355a64e96fb8bbf41d951de78c29df9 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Mon, 5 Oct 2015 23:33:01 +0300 Subject: [PATCH 078/264] uniq databases during restore --- bin/v-restore-user | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/v-restore-user b/bin/v-restore-user index efdb21e25..33d5cdfe2 100755 --- a/bin/v-restore-user +++ b/bin/v-restore-user @@ -649,7 +649,7 @@ if [ "$db" != 'no' ]; then # Create domain list db_list=$(tar -tf $BACKUP/$backup | grep "^./db" |\ - grep db.conf | cut -f 3 -d '/') + grep db.conf | cut -f 3 -d '/' |sort -u) if [ ! -z "$db" ]; then db_include_list=$(mktemp) for db_include in ${db//,/ }; do From 70a8f75f1b880ccbd31dfdf52f5927f870a8c397 Mon Sep 17 00:00:00 2001 From: Daniel Ting Date: Thu, 8 Oct 2015 19:10:59 +1100 Subject: [PATCH 079/264] Update SSL Ciphers To fix RC4 immediate deprecation by major web browsers. Using old configuration results in "Insecure Certificate" errors. Strong Ciphers via CloudFlare (https://github.com/cloudflare/sslconfig/blob/master/conf). Excluded CloudFlare's use of ChaCha cipher due to compatibility patch required. Info Source: https://tools.ietf.org/html/rfc7465 https://www.pcicomplianceguide.org/pci-dss-v3-1-and-ssl-what-you-should-do-now/ https://blog.digicert.com/major-browsers-announce-rc4-deprecation/ --- src/rpm/conf/nginx.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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; From 4049a319a65413ada5c7f42b34dc5031fd3924c9 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Thu, 8 Oct 2015 15:07:53 +0300 Subject: [PATCH 080/264] FileManager stuff --- web/edit/file/index.php | 28 ++- web/file_manager/upload_file.php | 2 +- web/inc/i18n/ar.php | 46 +++++ web/inc/i18n/bs.php | 46 +++++ web/inc/i18n/cn.php | 46 +++++ web/inc/i18n/cz.php | 46 +++++ web/inc/i18n/de.php | 46 +++++ web/inc/i18n/el.php | 45 +++++ web/inc/i18n/en.php | 46 +++++ web/inc/i18n/es.php | 45 +++++ web/inc/i18n/fi.php | 45 +++++ web/inc/i18n/fr.php | 45 +++++ web/inc/i18n/hu.php | 45 +++++ web/inc/i18n/id.php | 45 +++++ web/inc/i18n/it.php | 45 +++++ web/inc/i18n/nl.php | 45 +++++ web/inc/i18n/no.php | 45 +++++ web/inc/i18n/pt.php | 45 +++++ web/inc/i18n/ro.php | 45 +++++ web/inc/i18n/ru.php | 45 +++++ web/inc/i18n/se.php | 45 +++++ web/inc/i18n/tr.php | 45 +++++ web/inc/i18n/tw.php | 45 +++++ web/inc/i18n/ua.php | 45 +++++ web/js/i18n.js.php | 64 ++++--- web/js/templates.js | 8 +- web/templates/file_manager/main.php | 242 ++---------------------- web/templates/file_manager/tab_menu.php | 47 ++--- 28 files changed, 1090 insertions(+), 297 deletions(-) diff --git a/web/edit/file/index.php b/web/edit/file/index.php index ea90079cc..7620d3db0 100644 --- a/web/edit/file/index.php +++ b/web/edit/file/index.php @@ -2,6 +2,8 @@ session_start(); include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); + +$user = $_SESSION['user']; /* if (empty($panel)) { $command = VESTA_CMD."v-list-user '".$user."' 'json'"; @@ -56,7 +58,16 @@ if ((!isset($_SESSION['user'])) && (!defined('NO_AUTH_REQUIRED'))) { $f = fopen ($fn, 'w+'); fwrite($f, $_POST['contents']); if ($f) { - copy($fn, $path); + //copy($fn, $path); + exec (VESTA_CMD . "v-copy-fs-file {$user} {$fn} {$path}", $output, $return_var); + + $error = check_return_code($return_var, $output); + if ($return_var != 0) { + var_dump(VESTA_CMD . "v-copy-fs-file {$user} {$fn} {$path}"); + var_dump($path); + var_dump($output); + die('

    Error while saving file

    ');//echo '0'; + } } unlink($fn); } @@ -65,13 +76,24 @@ if ((!isset($_SESSION['user'])) && (!defined('NO_AUTH_REQUIRED'))) { // $content = file_get_contents($path); // v-open-fs-file - exec (VESTA_CMD . "v-open-fs-file {$user} {$path}", $content, $return_var); + + //print file_get_contents($path); + exec (VESTA_CMD . "v-check-fs-permission {$user} {$path}", $content, $return_var); + + if ($return_var != 0) { + print 'Error while opening file'; // todo: handle this more styled + exit; + } + + + /*exec (VESTA_CMD . "v-open-fs-file {$user} {$path}", $content, $return_var); if ($return_var != 0) { print 'Error while opening file'; // todo: handle this more styled exit; } - $content = implode("\n", $content); + $content = implode("\n", $content);*/ + $content = file_get_contents($path); } } else { diff --git a/web/file_manager/upload_file.php b/web/file_manager/upload_file.php index 16fa7c5fa..7bfaca70e 100644 --- a/web/file_manager/upload_file.php +++ b/web/file_manager/upload_file.php @@ -27,7 +27,7 @@ if (!empty($_FILES) && $_POST['token'] == $verifyToken) { exec (VESTA_CMD . "v-copy-fs-file {$user} {$tempFile} {$targetFile}", $output, $return_var); - $error = self::check_return_code($return_var, $output); + $error = check_return_code($return_var, $output); if ($return_var != 0) { echo '0'; } else { diff --git a/web/inc/i18n/ar.php b/web/inc/i18n/ar.php index b43c098f6..5bc781497 100644 --- a/web/inc/i18n/ar.php +++ b/web/inc/i18n/ar.php @@ -499,4 +499,50 @@ $LANG['ar'] = array( 'Date' => 'Date', 'Starred' => 'Starred', 'Name' => 'Name', + + 'File Manager' => 'File Manager', + 'type' => 'type', + 'size' => 'size', + 'date' => 'date', + 'name' => 'name', + 'Initializing' => 'Initializing', + 'UPLOAD' => 'UPLOAD', + 'NEW FILE' => 'NEW FILE', + 'NEW DIR' => 'NEW DIR', + 'DELETE' => 'DELETE', + 'RENAME' => 'RENAME', + 'COPY' => 'COPY', + 'ARCHIVE' => 'ARCHIVE', + 'EXTRACT' => 'EXTRACT', + 'DOWNLOAD' => 'DOWNLOAD', + 'Hit' => 'Hit', + 'to reload the page' => 'to reload the page', + 'Directory name cannot be empty' => 'Directory name cannot be empty', + 'File name cannot be empty' => 'File name cannot be empty', + 'No file selected' => 'No file selected', + 'No file or folder selected' => 'No file or folder selected', + 'File type not supported' => 'File type not supported', + 'Directory download not available in current version' => 'Directory download not available in current version', + 'Directory not available' => 'Directory not available', + 'Done' => 'Done', + 'Close' => 'Close', + 'Copy' => 'Copy', + 'Cancel' => 'Cancel', + 'Rename' => 'Rename', + 'Delete' => 'Delete', + 'Extract' => 'Extract', + 'Create' => 'Create', + 'Compress' => 'Compress', + 'OK' => 'OK', + 'Are you sure you want to copy' => 'Are you sure you want to copy', + 'Are you sure you want to delete' => 'Are you sure you want to delete', + 'into' => 'into', + 'existing files will be replaced' => 'existing files will be replaced', + 'Original name' => 'Original name', + 'File' => 'File', + 'already exists' => 'already exists', + 'Create file' => 'Create file', + 'Create directory' => 'Create directory', + + ); \ No newline at end of file diff --git a/web/inc/i18n/bs.php b/web/inc/i18n/bs.php index e32bbd7a4..795af1bdb 100644 --- a/web/inc/i18n/bs.php +++ b/web/inc/i18n/bs.php @@ -495,4 +495,50 @@ $LANG['bs'] = array( 'Date' => 'Datum', 'Starred' => 'Starred', 'Name' => 'Name', + + 'File Manager' => 'File Manager', + 'type' => 'type', + 'size' => 'size', + 'date' => 'date', + 'name' => 'name', + 'Initializing' => 'Initializing', + 'UPLOAD' => 'UPLOAD', + 'NEW FILE' => 'NEW FILE', + 'NEW DIR' => 'NEW DIR', + 'DELETE' => 'DELETE', + 'RENAME' => 'RENAME', + 'COPY' => 'COPY', + 'ARCHIVE' => 'ARCHIVE', + 'EXTRACT' => 'EXTRACT', + 'DOWNLOAD' => 'DOWNLOAD', + 'Hit' => 'Hit', + 'to reload the page' => 'to reload the page', + 'Directory name cannot be empty' => 'Directory name cannot be empty', + 'File name cannot be empty' => 'File name cannot be empty', + 'No file selected' => 'No file selected', + 'No file or folder selected' => 'No file or folder selected', + 'File type not supported' => 'File type not supported', + 'Directory download not available in current version' => 'Directory download not available in current version', + 'Directory not available' => 'Directory not available', + 'Done' => 'Done', + 'Close' => 'Close', + 'Copy' => 'Copy', + 'Cancel' => 'Cancel', + 'Rename' => 'Rename', + 'Delete' => 'Delete', + 'Extract' => 'Extract', + 'Create' => 'Create', + 'Compress' => 'Compress', + 'OK' => 'OK', + 'Are you sure you want to copy' => 'Are you sure you want to copy', + 'Are you sure you want to delete' => 'Are you sure you want to delete', + 'into' => 'into', + 'existing files will be replaced' => 'existing files will be replaced', + 'Original name' => 'Original name', + 'File' => 'File', + 'already exists' => 'already exists', + 'Create file' => 'Create file', + 'Create directory' => 'Create directory', + + ); \ No newline at end of file diff --git a/web/inc/i18n/cn.php b/web/inc/i18n/cn.php index e602e8585..e1c2446d7 100644 --- a/web/inc/i18n/cn.php +++ b/web/inc/i18n/cn.php @@ -500,4 +500,50 @@ $LANG['cn'] = array( 'Date' => 'Date', 'Starred' => 'Starred', 'Name' => 'Name', + + 'File Manager' => 'File Manager', + 'type' => 'type', + 'size' => 'size', + 'date' => 'date', + 'name' => 'name', + 'Initializing' => 'Initializing', + 'UPLOAD' => 'UPLOAD', + 'NEW FILE' => 'NEW FILE', + 'NEW DIR' => 'NEW DIR', + 'DELETE' => 'DELETE', + 'RENAME' => 'RENAME', + 'COPY' => 'COPY', + 'ARCHIVE' => 'ARCHIVE', + 'EXTRACT' => 'EXTRACT', + 'DOWNLOAD' => 'DOWNLOAD', + 'Hit' => 'Hit', + 'to reload the page' => 'to reload the page', + 'Directory name cannot be empty' => 'Directory name cannot be empty', + 'File name cannot be empty' => 'File name cannot be empty', + 'No file selected' => 'No file selected', + 'No file or folder selected' => 'No file or folder selected', + 'File type not supported' => 'File type not supported', + 'Directory download not available in current version' => 'Directory download not available in current version', + 'Directory not available' => 'Directory not available', + 'Done' => 'Done', + 'Close' => 'Close', + 'Copy' => 'Copy', + 'Cancel' => 'Cancel', + 'Rename' => 'Rename', + 'Delete' => 'Delete', + 'Extract' => 'Extract', + 'Create' => 'Create', + 'Compress' => 'Compress', + 'OK' => 'OK', + 'Are you sure you want to copy' => 'Are you sure you want to copy', + 'Are you sure you want to delete' => 'Are you sure you want to delete', + 'into' => 'into', + 'existing files will be replaced' => 'existing files will be replaced', + 'Original name' => 'Original name', + 'File' => 'File', + 'already exists' => 'already exists', + 'Create file' => 'Create file', + 'Create directory' => 'Create directory', + + ); \ No newline at end of file diff --git a/web/inc/i18n/cz.php b/web/inc/i18n/cz.php index 468c18f32..7a1d94482 100644 --- a/web/inc/i18n/cz.php +++ b/web/inc/i18n/cz.php @@ -501,4 +501,50 @@ $LANG['cz'] = array( 'Date' => 'Date', 'Starred' => 'Starred', 'Name' => 'Name', + + 'File Manager' => 'File Manager', + 'type' => 'type', + 'size' => 'size', + 'date' => 'date', + 'name' => 'name', + 'Initializing' => 'Initializing', + 'UPLOAD' => 'UPLOAD', + 'NEW FILE' => 'NEW FILE', + 'NEW DIR' => 'NEW DIR', + 'DELETE' => 'DELETE', + 'RENAME' => 'RENAME', + 'COPY' => 'COPY', + 'ARCHIVE' => 'ARCHIVE', + 'EXTRACT' => 'EXTRACT', + 'DOWNLOAD' => 'DOWNLOAD', + 'Hit' => 'Hit', + 'to reload the page' => 'to reload the page', + 'Directory name cannot be empty' => 'Directory name cannot be empty', + 'File name cannot be empty' => 'File name cannot be empty', + 'No file selected' => 'No file selected', + 'No file or folder selected' => 'No file or folder selected', + 'File type not supported' => 'File type not supported', + 'Directory download not available in current version' => 'Directory download not available in current version', + 'Directory not available' => 'Directory not available', + 'Done' => 'Done', + 'Close' => 'Close', + 'Copy' => 'Copy', + 'Cancel' => 'Cancel', + 'Rename' => 'Rename', + 'Delete' => 'Delete', + 'Extract' => 'Extract', + 'Create' => 'Create', + 'Compress' => 'Compress', + 'OK' => 'OK', + 'Are you sure you want to copy' => 'Are you sure you want to copy', + 'Are you sure you want to delete' => 'Are you sure you want to delete', + 'into' => 'into', + 'existing files will be replaced' => 'existing files will be replaced', + 'Original name' => 'Original name', + 'File' => 'File', + 'already exists' => 'already exists', + 'Create file' => 'Create file', + 'Create directory' => 'Create directory', + + ); \ No newline at end of file diff --git a/web/inc/i18n/de.php b/web/inc/i18n/de.php index 46dc9a8b5..116217192 100644 --- a/web/inc/i18n/de.php +++ b/web/inc/i18n/de.php @@ -499,4 +499,50 @@ $LANG['de'] = array( 'Date' => 'Datum', 'Starred' => 'Starred', 'Name' => 'Name', + + 'File Manager' => 'File Manager', + 'type' => 'type', + 'size' => 'size', + 'date' => 'date', + 'name' => 'name', + 'Initializing' => 'Initializing', + 'UPLOAD' => 'UPLOAD', + 'NEW FILE' => 'NEW FILE', + 'NEW DIR' => 'NEW DIR', + 'DELETE' => 'DELETE', + 'RENAME' => 'RENAME', + 'COPY' => 'COPY', + 'ARCHIVE' => 'ARCHIVE', + 'EXTRACT' => 'EXTRACT', + 'DOWNLOAD' => 'DOWNLOAD', + 'Hit' => 'Hit', + 'to reload the page' => 'to reload the page', + 'Directory name cannot be empty' => 'Directory name cannot be empty', + 'File name cannot be empty' => 'File name cannot be empty', + 'No file selected' => 'No file selected', + 'No file or folder selected' => 'No file or folder selected', + 'File type not supported' => 'File type not supported', + 'Directory download not available in current version' => 'Directory download not available in current version', + 'Directory not available' => 'Directory not available', + 'Done' => 'Done', + 'Close' => 'Close', + 'Copy' => 'Copy', + 'Cancel' => 'Cancel', + 'Rename' => 'Rename', + 'Delete' => 'Delete', + 'Extract' => 'Extract', + 'Create' => 'Create', + 'Compress' => 'Compress', + 'OK' => 'OK', + 'Are you sure you want to copy' => 'Are you sure you want to copy', + 'Are you sure you want to delete' => 'Are you sure you want to delete', + 'into' => 'into', + 'existing files will be replaced' => 'existing files will be replaced', + 'Original name' => 'Original name', + 'File' => 'File', + 'already exists' => 'already exists', + 'Create file' => 'Create file', + 'Create directory' => 'Create directory', + + ); \ No newline at end of file diff --git a/web/inc/i18n/el.php b/web/inc/i18n/el.php index 28de3e3ac..b6de95967 100644 --- a/web/inc/i18n/el.php +++ b/web/inc/i18n/el.php @@ -501,4 +501,49 @@ $LANG['el'] = array( 'Date' => 'Date', 'Starred' => 'Starred', 'Name' => 'Name', + + 'File Manager' => 'File Manager', + 'type' => 'type', + 'size' => 'size', + 'date' => 'date', + 'name' => 'name', + 'Initializing' => 'Initializing', + 'UPLOAD' => 'UPLOAD', + 'NEW FILE' => 'NEW FILE', + 'NEW DIR' => 'NEW DIR', + 'DELETE' => 'DELETE', + 'RENAME' => 'RENAME', + 'COPY' => 'COPY', + 'ARCHIVE' => 'ARCHIVE', + 'EXTRACT' => 'EXTRACT', + 'DOWNLOAD' => 'DOWNLOAD', + 'Hit' => 'Hit', + 'to reload the page' => 'to reload the page', + 'Directory name cannot be empty' => 'Directory name cannot be empty', + 'File name cannot be empty' => 'File name cannot be empty', + 'No file selected' => 'No file selected', + 'No file or folder selected' => 'No file or folder selected', + 'File type not supported' => 'File type not supported', + 'Directory download not available in current version' => 'Directory download not available in current version', + 'Directory not available' => 'Directory not available', + 'Done' => 'Done', + 'Close' => 'Close', + 'Copy' => 'Copy', + 'Cancel' => 'Cancel', + 'Rename' => 'Rename', + 'Delete' => 'Delete', + 'Extract' => 'Extract', + 'Create' => 'Create', + 'Compress' => 'Compress', + 'OK' => 'OK', + 'Are you sure you want to copy' => 'Are you sure you want to copy', + 'Are you sure you want to delete' => 'Are you sure you want to delete', + 'into' => 'into', + 'existing files will be replaced' => 'existing files will be replaced', + 'Original name' => 'Original name', + 'File' => 'File', + 'already exists' => 'already exists', + 'Create file' => 'Create file', + 'Create directory' => 'Create directory', + ); \ No newline at end of file diff --git a/web/inc/i18n/en.php b/web/inc/i18n/en.php index 48e7dd86b..3b9b469a7 100644 --- a/web/inc/i18n/en.php +++ b/web/inc/i18n/en.php @@ -500,4 +500,50 @@ $LANG['en'] = array( 'Date' => 'Date', 'Starred' => 'Starred', 'Name' => 'Name', + + + 'File Manager' => 'File Manager', + 'type' => 'type', + 'size' => 'size', + 'date' => 'date', + 'name' => 'name', + 'Initializing' => 'Initializing', + 'UPLOAD' => 'UPLOAD', + 'NEW FILE' => 'NEW FILE', + 'NEW DIR' => 'NEW DIR', + 'DELETE' => 'DELETE', + 'RENAME' => 'RENAME', + 'COPY' => 'COPY', + 'ARCHIVE' => 'ARCHIVE', + 'EXTRACT' => 'EXTRACT', + 'DOWNLOAD' => 'DOWNLOAD', + 'Hit' => 'Hit', + 'to reload the page' => 'to reload the page', + 'Directory name cannot be empty' => 'Directory name cannot be empty', + 'File name cannot be empty' => 'File name cannot be empty', + 'No file selected' => 'No file selected', + 'No file or folder selected' => 'No file or folder selected', + 'File type not supported' => 'File type not supported', + 'Directory download not available in current version' => 'Directory download not available in current version', + 'Directory not available' => 'Directory not available', + 'Done' => 'Done', + 'Close' => 'Close', + 'Copy' => 'Copy', + 'Cancel' => 'Cancel', + 'Rename' => 'Rename', + 'Delete' => 'Delete', + 'Extract' => 'Extract', + 'Create' => 'Create', + 'Compress' => 'Compress', + 'OK' => 'OK', + 'Are you sure you want to copy' => 'Are you sure you want to copy', + 'Are you sure you want to delete' => 'Are you sure you want to delete', + 'into' => 'into', + 'existing files will be replaced' => 'existing files will be replaced', + 'Original name' => 'Original name', + 'File' => 'File', + 'already exists' => 'already exists', + 'Create file' => 'Create file', + 'Create directory' => 'Create directory', + ); \ No newline at end of file diff --git a/web/inc/i18n/es.php b/web/inc/i18n/es.php index f2d44ba2b..6902a6853 100644 --- a/web/inc/i18n/es.php +++ b/web/inc/i18n/es.php @@ -500,4 +500,49 @@ $LANG['es'] = array( 'Date' => 'Date', 'Starred' => 'Starred', 'Name' => 'Name', + + 'File Manager' => 'File Manager', + 'type' => 'type', + 'size' => 'size', + 'date' => 'date', + 'name' => 'name', + 'Initializing' => 'Initializing', + 'UPLOAD' => 'UPLOAD', + 'NEW FILE' => 'NEW FILE', + 'NEW DIR' => 'NEW DIR', + 'DELETE' => 'DELETE', + 'RENAME' => 'RENAME', + 'COPY' => 'COPY', + 'ARCHIVE' => 'ARCHIVE', + 'EXTRACT' => 'EXTRACT', + 'DOWNLOAD' => 'DOWNLOAD', + 'Hit' => 'Hit', + 'to reload the page' => 'to reload the page', + 'Directory name cannot be empty' => 'Directory name cannot be empty', + 'File name cannot be empty' => 'File name cannot be empty', + 'No file selected' => 'No file selected', + 'No file or folder selected' => 'No file or folder selected', + 'File type not supported' => 'File type not supported', + 'Directory download not available in current version' => 'Directory download not available in current version', + 'Directory not available' => 'Directory not available', + 'Done' => 'Done', + 'Close' => 'Close', + 'Copy' => 'Copy', + 'Cancel' => 'Cancel', + 'Rename' => 'Rename', + 'Delete' => 'Delete', + 'Extract' => 'Extract', + 'Create' => 'Create', + 'Compress' => 'Compress', + 'OK' => 'OK', + 'Are you sure you want to copy' => 'Are you sure you want to copy', + 'Are you sure you want to delete' => 'Are you sure you want to delete', + 'into' => 'into', + 'existing files will be replaced' => 'existing files will be replaced', + 'Original name' => 'Original name', + 'File' => 'File', + 'already exists' => 'already exists', + 'Create file' => 'Create file', + 'Create directory' => 'Create directory', + ); \ No newline at end of file diff --git a/web/inc/i18n/fi.php b/web/inc/i18n/fi.php index ac05de6ae..299eff03c 100644 --- a/web/inc/i18n/fi.php +++ b/web/inc/i18n/fi.php @@ -504,4 +504,49 @@ $LANG['fi'] = array( 'Date' => 'Date', 'Starred' => 'Starred', 'Name' => 'Name', + + 'File Manager' => 'File Manager', + 'type' => 'type', + 'size' => 'size', + 'date' => 'date', + 'name' => 'name', + 'Initializing' => 'Initializing', + 'UPLOAD' => 'UPLOAD', + 'NEW FILE' => 'NEW FILE', + 'NEW DIR' => 'NEW DIR', + 'DELETE' => 'DELETE', + 'RENAME' => 'RENAME', + 'COPY' => 'COPY', + 'ARCHIVE' => 'ARCHIVE', + 'EXTRACT' => 'EXTRACT', + 'DOWNLOAD' => 'DOWNLOAD', + 'Hit' => 'Hit', + 'to reload the page' => 'to reload the page', + 'Directory name cannot be empty' => 'Directory name cannot be empty', + 'File name cannot be empty' => 'File name cannot be empty', + 'No file selected' => 'No file selected', + 'No file or folder selected' => 'No file or folder selected', + 'File type not supported' => 'File type not supported', + 'Directory download not available in current version' => 'Directory download not available in current version', + 'Directory not available' => 'Directory not available', + 'Done' => 'Done', + 'Close' => 'Close', + 'Copy' => 'Copy', + 'Cancel' => 'Cancel', + 'Rename' => 'Rename', + 'Delete' => 'Delete', + 'Extract' => 'Extract', + 'Create' => 'Create', + 'Compress' => 'Compress', + 'OK' => 'OK', + 'Are you sure you want to copy' => 'Are you sure you want to copy', + 'Are you sure you want to delete' => 'Are you sure you want to delete', + 'into' => 'into', + 'existing files will be replaced' => 'existing files will be replaced', + 'Original name' => 'Original name', + 'File' => 'File', + 'already exists' => 'already exists', + 'Create file' => 'Create file', + 'Create directory' => 'Create directory', + ); \ No newline at end of file diff --git a/web/inc/i18n/fr.php b/web/inc/i18n/fr.php index ad79a3477..adfd7a0b1 100644 --- a/web/inc/i18n/fr.php +++ b/web/inc/i18n/fr.php @@ -502,4 +502,49 @@ $LANG['fr'] = array( 'Date' => 'Date', 'Starred' => 'Starred', 'Name' => 'Name', + + 'File Manager' => 'File Manager', + 'type' => 'type', + 'size' => 'size', + 'date' => 'date', + 'name' => 'name', + 'Initializing' => 'Initializing', + 'UPLOAD' => 'UPLOAD', + 'NEW FILE' => 'NEW FILE', + 'NEW DIR' => 'NEW DIR', + 'DELETE' => 'DELETE', + 'RENAME' => 'RENAME', + 'COPY' => 'COPY', + 'ARCHIVE' => 'ARCHIVE', + 'EXTRACT' => 'EXTRACT', + 'DOWNLOAD' => 'DOWNLOAD', + 'Hit' => 'Hit', + 'to reload the page' => 'to reload the page', + 'Directory name cannot be empty' => 'Directory name cannot be empty', + 'File name cannot be empty' => 'File name cannot be empty', + 'No file selected' => 'No file selected', + 'No file or folder selected' => 'No file or folder selected', + 'File type not supported' => 'File type not supported', + 'Directory download not available in current version' => 'Directory download not available in current version', + 'Directory not available' => 'Directory not available', + 'Done' => 'Done', + 'Close' => 'Close', + 'Copy' => 'Copy', + 'Cancel' => 'Cancel', + 'Rename' => 'Rename', + 'Delete' => 'Delete', + 'Extract' => 'Extract', + 'Create' => 'Create', + 'Compress' => 'Compress', + 'OK' => 'OK', + 'Are you sure you want to copy' => 'Are you sure you want to copy', + 'Are you sure you want to delete' => 'Are you sure you want to delete', + 'into' => 'into', + 'existing files will be replaced' => 'existing files will be replaced', + 'Original name' => 'Original name', + 'File' => 'File', + 'already exists' => 'already exists', + 'Create file' => 'Create file', + 'Create directory' => 'Create directory', + ); \ No newline at end of file diff --git a/web/inc/i18n/hu.php b/web/inc/i18n/hu.php index f4efe1788..3d5979fc9 100644 --- a/web/inc/i18n/hu.php +++ b/web/inc/i18n/hu.php @@ -502,4 +502,49 @@ $LANG['hu'] = array( 'Date' => 'Date', 'Starred' => 'Starred', 'Name' => 'Name', + + 'File Manager' => 'File Manager', + 'type' => 'type', + 'size' => 'size', + 'date' => 'date', + 'name' => 'name', + 'Initializing' => 'Initializing', + 'UPLOAD' => 'UPLOAD', + 'NEW FILE' => 'NEW FILE', + 'NEW DIR' => 'NEW DIR', + 'DELETE' => 'DELETE', + 'RENAME' => 'RENAME', + 'COPY' => 'COPY', + 'ARCHIVE' => 'ARCHIVE', + 'EXTRACT' => 'EXTRACT', + 'DOWNLOAD' => 'DOWNLOAD', + 'Hit' => 'Hit', + 'to reload the page' => 'to reload the page', + 'Directory name cannot be empty' => 'Directory name cannot be empty', + 'File name cannot be empty' => 'File name cannot be empty', + 'No file selected' => 'No file selected', + 'No file or folder selected' => 'No file or folder selected', + 'File type not supported' => 'File type not supported', + 'Directory download not available in current version' => 'Directory download not available in current version', + 'Directory not available' => 'Directory not available', + 'Done' => 'Done', + 'Close' => 'Close', + 'Copy' => 'Copy', + 'Cancel' => 'Cancel', + 'Rename' => 'Rename', + 'Delete' => 'Delete', + 'Extract' => 'Extract', + 'Create' => 'Create', + 'Compress' => 'Compress', + 'OK' => 'OK', + 'Are you sure you want to copy' => 'Are you sure you want to copy', + 'Are you sure you want to delete' => 'Are you sure you want to delete', + 'into' => 'into', + 'existing files will be replaced' => 'existing files will be replaced', + 'Original name' => 'Original name', + 'File' => 'File', + 'already exists' => 'already exists', + 'Create file' => 'Create file', + 'Create directory' => 'Create directory', + ); \ No newline at end of file diff --git a/web/inc/i18n/id.php b/web/inc/i18n/id.php index 3fdb6a192..87ad75bd9 100644 --- a/web/inc/i18n/id.php +++ b/web/inc/i18n/id.php @@ -503,4 +503,49 @@ $LANG['id'] = array( 'Date' => 'Date', 'Starred' => 'Starred', 'Name' => 'Name', + + 'File Manager' => 'File Manager', + 'type' => 'type', + 'size' => 'size', + 'date' => 'date', + 'name' => 'name', + 'Initializing' => 'Initializing', + 'UPLOAD' => 'UPLOAD', + 'NEW FILE' => 'NEW FILE', + 'NEW DIR' => 'NEW DIR', + 'DELETE' => 'DELETE', + 'RENAME' => 'RENAME', + 'COPY' => 'COPY', + 'ARCHIVE' => 'ARCHIVE', + 'EXTRACT' => 'EXTRACT', + 'DOWNLOAD' => 'DOWNLOAD', + 'Hit' => 'Hit', + 'to reload the page' => 'to reload the page', + 'Directory name cannot be empty' => 'Directory name cannot be empty', + 'File name cannot be empty' => 'File name cannot be empty', + 'No file selected' => 'No file selected', + 'No file or folder selected' => 'No file or folder selected', + 'File type not supported' => 'File type not supported', + 'Directory download not available in current version' => 'Directory download not available in current version', + 'Directory not available' => 'Directory not available', + 'Done' => 'Done', + 'Close' => 'Close', + 'Copy' => 'Copy', + 'Cancel' => 'Cancel', + 'Rename' => 'Rename', + 'Delete' => 'Delete', + 'Extract' => 'Extract', + 'Create' => 'Create', + 'Compress' => 'Compress', + 'OK' => 'OK', + 'Are you sure you want to copy' => 'Are you sure you want to copy', + 'Are you sure you want to delete' => 'Are you sure you want to delete', + 'into' => 'into', + 'existing files will be replaced' => 'existing files will be replaced', + 'Original name' => 'Original name', + 'File' => 'File', + 'already exists' => 'already exists', + 'Create file' => 'Create file', + 'Create directory' => 'Create directory', + ); \ No newline at end of file diff --git a/web/inc/i18n/it.php b/web/inc/i18n/it.php index 1a8590bcb..f5b8797ad 100644 --- a/web/inc/i18n/it.php +++ b/web/inc/i18n/it.php @@ -501,4 +501,49 @@ $LANG['it'] = array( 'Date' => 'Data', 'Starred' => 'Starred', 'Name' => 'Name', + + 'File Manager' => 'File Manager', + 'type' => 'type', + 'size' => 'size', + 'date' => 'date', + 'name' => 'name', + 'Initializing' => 'Initializing', + 'UPLOAD' => 'UPLOAD', + 'NEW FILE' => 'NEW FILE', + 'NEW DIR' => 'NEW DIR', + 'DELETE' => 'DELETE', + 'RENAME' => 'RENAME', + 'COPY' => 'COPY', + 'ARCHIVE' => 'ARCHIVE', + 'EXTRACT' => 'EXTRACT', + 'DOWNLOAD' => 'DOWNLOAD', + 'Hit' => 'Hit', + 'to reload the page' => 'to reload the page', + 'Directory name cannot be empty' => 'Directory name cannot be empty', + 'File name cannot be empty' => 'File name cannot be empty', + 'No file selected' => 'No file selected', + 'No file or folder selected' => 'No file or folder selected', + 'File type not supported' => 'File type not supported', + 'Directory download not available in current version' => 'Directory download not available in current version', + 'Directory not available' => 'Directory not available', + 'Done' => 'Done', + 'Close' => 'Close', + 'Copy' => 'Copy', + 'Cancel' => 'Cancel', + 'Rename' => 'Rename', + 'Delete' => 'Delete', + 'Extract' => 'Extract', + 'Create' => 'Create', + 'Compress' => 'Compress', + 'OK' => 'OK', + 'Are you sure you want to copy' => 'Are you sure you want to copy', + 'Are you sure you want to delete' => 'Are you sure you want to delete', + 'into' => 'into', + 'existing files will be replaced' => 'existing files will be replaced', + 'Original name' => 'Original name', + 'File' => 'File', + 'already exists' => 'already exists', + 'Create file' => 'Create file', + 'Create directory' => 'Create directory', + ); \ No newline at end of file diff --git a/web/inc/i18n/nl.php b/web/inc/i18n/nl.php index 15f03a0d1..40e3fde6e 100644 --- a/web/inc/i18n/nl.php +++ b/web/inc/i18n/nl.php @@ -501,4 +501,49 @@ $LANG['nl'] = array( 'Date' => 'Date', 'Starred' => 'Starred', 'Name' => 'Name', + + 'File Manager' => 'File Manager', + 'type' => 'type', + 'size' => 'size', + 'date' => 'date', + 'name' => 'name', + 'Initializing' => 'Initializing', + 'UPLOAD' => 'UPLOAD', + 'NEW FILE' => 'NEW FILE', + 'NEW DIR' => 'NEW DIR', + 'DELETE' => 'DELETE', + 'RENAME' => 'RENAME', + 'COPY' => 'COPY', + 'ARCHIVE' => 'ARCHIVE', + 'EXTRACT' => 'EXTRACT', + 'DOWNLOAD' => 'DOWNLOAD', + 'Hit' => 'Hit', + 'to reload the page' => 'to reload the page', + 'Directory name cannot be empty' => 'Directory name cannot be empty', + 'File name cannot be empty' => 'File name cannot be empty', + 'No file selected' => 'No file selected', + 'No file or folder selected' => 'No file or folder selected', + 'File type not supported' => 'File type not supported', + 'Directory download not available in current version' => 'Directory download not available in current version', + 'Directory not available' => 'Directory not available', + 'Done' => 'Done', + 'Close' => 'Close', + 'Copy' => 'Copy', + 'Cancel' => 'Cancel', + 'Rename' => 'Rename', + 'Delete' => 'Delete', + 'Extract' => 'Extract', + 'Create' => 'Create', + 'Compress' => 'Compress', + 'OK' => 'OK', + 'Are you sure you want to copy' => 'Are you sure you want to copy', + 'Are you sure you want to delete' => 'Are you sure you want to delete', + 'into' => 'into', + 'existing files will be replaced' => 'existing files will be replaced', + 'Original name' => 'Original name', + 'File' => 'File', + 'already exists' => 'already exists', + 'Create file' => 'Create file', + 'Create directory' => 'Create directory', + ); \ No newline at end of file diff --git a/web/inc/i18n/no.php b/web/inc/i18n/no.php index f2bb0b8a7..52a2db7b7 100644 --- a/web/inc/i18n/no.php +++ b/web/inc/i18n/no.php @@ -501,4 +501,49 @@ $LANG['no'] = array( 'Date' => 'Date', 'Starred' => 'Starred', 'Name' => 'Name', + + 'File Manager' => 'File Manager', + 'type' => 'type', + 'size' => 'size', + 'date' => 'date', + 'name' => 'name', + 'Initializing' => 'Initializing', + 'UPLOAD' => 'UPLOAD', + 'NEW FILE' => 'NEW FILE', + 'NEW DIR' => 'NEW DIR', + 'DELETE' => 'DELETE', + 'RENAME' => 'RENAME', + 'COPY' => 'COPY', + 'ARCHIVE' => 'ARCHIVE', + 'EXTRACT' => 'EXTRACT', + 'DOWNLOAD' => 'DOWNLOAD', + 'Hit' => 'Hit', + 'to reload the page' => 'to reload the page', + 'Directory name cannot be empty' => 'Directory name cannot be empty', + 'File name cannot be empty' => 'File name cannot be empty', + 'No file selected' => 'No file selected', + 'No file or folder selected' => 'No file or folder selected', + 'File type not supported' => 'File type not supported', + 'Directory download not available in current version' => 'Directory download not available in current version', + 'Directory not available' => 'Directory not available', + 'Done' => 'Done', + 'Close' => 'Close', + 'Copy' => 'Copy', + 'Cancel' => 'Cancel', + 'Rename' => 'Rename', + 'Delete' => 'Delete', + 'Extract' => 'Extract', + 'Create' => 'Create', + 'Compress' => 'Compress', + 'OK' => 'OK', + 'Are you sure you want to copy' => 'Are you sure you want to copy', + 'Are you sure you want to delete' => 'Are you sure you want to delete', + 'into' => 'into', + 'existing files will be replaced' => 'existing files will be replaced', + 'Original name' => 'Original name', + 'File' => 'File', + 'already exists' => 'already exists', + 'Create file' => 'Create file', + 'Create directory' => 'Create directory', + ); \ No newline at end of file diff --git a/web/inc/i18n/pt.php b/web/inc/i18n/pt.php index b038cbd15..0b10004e9 100644 --- a/web/inc/i18n/pt.php +++ b/web/inc/i18n/pt.php @@ -500,4 +500,49 @@ $LANG['pt'] = array( 'Date' => 'Data', 'Starred' => 'Starred', 'Name' => 'Name', + + 'File Manager' => 'File Manager', + 'type' => 'type', + 'size' => 'size', + 'date' => 'date', + 'name' => 'name', + 'Initializing' => 'Initializing', + 'UPLOAD' => 'UPLOAD', + 'NEW FILE' => 'NEW FILE', + 'NEW DIR' => 'NEW DIR', + 'DELETE' => 'DELETE', + 'RENAME' => 'RENAME', + 'COPY' => 'COPY', + 'ARCHIVE' => 'ARCHIVE', + 'EXTRACT' => 'EXTRACT', + 'DOWNLOAD' => 'DOWNLOAD', + 'Hit' => 'Hit', + 'to reload the page' => 'to reload the page', + 'Directory name cannot be empty' => 'Directory name cannot be empty', + 'File name cannot be empty' => 'File name cannot be empty', + 'No file selected' => 'No file selected', + 'No file or folder selected' => 'No file or folder selected', + 'File type not supported' => 'File type not supported', + 'Directory download not available in current version' => 'Directory download not available in current version', + 'Directory not available' => 'Directory not available', + 'Done' => 'Done', + 'Close' => 'Close', + 'Copy' => 'Copy', + 'Cancel' => 'Cancel', + 'Rename' => 'Rename', + 'Delete' => 'Delete', + 'Extract' => 'Extract', + 'Create' => 'Create', + 'Compress' => 'Compress', + 'OK' => 'OK', + 'Are you sure you want to copy' => 'Are you sure you want to copy', + 'Are you sure you want to delete' => 'Are you sure you want to delete', + 'into' => 'into', + 'existing files will be replaced' => 'existing files will be replaced', + 'Original name' => 'Original name', + 'File' => 'File', + 'already exists' => 'already exists', + 'Create file' => 'Create file', + 'Create directory' => 'Create directory', + ); diff --git a/web/inc/i18n/ro.php b/web/inc/i18n/ro.php index 4de396fc5..cdd4f0128 100644 --- a/web/inc/i18n/ro.php +++ b/web/inc/i18n/ro.php @@ -502,4 +502,49 @@ $LANG['ro'] = array( 'Date' => 'Data', 'Starred' => 'Starred', 'Name' => 'Name', + + 'File Manager' => 'File Manager', + 'type' => 'type', + 'size' => 'size', + 'date' => 'date', + 'name' => 'name', + 'Initializing' => 'Initializing', + 'UPLOAD' => 'UPLOAD', + 'NEW FILE' => 'NEW FILE', + 'NEW DIR' => 'NEW DIR', + 'DELETE' => 'DELETE', + 'RENAME' => 'RENAME', + 'COPY' => 'COPY', + 'ARCHIVE' => 'ARCHIVE', + 'EXTRACT' => 'EXTRACT', + 'DOWNLOAD' => 'DOWNLOAD', + 'Hit' => 'Hit', + 'to reload the page' => 'to reload the page', + 'Directory name cannot be empty' => 'Directory name cannot be empty', + 'File name cannot be empty' => 'File name cannot be empty', + 'No file selected' => 'No file selected', + 'No file or folder selected' => 'No file or folder selected', + 'File type not supported' => 'File type not supported', + 'Directory download not available in current version' => 'Directory download not available in current version', + 'Directory not available' => 'Directory not available', + 'Done' => 'Done', + 'Close' => 'Close', + 'Copy' => 'Copy', + 'Cancel' => 'Cancel', + 'Rename' => 'Rename', + 'Delete' => 'Delete', + 'Extract' => 'Extract', + 'Create' => 'Create', + 'Compress' => 'Compress', + 'OK' => 'OK', + 'Are you sure you want to copy' => 'Are you sure you want to copy', + 'Are you sure you want to delete' => 'Are you sure you want to delete', + 'into' => 'into', + 'existing files will be replaced' => 'existing files will be replaced', + 'Original name' => 'Original name', + 'File' => 'File', + 'already exists' => 'already exists', + 'Create file' => 'Create file', + 'Create directory' => 'Create directory', + ); \ No newline at end of file diff --git a/web/inc/i18n/ru.php b/web/inc/i18n/ru.php index 4266d3cfd..760837f2c 100644 --- a/web/inc/i18n/ru.php +++ b/web/inc/i18n/ru.php @@ -502,4 +502,49 @@ $LANG['ru'] = array( 'Date' => 'Дата', 'Starred' => 'Избранные', 'Name' => 'Имя', + + 'File Manager' => 'Файлы', + 'type' => 'тип', + 'size' => 'размер', + 'date' => 'дата', + 'name' => 'имя', + 'Initializing' => 'В процессе', + 'UPLOAD' => 'ЗАГРУЗИТЬ', + 'NEW FILE' => 'ФАЙЛ', + 'NEW DIR' => 'ПАПКА', + 'DELETE' => 'УДАЛИТЬ', + 'RENAME' => 'ПЕРЕИМЕНОВАТЬ', + 'COPY' => 'КОПИЯ', + 'ARCHIVE' => 'АРХИВ', + 'EXTRACT' => 'РАСПАКОВАТЬ', + 'DOWNLOAD' => 'СКАЧАТЬ', + 'Hit' => 'Нажмите', + 'to reload the page' => 'чтобы перегрузить страницу', + 'Directory name cannot be empty' => 'Название директории не может быть пустым', + 'File name cannot be empty' => 'Название файла не может быть пустым', + 'No file selected' => 'Ничего не выбрано', + 'No file or folder selected' => 'Не выбрано ни одного файла или папки', + 'File type not supported' => 'Данный тип файла не поддерживается', + 'Directory download not available in current version' => 'В этой версии панели загрузка папок ещё не поддерживается', + 'Directory not available' => 'Папка недоступна', + 'Done' => 'Готово', + 'Close' => 'Закрыть', + 'Copy' => 'Скопировать', + 'Cancel' => 'Отмена', + 'Rename' => 'Переименовать', + 'Delete' => 'Удалить', + 'Extract' => 'Распаковать', + 'Create' => 'Создать', + 'Compress' => 'Запаковать', + 'OK' => 'OK', + 'Are you sure you want to copy' => 'Вы уверены, что хотите скопировать', + 'Are you sure you want to delete' => 'Вы уверены, что хотите удалить', + 'into' => 'в', + 'existing files will be replaced' => 'существующие файлы будут перезаписаны', + 'Original name' => 'Оригинальное имя', + 'File' => 'Файл', + 'already exists' => 'уже существует', + 'Create file' => 'Создать файл', + 'Create directory' => 'Создать папку', + ); \ No newline at end of file diff --git a/web/inc/i18n/se.php b/web/inc/i18n/se.php index af5461743..be8fae3aa 100644 --- a/web/inc/i18n/se.php +++ b/web/inc/i18n/se.php @@ -498,4 +498,49 @@ $LANG['se'] = array( 'Date' => 'Datum', 'Starred' => 'Starred', 'Name' => 'Name', + + 'File Manager' => 'File Manager', + 'type' => 'type', + 'size' => 'size', + 'date' => 'date', + 'name' => 'name', + 'Initializing' => 'Initializing', + 'UPLOAD' => 'UPLOAD', + 'NEW FILE' => 'NEW FILE', + 'NEW DIR' => 'NEW DIR', + 'DELETE' => 'DELETE', + 'RENAME' => 'RENAME', + 'COPY' => 'COPY', + 'ARCHIVE' => 'ARCHIVE', + 'EXTRACT' => 'EXTRACT', + 'DOWNLOAD' => 'DOWNLOAD', + 'Hit' => 'Hit', + 'to reload the page' => 'to reload the page', + 'Directory name cannot be empty' => 'Directory name cannot be empty', + 'File name cannot be empty' => 'File name cannot be empty', + 'No file selected' => 'No file selected', + 'No file or folder selected' => 'No file or folder selected', + 'File type not supported' => 'File type not supported', + 'Directory download not available in current version' => 'Directory download not available in current version', + 'Directory not available' => 'Directory not available', + 'Done' => 'Done', + 'Close' => 'Close', + 'Copy' => 'Copy', + 'Cancel' => 'Cancel', + 'Rename' => 'Rename', + 'Delete' => 'Delete', + 'Extract' => 'Extract', + 'Create' => 'Create', + 'Compress' => 'Compress', + 'OK' => 'OK', + 'Are you sure you want to copy' => 'Are you sure you want to copy', + 'Are you sure you want to delete' => 'Are you sure you want to delete', + 'into' => 'into', + 'existing files will be replaced' => 'existing files will be replaced', + 'Original name' => 'Original name', + 'File' => 'File', + 'already exists' => 'already exists', + 'Create file' => 'Create file', + 'Create directory' => 'Create directory', + ); \ No newline at end of file diff --git a/web/inc/i18n/tr.php b/web/inc/i18n/tr.php index a95a2bdfb..5d3618803 100644 --- a/web/inc/i18n/tr.php +++ b/web/inc/i18n/tr.php @@ -500,4 +500,49 @@ $LANG['tr'] = array( 'Date' => 'Date', 'Starred' => 'Starred', 'Name' => 'Name', + + 'File Manager' => 'File Manager', + 'type' => 'type', + 'size' => 'size', + 'date' => 'date', + 'name' => 'name', + 'Initializing' => 'Initializing', + 'UPLOAD' => 'UPLOAD', + 'NEW FILE' => 'NEW FILE', + 'NEW DIR' => 'NEW DIR', + 'DELETE' => 'DELETE', + 'RENAME' => 'RENAME', + 'COPY' => 'COPY', + 'ARCHIVE' => 'ARCHIVE', + 'EXTRACT' => 'EXTRACT', + 'DOWNLOAD' => 'DOWNLOAD', + 'Hit' => 'Hit', + 'to reload the page' => 'to reload the page', + 'Directory name cannot be empty' => 'Directory name cannot be empty', + 'File name cannot be empty' => 'File name cannot be empty', + 'No file selected' => 'No file selected', + 'No file or folder selected' => 'No file or folder selected', + 'File type not supported' => 'File type not supported', + 'Directory download not available in current version' => 'Directory download not available in current version', + 'Directory not available' => 'Directory not available', + 'Done' => 'Done', + 'Close' => 'Close', + 'Copy' => 'Copy', + 'Cancel' => 'Cancel', + 'Rename' => 'Rename', + 'Delete' => 'Delete', + 'Extract' => 'Extract', + 'Create' => 'Create', + 'Compress' => 'Compress', + 'OK' => 'OK', + 'Are you sure you want to copy' => 'Are you sure you want to copy', + 'Are you sure you want to delete' => 'Are you sure you want to delete', + 'into' => 'into', + 'existing files will be replaced' => 'existing files will be replaced', + 'Original name' => 'Original name', + 'File' => 'File', + 'already exists' => 'already exists', + 'Create file' => 'Create file', + 'Create directory' => 'Create directory', + ); \ No newline at end of file diff --git a/web/inc/i18n/tw.php b/web/inc/i18n/tw.php index 8cb4d1eed..509ef315d 100644 --- a/web/inc/i18n/tw.php +++ b/web/inc/i18n/tw.php @@ -500,4 +500,49 @@ $LANG['tw'] = array( 'Date' => 'Date', 'Starred' => 'Starred', 'Name' => 'Name', + + 'File Manager' => 'File Manager', + 'type' => 'type', + 'size' => 'size', + 'date' => 'date', + 'name' => 'name', + 'Initializing' => 'Initializing', + 'UPLOAD' => 'UPLOAD', + 'NEW FILE' => 'NEW FILE', + 'NEW DIR' => 'NEW DIR', + 'DELETE' => 'DELETE', + 'RENAME' => 'RENAME', + 'COPY' => 'COPY', + 'ARCHIVE' => 'ARCHIVE', + 'EXTRACT' => 'EXTRACT', + 'DOWNLOAD' => 'DOWNLOAD', + 'Hit' => 'Hit', + 'to reload the page' => 'to reload the page', + 'Directory name cannot be empty' => 'Directory name cannot be empty', + 'File name cannot be empty' => 'File name cannot be empty', + 'No file selected' => 'No file selected', + 'No file or folder selected' => 'No file or folder selected', + 'File type not supported' => 'File type not supported', + 'Directory download not available in current version' => 'Directory download not available in current version', + 'Directory not available' => 'Directory not available', + 'Done' => 'Done', + 'Close' => 'Close', + 'Copy' => 'Copy', + 'Cancel' => 'Cancel', + 'Rename' => 'Rename', + 'Delete' => 'Delete', + 'Extract' => 'Extract', + 'Create' => 'Create', + 'Compress' => 'Compress', + 'OK' => 'OK', + 'Are you sure you want to copy' => 'Are you sure you want to copy', + 'Are you sure you want to delete' => 'Are you sure you want to delete', + 'into' => 'into', + 'existing files will be replaced' => 'existing files will be replaced', + 'Original name' => 'Original name', + 'File' => 'File', + 'already exists' => 'already exists', + 'Create file' => 'Create file', + 'Create directory' => 'Create directory', + ); \ No newline at end of file diff --git a/web/inc/i18n/ua.php b/web/inc/i18n/ua.php index 1c827cc32..e51d0b474 100644 --- a/web/inc/i18n/ua.php +++ b/web/inc/i18n/ua.php @@ -502,4 +502,49 @@ $LANG['ua'] = array( 'Date' => 'Date', 'Starred' => 'Starred', 'Name' => 'Name', + + 'File Manager' => 'File Manager', + 'type' => 'type', + 'size' => 'size', + 'date' => 'date', + 'name' => 'name', + 'Initializing' => 'Initializing', + 'UPLOAD' => 'UPLOAD', + 'NEW FILE' => 'NEW FILE', + 'NEW DIR' => 'NEW DIR', + 'DELETE' => 'DELETE', + 'RENAME' => 'RENAME', + 'COPY' => 'COPY', + 'ARCHIVE' => 'ARCHIVE', + 'EXTRACT' => 'EXTRACT', + 'DOWNLOAD' => 'DOWNLOAD', + 'Hit' => 'Hit', + 'to reload the page' => 'to reload the page', + 'Directory name cannot be empty' => 'Directory name cannot be empty', + 'File name cannot be empty' => 'File name cannot be empty', + 'No file selected' => 'No file selected', + 'No file or folder selected' => 'No file or folder selected', + 'File type not supported' => 'File type not supported', + 'Directory download not available in current version' => 'Directory download not available in current version', + 'Directory not available' => 'Directory not available', + 'Done' => 'Done', + 'Close' => 'Close', + 'Copy' => 'Copy', + 'Cancel' => 'Cancel', + 'Rename' => 'Rename', + 'Delete' => 'Delete', + 'Extract' => 'Extract', + 'Create' => 'Create', + 'Compress' => 'Compress', + 'OK' => 'OK', + 'Are you sure you want to copy' => 'Are you sure you want to copy', + 'Are you sure you want to delete' => 'Are you sure you want to delete', + 'into' => 'into', + 'existing files will be replaced' => 'existing files will be replaced', + 'Original name' => 'Original name', + 'File' => 'File', + 'already exists' => 'already exists', + 'Create file' => 'Create file', + 'Create directory' => 'Create directory', + ); \ No newline at end of file diff --git a/web/js/i18n.js.php b/web/js/i18n.js.php index dc7952341..e9a43aec8 100644 --- a/web/js/i18n.js.php +++ b/web/js/i18n.js.php @@ -44,40 +44,42 @@ if (!function_exists('__')) { } ?> -App.i18n.ARE_YOU_SURE = ''; -App.Constants.UNLIM_TRANSLATED_VALUE = ''; +App.i18n.ARE_YOU_SURE = ''; +App.Constants.UNLIM_TRANSLATED_VALUE = ''; -App.Constants.FM_DIRECTORY_NAME_CANNOT_BE_EMPTY = ''; -App.Constants.FM_FILE_NAME_CANNOT_BE_EMPTY = ''; -App.Constants.FM_NO_FILE_SELECTED = ''; -App.Constants.FM_NO_FILE_OR_DIRECTORY_SELECTED = ''; -App.Constants.FM_FILE_TYPE_NOT_SUPPORTED = ''; -App.Constants.FM_DIRECTORY_DOWNLOAD_NOT_READY = ''; +App.Constants.FM_HIT = ''; +App.Constants.FM_TO_RELOAD_THE_PAGE = '' +App.Constants.FM_DIRECTORY_NAME_CANNOT_BE_EMPTY = ''; +App.Constants.FM_FILE_NAME_CANNOT_BE_EMPTY = ''; +App.Constants.FM_NO_FILE_SELECTED = ''; +App.Constants.FM_NO_FILE_OR_DIRECTORY_SELECTED = ''; +App.Constants.FM_FILE_TYPE_NOT_SUPPORTED = ''; +App.Constants.FM_DIRECTORY_DOWNLOAD_NOT_READY = ''; -App.Constants.FM_DIRECTORY_NOT_AVAILABLE = ''; -App.Constants.FM_DONE = ''; -App.Constants.FM_CLOSE = ''; -App.Constants.FM_COPY = ''; -App.Constants.FM_CANCEL = ''; -App.Constants.FM_RENAME = ''; -App.Constants.FM_DELETE = ''; -App.Constants.FM_EXTRACT = ''; -App.Constants.FM_CREATE = ''; -App.Constants.FM_PACK = ''; -App.Constants.FM_PACK_BUTTON = ''; -App.Constants.FM_OK = ''; -App.Constants.FM_YOU_ARE_COPYING = ''; -App.Constants.FM_YOU_ARE_REMOVING = ''; +App.Constants.FM_DIRECTORY_NOT_AVAILABLE = ''; +App.Constants.FM_DONE = ''; +App.Constants.FM_CLOSE = ''; +App.Constants.FM_COPY = ''; +App.Constants.FM_CANCEL = ''; +App.Constants.FM_RENAME = ''; +App.Constants.FM_DELETE = ''; +App.Constants.FM_EXTRACT = ''; +App.Constants.FM_CREATE = ''; +App.Constants.FM_PACK = ''; +App.Constants.FM_PACK_BUTTON = ''; +App.Constants.FM_OK = ''; +App.Constants.FM_YOU_ARE_COPYING = ''; +App.Constants.FM_YOU_ARE_REMOVING = ''; -App.Constants.FM_CONFIRM_COPY = ''; -App.Constants.FM_CONFIRM_DELETE = ''; -App.Constants.FM_INTO_KEYWORD = ''; -App.Constants.FM_EXISTING_FILES_WILL_BE_REPLACED= ''; -App.Constants.FM_ORIGINAL_NAME = ''; -App.Constants.FM_FILE = ''; -App.Constants.FM_ALREADY_EXISTS = ''; -App.Constants.FM_CREATE_FILE = ''; -App.Constants.FM_CREATE_DIRECTORY = ''; +App.Constants.FM_CONFIRM_COPY = ''; +App.Constants.FM_CONFIRM_DELETE = ''; +App.Constants.FM_INTO_KEYWORD = ''; +App.Constants.FM_EXISTING_FILES_WILL_BE_REPLACED= ''; +App.Constants.FM_ORIGINAL_NAME = ''; +App.Constants.FM_FILE = ''; +App.Constants.FM_ALREADY_EXISTS = ''; +App.Constants.FM_CREATE_FILE = ''; +App.Constants.FM_CREATE_DIRECTORY = ''; diff --git a/web/js/templates.js b/web/js/templates.js index df0ad188e..905fa5692 100644 --- a/web/js/templates.js +++ b/web/js/templates.js @@ -9,14 +9,10 @@ App.Templates.html = { // file manager // -//\ - FM: { reload_in_time: [ - //'
    If you want to reload, hit key "Y" to reload.
    You have ~!:TIME_LEFT~!s. to do this.
    Hurry up!
    ' '
    \ - \ -
    Hit F5 to reload the page
    \ +
    '+App.Constants.FM_HIT+' F5 '+App.Constants.FM_TO_RELOAD_THE_PAGE+'
    \
    ' ], entry_line: ['
  • \ @@ -38,7 +34,7 @@ App.Templates.html = { popup_alert: ['
    \
    ~!:TEXT~!
    \
    \ -

    close

    \ +

    '+App.Constants.FM_CLOSE+'

    \
    \
    '], popup_bulk: ['
    \ diff --git a/web/templates/file_manager/main.php b/web/templates/file_manager/main.php index 20fb1c107..7c1f0f36c 100644 --- a/web/templates/file_manager/main.php +++ b/web/templates/file_manager/main.php @@ -1,7 +1,7 @@ -Filemanager +<?=__('File Manager')?> @@ -17,233 +17,22 @@
    -
    - '.$dir.''; - } ?> */ ?> -
    +
    - -
      - 1){ - echo '
    • - - .. -
      • '; - } - - foreach($listing['dirs'] as $dir){ - echo '
    • - '.$dir['name'].' - '.$dir['atime_human'].' - '.$dir['adate_human'].' -   -   - '.$dir['owner'].'/'.$dir['group'].' - '.$dir['mode']['owner'].''.$dir['mode']['group'].''.$dir['mode']['other'].' -
      • '; - } - - foreach($listing['files'] as $item){ - echo '
    • - '.$item['name'].' - '.$item['atime_human'].' - '.$item['adate_human'].' -   - '.$item['size'].' - '.$item['owner'].'/'.$item['group'].' - '.$item['mode']['owner'].''.$item['mode']['group'].''.$item['mode']['other'].' -
      • '; - }*/ ?> - - -
    +
      -
      -
      - varwwwhtmlsitespublic html */ ?> -
      +
      - - -
        - -
      +
        - - - - - - -
        type
        - +
        From 3bcad0078db9996164e57d2112fe626962e7b5a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Serta=C3=A7=20=C3=87EL=C4=B0K?= Date: Sat, 10 Oct 2015 00:23:33 +0300 Subject: [PATCH 081/264] Update v-update-user-quota # Hard quota set to more than 10% of soft quota. This is more meaningful. --- bin/v-update-user-quota | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bin/v-update-user-quota b/bin/v-update-user-quota index 013ee3869..fcb220182 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 +# Hard quota set to more than 10%. This is more meaningful. quota=$(get_user_value '$DISK_QUOTA') -soft=$((quota * 1000)) -hard=$((soft + 50000)) +soft=$((quota * 1024)) +hard=$((soft * 1.10)) # Searching home mount point mnt=$(df -P /home |awk '{print $6}' |tail -n1) From 83f1b3a426d760b20c25be6eaa16052763e6a1fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Serta=C3=A7=20=C3=87EL=C4=B0K?= Date: Sat, 10 Oct 2015 00:39:53 +0300 Subject: [PATCH 082/264] Update v-update-user-quota --- bin/v-update-user-quota | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/v-update-user-quota b/bin/v-update-user-quota index fcb220182..3dffb1220 100755 --- a/bin/v-update-user-quota +++ b/bin/v-update-user-quota @@ -31,10 +31,10 @@ is_object_valid 'user' 'USER' "$user" #----------------------------------------------------------# # Updating disk quota -# Hard quota set to more than 10%. This is more meaningful. +# Had quota equals package value. Soft quota equals 90% of package value for warnings. quota=$(get_user_value '$DISK_QUOTA') -soft=$((quota * 1024)) -hard=$((soft * 1.10)) +soft=$((quota * 1024 * 0.90)) +hard=$((quota * 1024)) # Searching home mount point mnt=$(df -P /home |awk '{print $6}' |tail -n1) From 5c8e3d34897d3c1ae639f41287eb024af1b6ce91 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Mon, 12 Oct 2015 17:43:15 +0300 Subject: [PATCH 083/264] flush vars before list them --- bin/v-list-user-backup-exclusions | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/bin/v-list-user-backup-exclusions b/bin/v-list-user-backup-exclusions index cef78a033..87346aaad 100755 --- a/bin/v-list-user-backup-exclusions +++ b/bin/v-list-user-backup-exclusions @@ -74,6 +74,14 @@ is_object_valid 'user' 'USER' "$user" # Action # #----------------------------------------------------------# +# Flush variables +WEB='' +DNS='' +MAIL='' +DB='' +CRON='' +USER='' + # Defining fileds to select touch $USER_DATA/backup-excludes.conf fields="\$WEB \$DNS \$MAIL \$DB \$CRON \$USER" From 7565e8217f407ef74473512cec823f856185b1b9 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Mon, 12 Oct 2015 17:45:31 +0300 Subject: [PATCH 084/264] FileManager stuff --- web/css/file_manager.css | 99 ++++++++++++++ web/css/styles.min.css | 28 +++- web/edit/file/index.php | 10 +- web/images/sprite.png | Bin 47938 -> 48478 bytes web/inc/i18n/en.php | 50 +++++++ web/js/file_manager.js | 194 ++++++++++++++++++++++++---- web/js/i18n.js.php | 3 + web/js/templates.js | 33 ++++- web/templates/admin/panel.html | 4 + web/templates/file_manager/main.php | 43 ++++++ web/templates/footer.html | 56 +++++--- web/templates/user/panel.html | 4 + web/upload/UploadHandler.php | 50 ++++++- 13 files changed, 514 insertions(+), 60 deletions(-) diff --git a/web/css/file_manager.css b/web/css/file_manager.css index 3a43db98a..b90f1ef12 100644 --- a/web/css/file_manager.css +++ b/web/css/file_manager.css @@ -625,3 +625,102 @@ input[type="checkbox"] { .subcontext-menu li { /*float: left;*/ } + + +.shortcuts { + background: rgba(50, 50, 50, 0.9); + display: inline-block; + position: fixed; + right: 20%; + bottom: 0; + color: #eee; + width: 810px; + border: 1px solid #333; + font-family: arial; + font-size: 13px; +} +.shortcuts .header { + border-bottom: 1px solid #333; + height: 43px; +} +.shortcuts .title { + text-transform: uppercase; + color: #ffcc00; + padding: 7px 0 7px 14px; + display: inline-block; + float: left; + font-size: 11px; + letter-spacing: 3px; + font-weight: bold; + line-height: 30px; +} +.shortcuts .close { + background: url("/images/sprite.png") repeat scroll -408px -469px; + cursor: pointer; + display: inline-block; + float: right; + height: 32px; + padding-top: 11px; + width: 46px; +} +.shortcuts .close:hover { + background-color: #000; +.. +} +.shortcuts .close:active { + background-color: #55c9c0; +} +.shortcuts ul { + list-style-type: none; + padding: 30px 10px; + display: inline-block; + float: left; +} +.shortcuts ul li { + padding: 5px 20px; +} +.shortcuts ul li.step-top { + padding-top: 30px; +} +.shortcuts ul li span { + color: #48F4EF; + display: inline-block; + font-weight: bold; + padding: 0 20px 0 0; + text-align: right; + width: 140px; +} +.shortcuts ul li span.bigger { + font-size: 18px; +} +.shortcuts ul.note { + font-style: italic; + color: #9CA484; + width: 700px; + padding-left: 50px; +} +.shortcuts ul.note a { + color: #9CA484; +} + +.to-shortcuts { + display: inline-block; + position: fixed; + top: 95%; + right: 1%; +} +.l-icon-shortcuts { + display: inline-block; + vertical-align: middle; + background-image: url("/images/sprite.png"); + width: 35px; + height: 35px; + background-position: -283px -68px; + border-radius: 18px; +} +.l-icon-shortcuts:hover { + background-color: #ccc; +} +.l-icon-shortcuts:active { + background-color: #98D5CD; +} diff --git a/web/css/styles.min.css b/web/css/styles.min.css index df532d8c2..db876b977 100644 --- a/web/css/styles.min.css +++ b/web/css/styles.min.css @@ -1867,7 +1867,7 @@ div.l-content > div.l-separator:nth-of-type(4) { } -.l-icon-up-arrow, .l-icon-down-arrow, .l-icon-star, .l-icon-to-top, .l-icon-star-orange, .l-icon-star-blue { +.l-icon-up-arrow, .l-icon-down-arrow, .l-icon-star, .l-icon-to-top, .l-icon-shortcuts, .l-icon-star-orange, .l-icon-star-blue { display: inline-block; vertical-align: middle; background-image: url("/images/sprite.png"); @@ -1928,6 +1928,19 @@ div.l-content > div.l-separator:nth-of-type(4) { background-position: -402px -68px; } +.l-icon-shortcuts { + width: 35px; + height: 35px; + background-position: -283px -68px; + border-radius: 18px; +} +.l-icon-shortcuts:hover { + background-color: #ccc; +} +.l-icon-shortcuts:active { + background-color: #98D5CD; +} + .l-icon-star-orange { width: 13px; height: 13px; @@ -1974,9 +1987,17 @@ div.l-content > div.l-separator:nth-of-type(4) { display: inline-block; position: fixed; top: 92%; - right: 3%; + right: 4%; } +.to-shortcuts { + display: inline-block; + position: fixed; + top: 92%; + right: 1%; +} + + /* #vstobjects { margin-top: -1px; @@ -2737,6 +2758,7 @@ form#vstobjects.suspended { color: #eee; width: 800px; border: 1px solid #333; + font-size: 13px; } .shortcuts .header { border-bottom: 1px solid #333; @@ -2777,7 +2799,7 @@ form#vstobjects.suspended { padding: 5px 20px; } .shortcuts ul li.step-top { - padding-bottom: 30px; + padding-top: 30px; } .shortcuts ul li span { color: #48F4EF; diff --git a/web/edit/file/index.php b/web/edit/file/index.php index 7620d3db0..a09563ae0 100644 --- a/web/edit/file/index.php +++ b/web/edit/file/index.php @@ -57,20 +57,24 @@ if ((!isset($_SESSION['user'])) && (!defined('NO_AUTH_REQUIRED'))) { if ($fn) { $f = fopen ($fn, 'w+'); fwrite($f, $_POST['contents']); + fclose($f); + + chmod($fn, 0644); + if ($f) { //copy($fn, $path); exec (VESTA_CMD . "v-copy-fs-file {$user} {$fn} {$path}", $output, $return_var); $error = check_return_code($return_var, $output); if ($return_var != 0) { - var_dump(VESTA_CMD . "v-copy-fs-file {$user} {$fn} {$path}"); + /*var_dump(VESTA_CMD . "v-copy-fs-file {$user} {$fn} {$path}"); var_dump($path); - var_dump($output); + var_dump($output);*/ die('

        Error while saving file

        ');//echo '0'; } } unlink($fn); - } + } } // $content = file_get_contents($path); diff --git a/web/images/sprite.png b/web/images/sprite.png index cb9be74ea51fba53097f9fddc7f5bc3f4dd2542b..f3df683ad5425f7f735fbbdd14678cfc0e5d666b 100644 GIT binary patch literal 48478 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

        *%$I49fkVp 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 literal 47938 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 diff --git a/web/inc/i18n/en.php b/web/inc/i18n/en.php index 3b9b469a7..224921533 100644 --- a/web/inc/i18n/en.php +++ b/web/inc/i18n/en.php @@ -546,4 +546,54 @@ $LANG['en'] = array( 'Create file' => 'Create file', 'Create directory' => 'Create directory', + + 'Add New object' => 'Add New object', + 'Save Form' => 'Save Form', + 'Cancel saving form' => 'Cancel saving form', + 'Go to USER list' => 'Go to USER list', + 'Go to WEB list' => 'Go to WEB list', + 'Go to DNS list' => 'Go to DNS list', + 'Go to MAIL list' => 'Go to MAIL list', + 'Go to DB list' => 'Go to DB list', + 'Go to CRON list' => 'Go to CRON list', + 'Go to BACKUP list' => 'Go to BACKUP list', + 'Focus on search' => 'Focus on search', + 'Display/Close shortcuts' => 'Display/Close shortcuts', + 'Go to Packages' => 'Go to Packages', + 'Go to IP' => 'Go to IP', + 'Go to Graphs' => 'Go to Graphs', + 'Go to Statistic' => 'Go to Statistic', + 'Go to Log' => 'Go to Log', + 'Go to Updates' => 'Go to Updates', + 'Go to Firewall' => 'Go to Firewall', + 'Go to File Manager' => 'Go to File Manager', + 'Go to Server' => 'Go to Server', + + + 'Upload' => 'Upload', + 'New File' => 'New File', + 'New Folder' => 'New Folder', + 'Download' => 'Download', + 'Rename' => 'Rename', + 'Copy' => 'Copy', + 'Archive' => 'Archive', + 'Delete' => 'Delete', + 'Save File (in text editor)' => 'Save File (in text editor)', + 'Display Shortcuts Hel' => 'Display Shortcuts Hel', + 'Close Popup / Cancel' => 'Close Popup / Cancel', + 'Move Cursor Up' => 'Move Cursor Up', + 'Move Cursor Dow' => 'Move Cursor Dow', + 'Switch to Left Tab' => 'Switch to Left Tab', + 'Switch to Right Tab' => 'Switch to Right Tab', + 'Switch Tab' => 'Switch Tab', + 'Go to the Top of File List' => 'Go to the Top of File List', + 'Go to the Last File' => 'Go to the Last File', + 'Open File/Enter Directory' => 'Open File/Enter Directory', + 'Go to Parent Directory' => 'Go to Parent Directory', + 'Select Current File' => 'Select Current File', + 'Select Bunch of Files' => 'Select Bunch of Files', + 'Append File to the Current Selection' => 'Append File to the Current Selection', + 'Select All Files' => 'Select All Files', + 'shortcuts are inspired by magnificent GNU Midnight Commander file manager' => 'shortcuts are inspired by magnificent GNU Midnight Commander file manager', + ); \ No newline at end of file diff --git a/web/js/file_manager.js b/web/js/file_manager.js index f7093c427..b79fbdd34 100644 --- a/web/js/file_manager.js +++ b/web/js/file_manager.js @@ -546,7 +546,7 @@ FM.downloadFileFromSubcontext = function(elm) { FM.openFile = function(dir, box, elm) { var tab = FM.getTabLetter(box); - FM['TAB_'+tab+'_CURRENT_PATH'] = dir; + //FM['TAB_'+tab+'_CURRENT_PATH'] = dir; var elm = $(elm).hasClass('dir') ? $(elm) : $(elm).closest('.dir'); var src = $.parseJSON($(elm).find('.source').val()); @@ -754,11 +754,11 @@ FM.checkBulkStatus = function(bulkStatuses, acc) { if (status == true) { $('#popup .results').html(App.Constants.FM_DONE); - $('.controls p').replaceWith('

        close

        '); + $('.controls').html('

        '+App.Constants.FM_DONE+'

        '); } else { $('#popup .results').html(msg); - $('.controls p').replaceWith('

        close

        '); + $('.controls').html('

        '+App.Constants.FM_DONE+'

        '); } } @@ -795,49 +795,47 @@ FM.humanFileSizeUnit = function(size) { } -FM.bulkCopy = function() { +FM.bulkCopyDo = function() { var acc = $(FM.CURRENT_TAB).find('.dir.selected'); if (acc.length > 0) { //FM.popupClose(); - + var cfr_html = ''; - + var numberOfItems = 0; $.each(acc, function(i, o) { var ref = $(o); var src = $(ref).find('.source').val(); src = $.parseJSON(src); - + if (!FM.isItemPseudo(o)) { cfr_html += '
        '+src.name+'
        '; + numberOfItems++; } }); - var tpl = Tpl.get('popup_bulk', 'FM'); - tpl.set(':ACTION', App.Constants.FM_YOU_ARE_COPYING); - tpl.set(':TEXT', cfr_html); - - FM.popupOpen(tpl.finalize()); - + var bulkStatuses = []; $.each(acc, function(i, o) { var ref = $(o); var src = $(ref).find('.source').val(); src = $.parseJSON(src); - /*if (!FM.isItemPseudo(o)) { - cfr_html += '
        '+src.name+'
        '; - }*/ - var tab = FM.getTabLetter(FM.CURRENT_TAB); + if (FM.isItemPseudo(src)) { + //cfr_html += '
        '+src.name+'
        '; + return; + } + var tab = FM.getTabLetter(FM.CURRENT_TAB); var opposite_tab = 'A'; if (tab == 'A') { opposite_tab = 'B'; } if (FM.isItemPseudo(src)) { - return FM.displayError( + /*return FM.displayError( App.Constants.FM_NO_FILE_OR_DIRECTORY_SELECTED - ); + );*/ + return; } var dest = FM['TAB_' + opposite_tab + '_CURRENT_PATH' ]; @@ -863,6 +861,106 @@ FM.bulkCopy = function() { bulkStatuses.push(reply.message); } + FM.checkBulkStatus(bulkStatuses, acc); + }); + }); + } +} + +FM.bulkCopy = function() { + var acc = $(FM.CURRENT_TAB).find('.dir.selected'); + if (acc.length > 0) { + FM.popupClose(); + + var cfr_html = ''; + var numberOfItems = 0; + $.each(acc, function(i, o) { + var ref = $(o); + var src = $(ref).find('.source').val(); + src = $.parseJSON(src); + + if (!FM.isItemPseudo(o)) { + cfr_html += '
        '+src.name+'
        '; + numberOfItems++; + } + }); + + var tab = FM.getTabLetter(FM.CURRENT_TAB); + var opposite_tab = 'A'; + if (tab == 'A') { + opposite_tab = 'B'; + } + var dest = FM['TAB_' + opposite_tab + '_CURRENT_PATH' ]; + if (dest == '') { + dest = GLOBAL.ROOT_DIR; + } + + var tpl = Tpl.get('popup_bulk_copy', 'FM'); + tpl.set(':NUMBER_OF_ITEMS', numberOfItems); + tpl.set(':DST_FILENAME', dest); + //popup_bulk_copy + + FM.popupOpen(tpl.finalize()); + + } +} + +FM.bulkRemoveDo = function() { + var acc = $(FM.CURRENT_TAB).find('.dir.selected'); + if (acc.length > 0) { + //FM.popupClose(); + + var cfr_html = ''; + + $.each(acc, function(i, o) { + var ref = $(o); + var src = $(ref).find('.source').val(); + src = $.parseJSON(src); + + if (!FM.isItemPseudo(o)) { + cfr_html += '
        '+src.name+'
        '; + } + }); + + var bulkStatuses = []; + $.each(acc, function(i, o) { + var ref = $(o); + var src = $(ref).find('.source').val(); + src = $.parseJSON(src); + + var tab = FM.getTabLetter(FM.CURRENT_TAB); + + var opposite_tab = 'A'; + if (tab == 'A') { + opposite_tab = 'B'; + } + + if (FM.isItemPseudo(src)) { + return; + /*return FM.displayError( + App.Constants.FM_NO_FILE_OR_DIRECTORY_SELECTED + );*/ + } + + var dest = FM['TAB_' + opposite_tab + '_CURRENT_PATH' ]; + if (dest == '') { + dest = GLOBAL.ROOT_DIR; + } + + var params = { + item: src.full_path, + dir: FM['TAB_' + tab + '_CURRENT_PATH'] + }; + + App.Ajax.request('delete_files', params, function(reply) { + if (reply.result == true) { + bulkStatuses.push(true); + } + else { + //FM.showError('copy-items', reply.message); + bulkStatuses.push(reply.message); + } + FM.checkBulkStatus(bulkStatuses, acc); }); }); @@ -871,6 +969,33 @@ FM.bulkCopy = function() { } FM.bulkRemove = function() { + var acc = $(FM.CURRENT_TAB).find('.dir.selected'); + if (acc.length > 0) { + FM.popupClose(); + + var cfr_html = ''; + var numberOfItems = 0; + $.each(acc, function(i, o) { + var ref = $(o); + var src = $(ref).find('.source').val(); + src = $.parseJSON(src); + + if (!FM.isItemPseudo(o)) { + cfr_html += '
        '+src.name+'
        '; + numberOfItems++; + } + }); + + var tpl = Tpl.get('popup_bulk_remove', 'FM'); + tpl.set(':NUMBER_OF_ITEMS', numberOfItems); + //tpl.set(':DST_FILENAME', dest); + + FM.popupOpen(tpl.finalize()); + } +} + + +FM.bulkRemove11111 = function() { var acc = $(FM.CURRENT_TAB).find('.dir.selected'); if (acc.length > 0) { //FM.popupClose(); @@ -907,9 +1032,10 @@ FM.bulkRemove = function() { } if (FM.isItemPseudo(src)) { - return FM.displayError( + return; + /*return FM.displayError( App.Constants.FM_NO_FILE_OR_DIRECTORY_SELECTED - ); + );*/ } var dest = FM['TAB_' + opposite_tab + '_CURRENT_PATH' ]; @@ -1810,6 +1936,7 @@ $(document).ready(function() { shortcut.add("Esc",function() { FM.Env.RELOAD_IN_TIME = false; $('#reload-in-time').remove(); + $('.shortcuts').hide(); if (FM.isPopupOpened()) { return FM.handlePopupCancel(); } @@ -1820,6 +1947,15 @@ $(document).ready(function() { 'target': document }); + shortcut.add("h", function(){ + $('.shortcuts').toggle(); + }, { + 'type': 'keydown', + 'propagate': false, + 'disable_in_input': true, + 'target': document + }); + shortcut.add("Down",function() { FM.goDown(); },{ @@ -2014,6 +2150,7 @@ $(document).ready(function() { 'disable_in_input': false, 'target': document }); + shortcut.add("a",function() { FM.packItem(); },{ @@ -2023,8 +2160,6 @@ $(document).ready(function() { 'target': document }); - - shortcut.add("d",function() { FM.downloadFiles(); },{ @@ -2098,15 +2233,22 @@ $(document).ready(function() { $('.context-menu.sort-order').on('click', 'span', function(evt){ FM.reOrderList($(evt.target)); }); - + $('.warning-box .close').on('click', function(evt){ $(evt.target).closest('.warning-box').hide(); }); $('.menu-A .extract-btn').hide(); $('.menu-B .extract-btn').hide(); - - + + + $('.to-shortcuts').click(function(){ + $('.shortcuts').toggle(); + }); + + $('.shortcuts .close').click(function(){ + $('.shortcuts').hide(); + }); }); diff --git a/web/js/i18n.js.php b/web/js/i18n.js.php index e9a43aec8..d3f2a7e0f 100644 --- a/web/js/i18n.js.php +++ b/web/js/i18n.js.php @@ -63,6 +63,7 @@ App.Constants.FM_COPY = ''; App.Constants.FM_CANCEL = ''; App.Constants.FM_RENAME = ''; App.Constants.FM_DELETE = ''; +App.Constants.FM_CONFIRM_DELETE_BULK = ''; App.Constants.FM_EXTRACT = ''; App.Constants.FM_CREATE = ''; App.Constants.FM_PACK = ''; @@ -71,6 +72,8 @@ App.Constants.FM_OK = ''; App.Constants.FM_YOU_ARE_COPYING = ''; App.Constants.FM_YOU_ARE_REMOVING = ''; +App.Constants.FM_COPY_BULK = ''; + App.Constants.FM_CONFIRM_COPY = ''; App.Constants.FM_CONFIRM_DELETE = ''; App.Constants.FM_INTO_KEYWORD = ''; diff --git a/web/js/templates.js b/web/js/templates.js index 905fa5692..dc6e64ea5 100644 --- a/web/js/templates.js +++ b/web/js/templates.js @@ -10,11 +10,11 @@ App.Templates.html = { // FM: { - reload_in_time: [ - '
        \ -
        '+App.Constants.FM_HIT+' F5 '+App.Constants.FM_TO_RELOAD_THE_PAGE+'
        \ -
        ' - ], + reload_in_time: [ + '
        \ +
        '+App.Constants.FM_HIT+' F5 '+App.Constants.FM_TO_RELOAD_THE_PAGE+'
        \ +
        ' + ], entry_line: ['
      • \ \ \ @@ -37,14 +37,33 @@ App.Templates.html = {

        '+App.Constants.FM_CLOSE+'

        \ \ '], - popup_bulk: ['
        \ + popup_bulk_remove: ['
        \ +
        '+App.Constants.FM_CONFIRM_DELETE_BULK+' (~!:NUMBER_OF_ITEMS~!)?
        \ +
        \ +

        '+App.Constants.FM_CANCEL+'

        \ +

        '+App.Constants.FM_DELETE+'

        \ +
        \ +
        '], + popup_bulk_copy: ['
        \ +
        '+App.Constants.FM_COPY_BULK+' (~!:NUMBER_OF_ITEMS~!) '+ App.Constants.FM_INTO_KEYWORD +':
        \ +
        \ + \ +
        \ +
        \ +
        '+App.Constants.FM_EXISTING_FILES_WILL_BE_REPLACED+'
        \ +
        \ +

        '+App.Constants.FM_CANCEL+'

        \ +

        '+App.Constants.FM_COPY+'

        \ +
        \ +
        '], + /*popup_bulk: ['
        \
        ~!:ACTION~!:
        ~!:TEXT~!
        \
        \
        \ \

        \
        \ -
        '], +
        '],*/ popup_delete: ['
        \
        '+App.Constants.FM_CONFIRM_DELETE+' "~!:FILENAME~!"?
        \
        \ diff --git a/web/templates/admin/panel.html b/web/templates/admin/panel.html index f883dd13d..ed55ed263 100644 --- a/web/templates/admin/panel.html +++ b/web/templates/admin/panel.html @@ -1,6 +1,10 @@ + + + +
        diff --git a/web/templates/file_manager/main.php b/web/templates/file_manager/main.php index 7c1f0f36c..4dea8af78 100644 --- a/web/templates/file_manager/main.php +++ b/web/templates/file_manager/main.php @@ -14,6 +14,10 @@ + + + +
        @@ -72,6 +76,43 @@
        + + + @@ -346,6 +387,8 @@ FM['CURRENT_B_LINE'] = 0; } } + + }); /*$(".listing-right").selectable({ selected: function (event, ui) { diff --git a/web/templates/footer.html b/web/templates/footer.html index 3f7079c34..cf322525f 100644 --- a/web/templates/footer.html +++ b/web/templates/footer.html @@ -460,11 +460,26 @@ } ); + shortcut.add("Esc", function(){ + $('.shortcuts').hide(); + }, { + 'type': 'keydown', + 'propagate': false, + 'disable_in_input': true, + 'target': document + } + ); + $('.shortcuts .close').click(function(){ $('.shortcuts').hide(); }); + $('.to-shortcuts').click(function(){ + $('.shortcuts').toggle(); + }); + + VE.core.register(); if (location.href.search(/list/) != -1) { var shift_select_ref = $('body').finderSelect({ @@ -511,30 +526,31 @@
          -
        • nAdd New object
          • -
        • <Ctrl> + EnterSave Form
          • -
        • <Ctrl> + BackspaceCancel saving form
          • +
        • n
          • +
        • <Ctrl> + Enter
          • +
        • <Ctrl> + Backspace
          • -
        • 1Go to USER list
          • -
        • 2Go to WEB list
          • -
        • 3Go to DNS list
          • -
        • 4Go to MAIL list
          • -
        • 5Go to DB list
          • -
        • 6Go to CRON list
          • -
        • 7Go to BACKUP list
          • +
        • 1
          • +
        • 2
          • +
        • 3
          • +
        • 4
          • +
        • 5
          • +
        • 6
          • +
        • 7
          -
        • fFocus on search
          • -
        • hDisplay/Close shortcuts
          • +
        • f
          • +
        • h
          • -
        • <Ctrl> + 1Go to Packages
          • -
        • <Ctrl> + 2Go to IP
          • -
        • <Ctrl> + 3Go to Graphs
          • -
        • <Ctrl> + 4Go to Statistics
          • -
        • <Ctrl> + 5Go to Log
          • -
        • <Ctrl> + 6Go to Updates
          • -
        • <Ctrl> + 7Go to Firewall
          • -
        • <Ctrl> + 8Go to Server
          • +
        • <Ctrl> + 1
          • +
        • <Ctrl> + 2
          • +
        • <Ctrl> + 3
          • +
        • <Ctrl> + 4
          • +
        • <Ctrl> + 5
          • +
        • <Ctrl> + 6
          • +
        • <Ctrl> + 7
          • +
        • <Ctrl> + 8
          • +
        • <Ctrl> + 9
        diff --git a/web/templates/user/panel.html b/web/templates/user/panel.html index 345101ab6..c39c3143c 100644 --- a/web/templates/user/panel.html +++ b/web/templates/user/panel.html @@ -1,6 +1,9 @@ + + +
        @@ -8,6 +11,7 @@
        +
        diff --git a/web/upload/UploadHandler.php b/web/upload/UploadHandler.php index 1f170eca2..19078b53d 100755 --- a/web/upload/UploadHandler.php +++ b/web/upload/UploadHandler.php @@ -1,4 +1,36 @@ 0 ) { + header("Location: /error/"); + exit; + } + $panel = json_decode(implode('', $output), true); +} +$user = array_keys($panel); +$user = $user[0]; + +define('USERNAME', $user); + + +/* +// Check user session +if ((!isset($_SESSION['user'])) && (!defined('NO_AUTH_REQUIRED'))) { + $_SESSION['request_uri'] = $_SERVER['REQUEST_URI']; + header("Location: /login/"); + exit; +} +*/ + + /* * jQuery File Upload Plugin PHP Class 8.1.0 * https://github.com/blueimp/jQuery-File-Upload @@ -1042,6 +1074,8 @@ class UploadHandler protected function handle_file_upload($uploaded_file, $name, $size, $type, $error, $index = null, $content_range = null) { + + $file = new \stdClass(); $file->name = $this->get_file_name($uploaded_file, $name, $size, $type, $error, $index, $content_range); @@ -1065,7 +1099,21 @@ class UploadHandler FILE_APPEND ); } else { - move_uploaded_file($uploaded_file, $file_path); + chmod($uploaded_file, 0644); + //move_uploaded_file($uploaded_file, $file_path); + exec (VESTA_CMD . "v-copy-fs-file ". USERNAME ." {$uploaded_file} {$file_path}", $output, $return_var); + + $error = check_return_code($return_var, $output); + if ($return_var != 0) { + //var_dump(VESTA_CMD . "v-copy-fs-file {$user} {$fn} {$path}"); + //var_dump($path); + //var_dump($output); + $file->error = 'Error while saving file'; + /*var_dump(VESTA_CMD . "v-copy-fs-file ". USERNAME ." {$uploaded_file} {$file_path}"); + var_dump($return_var); + var_dump($output); + die();*/ + } } } else { // Non-multipart uploads (PUT method support) From a379e01e5a08156d66366483b29e0f37e93605ad Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Tue, 13 Oct 2015 14:24:23 +0300 Subject: [PATCH 085/264] FM style update --- web/css/styles.min.css | 8 ++++++++ web/templates/footer.html | 8 +++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/web/css/styles.min.css b/web/css/styles.min.css index db876b977..85834f5ea 100644 --- a/web/css/styles.min.css +++ b/web/css/styles.min.css @@ -808,6 +808,14 @@ input[type="checkbox"] { border-bottom: 3px solid #ff6e42; } +.l-stat__col.focus { + background-color: #ddd; +} +.l-stat__col.focus a { + border-bottom: 3px solid #AACC0D; +} + + .l-stat__col a:hover .l-stat__col-title { color: #ff6701; } diff --git a/web/templates/footer.html b/web/templates/footer.html index cf322525f..97a900854 100644 --- a/web/templates/footer.html +++ b/web/templates/footer.html @@ -151,14 +151,16 @@ } ); - shortcut.add("Ctrl+Backspace", function(){ - if($('form#vstobjects button.cancel')[0]){ +// shortcut.add("Ctrl+Backspace", function(){ + shortcut.add("Backspace", function(){ + console.log("read"); + if($('form#vstobjects .button.cancel')[0]){ location.href=$('form#vstobjects input.cancel').attr('onclick').replace("location.href='", "").replace("'",""); } }, { 'type': 'keydown', 'propagate': false, - 'disable_in_input': false, + 'disable_in_input': true, 'target': document } ); From 264b851d1ac7bd3c89e30f695de2dc88a648de3d Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Thu, 15 Oct 2015 15:03:23 +0300 Subject: [PATCH 086/264] DNS Cluster Serial fix --- bin/v-add-dns-domain | 5 +-- bin/v-add-dns-record | 1 + bin/v-add-remote-dns-domain | 2 +- bin/v-add-remote-dns-record | 5 ++- bin/v-change-dns-domain-ip | 3 +- bin/v-change-dns-domain-soa | 1 + bin/v-change-dns-domain-tpl | 1 + bin/v-change-dns-domain-ttl | 1 + bin/v-change-dns-record | 1 + bin/v-change-dns-record-id | 1 + bin/v-change-remote-dns-domain-soa | 2 +- bin/v-change-remote-dns-domain-ttl | 2 +- bin/v-delete-dns-record | 1 + bin/v-insert-dns-domain | 2 +- bin/v-list-dns-domain | 3 +- bin/v-list-dns-domains | 3 +- bin/v-rebuild-dns-domain | 14 ++++++--- bin/v-rebuild-dns-domains | 8 +++-- bin/v-suspend-dns-record | 1 + bin/v-unsuspend-dns-record | 1 + func/domain.sh | 50 +++++++++++++++++------------- web/templates/admin/list_dns.html | 11 +++++-- 22 files changed, 79 insertions(+), 40 deletions(-) diff --git a/bin/v-add-dns-domain b/bin/v-add-dns-domain index 41038d616..5f18daa18 100755 --- a/bin/v-add-dns-domain +++ b/bin/v-add-dns-domain @@ -81,6 +81,7 @@ if [ -z $ns2 ]; then fi soa="$ns1" exp=$(date +%F -d "+ 1 year") +serial=$(date +'%Y%m%d01') ttl=14400 # Reading template @@ -111,8 +112,8 @@ records="$(wc -l $USER_DATA/dns/$domain.conf |cut -f 1 -d ' ')" # Adding dns.conf record dns_rec="DOMAIN='$domain' IP='$ip' TPL='$template' TTL='$ttl' EXP='$exp'" -dns_rec="$dns_rec SOA='$soa' RECORDS='$records' SUSPENDED='no' TIME='$TIME'" -dns_rec="$dns_rec DATE='$DATE'" +dns_rec="$dns_rec SOA='$soa' SERIAL='$serial' SRC='' RECORDS='$records'" +dns_rec="$dns_rec SUSPENDED='no' TIME='$TIME' DATE='$DATE'" echo "$dns_rec" >> $USER_DATA/dns.conf chmod 660 $USER_DATA/dns.conf diff --git a/bin/v-add-dns-record b/bin/v-add-dns-record index f145007da..928b5c48d 100755 --- a/bin/v-add-dns-record +++ b/bin/v-add-dns-record @@ -82,6 +82,7 @@ sort_dns_records # Updating zone if [[ "$DNS_SYSTEM" =~ named|bind ]]; then + update_domain_serial update_domain_zone fi diff --git a/bin/v-add-remote-dns-domain b/bin/v-add-remote-dns-domain index 1b5609b40..e6a340484 100755 --- a/bin/v-add-remote-dns-domain +++ b/bin/v-add-remote-dns-domain @@ -111,7 +111,7 @@ for cluster_str in $search_str; do fi # Rebuild dns zone - $send_cmd v-rebuild-dns-domain $DNS_USER $domain 'scheduled' + $send_cmd v-rebuild-dns-domain $DNS_USER $domain 'scheduled' 'no' if [ $? -ne 0 ]; then echo "Error: $TYPE connection to $HOST failed" log_event "$E_CONNECT $EVENT" diff --git a/bin/v-add-remote-dns-record b/bin/v-add-remote-dns-record index ca9aaa0e9..ecd816810 100755 --- a/bin/v-add-remote-dns-record +++ b/bin/v-add-remote-dns-record @@ -80,13 +80,16 @@ for cluster_str in $(grep "SUSPENDED='no'" $VESTA/conf/dns-cluster.conf); do DNS_CLUSTER_IGNORE='dns-cluster' fi + # Sync SOA + $send_cmd v-insert-dns-domain $DNS_USER "$str" $HOSTNAME 'domain' 'no' + # Sync record str=$(grep "ID='$id'" $USER_DATA/dns/$domain.conf) str=$(echo "$str" | sed 's/"/\\"/g') $send_cmd v-insert-dns-record $DNS_USER $domain "$str" 'no' if [ $? -eq 0 ]; then # Rebuild dns zone - $send_cmd v-rebuild-dns-domain $DNS_USER $domain 'scheduled' + $send_cmd v-rebuild-dns-domain $DNS_USER $domain 'scheduled' 'no' if [ $? -ne 0 ]; then echo "Error: $TYPE connection to $HOST failed (rebuild)" log_event "$E_CONNECT $EVENT" diff --git a/bin/v-change-dns-domain-ip b/bin/v-change-dns-domain-ip index f587a4746..e2c9c24c7 100755 --- a/bin/v-change-dns-domain-ip +++ b/bin/v-change-dns-domain-ip @@ -51,6 +51,7 @@ sed -i "s/$old/$ip/g" $USER_DATA/dns/$domain.conf # Updating zone if [[ "$DNS_SYSTEM" =~ named|bind ]]; then + update_domain_serial update_domain_zone fi @@ -59,7 +60,7 @@ if [ ! -z "$DNS_CLUSTER" ]; then # Check for first sync dlock=$(grep "domain $user $domain" $VESTA/data/queue/dns-cluster.pipe) if [ -z "$dlock" ]; then - cmd="$BIN/v-add-remote-dns-domain $user $domain domain" + cmd="$BIN/v-add-remote-dns-domain $user $domain domain yes" echo "$cmd" >> $VESTA/data/queue/dns-cluster.pipe fi fi diff --git a/bin/v-change-dns-domain-soa b/bin/v-change-dns-domain-soa index 0e454e681..9a819f205 100755 --- a/bin/v-change-dns-domain-soa +++ b/bin/v-change-dns-domain-soa @@ -45,6 +45,7 @@ update_object_value 'dns' 'DOMAIN' "$domain" '$SOA' "$soa" # Updating zone if [[ "$DNS_SYSTEM" =~ named|bind ]]; then + update_domain_serial update_domain_zone fi diff --git a/bin/v-change-dns-domain-tpl b/bin/v-change-dns-domain-tpl index 255c0a365..52e149e99 100755 --- a/bin/v-change-dns-domain-tpl +++ b/bin/v-change-dns-domain-tpl @@ -67,6 +67,7 @@ records="$(wc -l $USER_DATA/dns/$domain.conf |cut -f 1 -d ' ')" # Updating zone if [[ "$DNS_SYSTEM" =~ named|bind ]]; then + update_domain_serial update_domain_zone fi diff --git a/bin/v-change-dns-domain-ttl b/bin/v-change-dns-domain-ttl index 3f1bf5ff2..109b243e6 100755 --- a/bin/v-change-dns-domain-ttl +++ b/bin/v-change-dns-domain-ttl @@ -44,6 +44,7 @@ update_object_value 'dns' 'DOMAIN' "$domain" '$TTL' "$ttl" # Updating zone if [[ "$DNS_SYSTEM" =~ named|bind ]]; then + update_domain_serial update_domain_zone fi diff --git a/bin/v-change-dns-record b/bin/v-change-dns-record index 5fe16a07b..6614f2e0b 100755 --- a/bin/v-change-dns-record +++ b/bin/v-change-dns-record @@ -77,6 +77,7 @@ sort_dns_records # Updating zone if [[ "$DNS_SYSTEM" =~ named|bind ]]; then + update_domain_serial update_domain_zone fi diff --git a/bin/v-change-dns-record-id b/bin/v-change-dns-record-id index c9e128bd8..4324524a5 100755 --- a/bin/v-change-dns-record-id +++ b/bin/v-change-dns-record-id @@ -51,6 +51,7 @@ sort_dns_records # Updating zone if [[ "$DNS_SYSTEM" =~ named|bind ]]; then + update_domain_serial update_domain_zone fi diff --git a/bin/v-change-remote-dns-domain-soa b/bin/v-change-remote-dns-domain-soa index 596954a77..99734e756 100755 --- a/bin/v-change-remote-dns-domain-soa +++ b/bin/v-change-remote-dns-domain-soa @@ -85,7 +85,7 @@ for cluster_str in $(grep "SUSPENDED='no'" $VESTA/conf/dns-cluster.conf); do $send_cmd v-insert-dns-domain $DNS_USER "$str" $HOSTNAME 'no' # Rebuild dns zone - $send_cmd v-rebuild-dns-domain $DNS_USER $domain 'scheduled' + $send_cmd v-rebuild-dns-domain $DNS_USER $domain 'scheduled' 'no' if [ $? -ne 0 ]; then echo "Error: $TYPE connection to $HOST failed (rebuild)" log_event "$E_CONNECT $EVENT" diff --git a/bin/v-change-remote-dns-domain-ttl b/bin/v-change-remote-dns-domain-ttl index 390ac9baa..25ff0e6ad 100755 --- a/bin/v-change-remote-dns-domain-ttl +++ b/bin/v-change-remote-dns-domain-ttl @@ -100,7 +100,7 @@ for cluster_str in $(grep "SUSPENDED='no'" $VESTA/conf/dns-cluster.conf); do $send_cmd v-insert-dns-domain $DNS_USER "$str" $HOSTNAME 'no' # Rebuild dns zone - $send_cmd v-rebuild-dns-domain $DNS_USER $domain 'scheduled' + $send_cmd v-rebuild-dns-domain $DNS_USER $domain 'scheduled' 'no' if [ $? -ne 0 ]; then echo "Error: $TYPE connection to $HOST failed (rebuild)" log_event "$E_CONNECT $EVENT" diff --git a/bin/v-delete-dns-record b/bin/v-delete-dns-record index d5749d190..6f8969b4e 100755 --- a/bin/v-delete-dns-record +++ b/bin/v-delete-dns-record @@ -45,6 +45,7 @@ sed -i "/^ID='$id'/d" $USER_DATA/dns/$domain.conf # Updating zone if [[ "$DNS_SYSTEM" =~ named|bind ]]; then + update_domain_serial update_domain_zone fi diff --git a/bin/v-insert-dns-domain b/bin/v-insert-dns-domain index eb246f5d4..be98ac3ff 100755 --- a/bin/v-insert-dns-domain +++ b/bin/v-insert-dns-domain @@ -57,7 +57,7 @@ fi # Prepare values for the insert dns_rec="DOMAIN='$DOMAIN' IP='$IP' TPL='$TPL' TTL='$TTL' EXP='$EXP'" -dns_rec="$dns_rec SOA='$SOA' SRC='$src' RECORDS='$RECORDS'" +dns_rec="$dns_rec SOA='$SOA' SERIAL="$SERIAL" SRC='$src' RECORDS='$RECORDS'" dns_rec="$dns_rec SUSPENDED='$SUSPENDED' TIME='$TIME' DATE='$DATE'" echo "$dns_rec" >> $USER_DATA/dns.conf diff --git a/bin/v-list-dns-domain b/bin/v-list-dns-domain index 8f24a37c3..5c6943aa4 100755 --- a/bin/v-list-dns-domain +++ b/bin/v-list-dns-domain @@ -87,7 +87,8 @@ is_object_valid 'dns' 'DOMAIN' "$domain" # Defining config and fields to select conf=$USER_DATA/dns.conf -fields='$DOMAIN $IP $TPL $TTL $EXP $SOA $RECORDS $SUSPENDED $TIME $DATE' +fields='$DOMAIN $IP $TPL $TTL $EXP $SOA $SERIAL $SRC $RECORDS + $SUSPENDED $TIME $DATE' # Listing domains case $format in diff --git a/bin/v-list-dns-domains b/bin/v-list-dns-domains index e26452892..b5f2e5ca0 100755 --- a/bin/v-list-dns-domains +++ b/bin/v-list-dns-domains @@ -32,7 +32,8 @@ is_object_valid 'user' 'USER' "$user" # Defining config and fields conf=$USER_DATA/dns.conf -fields='$DOMAIN $IP $TPL $TTL $EXP $SOA $SRC $RECORDS $SUSPENDED $TIME $DATE' +fields='$DOMAIN $IP $TPL $TTL $EXP $SOA $SERIAL $SRC $RECORDS + $SUSPENDED $TIME $DATE' # Listing domains case $format in diff --git a/bin/v-rebuild-dns-domain b/bin/v-rebuild-dns-domain index 7fdb0bd33..732e14eda 100755 --- a/bin/v-rebuild-dns-domain +++ b/bin/v-rebuild-dns-domain @@ -1,6 +1,6 @@ #!/bin/bash # info: rebuild dns domain -# options: USER DOMAIN [RESTART] +# options: USER DOMAIN [RESTART] [UPDATE_SERIAL] # # The function rebuilds DNS configuration files. @@ -13,6 +13,7 @@ user=$1 domain=$2 restart=$3 +update_serial=$4 # Includes source $VESTA/func/main.sh @@ -25,7 +26,7 @@ source $VESTA/conf/vesta.conf # Verifications # #----------------------------------------------------------# -check_args '2' "$#" 'USER DOMAIN [RESTART]' +check_args '2' "$#" 'USER DOMAIN [RESTART] [UPDATE_SERIAL]' validate_format 'user' 'domain' is_system_enabled "$DNS_SYSTEM" 'DNS_SYSTEM' is_object_valid 'user' 'USER' "$user" @@ -59,10 +60,15 @@ if [ -e '/etc/bind/named.conf' ]; then dns_conf='/etc/bind/named.conf' fi -# Remove old user's zone +# Deleting old user's zone sed -i "/\/$user\/conf\/dns\/$domain/d" $dns_conf -# Starting loop +# Updating zone serial +if [ "$update_serial" != 'no' ]; then + update_domain_serial +fi + +# Rebuiling zone config rebuild_dns_domain_conf diff --git a/bin/v-rebuild-dns-domains b/bin/v-rebuild-dns-domains index 971a99f45..b2c4aba39 100755 --- a/bin/v-rebuild-dns-domains +++ b/bin/v-rebuild-dns-domains @@ -1,6 +1,6 @@ #!/bin/bash # info: rebuild dns domains -# options: USER [RESTART] +# options: USER [RESTART] [UPDATE_SERIAL] # # The function rebuilds DNS configuration files. @@ -12,6 +12,7 @@ # Argument defenition user=$1 restart=$2 +update_serial=$3 # Includes source $VESTA/func/main.sh @@ -24,7 +25,7 @@ source $VESTA/conf/vesta.conf # Verifications # #----------------------------------------------------------# -check_args '1' "$#" 'USER [RESTART]' +check_args '1' "$#" 'USER [RESTART] [UPDATE_SERIAL]' validate_format 'user' is_system_enabled "$DNS_SYSTEM" 'DNS_SYSTEM' is_object_valid 'user' 'USER' "$user" @@ -65,6 +66,9 @@ sed -i "/\/$user\/conf\/dns/d" $dns_conf # Starting loop for domain in $(search_objects 'dns' 'DOMAIN' "*" 'DOMAIN'); do + if [ "$update_serial" != 'no' ]; then + update_domain_serial + fi rebuild_dns_domain_conf done diff --git a/bin/v-suspend-dns-record b/bin/v-suspend-dns-record index 5cc8f310f..7ac0a3093 100755 --- a/bin/v-suspend-dns-record +++ b/bin/v-suspend-dns-record @@ -54,6 +54,7 @@ sort_dns_records # Updating zone if [[ "$DNS_SYSTEM" =~ named|bind ]]; then + update_domain_serial update_domain_zone fi diff --git a/bin/v-unsuspend-dns-record b/bin/v-unsuspend-dns-record index 761581ef2..52fb15fb1 100755 --- a/bin/v-unsuspend-dns-record +++ b/bin/v-unsuspend-dns-record @@ -53,6 +53,7 @@ sort_dns_records # Updating zone if [[ "$DNS_SYSTEM" =~ named|bind ]]; then + update_domain_serial update_domain_zone fi diff --git a/func/domain.sh b/func/domain.sh index 43eae6c1d..09371117b 100644 --- a/func/domain.sh +++ b/func/domain.sh @@ -216,32 +216,13 @@ is_mail_new() { # Update domain zone update_domain_zone() { conf="$HOMEDIR/$user/conf/dns/$domain.db" - line=$(grep "DOMAIN='$domain'" $USER_DATA/dns.conf) + domain_param=$(grep "DOMAIN='$domain'" $USER_DATA/dns.conf) fields='$RECORD\t$TTL\tIN\t$TYPE\t$PRIORITY\t$VALUE' - if [ -e $conf ]; then - zn_serial=$(head $conf|grep 'SOA' -A1|tail -n 1|sed "s/ //g") - s_date=$(echo ${zn_serial:0:8}) - c_date=$(date +'%Y%m%d') - if [ "$s_date" == "$c_date" ]; then - cur_value=$(echo ${zn_serial:8} ) - new_value=$(expr $cur_value + 1 ) - len_value=$(expr length $new_value) - if [ 1 -eq "$len_value" ]; then - new_value='0'$new_value - fi - serial="$c_date""$new_value" - else - serial="$(date +'%Y%m%d01')" - fi - else - serial="$(date +'%Y%m%d01')" - fi - - eval $line + eval $domain_param SOA=$(idn --quiet -a -t "$SOA") echo "\$TTL $TTL @ IN SOA $SOA. root.$domain_idn. ( - $serial + $SERIAL 7200 3600 1209600 @@ -264,6 +245,31 @@ update_domain_zone() { done < $USER_DATA/dns/$domain.conf } +# Update zone serial +update_domain_serial() { + zn_conf="$HOMEDIR/$user/conf/dns/$domain.db" + if [ -e $zn_conf ]; then + zn_serial=$(head $zn_conf |grep 'SOA' -A1 |tail -n 1 |sed "s/ //g") + s_date=$(echo ${zn_serial:0:8}) + c_date=$(date +'%Y%m%d') + if [ "$s_date" == "$c_date" ]; then + cur_value=$(echo ${zn_serial:8} ) + new_value=$(expr $cur_value + 1 ) + len_value=$(expr length $new_value) + if [ 1 -eq "$len_value" ]; then + new_value='0'$new_value + fi + serial="$c_date""$new_value" + else + serial="$(date +'%Y%m%d01')" + fi + else + serial="$(date +'%Y%m%d01')" + fi + add_object_key "dns" 'DOMAIN' "$domain" 'SERIAL' 'RECORDS' + update_object_value 'dns' 'DOMAIN' "$domain" '$SERIAL' "$serial" +} + # Get next DNS record ID get_next_dnsrecord(){ if [ -z "$id" ]; then diff --git a/web/templates/admin/list_dns.html b/web/templates/admin/list_dns.html index 34fc39eff..53fba641f 100644 --- a/web/templates/admin/list_dns.html +++ b/web/templates/admin/list_dns.html @@ -161,13 +161,20 @@ sort-expire="" sort-records="
        -
        :
        +
        :
        - +
        + +
        +
        :
        +
        + +
        +
        From a35fa78389f484fdd60be21c4bb730abc8e3bc59 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Thu, 15 Oct 2015 15:03:59 +0300 Subject: [PATCH 087/264] FileManager stuff --- web/css/styles.min.css | 13 +++++--- web/js/events.js | 76 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 85 insertions(+), 4 deletions(-) diff --git a/web/css/styles.min.css b/web/css/styles.min.css index 85834f5ea..5aeee4f99 100644 --- a/web/css/styles.min.css +++ b/web/css/styles.min.css @@ -711,6 +711,10 @@ input[type="checkbox"] { background-color: #ff6701; } +.l-menu.active .l-menu__item.focus a { + text-decoration: underline; + color: #5edad0; +} .lang-ua .l-menu__item a, .lang-nl .l-menu__item a, @@ -808,14 +812,15 @@ input[type="checkbox"] { border-bottom: 3px solid #ff6e42; } -.l-stat__col.focus { - background-color: #ddd; +.l-stat.active .l-stat__col.focus a { + border-bottom: 3px solid #5edad0; } -.l-stat__col.focus a { - border-bottom: 3px solid #AACC0D; +.l-stat.active .l-stat__col.focus a .l-stat__col-title { + color: #36B3A9; } + .l-stat__col a:hover .l-stat__col-title { color: #ff6701; } diff --git a/web/js/events.js b/web/js/events.js index 23cc9e479..9b7ceb38c 100644 --- a/web/js/events.js +++ b/web/js/events.js @@ -1,6 +1,13 @@ // Init kinda namespace object var VE = { // Vesta Events object core: {}, // core functions + navigation: { + state: { + active_menu: 1, + menu_selector: '.l-stat__col', + menu_active_selector: '.l-stat__col--active' + } + }, // menu and element navigation functions callbacks: { // events callback functions click: {}, mouseover: {}, @@ -225,6 +232,75 @@ VE.helpers.refresh_timer = { } } +VE.navigation.enter_focused = function() { + if($(VE.navigation.state.menu_selector + '.focus a').attr('href')){ + location.href=($(VE.navigation.state.menu_selector + '.focus a').attr('href')); + } +} +VE.navigation.move_focus_left = function(){ + var index = parseInt($(VE.navigation.state.menu_selector).index($(VE.navigation.state.menu_selector+'.focus'))); + if(index == -1) + index = parseInt($(VE.navigation.state.menu_selector).index($(VE.navigation.state.menu_active_selector))); + if(index > 0){ + $(VE.navigation.state.menu_selector).removeClass('focus'); + $($(VE.navigation.state.menu_selector)[index-1]).addClass('focus'); + } else { + $($(VE.navigation.state.menu_selector)[0]).addClass('focus'); + } +} + +VE.navigation.move_focus_right = function(){ + var max_index = $(VE.navigation.state.menu_selector).length-1; + var index = parseInt($(VE.navigation.state.menu_selector).index($(VE.navigation.state.menu_selector+'.focus'))); + if(index == -1) + index = parseInt($(VE.navigation.state.menu_selector).index($(VE.navigation.state.menu_active_selector))) || 0; + + if(index < max_index){ + $(VE.navigation.state.menu_selector).removeClass('focus'); + $($(VE.navigation.state.menu_selector)[index+1]).addClass('focus'); + } +} + +VE.navigation.switch_menu = function(){ + if(VE.navigation.state.active_menu == 0){ + VE.navigation.state.active_menu = 1; + VE.navigation.state.menu_selector = '.l-stat__col'; + VE.navigation.state.menu_active_selector = '.l-stat__col--active'; + $('.l-menu').removeClass('active'); + $('.l-stat').addClass('active'); + } else { + VE.navigation.state.active_menu = 0; + VE.navigation.state.menu_selector = '.l-menu__item'; + VE.navigation.state.menu_active_selector = '.l-menu__item--active'; + $('.l-menu').addClass('active'); + $('.l-stat').removeClass('active'); + } + + + var index = parseInt($(VE.navigation.state.menu_selector).index($(VE.navigation.state.menu_selector+'.focus'))); + if(index == -1){ + index = parseInt($(VE.navigation.state.menu_selector).index($(VE.navigation.state.menu_active_selector))) || 0; + if(index == -1) + index = 0; + $($(VE.navigation.state.menu_selector)[index]).addClass('focus'); + } +} + +VE.navigation.init = function(){ + if($('.l-menu__item.l-menu__item--active').length){ +// VE.navigation.switch_menu(); + VE.navigation.state.active_menu = 0; + VE.navigation.state.menu_selector = '.l-menu__item'; + VE.navigation.state.menu_active_selector = '.l-menu__item--active'; + $('.l-menu').addClass('active'); + $('.l-stat').removeClass('active'); + + } else { + $('.l-stat').addClass('active'); + } +} VE.helpers.extendPasswordFields(); + + From 4307b1f827aa9fe1595afed79303873a0d1b47ef Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Thu, 15 Oct 2015 15:12:49 +0300 Subject: [PATCH 088/264] FM HotKeys --- web/templates/footer.html | 42 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/web/templates/footer.html b/web/templates/footer.html index 97a900854..77b4b0acf 100644 --- a/web/templates/footer.html +++ b/web/templates/footer.html @@ -472,6 +472,46 @@ } ); + shortcut.add("Left", function(){ + VE.navigation.move_focus_left(); + }, { + 'type': 'keydown', + 'propagate': false, + 'disable_in_input': true, + 'target': document + } + ); + + shortcut.add("Right", function(){ + VE.navigation.move_focus_right(); + }, { + 'type': 'keydown', + 'propagate': false, + 'disable_in_input': true, + 'target': document + } + ); + + shortcut.add("Enter", function(){ + VE.navigation.enter_focused(); + }, { + 'type': 'keydown', + 'propagate': false, + 'disable_in_input': true, + 'target': document + } + ); + + shortcut.add("Tab", function(){ + VE.navigation.switch_menu(); + }, { + 'type': 'keydown', + 'propagate': false, + 'disable_in_input': true, + 'target': document + } + ); + $('.shortcuts .close').click(function(){ $('.shortcuts').hide(); @@ -482,6 +522,8 @@ }); + VE.navigation.init(); + VE.core.register(); if (location.href.search(/list/) != -1) { var shift_select_ref = $('body').finderSelect({ From 941e01eadd20ebf182fa1452ed63b1dc0122b286 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Wed, 21 Oct 2015 15:01:32 +0300 Subject: [PATCH 089/264] Improved Even Logger + check_result() --- func/main.sh | 36 +++++++++++++++++++++++++----------- 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/func/main.sh b/func/main.sh index 2873f704c..2dd448f78 100644 --- a/func/main.sh +++ b/func/main.sh @@ -2,16 +2,6 @@ DATE=$(date +%F) TIME=$(date +%T) SCRIPT=$(basename $0) -A1=$1 -A2=$2 -A3=$3 -A4=$4 -A5=$5 -A6=$6 -A7=$7 -A8=$8 -A9=$9 -EVENT="$DATE $TIME $SCRIPT $A1 $A2 $A3 $A4 $A5 $A6 $A7 $A8 $A9" HOMEDIR='/home' BACKUP='/backup' BACKUP_GZIP=5 @@ -51,6 +41,16 @@ E_RRD=18 E_UPDATE=19 E_RESTART=20 +# Event string for logger +EVENT="$DATE $TIME $SCRIPT" +for ((I=1; I <= $# ; I++)); do + if [[ "$HIDE" != $I ]]; then + EVENT="$EVENT '$(eval echo \$${I})'" + else + EVENT="$EVENT '******'" + fi +done + # Log event function log_event() { if [ "$1" -eq 0 ]; then @@ -79,6 +79,20 @@ log_history() { echo "ID='$id' DATE='$DATE' TIME='$TIME' CMD='$cmd' UNDO='$undo'" >> $log } +# Result checker +check_result() { + if [ $1 -ne 0 ]; then + echo "Error: $2" + if [ ! -z "$3" ]; then + log_event $3 $EVENT + exit $3 + else + log_event $1 $EVENT + exit $1 + fi + fi +} + # Argument list checker check_args() { if [ "$1" -gt "$2" ]; then @@ -292,7 +306,7 @@ get_object_value() { # Update object value update_object_value() { - row=$(grep -n "$2='$3'" $USER_DATA/$1.conf) + row=$(grep -nF "$2='$3'" $USER_DATA/$1.conf) lnr=$(echo $row | cut -f 1 -d ':') object=$(echo $row | sed "s/^$lnr://") eval "$object" From 89c1f644fee11e8612c1aa22af0235596d4aaa8d Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Wed, 21 Oct 2015 15:47:32 +0300 Subject: [PATCH 090/264] Improved domain validation plus added SERIAL support --- func/domain.sh | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/func/domain.sh b/func/domain.sh index 09371117b..6fdabc08e 100644 --- a/func/domain.sh +++ b/func/domain.sh @@ -146,10 +146,10 @@ is_domain_new() { web_alias=$(grep -w $dom $VESTA/data/users/*/web.conf) fi if [ ! -z "$web_alias" ]; then - c1=$(grep -H "'$dom'" $VESTA/data/users/*/web.conf | cut -f 7 -d /) - c2=$(grep -H "'$dom," $VESTA/data/users/*/web.conf | cut -f 7 -d /) - c3=$(grep -H ",$dom," $VESTA/data/users/*/web.conf | cut -f 7 -d /) - c4=$(grep -H ",$dom'" $VESTA/data/users/*/web.conf | cut -f 7 -d /) + c1=$(grep -HF "'$dom'" $VESTA/data/users/*/web.conf | cut -f 7 -d /) + c2=$(grep -HF "'$dom," $VESTA/data/users/*/web.conf | cut -f 7 -d /) + c3=$(grep -HF ",$dom," $VESTA/data/users/*/web.conf | cut -f 7 -d /) + c4=$(grep -HF ",$dom'" $VESTA/data/users/*/web.conf | cut -f 7 -d /) if [ ! -z "$c1" ] && [ "$type" == "web" ]; then echo "Error: $object $dom exist" log_event "$E_EXISTS" "$EVENT" @@ -215,11 +215,13 @@ is_mail_new() { # Update domain zone update_domain_zone() { - conf="$HOMEDIR/$user/conf/dns/$domain.db" domain_param=$(grep "DOMAIN='$domain'" $USER_DATA/dns.conf) - fields='$RECORD\t$TTL\tIN\t$TYPE\t$PRIORITY\t$VALUE' eval $domain_param SOA=$(idn --quiet -a -t "$SOA") + if [ -z "$SERIAL" ]; then + SERIAL=$(date +'%Y%m%d01') + fi + zn_conf="$HOMEDIR/$user/conf/dns/$domain.db" echo "\$TTL $TTL @ IN SOA $SOA. root.$domain_idn. ( $SERIAL @@ -227,7 +229,8 @@ update_domain_zone() { 3600 1209600 180 ) -" > $conf +" > $zn_conf + fields='$RECORD\t$TTL\tIN\t$TYPE\t$PRIORITY\t$VALUE' while read line ; do IFS=$'\n' for key in $(echo $line|sed "s/' /'\n/g"); do @@ -240,7 +243,7 @@ update_domain_zone() { fi if [ "$SUSPENDED" != 'yes' ]; then - eval echo -e "\"$fields\""|sed "s/%quote%/'/g" >> $conf + eval echo -e "\"$fields\""|sed "s/%quote%/'/g" >> $zn_conf fi done < $USER_DATA/dns/$domain.conf } @@ -320,6 +323,7 @@ add_web_config() { # Get config top and bottom line numbers get_web_config_brds() { + serv_line=$(egrep -ni "Name %domain_idn%($| )" $tpl_file |cut -f 1 -d :) if [ -z "$serv_line" ]; then log_event "$E_PARSING" "$EVENT" @@ -330,15 +334,14 @@ get_web_config_brds() { bfr_line=$((serv_line - 1)) aftr_line=$((last_line - serv_line - 1)) - str=$(egrep -ni "Name $domain_idn($| )" $conf | cut -f 1 -d :) + str=$(grep -niF "Name $domain_idn" $conf |egrep "$domain_idn$|$domain_idn ") + str=$(echo "$str" |cut -f 1 -d :) top_line=$((str - serv_line + 1)) bottom_line=$((top_line + last_line -1)) - multi=$(sed -n "$top_line,$bottom_line p" $conf |grep ServerAlias |wc -l) if [ "$multi" -ge 2 ]; then bottom_line=$((bottom_line + multi -1)) fi - } # Replace web config From 7b0824015febba38bf3364037be5c2a4d2394059 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Wed, 21 Oct 2015 15:49:03 +0300 Subject: [PATCH 091/264] Improved remote API --- func/remote.sh | 137 ++++++++++++++++++---------------------------- web/api/index.php | 13 ++++- 2 files changed, 64 insertions(+), 86 deletions(-) diff --git a/func/remote.sh b/func/remote.sh index 61b050065..f680ce0d3 100644 --- a/func/remote.sh +++ b/func/remote.sh @@ -1,11 +1,4 @@ send_api_cmd() { - if [ -z $PORT ]; then - PORT=8083 - fi - if [ -z $USER ]; then - USER=admin - fi - answer=$(curl -s -k \ --data-urlencode "user=$USER" \ --data-urlencode "password=$PASSWORD" \ @@ -20,21 +13,22 @@ send_api_cmd() { --data-urlencode "arg7=$8" \ --data-urlencode "arg8=$9" \ https://$HOST:$PORT/api/) + return $answer +} - if [ "$answer" != '0' ]; then - return 1 - else - return 0 - fi +send_api_file() { + answer=$(curl -s -k \ + --data-urlencode "user=$USER" \ + --data-urlencode "password=$PASSWORD" \ + --data-urlencode "returncode=yes" \ + --data-urlencode "cmd=v-make-tmp-file" \ + --data-urlencode "arg1=$(cat $1)" \ + --data-urlencode "arg2=$2" \ + https://$HOST:$PORT/api/) + return $answer } send_ssh_cmd() { - if [ -z $PORT ]; then - PORT=22 - fi - if [ -z $USER ]; then - USER=admin - fi if [ -z "$IDENTITY_FILE" ] && [ "$USER" = 'root' ]; then IDENTITY_FILE="/root/.ssh/id_rsa" fi @@ -55,13 +49,7 @@ send_ssh_cmd() { fi } -scp_cmd() { - if [ -z $PORT ]; then - PORT=22 - fi - if [ -z $USER ]; then - USER=admin - fi +send_scp_file() { if [ -z "$IDENTITY_FILE" ]; then IDENTITY_FILE="/home/admin/.ssh/id_rsa" fi @@ -77,75 +65,33 @@ is_dnshost_new() { if [ -e "$VESTA/conf/dns-cluster.conf" ]; then check_host=$(grep "HOST='$host'" $VESTA/conf/dns-cluster.conf) if [ ! -z "$check_host" ]; then - echo "Error: dns host $host exists" - log_event "$E_EXISTS" "$EVENT" - exit $E_EXISTS + check_result $E_EXISTS "remote dns host $host exists" fi fi } is_dnshost_alive() { - HOST=$host - PORT=$port - USER=$user - PASSWORD=$password + cluster_cmd v-list-sys-config + check_result $? "$type connection to $HOST failed" $E_CONNECT - # Switch on connection type - case $type in - ssh) send_cmd="send_ssh_cmd" ;; - *) send_cmd="send_api_cmd" ;; - esac - - # Check host connection - $send_cmd v-list-sys-config - if [ $? -ne 0 ]; then - echo "Error: $type connection to $HOST failed" - log_event "$E_CONNECT" "$EVENT" - exit $E_CONNECT - fi - - # Check recipient dns user - if [ -z "$DNS_USER" ]; then - DNS_USER='dns-cluster' - fi - if [ ! -z "$verbose" ]; then - echo "DNS_USER: $DNS_USER" - fi - $send_cmd v-list-user $DNS_USER - if [ $? -ne 0 ]; then - echo "Error: dns user $DNS_USER doesn't exist" - log_event "$E_NOTEXIST" "$EVENT" - exit $E_NOTEXIST - fi + cluster_cmd v-list-user $DNS_USER + check_result $? "$DNS_USER doesn't exist" $E_CONNECT } remote_dns_health_check() { - # Define tmp mail vars - subj="DNS sync failed" - email=$(grep CONTACT $VESTA/data/users/admin/user.conf | cut -f 2 -d \') - send_mail="$VESTA/web/inc/mail-wrapper.php" - tmpfile=$(mktemp) + OLD_IFS="$IFS" + IFS=$'\n' # Starting health-check for str in $(grep "SUSPENDED='no'" $VESTA/conf/dns-cluster.conf); do - - # Get host values eval $str - # Check connection type - if [ -z "TYPE" ]; then - TYPE='api' - fi - - # Switch on connection type - case $TYPE in - ssh) send_cmd="send_ssh_cmd" ;; - *) send_cmd="send_api_cmd" ;; - esac - - # Check host connection - $send_cmd v-list-sys-config + # Checking host connection + cluster_cmd v-list-user $DNS_USER if [ $? -ne 0 ]; then + + # Creating error report + tmpfile=$(mktemp) echo "$(basename $0) $*" > $tmpfile echo -e "Error: $TYPE connection to $HOST failed.\n" >> $tmpfile echo -n "Remote dns host has been suspended." >> $tmpfile @@ -154,14 +100,37 @@ remote_dns_health_check() { echo "v-unsuspend-remote-dns-host $HOST" >> $tmpfile echo "v-sync-dns-cluster $HOST" >> $tmpfile echo -e "\n\n--\nVesta Control Panel\n$(hostname)" >> $tmpfile - cat $tmpfile | $send_mail -s "$subj" $email + if [ "$1" = 'no_email' ]; then + cat $tmpfile + else + subj="DNS sync failed" + email=$($BIN/v-get-user-value admin CONTACT) + cat $tmpfile |$send_mail -s "$subj" $email + fi + + # Deleting tmp file + rm -f $tmpfile log_event "$E_CONNECT" "$EVENT" - dconf="../../../conf/dns-cluster" + + # Suspending remote host + dconf="../../conf/dns-cluster" update_object_value "$dconf" 'HOST' "$HOST" '$SUSPENDED' 'yes' fi - - # Remove tmp file - rm -f $tmpfile done + IFS="$OLD_IFS" +} + +cluster_cmd() { + case $TYPE in + ssh) send_ssh_cmd $* ;; + api) send_api_cmd $* ;; + esac +} + +cluster_file() { + case $TYPE in + ssh) send_scp_file $* ;; + api) send_api_file $* ;; + esac } diff --git a/web/api/index.php b/web/api/index.php index cfa74ff76..f78a4e7f2 100644 --- a/web/api/index.php +++ b/web/api/index.php @@ -65,8 +65,17 @@ if (isset($_POST['user']) || isset($_POST['hash'])) { if(!empty($arg9)){ $cmdquery = $cmdquery.$arg9; } - // Run query - exec ($cmdquery, $output, $return_var); + // Check command + if ($cmd == "'v-make-tmp-file'") { + // Used in DNS Cluster + $fp = fopen($_POST['arg2'], 'w'); + fwrite($fp, $_POST['arg1']."\n"); + fclose($fp); + $return_var = 0; + } else { + // Run normal cmd query + exec ($cmdquery, $output, $return_var); + } if ((!empty($_POST['returncode'])) && ($_POST['returncode'] == 'yes')) { echo $return_var; From bdc8111b0692f396e338bd83fa2669278165568e Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Wed, 21 Oct 2015 15:54:07 +0300 Subject: [PATCH 092/264] Fix SERIAL sync in DNS cluster --- bin/v-add-dns-domain | 62 +++++++++--- bin/v-add-dns-record | 4 +- bin/v-add-remote-dns-domain | 111 +++++++-------------- bin/v-add-remote-dns-host | 45 ++++----- bin/v-add-remote-dns-record | 96 +++++++----------- bin/v-change-remote-dns-domain-exp | 71 ++++---------- bin/v-change-remote-dns-domain-soa | 76 ++++----------- bin/v-change-remote-dns-domain-ttl | 88 ++++------------- bin/v-delete-remote-dns-domain | 79 ++++----------- bin/v-delete-remote-dns-domains | 87 ++++------------- bin/v-delete-remote-dns-host | 18 +--- bin/v-delete-remote-dns-record | 76 +++++---------- bin/v-insert-dns-domain | 5 +- bin/v-sync-dns-cluster | 150 +++++++---------------------- 14 files changed, 298 insertions(+), 670 deletions(-) diff --git a/bin/v-add-dns-domain b/bin/v-add-dns-domain index 5f18daa18..c33602998 100755 --- a/bin/v-add-dns-domain +++ b/bin/v-add-dns-domain @@ -1,6 +1,6 @@ #!/bin/bash # info: add dns domain -# options: USER DOMAIN IP [NS1] [NS2] [NS3] [NS4] [RESTART] +# options: USER DOMAIN IP [NS1] [NS2] [NS3] [..] [NS8] [RESTART] # # The function adds DNS zone with records defined in the template. If the exp # argument isn't stated, the expiration date value will be set to next year. @@ -24,7 +24,11 @@ ns1=$4 ns2=$5 ns3=$6 ns4=$7 -restart=$8 +ns5=$8 +ns6=$9 +ns7=${10} +ns8=${11} +restart=${12} # Includes source $VESTA/func/main.sh @@ -36,14 +40,13 @@ source $VESTA/conf/vesta.conf # Verifications # #----------------------------------------------------------# -check_args '3' "$#" 'USER DOMAIN IP [NS1] [NS2] [NS3] [NS4]' +check_args '3' "$#" 'USER DOMAIN IP [NS1] [NS2] [NS3] [..] [NS8] [RESTART]' validate_format 'user' 'domain' 'ip' is_system_enabled "$DNS_SYSTEM" 'DNS_SYSTEM' is_object_valid 'user' 'USER' "$user" is_object_unsuspended 'user' 'USER' "$user" is_domain_new 'dns' is_package_full 'DNS_DOMAINS' - template=$(get_user_value '$DNS_TEMPLATE') is_dns_template_valid @@ -64,6 +67,23 @@ if [ ! -z "$ns4" ]; then ns4=$(echo $7 | sed -e 's/\.*$//g' -e 's/^\.*//g') validate_format 'ns4' fi +if [ ! -z "$ns5" ]; then + ns5=$(echo $8 | sed -e 's/\.*$//g' -e 's/^\.*//g') + validate_format 'ns5' +fi +if [ ! -z "$ns6" ]; then + ns6=$(echo $9 | sed -e 's/\.*$//g' -e 's/^\.*//g') + validate_format 'ns6' +fi +if [ ! -z "$ns7" ]; then + ns7=$(echo ${10} | sed -e 's/\.*$//g' -e 's/^\.*//g') + validate_format 'ns7' +fi + +if [ ! -z "$ns8" ]; then + ns8=$(echo ${11} | sed -e 's/\.*$//g' -e 's/^\.*//g') + validate_format 'ns8' +fi #----------------------------------------------------------# @@ -89,13 +109,25 @@ template_data=$(cat $DNSTPL/$template.tpl) # Deleting unused nameservers if [ -z "$ns3" ]; then - template_data=$(echo "$template_data" | grep -v %ns3%) + template_data=$(echo "$template_data" |grep -v %ns3%) fi if [ -z "$ns4" ]; then - template_data=$(echo "$template_data" | grep -v %ns4%) + template_data=$(echo "$template_data" |grep -v %ns4%) +fi +if [ -z "$ns5" ]; then + template_data=$(echo "$template_data" |grep -v %ns5%) +fi +if [ -z "$ns6" ]; then + template_data=$(echo "$template_data" |grep -v %ns6%) +fi +if [ -z "$ns7" ]; then + template_data=$(echo "$template_data" |grep -v %ns7%) +fi +if [ -z "$ns8" ]; then + template_data=$(echo "$template_data" |grep -v %ns8%) fi -# Add dns zone to the user config +# Adding dns zone to the user config echo "$template_data" |\ sed -e "s/%ip%/$ip/g" \ -e "s/%domain_idn%/$domain_idn/g" \ @@ -104,6 +136,10 @@ echo "$template_data" |\ -e "s/%ns2%/$ns2/g" \ -e "s/%ns3%/$ns3/g" \ -e "s/%ns4%/$ns4/g" \ + -e "s/%ns5%/$ns5/g" \ + -e "s/%ns6%/$ns6/g" \ + -e "s/%ns7%/$ns7/g" \ + -e "s/%ns8%/$ns8/g" \ -e "s/%time%/$TIME/g" \ -e "s/%date%/$DATE/g" > $USER_DATA/dns/$domain.conf @@ -118,7 +154,7 @@ dns_rec="$dns_rec SUSPENDED='no' TIME='$TIME' DATE='$DATE'" echo "$dns_rec" >> $USER_DATA/dns.conf chmod 660 $USER_DATA/dns.conf -# Create system configs +# Creating system configs if [[ "$DNS_SYSTEM" =~ named|bind ]]; then if [ -e '/etc/named.conf' ]; then dns_conf='/etc/named.conf' @@ -136,9 +172,9 @@ if [[ "$DNS_SYSTEM" =~ named|bind ]]; then # Updating domain dns zone update_domain_zone - # Set permissions - chmod 640 $conf - chown root:$dns_group $conf + # Changing permissions + chmod 640 $HOMEDIR/$user/conf/dns/$domain.db + chown root:$dns_group $HOMEDIR/$user/conf/dns/$domain.db fi # Updating dns-cluster queue @@ -159,9 +195,7 @@ increase_user_value "$user" '$U_DNS_RECORDS' "$records" # Restart named if [ "$restart" != 'no' ]; then $BIN/v-restart-dns - if [ $? -ne 0 ]; then - exit $E_RESTART - fi + check_result $? "DNS restart failed" fi # Logging diff --git a/bin/v-add-dns-record b/bin/v-add-dns-record index 928b5c48d..af1744895 100755 --- a/bin/v-add-dns-record +++ b/bin/v-add-dns-record @@ -109,9 +109,7 @@ increase_user_value "$user" '$U_DNS_RECORDS' # Restart named if [ "$restart" != 'no' ]; then $BIN/v-restart-dns - if [ $? -ne 0 ]; then - exit $E_RESTART - fi + check_result $? $E_RESTART 'dns failed to restart' fi # Logging diff --git a/bin/v-add-remote-dns-domain b/bin/v-add-remote-dns-domain index e6a340484..e84a0e3dc 100755 --- a/bin/v-add-remote-dns-domain +++ b/bin/v-add-remote-dns-domain @@ -27,101 +27,64 @@ source $VESTA/conf/vesta.conf check_args '2' "$#" 'USER DOMAIN [FLUSH]' validate_format 'user' 'domain' is_system_enabled "$DNS_CLUSTER" 'DNS_CLUSTER' - if [ ! -e "$VESTA/conf/dns-cluster.conf" ]; then - echo "Error: dns-cluster.conf doesn't exist" - log_event "$E_NOTEXIST $EVENT" - exit $E_NOTEXIST + check_result $E_NOTEXIST "dns-cluster.conf doesn't exist" fi - -number_of_proc=$(ps auxf | grep -v grep | grep $VESTA/bin/$SCRIPT | wc -l) -if [ "$number_of_proc" -gt 2 ]; then - echo "Error: another sync process already exists" - log_event "$E_EXISTS $EVENT" - exit $E_EXISTS +if [ "$(ps auxf |grep -v grep |grep $BIN/$SCRIPT |wc -l)" -gt 2 ]; then + check_result $E_EXISTS "another sync process already running" fi +remote_dns_health_check #----------------------------------------------------------# # Action # #----------------------------------------------------------# -# Check domain existance -check_local_domain=$(grep "DOMAIN='$domain'" $USER_DATA/dns.conf 2>/dev/null) -if [ -z "$check_local_domain" ]; then +# Parsing domain record +str=$(grep "DOMAIN='$domain'" $USER_DATA/dns.conf 2>/dev/null) +if [ -z "$str" ]; then pipe="$VESTA/data/queue/dns-cluster.pipe" - str=$(grep -n "$SCRIPT $1 $2$" $pipe | cut -f1 -d: | head -n1) - if [ ! -z "$str" ]; then - sed -i "$str d" $pipe + queue_str=$(grep -n "$SCRIPT $1 $2 no$" $pipe |cut -f1 -d: |head -n1) + if [ ! -z "$queue_str" ]; then + sed -i "$queue_str d" $pipe fi exit fi -old_ifs="$IFS" IFS=$'\n' +for cluster in $(grep "SUSPENDED='no'" $VESTA/conf/dns-cluster.conf); do -# Check remote dns nodes -remote_dns_health_check + # Parsing remote dns host parameters + eval $cluster -search_str=$(grep "SUSPENDED='no'" $VESTA/conf/dns-cluster.conf) -for cluster_str in $search_str; do - - # Get host values - eval $cluster_str - - # Check connection type - if [ -z "TYPE" ]; then - TYPE='api' - fi - - # Check recipient dns user - if [ -z "$DNS_USER" ]; then - DNS_USER='dns-cluster' - fi - - # Switch on connection type - case $TYPE in - ssh) send_cmd="send_ssh_cmd" ;; - *) send_cmd="send_api_cmd" ;; - esac - - # Check dns exceptions - if [ -z "$DNS_CLUSTER_IGNORE" ]; then - DNS_CLUSTER_IGNORE='dns-cluster' - fi - - # Check flush parameters - - # Sync domain - str=$(grep "DOMAIN='$domain'" $USER_DATA/dns.conf) + # Parsing domain parameters eval $str - $send_cmd v-insert-dns-domain $DNS_USER "$str" $HOSTNAME "$flush" 'no' - if [ $? -eq 0 ]; then - # Sync records - if [ "$TYPE" = 'ssh' ]; then - tmp=$(mktemp -u) - scp_cmd $USER_DATA/dns/$DOMAIN.conf $tmp - $send_cmd v-insert-dns-records $DNS_USER $DOMAIN $tmp 'no' - else - for str in $(cat $USER_DATA/dns/$DOMAIN.conf); do - str=$(echo "$str" | sed 's/"/\\"/g') - $send_cmd v-insert-dns-record $DNS_USER $DOMAIN "$str" - done - fi + # Syncing domain data + cluster_cmd v-insert-dns-domain $DNS_USER "$str" $HOSTNAME $flush 'no' + check_result $? "$HOST connection failed" $E_CONNECT - # Rebuild dns zone - $send_cmd v-rebuild-dns-domain $DNS_USER $domain 'scheduled' 'no' - if [ $? -ne 0 ]; then - echo "Error: $TYPE connection to $HOST failed" - log_event "$E_CONNECT $EVENT" - exit $E_CONNECT - fi - fi + # Syncing domain records + tmp_file="/tmp/vst-sync.$DOMAIN" + cluster_file $USER_DATA/dns/$DOMAIN.conf $tmp_file + check_result $? "$HOST connection failed" $E_CONNECT + # Inserting synced records + cluster_cmd v-insert-dns-records $DNS_USER $DOMAIN $tmp_file 'no' + check_result $? "$HOST connection failed" $E_CONNECT + + # Rebuilding dns zone + cluster_cmd v-rebuild-dns-domain $DNS_USER $domain 'yes' 'no' + check_result $? "$HOST connection failed" $E_CONNECT done -# Update pipe + + +#----------------------------------------------------------# +# Vesta # +#----------------------------------------------------------# + +# Updating pipe rm -f $tmpfile pipe="$VESTA/data/queue/dns-cluster.pipe" str=$(grep -n "$SCRIPT $1 $2 " $pipe | cut -f1 -d: | head -n1) @@ -129,8 +92,4 @@ if [ ! -z "$str" ]; then sed -i "$str d" $pipe fi -#----------------------------------------------------------# -# Vesta # -#----------------------------------------------------------# - exit diff --git a/bin/v-add-remote-dns-host b/bin/v-add-remote-dns-host index 1ca8b0034..c004ee316 100755 --- a/bin/v-add-remote-dns-host +++ b/bin/v-add-remote-dns-host @@ -11,10 +11,15 @@ # Argument defenition host=$1 +HOST=$host port=$2 +PORT=$port user=$3 -password=$4 +USER=$user +password=$4; HIDE=4 +PASSWORD=$password type=${5-api} +TYPE="$type" dns_user=${6-dns-cluster} DNS_USER=$dns_user @@ -23,10 +28,6 @@ source $VESTA/func/main.sh source $VESTA/func/remote.sh source $VESTA/conf/vesta.conf -# Hiding passwords -A4='******' -EVENT="$DATE $TIME $SCRIPT $A1 $A2 $A3 $A4 $A5 $A6 $A7 $A8 $A9" - #----------------------------------------------------------# # Verifications # @@ -61,36 +62,26 @@ else sed -i "s/DNS_CLUSTER=.*/DNS_CLUSTER='yes'/g" $VESTA/conf/vesta.conf fi -# Enabling restart queue -HOST=$host -PORT=$port -USER=$user -PASSWORD=$password -case $type in - ssh) send_cmd="send_ssh_cmd" ;; - *) send_cmd="send_api_cmd" ;; -esac -$send_cmd v-add-cron-restart-job +# Enabling remote dns-cluster queue +cluster_cmd v-add-cron-restart-job +check_result $? "$HOST connection failed" $E_CONNECT -# Sync current zones +# Syncing all domains $BIN/v-sync-dns-cluster $host -return_code=$? -if [ "$return_code" -ne 0 ]; then - exit $return_code -fi - -# Add dns-cluster cron job -cmd="sudo /usr/local/vesta/bin/v-update-sys-queue dns-cluster" -check_cron=$(grep "$cmd" $VESTA/data/users/admin/cron.conf 2> /dev/null) -if [ -z "$check_cron" ] && [ ! -z "$CRON_SYSTEM" ]; then - $BIN/v-add-cron-job admin '*/5' '*' '*' '*' '*' "$cmd" -fi +check_result $? "$HOST sync failed" $E_CONNECT #----------------------------------------------------------# # Vesta # #----------------------------------------------------------# +# Adding local dns-cluster cron job +cmd="sudo /usr/local/vesta/bin/v-update-sys-queue dns-cluster" +check_cron=$(grep "$cmd" $VESTA/data/users/admin/cron.conf 2> /dev/null) +if [ -z "$check_cron" ] && [ ! -z "$CRON_SYSTEM" ]; then + $BIN/v-add-cron-job admin '*/5' '*' '*' '*' '*' "$cmd" +fi + # Logging log_event "$OK" "$EVENT" diff --git a/bin/v-add-remote-dns-record b/bin/v-add-remote-dns-record index ecd816810..f1a7fee59 100755 --- a/bin/v-add-remote-dns-record +++ b/bin/v-add-remote-dns-record @@ -29,86 +29,62 @@ validate_format 'user' 'domain' 'id' is_system_enabled "$DNS_CLUSTER" 'DNS_CLUSTER' is_object_valid 'user' 'USER' "$user" is_object_valid 'dns' 'DOMAIN' "$domain" -is_object_valid "dns/$domain" 'ID' "$id" - if [ ! -e "$VESTA/conf/dns-cluster.conf" ]; then - echo "Error: dns-cluster.conf doesn't exist" - log_event "$E_NOTEXIST $EVENT" - exit $E_NOTEXIST + check_result $E_NOTEXIST "dns-cluster.conf doesn't exist" fi - -number_of_proc=$(ps auxf | grep -v grep | grep $VESTA/bin/$SCRIPT | wc -l) -if [ "$number_of_proc" -gt 2 ]; then - echo "Error: another sync process already exists" - log_event "$E_EXISTS $EVENT" - exit $E_EXISTS +if [ "$(ps auxf |grep -v grep |grep $BIN/$SCRIPT |wc -l)" -gt 2 ]; then + check_result $E_EXISTS "another sync process already running" fi +remote_dns_health_check #----------------------------------------------------------# # Action # #----------------------------------------------------------# -old_ifs="$IFS" +# Parsing record +str=$(grep "ID='$id'" $USER_DATA/dns/$domain.conf) +if [ -z "$str" ]; then + pipe="$VESTA/data/queue/dns-cluster.pipe" + queue_str=$(grep -n "$SCRIPT $1 $2 $3$" $pipe | cut -f1 -d: | head -n1) + if [ ! -z "$queue_str" ]; then + sed -i "$queue_str d" $pipe + fi + exit +fi + IFS=$'\n' +for cluster in $(grep "SUSPENDED='no'" $VESTA/conf/dns-cluster.conf); do -# Check remote dns nodes -remote_dns_health_check + # Parsing remote host parameters + eval $cluster -for cluster_str in $(grep "SUSPENDED='no'" $VESTA/conf/dns-cluster.conf); do - # Get host values - eval $cluster_str + # Syncing serial + str=$(grep "DOMAIN='$domain'" $USER_DATA/dns.conf) + cluster_cmd v-insert-dns-domain $DNS_USER "$str" $HOSTNAME 'domain' 'no' + check_result $? "$HOST connection failed (soa sync)" $E_CONNECT - # Check connection type - if [ -z "TYPE" ]; then - TYPE='api' - fi + # Syncing record + str=$(grep "ID='$id'" $USER_DATA/dns/$domain.conf | sed 's/"/\\"/g') + cluster_cmd v-insert-dns-record $DNS_USER $domain "$str" 'no' + check_result $? "$HOST connection failed (record sync)" $E_CONNECT - # Switch on connection type - case $TYPE in - ssh) send_cmd="send_ssh_cmd" ;; - *) send_cmd="send_api_cmd" ;; - esac - - # Check recipient dns user - if [ -z "$DNS_USER" ]; then - DNS_USER='dns-cluster' - fi - - # Check dns exceptions - if [ -z "$DNS_CLUSTER_IGNORE" ]; then - DNS_CLUSTER_IGNORE='dns-cluster' - fi - - # Sync SOA - $send_cmd v-insert-dns-domain $DNS_USER "$str" $HOSTNAME 'domain' 'no' - - # Sync record - str=$(grep "ID='$id'" $USER_DATA/dns/$domain.conf) - str=$(echo "$str" | sed 's/"/\\"/g') - $send_cmd v-insert-dns-record $DNS_USER $domain "$str" 'no' - if [ $? -eq 0 ]; then - # Rebuild dns zone - $send_cmd v-rebuild-dns-domain $DNS_USER $domain 'scheduled' 'no' - if [ $? -ne 0 ]; then - echo "Error: $TYPE connection to $HOST failed (rebuild)" - log_event "$E_CONNECT $EVENT" - exit $E_CONNECT - fi - fi + # Rebuilding dns zone + cluster_cmd v-rebuild-dns-domain $DNS_USER $domain 'yes' 'no' + check_result $? "$HOST connection failed (rebuild)" $E_CONNECT done -# Update pipe -pipe="$VESTA/data/queue/dns-cluster.pipe" -str=$(grep -n "$SCRIPT $1 $2 $3$" $pipe | cut -f1 -d: | head -n1) -if [ ! -z "$str" ]; then - sed -i "$str d" $pipe -fi - #----------------------------------------------------------# # Vesta # #----------------------------------------------------------# +# Updating pipe +pipe="$VESTA/data/queue/dns-cluster.pipe" +str=$(grep -n "$SCRIPT $1 $2 $3$" $pipe | cut -f1 -d: | head -n1) +if [ ! -z "$str" ]; then + sed -i "$str d" $pipe +fi + exit diff --git a/bin/v-change-remote-dns-domain-exp b/bin/v-change-remote-dns-domain-exp index 9cd4a37bd..885f15aef 100755 --- a/bin/v-change-remote-dns-domain-exp +++ b/bin/v-change-remote-dns-domain-exp @@ -28,79 +28,42 @@ validate_format 'user' 'domain' is_system_enabled "$DNS_CLUSTER" 'DNS_CLUSTER' is_object_valid 'user' 'USER' "$user" is_object_valid 'dns' 'DOMAIN' "$domain" - if [ ! -e "$VESTA/conf/dns-cluster.conf" ]; then - echo "Error: dns-cluster.conf doesn't exist" - log_event "$E_NOTEXIST $EVENT" - exit $E_NOTEXIST + check_result $E_NOTEXIST "dns-cluster.conf doesn't exist" fi - -number_of_proc=$(ps auxf | grep -v grep | grep $VESTA/bin/$SCRIPT | wc -l) -if [ "$number_of_proc" -gt 2 ]; then - echo "Error: another sync process already exists" - log_event "$E_EXISTS $EVENT" - exit $E_EXISTS +if [ "$(ps auxf |grep -v grep |grep $BIN/$SCRIPT |wc -l)" -gt 2 ]; then + check_result $E_EXISTS "another sync process already running" fi +remote_dns_health_check #----------------------------------------------------------# # Action # #----------------------------------------------------------# -old_ifs="$IFS" IFS=$'\n' +for cluster in $(grep "SUSPENDED='no'" $VESTA/conf/dns-cluster.conf); do -# Check remote dns nodes -remote_dns_health_check + # Parsing remote host parameters + eval $cluster -for cluster_str in $(grep "SUSPENDED='no'" $VESTA/conf/dns-cluster.conf); do - - # Get host values - eval $cluster_str - - # Check connection type - if [ -z "TYPE" ]; then - TYPE='api' - fi - - # Switch on connection type - case $TYPE in - ssh) send_cmd="send_ssh_cmd" ;; - *) send_cmd="send_api_cmd" ;; - esac - - # Check recipient dns user - if [ -z "$DNS_USER" ]; then - DNS_USER='dns-cluster' - fi - - # Check dns exceptions - if [ -z "$DNS_CLUSTER_IGNORE" ]; then - DNS_CLUSTER_IGNORE='dns-cluster' - fi - - # Sync domain + # Syncing domain str=$(grep "DOMAIN='$domain'" $USER_DATA/dns.conf) - eval $str - $send_cmd v-insert-dns-domain $DNS_USER "$str" $HOSTNAME 'scheduled' - if [ $? -ne 0 ]; then - echo "Error: $TYPE connection to $HOST failed" - log_event "$E_CONNECT $EVENT" - exit $E_CONNECT - fi + cluster_cmd v-insert-dns-domain $DNS_USER "$str" $HOSTNAME 'no' + check_result $? "$HOST connection failed (exp insert)" $E_CONNECT done -# Update pipe -pipe="$VESTA/data/queue/dns-cluster.pipe" -str=$(grep -n "$SCRIPT $1 $2 $3$" $pipe | cut -f1 -d: | head -n1) -if [ ! -z "$str" ]; then - sed -i "$str d" $pipe -fi - #----------------------------------------------------------# # Vesta # #----------------------------------------------------------# +# Updating pipe +pipe="$VESTA/data/queue/dns-cluster.pipe" +str=$(grep -n "$SCRIPT $1 $2 $3$" $pipe | cut -f1 -d: | head -n1) +if [ ! -z "$str" ]; then + sed -i "$str d" $pipe +fi + exit diff --git a/bin/v-change-remote-dns-domain-soa b/bin/v-change-remote-dns-domain-soa index 99734e756..4adf2a4d7 100755 --- a/bin/v-change-remote-dns-domain-soa +++ b/bin/v-change-remote-dns-domain-soa @@ -28,82 +28,46 @@ validate_format 'user' 'domain' is_system_enabled "$DNS_CLUSTER" 'DNS_CLUSTER' is_object_valid 'user' 'USER' "$user" is_object_valid 'dns' 'DOMAIN' "$domain" - if [ ! -e "$VESTA/conf/dns-cluster.conf" ]; then - echo "Error: dns-cluster.conf doesn't exist" - log_event "$E_NOTEXIST $EVENT" - exit $E_NOTEXIST + check_result 1 $E_NOTEXIST "dns-cluster.conf doesn't exist" fi - -number_of_proc=$(ps auxf | grep -v grep | grep $VESTA/bin/$SCRIPT | wc -l) -if [ "$number_of_proc" -gt 2 ]; then - echo "Error: another sync process already exists" - log_event "$E_EXISTS $EVENT" - exit $E_EXISTS +if [ "$(ps auxf |grep -v grep |grep $VESTA/bin/$SCRIPT |wc -l)" -gt 2 ]; then + check_result 1 $E_EXISTS "another sync process already running" fi +remote_dns_health_check #----------------------------------------------------------# # Action # #----------------------------------------------------------# -old_ifs="$IFS" IFS=$'\n' +for cluster in $(grep "SUSPENDED='no'" $VESTA/conf/dns-cluster.conf); do -# Check remote dns nodes -remote_dns_health_check + # Parsing remote host parameters + eval $cluster -for cluster_str in $(grep "SUSPENDED='no'" $VESTA/conf/dns-cluster.conf); do - - # Get host values - eval $cluster_str - - # Check connection type - if [ -z "TYPE" ]; then - TYPE='api' - fi - - # Switch on connection type - case $TYPE in - ssh) send_cmd="send_ssh_cmd" ;; - *) send_cmd="send_api_cmd" ;; - esac - - # Check recipient dns user - if [ -z "$DNS_USER" ]; then - DNS_USER='dns-cluster' - fi - - # Check dns exceptions - if [ -z "$DNS_CLUSTER_IGNORE" ]; then - DNS_CLUSTER_IGNORE='dns-cluster' - fi - - # Sync domain + # Syncing SOA str=$(grep "DOMAIN='$domain'" $USER_DATA/dns.conf) - eval $str - $send_cmd v-insert-dns-domain $DNS_USER "$str" $HOSTNAME 'no' + cluster_cmd v-insert-dns-domain $DNS_USER "$str" $HOSTNAME 'domain' 'no' + check_result $? "$HOST connection failed (sync)" $E_CONNECT - # Rebuild dns zone - $send_cmd v-rebuild-dns-domain $DNS_USER $domain 'scheduled' 'no' - if [ $? -ne 0 ]; then - echo "Error: $TYPE connection to $HOST failed (rebuild)" - log_event "$E_CONNECT $EVENT" - exit $E_CONNECT - fi + # Rebuilding dns zone + cluster_cmd v-rebuild-dns-domain $DNS_USER $domain 'yes' 'no' + check_result $? "$HOST connection failed (rebuild)" $E_CONNECT done -# Update pipe -pipe="$VESTA/data/queue/dns-cluster.pipe" -str=$(grep -n "$SCRIPT $1 $2 $3$" $pipe | cut -f1 -d: | head -n1) -if [ ! -z "$str" ]; then - sed -i "$str d" $pipe -fi - #----------------------------------------------------------# # Vesta # #----------------------------------------------------------# +# Updating pipe +pipe="$VESTA/data/queue/dns-cluster.pipe" +str=$(grep -n "$SCRIPT $1 $2 $3$" $pipe | cut -f1 -d: | head -n1) +if [ ! -z "$str" ]; then + sed -i "$str d" $pipe +fi + exit diff --git a/bin/v-change-remote-dns-domain-ttl b/bin/v-change-remote-dns-domain-ttl index 25ff0e6ad..a03664d79 100755 --- a/bin/v-change-remote-dns-domain-ttl +++ b/bin/v-change-remote-dns-domain-ttl @@ -28,96 +28,46 @@ validate_format 'user' 'domain' is_system_enabled "$DNS_CLUSTER" 'DNS_CLUSTER' is_object_valid 'user' 'USER' "$user" is_object_valid 'dns' 'DOMAIN' "$domain" - if [ ! -e "$VESTA/conf/dns-cluster.conf" ]; then - echo "Error: dns-cluster.conf doesn't exist" - log_event "$E_NOTEXIST $EVENT" - exit $E_NOTEXIST + check_result $E_NOTEXIST "dns-cluster.conf doesn't exist" fi - -number_of_proc=$(ps auxf | grep -v grep | grep $VESTA/bin/$SCRIPT | wc -l) -if [ "$number_of_proc" -gt 2 ]; then - echo "Error: another sync process already exists" - log_event "$E_EXISTS $EVENT" - exit $E_EXISTS +if [ "$(ps auxf |grep -v grep |grep $BIN/$SCRIPT |wc -l)" -gt 2 ]; then + check_result $E_EXISTS "another sync process already running" fi +remote_dns_health_check #----------------------------------------------------------# # Action # #----------------------------------------------------------# -old_ifs="$IFS" IFS=$'\n' +for cluster in $(grep "SUSPENDED='no'" $VESTA/conf/dns-cluster.conf); do -# Check remote dns nodes -remote_dns_health_check + # Parsing remote host parameters + eval $cluster -# Starting cluster loop -for cluster_str in $(grep "SUSPENDED='no'" $VESTA/conf/dns-cluster.conf); do - - # Get host values - eval $cluster_str - - # Check connection type - if [ -z "TYPE" ]; then - TYPE='api' - fi - - # Switch on connection type - case $TYPE in - ssh) send_cmd="send_ssh_cmd" ;; - *) send_cmd="send_api_cmd" ;; - esac - - # Check host connection - $send_cmd v-list-sys-config - if [ $? -ne 0 ]; then - echo "Error: $TYPE connection to $HOST failed" - log_event "$E_CONNECT $EVENT" - exit $E_CONNECT - fi - - # Check recipient dns user - if [ -z "$DNS_USER" ]; then - DNS_USER='dns-cluster' - fi - $send_cmd v-list-user $DNS_USER - if [ $? -ne 0 ]; then - echo "Error: dns user $DNS_USER doesn't exist" - log_event "$E_NOTEXIST $EVENT" - exit $E_NOTEXIST - fi - - # Check dns exceptions - if [ -z "$DNS_CLUSTER_IGNORE" ]; then - DNS_CLUSTER_IGNORE='dns-cluster' - fi - - # Sync domain + # Syncing TTL str=$(grep "DOMAIN='$domain'" $USER_DATA/dns.conf) - eval $str - $send_cmd v-insert-dns-domain $DNS_USER "$str" $HOSTNAME 'no' + cluster_cmd v-insert-dns-domain $DNS_USER "$str" $HOSTNAME 'domain' 'no' + check_result $? "$HOST connection failed (sync)" $E_CONNECT - # Rebuild dns zone - $send_cmd v-rebuild-dns-domain $DNS_USER $domain 'scheduled' 'no' - if [ $? -ne 0 ]; then - echo "Error: $TYPE connection to $HOST failed (rebuild)" - log_event "$E_CONNECT $EVENT" - exit $E_CONNECT - fi + # Rebuilding dns zone + cluster_cmd v-rebuild-dns-domain $DNS_USER $domain 'yes' 'no' + check_result $? "$HOST connection failed (rebuild)" $E_CONNECT done -# Update pipe + +#----------------------------------------------------------# +# Vesta # +#----------------------------------------------------------# + +# Updating pipe pipe="$VESTA/data/queue/dns-cluster.pipe" str=$(grep -n "$SCRIPT $1 $2 $3$" $pipe | cut -f1 -d: | head -n1) if [ ! -z "$str" ]; then sed -i "$str d" $pipe fi -#----------------------------------------------------------# -# Vesta # -#----------------------------------------------------------# - exit diff --git a/bin/v-delete-remote-dns-domain b/bin/v-delete-remote-dns-domain index 1ba782dbc..bbe3d9290 100755 --- a/bin/v-delete-remote-dns-domain +++ b/bin/v-delete-remote-dns-domain @@ -26,84 +26,45 @@ source $VESTA/conf/vesta.conf check_args '2' "$#" 'USER DOMAIN' validate_format 'user' 'domain' is_system_enabled "$DNS_CLUSTER" 'DNS_CLUSTER' - if [ ! -e "$VESTA/conf/dns-cluster.conf" ]; then - echo "Error: dns-cluster.conf doesn't exist" - log_event "$E_NOTEXIST $EVENT" - exit $E_NOTEXIST + check_result $E_NOTEXIST "dns-cluster.conf doesn't exist" fi - -number_of_proc=$(ps auxf | grep -v grep | grep $VESTA/bin/$SCRIPT | wc -l) -if [ "$number_of_proc" -gt 2 ]; then - echo "Error: another sync process already exists" - log_event "$E_EXISTS $EVENT" - exit $E_EXISTS +if [ "$(ps auxf |grep -v grep |grep $BIN/$SCRIPT |wc -l)" -gt 2 ]; then + check_result $E_EXISTS "another sync process already running" fi +remote_dns_health_check #----------------------------------------------------------# # Action # #----------------------------------------------------------# -old_ifs="$IFS" -IFS=$'\n' - # Starting cluster loop -for cluster_str in $(grep "SUSPENDED='no'" $VESTA/conf/dns-cluster.conf); do +IFS=$'\n' +for cluster in $(grep "SUSPENDED='no'" $VESTA/conf/dns-cluster.conf); do - # Get host values - eval $cluster_str + # Parsing remote host parameters + eval $cluster - # Check connection type - if [ -z "TYPE" ]; then - TYPE='api' + # Syncing domain + cluster_cmd v-delete-dns-domain $DNS_USER $domain 'yes' + rc=$? + if [ "$rc" -ne 0 ] && [ $rc -ne 3 ]; then + check_result $rc "$HOST connection failed (sync)" $E_CONNECT fi - # Switch on connection type - case $TYPE in - ssh) send_cmd="send_ssh_cmd" ;; - *) send_cmd="send_api_cmd" ;; - esac - - # Check host connection - $send_cmd v-list-sys-config - if [ $? -ne 0 ]; then - echo "Error: $TYPE connection to $HOST failed" - log_event "$E_CONNECT $EVENT" - exit $E_CONNECT - fi - - # Check recipient dns user - if [ -z "$DNS_USER" ]; then - DNS_USER='dns-cluster' - fi - $send_cmd v-list-user $DNS_USER - if [ $? -ne 0 ]; then - echo "Error: dns user $DNS_USER doesn't exist" - log_event "$E_NOTEXIST $EVENT" - exit $E_NOTEXIST - fi - - # Check dns exceptions - if [ -z "$DNS_CLUSTER_IGNORE" ]; then - DNS_CLUSTER_IGNORE='dns-cluster' - fi - - # Sync domain - $send_cmd v-delete-dns-domain $DNS_USER $domain 'scheduled' - done -# Update pipe -pipe="$VESTA/data/queue/dns-cluster.pipe" -str=$(grep -n "$SCRIPT $1 $2$" $pipe | cut -f1 -d: | head -n1) -if [ ! -z "$str" ]; then - sed -i "$str d" $pipe -fi - #----------------------------------------------------------# # Vesta # #----------------------------------------------------------# +# Updating pipe +pipe="$VESTA/data/queue/dns-cluster.pipe" +str=$(grep -n "$SCRIPT $1 $2$" $pipe | cut -f1 -d: | head -n1) +if [ ! -z "$str" ]; then + sed -i "$str d" $pipe +fi + exit diff --git a/bin/v-delete-remote-dns-domains b/bin/v-delete-remote-dns-domains index c2e2300f5..bb8c9b7ca 100755 --- a/bin/v-delete-remote-dns-domains +++ b/bin/v-delete-remote-dns-domains @@ -22,26 +22,19 @@ source $VESTA/conf/vesta.conf #----------------------------------------------------------# is_system_enabled "$DNS_CLUSTER" 'DNS_CLUSTER' - if [ ! -e "$VESTA/conf/dns-cluster.conf" ]; then - echo "Error: dns-cluster.conf doesn't exist" - log_event "$E_NOTEXIST $EVENT" - exit $E_NOTEXIST + check_result $E_NOTEXIST "dns-cluster.conf doesn't exist" fi - -number_of_proc=$(ps auxf | grep -v grep | grep $VESTA/bin/$SCRIPT | wc -l) -if [ "$number_of_proc" -gt 2 ]; then - echo "Error: another sync process already exists" - log_event "$E_EXISTS $EVENT" - exit $E_EXISTS +if [ "$(ps auxf |grep -v grep |grep $BIN/$SCRIPT |wc -l)" -gt 2 ]; then + check_result $E_EXISTS "another sync process already running" fi +remote_dns_health_check #----------------------------------------------------------# # Action # #----------------------------------------------------------# -old_ifs="$IFS" IFS=$'\n' if [ -z $host ]; then @@ -51,65 +44,18 @@ else fi # Starting cluster loop -for cluster_str in $hosts; do +for cluster in $hosts; do - # Get host values - eval $cluster_str + # Parsing remote host parameters + eval $cluster - # Check connection type - if [ -z "TYPE" ]; then - TYPE='api' - fi + # Deleting source records + cluster_cmd v-delete-dns-domains-src $DNS_USER $HOSTNAME 'no' + check_result $? "$HOST connection failed (cleanup)" $E_CONNECT - # Print hostname - if [ ! -z "$verbose" ]; then - echo "HOSTNAME: $HOSTNAME" - echo "TYPE: $TYPE" - fi - - # Switch on connection type - case $TYPE in - ssh) send_cmd="send_ssh_cmd" ;; - *) send_cmd="send_api_cmd" ;; - esac - - # Check host connection - $send_cmd v-list-sys-config - if [ $? -ne 0 ]; then - echo "Error: $TYPE connection to $HOST failed" - log_event "$E_CONNECT $EVENT" - exit $E_CONNECT - fi - - # Check recipient dns user - if [ -z "$DNS_USER" ]; then - DNS_USER='dns-cluster' - fi - if [ ! -z "$verbose" ]; then - echo "DNS_USER: $DNS_USER" - fi - $send_cmd v-list-user $DNS_USER - if [ $? -ne 0 ]; then - echo "Error: dns user $DNS_USER doesn't exist" - log_event "$E_NOTEXIST $EVENT" - exit $E_NOTEXIST - fi - - # Clean source records - $send_cmd v-delete-dns-domains-src $DNS_USER $HOSTNAME 'no' - if [ $? -ne 0 ]; then - echo "Error: $TYPE connection to $HOST failed (cleanup)" - log_event "$E_CONNECT $EVENT" - exit $E_CONNECT - fi - - # Rebuild dns zones - $send_cmd v-rebuild-dns-domains $DNS_USER 'scheduled' - if [ $? -ne 0 ]; then - echo "Error: $TYPE connection to $HOST failed (rebuild)" - log_event "$E_CONNECT $EVENT" - exit $E_CONNECT - fi + # Rebuilding dns zones + $send_cmd v-rebuild-dns-domains $DNS_USER 'yes' + check_result $? "$HOST connection failed (rebuild)" $E_CONNECT done @@ -118,4 +64,11 @@ done # Vesta # #----------------------------------------------------------# +# Updating pipe +pipe="$VESTA/data/queue/dns-cluster.pipe" +str=$(grep -n "$SCRIPT $1 $2$" $pipe | cut -f1 -d: | head -n1) +if [ ! -z "$str" ]; then + sed -i "$str d" $pipe +fi + exit diff --git a/bin/v-delete-remote-dns-host b/bin/v-delete-remote-dns-host index e82cad688..344ece6df 100755 --- a/bin/v-delete-remote-dns-host +++ b/bin/v-delete-remote-dns-host @@ -32,25 +32,13 @@ is_object_valid "../../conf/dns-cluster" 'HOST' "$host" # Action # #----------------------------------------------------------# -eval $(grep $host $VESTA/conf/dns-cluster.conf) -case $TYPE in - ssh) send_cmd="send_ssh_cmd" ;; - *) send_cmd="send_api_cmd" ;; -esac - - -# Check host connection -$send_cmd v-list-sys-config -if [ $? -eq 0 ]; then - # Deleting domains - $BIN/v-delete-remote-dns-domains $host >>/dev/null 2>&1 - $send_cmd v-add-cron-restart-job -fi +# Deleting remote domains +$BIN/v-delete-remote-dns-domains $host >>/dev/null 2>&1 # Deleting server sed -i "/HOST='$host' /d" $VESTA/conf/dns-cluster.conf -# Delete DNS_CLUSTER key +# Deleting DNS_CLUSTER key check_cluster=$(grep HOST $VESTA/conf/dns-cluster.conf |wc -l) if [ "$check_cluster" -eq '0' ]; then rm -f $VESTA/conf/dns-cluster.conf diff --git a/bin/v-delete-remote-dns-record b/bin/v-delete-remote-dns-record index 29102f6e6..0c09d68cc 100755 --- a/bin/v-delete-remote-dns-record +++ b/bin/v-delete-remote-dns-record @@ -27,79 +27,53 @@ source $VESTA/conf/vesta.conf check_args '3' "$#" 'USER DOMAIN ID' validate_format 'user' 'domain' 'id' is_system_enabled "$DNS_CLUSTER" 'DNS_CLUSTER' - if [ ! -e "$VESTA/conf/dns-cluster.conf" ]; then - echo "Error: dns-cluster.conf doesn't exist" - log_event "$E_NOTEXIST $EVENT" - exit $E_NOTEXIST + check_result $E_NOTEXIST "dns-cluster.conf doesn't exist" fi - -number_of_proc=$(ps auxf | grep -v grep | grep $VESTA/bin/$SCRIPT | wc -l) -if [ "$number_of_proc" -gt 2 ]; then - echo "Error: another sync process already exists" - log_event "$E_EXISTS $EVENT" - exit $E_EXISTS +if [ "$(ps auxf |grep -v grep |grep $BIN/$SCRIPT |wc -l)" -gt 2 ]; then + check_result $E_EXISTS "another sync process already running" fi +remote_dns_health_check #----------------------------------------------------------# # Action # #----------------------------------------------------------# -old_ifs="$IFS" -IFS=$'\n' # Starting cluster loop -for cluster_str in $(cat $VESTA/conf/dns-cluster.conf); do +IFS=$'\n' +for cluster in $(cat $VESTA/conf/dns-cluster.conf); do - # Get host values - eval $cluster_str + # Parsing remote host parameters + eval $cluster - # Check connection type - if [ -z "TYPE" ]; then - TYPE='api' - fi - - # Switch on connection type - case $TYPE in - ssh) send_cmd="send_ssh_cmd" ;; - *) send_cmd="send_api_cmd" ;; - esac - - # Check host connection - $send_cmd v-list-sys-config - if [ $? -ne 0 ]; then - echo "Error: $TYPE connection to $HOST failed" - log_event "$E_CONNECT $EVENT" - exit $E_CONNECT - fi - - # Check recipient dns user - if [ -z "$DNS_USER" ]; then - DNS_USER='dns-cluster' - fi - $send_cmd v-list-user $DNS_USER - if [ $? -ne 0 ]; then - echo "Error: dns user $DNS_USER doesn't exist" - log_event "$E_NOTEXIST $EVENT" - exit $E_NOTEXIST - fi + # Syncing serial + str=$(grep "DOMAIN='$domain'" $USER_DATA/dns.conf) + cluster_cmd v-insert-dns-domain $DNS_USER "$str" $HOSTNAME 'domain' 'no' + check_result $? "$HOST connection failed (soa sync)" $E_CONNECT # Sync domain - $send_cmd v-delete-dns-record $DNS_USER $domain $id 'scheduled' + cluster_cmd v-delete-dns-record $DNS_USER $domain $id 'no' + check_result $? "$HOST connection failed (rebuild)" $E_CONNECT + + # Rebuilding dns zone + cluster_cmd v-rebuild-dns-domain $DNS_USER $domain 'yes' 'no' + check_result $? "$HOST connection failed (rebuild)" $E_CONNECT done -# Update pipe -pipe="$VESTA/data/queue/dns-cluster.pipe" -str=$(grep -n "$SCRIPT $1 $2 $3$" $pipe | cut -f1 -d: | head -n1) -if [ ! -z "$str" ]; then - sed -i "$str d" $pipe -fi #----------------------------------------------------------# # Vesta # #----------------------------------------------------------# +# Updating pipe +pipe="$VESTA/data/queue/dns-cluster.pipe" +str=$(grep -n "$SCRIPT $1 $2 $3$" $pipe | cut -f1 -d: | head -n1) +if [ ! -z "$str" ]; then + sed -i "$str d" $pipe +fi + exit diff --git a/bin/v-insert-dns-domain b/bin/v-insert-dns-domain index be98ac3ff..fcd548ae7 100755 --- a/bin/v-insert-dns-domain +++ b/bin/v-insert-dns-domain @@ -26,7 +26,7 @@ source $VESTA/conf/vesta.conf # Verifications # #----------------------------------------------------------# -check_args '2' "$#" 'USER DATA [SRC] [RESTART]' +check_args '2' "$#" 'USER DATA [SRC] [FLUSH] [RESTART]' validate_format 'user' 'data' is_system_enabled "$DNS_SYSTEM" 'DNS_SYSTEM' is_object_valid 'user' 'USER' "$user" @@ -47,11 +47,10 @@ if [ "$flush" = 'records' ]; then rm -f $USER_DATA/dns/$DOMAIN.conf touch $USER_DATA/dns/$DOMAIN.conf chmod 660 $USER_DATA/dns/$DOMAIN.conf - exit fi # Flush domain -if [ "$flush" = 'domain' ]; then +if [ "$flush" ! = 'no' ]; then sed -i "/DOMAIN='$DOMAIN'/d" $USER_DATA/dns.conf 2> /dev/null fi diff --git a/bin/v-sync-dns-cluster b/bin/v-sync-dns-cluster index ac0045184..d4a1e00db 100755 --- a/bin/v-sync-dns-cluster +++ b/bin/v-sync-dns-cluster @@ -10,7 +10,6 @@ # Argument defenition host=$1 -verbose=$2 # Includes source $VESTA/func/main.sh @@ -23,146 +22,60 @@ source $VESTA/conf/vesta.conf #----------------------------------------------------------# is_system_enabled "$DNS_CLUSTER" 'DNS_CLUSTER' - if [ ! -e "$VESTA/conf/dns-cluster.conf" ]; then - echo "Error: dns-cluster.conf doesn't exist" - log_event "$E_NOTEXIST $EVENT" - exit $E_NOTEXIST + check_result $E_NOTEXIST "dns-cluster.conf doesn't exist" fi - -number_of_proc=$(ps auxf | grep -v grep | grep $VESTA/bin/$SCRIPT | wc -l) -if [ "$number_of_proc" -gt 2 ]; then - echo "Error: another sync process already exists" - log_event "$E_EXISTS $EVENT" - exit $E_EXISTS +if [ "$(ps auxf |grep -v grep |grep $BIN/$SCRIPT |wc -l)" -gt 2 ]; then + check_result $E_EXISTS "another sync process already running" fi +remote_dns_health_check 'no_email' #----------------------------------------------------------# # Action # #----------------------------------------------------------# -old_ifs="$IFS" +# Selecting remote hosts IFS=$'\n' - if [ -z $host ]; then - hosts=$(cat $VESTA/conf/dns-cluster.conf | grep "SUSPENDED='no'") - rm -f $VESTA/data/queue/dns-cluster.pipe - touch $VESTA/data/queue/dns-cluster.pipe - chmod 660 $VESTA/data/queue/dns-cluster.pipe + hosts=$(cat $VESTA/conf/dns-cluster.conf |grep "SUSPENDED='no'") else hosts=$(grep "HOST='$host'" $VESTA/conf/dns-cluster.conf) fi # Starting cluster loop -for cluster_str in $hosts; do +for cluster in $hosts; do - # Get host values - eval $cluster_str + # Parsing host values + eval $cluster - # Check connection type - if [ -z "TYPE" ]; then - TYPE='api' - fi + # Wiping remote domains + cluster_cmd v-delete-dns-domains-src $DNS_USER $HOSTNAME no + check_result $? "$HOST connection failed" $E_CONNECT - # Print hostname - if [ ! -z "$verbose" ]; then - echo "HOSTNAME: $HOSTNAME" - echo "TYPE: $TYPE" - fi - - # Switch on connection type - case $TYPE in - ssh) send_cmd="send_ssh_cmd" ;; - *) send_cmd="send_api_cmd" ;; - esac - - # Check host connection - $send_cmd v-list-sys-config - if [ $? -ne 0 ]; then - echo "Error: $TYPE connection to $HOST failed" - log_event "$E_CONNECT $EVENT" - exit $E_CONNECT - fi - - # Check recipient dns user - if [ -z "$DNS_USER" ]; then - DNS_USER='dns-cluster' - fi - if [ ! -z "$verbose" ]; then - echo "DNS_USER: $DNS_USER" - fi - $send_cmd v-list-user $DNS_USER - if [ $? -ne 0 ]; then - echo "Error: dns user $DNS_USER doesn't exist" - log_event "$E_NOTEXIST $EVENT" - exit $E_NOTEXIST - fi - - # Check dns exceptions - if [ -z "$DNS_CLUSTER_IGNORE" ]; then - DNS_CLUSTER_IGNORE='dns-cluster' - fi - - # Create userlist - user_list=$(ls $VESTA/data/users) - for exception in $(echo -e "${DNS_CLUSTER_IGNORE//,/\n}"); do - user_list=$(echo "$user_list" | grep -v "^$exception$") - done - - # Clean source records - if [ ! -z "$verbose" ]; then - echo "STATUS: Wiping dns domains" - fi - $send_cmd v-delete-dns-domains-src $DNS_USER $HOSTNAME no - if [ $? -ne 0 ]; then - echo "Error: $TYPE connection to $HOST failed (cleanup)" - log_event "$E_CONNECT $EVENT" - exit $E_CONNECT - fi - - # Start user loop + # Syncing user domains + user_list=$(ls $VESTA/data/users |grep -v "dns-cluster") for user in $user_list; do - - # Sync domain for str in $(cat $VESTA/data/users/$user/dns.conf); do - eval $str - if [ ! -z "$verbose" ]; then - echo "DOMAIN: $DOMAIN index" - fi - $send_cmd v-insert-dns-domain $DNS_USER "$str" $HOSTNAME - if [ $? -eq 0 ]; then - if [ ! -z "$verbose" ]; then - echo "DOMAIN: $DOMAIN records" - fi - # Sync record - if [ "$TYPE" = 'ssh' ]; then - tmp=$(mktemp -u) - scp_cmd $USER_DATA/$user/dns/$DOMAIN.conf $tmp - $send_cmd v-insert-dns-records $DNS_USER $DOMAIN $tmp - else - for str in $(cat $USER_DATA/$user/dns/$DOMAIN.conf); do - str=$(echo "$str" | sed 's/"/\\"/g') - $send_cmd v-insert-dns-record \ - $DNS_USER $DOMAIN "$str" - done - fi - else - if [ ! -z "$verbose" ]; then - echo "DOMAIN: $DOMAIN skiping records (not uniq)" - fi - fi + # Syncing domain index + eval $str + cluster_cmd v-insert-dns-domain $DNS_USER "$str" $HOSTNAME ' ' no + check_result $? "$HOST connection failed" $E_CONNECT + + # Syncing domain records + tmp_file="/tmp/vst-sync.$DOMAIN" + cluster_file $USER_DATA/$user/dns/$DOMAIN.conf $tmp_file + check_result $? "$HOST connection failed" $E_CONNECT + + cluster_cmd v-insert-dns-records $DNS_USER $DOMAIN $tmp_file 'no' + check_result $? "$HOST connection failed" $E_CONNECT done done - # Rebuild dns zones - $send_cmd v-rebuild-dns-domains $DNS_USER - if [ $? -ne 0 ]; then - echo "Error: $TYPE connection to $HOST failed (rebuild)" - log_event "$E_CONNECT $EVENT" - exit $E_CONNECT - fi + # Rebuilding dns zones + cluster_cmd v-rebuild-dns-domains $DNS_USER + check_result $? "$TYPE connection to $HOST failed" $E_CONNECT done @@ -171,4 +84,9 @@ done # Vesta # #----------------------------------------------------------# +# Flushing dns-cluster queue +rm -f $VESTA/data/queue/dns-cluster.pipe +touch $VESTA/data/queue/dns-cluster.pipe +chmod 660 $VESTA/data/queue/dns-cluster.pipe + exit From bff45302f62da4576a0380bdb0c632e274f89e7c Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Wed, 21 Oct 2015 15:55:07 +0300 Subject: [PATCH 093/264] Fix for bulk actions --- bin/v-add-domain | 39 +++++++++--------- bin/v-delete-domain | 53 +++++++++++++------------ bin/v-suspend-domain | 90 ++++++++++++++++++++++++++++++++++++++++++ bin/v-unsuspend-domain | 89 +++++++++++++++++++++++++++++++++++++++++ web/bulk/web/index.php | 49 ++++++----------------- 5 files changed, 237 insertions(+), 83 deletions(-) create mode 100755 bin/v-suspend-domain create mode 100755 bin/v-unsuspend-domain diff --git a/bin/v-add-domain b/bin/v-add-domain index cf0e22abe..0af33c0d3 100755 --- a/bin/v-add-domain +++ b/bin/v-add-domain @@ -47,37 +47,34 @@ if [ -z "$ip" ]; then fi fi -# Web domain +# Working on web domain if [ ! -z "$WEB_SYSTEM" ]; then $BIN/v-add-web-domain $user $domain $ip 'no' - return_code=$? + check_result $? "can't add web domain" >/dev/null fi -# Proxy support -if [ ! -z "$PROXY_SYSTEM" ] && [ "$return_code" -eq 0 ]; then - extentions="jpg,jpeg,gif,png,ico,svg,css,zip,tgz,gz,rar,bz2,doc,xls" - extentions="$extentions,exe,pdf,ppt,txt,odt,ods,odp,odf,tar,wav" - extentions="$extentions,bmp,rtf,js,mp3,avi,mpeg,flv,html,htm" - $BIN/v-add-web-domain-proxy $user $domain 'default' "$extentions" 'no' +# Working on DNS domain +if [ ! -z "$DNS_SYSTEM" ]; then + $BIN/v-add-dns-domain $user $domain $ip "" "" "" "" "" 'no' + check_result $? "can't add dns domain" >/dev/null fi -# DNS domain -if [ ! -z "$DNS_SYSTEM" ] && [ "$return_code" -eq 0 ]; then - $BIN/v-add-dns-domain $user $domain $ip 'no' - return_code=$? -fi - -# Mail domain -if [ ! -z "$MAIL_SYSTEM" ] && [ "$return_code" -eq 0 ]; then +# Working on mail domain +if [ ! -z "$MAIL_SYSTEM" ]; then $BIN/v-add-mail-domain $user $domain - return_code=$? + check_result $? "can't add mail domain" >/dev/null fi -# Restart services -if [ "$restart" != 'no' ] && [ "$return_code" -eq 0 ]; then +# Restarting services +if [ "$restart" != 'no' ]; then $BIN/v-restart-web - $BIN/v-restart-proxy + check_result $? "can't restart web" > /dev/null + if [ ! -z "$PROXY_SYSTEM" ]; then + $BIN/v-restart-proxy + check_result $? "can't restart proxy" > /dev/null + fi $BIN/v-restart-dns + check_result $? "can't restart dns" > /dev/null fi @@ -85,4 +82,4 @@ fi # Vesta # #----------------------------------------------------------# -exit $return_code +exit diff --git a/bin/v-delete-domain b/bin/v-delete-domain index deb4f2164..63584c98f 100755 --- a/bin/v-delete-domain +++ b/bin/v-delete-domain @@ -16,7 +16,6 @@ restart="${3-yes}" # Includes source $VESTA/func/main.sh -source $VESTA/func/ip.sh source $VESTA/conf/vesta.conf @@ -34,51 +33,53 @@ is_object_unsuspended 'user' 'USER' "$user" # Action # #----------------------------------------------------------# -# Web domain -if [ ! -z "$WEB_SYSTEM" ] && [ "$WEB_SYSTEM" != 'no' ]; then - check_web=$(grep "DOMAIN='$domain'" $USER_DATA/web.conf) - if [ ! -z "$check_web" ]; then +# Working on Web domain +if [ ! -z "$WEB_SYSTEM" ]; then + str=$(grep "DOMAIN='$domain'" $USER_DATA/web.conf |grep "SUSPENDED='no") + if [ ! -z "$str" ]; then + domain_found='yes' $BIN/v-delete-web-domain $user $domain 'no' - if [ $? -ne 0 ]; then - exit $E_RESTART - fi + check_result $? "can't suspend web" > /dev/null fi fi -# DNS domain -if [ ! -z "$DNS_SYSTEM" ] && [ "$DNS_SYSTEM" != 'no' ]; then - check_dns=$(grep "DOMAIN='$domain'" $USER_DATA/dns.conf) - if [ ! -z "$check_dns" ]; then +# Working on DNS domain +if [ ! -z "$DNS_SYSTEM" ]; then + str=$(grep "DOMAIN='$domain'" $USER_DATA/dns.conf |grep "SUSPENDED='no") + if [ ! -z "$str" ]; then + domain_found='yes' $BIN/v-delete-dns-domain $user $domain 'no' - if [ $? -ne 0 ]; then - exit $E_RESTART - fi + check_result $? "can't suspend dns" > /dev/null fi fi -# Mail domain -if [ ! -z "$MAIL_SYSTEM" ] && [ "$MAIL_SYSTEM" != 'no' ]; then - check_mail=$(grep "DOMAIN='$domain'" $USER_DATA/mail.conf) - if [ ! -z "$check_mail" ]; then +# Working on Mail domain +if [ ! -z "$MAIL_SYSTEM" ]; then + str=$(grep "DOMAIN='$domain'" $USER_DATA/mail.conf |grep "SUSPENDED='no") + if [ ! -z "$str" ]; then + domain_found='yes' $BIN/v-delete-mail-domain $user $domain - if [ $? -ne 0 ]; then - exit $E_RESTART - fi + check_result $? "can't suspend mail" > /dev/null fi fi -# Check domain status -if [ -z "$check_web" ] && [ -z "$check_dns" ] && [ -z "$check_mail" ]; then +# Checking domain search result +if [ -z "$domain_found" ]; then echo "Error: domain $domain doesn't exist" log_event "$E_NOTEXIST" "$EVENT" exit $E_NOTEXIST fi -# Restart services +# Restarting services if [ "$restart" != 'no' ]; then $BIN/v-restart-web - $BIN/v-restart-proxy + check_result $? "can't restart web" > /dev/null + if [ ! -z "$PROXY_SYSTEM" ]; then + $BIN/v-restart-proxy + check_result $? "can't restart proxy" > /dev/null + fi $BIN/v-restart-dns + check_result $? "can't restart dns" > /dev/null fi diff --git a/bin/v-suspend-domain b/bin/v-suspend-domain new file mode 100755 index 000000000..35dd89669 --- /dev/null +++ b/bin/v-suspend-domain @@ -0,0 +1,90 @@ +#!/bin/bash +# info: suspend web/dns/mail domain +# options: USER DOMAIN +# +# The function suspends web/dns/mail domain. + + +#----------------------------------------------------------# +# Variable&Function # +#----------------------------------------------------------# + +# Argument defenition +user=$1 +domain=$2 +restart="${3-yes}" + +# Includes +source $VESTA/func/main.sh +source $VESTA/conf/vesta.conf + + +#----------------------------------------------------------# +# Verifications # +#----------------------------------------------------------# + +check_args '2' "$#" 'USER DOMAIN' +validate_format 'user' 'domain' +is_object_valid 'user' 'USER' "$user" +is_object_unsuspended 'user' 'USER' "$user" + + +#----------------------------------------------------------# +# Action # +#----------------------------------------------------------# + +# Working on Web domain +if [ ! -z "$WEB_SYSTEM" ]; then + str=$(grep "DOMAIN='$domain'" $USER_DATA/web.conf |grep "SUSPENDED='no") + if [ ! -z "$str" ]; then + domain_found='yes' + $BIN/v-suspend-web-domain $user $domain 'no' + check_result $? "can't suspend web" > /dev/null + fi +fi + +# Working on DNS domain +if [ ! -z "$DNS_SYSTEM" ]; then + str=$(grep "DOMAIN='$domain'" $USER_DATA/dns.conf |grep "SUSPENDED='no") + if [ ! -z "$str" ]; then + domain_found='yes' + $BIN/v-suspend-dns-domain $user $domain 'no' + check_result $? "can't suspend dns" > /dev/null + fi +fi + +# Working on Mail domain +if [ ! -z "$MAIL_SYSTEM" ]; then + str=$(grep "DOMAIN='$domain'" $USER_DATA/mail.conf |grep "SUSPENDED='no") + if [ ! -z "$str" ]; then + domain_found='yes' + $BIN/v-suspend-mail-domain $user $domain + check_result $? "can't suspend mail" > /dev/null + fi +fi + +# Checking domain search result +if [ -z "$domain_found" ]; then + echo "Error: domain $domain doesn't exist" + log_event "$E_NOTEXIST" "$EVENT" + exit $E_NOTEXIST +fi + +# Restarting services +if [ "$restart" != 'no' ]; then + $BIN/v-restart-web + check_result $? "can't restart web" > /dev/null + if [ ! -z "$PROXY_SYSTEM" ]; then + $BIN/v-restart-proxy + check_result $? "can't restart proxy" > /dev/null + fi + $BIN/v-restart-dns + check_result $? "can't restart dns" > /dev/null +fi + + +#----------------------------------------------------------# +# Vesta # +#----------------------------------------------------------# + +exit diff --git a/bin/v-unsuspend-domain b/bin/v-unsuspend-domain new file mode 100755 index 000000000..c53a06002 --- /dev/null +++ b/bin/v-unsuspend-domain @@ -0,0 +1,89 @@ +#!/bin/bash +# info: unsuspend web/dns/mail domain +# options: USER DOMAIN +# +# The function unsuspends web/dns/mail domain. + + +#----------------------------------------------------------# +# Variable&Function # +#----------------------------------------------------------# + +# Argument defenition +user=$1 +domain=$2 +restart="${3-yes}" + +# Includes +source $VESTA/func/main.sh +source $VESTA/conf/vesta.conf + + +#----------------------------------------------------------# +# Verifications # +#----------------------------------------------------------# + +check_args '2' "$#" 'USER DOMAIN' +validate_format 'user' 'domain' +is_object_valid 'user' 'USER' "$user" + + +#----------------------------------------------------------# +# Action # +#----------------------------------------------------------# + +# Working on Web domain +if [ ! -z "$WEB_SYSTEM" ]; then + str=$(grep "DOMAIN='$domain'" $USER_DATA/web.conf |grep "SUSPENDED='yes") + if [ ! -z "$str" ]; then + domain_found='yes' + $BIN/v-unsuspend-web-domain $user $domain 'no' + check_result $? "can't suspend web" > /dev/null + fi +fi + +# Working on DNS domain +if [ ! -z "$DNS_SYSTEM" ]; then + str=$(grep "DOMAIN='$domain'" $USER_DATA/dns.conf |grep "SUSPENDED='yes") + if [ ! -z "$str" ]; then + domain_found='yes' + $BIN/v-unsuspend-dns-domain $user $domain 'no' + check_result $? "can't suspend dns" > /dev/null + fi +fi + +# Working on Mail domain +if [ ! -z "$MAIL_SYSTEM" ]; then + str=$(grep "DOMAIN='$domain'" $USER_DATA/mail.conf |grep "SUSPENDED='yes") + if [ ! -z "$str" ]; then + domain_found='yes' + $BIN/v-unsuspend-mail-domain $user $domain + check_result $? "can't suspend mail" > /dev/null + fi +fi + +# Checking domain search result +if [ -z "$domain_found" ]; then + echo "Error: domain $domain doesn't exist" + log_event "$E_NOTEXIST" "$EVENT" + exit $E_NOTEXIST +fi + +# Restarting services +if [ "$restart" != 'no' ]; then + $BIN/v-restart-web + check_result $? "can't restart web" > /dev/null + if [ ! -z "$PROXY_SYSTEM" ]; then + $BIN/v-restart-proxy + check_result $? "can't restart proxy" > /dev/null + fi + $BIN/v-restart-dns + check_result $? "can't restart dns" > /dev/null +fi + + +#----------------------------------------------------------# +# Vesta # +#----------------------------------------------------------# + +exit diff --git a/web/bulk/web/index.php b/web/bulk/web/index.php index debeda53f..d7bc3c9a9 100644 --- a/web/bulk/web/index.php +++ b/web/bulk/web/index.php @@ -17,59 +17,36 @@ $action = $_POST['action']; if ($_SESSION['user'] == 'admin') { switch ($action) { - case 'delete': $cmd='v-delete-web-domain'; - $cmd_dns='v-delete-dns-domain'; - $cmd_mail='v-delete-mail-domain'; + case 'delete': $cmd='v-delete-domain'; break; - case 'suspend': $cmd='v-suspend-web-domain'; - $cmd_dns='v-suspend-dns-domain'; - $cmd_mail='v-suspend-mail-domain'; + case 'suspend': $cmd='v-suspend-domain'; break; - case 'unsuspend': $cmd='v-unsuspend-web-domain'; - $cmd_dns='v-unsuspend-dns-domain'; - $cmd_mail='v-unsuspend-mail-domain'; + case 'unsuspend': $cmd='v-unsuspend-domain'; break; default: header("Location: /list/web/"); exit; } } else { switch ($action) { - case 'delete': $cmd='v-delete-web-domain'; - $cmd_dns='v-delete-dns-domain'; - $cmd_mail='v-delete-mail-domain'; + case 'delete': $cmd='v-web-domain'; break; default: header("Location: /list/web/"); exit; } } +print_r($_POST); + foreach ($domain as $value) { - // WEB $value = escapeshellarg($value); - exec (VESTA_CMD.$cmd." ".$user." ".$value." no", $output, $return_var); - $restart_web = 'yes'; - - // DNS - if ($return_var == 0) { - exec (VESTA_CMD."v-list-dns-domain ".$user." ".$value." json", $output, $lreturn_var); - if ($lreturn_var == 0 ) { - exec (VESTA_CMD.$cmd_dns." ".$user." ".$value." no", $output, $return_var); - $restart_dns = 'yes'; - } - } - - // Mail - if ($return_var == 0) { - exec (VESTA_CMD."v-list-mail-domain ".$user." ".$value." json", $output, $lreturn_var); - if ($lreturn_var == 0 ) { - exec (VESTA_CMD.$cmd_mail." ".$user." ".$value." no", $output, $return_var); - } - } + echo VESTA_CMD.$cmd." ".$user." ".$value." no"; +// exec (VESTA_CMD.$cmd." ".$user." ".$value." no", $output, $return_var); + $restart='yes'; } -if (!empty($restart_web)) { +exit(); + +if (isset($restart)) { exec (VESTA_CMD."v-restart-web", $output, $return_var); -} - -if (!empty($restart_dns)) { + exec (VESTA_CMD."v-restart-proxy", $output, $return_var); exec (VESTA_CMD."v-restart-dns", $output, $return_var); } From a9cbdfe6ffb7d9740e09ef182c2805ddc7bbe0d9 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Wed, 21 Oct 2015 15:56:19 +0300 Subject: [PATCH 094/264] Fix for borken exlucssion missing symlinks and hidden files --- bin/v-add-backup-host | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/bin/v-add-backup-host b/bin/v-add-backup-host index e46c1d216..7cf08fe30 100755 --- a/bin/v-add-backup-host +++ b/bin/v-add-backup-host @@ -13,7 +13,7 @@ type=$1 host=$2 user=$3 -password=$4 +password=$4; HIDE=4 path=${5-/backup} port=$6 @@ -21,10 +21,6 @@ port=$6 source $VESTA/func/main.sh source $VESTA/conf/vesta.conf -# Hiding password -A4='******' -EVENT="$DATE $TIME $SCRIPT $A1 $A2 $A3 $A4 $A5 $A6 $A7 $A8 $A9" - # Defining ftp command function ftpc() { ftp -p -n $host $port < Date: Wed, 21 Oct 2015 15:57:54 +0300 Subject: [PATCH 095/264] New syntax to hide password from logger --- bin/v-add-database | 6 +- bin/v-add-database-host | 6 +- bin/v-add-mail-account | 6 +- bin/v-add-user | 6 +- bin/v-add-web-domain-ftp | 6 +- bin/v-add-web-domain-httpauth | 6 +- bin/v-add-web-domain-stats-user | 6 +- bin/v-backup-user | 88 ++++++++++++++-------------- bin/v-change-database-host-password | 6 +- bin/v-change-database-password | 6 +- bin/v-change-database-user | 6 +- bin/v-change-mail-account-password | 6 +- bin/v-change-user-password | 6 +- bin/v-change-web-domain-ftp-password | 6 +- bin/v-change-web-domain-httpauth | 6 +- 15 files changed, 57 insertions(+), 115 deletions(-) diff --git a/bin/v-add-database b/bin/v-add-database index d4d791784..a3c3ff453 100755 --- a/bin/v-add-database +++ b/bin/v-add-database @@ -19,7 +19,7 @@ user=$1 database="$user"_"$2" dbuser="$user"_"$3" -password=$4 +password=$4; HIDE=4 type=${5-mysql} host=$6 charset=${7-UTF8} @@ -30,10 +30,6 @@ source $VESTA/func/main.sh source $VESTA/func/db.sh source $VESTA/conf/vesta.conf -# Hiding password -A4='******' -EVENT="$DATE $TIME $SCRIPT $A1 $A2 $A3 $A4 $A5 $A6 $A7 $A8 $A9" - #----------------------------------------------------------# # Verifications # diff --git a/bin/v-add-database-host b/bin/v-add-database-host index ead97aec3..cf0862eca 100755 --- a/bin/v-add-database-host +++ b/bin/v-add-database-host @@ -17,7 +17,7 @@ type=$1 host=$2 dbuser=$3 -password=$4 +password=$4; HIDE=4 max_db=${6-500} charsets=${7-UTF8,LATIN1,WIN1250,WIN1251,WIN1252,WIN1256,WIN1258,KOI8} template=${8-template1} @@ -27,10 +27,6 @@ source $VESTA/func/main.sh source $VESTA/func/db.sh source $VESTA/conf/vesta.conf -# Hiding password -A4='******' -EVENT="$DATE $TIME $SCRIPT $A1 $A2 $A3 $A4 $A5 $A6 $A7 $A8 $A9" - is_mysql_host_alive() { mycnf=$(mktemp) echo "[client]">$mycnf diff --git a/bin/v-add-mail-account b/bin/v-add-mail-account index 814b55857..3fbe6ae9b 100755 --- a/bin/v-add-mail-account +++ b/bin/v-add-mail-account @@ -15,7 +15,7 @@ domain=$(idn -t --quiet -u "$2" ) domain=$(echo $domain | tr '[:upper:]' '[:lower:]') domain_idn=$(idn -t --quiet -a "$domain") account=$(echo $3 | tr '[:upper:]' '[:lower:]') -password=$4 +password=$4; HIDE=4 quota=${5-unlimited} # Includes @@ -23,10 +23,6 @@ source $VESTA/func/main.sh source $VESTA/func/domain.sh source $VESTA/conf/vesta.conf -# Hiding password -A4='******' -EVENT="$DATE $TIME $SCRIPT $A1 $A2 $A3 $A4 $A5 $A6 $A7 $A8 $A9" - #----------------------------------------------------------# # Verifications # diff --git a/bin/v-add-user b/bin/v-add-user index 568d7bbe5..9afb1e9d0 100755 --- a/bin/v-add-user +++ b/bin/v-add-user @@ -11,7 +11,7 @@ # Argument defenition user=$1 -password=$2 +password=$2; HIDE=2 email=$3 package=${4-default} fname=$5 @@ -21,10 +21,6 @@ lname=$6 source $VESTA/func/main.sh source $VESTA/conf/vesta.conf -# Hiding password -A2='******' -EVENT="$DATE $TIME $SCRIPT $A1 $A2 $A3 $A4 $A5 $A6 $A7 $A8 $A9" - is_user_free() { check_sysuser=$(cut -f 1 -d : /etc/passwd | grep -w "$user" ) if [ ! -z "$check_sysuser" ] || [ -e "$USER_DATA" ]; then diff --git a/bin/v-add-web-domain-ftp b/bin/v-add-web-domain-ftp index 1eaace855..57afec481 100755 --- a/bin/v-add-web-domain-ftp +++ b/bin/v-add-web-domain-ftp @@ -14,7 +14,7 @@ user=$1 domain=$(idn -t --quiet -u "$2" ) domain_idn=$(idn -t --quiet -a "$domain") ftp_user=${1}_${3} -password=$4 +password=$4; HIDE=4 ftp_path=$5 # Includes @@ -22,10 +22,6 @@ source $VESTA/func/main.sh source $VESTA/func/domain.sh source $VESTA/conf/vesta.conf -# Hiding password -A4='******' -EVENT="$DATE $TIME $SCRIPT $A1 $A2 $A3 $A4 $A5 $A6 $A7 $A8 $A9" - #----------------------------------------------------------# # Verifications # diff --git a/bin/v-add-web-domain-httpauth b/bin/v-add-web-domain-httpauth index d2371afdd..4b336629e 100755 --- a/bin/v-add-web-domain-httpauth +++ b/bin/v-add-web-domain-httpauth @@ -13,7 +13,7 @@ user=$1 domain=$2 auth_user=$3 -password=$4 +password=$4; HIDE=4 restart=${5-yes} # Includes @@ -21,10 +21,6 @@ source $VESTA/func/main.sh source $VESTA/func/domain.sh source $VESTA/conf/vesta.conf -# Hiding password -A4='******' -EVENT="$DATE $TIME $SCRIPT $A1 $A2 $A3 $A4 $A5 $A6 $A7 $A8 $A9" - # Definining htpasswd file htaccess="$HOMEDIR/$user/conf/web/$WEB_SYSTEM.$domain.conf_htaccess" htpasswd="$HOMEDIR/$user/conf/web/$WEB_SYSTEM.$domain.htpasswd" diff --git a/bin/v-add-web-domain-stats-user b/bin/v-add-web-domain-stats-user index 9d4b766b0..dbbd31582 100755 --- a/bin/v-add-web-domain-stats-user +++ b/bin/v-add-web-domain-stats-user @@ -13,17 +13,13 @@ user=$1 domain=$(idn -t --quiet -u "$2" ) stats_user=$3 -password=$4 +password=$4; HIDE=4 # Includes source $VESTA/func/main.sh source $VESTA/func/domain.sh source $VESTA/conf/vesta.conf -# Hiding password -A4='******' -EVENT="$DATE $TIME $SCRIPT $A1 $A2 $A3 $A4 $A5 $A6 $A7 $A8 $A9" - #----------------------------------------------------------# # Verifications # diff --git a/bin/v-backup-user b/bin/v-backup-user index dd86cea77..9ebd0b69b 100755 --- a/bin/v-backup-user +++ b/bin/v-backup-user @@ -54,12 +54,11 @@ if [ "$notify" != 'no' ]; then email=$(get_user_value '$CONTACT') else subj="$user → backup failed" - email=$(grep CONTACT $VESTA/data/users/admin/user.conf | cut -f 2 -d \') + email=$(grep CONTACT $VESTA/data/users/admin/user.conf |cut -f 2 -d \') fi -send_mail="$VESTA/web/inc/mail-wrapper.php" # Check load average -la=$(cat /proc/loadavg | cut -f 1 -d ' ' | cut -f 1 -d '.') +la=$(cat /proc/loadavg |cut -f 1 -d ' ' |cut -f 1 -d '.') i=0 while [ "$la" -ge "$BACKUP_LA_LIMIT" ]; do echo "$(date "+%F %T") LoadAverage $la is above threshold. Sleeping..." @@ -67,20 +66,20 @@ while [ "$la" -ge "$BACKUP_LA_LIMIT" ]; do if [ "$i" -ge "5" ]; then mail_top=$(top -b| head -n 30) mail_text="LoadAverage $i is above threshold\n\n$mail_top\n" - echo -e "$mail_text" | $send_mail -s "$subj" $email + echo -e "$mail_text" |$send_mail -s "$subj" $email echo "Error: LA is too high" sed -i "/ $user /d" $VESTA/data/queue/backup.pipe log_event "$E_LA" "$EVENT" exit $E_LA fi - la=$(cat /proc/loadavg | cut -f 1 -d ' ' | cut -f 1 -d '.') + la=$(cat /proc/loadavg |cut -f 1 -d ' ' |cut -f 1 -d '.') (( ++i)) done # Creating temporary directory tmpdir=$(mktemp -p $BACKUP -d) if [ "$?" -ne 0 ]; then - echo "Can't create tmp dir $tmpdir" | $send_mail -s "$subj" $email + echo "Can't create tmp dir $tmpdir" |$send_mail -s "$subj" $email echo "Error: can't create tmp dir" log_event "$E_NOTEXIST" "$EVENT" exit $E_NOTEXIST @@ -137,15 +136,15 @@ if [ ! -z "$WEB_SYSTEM" ] && [ "$WEB" != '*' ]; then # Parsing domain exclusions conf="$USER_DATA/web.conf" for domain in $(search_objects 'web' 'SUSPENDED' "*" 'DOMAIN'); do - check_exl=$(echo -e "${WEB//,/\n}" |grep "^$domain$") - if [ -z "$check_exl" ]; then + exclusion=$(echo -e "$WEB" |tr ',' '\n' |grep "^$domain$") + if [ -z "$exclusion" ]; then web_list="$web_list $domain" else echo "$(date "+%F %T") excluding $domain" msg="$msg\n$(date "+%F %T") excluding $domain" fi done - web_list=$(echo "$web_list" | sed -e "s/ */\ /g" -e "s/^ //") + web_list=$(echo "$web_list" |sed -e "s/ */\ /g" -e "s/^ //") i=0 @@ -212,11 +211,11 @@ if [ ! -z "$WEB_SYSTEM" ] && [ "$WEB" != '*' ]; then fargs+=(-not) fargs+=(-path) fargs+=("./logs*") - check_exlusion=$(echo -e "${WEB//,/\n}" | grep "^$domain:") - if [ ! -z "$check_exlusion" ]; then - xdirs="$(echo -e "${check_exlusion//:/\n}" |grep -v $domain)" + exlusion=$(echo -e "$WEB" |tr ',' '\n' |grep "^$domain:") + if [ ! -z "$exlusion" ]; then + xdirs="$(echo -e "$exlusion" |tr ':' '\n' |grep -v $domain)" for xpath in $xdirs; do - xpath="$(echo $xpath | sed -e 's/\/*$//' -e 's/^\/*//')" + xpath="$(echo $xpath |sed -e 's/\/*$//' -e 's/^\/*//')" fargs+=(-not) fargs+=(-path) fargs+=("./$xpath/*") @@ -259,15 +258,15 @@ if [ ! -z "$DNS_SYSTEM" ] && [ "$DNS" != '*' ]; then # Parsing domain exclusions for domain in $(search_objects 'dns' 'SUSPENDED' "*" 'DOMAIN'); do - check_exl=$(echo -e "${DNS//,/\n}" |grep "^$domain$") - if [ -z "$check_exl" ]; then + exclusion=$(echo "$DNS" |tr ',' '\n' |grep "^$domain$") + if [ -z "$exclusion" ]; then dns_list="$dns_list $domain" else echo "$(date "+%F %T") excluding $domain" msg="$msg\n$(date "+%F %T") excluding $domain" fi done - dns_list=$(echo "$dns_list" | sed -e "s/ */\ /g" -e "s/^ //") + dns_list=$(echo "$dns_list" |sed -e "s/ */\ /g" -e "s/^ //") i=0 for domain in $dns_list; do @@ -312,7 +311,7 @@ if [ ! -z "$MAIL_SYSTEM" ] && [ "$MAIL" != '*' ]; then # Parsing domain exclusions conf="$USER_DATA/mail.conf" for domain in $(search_objects 'mail' 'SUSPENDED' "*" 'DOMAIN'); do - check_exl=$(echo -e "${MAIL//,/\n}" |grep "^$domain$") + check_exl=$(echo "$MAIL" |tr ',' '\n' |grep "^$domain$") if [ -z "$check_exl" ]; then mail_list="$mail_list $domain" else @@ -320,7 +319,7 @@ if [ ! -z "$MAIL_SYSTEM" ] && [ "$MAIL" != '*' ]; then msg="$msg\n$(date "+%F %T") excluding $domain" fi done - mail_list=$(echo "$mail_list" | sed -e "s/ */\ /g" -e "s/^ //") + mail_list=$(echo "$mail_list" |sed -e "s/ */\ /g" -e "s/^ //") i=0 for domain in $mail_list; do @@ -348,8 +347,8 @@ if [ ! -z "$MAIL_SYSTEM" ] && [ "$MAIL" != '*' ]; then # Backup emails cd $HOMEDIR/$user/mail/$domain_idn for account in $(ls); do - exclusion=$(echo -e "${MAIL//,/\n}" |grep "$domain:") - exclusion=$(echo -e "${exclusion//:/\n}" |grep "^$account$") + exclusion=$(echo "$MAIL" |tr ',' '\n' |grep "$domain:") + exclusion=$(echo "$exclusion" |tr ':' '\n' |grep "^$account$") # Checking exlusions if [ -z "$exclusion" ] && [[ "$MAIL_SYSTEM" =~ exim ]]; then @@ -390,8 +389,8 @@ if [ ! -z "$DB_SYSTEM" ] && [ "$DB" != '*' ]; then # Parsing database exclusions for database in $(search_objects 'db' 'SUSPENDED' "*" 'DB'); do - check_exl=$(echo -e "${DB//,/\n}" |grep "^$database$") - if [ -z "$check_exl" ]; then + exclusion=$(echo "$DB" |tr ',' '\n' |grep "^$database$") + if [ -z "$exclusion" ]; then db_list="$db_list $database" else echo "$(date "+%F %T") excluding $database" @@ -401,7 +400,7 @@ if [ ! -z "$DB_SYSTEM" ] && [ "$DB" != '*' ]; then i=0 conf="$USER_DATA/db.conf" - db_list=$(echo "$db_list" | sed -e "s/ */\ /g" -e "s/^ //") + db_list=$(echo "$db_list" |sed -e "s/ */\ /g" -e "s/^ //") for database in $db_list; do ((i ++)) get_database_values @@ -477,9 +476,8 @@ if [ "$USER" != '*' ]; then if [ -e "$USER_DATA/backup-excludes.conf" ]; then source $USER_DATA/backup-excludes.conf fi - exlusion_list=$(echo -e "${USER//,/\n}") fargs=() - for xpath in $exlusion_list; do + for xpath in $(echo "$USER" |tr ',' '\n'); do fargs+=(-not) fargs+=(-path) fargs+=("./$xpath*") @@ -491,12 +489,12 @@ if [ "$USER" != '*' ]; then set -f i=0 for udir in $(ls -a |egrep -v "conf|web|dns|mail|^\.\.$|^\.$"); do - check_exl=$(echo -e "${USER//,/\n}" |grep "^$udir$") - if [ -z "$check_exl" ]; then + exclusion=$(echo "$USER" |tr ',' '\n' |grep "^$udir$") + if [ -z "$exclusion" ]; then ((i ++)) udir_list="$udir_list $udir" - echo -e "$(date "+%F %T") adding directory $udir" - msg="$msg\n$(date "+%F %T") adding directory $udir" + echo -e "$(date "+%F %T") adding $udir" + msg="$msg\n$(date "+%F %T") adding $udir" # Backup files find ./$udir ${fargs[@]} -type f -or -type l -print0 |\ @@ -511,7 +509,7 @@ if [ "$USER" != '*' ]; then fi done set +f - udir_list=$(echo "$udir_list" | sed -e "s/ */\ /g" -e "s/^ //") + udir_list=$(echo "$udir_list" |sed -e "s/ */\ /g" -e "s/^ //") # Print total if [ "$i" -eq 1 ]; then @@ -526,7 +524,7 @@ if [ "$USER" != '*' ]; then fi # Get backup size -size="$(du -shm $tmpdir | cut -f 1)" +size="$(du -shm $tmpdir |cut -f 1)" # Get current time end_time=$(date '+%s') @@ -540,15 +538,15 @@ local_backup(){ rm -f $BACKUP/$user.$DATE.tar # Checking retention - backup_list=$(ls -lrt $BACKUP/ | awk '{print $9}' |grep "^$user\.") - backups_count=$(echo "$backup_list" | wc -l) + backup_list=$(ls -lrt $BACKUP/ |awk '{print $9}' |grep "^$user\.") + backups_count=$(echo "$backup_list" |wc -l) if [ "$BACKUPS" -le "$backups_count" ]; then backups_rm_number=$((backups_count - BACKUPS)) (( ++backups_rm_number)) # Removing old backup - for backup in $(echo "$backup_list" | head -n $backups_rm_number); do - backup_date=$(echo $backup | sed -e "s/$user.//" -e "s/.tar$//") + for backup in $(echo "$backup_list" |head -n $backups_rm_number); do + backup_date=$(echo $backup |sed -e "s/$user.//" -e "s/.tar$//") echo -e "$(date "+%F %T") Roated: $backup_date" msg="$msg\n$(date "+%F %T") Rotated: $backup_date" rm -f $BACKUP/$backup @@ -576,7 +574,7 @@ local_backup(){ localbackup='yes' echo -e "$(date "+%F %T") Local: $BACKUP/$user.$DATE.tar" msg="$msg\n$(date "+%F %T") Local: $BACKUP/$user.$DATE.tar" - U_BACKUPS=$(ls $BACKUP/ | grep "^$user." | wc -l) + U_BACKUPS=$(ls $BACKUP/ |grep "^$user." |wc -l) update_user_value "$user" '$U_BACKUPS' "$U_BACKUPS" } @@ -599,7 +597,7 @@ ftp_backup() { # Checking config if [ ! -e "$VESTA/conf/ftp.backup.conf" ]; then ftp_conf_error="Can't open $VESTA/conf/ftp.backup.conf" - echo "$ftp_conf_error" | $send_mail -s "$subj" $email + echo "$ftp_conf_error" |$send_mail -s "$subj" $email echo "Error: $VESTA/conf/ftp.backup.conf doesn't exist" sed -i "/ $user /d" $VESTA/data/queue/backup.pipe log_event "$E_NOTEXIST" "$EVENT" @@ -663,11 +661,11 @@ ftp_backup() { # Checking retention backup_list=$(ftpc "cd $BPATH" "ls" |awk '{print $9}' |grep "^$user\.") - backups_count=$(echo "$backup_list" | wc -l) + backups_count=$(echo "$backup_list" |wc -l) if [ "$backups_count" -ge "$BACKUPS" ]; then backups_rm_number=$((backups_count - BACKUPS + 1)) - for backup in $(echo "$backup_list" | head -n $backups_rm_number); do - backup_date=$(echo $backup | sed -e "s/$user.//" -e "s/.tar$//") + for backup in $(echo "$backup_list" |head -n $backups_rm_number); do + backup_date=$(echo $backup |sed -e "s/$user.//" -e "s/.tar$//") echo -e "$(date "+%F %T") Roated ftp backup: $backup_date" msg="$msg\n$(date "+%F %T") Roated ftp backup: $backup_date" ftpc "cd $BPATH" "delete $backup" @@ -750,7 +748,7 @@ sftp_backup() { # Checking config if [ ! -e "$VESTA/conf/sftp.backup.conf" ]; then sftp_conf_error="Can't open $VESTA/conf/sftp.backup.conf" - echo "$sftp_conf_error" | $send_mail -s "$subj" $email + echo "$sftp_conf_error" |$send_mail -s "$subj" $email echo "Error: $VESTA/conf/sftp.backup.conf doesn't exist" sed -i "/ $user /d" $VESTA/data/queue/backup.pipe log_event "$E_NOTEXIST" "$EVENT" @@ -803,11 +801,11 @@ sftp_backup() { # Checking retention backup_list=$(sftpc "cd $BPATH" "ls -l" |awk '{print $9}' |grep "^$user\.") - backups_count=$(echo "$backup_list" | wc -l) + backups_count=$(echo "$backup_list" |wc -l) if [ "$backups_count" -ge "$BACKUPS" ]; then backups_rm_number=$((backups_count - BACKUPS + 1)) - for backup in $(echo "$backup_list" | head -n $backups_rm_number); do - backup_date=$(echo $backup | sed -e "s/$user.//" -e "s/.tar.*$//") + for backup in $(echo "$backup_list" |head -n $backups_rm_number); do + backup_date=$(echo $backup |sed -e "s/$user.//" -e "s/.tar.*$//") echo -e "$(date "+%F %T") Roated sftp backup: $backup_date" msg="$msg\n$(date "+%F %T") Roated sftp backup: $backup_date" sftpc "cd $BPATH" "rm $backup" > /dev/null 2>&1 @@ -893,7 +891,7 @@ sed -i "/v-backup-user $user /d" $VESTA/data/queue/backup.pipe if [ "$notify" != 'no' ]; then subj="$user → backup has been completed" email=$(get_user_value '$CONTACT') - echo -e "$msg" | $send_mail -s "$subj" $email + echo -e "$msg" |$send_mail -s "$subj" $email fi # Logging diff --git a/bin/v-change-database-host-password b/bin/v-change-database-host-password index 9c0c037ad..d5d37ea1d 100755 --- a/bin/v-change-database-host-password +++ b/bin/v-change-database-host-password @@ -13,17 +13,13 @@ type=$1 host=$2 dbuser=$3 -password=$4 +password=$4; HIDE=4 # Includes source $VESTA/func/main.sh source $VESTA/func/db.sh source $VESTA/conf/vesta.conf -# Hiding password -A4='******' -EVENT="$DATE $TIME $SCRIPT $A1 $A2 $A3 $A4 $A5 $A6 $A7 $A8 $A9" - #----------------------------------------------------------# # Verifications # diff --git a/bin/v-change-database-password b/bin/v-change-database-password index 152791902..29c41af82 100755 --- a/bin/v-change-database-password +++ b/bin/v-change-database-password @@ -13,17 +13,13 @@ # Argument defenition user=$1 database=$2 -password=$3 +password=$3; HIDE=3 # Includes source $VESTA/func/main.sh source $VESTA/func/db.sh source $VESTA/conf/vesta.conf -# Hiding password -A3='******' -EVENT="$DATE $TIME $SCRIPT $A1 $A2 $A3 $A4 $A5 $A6 $A7 $A8 $A9" - #----------------------------------------------------------# # Verifications # diff --git a/bin/v-change-database-user b/bin/v-change-database-user index 90262d454..77c8ef975 100755 --- a/bin/v-change-database-user +++ b/bin/v-change-database-user @@ -13,7 +13,7 @@ user=$1 database=$2 dbuser="$user"_"$3" -password=$4 +password=$4; HIDE=4 # Includes source $VESTA/func/main.sh @@ -21,10 +21,6 @@ source $VESTA/func/db.sh source $VESTA/func/rebuild.sh source $VESTA/conf/vesta.conf -# Hiding password -A4='******' -EVENT="$DATE $TIME $SCRIPT $A1 $A2 $A3 $A4 $A5 $A6 $A7 $A8 $A9" - #----------------------------------------------------------# # Verifications # diff --git a/bin/v-change-mail-account-password b/bin/v-change-mail-account-password index 143468971..11afb34b5 100755 --- a/bin/v-change-mail-account-password +++ b/bin/v-change-mail-account-password @@ -15,17 +15,13 @@ domain=$(idn -t --quiet -u "$2" ) domain=$(echo $domain | tr '[:upper:]' '[:lower:]') domain_idn=$(idn -t --quiet -a "$domain") account=$3 -password=$4 +password=$4; HIDE=4 # Includes source $VESTA/func/main.sh source $VESTA/func/domain.sh source $VESTA/conf/vesta.conf -# Hiding password -A4='******' -EVENT="$DATE $TIME $SCRIPT $A1 $A2 $A3 $A4 $A5 $A6 $A7 $A8 $A9" - #----------------------------------------------------------# # Verifications # diff --git a/bin/v-change-user-password b/bin/v-change-user-password index 903224d7b..ce38cb533 100755 --- a/bin/v-change-user-password +++ b/bin/v-change-user-password @@ -11,16 +11,12 @@ # Argument defenition user=$1 -password=$2 +password=$2; HIDE=2 # Includes source $VESTA/func/main.sh source $VESTA/conf/vesta.conf -# Hiding password -A2="******" -EVENT="$DATE $TIME $SCRIPT $A1 $A2 $A3 $A4 $A5 $A6 $A7 $A8 $A9" - #----------------------------------------------------------# # Verifications # diff --git a/bin/v-change-web-domain-ftp-password b/bin/v-change-web-domain-ftp-password index e01b250ff..8d38fbb46 100755 --- a/bin/v-change-web-domain-ftp-password +++ b/bin/v-change-web-domain-ftp-password @@ -14,17 +14,13 @@ user=$1 domain=$(idn -t --quiet -u "$2" ) domain_idn=$(idn -t --quiet -a "$domain") ftp_user=$3 -password=$4 +password=$4; HIDE=4 # Includes source $VESTA/func/main.sh source $VESTA/func/domain.sh source $VESTA/conf/vesta.conf -# Hiding password -A4="******" -EVENT="$DATE $TIME $SCRIPT $A1 $A2 $A3 $A4 $A5 $A6 $A7 $A8 $A9" - #----------------------------------------------------------# # Verifications # diff --git a/bin/v-change-web-domain-httpauth b/bin/v-change-web-domain-httpauth index 00deee1e0..9996c0988 100755 --- a/bin/v-change-web-domain-httpauth +++ b/bin/v-change-web-domain-httpauth @@ -13,17 +13,13 @@ user=$1 domain=$2 auth_user=$3 -password=$4 +password=$4; HIDE=4 # Includes source $VESTA/func/main.sh source $VESTA/func/domain.sh source $VESTA/conf/vesta.conf -# Hiding password -A4='******' -EVENT="$DATE $TIME $SCRIPT $A1 $A2 $A3 $A4 $A5 $A6 $A7 $A8 $A9" - # Definining htpasswd file htpasswd="$HOMEDIR/$user/conf/web/$WEB_SYSTEM.$domain.htpasswd" From 2b042c2fb5b9aa702f52321ea3502a7427e0d28f Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Wed, 21 Oct 2015 18:55:54 +0300 Subject: [PATCH 096/264] multiple name servers support --- bin/v-change-user-ns | 35 ++++++++++++++++++------ install/debian/templates/dns/default.tpl | 20 +++++++++----- install/rhel/templates/dns/default.tpl | 20 +++++++++----- install/ubuntu/templates/dns/default.tpl | 20 +++++++++----- 4 files changed, 66 insertions(+), 29 deletions(-) diff --git a/bin/v-change-user-ns b/bin/v-change-user-ns index a799257c9..027cc1b60 100755 --- a/bin/v-change-user-ns +++ b/bin/v-change-user-ns @@ -1,6 +1,6 @@ #!/bin/bash # info: change user nameservers -# options: USER NS1 NS2 [NS3] [NS4] +# options: USER NS1 NS2 [NS3] [NS4] [NS5] [NS6] [NS7] [NS8] # # The function for changing default nameservers for speciefic user. @@ -13,8 +13,12 @@ user=$1 ns1=$(echo $2 | sed -e 's/\.*$//g' -e 's/^\.*//g') ns2=$(echo $3 | sed -e 's/\.*$//g' -e 's/^\.*//g') -ns3=$4 -ns4=$5 +ns3=$(echo $4 | sed -e 's/\.*$//g' -e 's/^\.*//g') +ns4=$(echo $5 | sed -e 's/\.*$//g' -e 's/^\.*//g') +ns5=$(echo $6 | sed -e 's/\.*$//g' -e 's/^\.*//g') +ns6=$(echo $7 | sed -e 's/\.*$//g' -e 's/^\.*//g') +ns7=$(echo $8 | sed -e 's/\.*$//g' -e 's/^\.*//g') +ns8=$(echo $9 | sed -e 's/\.*$//g' -e 's/^\.*//g') # Includes source $VESTA/func/main.sh @@ -26,10 +30,10 @@ source $VESTA/conf/vesta.conf #----------------------------------------------------------# # Checking args -check_args '3' "$#" 'USER NS1 NS2 [NS3] [NS4]' +check_args '3' "$#" 'USER NS1 NS2 [NS3] [NS4] [NS5] [NS6] [NS7] [NS8]' # Checking argument format -validate_format 'user' 'ns1' 'ns2' +validate_format 'user' 'ns1' 'ns2' if [ ! -z "$ns3" ]; then ns3=$(echo $4 | sed -e 's/\.*$//g' -e 's/^\.*//g') validate_format 'ns3' @@ -38,7 +42,22 @@ if [ ! -z "$ns4" ]; then ns4=$(echo $5 | sed -e 's/\.*$//g' -e 's/^\.*//g') validate_format 'ns4' fi - +if [ ! -z "$ns5" ]; then + ns5=$(echo $6 | sed -e 's/\.*$//g' -e 's/^\.*//g') + validate_format 'ns5' +fi +if [ ! -z "$ns6" ]; then + ns6=$(echo $7 | sed -e 's/\.*$//g' -e 's/^\.*//g') + validate_format 'ns6' +fi +if [ ! -z "$ns7" ]; then + ns7=$(echo $8 | sed -e 's/\.*$//g' -e 's/^\.*//g') + validate_format 'ns7' +fi +if [ ! -z "$ns8" ]; then + ns8=$(echo $9 | sed -e 's/\.*$//g' -e 's/^\.*//g') + validate_format 'ns8' +fi is_object_valid 'user' 'USER' "$user" is_object_unsuspended 'user' 'USER' "$user" @@ -48,7 +67,7 @@ is_object_unsuspended 'user' 'USER' "$user" #----------------------------------------------------------# # Merging values -ns="$ns1,$ns2,$ns3,$ns4" +ns="$ns1,$ns2,$ns3,$ns4,$ns5,$ns6,$ns7,$ns8" ns=$(echo "$ns" | sed -e "s/,,//g" -e "s/,$//") # Changing ns values @@ -60,7 +79,7 @@ update_user_value "$user" '$NS' "$ns" #----------------------------------------------------------# # Logging -log_history "changed user nameservers to $ns1, $ns2" +log_history "updated nameservers $ns1 $ns2 $ns3 $ns4 $ns5 $ns6 $ns7 $ns8" log_event "$OK" "$EVENT" exit diff --git a/install/debian/templates/dns/default.tpl b/install/debian/templates/dns/default.tpl index 38f963006..942c15bc8 100755 --- a/install/debian/templates/dns/default.tpl +++ b/install/debian/templates/dns/default.tpl @@ -1,9 +1,15 @@ ID='1' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns1%.' SUSPENDED='no' TIME='%time%' DATE='%date%' ID='2' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns2%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='3' RECORD='@' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='4' RECORD='mail' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='5' RECORD='www' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='6' RECORD='pop' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='7' RECORD='ftp' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='8' RECORD='@' TYPE='MX' PRIORITY='10' VALUE='mail.%domain%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='9' RECORD='@' TYPE='TXT' PRIORITY='' VALUE='"v=spf1 a mx ip4:%ip% ?all"' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='3' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns3%.' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='4' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns4%.' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='5' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns5%.' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='6' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns6%.' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='7' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns7%.' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='8' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns8%.' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='9' RECORD='@' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='10' RECORD='mail' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='11' RECORD='www' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='12' RECORD='pop' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='13' RECORD='ftp' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='14' RECORD='@' TYPE='MX' PRIORITY='10' VALUE='mail.%domain%.' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='15' RECORD='@' TYPE='TXT' PRIORITY='' VALUE='"v=spf1 a mx ip4:%ip% ?all"' SUSPENDED='no' TIME='%time%' DATE='%date%' diff --git a/install/rhel/templates/dns/default.tpl b/install/rhel/templates/dns/default.tpl index 38f963006..942c15bc8 100755 --- a/install/rhel/templates/dns/default.tpl +++ b/install/rhel/templates/dns/default.tpl @@ -1,9 +1,15 @@ ID='1' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns1%.' SUSPENDED='no' TIME='%time%' DATE='%date%' ID='2' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns2%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='3' RECORD='@' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='4' RECORD='mail' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='5' RECORD='www' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='6' RECORD='pop' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='7' RECORD='ftp' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='8' RECORD='@' TYPE='MX' PRIORITY='10' VALUE='mail.%domain%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='9' RECORD='@' TYPE='TXT' PRIORITY='' VALUE='"v=spf1 a mx ip4:%ip% ?all"' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='3' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns3%.' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='4' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns4%.' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='5' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns5%.' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='6' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns6%.' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='7' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns7%.' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='8' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns8%.' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='9' RECORD='@' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='10' RECORD='mail' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='11' RECORD='www' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='12' RECORD='pop' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='13' RECORD='ftp' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='14' RECORD='@' TYPE='MX' PRIORITY='10' VALUE='mail.%domain%.' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='15' RECORD='@' TYPE='TXT' PRIORITY='' VALUE='"v=spf1 a mx ip4:%ip% ?all"' SUSPENDED='no' TIME='%time%' DATE='%date%' diff --git a/install/ubuntu/templates/dns/default.tpl b/install/ubuntu/templates/dns/default.tpl index 38f963006..942c15bc8 100755 --- a/install/ubuntu/templates/dns/default.tpl +++ b/install/ubuntu/templates/dns/default.tpl @@ -1,9 +1,15 @@ ID='1' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns1%.' SUSPENDED='no' TIME='%time%' DATE='%date%' ID='2' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns2%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='3' RECORD='@' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='4' RECORD='mail' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='5' RECORD='www' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='6' RECORD='pop' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='7' RECORD='ftp' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='8' RECORD='@' TYPE='MX' PRIORITY='10' VALUE='mail.%domain%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='9' RECORD='@' TYPE='TXT' PRIORITY='' VALUE='"v=spf1 a mx ip4:%ip% ?all"' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='3' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns3%.' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='4' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns4%.' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='5' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns5%.' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='6' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns6%.' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='7' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns7%.' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='8' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns8%.' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='9' RECORD='@' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='10' RECORD='mail' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='11' RECORD='www' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='12' RECORD='pop' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='13' RECORD='ftp' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='14' RECORD='@' TYPE='MX' PRIORITY='10' VALUE='mail.%domain%.' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='15' RECORD='@' TYPE='TXT' PRIORITY='' VALUE='"v=spf1 a mx ip4:%ip% ?all"' SUSPENDED='no' TIME='%time%' DATE='%date%' From 92d7044c59ed351501b35a7c5956f91009a390ad Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Wed, 21 Oct 2015 18:56:29 +0300 Subject: [PATCH 097/264] fix date/time format for fail2ban --- bin/v-check-user-password | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/bin/v-check-user-password b/bin/v-check-user-password index 460d8b012..6543333c9 100755 --- a/bin/v-check-user-password +++ b/bin/v-check-user-password @@ -11,7 +11,7 @@ # Argument defenition user=$1 -password=$2 +password=$2; HIDE=2 ip=${3-127.0.0.1} # Includes @@ -29,7 +29,7 @@ validate_format 'user' # Checking user if [ ! -d "$VESTA/data/users/$user" ] && [ "$user" != 'root' ]; then echo "Error: password missmatch" - echo "$DATE $user $ip failed to login" >> $VESTA/log/auth.log + echo "$DATE $TIME $user $ip failed to login" >> $VESTA/log/auth.log exit 9 fi @@ -39,7 +39,7 @@ is_password_valid # Checking empty password if [[ -z "$password" ]]; then echo "Error: password missmatch" - echo "$DATE $user $ip failed to login" >> $VESTA/log/auth.log + echo "$DATE $TIME $user $ip failed to login" >> $VESTA/log/auth.log exit 9 fi @@ -60,7 +60,7 @@ fi if [ -z "$salt" ]; then echo "Error: password missmatch" - echo "$DATE $user $ip failed to login" >> $VESTA/log/auth.log + echo "$DATE $TIME $user $ip failed to login" >> $VESTA/log/auth.log exit 9 fi @@ -68,7 +68,7 @@ fi hash=$($BIN/v-generate-password-hash $method $salt <<< $password) if [[ -z "$hash" ]]; then echo "Error: password missmatch" - echo "$DATE $user $ip failed to login" >> $VESTA/log/auth.log + echo "$DATE $TIME $user $ip failed to login" >> $VESTA/log/auth.log exit 9 fi @@ -76,7 +76,7 @@ fi result=$(grep "^$user:$hash:" /etc/shadow 2>/dev/null) if [[ -z "$result" ]]; then echo "Error: password missmatch" - echo "$DATE $user $ip failed to login" >> $VESTA/log/auth.log + echo "$DATE $TIME $user $ip failed to login" >> $VESTA/log/auth.log exit 9 fi @@ -86,6 +86,6 @@ fi #----------------------------------------------------------# # Logging -echo "$DATE $user $ip successfully logged in" >> $VESTA/log/auth.log +echo "$DATE $TIME $user $ip successfully logged in" >> $VESTA/log/auth.log exit From d79be2ca6897df5d697ebce7098d02968341e265 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Wed, 21 Oct 2015 18:56:49 +0300 Subject: [PATCH 098/264] fix for fail2ban ip removal --- bin/v-delete-firewall-ban | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/v-delete-firewall-ban b/bin/v-delete-firewall-ban index 97362adaa..468b58c5b 100755 --- a/bin/v-delete-firewall-ban +++ b/bin/v-delete-firewall-ban @@ -46,8 +46,8 @@ fi # Deleting ip from banlist sed -i "/IP='$ip' CHAIN='$chain'/d" $conf -$iptables -D fail2ban-$chain -s $ip \ - -j REJECT --reject-with icmp-port-unreachable 2>/dev/null +b=$($iptables -L fail2ban-$chain --line-number -n|grep $ip|awk '{print $1}') +$iptables -D fail2ban-$chain $b 2>/dev/null # Changing permissions chmod 660 $conf From 1ed911f78f24c1fb4a0e65f1f8473921cf6bdb38 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Wed, 21 Oct 2015 18:57:20 +0300 Subject: [PATCH 099/264] fix for missing chain after reboot --- bin/v-update-firewall | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/bin/v-update-firewall b/bin/v-update-firewall index cd7205b8a..65b9438dd 100755 --- a/bin/v-update-firewall +++ b/bin/v-update-firewall @@ -132,19 +132,29 @@ fi # Checking fail2ban support if [ ! -z "$FIREWALL_EXTENSION" ]; then - chains=$(cat $VESTA/data/firewall/chains.conf 2>/dev/null) -fi -for chain in $chains; do - eval $chain - if [[ "$PORT" =~ ,|-|: ]] ; then - port="-m multiport --dports $PORT" - else - port="--dport $PORT" - fi - echo "$iptables -I INPUT -p $PROTOCOL $port -j fail2ban-$CHAIN" > $tmp - bash $tmp + for chain in $(cat $VESTA/data/firewall/chains.conf 2>/dev/null); do + eval $chain + if [[ "$PORT" =~ ,|-|: ]] ; then + port="-m multiport --dports $PORT" + else + port="--dport $PORT" + fi + echo "$iptables -N fail2ban-$CHAIN" >> $tmp + echo "$iptables -F fail2ban-$CHAIN" >> $tmp + echo "$iptables -I fail2ban-$CHAIN -s 0.0.0.0/0 -j RETURN" >> $tmp + echo "$iptables -I INPUT -p $PROTOCOL $port -j fail2ban-$CHAIN" >>$tmp + done + bash $tmp 2>/dev/null rm -f $tmp -done + + for ban in $(cat $VESTA/data/firewall/banlist.conf 2>/dev/null); do + eval $ban + echo -n "$iptables -I fail2ban-$CHAIN 1 -s $IP" >> $tmp + echo " -j REJECT --reject-with icmp-port-unreachable" >> $tmp + done + bash $tmp 2>/dev/null + rm -f $tmp +fi # Saving rules to the master iptables file if [ -e "/etc/redhat-release" ]; then From 8eaa1b743ca8e057673109e15c56d4d575624b6c Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Wed, 21 Oct 2015 18:57:38 +0300 Subject: [PATCH 100/264] fix for pgsql listing --- bin/v-list-sys-services | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/bin/v-list-sys-services b/bin/v-list-sys-services index 5ad8b6b2d..af09cea44 100755 --- a/bin/v-list-sys-services +++ b/bin/v-list-sys-services @@ -171,8 +171,10 @@ service=$DB_SYSTEM if [ ! -z "$service" ] && [ "$service" != 'remote' ]; then for db in ${DB_SYSTEM//,/ }; do service="$db" - if [ -e "/etc/redhat-release" ]; then - service='mysqld' + if [ "$service" = 'mysql' ]; then + if [ -e "/etc/redhat-release" ]; then + service='mysqld' + fi fi if [ "$service" == 'pgsql' ]; then service='postgresql' From b6c152a258199559bb83e6f3615254146c4afcd9 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Wed, 21 Oct 2015 18:59:38 +0300 Subject: [PATCH 101/264] Delete chains on firewall stop --- bin/v-stop-firewall | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/bin/v-stop-firewall b/bin/v-stop-firewall index 1806d4fae..4087190dd 100755 --- a/bin/v-stop-firewall +++ b/bin/v-stop-firewall @@ -40,6 +40,15 @@ echo "$iptables -F INPUT" >> $tmp # Deleting vesta chain echo "$iptables -X vesta" >> $tmp +# Deleting custom chains +chains=$(cat $VESTA/data/firewall/chains.conf 2>/dev/null) +IFS=$'\n' +for chain in $chains; do + eval $chain + echo "$iptables -F fail2ban-$CHAIN" >> $tmp + echo "$iptables -X fail2ban-$CHAIN" >> $tmp +done + # Applying rules bash $tmp 2>/dev/null From ddf1d552947e1244b746cb05fd9a02f27ded9c6f Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Wed, 21 Oct 2015 19:16:42 +0300 Subject: [PATCH 102/264] .escapeshellarg protection --- web/edit/user/index.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/web/edit/user/index.php b/web/edit/user/index.php index 83d0c8663..5d04769fe 100644 --- a/web/edit/user/index.php +++ b/web/edit/user/index.php @@ -24,7 +24,7 @@ if (($_SESSION['user'] == 'admin') && (!empty($_GET['user']))) { } // List user -exec (VESTA_CMD."v-list-user ".$v_username." json", $output, $return_var); +exec (VESTA_CMD."v-list-user ".escapeshellarg($v_username)." json", $output, $return_var); check_return_code($return_var,$output); $data = json_decode(implode('', $output), true); unset($output); @@ -89,7 +89,7 @@ if (!empty($_POST['save'])) { $fp = fopen($v_password, "w"); fwrite($fp, $_POST['v_password']."\n"); fclose($fp); - exec (VESTA_CMD."v-change-user-password ".$v_username." ".$v_password, $output, $return_var); + exec (VESTA_CMD."v-change-user-password ".escapeshellarg($v_username)." ".$v_password, $output, $return_var); check_return_code($return_var,$output); unset($output); unlink($v_password); @@ -99,7 +99,7 @@ if (!empty($_POST['save'])) { // Change package (admin only) if (($v_package != $_POST['v_package']) && ($_SESSION['user'] == 'admin') && (empty($_SESSION['error_msg']))) { $v_package = escapeshellarg($_POST['v_package']); - exec (VESTA_CMD."v-change-user-package ".$v_username." ".$v_package, $output, $return_var); + exec (VESTA_CMD."v-change-user-package ".escapeshellarg($v_username)." ".$v_package, $output, $return_var); check_return_code($return_var,$output); unset($output); } @@ -107,7 +107,7 @@ if (!empty($_POST['save'])) { // Change language if (($v_language != $_POST['v_language']) && (empty($_SESSION['error_msg']))) { $v_language = escapeshellarg($_POST['v_language']); - exec (VESTA_CMD."v-change-user-language ".$v_username." ".$v_language, $output, $return_var); + exec (VESTA_CMD."v-change-user-language ".escapeshellarg($v_username)." ".$v_language, $output, $return_var); check_return_code($return_var,$output); if (empty($_SESSION['error_msg'])) { if ((empty($_GET['user'])) || ($_GET['user'] == $_SESSION['user'])) $_SESSION['language'] = $_POST['v_language']; @@ -118,7 +118,7 @@ if (!empty($_POST['save'])) { // Change shell (admin only) if (($v_shell != $_POST['v_shell']) && ($_SESSION['user'] == 'admin') && (empty($_SESSION['error_msg']))) { $v_shell = escapeshellarg($_POST['v_shell']); - exec (VESTA_CMD."v-change-user-shell ".$v_username." ".$v_shell, $output, $return_var); + exec (VESTA_CMD."v-change-user-shell ".escapeshellarg($v_username)." ".$v_shell, $output, $return_var); check_return_code($return_var,$output); unset($output); } @@ -129,7 +129,7 @@ if (!empty($_POST['save'])) { $_SESSION['error_msg'] = __('Please enter valid email address.'); } else { $v_email = escapeshellarg($_POST['v_email']); - exec (VESTA_CMD."v-change-user-contact ".$v_username." ".$v_email, $output, $return_var); + exec (VESTA_CMD."v-change-user-contact ".escapeshellarg($v_username)." ".$v_email, $output, $return_var); check_return_code($return_var,$output); unset($output); } @@ -139,7 +139,7 @@ if (!empty($_POST['save'])) { if (($v_fname != $_POST['v_fname']) || ($v_lname != $_POST['v_lname']) && (empty($_SESSION['error_msg']))) { $v_fname = escapeshellarg($_POST['v_fname']); $v_lname = escapeshellarg($_POST['v_lname']); - exec (VESTA_CMD."v-change-user-name ".$v_username." ".$v_fname." ".$v_lname, $output, $return_var); + exec (VESTA_CMD."v-change-user-name ".escapeshellarg($v_username)." ".$v_fname." ".$v_lname, $output, $return_var); check_return_code($return_var,$output); unset($output); $v_fname = $_POST['v_fname']; @@ -157,7 +157,7 @@ if (!empty($_POST['save'])) { $v_ns6 = escapeshellarg($_POST['v_ns6']); $v_ns7 = escapeshellarg($_POST['v_ns7']); $v_ns8 = escapeshellarg($_POST['v_ns8']); - $ns_cmd = VESTA_CMD."v-change-user-ns ".$v_username." ".$v_ns1." ".$v_ns2; + $ns_cmd = VESTA_CMD."v-change-user-ns ".escapeshellarg($v_username)." ".$v_ns1." ".$v_ns2; if (!empty($_POST['v_ns3'])) $ns_cmd = $ns_cmd." ".$v_ns3; if (!empty($_POST['v_ns4'])) $ns_cmd = $ns_cmd." ".$v_ns4; if (!empty($_POST['v_ns5'])) $ns_cmd = $ns_cmd." ".$v_ns5; From 44949ed4a345fc6f4166863046f39f29a12909af Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Wed, 21 Oct 2015 19:17:33 +0300 Subject: [PATCH 103/264] 118n for File Manager --- web/inc/i18n/ar.php | 48 ++++++++++++++++++++++++++++++++++++++++++++- web/inc/i18n/bs.php | 44 +++++++++++++++++++++++++++++++++++++++++ web/inc/i18n/cn.php | 44 +++++++++++++++++++++++++++++++++++++++++ web/inc/i18n/cz.php | 44 +++++++++++++++++++++++++++++++++++++++++ web/inc/i18n/de.php | 44 +++++++++++++++++++++++++++++++++++++++++ web/inc/i18n/el.php | 45 ++++++++++++++++++++++++++++++++++++++++++ web/inc/i18n/en.php | 20 ++++++++----------- web/inc/i18n/es.php | 45 ++++++++++++++++++++++++++++++++++++++++++ web/inc/i18n/fi.php | 45 ++++++++++++++++++++++++++++++++++++++++++ web/inc/i18n/fr.php | 45 ++++++++++++++++++++++++++++++++++++++++++ web/inc/i18n/hu.php | 45 ++++++++++++++++++++++++++++++++++++++++++ web/inc/i18n/id.php | 45 ++++++++++++++++++++++++++++++++++++++++++ web/inc/i18n/it.php | 45 ++++++++++++++++++++++++++++++++++++++++++ web/inc/i18n/nl.php | 45 ++++++++++++++++++++++++++++++++++++++++++ web/inc/i18n/no.php | 45 ++++++++++++++++++++++++++++++++++++++++++ web/inc/i18n/pt.php | 45 ++++++++++++++++++++++++++++++++++++++++++ web/inc/i18n/ro.php | 45 ++++++++++++++++++++++++++++++++++++++++++ web/inc/i18n/ru.php | 45 ++++++++++++++++++++++++++++++++++++++++++ web/inc/i18n/se.php | 45 ++++++++++++++++++++++++++++++++++++++++++ web/inc/i18n/tr.php | 45 ++++++++++++++++++++++++++++++++++++++++++ web/inc/i18n/tw.php | 45 ++++++++++++++++++++++++++++++++++++++++++ web/inc/i18n/ua.php | 45 ++++++++++++++++++++++++++++++++++++++++++ 22 files changed, 951 insertions(+), 13 deletions(-) diff --git a/web/inc/i18n/ar.php b/web/inc/i18n/ar.php index 5bc781497..e239ba521 100644 --- a/web/inc/i18n/ar.php +++ b/web/inc/i18n/ar.php @@ -344,7 +344,8 @@ $LANG['ar'] = array( 'Comment' => 'تعليق', 'Banlist' => 'قائمة ممنوعة', 'ranges are acceptable' => 'نطاقات مقبولة', - 'CDIR format is supported' => 'ويدعم صيغة CIDR', + 'CIDR format is supported' => 'ويدعم صيغة CIDR', + 'Add one more Name Server' => 'Add one more Name Server', 'unlimited' => 'unlimited', '1 account' => '1 حساب', @@ -494,12 +495,15 @@ $LANG['ar'] = array( 'Template Manager' => 'Template Manager', 'Backup Migration Manager' => 'Backup Migration Manager', 'FileManager' => 'FileManager', + 'show: CPU / MEM / NET / DISK' => 'show: CPU / MEM / NET / DISK', 'sort by' => 'sort by', 'Date' => 'Date', 'Starred' => 'Starred', 'Name' => 'Name', + + 'File Manager' => 'File Manager', 'type' => 'type', 'size' => 'size', @@ -544,5 +548,47 @@ $LANG['ar'] = array( 'Create file' => 'Create file', 'Create directory' => 'Create directory', + 'Add New object' => 'Add New object', + 'Save Form' => 'Save Form', + 'Cancel saving form' => 'Cancel saving form', + 'Go to USER list' => 'Go to USER list', + 'Go to WEB list' => 'Go to WEB list', + 'Go to DNS list' => 'Go to DNS list', + 'Go to MAIL list' => 'Go to MAIL list', + 'Go to DB list' => 'Go to DB list', + 'Go to CRON list' => 'Go to CRON list', + 'Go to BACKUP list' => 'Go to BACKUP list', + 'Focus on search' => 'Focus on search', + 'Display/Close shortcuts' => 'Display/Close shortcuts', + 'Move backward through top menu' => 'Move backward through top menu', + 'Move forward through top menu' => 'Move forward through top menu', + 'Switch active menu' => 'Switch active menu', + 'Enter focused element' => 'Enter focused element', + + 'Upload' => 'Upload', + 'New File' => 'New File', + 'New Folder' => 'New Folder', + 'Download' => 'Download', + 'Rename' => 'Rename', + 'Copy' => 'Copy', + 'Archive' => 'Archive', + 'Delete' => 'Delete', + 'Save File (in text editor)' => 'Save File (in text editor)', + 'Close Popup / Cancel' => 'Close Popup / Cancel', + 'Move Cursor Up' => 'Move Cursor Up', + 'Move Cursor Dow' => 'Move Cursor Dow', + 'Switch to Left Tab' => 'Switch to Left Tab', + 'Switch to Right Tab' => 'Switch to Right Tab', + 'Switch Tab' => 'Switch Tab', + 'Go to the Top of File List' => 'Go to the Top of File List', + 'Go to the Last File' => 'Go to the Last File', + 'Open File/Enter Directory' => 'Open File/Enter Directory', + 'Go to Parent Directory' => 'Go to Parent Directory', + 'Select Current File' => 'Select Current File', + 'Select Bunch of Files' => 'Select Bunch of Files', + 'Append File to the Current Selection' => 'Append File to the Current Selection', + 'Select All Files' => 'Select All Files', + 'shortcuts are inspired by magnificent GNU Midnight Commander file manager' => + 'shortcuts are inspired by magnificent GNU Midnight Commander file manager' ); \ No newline at end of file diff --git a/web/inc/i18n/bs.php b/web/inc/i18n/bs.php index 795af1bdb..a03ea5832 100644 --- a/web/inc/i18n/bs.php +++ b/web/inc/i18n/bs.php @@ -342,6 +342,7 @@ $LANG['bs'] = array( 'Banlist' => 'Lista banovanih', 'ranges are acceptable' => 'rasponi su prihvatljivi', 'CIDR format is supported' => 'CIDR format je podržan', + 'Add one more Name Server' => 'Add one more Name Server', 'unlimited' => 'unlimited', '1 account' => '1 račun', @@ -490,6 +491,7 @@ $LANG['bs'] = array( 'Template Manager' => 'Template Manager', 'Backup Migration Manager' => 'Backup Migration Manager', 'FileManager' => 'FileManager', + 'show: CPU / MEM / NET / DISK' => 'show: CPU / MEM / NET / DISK', 'sort by' => 'sort by', 'Date' => 'Datum', @@ -540,5 +542,47 @@ $LANG['bs'] = array( 'Create file' => 'Create file', 'Create directory' => 'Create directory', + 'Add New object' => 'Add New object', + 'Save Form' => 'Save Form', + 'Cancel saving form' => 'Cancel saving form', + 'Go to USER list' => 'Go to USER list', + 'Go to WEB list' => 'Go to WEB list', + 'Go to DNS list' => 'Go to DNS list', + 'Go to MAIL list' => 'Go to MAIL list', + 'Go to DB list' => 'Go to DB list', + 'Go to CRON list' => 'Go to CRON list', + 'Go to BACKUP list' => 'Go to BACKUP list', + 'Focus on search' => 'Focus on search', + 'Display/Close shortcuts' => 'Display/Close shortcuts', + 'Move backward through top menu' => 'Move backward through top menu', + 'Move forward through top menu' => 'Move forward through top menu', + 'Switch active menu' => 'Switch active menu', + 'Enter focused element' => 'Enter focused element', + + 'Upload' => 'Upload', + 'New File' => 'New File', + 'New Folder' => 'New Folder', + 'Download' => 'Download', + 'Rename' => 'Rename', + 'Copy' => 'Copy', + 'Archive' => 'Archive', + 'Delete' => 'Delete', + 'Save File (in text editor)' => 'Save File (in text editor)', + 'Close Popup / Cancel' => 'Close Popup / Cancel', + 'Move Cursor Up' => 'Move Cursor Up', + 'Move Cursor Dow' => 'Move Cursor Dow', + 'Switch to Left Tab' => 'Switch to Left Tab', + 'Switch to Right Tab' => 'Switch to Right Tab', + 'Switch Tab' => 'Switch Tab', + 'Go to the Top of File List' => 'Go to the Top of File List', + 'Go to the Last File' => 'Go to the Last File', + 'Open File/Enter Directory' => 'Open File/Enter Directory', + 'Go to Parent Directory' => 'Go to Parent Directory', + 'Select Current File' => 'Select Current File', + 'Select Bunch of Files' => 'Select Bunch of Files', + 'Append File to the Current Selection' => 'Append File to the Current Selection', + 'Select All Files' => 'Select All Files', + 'shortcuts are inspired by magnificent GNU Midnight Commander file manager' => + 'shortcuts are inspired by magnificent GNU Midnight Commander file manager' ); \ No newline at end of file diff --git a/web/inc/i18n/cn.php b/web/inc/i18n/cn.php index e1c2446d7..d8c6c4b9d 100644 --- a/web/inc/i18n/cn.php +++ b/web/inc/i18n/cn.php @@ -347,6 +347,7 @@ $LANG['cn'] = array( 'Banlist' => '黑名單', 'ranges are acceptable' => '範圍是可以接受的', 'CIDR format is supported' => '支持CIDR格式', + 'Add one more Name Server' => 'Add one more Name Server', 'unlimited' => 'unlimited', '1 account' => '1 账户', @@ -495,6 +496,7 @@ $LANG['cn'] = array( 'Template Manager' => 'Template Manager', 'Backup Migration Manager' => 'Backup Migration Manager', 'FileManager' => 'FileManager', + 'show: CPU / MEM / NET / DISK' => 'show: CPU / MEM / NET / DISK', 'sort by' => 'sort by', 'Date' => 'Date', @@ -545,5 +547,47 @@ $LANG['cn'] = array( 'Create file' => 'Create file', 'Create directory' => 'Create directory', + 'Add New object' => 'Add New object', + 'Save Form' => 'Save Form', + 'Cancel saving form' => 'Cancel saving form', + 'Go to USER list' => 'Go to USER list', + 'Go to WEB list' => 'Go to WEB list', + 'Go to DNS list' => 'Go to DNS list', + 'Go to MAIL list' => 'Go to MAIL list', + 'Go to DB list' => 'Go to DB list', + 'Go to CRON list' => 'Go to CRON list', + 'Go to BACKUP list' => 'Go to BACKUP list', + 'Focus on search' => 'Focus on search', + 'Display/Close shortcuts' => 'Display/Close shortcuts', + 'Move backward through top menu' => 'Move backward through top menu', + 'Move forward through top menu' => 'Move forward through top menu', + 'Switch active menu' => 'Switch active menu', + 'Enter focused element' => 'Enter focused element', + + 'Upload' => 'Upload', + 'New File' => 'New File', + 'New Folder' => 'New Folder', + 'Download' => 'Download', + 'Rename' => 'Rename', + 'Copy' => 'Copy', + 'Archive' => 'Archive', + 'Delete' => 'Delete', + 'Save File (in text editor)' => 'Save File (in text editor)', + 'Close Popup / Cancel' => 'Close Popup / Cancel', + 'Move Cursor Up' => 'Move Cursor Up', + 'Move Cursor Dow' => 'Move Cursor Dow', + 'Switch to Left Tab' => 'Switch to Left Tab', + 'Switch to Right Tab' => 'Switch to Right Tab', + 'Switch Tab' => 'Switch Tab', + 'Go to the Top of File List' => 'Go to the Top of File List', + 'Go to the Last File' => 'Go to the Last File', + 'Open File/Enter Directory' => 'Open File/Enter Directory', + 'Go to Parent Directory' => 'Go to Parent Directory', + 'Select Current File' => 'Select Current File', + 'Select Bunch of Files' => 'Select Bunch of Files', + 'Append File to the Current Selection' => 'Append File to the Current Selection', + 'Select All Files' => 'Select All Files', + 'shortcuts are inspired by magnificent GNU Midnight Commander file manager' => + 'shortcuts are inspired by magnificent GNU Midnight Commander file manager' ); \ No newline at end of file diff --git a/web/inc/i18n/cz.php b/web/inc/i18n/cz.php index 7a1d94482..b408ec21c 100644 --- a/web/inc/i18n/cz.php +++ b/web/inc/i18n/cz.php @@ -348,6 +348,7 @@ $LANG['cz'] = array( 'Banlist' => 'Banlist', 'ranges are acceptable' => 'rozsahy jsou přijatelné', 'CIDR format is supported' => 'Formát CIDR je podporován', + 'Add one more Name Server' => 'Add one more Name Server', 'unlimited' => 'unlimited', '1 account' => '1 účet', @@ -496,6 +497,7 @@ $LANG['cz'] = array( 'Template Manager' => 'Template Manager', 'Backup Migration Manager' => 'Backup Migration Manager', 'FileManager' => 'FileManager', + 'show: CPU / MEM / NET / DISK' => 'show: CPU / MEM / NET / DISK', 'sort by' => 'sort by', 'Date' => 'Date', @@ -546,5 +548,47 @@ $LANG['cz'] = array( 'Create file' => 'Create file', 'Create directory' => 'Create directory', + 'Add New object' => 'Add New object', + 'Save Form' => 'Save Form', + 'Cancel saving form' => 'Cancel saving form', + 'Go to USER list' => 'Go to USER list', + 'Go to WEB list' => 'Go to WEB list', + 'Go to DNS list' => 'Go to DNS list', + 'Go to MAIL list' => 'Go to MAIL list', + 'Go to DB list' => 'Go to DB list', + 'Go to CRON list' => 'Go to CRON list', + 'Go to BACKUP list' => 'Go to BACKUP list', + 'Focus on search' => 'Focus on search', + 'Display/Close shortcuts' => 'Display/Close shortcuts', + 'Move backward through top menu' => 'Move backward through top menu', + 'Move forward through top menu' => 'Move forward through top menu', + 'Switch active menu' => 'Switch active menu', + 'Enter focused element' => 'Enter focused element', + + 'Upload' => 'Upload', + 'New File' => 'New File', + 'New Folder' => 'New Folder', + 'Download' => 'Download', + 'Rename' => 'Rename', + 'Copy' => 'Copy', + 'Archive' => 'Archive', + 'Delete' => 'Delete', + 'Save File (in text editor)' => 'Save File (in text editor)', + 'Close Popup / Cancel' => 'Close Popup / Cancel', + 'Move Cursor Up' => 'Move Cursor Up', + 'Move Cursor Dow' => 'Move Cursor Dow', + 'Switch to Left Tab' => 'Switch to Left Tab', + 'Switch to Right Tab' => 'Switch to Right Tab', + 'Switch Tab' => 'Switch Tab', + 'Go to the Top of File List' => 'Go to the Top of File List', + 'Go to the Last File' => 'Go to the Last File', + 'Open File/Enter Directory' => 'Open File/Enter Directory', + 'Go to Parent Directory' => 'Go to Parent Directory', + 'Select Current File' => 'Select Current File', + 'Select Bunch of Files' => 'Select Bunch of Files', + 'Append File to the Current Selection' => 'Append File to the Current Selection', + 'Select All Files' => 'Select All Files', + 'shortcuts are inspired by magnificent GNU Midnight Commander file manager' => + 'shortcuts are inspired by magnificent GNU Midnight Commander file manager' ); \ No newline at end of file diff --git a/web/inc/i18n/de.php b/web/inc/i18n/de.php index 116217192..069c9cb55 100644 --- a/web/inc/i18n/de.php +++ b/web/inc/i18n/de.php @@ -346,6 +346,7 @@ $LANG['de'] = array( 'Banlist' => 'Bannliste', 'ranges are acceptable' => 'Bereiche sind akzeptabel', 'CIDR format is supported' => 'CIDR-Format wird unterstützt', + 'Add one more Name Server' => 'Add one more Name Server', 'unlimited' => 'unlimited', '1 account' => '1 Konto', @@ -494,6 +495,7 @@ $LANG['de'] = array( 'Template Manager' => 'Template Manager', 'Backup Migration Manager' => 'Backup Migration Manager', 'FileManager' => 'FileManager', + 'show: CPU / MEM / NET / DISK' => 'show: CPU / MEM / NET / DISK', 'sort by' => 'sort by', 'Date' => 'Datum', @@ -544,5 +546,47 @@ $LANG['de'] = array( 'Create file' => 'Create file', 'Create directory' => 'Create directory', + 'Add New object' => 'Add New object', + 'Save Form' => 'Save Form', + 'Cancel saving form' => 'Cancel saving form', + 'Go to USER list' => 'Go to USER list', + 'Go to WEB list' => 'Go to WEB list', + 'Go to DNS list' => 'Go to DNS list', + 'Go to MAIL list' => 'Go to MAIL list', + 'Go to DB list' => 'Go to DB list', + 'Go to CRON list' => 'Go to CRON list', + 'Go to BACKUP list' => 'Go to BACKUP list', + 'Focus on search' => 'Focus on search', + 'Display/Close shortcuts' => 'Display/Close shortcuts', + 'Move backward through top menu' => 'Move backward through top menu', + 'Move forward through top menu' => 'Move forward through top menu', + 'Switch active menu' => 'Switch active menu', + 'Enter focused element' => 'Enter focused element', + + 'Upload' => 'Upload', + 'New File' => 'New File', + 'New Folder' => 'New Folder', + 'Download' => 'Download', + 'Rename' => 'Rename', + 'Copy' => 'Copy', + 'Archive' => 'Archive', + 'Delete' => 'Delete', + 'Save File (in text editor)' => 'Save File (in text editor)', + 'Close Popup / Cancel' => 'Close Popup / Cancel', + 'Move Cursor Up' => 'Move Cursor Up', + 'Move Cursor Dow' => 'Move Cursor Dow', + 'Switch to Left Tab' => 'Switch to Left Tab', + 'Switch to Right Tab' => 'Switch to Right Tab', + 'Switch Tab' => 'Switch Tab', + 'Go to the Top of File List' => 'Go to the Top of File List', + 'Go to the Last File' => 'Go to the Last File', + 'Open File/Enter Directory' => 'Open File/Enter Directory', + 'Go to Parent Directory' => 'Go to Parent Directory', + 'Select Current File' => 'Select Current File', + 'Select Bunch of Files' => 'Select Bunch of Files', + 'Append File to the Current Selection' => 'Append File to the Current Selection', + 'Select All Files' => 'Select All Files', + 'shortcuts are inspired by magnificent GNU Midnight Commander file manager' => + 'shortcuts are inspired by magnificent GNU Midnight Commander file manager' ); \ No newline at end of file diff --git a/web/inc/i18n/el.php b/web/inc/i18n/el.php index b6de95967..ccd972403 100644 --- a/web/inc/i18n/el.php +++ b/web/inc/i18n/el.php @@ -348,6 +348,7 @@ $LANG['el'] = array( 'Banlist' => 'Λίστα απαγόρευσης', 'ranges are acceptable' => 'εύρος είναι αποδεκτό', 'CIDR format is supported' => 'To format CIDR υποστηρίζεται', + 'Add one more Name Server' => 'Add one more Name Server', 'unlimited' => 'unlimited', '1 account' => '1 λογαριασμός', @@ -496,6 +497,7 @@ $LANG['el'] = array( 'Template Manager' => 'Template Manager', 'Backup Migration Manager' => 'Backup Migration Manager', 'FileManager' => 'FileManager', + 'show: CPU / MEM / NET / DISK' => 'show: CPU / MEM / NET / DISK', 'sort by' => 'sort by', 'Date' => 'Date', @@ -546,4 +548,47 @@ $LANG['el'] = array( 'Create file' => 'Create file', 'Create directory' => 'Create directory', + 'Add New object' => 'Add New object', + 'Save Form' => 'Save Form', + 'Cancel saving form' => 'Cancel saving form', + 'Go to USER list' => 'Go to USER list', + 'Go to WEB list' => 'Go to WEB list', + 'Go to DNS list' => 'Go to DNS list', + 'Go to MAIL list' => 'Go to MAIL list', + 'Go to DB list' => 'Go to DB list', + 'Go to CRON list' => 'Go to CRON list', + 'Go to BACKUP list' => 'Go to BACKUP list', + 'Focus on search' => 'Focus on search', + 'Display/Close shortcuts' => 'Display/Close shortcuts', + 'Move backward through top menu' => 'Move backward through top menu', + 'Move forward through top menu' => 'Move forward through top menu', + 'Switch active menu' => 'Switch active menu', + 'Enter focused element' => 'Enter focused element', + + 'Upload' => 'Upload', + 'New File' => 'New File', + 'New Folder' => 'New Folder', + 'Download' => 'Download', + 'Rename' => 'Rename', + 'Copy' => 'Copy', + 'Archive' => 'Archive', + 'Delete' => 'Delete', + 'Save File (in text editor)' => 'Save File (in text editor)', + 'Close Popup / Cancel' => 'Close Popup / Cancel', + 'Move Cursor Up' => 'Move Cursor Up', + 'Move Cursor Dow' => 'Move Cursor Dow', + 'Switch to Left Tab' => 'Switch to Left Tab', + 'Switch to Right Tab' => 'Switch to Right Tab', + 'Switch Tab' => 'Switch Tab', + 'Go to the Top of File List' => 'Go to the Top of File List', + 'Go to the Last File' => 'Go to the Last File', + 'Open File/Enter Directory' => 'Open File/Enter Directory', + 'Go to Parent Directory' => 'Go to Parent Directory', + 'Select Current File' => 'Select Current File', + 'Select Bunch of Files' => 'Select Bunch of Files', + 'Append File to the Current Selection' => 'Append File to the Current Selection', + 'Select All Files' => 'Select All Files', + 'shortcuts are inspired by magnificent GNU Midnight Commander file manager' => + 'shortcuts are inspired by magnificent GNU Midnight Commander file manager' + ); \ No newline at end of file diff --git a/web/inc/i18n/en.php b/web/inc/i18n/en.php index 224921533..1cfff5843 100644 --- a/web/inc/i18n/en.php +++ b/web/inc/i18n/en.php @@ -347,6 +347,7 @@ $LANG['en'] = array( 'Banlist' => 'Banlist', 'ranges are acceptable' => 'ranges are acceptable', 'CIDR format is supported' => 'CIDR format is supported', + 'Add one more Name Server' => 'Add one more Name Server', 'unlimited' => 'unlimited', '1 account' => '1 account', @@ -495,6 +496,7 @@ $LANG['en'] = array( 'Template Manager' => 'Template Manager', 'Backup Migration Manager' => 'Backup Migration Manager', 'FileManager' => 'FileManager', + 'show: CPU / MEM / NET / DISK' => 'show: CPU / MEM / NET / DISK', 'sort by' => 'sort by', 'Date' => 'Date', @@ -559,16 +561,10 @@ $LANG['en'] = array( 'Go to BACKUP list' => 'Go to BACKUP list', 'Focus on search' => 'Focus on search', 'Display/Close shortcuts' => 'Display/Close shortcuts', - 'Go to Packages' => 'Go to Packages', - 'Go to IP' => 'Go to IP', - 'Go to Graphs' => 'Go to Graphs', - 'Go to Statistic' => 'Go to Statistic', - 'Go to Log' => 'Go to Log', - 'Go to Updates' => 'Go to Updates', - 'Go to Firewall' => 'Go to Firewall', - 'Go to File Manager' => 'Go to File Manager', - 'Go to Server' => 'Go to Server', - + 'Move backward through top menu' => 'Move backward through top menu', + 'Move forward through top menu' => 'Move forward through top menu', + 'Switch active menu' => 'Switch active menu', + 'Enter focused element' => 'Enter focused element', 'Upload' => 'Upload', 'New File' => 'New File', @@ -579,7 +575,6 @@ $LANG['en'] = array( 'Archive' => 'Archive', 'Delete' => 'Delete', 'Save File (in text editor)' => 'Save File (in text editor)', - 'Display Shortcuts Hel' => 'Display Shortcuts Hel', 'Close Popup / Cancel' => 'Close Popup / Cancel', 'Move Cursor Up' => 'Move Cursor Up', 'Move Cursor Dow' => 'Move Cursor Dow', @@ -594,6 +589,7 @@ $LANG['en'] = array( 'Select Bunch of Files' => 'Select Bunch of Files', 'Append File to the Current Selection' => 'Append File to the Current Selection', 'Select All Files' => 'Select All Files', - 'shortcuts are inspired by magnificent GNU Midnight Commander file manager' => 'shortcuts are inspired by magnificent GNU Midnight Commander file manager', + 'shortcuts are inspired by magnificent GNU Midnight Commander file manager' => + 'shortcuts are inspired by magnificent GNU Midnight Commander file manager' ); \ No newline at end of file diff --git a/web/inc/i18n/es.php b/web/inc/i18n/es.php index 6902a6853..5e66036e7 100644 --- a/web/inc/i18n/es.php +++ b/web/inc/i18n/es.php @@ -347,6 +347,7 @@ $LANG['es'] = array( 'Banlist' => 'Lista negra', 'ranges are acceptable' => 'rangos son aceptables', 'CIDR format is supported' => 'Formato CIDR se admite', + 'Add one more Name Server' => 'Add one more Name Server', 'unlimited' => 'unlimited', '1 account' => '1 cuenta', @@ -495,6 +496,7 @@ $LANG['es'] = array( 'Template Manager' => 'Template Manager', 'Backup Migration Manager' => 'Backup Migration Manager', 'FileManager' => 'FileManager', + 'show: CPU / MEM / NET / DISK' => 'show: CPU / MEM / NET / DISK', 'sort by' => 'sort by', 'Date' => 'Date', @@ -545,4 +547,47 @@ $LANG['es'] = array( 'Create file' => 'Create file', 'Create directory' => 'Create directory', + 'Add New object' => 'Add New object', + 'Save Form' => 'Save Form', + 'Cancel saving form' => 'Cancel saving form', + 'Go to USER list' => 'Go to USER list', + 'Go to WEB list' => 'Go to WEB list', + 'Go to DNS list' => 'Go to DNS list', + 'Go to MAIL list' => 'Go to MAIL list', + 'Go to DB list' => 'Go to DB list', + 'Go to CRON list' => 'Go to CRON list', + 'Go to BACKUP list' => 'Go to BACKUP list', + 'Focus on search' => 'Focus on search', + 'Display/Close shortcuts' => 'Display/Close shortcuts', + 'Move backward through top menu' => 'Move backward through top menu', + 'Move forward through top menu' => 'Move forward through top menu', + 'Switch active menu' => 'Switch active menu', + 'Enter focused element' => 'Enter focused element', + + 'Upload' => 'Upload', + 'New File' => 'New File', + 'New Folder' => 'New Folder', + 'Download' => 'Download', + 'Rename' => 'Rename', + 'Copy' => 'Copy', + 'Archive' => 'Archive', + 'Delete' => 'Delete', + 'Save File (in text editor)' => 'Save File (in text editor)', + 'Close Popup / Cancel' => 'Close Popup / Cancel', + 'Move Cursor Up' => 'Move Cursor Up', + 'Move Cursor Dow' => 'Move Cursor Dow', + 'Switch to Left Tab' => 'Switch to Left Tab', + 'Switch to Right Tab' => 'Switch to Right Tab', + 'Switch Tab' => 'Switch Tab', + 'Go to the Top of File List' => 'Go to the Top of File List', + 'Go to the Last File' => 'Go to the Last File', + 'Open File/Enter Directory' => 'Open File/Enter Directory', + 'Go to Parent Directory' => 'Go to Parent Directory', + 'Select Current File' => 'Select Current File', + 'Select Bunch of Files' => 'Select Bunch of Files', + 'Append File to the Current Selection' => 'Append File to the Current Selection', + 'Select All Files' => 'Select All Files', + 'shortcuts are inspired by magnificent GNU Midnight Commander file manager' => + 'shortcuts are inspired by magnificent GNU Midnight Commander file manager' + ); \ No newline at end of file diff --git a/web/inc/i18n/fi.php b/web/inc/i18n/fi.php index 299eff03c..a912477d5 100644 --- a/web/inc/i18n/fi.php +++ b/web/inc/i18n/fi.php @@ -351,6 +351,7 @@ $LANG['fi'] = array( 'Banlist' => 'Bannilista', 'ranges are acceptable' => 'vaihteluvälit ovat hyväksyttäviä', 'CIDR format is supported' => 'CIDR muotoa tuetaan', + 'Add one more Name Server' => 'Add one more Name Server', 'unlimited' => 'unlimited', '1 account' => '1 tili', @@ -499,6 +500,7 @@ $LANG['fi'] = array( 'Template Manager' => 'Template Manager', 'Backup Migration Manager' => 'Backup Migration Manager', 'FileManager' => 'FileManager', + 'show: CPU / MEM / NET / DISK' => 'show: CPU / MEM / NET / DISK', 'sort by' => 'sort by', 'Date' => 'Date', @@ -549,4 +551,47 @@ $LANG['fi'] = array( 'Create file' => 'Create file', 'Create directory' => 'Create directory', + 'Add New object' => 'Add New object', + 'Save Form' => 'Save Form', + 'Cancel saving form' => 'Cancel saving form', + 'Go to USER list' => 'Go to USER list', + 'Go to WEB list' => 'Go to WEB list', + 'Go to DNS list' => 'Go to DNS list', + 'Go to MAIL list' => 'Go to MAIL list', + 'Go to DB list' => 'Go to DB list', + 'Go to CRON list' => 'Go to CRON list', + 'Go to BACKUP list' => 'Go to BACKUP list', + 'Focus on search' => 'Focus on search', + 'Display/Close shortcuts' => 'Display/Close shortcuts', + 'Move backward through top menu' => 'Move backward through top menu', + 'Move forward through top menu' => 'Move forward through top menu', + 'Switch active menu' => 'Switch active menu', + 'Enter focused element' => 'Enter focused element', + + 'Upload' => 'Upload', + 'New File' => 'New File', + 'New Folder' => 'New Folder', + 'Download' => 'Download', + 'Rename' => 'Rename', + 'Copy' => 'Copy', + 'Archive' => 'Archive', + 'Delete' => 'Delete', + 'Save File (in text editor)' => 'Save File (in text editor)', + 'Close Popup / Cancel' => 'Close Popup / Cancel', + 'Move Cursor Up' => 'Move Cursor Up', + 'Move Cursor Dow' => 'Move Cursor Dow', + 'Switch to Left Tab' => 'Switch to Left Tab', + 'Switch to Right Tab' => 'Switch to Right Tab', + 'Switch Tab' => 'Switch Tab', + 'Go to the Top of File List' => 'Go to the Top of File List', + 'Go to the Last File' => 'Go to the Last File', + 'Open File/Enter Directory' => 'Open File/Enter Directory', + 'Go to Parent Directory' => 'Go to Parent Directory', + 'Select Current File' => 'Select Current File', + 'Select Bunch of Files' => 'Select Bunch of Files', + 'Append File to the Current Selection' => 'Append File to the Current Selection', + 'Select All Files' => 'Select All Files', + 'shortcuts are inspired by magnificent GNU Midnight Commander file manager' => + 'shortcuts are inspired by magnificent GNU Midnight Commander file manager' + ); \ No newline at end of file diff --git a/web/inc/i18n/fr.php b/web/inc/i18n/fr.php index adfd7a0b1..7b07f7df9 100644 --- a/web/inc/i18n/fr.php +++ b/web/inc/i18n/fr.php @@ -349,6 +349,7 @@ $LANG['fr'] = array( 'Banlist' => 'Banlist', 'ranges are acceptable' => 'plages sont acceptables', 'CIDR format is supported' => 'Le format CIDR est pris en charge', + 'Add one more Name Server' => 'Add one more Name Server', 'unlimited' => 'unlimited', '1 account' => '1 compte', @@ -497,6 +498,7 @@ $LANG['fr'] = array( 'Template Manager' => 'Template Manager', 'Backup Migration Manager' => 'Backup Migration Manager', 'FileManager' => 'FileManager', + 'show: CPU / MEM / NET / DISK' => 'show: CPU / MEM / NET / DISK', 'sort by' => 'sort by', 'Date' => 'Date', @@ -547,4 +549,47 @@ $LANG['fr'] = array( 'Create file' => 'Create file', 'Create directory' => 'Create directory', + 'Add New object' => 'Add New object', + 'Save Form' => 'Save Form', + 'Cancel saving form' => 'Cancel saving form', + 'Go to USER list' => 'Go to USER list', + 'Go to WEB list' => 'Go to WEB list', + 'Go to DNS list' => 'Go to DNS list', + 'Go to MAIL list' => 'Go to MAIL list', + 'Go to DB list' => 'Go to DB list', + 'Go to CRON list' => 'Go to CRON list', + 'Go to BACKUP list' => 'Go to BACKUP list', + 'Focus on search' => 'Focus on search', + 'Display/Close shortcuts' => 'Display/Close shortcuts', + 'Move backward through top menu' => 'Move backward through top menu', + 'Move forward through top menu' => 'Move forward through top menu', + 'Switch active menu' => 'Switch active menu', + 'Enter focused element' => 'Enter focused element', + + 'Upload' => 'Upload', + 'New File' => 'New File', + 'New Folder' => 'New Folder', + 'Download' => 'Download', + 'Rename' => 'Rename', + 'Copy' => 'Copy', + 'Archive' => 'Archive', + 'Delete' => 'Delete', + 'Save File (in text editor)' => 'Save File (in text editor)', + 'Close Popup / Cancel' => 'Close Popup / Cancel', + 'Move Cursor Up' => 'Move Cursor Up', + 'Move Cursor Dow' => 'Move Cursor Dow', + 'Switch to Left Tab' => 'Switch to Left Tab', + 'Switch to Right Tab' => 'Switch to Right Tab', + 'Switch Tab' => 'Switch Tab', + 'Go to the Top of File List' => 'Go to the Top of File List', + 'Go to the Last File' => 'Go to the Last File', + 'Open File/Enter Directory' => 'Open File/Enter Directory', + 'Go to Parent Directory' => 'Go to Parent Directory', + 'Select Current File' => 'Select Current File', + 'Select Bunch of Files' => 'Select Bunch of Files', + 'Append File to the Current Selection' => 'Append File to the Current Selection', + 'Select All Files' => 'Select All Files', + 'shortcuts are inspired by magnificent GNU Midnight Commander file manager' => + 'shortcuts are inspired by magnificent GNU Midnight Commander file manager' + ); \ No newline at end of file diff --git a/web/inc/i18n/hu.php b/web/inc/i18n/hu.php index 3d5979fc9..ff2a9a38d 100644 --- a/web/inc/i18n/hu.php +++ b/web/inc/i18n/hu.php @@ -349,6 +349,7 @@ $LANG['hu'] = array( 'Banlist' => 'Banlista', 'ranges are acceptable' => 'tartományok megengedett', 'CIDR format is supported' => 'CIDR formátum támogatott', + 'Add one more Name Server' => 'Add one more Name Server', 'unlimited' => 'unlimited', '1 account' => '1 fiók', @@ -497,6 +498,7 @@ $LANG['hu'] = array( 'Template Manager' => 'Template Manager', 'Backup Migration Manager' => 'Backup Migration Manager', 'FileManager' => 'FileManager', + 'show: CPU / MEM / NET / DISK' => 'show: CPU / MEM / NET / DISK', 'sort by' => 'sort by', 'Date' => 'Date', @@ -547,4 +549,47 @@ $LANG['hu'] = array( 'Create file' => 'Create file', 'Create directory' => 'Create directory', + 'Add New object' => 'Add New object', + 'Save Form' => 'Save Form', + 'Cancel saving form' => 'Cancel saving form', + 'Go to USER list' => 'Go to USER list', + 'Go to WEB list' => 'Go to WEB list', + 'Go to DNS list' => 'Go to DNS list', + 'Go to MAIL list' => 'Go to MAIL list', + 'Go to DB list' => 'Go to DB list', + 'Go to CRON list' => 'Go to CRON list', + 'Go to BACKUP list' => 'Go to BACKUP list', + 'Focus on search' => 'Focus on search', + 'Display/Close shortcuts' => 'Display/Close shortcuts', + 'Move backward through top menu' => 'Move backward through top menu', + 'Move forward through top menu' => 'Move forward through top menu', + 'Switch active menu' => 'Switch active menu', + 'Enter focused element' => 'Enter focused element', + + 'Upload' => 'Upload', + 'New File' => 'New File', + 'New Folder' => 'New Folder', + 'Download' => 'Download', + 'Rename' => 'Rename', + 'Copy' => 'Copy', + 'Archive' => 'Archive', + 'Delete' => 'Delete', + 'Save File (in text editor)' => 'Save File (in text editor)', + 'Close Popup / Cancel' => 'Close Popup / Cancel', + 'Move Cursor Up' => 'Move Cursor Up', + 'Move Cursor Dow' => 'Move Cursor Dow', + 'Switch to Left Tab' => 'Switch to Left Tab', + 'Switch to Right Tab' => 'Switch to Right Tab', + 'Switch Tab' => 'Switch Tab', + 'Go to the Top of File List' => 'Go to the Top of File List', + 'Go to the Last File' => 'Go to the Last File', + 'Open File/Enter Directory' => 'Open File/Enter Directory', + 'Go to Parent Directory' => 'Go to Parent Directory', + 'Select Current File' => 'Select Current File', + 'Select Bunch of Files' => 'Select Bunch of Files', + 'Append File to the Current Selection' => 'Append File to the Current Selection', + 'Select All Files' => 'Select All Files', + 'shortcuts are inspired by magnificent GNU Midnight Commander file manager' => + 'shortcuts are inspired by magnificent GNU Midnight Commander file manager' + ); \ No newline at end of file diff --git a/web/inc/i18n/id.php b/web/inc/i18n/id.php index 87ad75bd9..64bb5727d 100644 --- a/web/inc/i18n/id.php +++ b/web/inc/i18n/id.php @@ -350,6 +350,7 @@ $LANG['id'] = array( 'Banlist' => 'Banlist', 'ranges are acceptable' => 'rentang diperbolehkan', 'CIDR format is supported' => 'Format CIDR didukung', + 'Add one more Name Server' => 'Add one more Name Server', 'unlimited' => 'unlimited', '1 account' => '1 pengguna', @@ -498,6 +499,7 @@ $LANG['id'] = array( 'Template Manager' => 'Template Manager', 'Backup Migration Manager' => 'Backup Migration Manager', 'FileManager' => 'FileManager', + 'show: CPU / MEM / NET / DISK' => 'show: CPU / MEM / NET / DISK', 'sort by' => 'sort by', 'Date' => 'Date', @@ -548,4 +550,47 @@ $LANG['id'] = array( 'Create file' => 'Create file', 'Create directory' => 'Create directory', + 'Add New object' => 'Add New object', + 'Save Form' => 'Save Form', + 'Cancel saving form' => 'Cancel saving form', + 'Go to USER list' => 'Go to USER list', + 'Go to WEB list' => 'Go to WEB list', + 'Go to DNS list' => 'Go to DNS list', + 'Go to MAIL list' => 'Go to MAIL list', + 'Go to DB list' => 'Go to DB list', + 'Go to CRON list' => 'Go to CRON list', + 'Go to BACKUP list' => 'Go to BACKUP list', + 'Focus on search' => 'Focus on search', + 'Display/Close shortcuts' => 'Display/Close shortcuts', + 'Move backward through top menu' => 'Move backward through top menu', + 'Move forward through top menu' => 'Move forward through top menu', + 'Switch active menu' => 'Switch active menu', + 'Enter focused element' => 'Enter focused element', + + 'Upload' => 'Upload', + 'New File' => 'New File', + 'New Folder' => 'New Folder', + 'Download' => 'Download', + 'Rename' => 'Rename', + 'Copy' => 'Copy', + 'Archive' => 'Archive', + 'Delete' => 'Delete', + 'Save File (in text editor)' => 'Save File (in text editor)', + 'Close Popup / Cancel' => 'Close Popup / Cancel', + 'Move Cursor Up' => 'Move Cursor Up', + 'Move Cursor Dow' => 'Move Cursor Dow', + 'Switch to Left Tab' => 'Switch to Left Tab', + 'Switch to Right Tab' => 'Switch to Right Tab', + 'Switch Tab' => 'Switch Tab', + 'Go to the Top of File List' => 'Go to the Top of File List', + 'Go to the Last File' => 'Go to the Last File', + 'Open File/Enter Directory' => 'Open File/Enter Directory', + 'Go to Parent Directory' => 'Go to Parent Directory', + 'Select Current File' => 'Select Current File', + 'Select Bunch of Files' => 'Select Bunch of Files', + 'Append File to the Current Selection' => 'Append File to the Current Selection', + 'Select All Files' => 'Select All Files', + 'shortcuts are inspired by magnificent GNU Midnight Commander file manager' => + 'shortcuts are inspired by magnificent GNU Midnight Commander file manager' + ); \ No newline at end of file diff --git a/web/inc/i18n/it.php b/web/inc/i18n/it.php index f5b8797ad..dbe75b674 100644 --- a/web/inc/i18n/it.php +++ b/web/inc/i18n/it.php @@ -348,6 +348,7 @@ $LANG['it'] = array( 'Banlist' => 'Banlista', 'ranges are acceptable' => 'gamme sono ammessi', 'CIDR format is supported' => 'formato CIDR e supportato', + 'Add one more Name Server' => 'Add one more Name Server', 'unlimited' => 'unlimited', '1 account' => '1 account', @@ -496,6 +497,7 @@ $LANG['it'] = array( 'Template Manager' => 'Template Manager', 'Backup Migration Manager' => 'Backup Migration Manager', 'FileManager' => 'FileManager', + 'show: CPU / MEM / NET / DISK' => 'show: CPU / MEM / NET / DISK', 'sort by' => 'sort by', 'Date' => 'Data', @@ -546,4 +548,47 @@ $LANG['it'] = array( 'Create file' => 'Create file', 'Create directory' => 'Create directory', + 'Add New object' => 'Add New object', + 'Save Form' => 'Save Form', + 'Cancel saving form' => 'Cancel saving form', + 'Go to USER list' => 'Go to USER list', + 'Go to WEB list' => 'Go to WEB list', + 'Go to DNS list' => 'Go to DNS list', + 'Go to MAIL list' => 'Go to MAIL list', + 'Go to DB list' => 'Go to DB list', + 'Go to CRON list' => 'Go to CRON list', + 'Go to BACKUP list' => 'Go to BACKUP list', + 'Focus on search' => 'Focus on search', + 'Display/Close shortcuts' => 'Display/Close shortcuts', + 'Move backward through top menu' => 'Move backward through top menu', + 'Move forward through top menu' => 'Move forward through top menu', + 'Switch active menu' => 'Switch active menu', + 'Enter focused element' => 'Enter focused element', + + 'Upload' => 'Upload', + 'New File' => 'New File', + 'New Folder' => 'New Folder', + 'Download' => 'Download', + 'Rename' => 'Rename', + 'Copy' => 'Copy', + 'Archive' => 'Archive', + 'Delete' => 'Delete', + 'Save File (in text editor)' => 'Save File (in text editor)', + 'Close Popup / Cancel' => 'Close Popup / Cancel', + 'Move Cursor Up' => 'Move Cursor Up', + 'Move Cursor Dow' => 'Move Cursor Dow', + 'Switch to Left Tab' => 'Switch to Left Tab', + 'Switch to Right Tab' => 'Switch to Right Tab', + 'Switch Tab' => 'Switch Tab', + 'Go to the Top of File List' => 'Go to the Top of File List', + 'Go to the Last File' => 'Go to the Last File', + 'Open File/Enter Directory' => 'Open File/Enter Directory', + 'Go to Parent Directory' => 'Go to Parent Directory', + 'Select Current File' => 'Select Current File', + 'Select Bunch of Files' => 'Select Bunch of Files', + 'Append File to the Current Selection' => 'Append File to the Current Selection', + 'Select All Files' => 'Select All Files', + 'shortcuts are inspired by magnificent GNU Midnight Commander file manager' => + 'shortcuts are inspired by magnificent GNU Midnight Commander file manager' + ); \ No newline at end of file diff --git a/web/inc/i18n/nl.php b/web/inc/i18n/nl.php index 40e3fde6e..c287f4dc1 100644 --- a/web/inc/i18n/nl.php +++ b/web/inc/i18n/nl.php @@ -348,6 +348,7 @@ $LANG['nl'] = array( 'Banlist' => 'Banlist', 'ranges are acceptable' => 'marges zijn toegestaan', 'CIDR format is supported' => 'CIDR-indeling wordt ondersteund', + 'Add one more Name Server' => 'Add one more Name Server', 'unlimited' => 'unlimited', '1 account' => '1 account', @@ -496,6 +497,7 @@ $LANG['nl'] = array( 'Template Manager' => 'Template Manager', 'Backup Migration Manager' => 'Backup Migration Manager', 'FileManager' => 'FileManager', + 'show: CPU / MEM / NET / DISK' => 'show: CPU / MEM / NET / DISK', 'sort by' => 'sort by', 'Date' => 'Date', @@ -546,4 +548,47 @@ $LANG['nl'] = array( 'Create file' => 'Create file', 'Create directory' => 'Create directory', + 'Add New object' => 'Add New object', + 'Save Form' => 'Save Form', + 'Cancel saving form' => 'Cancel saving form', + 'Go to USER list' => 'Go to USER list', + 'Go to WEB list' => 'Go to WEB list', + 'Go to DNS list' => 'Go to DNS list', + 'Go to MAIL list' => 'Go to MAIL list', + 'Go to DB list' => 'Go to DB list', + 'Go to CRON list' => 'Go to CRON list', + 'Go to BACKUP list' => 'Go to BACKUP list', + 'Focus on search' => 'Focus on search', + 'Display/Close shortcuts' => 'Display/Close shortcuts', + 'Move backward through top menu' => 'Move backward through top menu', + 'Move forward through top menu' => 'Move forward through top menu', + 'Switch active menu' => 'Switch active menu', + 'Enter focused element' => 'Enter focused element', + + 'Upload' => 'Upload', + 'New File' => 'New File', + 'New Folder' => 'New Folder', + 'Download' => 'Download', + 'Rename' => 'Rename', + 'Copy' => 'Copy', + 'Archive' => 'Archive', + 'Delete' => 'Delete', + 'Save File (in text editor)' => 'Save File (in text editor)', + 'Close Popup / Cancel' => 'Close Popup / Cancel', + 'Move Cursor Up' => 'Move Cursor Up', + 'Move Cursor Dow' => 'Move Cursor Dow', + 'Switch to Left Tab' => 'Switch to Left Tab', + 'Switch to Right Tab' => 'Switch to Right Tab', + 'Switch Tab' => 'Switch Tab', + 'Go to the Top of File List' => 'Go to the Top of File List', + 'Go to the Last File' => 'Go to the Last File', + 'Open File/Enter Directory' => 'Open File/Enter Directory', + 'Go to Parent Directory' => 'Go to Parent Directory', + 'Select Current File' => 'Select Current File', + 'Select Bunch of Files' => 'Select Bunch of Files', + 'Append File to the Current Selection' => 'Append File to the Current Selection', + 'Select All Files' => 'Select All Files', + 'shortcuts are inspired by magnificent GNU Midnight Commander file manager' => + 'shortcuts are inspired by magnificent GNU Midnight Commander file manager' + ); \ No newline at end of file diff --git a/web/inc/i18n/no.php b/web/inc/i18n/no.php index 52a2db7b7..7c85ab4b3 100644 --- a/web/inc/i18n/no.php +++ b/web/inc/i18n/no.php @@ -348,6 +348,7 @@ $LANG['no'] = array( 'Banlist' => 'Blokkeringsliste', 'ranges are acceptable' => 'områder er tillatt', 'CIDR format is supported' => 'CIDR-format støttes', + 'Add one more Name Server' => 'Add one more Name Server', 'unlimited' => 'unlimited', '1 account' => '1 konto', @@ -496,6 +497,7 @@ $LANG['no'] = array( 'Template Manager' => 'Template Manager', 'Backup Migration Manager' => 'Backup Migration Manager', 'FileManager' => 'FileManager', + 'show: CPU / MEM / NET / DISK' => 'show: CPU / MEM / NET / DISK', 'sort by' => 'sort by', 'Date' => 'Date', @@ -546,4 +548,47 @@ $LANG['no'] = array( 'Create file' => 'Create file', 'Create directory' => 'Create directory', + 'Add New object' => 'Add New object', + 'Save Form' => 'Save Form', + 'Cancel saving form' => 'Cancel saving form', + 'Go to USER list' => 'Go to USER list', + 'Go to WEB list' => 'Go to WEB list', + 'Go to DNS list' => 'Go to DNS list', + 'Go to MAIL list' => 'Go to MAIL list', + 'Go to DB list' => 'Go to DB list', + 'Go to CRON list' => 'Go to CRON list', + 'Go to BACKUP list' => 'Go to BACKUP list', + 'Focus on search' => 'Focus on search', + 'Display/Close shortcuts' => 'Display/Close shortcuts', + 'Move backward through top menu' => 'Move backward through top menu', + 'Move forward through top menu' => 'Move forward through top menu', + 'Switch active menu' => 'Switch active menu', + 'Enter focused element' => 'Enter focused element', + + 'Upload' => 'Upload', + 'New File' => 'New File', + 'New Folder' => 'New Folder', + 'Download' => 'Download', + 'Rename' => 'Rename', + 'Copy' => 'Copy', + 'Archive' => 'Archive', + 'Delete' => 'Delete', + 'Save File (in text editor)' => 'Save File (in text editor)', + 'Close Popup / Cancel' => 'Close Popup / Cancel', + 'Move Cursor Up' => 'Move Cursor Up', + 'Move Cursor Dow' => 'Move Cursor Dow', + 'Switch to Left Tab' => 'Switch to Left Tab', + 'Switch to Right Tab' => 'Switch to Right Tab', + 'Switch Tab' => 'Switch Tab', + 'Go to the Top of File List' => 'Go to the Top of File List', + 'Go to the Last File' => 'Go to the Last File', + 'Open File/Enter Directory' => 'Open File/Enter Directory', + 'Go to Parent Directory' => 'Go to Parent Directory', + 'Select Current File' => 'Select Current File', + 'Select Bunch of Files' => 'Select Bunch of Files', + 'Append File to the Current Selection' => 'Append File to the Current Selection', + 'Select All Files' => 'Select All Files', + 'shortcuts are inspired by magnificent GNU Midnight Commander file manager' => + 'shortcuts are inspired by magnificent GNU Midnight Commander file manager' + ); \ No newline at end of file diff --git a/web/inc/i18n/pt.php b/web/inc/i18n/pt.php index 0b10004e9..823dbacc0 100644 --- a/web/inc/i18n/pt.php +++ b/web/inc/i18n/pt.php @@ -347,6 +347,7 @@ $LANG['pt'] = array( 'Banlist' => 'Banlista', 'ranges are acceptable' => 'gamas são permitidos', 'CIDR format is supported' => 'formato CIDR é suportada', + 'Add one more Name Server' => 'Add one more Name Server', 'unlimited' => 'unlimited', '1 account' => '1 conta', @@ -495,6 +496,7 @@ $LANG['pt'] = array( 'Template Manager' => 'Template Manager', 'Backup Migration Manager' => 'Backup Migration Manager', 'FileManager' => 'FileManager', + 'show: CPU / MEM / NET / DISK' => 'show: CPU / MEM / NET / DISK', 'sort by' => 'sort by', 'Date' => 'Data', @@ -545,4 +547,47 @@ $LANG['pt'] = array( 'Create file' => 'Create file', 'Create directory' => 'Create directory', + 'Add New object' => 'Add New object', + 'Save Form' => 'Save Form', + 'Cancel saving form' => 'Cancel saving form', + 'Go to USER list' => 'Go to USER list', + 'Go to WEB list' => 'Go to WEB list', + 'Go to DNS list' => 'Go to DNS list', + 'Go to MAIL list' => 'Go to MAIL list', + 'Go to DB list' => 'Go to DB list', + 'Go to CRON list' => 'Go to CRON list', + 'Go to BACKUP list' => 'Go to BACKUP list', + 'Focus on search' => 'Focus on search', + 'Display/Close shortcuts' => 'Display/Close shortcuts', + 'Move backward through top menu' => 'Move backward through top menu', + 'Move forward through top menu' => 'Move forward through top menu', + 'Switch active menu' => 'Switch active menu', + 'Enter focused element' => 'Enter focused element', + + 'Upload' => 'Upload', + 'New File' => 'New File', + 'New Folder' => 'New Folder', + 'Download' => 'Download', + 'Rename' => 'Rename', + 'Copy' => 'Copy', + 'Archive' => 'Archive', + 'Delete' => 'Delete', + 'Save File (in text editor)' => 'Save File (in text editor)', + 'Close Popup / Cancel' => 'Close Popup / Cancel', + 'Move Cursor Up' => 'Move Cursor Up', + 'Move Cursor Dow' => 'Move Cursor Dow', + 'Switch to Left Tab' => 'Switch to Left Tab', + 'Switch to Right Tab' => 'Switch to Right Tab', + 'Switch Tab' => 'Switch Tab', + 'Go to the Top of File List' => 'Go to the Top of File List', + 'Go to the Last File' => 'Go to the Last File', + 'Open File/Enter Directory' => 'Open File/Enter Directory', + 'Go to Parent Directory' => 'Go to Parent Directory', + 'Select Current File' => 'Select Current File', + 'Select Bunch of Files' => 'Select Bunch of Files', + 'Append File to the Current Selection' => 'Append File to the Current Selection', + 'Select All Files' => 'Select All Files', + 'shortcuts are inspired by magnificent GNU Midnight Commander file manager' => + 'shortcuts are inspired by magnificent GNU Midnight Commander file manager' + ); diff --git a/web/inc/i18n/ro.php b/web/inc/i18n/ro.php index cdd4f0128..fccc5724b 100644 --- a/web/inc/i18n/ro.php +++ b/web/inc/i18n/ro.php @@ -349,6 +349,7 @@ $LANG['ro'] = array( 'Banlist' => 'Banlist', 'ranges are acceptable' => 'intervale sunt acceptabile', 'CIDR format is supported' => 'format CIDR este suportat', + 'Add one more Name Server' => 'Add one more Name Server', 'unlimited' => 'unlimited', '1 account' => '1 utilizator', @@ -497,6 +498,7 @@ $LANG['ro'] = array( 'Template Manager' => 'Template Manager', 'Backup Migration Manager' => 'Backup Migration Manager', 'FileManager' => 'FileManager', + 'show: CPU / MEM / NET / DISK' => 'show: CPU / MEM / NET / DISK', 'sort by' => 'sort by', 'Date' => 'Data', @@ -547,4 +549,47 @@ $LANG['ro'] = array( 'Create file' => 'Create file', 'Create directory' => 'Create directory', + 'Add New object' => 'Add New object', + 'Save Form' => 'Save Form', + 'Cancel saving form' => 'Cancel saving form', + 'Go to USER list' => 'Go to USER list', + 'Go to WEB list' => 'Go to WEB list', + 'Go to DNS list' => 'Go to DNS list', + 'Go to MAIL list' => 'Go to MAIL list', + 'Go to DB list' => 'Go to DB list', + 'Go to CRON list' => 'Go to CRON list', + 'Go to BACKUP list' => 'Go to BACKUP list', + 'Focus on search' => 'Focus on search', + 'Display/Close shortcuts' => 'Display/Close shortcuts', + 'Move backward through top menu' => 'Move backward through top menu', + 'Move forward through top menu' => 'Move forward through top menu', + 'Switch active menu' => 'Switch active menu', + 'Enter focused element' => 'Enter focused element', + + 'Upload' => 'Upload', + 'New File' => 'New File', + 'New Folder' => 'New Folder', + 'Download' => 'Download', + 'Rename' => 'Rename', + 'Copy' => 'Copy', + 'Archive' => 'Archive', + 'Delete' => 'Delete', + 'Save File (in text editor)' => 'Save File (in text editor)', + 'Close Popup / Cancel' => 'Close Popup / Cancel', + 'Move Cursor Up' => 'Move Cursor Up', + 'Move Cursor Dow' => 'Move Cursor Dow', + 'Switch to Left Tab' => 'Switch to Left Tab', + 'Switch to Right Tab' => 'Switch to Right Tab', + 'Switch Tab' => 'Switch Tab', + 'Go to the Top of File List' => 'Go to the Top of File List', + 'Go to the Last File' => 'Go to the Last File', + 'Open File/Enter Directory' => 'Open File/Enter Directory', + 'Go to Parent Directory' => 'Go to Parent Directory', + 'Select Current File' => 'Select Current File', + 'Select Bunch of Files' => 'Select Bunch of Files', + 'Append File to the Current Selection' => 'Append File to the Current Selection', + 'Select All Files' => 'Select All Files', + 'shortcuts are inspired by magnificent GNU Midnight Commander file manager' => + 'shortcuts are inspired by magnificent GNU Midnight Commander file manager' + ); \ No newline at end of file diff --git a/web/inc/i18n/ru.php b/web/inc/i18n/ru.php index 760837f2c..0829b9185 100644 --- a/web/inc/i18n/ru.php +++ b/web/inc/i18n/ru.php @@ -349,6 +349,7 @@ $LANG['ru'] = array( 'Banlist' => 'Черный список', 'ranges are acceptable' => 'можно использовать диапазоны', 'CIDR format is supported' => 'поддерживается формат CIDR', + 'Add one more Name Server' => 'Добавить ещё один Сервер Имён', 'unlimited' => 'неограничено', '1 account' => ' пользователей на странице: 1', @@ -497,6 +498,7 @@ $LANG['ru'] = array( 'Template Manager' => 'Менеджер Шаблонов', 'Backup Migration Manager' => 'Менеджер Миграции Бэкапов', 'FileManager' => 'Файл Менеджер', + 'show: CPU / MEM / NET / DISK' => 'показатели: ПРОЦЕССОР / ПАМЯТЬ / СЕТЬ / ДИСК', 'sort by' => 'сортировка', 'Date' => 'Дата', @@ -547,4 +549,47 @@ $LANG['ru'] = array( 'Create file' => 'Создать файл', 'Create directory' => 'Создать папку', + 'Add New object' => 'Перейти к Форме Добавления', + 'Save Form' => 'Сохрнанить Форму', + 'Cancel saving form' => 'Отменить Сохранение', + 'Go to USER list' => 'Перейти в USER', + 'Go to WEB list' => 'Перейти в WEB', + 'Go to DNS list' => 'Перейти в DNS', + 'Go to MAIL list' => 'Перейти в MAIL', + 'Go to DB list' => 'Перейти в DB', + 'Go to CRON list' => 'Перейти в CRON', + 'Go to BACKUP list' => 'Перейти в BACKUP', + 'Focus on search' => 'Фокус на форме поиска', + 'Display/Close shortcuts' => 'Показать/Скрыть список горячих клавиш', + 'Move backward through top menu' => 'Фокус на предыдущий пункт меню', + 'Move forward through top menu' => 'Фокус на следующий пункт меню', + 'Switch active menu' => 'Переключиться между меню', + 'Enter focused element' => 'Перейти в активный пункт меню', + + 'Upload' => 'Загрузить файл', + 'New File' => 'Создать Файл', + 'New Folder' => 'Создать Папку', + 'Download' => 'Скачать', + 'Rename' => 'Переименовать', + 'Copy' => 'Скопировать', + 'Archive' => 'Заархивировать', + 'Delete' => 'Удалить', + 'Save File (in text editor)' => 'Сохранить Файл (в рамках текстового редактора)', + 'Close Popup / Cancel' => 'Закрыть Попап / Отмена', + 'Move Cursor Up' => 'Переемстить курсор вверх', + 'Move Cursor Dow' => 'Переместить курсор вниз', + 'Switch to Left Tab' => 'Переключиться на таб слева', + 'Switch to Right Tab' => 'Переключиться на таб справа', + 'Switch Tab' => 'Переключить активный таб', + 'Go to the Top of File List' => 'Перейти к первому файлу', + 'Go to the Last File' => 'Перейти к последнему файлу', + 'Open File/Enter Directory' => 'Открыть Файл/Папку', + 'Go to Parent Directory' => 'Перейти в родительскую директорию', + 'Select Current File' => 'Выбрать активный файл', + 'Select Bunch of Files' => 'Выбрать блок файлов', + 'Append File to the Current Selection' => 'Добавить файл к выбранным', + 'Select All Files' => 'Выбрать все файлы', + 'shortcuts are inspired by magnificent GNU Midnight Commander file manager' => + 'горячие клавиши заимствованы из великолепного файл менеджера GNU Midnight Commander' + ); \ No newline at end of file diff --git a/web/inc/i18n/se.php b/web/inc/i18n/se.php index be8fae3aa..3c529eb5e 100644 --- a/web/inc/i18n/se.php +++ b/web/inc/i18n/se.php @@ -345,6 +345,7 @@ $LANG['se'] = array( 'Banlist' => 'Blockeringslista', 'ranges are acceptable' => 'spannet är acceptabelt', 'CIDR format is supported' => 'Stöd finns för CIDR-format', + 'Add one more Name Server' => 'Add one more Name Server', 'unlimited' => 'unlimited', '1 account' => '1 konto', @@ -493,6 +494,7 @@ $LANG['se'] = array( 'Template Manager' => 'Template Manager', 'Backup Migration Manager' => 'Backup Migration Manager', 'FileManager' => 'FileManager', + 'show: CPU / MEM / NET / DISK' => 'show: CPU / MEM / NET / DISK', 'sort by' => 'sort by', 'Date' => 'Datum', @@ -543,4 +545,47 @@ $LANG['se'] = array( 'Create file' => 'Create file', 'Create directory' => 'Create directory', + 'Add New object' => 'Add New object', + 'Save Form' => 'Save Form', + 'Cancel saving form' => 'Cancel saving form', + 'Go to USER list' => 'Go to USER list', + 'Go to WEB list' => 'Go to WEB list', + 'Go to DNS list' => 'Go to DNS list', + 'Go to MAIL list' => 'Go to MAIL list', + 'Go to DB list' => 'Go to DB list', + 'Go to CRON list' => 'Go to CRON list', + 'Go to BACKUP list' => 'Go to BACKUP list', + 'Focus on search' => 'Focus on search', + 'Display/Close shortcuts' => 'Display/Close shortcuts', + 'Move backward through top menu' => 'Move backward through top menu', + 'Move forward through top menu' => 'Move forward through top menu', + 'Switch active menu' => 'Switch active menu', + 'Enter focused element' => 'Enter focused element', + + 'Upload' => 'Upload', + 'New File' => 'New File', + 'New Folder' => 'New Folder', + 'Download' => 'Download', + 'Rename' => 'Rename', + 'Copy' => 'Copy', + 'Archive' => 'Archive', + 'Delete' => 'Delete', + 'Save File (in text editor)' => 'Save File (in text editor)', + 'Close Popup / Cancel' => 'Close Popup / Cancel', + 'Move Cursor Up' => 'Move Cursor Up', + 'Move Cursor Dow' => 'Move Cursor Dow', + 'Switch to Left Tab' => 'Switch to Left Tab', + 'Switch to Right Tab' => 'Switch to Right Tab', + 'Switch Tab' => 'Switch Tab', + 'Go to the Top of File List' => 'Go to the Top of File List', + 'Go to the Last File' => 'Go to the Last File', + 'Open File/Enter Directory' => 'Open File/Enter Directory', + 'Go to Parent Directory' => 'Go to Parent Directory', + 'Select Current File' => 'Select Current File', + 'Select Bunch of Files' => 'Select Bunch of Files', + 'Append File to the Current Selection' => 'Append File to the Current Selection', + 'Select All Files' => 'Select All Files', + 'shortcuts are inspired by magnificent GNU Midnight Commander file manager' => + 'shortcuts are inspired by magnificent GNU Midnight Commander file manager' + ); \ No newline at end of file diff --git a/web/inc/i18n/tr.php b/web/inc/i18n/tr.php index 5d3618803..44d7176bd 100644 --- a/web/inc/i18n/tr.php +++ b/web/inc/i18n/tr.php @@ -347,6 +347,7 @@ $LANG['tr'] = array( 'Banlist' => 'Yasaklı Listesi', 'ranges are acceptable' => 'kabul edilebilir aralıklar', 'CIDR format is supported' => 'CIDR formatı destekleniyor', + 'Add one more Name Server' => 'Add one more Name Server', 'unlimited' => 'sınırsız', '1 account' => '1 hesap', @@ -495,6 +496,7 @@ $LANG['tr'] = array( 'Template Manager' => 'Şablon Yöneticisi', 'Backup Migration Manager' => 'Yedek Aktarma Yöneticisi', 'FileManager' => 'DosyaYöneticisi', + 'show: CPU / MEM / NET / DISK' => 'show: CPU / MEM / NET / DISK', 'sort by' => 'sort by', 'Date' => 'Date', @@ -545,4 +547,47 @@ $LANG['tr'] = array( 'Create file' => 'Create file', 'Create directory' => 'Create directory', + 'Add New object' => 'Add New object', + 'Save Form' => 'Save Form', + 'Cancel saving form' => 'Cancel saving form', + 'Go to USER list' => 'Go to USER list', + 'Go to WEB list' => 'Go to WEB list', + 'Go to DNS list' => 'Go to DNS list', + 'Go to MAIL list' => 'Go to MAIL list', + 'Go to DB list' => 'Go to DB list', + 'Go to CRON list' => 'Go to CRON list', + 'Go to BACKUP list' => 'Go to BACKUP list', + 'Focus on search' => 'Focus on search', + 'Display/Close shortcuts' => 'Display/Close shortcuts', + 'Move backward through top menu' => 'Move backward through top menu', + 'Move forward through top menu' => 'Move forward through top menu', + 'Switch active menu' => 'Switch active menu', + 'Enter focused element' => 'Enter focused element', + + 'Upload' => 'Upload', + 'New File' => 'New File', + 'New Folder' => 'New Folder', + 'Download' => 'Download', + 'Rename' => 'Rename', + 'Copy' => 'Copy', + 'Archive' => 'Archive', + 'Delete' => 'Delete', + 'Save File (in text editor)' => 'Save File (in text editor)', + 'Close Popup / Cancel' => 'Close Popup / Cancel', + 'Move Cursor Up' => 'Move Cursor Up', + 'Move Cursor Dow' => 'Move Cursor Dow', + 'Switch to Left Tab' => 'Switch to Left Tab', + 'Switch to Right Tab' => 'Switch to Right Tab', + 'Switch Tab' => 'Switch Tab', + 'Go to the Top of File List' => 'Go to the Top of File List', + 'Go to the Last File' => 'Go to the Last File', + 'Open File/Enter Directory' => 'Open File/Enter Directory', + 'Go to Parent Directory' => 'Go to Parent Directory', + 'Select Current File' => 'Select Current File', + 'Select Bunch of Files' => 'Select Bunch of Files', + 'Append File to the Current Selection' => 'Append File to the Current Selection', + 'Select All Files' => 'Select All Files', + 'shortcuts are inspired by magnificent GNU Midnight Commander file manager' => + 'shortcuts are inspired by magnificent GNU Midnight Commander file manager' + ); \ No newline at end of file diff --git a/web/inc/i18n/tw.php b/web/inc/i18n/tw.php index 509ef315d..050ac603b 100644 --- a/web/inc/i18n/tw.php +++ b/web/inc/i18n/tw.php @@ -347,6 +347,7 @@ $LANG['tw'] = array( 'Banlist' => '封鎖清單', 'ranges are acceptable' => '可使用範圍', 'CIDR format is supported' => 'CIDR 格式是支援的', + 'Add one more Name Server' => 'Add one more Name Server', 'unlimited' => 'unlimited', '1 account' => '1 帳號', @@ -495,6 +496,7 @@ $LANG['tw'] = array( 'Template Manager' => 'Template Manager', 'Backup Migration Manager' => 'Backup Migration Manager', 'FileManager' => 'FileManager', + 'show: CPU / MEM / NET / DISK' => 'show: CPU / MEM / NET / DISK', 'sort by' => 'sort by', 'Date' => 'Date', @@ -545,4 +547,47 @@ $LANG['tw'] = array( 'Create file' => 'Create file', 'Create directory' => 'Create directory', + 'Add New object' => 'Add New object', + 'Save Form' => 'Save Form', + 'Cancel saving form' => 'Cancel saving form', + 'Go to USER list' => 'Go to USER list', + 'Go to WEB list' => 'Go to WEB list', + 'Go to DNS list' => 'Go to DNS list', + 'Go to MAIL list' => 'Go to MAIL list', + 'Go to DB list' => 'Go to DB list', + 'Go to CRON list' => 'Go to CRON list', + 'Go to BACKUP list' => 'Go to BACKUP list', + 'Focus on search' => 'Focus on search', + 'Display/Close shortcuts' => 'Display/Close shortcuts', + 'Move backward through top menu' => 'Move backward through top menu', + 'Move forward through top menu' => 'Move forward through top menu', + 'Switch active menu' => 'Switch active menu', + 'Enter focused element' => 'Enter focused element', + + 'Upload' => 'Upload', + 'New File' => 'New File', + 'New Folder' => 'New Folder', + 'Download' => 'Download', + 'Rename' => 'Rename', + 'Copy' => 'Copy', + 'Archive' => 'Archive', + 'Delete' => 'Delete', + 'Save File (in text editor)' => 'Save File (in text editor)', + 'Close Popup / Cancel' => 'Close Popup / Cancel', + 'Move Cursor Up' => 'Move Cursor Up', + 'Move Cursor Dow' => 'Move Cursor Dow', + 'Switch to Left Tab' => 'Switch to Left Tab', + 'Switch to Right Tab' => 'Switch to Right Tab', + 'Switch Tab' => 'Switch Tab', + 'Go to the Top of File List' => 'Go to the Top of File List', + 'Go to the Last File' => 'Go to the Last File', + 'Open File/Enter Directory' => 'Open File/Enter Directory', + 'Go to Parent Directory' => 'Go to Parent Directory', + 'Select Current File' => 'Select Current File', + 'Select Bunch of Files' => 'Select Bunch of Files', + 'Append File to the Current Selection' => 'Append File to the Current Selection', + 'Select All Files' => 'Select All Files', + 'shortcuts are inspired by magnificent GNU Midnight Commander file manager' => + 'shortcuts are inspired by magnificent GNU Midnight Commander file manager' + ); \ No newline at end of file diff --git a/web/inc/i18n/ua.php b/web/inc/i18n/ua.php index e51d0b474..8cf8271d9 100644 --- a/web/inc/i18n/ua.php +++ b/web/inc/i18n/ua.php @@ -349,6 +349,7 @@ $LANG['ua'] = array( 'Banlist' => 'Чорний список', 'ranges are acceptable' => 'дозволені діапазони', 'CIDR format is supported' => 'формат CIDR підтримується', + 'Add one more Name Server' => 'Add one more Name Server', 'unlimited' => 'безлімітний', '1 account' => ' 1 акаунт', @@ -497,6 +498,7 @@ $LANG['ua'] = array( 'Template Manager' => 'Менеджер Шаблонів', 'Backup Migration Manager' => 'Менеджер Міграції Бекапів', 'FileManager' => 'Файл Менеджер', + 'show: CPU / MEM / NET / DISK' => 'show: CPU / MEM / NET / DISK', 'sort by' => 'sort by', 'Date' => 'Date', @@ -547,4 +549,47 @@ $LANG['ua'] = array( 'Create file' => 'Create file', 'Create directory' => 'Create directory', + 'Add New object' => 'Add New object', + 'Save Form' => 'Save Form', + 'Cancel saving form' => 'Cancel saving form', + 'Go to USER list' => 'Go to USER list', + 'Go to WEB list' => 'Go to WEB list', + 'Go to DNS list' => 'Go to DNS list', + 'Go to MAIL list' => 'Go to MAIL list', + 'Go to DB list' => 'Go to DB list', + 'Go to CRON list' => 'Go to CRON list', + 'Go to BACKUP list' => 'Go to BACKUP list', + 'Focus on search' => 'Focus on search', + 'Display/Close shortcuts' => 'Display/Close shortcuts', + 'Move backward through top menu' => 'Move backward through top menu', + 'Move forward through top menu' => 'Move forward through top menu', + 'Switch active menu' => 'Switch active menu', + 'Enter focused element' => 'Enter focused element', + + 'Upload' => 'Upload', + 'New File' => 'New File', + 'New Folder' => 'New Folder', + 'Download' => 'Download', + 'Rename' => 'Rename', + 'Copy' => 'Copy', + 'Archive' => 'Archive', + 'Delete' => 'Delete', + 'Save File (in text editor)' => 'Save File (in text editor)', + 'Close Popup / Cancel' => 'Close Popup / Cancel', + 'Move Cursor Up' => 'Move Cursor Up', + 'Move Cursor Dow' => 'Move Cursor Dow', + 'Switch to Left Tab' => 'Switch to Left Tab', + 'Switch to Right Tab' => 'Switch to Right Tab', + 'Switch Tab' => 'Switch Tab', + 'Go to the Top of File List' => 'Go to the Top of File List', + 'Go to the Last File' => 'Go to the Last File', + 'Open File/Enter Directory' => 'Open File/Enter Directory', + 'Go to Parent Directory' => 'Go to Parent Directory', + 'Select Current File' => 'Select Current File', + 'Select Bunch of Files' => 'Select Bunch of Files', + 'Append File to the Current Selection' => 'Append File to the Current Selection', + 'Select All Files' => 'Select All Files', + 'shortcuts are inspired by magnificent GNU Midnight Commander file manager' => + 'shortcuts are inspired by magnificent GNU Midnight Commander file manager' + ); \ No newline at end of file From 20613e92a9c868d9d20026a91ccc51c5f326b4fe Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Wed, 21 Oct 2015 19:25:38 +0300 Subject: [PATCH 104/264] global suspend --- web/unsuspend/web/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/unsuspend/web/index.php b/web/unsuspend/web/index.php index befb39166..760cc169e 100644 --- a/web/unsuspend/web/index.php +++ b/web/unsuspend/web/index.php @@ -22,7 +22,7 @@ if (!empty($_GET['user'])) { if (!empty($_GET['domain'])) { $v_username = escapeshellarg($user); $v_domain = escapeshellarg($_GET['domain']); - exec (VESTA_CMD."v-unsuspend-web-domain ".$v_username." ".$v_domain, $output, $return_var); + exec (VESTA_CMD."v-unsuspend-domain ".$v_username." ".$v_domain, $output, $return_var); } check_return_code($return_var,$output); unset($output); From 86d7c7f6550158918c81fd27dbcc89037881a14b Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Wed, 21 Oct 2015 19:26:29 +0300 Subject: [PATCH 105/264] multiple name servers --- web/templates/user/edit_user.html | 114 ++++++++++++++++++++++++++---- 1 file changed, 101 insertions(+), 13 deletions(-) diff --git a/web/templates/user/edit_user.html b/web/templates/user/edit_user.html index 70ae8a012..d42998a41 100644 --- a/web/templates/user/edit_user.html +++ b/web/templates/user/edit_user.html @@ -138,7 +138,21 @@ - + + + + > + + + + + + > + + + + + + + + + '.__('delete').' + + '; + + if($v_ns4) + echo ' + + + '.__('delete').' + + '; + + if($v_ns5) + echo ' + + + '.__('delete').' + + '; + + if($v_ns6) + echo ' + + + '.__('delete').' + + '; + + if($v_ns7) + echo ' + + + '.__('delete').' + + '; + + if($v_ns8) + echo ' + + + '.__('delete').' + + '; + ?> + > + + + + + @@ -173,4 +231,34 @@
        -
        \ No newline at end of file +
        + From b55b174cc06a19f410c90d7affa0956f644a5e81 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Wed, 21 Oct 2015 19:28:46 +0300 Subject: [PATCH 106/264] .htmlentities fix --- web/templates/admin/add_dns.html | 18 +++++++++--------- web/templates/admin/add_dns_rec.html | 1 - web/templates/admin/add_user.html | 16 ++++++++-------- web/templates/admin/edit_user.html | 18 +++++++++--------- web/templates/admin/list_backup_detail.html | 4 ++-- web/templates/admin/list_dns_rec.html | 2 +- web/templates/admin/list_mail_acc.html | 2 +- web/templates/admin/list_services.html | 6 +++--- web/templates/user/list_dns_rec.html | 2 +- web/templates/user/list_mail_acc.html | 2 +- 10 files changed, 35 insertions(+), 36 deletions(-) diff --git a/web/templates/admin/add_dns.html b/web/templates/admin/add_dns.html index 8ad414fbe..564ca5fa1 100644 --- a/web/templates/admin/add_dns.html +++ b/web/templates/admin/add_dns.html @@ -108,20 +108,20 @@ > - delete + > - delete + - delete + '.__('delete').' '; @@ -129,7 +129,7 @@ echo ' - delete + '.__('delete').' '; @@ -137,7 +137,7 @@ echo ' - delete + '.__('delete').' '; @@ -145,7 +145,7 @@ echo ' - delete + '.__('delete').' '; @@ -153,7 +153,7 @@ echo ' - delete + '.__('delete').' '; @@ -161,13 +161,13 @@ echo ' - delete + '.__('delete').' '; ?> > - Add one more Name Server + diff --git a/web/templates/admin/add_dns_rec.html b/web/templates/admin/add_dns_rec.html index 23836cace..af1050418 100644 --- a/web/templates/admin/add_dns_rec.html +++ b/web/templates/admin/add_dns_rec.html @@ -31,7 +31,6 @@ ?>
        - @@ -79,7 +79,7 @@ @@ -89,7 +89,7 @@ @@ -99,7 +99,7 @@ @@ -159,7 +159,7 @@ @@ -169,7 +169,7 @@ diff --git a/web/templates/admin/edit_user.html b/web/templates/admin/edit_user.html index c85e7c222..894a8a2cc 100644 --- a/web/templates/admin/edit_user.html +++ b/web/templates/admin/edit_user.html @@ -183,20 +183,20 @@ '; @@ -204,7 +204,7 @@ echo ''; @@ -212,7 +212,7 @@ echo ''; @@ -220,7 +220,7 @@ echo ''; @@ -228,7 +228,7 @@ echo ''; @@ -236,14 +236,14 @@ echo ''; ?> > diff --git a/web/templates/admin/list_backup_detail.html b/web/templates/admin/list_backup_detail.html index a87bbae8d..87115f09d 100644 --- a/web/templates/admin/list_backup_detail.html +++ b/web/templates/admin/list_backup_detail.html @@ -1,6 +1,6 @@
        - +
        diff --git a/web/templates/admin/add_user.html b/web/templates/admin/add_user.html index 1028da286..bf6f33d1d 100644 --- a/web/templates/admin/add_user.html +++ b/web/templates/admin/add_user.html @@ -69,7 +69,7 @@
        -
        -
        -
        - $value) { echo "\n\t\t\t\t\t\t\t\t\t\t\t\t\t
        - $value) { echo "\n\t\t\t\t\t\t\t\t\t
        -
        -
        -
        > - delete +
        > - delete +
        - delete + '.__('delete').'
        - delete + '.__('delete').'
        - delete + '.__('delete').'
        - delete + '.__('delete').'
        - delete + '.__('delete').'
        - delete + '.__('delete').'
        - Add one more Name Server +
        @@ -18,7 +18,7 @@ @@ -319,7 +319,7 @@ echo ''; @@ -327,7 +327,7 @@ echo ''; @@ -335,7 +335,7 @@ echo ''; @@ -343,7 +343,7 @@ echo ''; @@ -351,7 +351,7 @@ echo ''; @@ -359,14 +359,14 @@ echo ''; ?> > @@ -416,4 +416,4 @@ }) }); - \ No newline at end of file + From 95538111b9b7cb7fc0714da46ea3b12e053b7f7d Mon Sep 17 00:00:00 2001 From: Ionescu Bogdan Date: Fri, 4 Dec 2015 22:57:23 +0200 Subject: [PATCH 242/264] Update list_mail.html --- web/templates/admin/list_mail.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/templates/admin/list_mail.html b/web/templates/admin/list_mail.html index 73ee54e18..2e1cf5de0 100644 --- a/web/templates/admin/list_mail.html +++ b/web/templates/admin/list_mail.html @@ -78,7 +78,7 @@ } else { $status = 'active'; $spnd_action = 'suspend' ; - $spnd_confirmation = 'UNSUSPEND_DOMAIN_CONFIRMATION' ; + $spnd_confirmation = 'SUSPEND_DOMAIN_CONFIRMATION' ; } if (empty($data[$key]['CATCHALL'])) { $data[$key]['CATCHALL'] = '/dev/null'; From 28841c5c9dc6e5d1473d77e4a8b7be0ec2079d35 Mon Sep 17 00:00:00 2001 From: Ionescu Bogdan Date: Fri, 4 Dec 2015 23:01:58 +0200 Subject: [PATCH 243/264] Update add_firewall_banlist.html --- web/templates/admin/add_firewall_banlist.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/templates/admin/add_firewall_banlist.html b/web/templates/admin/add_firewall_banlist.html index 9c09d8da6..ddea27dbe 100644 --- a/web/templates/admin/add_firewall_banlist.html +++ b/web/templates/admin/add_firewall_banlist.html @@ -72,7 +72,7 @@ @@ -95,4 +95,4 @@
        - +
        diff --git a/web/templates/admin/list_mail_acc.html b/web/templates/admin/list_mail_acc.html index 253e0194a..bc7b6c23f 100644 --- a/web/templates/admin/list_mail_acc.html +++ b/web/templates/admin/list_mail_acc.html @@ -1,6 +1,6 @@
        - +
        - + diff --git a/web/templates/admin/list_web.html b/web/templates/admin/list_web.html index c2da185a4..797ae6531 100644 --- a/web/templates/admin/list_web.html +++ b/web/templates/admin/list_web.html @@ -99,6 +99,11 @@ $ftp_user = str_replace(':', ', ', $ftp_user); } + $backend_support='no'; + if (!empty($data[$key]['BACKEND'])) { + $backend_support='yes'; + } + $proxy_support='no'; if (!empty($data[$key]['PROXY'])) { $proxy_support='yes'; @@ -203,6 +208,7 @@ sort-name="" sort-bandwidth="" sort-dis @@ -230,12 +249,22 @@ sort-name="" sort-bandwidth="" sort-dis diff --git a/web/templates/user/edit_web.html b/web/templates/user/edit_web.html index 3cbd06995..878e91402 100644 --- a/web/templates/user/edit_web.html +++ b/web/templates/user/edit_web.html @@ -124,27 +124,6 @@ - - - - - - - +
        - - @@ -15,6 +12,9 @@ + + diff --git a/web/templates/user/list_dns_rec.html b/web/templates/user/list_dns_rec.html index 6a7a82700..ecb6f8027 100644 --- a/web/templates/user/list_dns_rec.html +++ b/web/templates/user/list_dns_rec.html @@ -1,6 +1,6 @@
        - +
        diff --git a/web/templates/user/list_mail_acc.html b/web/templates/user/list_mail_acc.html index d510445ab..3840b7ad4 100644 --- a/web/templates/user/list_mail_acc.html +++ b/web/templates/user/list_mail_acc.html @@ -1,6 +1,6 @@
        - +
        diff --git a/web/templates/header.html b/web/templates/header.html index ab11d821d..83696d9c4 100644 --- a/web/templates/header.html +++ b/web/templates/header.html @@ -59,6 +59,6 @@ - + From ab7c5e9ce3b33e1868dbd9d3efbe6a29d351c165 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Wed, 21 Oct 2015 19:29:31 +0300 Subject: [PATCH 108/264] global suspend --- web/suspend/web/index.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/suspend/web/index.php b/web/suspend/web/index.php index 02b3fd864..23ae3cda3 100644 --- a/web/suspend/web/index.php +++ b/web/suspend/web/index.php @@ -21,10 +21,11 @@ if (!empty($_GET['user'])) { $user=$_GET['user']; } + if (!empty($_GET['domain'])) { $v_username = escapeshellarg($user); $v_domain = escapeshellarg($_GET['domain']); - exec (VESTA_CMD."v-suspend-web-domain ".$v_username." ".$v_domain, $output, $return_var); + exec (VESTA_CMD."v-suspend-domain ".$v_username." ".$v_domain, $output, $return_var); } check_return_code($return_var,$output); unset($output); From dce52823fb6c2e8a30a299d6324b6e587a6e8ec0 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Wed, 21 Oct 2015 19:29:45 +0300 Subject: [PATCH 109/264] FileManager stuff --- web/css/file_manager.css | 34 +++++++++++++++------------- web/css/file_manager_editor.css | 2 +- web/css/styles.min.css | 26 +++++++++++++++------ web/images/sprite.png | Bin 48478 -> 52380 bytes web/js/file_manager.js | 7 +++++- web/js/templates.js | 2 +- web/templates/file_manager/main.php | 2 +- 7 files changed, 46 insertions(+), 27 deletions(-) diff --git a/web/css/file_manager.css b/web/css/file_manager.css index b90f1ef12..bd805998e 100644 --- a/web/css/file_manager.css +++ b/web/css/file_manager.css @@ -102,7 +102,7 @@ body { margin: 0; padding: 0; } ul.listing { list-style-type: none; padding: 18px 0 0; margin: -4px 0 0 -1px; border-left: 1px solid #DDDDDD; overflow: auto; } .listing li { color: #999999; display: block; height: 34px; margin: 1px 0 0; line-height: 30px; padding: 0; } -.listing li span { display: inline-block; float: right; } +.listing li span { display: inline-block; float: right; height: 32px; overflow: hidden; } .listing li .marker { width: 4px; float: left; height: 100%; margin-right: 31px; } .listing li.back { } .listing li.file { } @@ -200,7 +200,9 @@ ul.listing { list-style-type: none; padding: 18px 0 0; margin: -4px 0 0 -1px; b .listing li .icon.filetype-xhtml { background: url("/images/flat_icons.png") no-repeat scroll -138px -227px; } -.listing li .filename { color: #555; cursor: pointer; height: 32px; max-width: 40%; overflow: hidden; float: left; padding: 2px 7px 0 7px; border-radius: 3px; transition: all 0.18s cubic-bezier(0.4, 0, 0.2, 1) 0s; -webkit-transition: all 0.18s cubic-bezier(0.4, 0, 0.2, 1) 0s; } +.listing li .filename-holder { max-width: 40%; overflow: hidden; float: left; height: 35px; } +.listing li .filename { color: #555; cursor: pointer; height: 32px; float: left; padding: 2px 7px 0 7px; border-radius: 3px; transition: all 0.18s cubic-bezier(0.4, 0, 0.2, 1) 0s; -webkit-transition: all 0.18s cubic-bezier(0.4, 0, 0.2, 1) 0s; } + /* .listing li .filename { background: url("/images/folder_.png") no-repeat scroll -2px 6px; color: #555; cursor: pointer; float: left; margin-left: -27px; padding-left: 19px; }*/ .listing li .filename:hover { color: #333; background-color: #D1D0CF; } @@ -531,7 +533,7 @@ input[type="checkbox"] { */ @media (max-width: 1400px) { - .listing li .filename { width: 35%; } + .listing li .filename-holder { width: 35%; } } @@ -540,13 +542,13 @@ input[type="checkbox"] { .menu div.button.mkdir { display: none; } .menu div.button.mkfile.small, .menu div.button.mkdir.small { display: inline-block; } - .listing li .filename { max-width: 30%; } + .listing li .filename-holder { max-width: 30%; } } @media (max-width: 1210px) { .menu div.button.del { display: none; } .menu div.button.del.small { display: inline-block; } - .listing li .filename { max-width: 25%; } + .listing li .filename-holder { max-width: 25%; } } @@ -554,7 +556,7 @@ input[type="checkbox"] { .menu div.button { display: none; } .menu div.button.medium, .menu div.button.small { display: inline-block; } - .listing li .filename { max-width: 20%; } + .listing li .filename-holder { max-width: 20%; } } @media (max-width: 1080px) { @@ -569,11 +571,11 @@ input[type="checkbox"] { .menu div.button { display: inline-block; } .menu div.button.small { display: none; } .menu div.copy.button { display: none; } - .listing li .filename { max-width: 40%; } + .listing li .filename-holder { max-width: 40%; } } @media (max-width: 720px) { - .listing li .filename { max-width: 30%; } + .listing li .filename-holder { max-width: 30%; } } @media (max-width: 600px) { @@ -581,18 +583,18 @@ input[type="checkbox"] { .menu div.button.medium, .menu div.button.small { display: inline-block; } .menu div.copy.button.small { display: none; } - .listing li .filename { max-width: 20%; } + .listing li .filename-holder { max-width: 20%; } } @media (max-width: 520px) { .listing li .owner { display: none; } - .listing li .filename { max-width: 15%; } + .listing li .filename-holder { max-width: 15%; } } @media (max-width: 400px) { .listing li .mode { display: none; } .listing li .time { display: none; } - .listing li .filename { max-width: 30%; } + .listing li .filename-holder { max-width: 30%; } } @media (max-width: 360px) { @@ -672,9 +674,10 @@ input[type="checkbox"] { } .shortcuts ul { list-style-type: none; - padding: 30px 10px; + padding: 30px 20px; display: inline-block; float: left; + width: 360px; } .shortcuts ul li { padding: 5px 20px; @@ -688,7 +691,6 @@ input[type="checkbox"] { font-weight: bold; padding: 0 20px 0 0; text-align: right; - width: 140px; } .shortcuts ul li span.bigger { font-size: 18px; @@ -715,12 +717,12 @@ input[type="checkbox"] { background-image: url("/images/sprite.png"); width: 35px; height: 35px; - background-position: -283px -68px; + background-position: -122px -283px; border-radius: 18px; } .l-icon-shortcuts:hover { - background-color: #ccc; + background-position: -160px -283px; } .l-icon-shortcuts:active { - background-color: #98D5CD; + background-position: -198px -283px; } diff --git a/web/css/file_manager_editor.css b/web/css/file_manager_editor.css index 9db4931af..1730e5410 100644 --- a/web/css/file_manager_editor.css +++ b/web/css/file_manager_editor.css @@ -28,7 +28,7 @@ input.save:active { border: 1px solid #FFCC00; background-color: #FFCC00; color: .ace_gutter, -.ace_scroller { padding-top: 10px; } +.ace_scroller { padding-top: 0px; } .ace-twilight .ace_gutter-active-line { margin-top: 10px; } .ace_gutter-cell { color: #777; } diff --git a/web/css/styles.min.css b/web/css/styles.min.css index 5aeee4f99..9fcace9d2 100644 --- a/web/css/styles.min.css +++ b/web/css/styles.min.css @@ -1156,6 +1156,10 @@ div.l-content > div.l-separator:nth-of-type(4) { font-size: 13px; } +.units div:last-child { + border-bottom: none !important; +} + .units .l-unit { border-bottom: 1px solid #ddd; } @@ -1944,16 +1948,19 @@ div.l-content > div.l-separator:nth-of-type(4) { .l-icon-shortcuts { width: 35px; height: 35px; - background-position: -283px -68px; + background-position: -240px -281px; border-radius: 18px; } .l-icon-shortcuts:hover { - background-color: #ccc; + background-position: -160px -281px; } .l-icon-shortcuts:active { - background-color: #98D5CD; + background-position: -198px -281px; } + + + .l-icon-star-orange { width: 13px; height: 13px; @@ -2000,14 +2007,14 @@ div.l-content > div.l-separator:nth-of-type(4) { display: inline-block; position: fixed; top: 92%; - right: 4%; + right: 1%; } .to-shortcuts { display: inline-block; position: fixed; top: 92%; - right: 1%; + right: 4%; } @@ -2593,6 +2600,7 @@ td.hint { .l-unit.selected { background-color: #feef9a; color: #555; + border-bottom: 1px solid #c0b990; } .l-unit.selected b, @@ -2804,9 +2812,10 @@ form#vstobjects.suspended { } .shortcuts ul { list-style-type: none; - padding: 30px 15px; + padding: 30px 20px; display: inline-block; float: left; + width: 360px; } .shortcuts ul li { padding: 5px 20px; @@ -2820,7 +2829,10 @@ form#vstobjects.suspended { font-weight: bold; padding: 0 20px 0 0; text-align: right; - width: 140px; +/* width: 140px;*/ +} +.shortcuts ul li span.bigger { + font-size: 18px; } .description { diff --git a/web/images/sprite.png b/web/images/sprite.png index f3df683ad5425f7f735fbbdd14678cfc0e5d666b..a20baf8a14705aa5de2e1993518bf59209bf3d7c 100644 GIT binary patch literal 52380 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 literal 48478 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

        *%$I49fkVp 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 diff --git a/web/js/file_manager.js b/web/js/file_manager.js index b79fbdd34..8167753ac 100644 --- a/web/js/file_manager.js +++ b/web/js/file_manager.js @@ -1174,8 +1174,13 @@ FM.selectItem = function(item, box) { src = $.parseJSON(src); var tab = FM.getTabLetter(FM.CURRENT_TAB); + + if (FM.itemIsArchieve(src)) { - $('.menu-'+tab+' .extract-btn').show(); + if($('.menu-'+tab+' .archive.button').first().is(':visible')) + $('.menu-'+tab+' .extract-btn').first().show(); + else + $('.menu-'+tab+' .extract-btn.small').show(); } else { $('.menu-'+tab+' .extract-btn').hide(); diff --git a/web/js/templates.js b/web/js/templates.js index dc6e64ea5..b7b3d7aca 100644 --- a/web/js/templates.js +++ b/web/js/templates.js @@ -20,7 +20,7 @@ App.Templates.html = { \ \ \ - ~!:NAME~!\ +

        ~!:NAME~!
        \ ~!:PERMISSIONS~!\ ~!:OWNER~!\ ~!:SIZE_UNIT~!\ diff --git a/web/templates/file_manager/main.php b/web/templates/file_manager/main.php index 4dea8af78..d395633c4 100644 --- a/web/templates/file_manager/main.php +++ b/web/templates/file_manager/main.php @@ -91,7 +91,7 @@
      • a
      • F8 / Del
      • <Ctrl> + s
        • -
      • h
        • +
      • h
      • Esc
          • From e89289887414398e112e1128254dd7e11a3aa812 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Wed, 21 Oct 2015 20:10:00 +0300 Subject: [PATCH 110/264] New vesta installer --- install/debian/{ => 7/apache2}/apache2.conf | 0 .../apache2/status.conf} | 0 install/debian/{ => 7/bind}/named.conf | 0 install/debian/{ => 7/clamav}/clamd.conf | 0 install/debian/7/deb_signing.key | 30 + install/debian/7/dovecot.tar.gz | Bin 0 -> 3487 bytes .../{ => 7}/dovecot/conf.d/10-auth.conf | 0 .../{ => 7}/dovecot/conf.d/10-logging.conf | 0 .../{ => 7}/dovecot/conf.d/10-mail.conf | 0 .../{ => 7}/dovecot/conf.d/10-master.conf | 0 .../debian/{ => 7}/dovecot/conf.d/10-ssl.conf | 0 .../{ => 7}/dovecot/conf.d/20-imap.conf | 0 .../{ => 7}/dovecot/conf.d/20-pop3.conf | 0 .../dovecot/conf.d/auth-passwdfile.conf.ext | 0 .../{ubuntu => debian/7/dovecot}/dovecot.conf | 0 install/debian/{ => 7/exim}/dnsbl.conf | 0 .../debian/{ => 7/exim}/exim4.conf.template | 2 +- install/debian/{ => 7/exim}/spam-blocks.conf | 0 install/debian/7/fail2ban.tar.gz | Bin 0 -> 721 bytes install/debian/7/fail2ban/action.d/vesta.conf | 9 + .../fail2ban/filter.d/vesta.conf} | 0 install/debian/7/fail2ban/jail.local | 39 + install/debian/7/firewall.tar.gz | Bin 0 -> 540 bytes install/debian/{ => 7}/firewall/ports.conf | 2 +- install/debian/{ => 7}/firewall/rules.conf | 2 +- .../{apache2.log => 7/logrotate/apache2} | 0 install/debian/7/logrotate/nginx | 13 + .../debian/{vesta.log => 7/logrotate/vesta} | 0 install/debian/7/mysql/my-large.cnf | 42 + .../my.cnf => debian/7/mysql/my-medium.cnf} | 25 +- install/debian/7/mysql/my-small.cnf | 40 + install/debian/{ => 7/nginx}/nginx.conf | 0 install/debian/7/nginx/phpmyadmin.inc | 15 + install/debian/7/nginx/phppgadmin.inc | 11 + .../nginx/status.conf} | 0 install/debian/7/nginx/webmail.inc | 15 + install/debian/7/packages.tar.gz | Bin 0 -> 562 bytes install/debian/{ => 7}/packages/default.pkg | 0 install/debian/{ => 7}/packages/gainsboro.pkg | 0 install/debian/{ => 7}/packages/palegreen.pkg | 0 install/debian/{ => 7}/packages/slategrey.pkg | 0 .../debian/{pga.conf => 7/pga/config.inc.php} | 0 .../pga/phppgadmin.conf} | 0 .../{apache2-pma.conf => 7/pma/apache.conf} | 0 .../debian/{pma.conf => 7/pma/config.inc.php} | 0 install/debian/{ => 7/postgresql}/pg_hba.conf | 0 .../{ubuntu => debian/7/proftpd}/proftpd.conf | 0 .../roundcube/apache.conf} | 0 .../roundcube/config.inc.php} | 0 .../roundcube/db.inc.php} | 0 .../roundcube/main.inc.php} | 0 .../roundcube/vesta.php} | 0 .../{sudoers.admin.conf => 7/sudo/admin} | 4 + install/debian/7/templates.tar.gz | Bin 0 -> 12831 bytes .../debian/{ => 7}/templates/dns/child-ns.tpl | 0 install/debian/7/templates/dns/default.tpl | 9 + .../debian/{ => 7}/templates/dns/gmail.tpl | 0 .../templates/web/apache2/basedir.stpl | 4 +- .../7}/templates/web/apache2/basedir.tpl | 4 +- .../templates/web/apache2/default.stpl | 0 .../{ => 7}/templates/web/apache2/default.tpl | 0 .../templates/web/apache2/hosting.stpl | 0 .../{ => 7}/templates/web/apache2/hosting.tpl | 0 .../{ => 7}/templates/web/apache2/phpcgi.sh | 0 .../{ => 7}/templates/web/apache2/phpcgi.stpl | 0 .../{ => 7}/templates/web/apache2/phpcgi.tpl | 0 .../{ => 7}/templates/web/apache2/phpfcgid.sh | 0 .../templates/web/apache2/phpfcgid.stpl | 0 .../templates/web/apache2/phpfcgid.tpl | 0 .../{ => 7}/templates/web/awstats/awstats.tpl | 0 .../{ => 7}/templates/web/awstats/index.tpl | 0 .../{ => 7}/templates/web/awstats/nav.tpl | 0 .../{ => 7}/templates/web/nginx/caching.stpl | 0 .../{ => 7}/templates/web/nginx/caching.tpl | 0 .../{ => 7}/templates/web/nginx/default.stpl | 0 .../{ => 7}/templates/web/nginx/default.tpl | 0 .../{ => 7}/templates/web/nginx/hosting.sh | 0 .../{ => 7}/templates/web/nginx/hosting.stpl | 0 .../{ => 7}/templates/web/nginx/hosting.tpl | 0 .../web/nginx/php5-fpm/cms_made_simple.stpl | 51 + .../web/nginx/php5-fpm/cms_made_simple.tpl | 47 + .../web/nginx/php5-fpm/codeigniter2.stpl | 56 + .../web/nginx/php5-fpm/codeigniter2.tpl | 52 + .../web/nginx/php5-fpm/codeigniter3.stpl | 51 + .../web/nginx/php5-fpm/codeigniter3.tpl | 47 + .../web/nginx/php5-fpm/datalife_engine.stpl | 122 ++ .../web/nginx/php5-fpm/datalife_engine.tpl | 118 ++ .../templates/web/nginx/php5-fpm/default.stpl | 50 + .../templates/web/nginx/php5-fpm/default.tpl | 46 + .../web/nginx/php5-fpm/dokuwiki.stpl | 67 + .../templates/web/nginx/php5-fpm/dokuwiki.tpl | 62 + .../templates/web/nginx/php5-fpm/drupal.stpl | 101 + .../7/templates/web/nginx/php5-fpm/drupal.tpl | 98 + .../templates/web/nginx/php5-fpm/joomla.stpl | 58 + .../7/templates/web/nginx/php5-fpm/joomla.tpl | 54 + .../web/nginx/php5-fpm/owncloud.stpl | 80 + .../templates/web/nginx/php5-fpm/owncloud.tpl | 76 + .../7/templates/web/nginx/php5-fpm/piwik.stpl | 68 + .../7/templates/web/nginx/php5-fpm/piwik.tpl | 64 + .../templates/web/nginx/php5-fpm/pyrocms.stpl | 61 + .../templates/web/nginx/php5-fpm/pyrocms.tpl | 57 + .../web/nginx/php5-fpm/wordpress.stpl | 50 + .../web/nginx/php5-fpm/wordpress.tpl | 46 + .../web/nginx/php5-fpm/wordpress2.stpl | 62 + .../web/nginx/php5-fpm/wordpress2.tpl | 58 + .../7/templates/web/nginx/php5-fpm/www.conf | 10 + .../{ => 7}/templates/web/nginx/proxy_ip.tpl | 0 .../7/templates/web/php5-fpm/default.tpl | 18 + .../7/templates/web/php5-fpm/no-php.tpl | 13 + .../7/templates/web/php5-fpm/socket.tpl | 21 + .../web/skel/document_errors/403.html | 29 + .../web/skel/document_errors/404.html | 28 + .../web/skel/document_errors/50x.html | 29 + .../templates/web/skel/public_html/index.html | 0 .../templates/web/skel/public_html/robots.txt | 0 .../web/skel/public_shtml/index.html | 0 .../web/skel/public_shtml/robots.txt | 0 .../{ => 7}/templates/web/suspend/.htaccess | 0 .../debian/7/templates/web/suspend/index.html | 27 + .../templates/web/webalizer/webalizer.tpl | 0 install/debian/{ => 7/vsftpd}/vsftpd.conf | 0 .../{ubuntu => debian/8/apache2}/apache2.conf | 1 - .../8/apache2/status.conf} | 0 install/{ubuntu => debian/8/bind}/named.conf | 0 .../{ubuntu => debian/8/clamav}/clamd.conf | 0 install/debian/8/deb_signing.key | 30 + install/debian/8/dovecot.tar.gz | Bin 0 -> 3487 bytes .../8}/dovecot/conf.d/10-auth.conf | 0 .../8}/dovecot/conf.d/10-logging.conf | 0 .../8}/dovecot/conf.d/10-mail.conf | 0 .../8}/dovecot/conf.d/10-master.conf | 0 .../8}/dovecot/conf.d/10-ssl.conf | 0 install/debian/8/dovecot/conf.d/20-imap.conf | 58 + .../8}/dovecot/conf.d/20-pop3.conf | 0 .../dovecot/conf.d/auth-passwdfile.conf.ext | 0 install/debian/8/dovecot/dovecot.conf | 4 + install/{rhel => debian/8/exim}/dnsbl.conf | 0 .../8/exim}/exim4.conf.template | 2 +- .../{rhel => debian/8/exim}/spam-blocks.conf | 0 install/debian/8/fail2ban.tar.gz | Bin 0 -> 721 bytes install/debian/8/fail2ban/action.d/vesta.conf | 9 + .../8/fail2ban/filter.d/vesta.conf} | 0 install/debian/8/fail2ban/jail.local | 39 + install/debian/8/firewall.tar.gz | Bin 0 -> 540 bytes .../{rhel => debian/8}/firewall/ports.conf | 2 +- .../{rhel => debian/8}/firewall/rules.conf | 2 +- .../8/logrotate/apache2} | 0 install/debian/8/logrotate/nginx | 13 + .../vesta.log => debian/8/logrotate/vesta} | 0 install/debian/8/mysql/my-large.cnf | 42 + .../debian/{my.cnf => 8/mysql/my-medium.cnf} | 25 +- install/debian/8/mysql/my-small.cnf | 40 + install/{rhel => debian/8/nginx}/nginx.conf | 4 +- install/debian/8/nginx/phpmyadmin.inc | 15 + install/debian/8/nginx/phppgadmin.inc | 11 + .../8/nginx/status.conf} | 0 install/debian/8/nginx/webmail.inc | 15 + install/debian/8/packages.tar.gz | Bin 0 -> 562 bytes .../{rhel => debian/8}/packages/default.pkg | 0 .../{rhel => debian/8}/packages/gainsboro.pkg | 0 .../{rhel => debian/8}/packages/palegreen.pkg | 0 .../{rhel => debian/8}/packages/slategrey.pkg | 0 .../pga.conf => debian/8/pga/config.inc.php} | 0 .../8/pga/phppgadmin.conf} | 0 install/debian/8/php5-fpm/www.conf | 10 + .../8/pma/apache.conf} | 2 +- .../pma.conf => debian/8/pma/config.inc.php} | 0 .../{rhel => debian/8/postgresql}/pg_hba.conf | 0 install/debian/8/proftpd/proftpd.conf | 32 + .../8/roundcube/apache.conf} | 0 .../8/roundcube/config.inc.php} | 0 .../8/roundcube/db.inc.php} | 0 .../8/roundcube/main.inc.php} | 3 + .../8/roundcube/vesta.php} | 0 .../8/sudo/admin} | 4 + install/debian/8/templates.tar.gz | Bin 0 -> 12935 bytes .../8}/templates/dns/child-ns.tpl | 0 .../debian/{ => 8}/templates/dns/default.tpl | 0 .../8}/templates/dns/gmail.tpl | 0 .../8/templates/web/apache2/basedir.stpl | 41 + .../8/templates/web/apache2/basedir.tpl | 35 + .../8/templates/web/apache2/default.stpl | 40 + .../8/templates/web/apache2/default.tpl | 34 + .../8}/templates/web/apache2/hosting.stpl | 2 +- .../8}/templates/web/apache2/hosting.tpl | 2 +- .../8/templates/web/apache2}/phpcgi.sh | 0 .../8}/templates/web/apache2/phpcgi.stpl | 2 +- .../8}/templates/web/apache2/phpcgi.tpl | 2 +- .../8/templates/web/apache2}/phpfcgid.sh | 0 .../8}/templates/web/apache2/phpfcgid.stpl | 2 +- .../8}/templates/web/apache2/phpfcgid.tpl | 2 +- .../8}/templates/web/awstats/awstats.tpl | 0 .../8}/templates/web/awstats/index.tpl | 0 .../8}/templates/web/awstats/nav.tpl | 0 .../debian/8/templates/web/nginx/caching.sh | 12 + .../8}/templates/web/nginx/caching.stpl | 0 .../8}/templates/web/nginx/caching.tpl | 0 .../8}/templates/web/nginx/default.stpl | 0 .../8}/templates/web/nginx/default.tpl | 0 .../8}/templates/web/nginx/hosting.sh | 0 .../8}/templates/web/nginx/hosting.stpl | 0 .../8}/templates/web/nginx/hosting.tpl | 0 .../web/nginx/php5-fpm/cms_made_simple.stpl | 51 + .../web/nginx/php5-fpm/cms_made_simple.tpl | 47 + .../web/nginx/php5-fpm/codeigniter2.stpl | 56 + .../web/nginx/php5-fpm/codeigniter2.tpl | 52 + .../web/nginx/php5-fpm/codeigniter3.stpl | 51 + .../web/nginx/php5-fpm/codeigniter3.tpl | 47 + .../web/nginx/php5-fpm/datalife_engine.stpl | 122 ++ .../web/nginx/php5-fpm/datalife_engine.tpl | 118 ++ .../templates/web/nginx/php5-fpm/default.stpl | 50 + .../templates/web/nginx/php5-fpm/default.tpl | 46 + .../web/nginx/php5-fpm/dokuwiki.stpl | 67 + .../templates/web/nginx/php5-fpm/dokuwiki.tpl | 62 + .../templates/web/nginx/php5-fpm/drupal.stpl | 101 + .../8/templates/web/nginx/php5-fpm/drupal.tpl | 98 + .../templates/web/nginx/php5-fpm/joomla.stpl | 58 + .../8/templates/web/nginx/php5-fpm/joomla.tpl | 54 + .../web/nginx/php5-fpm/owncloud.stpl | 80 + .../templates/web/nginx/php5-fpm/owncloud.tpl | 76 + .../8/templates/web/nginx/php5-fpm/piwik.stpl | 68 + .../8/templates/web/nginx/php5-fpm/piwik.tpl | 64 + .../templates/web/nginx/php5-fpm/pyrocms.stpl | 61 + .../templates/web/nginx/php5-fpm/pyrocms.tpl | 57 + .../web/nginx/php5-fpm/wordpress.stpl | 50 + .../web/nginx/php5-fpm/wordpress.tpl | 46 + .../web/nginx/php5-fpm/wordpress2.stpl | 62 + .../web/nginx/php5-fpm/wordpress2.tpl | 58 + .../8}/templates/web/nginx/proxy_ip.tpl | 0 .../8/templates/web/php5-fpm/default.tpl | 18 + .../8/templates/web/php5-fpm/no-php.tpl | 13 + .../8/templates/web/php5-fpm/socket.tpl | 21 + .../web/skel/document_errors/403.html | 29 + .../web/skel/document_errors/404.html | 28 + .../web/skel/document_errors/50x.html | 29 + .../templates/web/skel/public_html/index.html | 0 .../templates/web/skel/public_html/robots.txt | 0 .../web/skel/public_shtml/index.html | 0 .../web/skel/public_shtml/robots.txt | 0 .../8}/templates/web/suspend/.htaccess | 0 .../debian/8/templates/web/suspend/index.html | 27 + .../8}/templates/web/webalizer/webalizer.tpl | 0 .../{ubuntu => debian/8/vsftpd}/vsftpd.conf | 2 +- install/debian/apache2.readme.txt | 11 - install/debian/certificate.crt | 22 - install/debian/certificate.key | 27 - install/debian/dovecot.conf | 28 - install/debian/freshclam.conf | 27 - install/debian/nginx.readme.txt | 11 - install/debian/sudoers.conf | 32 - install/debian/vesta.conf | 24 - install/debian/whmcs-module.php | 359 ---- install/rhel/5/GPG.txt | 30 + install/rhel/{ => 5/clamav}/clamd.conf | 0 install/rhel/5/clamav/clamd.service | 12 + install/rhel/{ => 5/clamav}/freshclam.conf | 0 install/rhel/5/dovecot.tar.gz | Bin 0 -> 439 bytes install/rhel/{ => 5/dovecot}/dovecot.conf | 4 +- install/rhel/5/epel-release.rpm | Bin 0 -> 12232 bytes install/{ubuntu => rhel/5/exim}/dnsbl.conf | 0 install/rhel/{ => 5/exim}/exim-smarthost.conf | 0 install/rhel/{ => 5/exim}/exim.conf | 2 +- .../{ubuntu => rhel/5/exim}/spam-blocks.conf | 0 install/rhel/5/fail2ban.tar.gz | Bin 0 -> 727 bytes .../5/fail2ban}/fail2ban.action.conf | 0 .../5/fail2ban}/fail2ban.filter.conf | 0 .../5/fail2ban}/fail2ban.jail.conf | 0 install/rhel/5/firewall.tar.gz | Bin 0 -> 540 bytes .../{ubuntu => rhel/5}/firewall/ports.conf | 2 +- .../{ubuntu => rhel/5}/firewall/rules.conf | 2 +- install/rhel/{ => 5/httpd}/httpd.conf | 0 install/rhel/5/httpd/ruid2.conf | 8 + .../rhel/{httpd-ssl.conf => 5/httpd/ssl.conf} | 0 .../httpd/status.conf} | 0 install/rhel/{httpd.log => 5/logrotate/httpd} | 0 install/rhel/5/logrotate/nginx | 12 + .../vesta.log => rhel/5/logrotate/vesta} | 0 install/rhel/5/mariadb/my-large.cnf | 38 + install/rhel/5/mariadb/my-medium.cnf | 37 + install/rhel/5/mariadb/my-small.cnf | 35 + install/rhel/{ => 5}/monit/clamd.conf | 0 install/rhel/{ => 5}/monit/dovecot.conf | 0 install/rhel/{ => 5}/monit/exim.conf | 0 install/rhel/{ => 5}/monit/httpd.conf | 0 install/rhel/{ => 5}/monit/mysql.conf | 0 install/rhel/{ => 5}/monit/nginx.conf | 0 install/rhel/{ => 5}/monit/spamassassin.conf | 0 install/rhel/{ => 5}/monit/sshd.conf | 0 install/rhel/{ => 5}/monit/vesta-nginx.conf | 0 install/rhel/{ => 5}/monit/vesta-php.conf | 0 install/rhel/5/mysqld/my-large.cnf | 38 + install/rhel/5/mysqld/my-medium.cnf | 37 + install/rhel/5/mysqld/my-small.cnf | 35 + install/rhel/{ => 5/named}/named.conf | 0 install/rhel/5/nginx/nginx.conf | 101 + install/rhel/5/nginx/phpmyadmin.inc | 15 + install/rhel/5/nginx/phppgadmin.inc | 11 + .../5/nginx/status.conf} | 0 install/rhel/5/nginx/webmail.inc | 15 + install/rhel/5/packages.tar.gz | Bin 0 -> 552 bytes install/rhel/5/packages/default.pkg | 19 + install/rhel/5/packages/gainsboro.pkg | 19 + install/rhel/5/packages/palegreen.pkg | 19 + install/rhel/5/packages/slategrey.pkg | 19 + .../pga.conf => rhel/5/pga/config.inc.php} | 0 .../{httpd-pga.conf => 5/pga/phpPgAdmin.conf} | 0 install/rhel/5/php-fpm/www.conf | 10 + .../rhel/{pma.conf => 5/pma/config.inc.conf} | 0 .../{httpd-pma.conf => 5/pma/phpMyAdmin.conf} | 6 - install/rhel/5/postgresql/pg_hba.conf | 11 + install/rhel/{ => 5/proftpd}/proftpd.conf | 0 install/rhel/5/remi-release.rpm | Bin 0 -> 5450 bytes .../5/roundcube/config.inc.php} | 0 .../5/roundcube/db.inc.php} | 0 install/rhel/5/roundcube/main.inc.php | 40 + .../roundcube/roundcubemail.conf} | 12 +- .../roundcube/vesta.php} | 0 .../sudoers.admin.conf => rhel/5/sudo/admin} | 4 + install/rhel/5/templates.tar.gz | Bin 0 -> 12995 bytes .../5}/templates/dns/child-ns.tpl | 0 install/rhel/5/templates/dns/default.tpl | 9 + .../5}/templates/dns/gmail.tpl | 2 +- .../5}/templates/web/awstats/awstats.tpl | 0 .../5}/templates/web/awstats/index.tpl | 0 .../5}/templates/web/awstats/nav.tpl | 0 .../{ => 5}/templates/web/httpd/basedir.stpl | 4 +- .../{ => 5}/templates/web/httpd/basedir.tpl | 4 +- .../{ => 5}/templates/web/httpd/default.stpl | 0 .../{ => 5}/templates/web/httpd/default.tpl | 0 .../{ => 5}/templates/web/httpd/hosting.stpl | 0 .../{ => 5}/templates/web/httpd/hosting.tpl | 0 .../5/templates/web/httpd}/phpcgi.sh | 0 .../{ => 5}/templates/web/httpd/phpcgi.stpl | 0 .../{ => 5}/templates/web/httpd/phpcgi.tpl | 0 .../5/templates/web/httpd}/phpfcgid.sh | 0 .../{ => 5}/templates/web/httpd/phpfcgid.stpl | 0 .../{ => 5}/templates/web/httpd/phpfcgid.tpl | 0 install/rhel/5/templates/web/nginx/caching.sh | 12 + .../rhel/5/templates/web/nginx/caching.stpl | 44 + .../rhel/5/templates/web/nginx/caching.tpl | 41 + .../{ => 5}/templates/web/nginx/default.stpl | 0 .../{ => 5}/templates/web/nginx/default.tpl | 0 .../5}/templates/web/nginx/hosting.sh | 0 .../{ => 5}/templates/web/nginx/hosting.stpl | 0 .../{ => 5}/templates/web/nginx/hosting.tpl | 0 .../web/nginx/php-fpm/cms_made_simple.stpl | 51 + .../web/nginx/php-fpm/cms_made_simple.tpl | 47 + .../web/nginx/php-fpm/codeigniter2.stpl | 56 + .../web/nginx/php-fpm/codeigniter2.tpl | 52 + .../web/nginx/php-fpm/codeigniter3.stpl | 51 + .../web/nginx/php-fpm/codeigniter3.tpl | 47 + .../web/nginx/php-fpm/datalife_engine.stpl | 122 ++ .../web/nginx/php-fpm/datalife_engine.tpl | 118 ++ .../templates/web/nginx/php-fpm/default.stpl | 50 + .../5/templates/web/nginx/php-fpm/default.tpl | 46 + .../templates/web/nginx/php-fpm/dokuwiki.stpl | 67 + .../templates/web/nginx/php-fpm/dokuwiki.tpl | 62 + .../5/templates/web/nginx/php-fpm/drupal.stpl | 101 + .../5/templates/web/nginx/php-fpm/drupal.tpl | 98 + .../5/templates/web/nginx/php-fpm/joomla.stpl | 58 + .../5/templates/web/nginx/php-fpm/joomla.tpl | 54 + .../templates/web/nginx/php-fpm/owncloud.stpl | 80 + .../templates/web/nginx/php-fpm/owncloud.tpl | 76 + .../5/templates/web/nginx/php-fpm/piwik.stpl | 68 + .../5/templates/web/nginx/php-fpm/piwik.tpl | 64 + .../templates/web/nginx/php-fpm/pyrocms.stpl | 61 + .../5/templates/web/nginx/php-fpm/pyrocms.tpl | 57 + .../web/nginx/php-fpm/wordpress.stpl | 50 + .../templates/web/nginx/php-fpm/wordpress.tpl | 46 + .../web/nginx/php-fpm/wordpress2.stpl | 62 + .../web/nginx/php-fpm/wordpress2.tpl | 58 + .../5}/templates/web/nginx/proxy_ip.tpl | 0 .../rhel/5/templates/web/php-fpm/default.tpl | 18 + .../rhel/5/templates/web/php-fpm/no-php.tpl | 13 + .../rhel/5/templates/web/php-fpm/socket.tpl | 21 + .../web/skel/document_errors/403.html | 0 .../web/skel/document_errors/404.html | 0 .../web/skel/document_errors/50x.html | 0 .../templates/web/skel/public_html/index.html | 0 .../templates/web/skel/public_html/robots.txt | 0 .../web/skel/public_shtml/index.html | 0 .../web/skel/public_shtml/robots.txt | 0 .../5}/templates/web/suspend/.htaccess | 0 .../5}/templates/web/suspend/index.html | 0 .../5}/templates/web/webalizer/webalizer.tpl | 0 install/rhel/{ => 5/vsftpd}/vsftpd.conf | 0 install/rhel/5/wsgi/httpd.tar.gz | Bin 0 -> 1311 bytes install/rhel/5/wsgi/httpd/wsgi.sh | 33 + install/rhel/5/wsgi/httpd/wsgi.stpl | 49 + install/rhel/5/wsgi/httpd/wsgi.tpl | 44 + install/rhel/6/GPG.txt | 30 + install/rhel/6/clamav/clamd.conf | 502 +++++ install/rhel/6/clamav/clamd.service | 12 + install/rhel/6/clamav/freshclam.conf | 6 + install/rhel/6/dovecot.tar.gz | Bin 0 -> 2640 bytes .../6}/dovecot/conf.d/10-auth.conf | 0 .../6}/dovecot/conf.d/10-logging.conf | 0 .../6}/dovecot/conf.d/10-mail.conf | 0 .../6}/dovecot/conf.d/10-master.conf | 0 install/rhel/6/dovecot/conf.d/10-ssl.conf | 3 + .../rhel/{ => 6}/dovecot/conf.d/20-imap.conf | 0 .../rhel/{ => 6}/dovecot/conf.d/20-pop3.conf | 0 .../dovecot/conf.d/auth-passwdfile.conf.ext | 0 install/rhel/{ => 6}/dovecot/dovecot.conf | 0 install/rhel/6/epel-release.rpm | Bin 0 -> 14540 bytes install/rhel/6/exim/dnsbl.conf | 2 + install/rhel/6/exim/exim-smarthost.conf | 384 ++++ install/rhel/6/exim/exim.conf | 376 ++++ install/rhel/6/exim/spam-blocks.conf | 0 install/rhel/6/fail2ban.tar.gz | Bin 0 -> 727 bytes .../{ => 6/fail2ban}/fail2ban.action.conf | 0 install/rhel/6/fail2ban/fail2ban.filter.conf | 10 + .../rhel/{ => 6/fail2ban}/fail2ban.jail.conf | 0 install/rhel/6/firewall.tar.gz | Bin 0 -> 540 bytes install/rhel/6/firewall/ports.conf | 16 + install/rhel/6/firewall/rules.conf | 10 + install/rhel/6/httpd/httpd.conf | 256 +++ install/rhel/6/httpd/ruid2.conf | 8 + install/rhel/6/httpd/ssl.conf | 12 + install/rhel/6/httpd/status.conf | 7 + install/rhel/6/logrotate/httpd | 10 + install/rhel/6/logrotate/nginx | 12 + install/rhel/6/logrotate/vesta | 7 + install/rhel/6/mariadb/my-large.cnf | 38 + install/rhel/6/mariadb/my-medium.cnf | 37 + install/rhel/6/mariadb/my-small.cnf | 35 + install/rhel/6/mysqld/my-large.cnf | 38 + install/rhel/6/mysqld/my-medium.cnf | 37 + install/rhel/6/mysqld/my-small.cnf | 35 + install/rhel/6/named/named.conf | 13 + install/rhel/6/nginx/nginx.conf | 101 + install/rhel/6/nginx/phpmyadmin.inc | 15 + install/rhel/6/nginx/phppgadmin.inc | 11 + install/rhel/6/nginx/status.conf | 9 + install/rhel/6/nginx/webmail.inc | 15 + install/rhel/6/packages.tar.gz | Bin 0 -> 552 bytes install/rhel/6/packages/default.pkg | 19 + install/rhel/6/packages/gainsboro.pkg | 19 + install/rhel/6/packages/palegreen.pkg | 19 + install/rhel/6/packages/slategrey.pkg | 19 + install/rhel/6/pga/config.inc.php | 159 ++ install/rhel/6/pga/phpPgAdmin.conf | 14 + install/rhel/6/php-fpm/www.conf | 10 + install/rhel/6/pma/config.inc.conf | 143 ++ install/rhel/6/pma/phpMyAdmin.conf | 39 + .../{ubuntu => rhel/6/postgresql}/pg_hba.conf | 0 .../{debian => rhel/6/proftpd}/proftpd.conf | 7 +- install/rhel/6/remi-release.rpm | Bin 0 -> 5688 bytes install/rhel/6/roundcube/config.inc.php | 33 + install/rhel/6/roundcube/db.inc.php | 66 + install/rhel/6/roundcube/main.inc.php | 40 + install/rhel/6/roundcube/roundcubemail.conf | 12 + install/rhel/6/roundcube/vesta.php | 59 + install/rhel/6/sudo/admin | 7 + install/rhel/6/templates.tar.gz | Bin 0 -> 12998 bytes install/rhel/6/templates/dns/child-ns.tpl | 11 + install/rhel/6/templates/dns/default.tpl | 9 + install/rhel/6/templates/dns/gmail.tpl | 14 + .../rhel/6/templates/web/awstats/awstats.tpl | 133 ++ .../rhel/6/templates/web/awstats/index.tpl | 10 + install/rhel/6/templates/web/awstats/nav.tpl | 23 + .../6/templates/web/httpd}/basedir.stpl | 6 +- .../6/templates/web/httpd}/basedir.tpl | 6 +- .../6/templates/web/httpd}/default.stpl | 2 +- .../6/templates/web/httpd}/default.tpl | 2 +- .../rhel/6/templates/web/httpd/hosting.stpl | 49 + .../rhel/6/templates/web/httpd/hosting.tpl | 43 + install/rhel/6/templates/web/httpd/phpcgi.sh | 16 + .../rhel/6/templates/web/httpd/phpcgi.stpl | 35 + install/rhel/6/templates/web/httpd/phpcgi.tpl | 28 + .../rhel/6/templates/web/httpd/phpfcgid.sh | 22 + .../rhel/6/templates/web/httpd/phpfcgid.stpl | 36 + .../rhel/6/templates/web/httpd/phpfcgid.tpl | 28 + install/rhel/6/templates/web/nginx/caching.sh | 12 + .../rhel/6/templates/web/nginx/caching.stpl | 44 + .../rhel/6/templates/web/nginx/caching.tpl | 41 + .../rhel/6/templates/web/nginx/default.stpl | 36 + .../rhel/6/templates/web/nginx/default.tpl | 33 + install/rhel/6/templates/web/nginx/hosting.sh | 11 + .../rhel/6/templates/web/nginx/hosting.stpl | 38 + .../rhel/6/templates/web/nginx/hosting.tpl | 35 + .../web/nginx/php-fpm/cms_made_simple.stpl | 51 + .../web/nginx/php-fpm/cms_made_simple.tpl | 47 + .../web/nginx/php-fpm/codeigniter2.stpl | 56 + .../web/nginx/php-fpm/codeigniter2.tpl | 52 + .../web/nginx/php-fpm/codeigniter3.stpl | 51 + .../web/nginx/php-fpm/codeigniter3.tpl | 47 + .../web/nginx/php-fpm/datalife_engine.stpl | 122 ++ .../web/nginx/php-fpm/datalife_engine.tpl | 118 ++ .../templates/web/nginx/php-fpm/default.stpl | 50 + .../6/templates/web/nginx/php-fpm/default.tpl | 46 + .../templates/web/nginx/php-fpm/dokuwiki.stpl | 67 + .../templates/web/nginx/php-fpm/dokuwiki.tpl | 62 + .../6/templates/web/nginx/php-fpm/drupal.stpl | 101 + .../6/templates/web/nginx/php-fpm/drupal.tpl | 98 + .../6/templates/web/nginx/php-fpm/joomla.stpl | 58 + .../6/templates/web/nginx/php-fpm/joomla.tpl | 54 + .../templates/web/nginx/php-fpm/owncloud.stpl | 80 + .../templates/web/nginx/php-fpm/owncloud.tpl | 76 + .../6/templates/web/nginx/php-fpm/piwik.stpl | 68 + .../6/templates/web/nginx/php-fpm/piwik.tpl | 64 + .../templates/web/nginx/php-fpm/pyrocms.stpl | 61 + .../6/templates/web/nginx/php-fpm/pyrocms.tpl | 57 + .../web/nginx/php-fpm/wordpress.stpl | 50 + .../templates/web/nginx/php-fpm/wordpress.tpl | 46 + .../web/nginx/php-fpm/wordpress2.stpl | 62 + .../web/nginx/php-fpm/wordpress2.tpl | 58 + .../rhel/6/templates/web/nginx/proxy_ip.tpl | 9 + .../rhel/6/templates/web/php-fpm/default.tpl | 18 + .../rhel/6/templates/web/php-fpm/no-php.tpl | 13 + .../rhel/6/templates/web/php-fpm/socket.tpl | 21 + .../web/skel/document_errors/403.html | 0 .../web/skel/document_errors/404.html | 0 .../web/skel/document_errors/50x.html | 0 .../templates/web/skel/public_html/index.html | 26 + .../templates/web/skel/public_html/robots.txt | 3 + .../web/skel/public_shtml/index.html | 26 + .../web/skel/public_shtml/robots.txt | 3 + .../rhel/6/templates/web/suspend/.htaccess | 2 + .../{ => 6}/templates/web/suspend/index.html | 0 .../6/templates/web/webalizer/webalizer.tpl | 110 ++ install/rhel/6/vsftpd/vsftpd.conf | 21 + install/rhel/6/wsgi/httpd.tar.gz | Bin 0 -> 1311 bytes install/rhel/6/wsgi/httpd/wsgi.sh | 33 + install/rhel/6/wsgi/httpd/wsgi.stpl | 49 + install/rhel/6/wsgi/httpd/wsgi.tpl | 44 + install/rhel/7/GPG.txt | 30 + install/rhel/7/clamav/clamd.conf | 502 +++++ install/rhel/7/clamav/clamd.service | 12 + install/rhel/7/clamav/freshclam.conf | 6 + install/rhel/7/dovecot.tar.gz | Bin 0 -> 2640 bytes install/rhel/7/dovecot/conf.d/10-auth.conf | 4 + install/rhel/7/dovecot/conf.d/10-logging.conf | 1 + install/rhel/7/dovecot/conf.d/10-mail.conf | 4 + install/rhel/7/dovecot/conf.d/10-master.conf | 29 + install/rhel/7/dovecot/conf.d/10-ssl.conf | 3 + .../7}/dovecot/conf.d/20-imap.conf | 0 install/rhel/7/dovecot/conf.d/20-pop3.conf | 86 + .../7/dovecot/conf.d/auth-passwdfile.conf.ext | 9 + install/rhel/7/dovecot/dovecot.conf | 4 + install/rhel/7/epel-release.rpm | Bin 0 -> 14524 bytes install/rhel/7/exim/dnsbl.conf | 2 + install/rhel/7/exim/exim-smarthost.conf | 384 ++++ install/rhel/7/exim/exim.conf | 376 ++++ install/rhel/7/exim/spam-blocks.conf | 0 install/rhel/7/fail2ban.tar.gz | Bin 0 -> 727 bytes .../7/fail2ban}/fail2ban.action.conf | 0 install/rhel/7/fail2ban/fail2ban.filter.conf | 10 + .../7/fail2ban}/fail2ban.jail.conf | 0 install/rhel/7/firewall.tar.gz | Bin 0 -> 540 bytes install/rhel/7/firewall/ports.conf | 16 + install/rhel/7/firewall/rules.conf | 10 + install/rhel/7/httpd/httpd.conf | 58 + install/rhel/7/httpd/ruid2.conf | 8 + install/rhel/7/httpd/ssl.conf | 6 + install/rhel/7/httpd/status.conf | 7 + install/rhel/7/logrotate/httpd | 10 + install/rhel/7/logrotate/nginx | 12 + install/rhel/7/logrotate/vesta | 7 + install/rhel/7/mariadb/my-large.cnf | 38 + install/rhel/7/mariadb/my-medium.cnf | 37 + install/rhel/7/mariadb/my-small.cnf | 35 + install/rhel/7/monit/clamd.conf | 3 + install/rhel/7/monit/dovecot.conf | 3 + install/rhel/7/monit/exim.conf | 3 + install/rhel/7/monit/httpd.conf | 3 + install/rhel/7/monit/mysql.conf | 3 + install/rhel/7/monit/nginx.conf | 3 + install/rhel/7/monit/spamassassin.conf | 3 + install/rhel/7/monit/sshd.conf | 3 + install/rhel/7/monit/vesta-nginx.conf | 3 + install/rhel/7/monit/vesta-php.conf | 3 + install/rhel/7/mysqld/my-large.cnf | 38 + install/rhel/7/mysqld/my-medium.cnf | 37 + install/rhel/7/mysqld/my-small.cnf | 35 + install/rhel/7/named/named.conf | 13 + install/rhel/7/nginx/nginx.conf | 101 + install/rhel/7/nginx/phpmyadmin.inc | 15 + install/rhel/7/nginx/phppgadmin.inc | 11 + install/rhel/7/nginx/status.conf | 9 + install/rhel/7/nginx/webmail.inc | 15 + install/rhel/7/packages.tar.gz | Bin 0 -> 552 bytes install/rhel/7/packages/default.pkg | 19 + install/rhel/7/packages/gainsboro.pkg | 19 + install/rhel/7/packages/palegreen.pkg | 19 + install/rhel/7/packages/slategrey.pkg | 19 + install/rhel/7/pga/config.inc.php | 159 ++ install/rhel/7/pga/phpPgAdmin.conf | 14 + install/rhel/7/php-fpm/www.conf | 10 + install/rhel/7/pma/config.inc.conf | 143 ++ install/rhel/7/pma/phpMyAdmin.conf | 39 + install/rhel/7/postgresql/pg_hba.conf | 11 + install/rhel/7/proftpd/proftpd.conf | 32 + install/rhel/7/remi-release.rpm | Bin 0 -> 5764 bytes install/rhel/7/roundcube/config.inc.php | 33 + install/rhel/7/roundcube/db.inc.php | 66 + install/rhel/7/roundcube/main.inc.php | 40 + install/rhel/7/roundcube/roundcubemail.conf | 12 + install/rhel/7/roundcube/vesta.php | 59 + install/rhel/7/sudo/admin | 7 + install/rhel/7/templates.tar.gz | Bin 0 -> 12995 bytes install/rhel/7/templates/dns/child-ns.tpl | 11 + .../rhel/{ => 7}/templates/dns/default.tpl | 0 install/rhel/7/templates/dns/gmail.tpl | 14 + .../rhel/7/templates/web/awstats/awstats.tpl | 133 ++ .../rhel/7/templates/web/awstats/index.tpl | 10 + install/rhel/7/templates/web/awstats/nav.tpl | 23 + .../rhel/7/templates/web/httpd/basedir.stpl | 41 + .../rhel/7/templates/web/httpd/basedir.tpl | 35 + .../rhel/7/templates/web/httpd/default.stpl | 40 + .../rhel/7/templates/web/httpd/default.tpl | 34 + .../rhel/7/templates/web/httpd/hosting.stpl | 49 + .../rhel/7/templates/web/httpd/hosting.tpl | 43 + install/rhel/7/templates/web/httpd/phpcgi.sh | 16 + .../rhel/7/templates/web/httpd/phpcgi.stpl | 35 + install/rhel/7/templates/web/httpd/phpcgi.tpl | 28 + .../rhel/7/templates/web/httpd/phpfcgid.sh | 22 + .../rhel/7/templates/web/httpd/phpfcgid.stpl | 36 + .../rhel/7/templates/web/httpd/phpfcgid.tpl | 28 + install/rhel/7/templates/web/nginx/caching.sh | 12 + .../rhel/7/templates/web/nginx/caching.stpl | 44 + .../rhel/7/templates/web/nginx/caching.tpl | 41 + .../rhel/7/templates/web/nginx/default.stpl | 36 + .../rhel/7/templates/web/nginx/default.tpl | 33 + install/rhel/7/templates/web/nginx/hosting.sh | 11 + .../rhel/7/templates/web/nginx/hosting.stpl | 38 + .../rhel/7/templates/web/nginx/hosting.tpl | 35 + .../web/nginx/php-fpm/cms_made_simple.stpl | 51 + .../web/nginx/php-fpm/cms_made_simple.tpl | 47 + .../web/nginx/php-fpm/codeigniter2.stpl | 56 + .../web/nginx/php-fpm/codeigniter2.tpl | 52 + .../web/nginx/php-fpm/codeigniter3.stpl | 51 + .../web/nginx/php-fpm/codeigniter3.tpl | 47 + .../web/nginx/php-fpm/datalife_engine.stpl | 122 ++ .../web/nginx/php-fpm/datalife_engine.tpl | 118 ++ .../templates/web/nginx/php-fpm/default.stpl | 50 + .../7/templates/web/nginx/php-fpm/default.tpl | 46 + .../templates/web/nginx/php-fpm/dokuwiki.stpl | 67 + .../templates/web/nginx/php-fpm/dokuwiki.tpl | 62 + .../7/templates/web/nginx/php-fpm/drupal.stpl | 101 + .../7/templates/web/nginx/php-fpm/drupal.tpl | 98 + .../7/templates/web/nginx/php-fpm/joomla.stpl | 58 + .../7/templates/web/nginx/php-fpm/joomla.tpl | 54 + .../templates/web/nginx/php-fpm/owncloud.stpl | 80 + .../templates/web/nginx/php-fpm/owncloud.tpl | 76 + .../7/templates/web/nginx/php-fpm/piwik.stpl | 68 + .../7/templates/web/nginx/php-fpm/piwik.tpl | 64 + .../templates/web/nginx/php-fpm/pyrocms.stpl | 61 + .../7/templates/web/nginx/php-fpm/pyrocms.tpl | 57 + .../web/nginx/php-fpm/wordpress.stpl | 50 + .../templates/web/nginx/php-fpm/wordpress.tpl | 46 + .../web/nginx/php-fpm/wordpress2.stpl | 62 + .../web/nginx/php-fpm/wordpress2.tpl | 58 + .../rhel/7/templates/web/nginx/proxy_ip.tpl | 9 + .../rhel/7/templates/web/php-fpm/default.tpl | 18 + .../rhel/7/templates/web/php-fpm/no-php.tpl | 13 + .../rhel/7/templates/web/php-fpm/socket.tpl | 21 + .../web/skel/document_errors/403.html | 0 .../web/skel/document_errors/404.html | 0 .../web/skel/document_errors/50x.html | 0 .../templates/web/skel/public_html/index.html | 26 + .../templates/web/skel/public_html/robots.txt | 3 + .../web/skel/public_shtml/index.html | 26 + .../web/skel/public_shtml/robots.txt | 3 + .../rhel/7/templates/web/suspend/.htaccess | 2 + .../7}/templates/web/suspend/index.html | 0 .../7/templates/web/webalizer/webalizer.tpl | 110 ++ install/rhel/7/vsftpd/vsftpd.conf | 22 + install/rhel/7/wsgi/httpd.tar.gz | Bin 0 -> 1311 bytes install/rhel/7/wsgi/httpd/wsgi.sh | 33 + install/rhel/7/wsgi/httpd/wsgi.stpl | 49 + install/rhel/7/wsgi/httpd/wsgi.tpl | 44 + install/rhel/apc.ini | 70 - install/rhel/dovecot/conf.d/10-ssl.conf | 3 - install/rhel/mysql-512.cnf | 35 - install/rhel/mysql.cnf | 19 - install/rhel/sudoers.conf | 99 - install/rhel/vesta.conf | 24 - install/rhel/whmcs-module.php | 359 ---- install/ubuntu/12.04/apache2/apache2.conf | 86 + install/ubuntu/12.04/apache2/status.conf | 8 + install/ubuntu/12.04/bind/named.conf | 12 + install/ubuntu/12.04/clamav/clamd.conf | 61 + install/ubuntu/12.04/deb_signing.key | 30 + install/ubuntu/12.04/dovecot.tar.gz | Bin 0 -> 3487 bytes .../ubuntu/12.04/dovecot/conf.d/10-auth.conf | 4 + .../12.04/dovecot/conf.d/10-logging.conf | 1 + .../ubuntu/12.04/dovecot/conf.d/10-mail.conf | 4 + .../12.04/dovecot/conf.d/10-master.conf | 29 + .../ubuntu/12.04/dovecot/conf.d/10-ssl.conf | 3 + .../ubuntu/12.04/dovecot/conf.d/20-imap.conf | 58 + .../ubuntu/12.04/dovecot/conf.d/20-pop3.conf | 91 + .../dovecot/conf.d/auth-passwdfile.conf.ext | 9 + install/ubuntu/12.04/dovecot/dovecot.conf | 4 + install/ubuntu/12.04/exim/dnsbl.conf | 2 + install/ubuntu/12.04/exim/exim4.conf.template | 377 ++++ install/ubuntu/12.04/exim/spam-blocks.conf | 0 install/ubuntu/12.04/fail2ban.tar.gz | Bin 0 -> 721 bytes .../ubuntu/12.04/fail2ban/action.d/vesta.conf | 9 + .../ubuntu/12.04/fail2ban/filter.d/vesta.conf | 10 + install/ubuntu/12.04/fail2ban/jail.local | 39 + install/ubuntu/12.04/firewall.tar.gz | Bin 0 -> 540 bytes install/ubuntu/12.04/firewall/ports.conf | 16 + install/ubuntu/12.04/firewall/rules.conf | 10 + install/ubuntu/12.04/logrotate/apache2 | 19 + install/ubuntu/12.04/logrotate/nginx | 13 + install/ubuntu/12.04/logrotate/vesta | 7 + install/ubuntu/12.04/mysql/my-large.cnf | 42 + install/ubuntu/12.04/mysql/my-medium.cnf | 40 + install/ubuntu/12.04/mysql/my-small.cnf | 40 + install/ubuntu/{ => 12.04/nginx}/nginx.conf | 2 +- install/ubuntu/12.04/nginx/phpmyadmin.inc | 15 + install/ubuntu/12.04/nginx/phppgadmin.inc | 11 + install/ubuntu/12.04/nginx/status.conf | 9 + install/ubuntu/12.04/nginx/webmail.inc | 15 + install/ubuntu/12.04/packages.tar.gz | Bin 0 -> 562 bytes .../ubuntu/{ => 12.04}/packages/default.pkg | 0 .../ubuntu/{ => 12.04}/packages/gainsboro.pkg | 0 .../ubuntu/{ => 12.04}/packages/palegreen.pkg | 0 .../ubuntu/{ => 12.04}/packages/slategrey.pkg | 0 install/ubuntu/12.04/pga/config.inc.php | 159 ++ install/ubuntu/12.04/pga/phppgadmin.conf | 31 + install/ubuntu/12.04/php5-fpm/www.conf | 10 + install/ubuntu/12.04/pma/apache.conf | 42 + install/ubuntu/12.04/pma/config.inc.php | 146 ++ install/ubuntu/12.04/postgresql/pg_hba.conf | 11 + install/ubuntu/12.04/proftpd/proftpd.conf | 32 + install/ubuntu/12.04/roundcube/apache.conf | 40 + install/ubuntu/12.04/roundcube/config.inc.php | 33 + install/ubuntu/12.04/roundcube/db.inc.php | 66 + .../roundcube/main.inc.php} | 3 + install/ubuntu/12.04/roundcube/vesta.php | 62 + install/ubuntu/12.04/sudo/admin | 7 + install/ubuntu/12.04/templates.tar.gz | Bin 0 -> 12935 bytes .../ubuntu/12.04/templates/dns/child-ns.tpl | 11 + .../ubuntu/12.04/templates/dns/default.tpl | 9 + install/ubuntu/12.04/templates/dns/gmail.tpl | 14 + .../12.04/templates/web/apache2/basedir.stpl | 41 + .../12.04/templates/web/apache2/basedir.tpl | 35 + .../12.04/templates/web/apache2/default.stpl | 40 + .../12.04/templates/web/apache2/default.tpl | 34 + .../12.04/templates/web/apache2/hosting.stpl | 49 + .../12.04/templates/web/apache2/hosting.tpl | 43 + .../12.04/templates/web/apache2/phpcgi.sh | 16 + .../12.04/templates/web/apache2/phpcgi.stpl | 35 + .../12.04/templates/web/apache2/phpcgi.tpl | 28 + .../12.04/templates/web/apache2/phpfcgid.sh | 22 + .../12.04/templates/web/apache2/phpfcgid.stpl | 36 + .../12.04/templates/web/apache2/phpfcgid.tpl | 28 + .../12.04/templates/web/awstats/awstats.tpl | 133 ++ .../12.04/templates/web/awstats/index.tpl | 10 + .../12.04/templates/web/awstats/nav.tpl | 23 + .../12.04/templates/web/nginx/caching.sh | 12 + .../templates/web/nginx/caching.stpl | 0 .../templates/web/nginx/caching.tpl | 2 +- .../12.04/templates/web/nginx/default.stpl | 36 + .../12.04/templates/web/nginx/default.tpl | 33 + .../12.04/templates/web/nginx/hosting.sh | 11 + .../12.04/templates/web/nginx/hosting.stpl | 38 + .../12.04/templates/web/nginx/hosting.tpl | 35 + .../web/nginx/php5-fpm/cms_made_simple.stpl | 51 + .../web/nginx/php5-fpm/cms_made_simple.tpl | 47 + .../web/nginx/php5-fpm/codeigniter2.stpl | 56 + .../web/nginx/php5-fpm/codeigniter2.tpl | 52 + .../web/nginx/php5-fpm/codeigniter3.stpl | 51 + .../web/nginx/php5-fpm/codeigniter3.tpl | 47 + .../web/nginx/php5-fpm/datalife_engine.stpl | 122 ++ .../web/nginx/php5-fpm/datalife_engine.tpl | 118 ++ .../templates/web/nginx/php5-fpm/default.stpl | 50 + .../templates/web/nginx/php5-fpm/default.tpl | 46 + .../web/nginx/php5-fpm/dokuwiki.stpl | 67 + .../templates/web/nginx/php5-fpm/dokuwiki.tpl | 62 + .../templates/web/nginx/php5-fpm/drupal.stpl | 101 + .../templates/web/nginx/php5-fpm/drupal.tpl | 98 + .../templates/web/nginx/php5-fpm/joomla.stpl | 58 + .../templates/web/nginx/php5-fpm/joomla.tpl | 54 + .../web/nginx/php5-fpm/owncloud.stpl | 80 + .../templates/web/nginx/php5-fpm/owncloud.tpl | 76 + .../templates/web/nginx/php5-fpm/piwik.stpl | 68 + .../templates/web/nginx/php5-fpm/piwik.tpl | 64 + .../templates/web/nginx/php5-fpm/pyrocms.stpl | 61 + .../templates/web/nginx/php5-fpm/pyrocms.tpl | 57 + .../web/nginx/php5-fpm/wordpress.stpl | 50 + .../web/nginx/php5-fpm/wordpress.tpl | 46 + .../web/nginx/php5-fpm/wordpress2.stpl | 62 + .../web/nginx/php5-fpm/wordpress2.tpl | 58 + .../12.04/templates/web/nginx/proxy_ip.tpl | 9 + .../12.04/templates/web/php5-fpm/default.tpl | 18 + .../12.04/templates/web/php5-fpm/no-php.tpl | 13 + .../12.04/templates/web/php5-fpm/socket.tpl | 21 + .../web/skel/document_errors/403.html | 29 + .../web/skel/document_errors/404.html | 28 + .../web/skel/document_errors/50x.html | 29 + .../templates/web/skel/public_html/index.html | 26 + .../templates/web/skel/public_html/robots.txt | 3 + .../web/skel/public_shtml/index.html | 26 + .../web/skel/public_shtml/robots.txt | 3 + .../12.04/templates/web/suspend/.htaccess | 2 + .../12.04/templates/web/suspend/index.html | 27 + .../templates/web/webalizer/webalizer.tpl | 110 ++ install/ubuntu/12.04/vsftpd/vsftpd.conf | 24 + install/ubuntu/12.10/apache2/apache2.conf | 86 + install/ubuntu/12.10/apache2/status.conf | 8 + install/ubuntu/12.10/bind/named.conf | 12 + install/ubuntu/12.10/clamav/clamd.conf | 61 + install/ubuntu/12.10/deb_signing.key | 30 + install/ubuntu/12.10/dovecot.tar.gz | Bin 0 -> 3487 bytes .../ubuntu/12.10/dovecot/conf.d/10-auth.conf | 4 + .../12.10/dovecot/conf.d/10-logging.conf | 1 + .../ubuntu/12.10/dovecot/conf.d/10-mail.conf | 4 + .../12.10/dovecot/conf.d/10-master.conf | 29 + .../ubuntu/12.10/dovecot/conf.d/10-ssl.conf | 3 + .../ubuntu/12.10/dovecot/conf.d/20-imap.conf | 58 + .../ubuntu/12.10/dovecot/conf.d/20-pop3.conf | 91 + .../dovecot/conf.d/auth-passwdfile.conf.ext | 9 + install/ubuntu/12.10/dovecot/dovecot.conf | 4 + install/ubuntu/12.10/exim/dnsbl.conf | 2 + install/ubuntu/12.10/exim/exim4.conf.template | 377 ++++ install/ubuntu/12.10/exim/spam-blocks.conf | 0 install/ubuntu/12.10/fail2ban.tar.gz | Bin 0 -> 721 bytes .../ubuntu/12.10/fail2ban/action.d/vesta.conf | 9 + .../ubuntu/12.10/fail2ban/filter.d/vesta.conf | 10 + install/ubuntu/12.10/fail2ban/jail.local | 39 + install/ubuntu/12.10/firewall.tar.gz | Bin 0 -> 540 bytes install/ubuntu/12.10/firewall/ports.conf | 16 + install/ubuntu/12.10/firewall/rules.conf | 10 + install/ubuntu/12.10/logrotate/apache2 | 19 + install/ubuntu/12.10/logrotate/nginx | 13 + install/ubuntu/12.10/logrotate/vesta | 7 + install/ubuntu/12.10/mysql/my-large.cnf | 42 + install/ubuntu/12.10/mysql/my-medium.cnf | 40 + install/ubuntu/12.10/mysql/my-small.cnf | 40 + install/ubuntu/12.10/nginx/nginx.conf | 124 ++ install/ubuntu/12.10/nginx/phpmyadmin.inc | 15 + install/ubuntu/12.10/nginx/phppgadmin.inc | 11 + install/ubuntu/12.10/nginx/status.conf | 9 + install/ubuntu/12.10/nginx/webmail.inc | 15 + install/ubuntu/12.10/packages.tar.gz | Bin 0 -> 562 bytes install/ubuntu/12.10/packages/default.pkg | 18 + install/ubuntu/12.10/packages/gainsboro.pkg | 18 + install/ubuntu/12.10/packages/palegreen.pkg | 18 + install/ubuntu/12.10/packages/slategrey.pkg | 18 + install/ubuntu/12.10/pga/config.inc.php | 159 ++ install/ubuntu/12.10/pga/phppgadmin.conf | 31 + install/ubuntu/12.10/php5-fpm/www.conf | 10 + install/ubuntu/12.10/pma/apache.conf | 42 + install/ubuntu/12.10/pma/config.inc.php | 146 ++ install/ubuntu/12.10/postgresql/pg_hba.conf | 11 + install/ubuntu/12.10/proftpd/proftpd.conf | 32 + install/ubuntu/12.10/roundcube/apache.conf | 40 + install/ubuntu/12.10/roundcube/config.inc.php | 33 + install/ubuntu/12.10/roundcube/db.inc.php | 66 + install/ubuntu/12.10/roundcube/main.inc.php | 850 ++++++++ install/ubuntu/12.10/roundcube/vesta.php | 62 + install/ubuntu/12.10/sudo/admin | 7 + install/ubuntu/12.10/templates.tar.gz | Bin 0 -> 12935 bytes .../ubuntu/12.10/templates/dns/child-ns.tpl | 11 + .../ubuntu/12.10/templates/dns/default.tpl | 9 + install/ubuntu/12.10/templates/dns/gmail.tpl | 14 + .../12.10/templates/web/apache2/basedir.stpl | 41 + .../12.10/templates/web/apache2/basedir.tpl | 35 + .../12.10/templates/web/apache2/default.stpl | 40 + .../12.10/templates/web/apache2/default.tpl | 34 + .../12.10/templates/web/apache2/hosting.stpl | 49 + .../12.10/templates/web/apache2/hosting.tpl | 43 + .../12.10/templates/web/apache2/phpcgi.sh | 16 + .../12.10/templates/web/apache2/phpcgi.stpl | 35 + .../12.10/templates/web/apache2/phpcgi.tpl | 28 + .../12.10/templates/web/apache2/phpfcgid.sh | 22 + .../12.10/templates/web/apache2/phpfcgid.stpl | 36 + .../12.10/templates/web/apache2/phpfcgid.tpl | 28 + .../12.10/templates/web/awstats/awstats.tpl | 133 ++ .../12.10/templates/web/awstats/index.tpl | 10 + .../12.10/templates/web/awstats/nav.tpl | 23 + .../12.10/templates/web/nginx/caching.sh | 12 + .../12.10/templates/web/nginx/caching.stpl | 44 + .../12.10/templates/web/nginx/caching.tpl | 41 + .../12.10/templates/web/nginx/default.stpl | 36 + .../12.10/templates/web/nginx/default.tpl | 33 + .../12.10/templates/web/nginx/hosting.sh | 11 + .../12.10/templates/web/nginx/hosting.stpl | 38 + .../12.10/templates/web/nginx/hosting.tpl | 35 + .../web/nginx/php5-fpm/cms_made_simple.stpl | 51 + .../web/nginx/php5-fpm/cms_made_simple.tpl | 47 + .../web/nginx/php5-fpm/codeigniter2.stpl | 56 + .../web/nginx/php5-fpm/codeigniter2.tpl | 52 + .../web/nginx/php5-fpm/codeigniter3.stpl | 51 + .../web/nginx/php5-fpm/codeigniter3.tpl | 47 + .../web/nginx/php5-fpm/datalife_engine.stpl | 122 ++ .../web/nginx/php5-fpm/datalife_engine.tpl | 118 ++ .../templates/web/nginx/php5-fpm/default.stpl | 50 + .../templates/web/nginx/php5-fpm/default.tpl | 46 + .../web/nginx/php5-fpm/dokuwiki.stpl | 67 + .../templates/web/nginx/php5-fpm/dokuwiki.tpl | 62 + .../templates/web/nginx/php5-fpm/drupal.stpl | 101 + .../templates/web/nginx/php5-fpm/drupal.tpl | 98 + .../templates/web/nginx/php5-fpm/joomla.stpl | 58 + .../templates/web/nginx/php5-fpm/joomla.tpl | 54 + .../web/nginx/php5-fpm/owncloud.stpl | 80 + .../templates/web/nginx/php5-fpm/owncloud.tpl | 76 + .../templates/web/nginx/php5-fpm/piwik.stpl | 68 + .../templates/web/nginx/php5-fpm/piwik.tpl | 64 + .../templates/web/nginx/php5-fpm/pyrocms.stpl | 61 + .../templates/web/nginx/php5-fpm/pyrocms.tpl | 57 + .../web/nginx/php5-fpm/wordpress.stpl | 50 + .../web/nginx/php5-fpm/wordpress.tpl | 46 + .../web/nginx/php5-fpm/wordpress2.stpl | 62 + .../web/nginx/php5-fpm/wordpress2.tpl | 58 + .../12.10/templates/web/nginx/proxy_ip.tpl | 9 + .../12.10/templates/web/php5-fpm/default.tpl | 18 + .../12.10/templates/web/php5-fpm/no-php.tpl | 13 + .../12.10/templates/web/php5-fpm/socket.tpl | 21 + .../web/skel/document_errors/403.html | 29 + .../web/skel/document_errors/404.html | 28 + .../web/skel/document_errors/50x.html | 29 + .../templates/web/skel/public_html/index.html | 26 + .../templates/web/skel/public_html/robots.txt | 3 + .../web/skel/public_shtml/index.html | 26 + .../web/skel/public_shtml/robots.txt | 3 + .../12.10/templates/web/suspend/.htaccess | 2 + .../12.10/templates/web/suspend/index.html | 27 + .../templates/web/webalizer/webalizer.tpl | 110 ++ install/ubuntu/12.10/vsftpd/vsftpd.conf | 24 + install/ubuntu/13.04/apache2/apache2.conf | 86 + install/ubuntu/13.04/apache2/status.conf | 8 + install/ubuntu/13.04/bind/named.conf | 12 + install/ubuntu/13.04/clamav/clamd.conf | 61 + install/ubuntu/13.04/deb_signing.key | 30 + install/ubuntu/13.04/dovecot.tar.gz | Bin 0 -> 3487 bytes .../ubuntu/13.04/dovecot/conf.d/10-auth.conf | 4 + .../13.04/dovecot/conf.d/10-logging.conf | 1 + .../ubuntu/13.04/dovecot/conf.d/10-mail.conf | 4 + .../13.04/dovecot/conf.d/10-master.conf | 29 + .../ubuntu/13.04/dovecot/conf.d/10-ssl.conf | 3 + .../ubuntu/13.04/dovecot/conf.d/20-imap.conf | 58 + .../ubuntu/13.04/dovecot/conf.d/20-pop3.conf | 91 + .../dovecot/conf.d/auth-passwdfile.conf.ext | 9 + install/ubuntu/13.04/dovecot/dovecot.conf | 4 + install/ubuntu/13.04/exim/dnsbl.conf | 2 + install/ubuntu/13.04/exim/exim4.conf.template | 377 ++++ install/ubuntu/13.04/exim/spam-blocks.conf | 0 install/ubuntu/13.04/fail2ban.tar.gz | Bin 0 -> 721 bytes .../ubuntu/13.04/fail2ban/action.d/vesta.conf | 9 + .../ubuntu/13.04/fail2ban/filter.d/vesta.conf | 10 + install/ubuntu/13.04/fail2ban/jail.local | 39 + install/ubuntu/13.04/firewall.tar.gz | Bin 0 -> 540 bytes install/ubuntu/13.04/firewall/ports.conf | 16 + install/ubuntu/13.04/firewall/rules.conf | 10 + install/ubuntu/13.04/logrotate/apache2 | 19 + install/ubuntu/13.04/logrotate/nginx | 13 + install/ubuntu/13.04/logrotate/vesta | 7 + install/ubuntu/13.04/mysql/my-large.cnf | 42 + install/ubuntu/13.04/mysql/my-medium.cnf | 40 + install/ubuntu/13.04/mysql/my-small.cnf | 40 + install/ubuntu/13.04/nginx/nginx.conf | 124 ++ install/ubuntu/13.04/nginx/phpmyadmin.inc | 15 + install/ubuntu/13.04/nginx/phppgadmin.inc | 11 + install/ubuntu/13.04/nginx/status.conf | 9 + install/ubuntu/13.04/nginx/webmail.inc | 15 + install/ubuntu/13.04/packages.tar.gz | Bin 0 -> 562 bytes install/ubuntu/13.04/packages/default.pkg | 18 + install/ubuntu/13.04/packages/gainsboro.pkg | 18 + install/ubuntu/13.04/packages/palegreen.pkg | 18 + install/ubuntu/13.04/packages/slategrey.pkg | 18 + install/ubuntu/13.04/pga/config.inc.php | 159 ++ install/ubuntu/13.04/pga/phppgadmin.conf | 31 + install/ubuntu/13.04/php5-fpm/www.conf | 10 + install/ubuntu/13.04/pma/apache.conf | 42 + install/ubuntu/13.04/pma/config.inc.php | 146 ++ install/ubuntu/13.04/postgresql/pg_hba.conf | 11 + install/ubuntu/13.04/proftpd/proftpd.conf | 32 + install/ubuntu/13.04/roundcube/apache.conf | 40 + install/ubuntu/13.04/roundcube/config.inc.php | 33 + install/ubuntu/13.04/roundcube/db.inc.php | 66 + install/ubuntu/13.04/roundcube/main.inc.php | 850 ++++++++ install/ubuntu/13.04/roundcube/vesta.php | 62 + install/ubuntu/13.04/sudo/admin | 7 + install/ubuntu/13.04/templates.tar.gz | Bin 0 -> 12935 bytes .../ubuntu/13.04/templates/dns/child-ns.tpl | 11 + .../ubuntu/13.04/templates/dns/default.tpl | 9 + install/ubuntu/13.04/templates/dns/gmail.tpl | 14 + .../13.04/templates/web/apache2/basedir.stpl | 41 + .../13.04/templates/web/apache2/basedir.tpl | 35 + .../13.04/templates/web/apache2/default.stpl | 40 + .../13.04/templates/web/apache2/default.tpl | 34 + .../13.04/templates/web/apache2/hosting.stpl | 49 + .../13.04/templates/web/apache2/hosting.tpl | 43 + .../13.04/templates/web/apache2/phpcgi.sh | 16 + .../13.04/templates/web/apache2/phpcgi.stpl | 35 + .../13.04/templates/web/apache2/phpcgi.tpl | 28 + .../13.04/templates/web/apache2/phpfcgid.sh | 22 + .../13.04/templates/web/apache2/phpfcgid.stpl | 36 + .../13.04/templates/web/apache2/phpfcgid.tpl | 28 + .../13.04/templates/web/awstats/awstats.tpl | 133 ++ .../13.04/templates/web/awstats/index.tpl | 10 + .../13.04/templates/web/awstats/nav.tpl | 23 + .../13.04/templates/web/nginx/caching.sh | 12 + .../13.04/templates/web/nginx/caching.stpl | 44 + .../13.04/templates/web/nginx/caching.tpl | 41 + .../13.04/templates/web/nginx/default.stpl | 36 + .../13.04/templates/web/nginx/default.tpl | 33 + .../13.04/templates/web/nginx/hosting.sh | 11 + .../13.04/templates/web/nginx/hosting.stpl | 38 + .../13.04/templates/web/nginx/hosting.tpl | 35 + .../web/nginx/php5-fpm/cms_made_simple.stpl | 51 + .../web/nginx/php5-fpm/cms_made_simple.tpl | 47 + .../web/nginx/php5-fpm/codeigniter2.stpl | 56 + .../web/nginx/php5-fpm/codeigniter2.tpl | 52 + .../web/nginx/php5-fpm/codeigniter3.stpl | 51 + .../web/nginx/php5-fpm/codeigniter3.tpl | 47 + .../web/nginx/php5-fpm/datalife_engine.stpl | 122 ++ .../web/nginx/php5-fpm/datalife_engine.tpl | 118 ++ .../templates/web/nginx/php5-fpm/default.stpl | 50 + .../templates/web/nginx/php5-fpm/default.tpl | 46 + .../web/nginx/php5-fpm/dokuwiki.stpl | 67 + .../templates/web/nginx/php5-fpm/dokuwiki.tpl | 62 + .../templates/web/nginx/php5-fpm/drupal.stpl | 101 + .../templates/web/nginx/php5-fpm/drupal.tpl | 98 + .../templates/web/nginx/php5-fpm/joomla.stpl | 58 + .../templates/web/nginx/php5-fpm/joomla.tpl | 54 + .../web/nginx/php5-fpm/owncloud.stpl | 80 + .../templates/web/nginx/php5-fpm/owncloud.tpl | 76 + .../templates/web/nginx/php5-fpm/piwik.stpl | 68 + .../templates/web/nginx/php5-fpm/piwik.tpl | 64 + .../templates/web/nginx/php5-fpm/pyrocms.stpl | 61 + .../templates/web/nginx/php5-fpm/pyrocms.tpl | 57 + .../web/nginx/php5-fpm/wordpress.stpl | 50 + .../web/nginx/php5-fpm/wordpress.tpl | 46 + .../web/nginx/php5-fpm/wordpress2.stpl | 62 + .../web/nginx/php5-fpm/wordpress2.tpl | 58 + .../13.04/templates/web/nginx/proxy_ip.tpl | 9 + .../13.04/templates/web/php5-fpm/default.tpl | 18 + .../13.04/templates/web/php5-fpm/no-php.tpl | 13 + .../13.04/templates/web/php5-fpm/socket.tpl | 21 + .../web/skel/document_errors/403.html | 29 + .../web/skel/document_errors/404.html | 28 + .../web/skel/document_errors/50x.html | 29 + .../templates/web/skel/public_html/index.html | 26 + .../templates/web/skel/public_html/robots.txt | 3 + .../web/skel/public_shtml/index.html | 26 + .../web/skel/public_shtml/robots.txt | 3 + .../13.04/templates/web/suspend/.htaccess | 2 + .../13.04/templates/web/suspend/index.html | 27 + .../templates/web/webalizer/webalizer.tpl | 110 ++ install/ubuntu/13.04/vsftpd/vsftpd.conf | 24 + install/ubuntu/13.10/apache2/apache2.conf | 86 + install/ubuntu/13.10/apache2/status.conf | 8 + install/ubuntu/13.10/bind/named.conf | 12 + install/ubuntu/13.10/clamav/clamd.conf | 61 + install/ubuntu/13.10/deb_signing.key | 30 + install/ubuntu/13.10/dovecot.tar.gz | Bin 0 -> 3487 bytes .../ubuntu/13.10/dovecot/conf.d/10-auth.conf | 4 + .../13.10/dovecot/conf.d/10-logging.conf | 1 + .../ubuntu/13.10/dovecot/conf.d/10-mail.conf | 4 + .../13.10/dovecot/conf.d/10-master.conf | 29 + .../ubuntu/13.10/dovecot/conf.d/10-ssl.conf | 3 + .../ubuntu/13.10/dovecot/conf.d/20-imap.conf | 58 + .../ubuntu/13.10/dovecot/conf.d/20-pop3.conf | 91 + .../dovecot/conf.d/auth-passwdfile.conf.ext | 9 + install/ubuntu/13.10/dovecot/dovecot.conf | 4 + install/ubuntu/13.10/exim/dnsbl.conf | 2 + install/ubuntu/13.10/exim/exim4.conf.template | 377 ++++ install/ubuntu/13.10/exim/spam-blocks.conf | 0 install/ubuntu/13.10/fail2ban.tar.gz | Bin 0 -> 721 bytes .../ubuntu/13.10/fail2ban/action.d/vesta.conf | 9 + .../ubuntu/13.10/fail2ban/filter.d/vesta.conf | 10 + install/ubuntu/13.10/fail2ban/jail.local | 39 + install/ubuntu/13.10/firewall.tar.gz | Bin 0 -> 540 bytes install/ubuntu/13.10/firewall/ports.conf | 16 + install/ubuntu/13.10/firewall/rules.conf | 10 + install/ubuntu/13.10/logrotate/apache2 | 19 + install/ubuntu/13.10/logrotate/nginx | 13 + install/ubuntu/13.10/logrotate/vesta | 7 + install/ubuntu/13.10/mysql/my-large.cnf | 42 + install/ubuntu/13.10/mysql/my-medium.cnf | 40 + install/ubuntu/13.10/mysql/my-small.cnf | 40 + install/ubuntu/13.10/nginx/nginx.conf | 124 ++ install/ubuntu/13.10/nginx/phpmyadmin.inc | 15 + install/ubuntu/13.10/nginx/phppgadmin.inc | 11 + install/ubuntu/13.10/nginx/status.conf | 9 + install/ubuntu/13.10/nginx/webmail.inc | 15 + install/ubuntu/13.10/packages.tar.gz | Bin 0 -> 562 bytes install/ubuntu/13.10/packages/default.pkg | 18 + install/ubuntu/13.10/packages/gainsboro.pkg | 18 + install/ubuntu/13.10/packages/palegreen.pkg | 18 + install/ubuntu/13.10/packages/slategrey.pkg | 18 + install/ubuntu/13.10/pga/config.inc.php | 159 ++ install/ubuntu/13.10/pga/phppgadmin.conf | 31 + install/ubuntu/13.10/php5-fpm/www.conf | 10 + install/ubuntu/13.10/pma/apache.conf | 42 + install/ubuntu/13.10/pma/config.inc.php | 146 ++ install/ubuntu/13.10/postgresql/pg_hba.conf | 11 + install/ubuntu/13.10/proftpd/proftpd.conf | 32 + install/ubuntu/13.10/roundcube/apache.conf | 40 + install/ubuntu/13.10/roundcube/config.inc.php | 33 + install/ubuntu/13.10/roundcube/db.inc.php | 66 + install/ubuntu/13.10/roundcube/main.inc.php | 850 ++++++++ install/ubuntu/13.10/roundcube/vesta.php | 62 + install/ubuntu/13.10/sudo/admin | 7 + install/ubuntu/13.10/templates.tar.gz | Bin 0 -> 12935 bytes .../ubuntu/13.10/templates/dns/child-ns.tpl | 11 + .../ubuntu/13.10/templates/dns/default.tpl | 9 + install/ubuntu/13.10/templates/dns/gmail.tpl | 14 + .../13.10/templates/web/apache2/basedir.stpl | 41 + .../13.10/templates/web/apache2/basedir.tpl | 35 + .../13.10/templates/web/apache2/default.stpl | 40 + .../13.10/templates/web/apache2/default.tpl | 34 + .../13.10/templates/web/apache2/hosting.stpl | 49 + .../13.10/templates/web/apache2/hosting.tpl | 43 + .../13.10/templates/web/apache2/phpcgi.sh | 16 + .../13.10/templates/web/apache2/phpcgi.stpl | 35 + .../13.10/templates/web/apache2/phpcgi.tpl | 28 + .../13.10/templates/web/apache2/phpfcgid.sh | 22 + .../13.10/templates/web/apache2/phpfcgid.stpl | 36 + .../13.10/templates/web/apache2/phpfcgid.tpl | 28 + .../13.10/templates/web/awstats/awstats.tpl | 133 ++ .../13.10/templates/web/awstats/index.tpl | 10 + .../13.10/templates/web/awstats/nav.tpl | 23 + .../13.10/templates/web/nginx/caching.sh | 12 + .../13.10/templates/web/nginx/caching.stpl | 44 + .../13.10/templates/web/nginx/caching.tpl | 41 + .../13.10/templates/web/nginx/default.stpl | 36 + .../13.10/templates/web/nginx/default.tpl | 33 + .../13.10/templates/web/nginx/hosting.sh | 11 + .../13.10/templates/web/nginx/hosting.stpl | 38 + .../13.10/templates/web/nginx/hosting.tpl | 35 + .../web/nginx/php5-fpm/cms_made_simple.stpl | 51 + .../web/nginx/php5-fpm/cms_made_simple.tpl | 47 + .../web/nginx/php5-fpm/codeigniter2.stpl | 56 + .../web/nginx/php5-fpm/codeigniter2.tpl | 52 + .../web/nginx/php5-fpm/codeigniter3.stpl | 51 + .../web/nginx/php5-fpm/codeigniter3.tpl | 47 + .../web/nginx/php5-fpm/datalife_engine.stpl | 122 ++ .../web/nginx/php5-fpm/datalife_engine.tpl | 118 ++ .../templates/web/nginx/php5-fpm/default.stpl | 50 + .../templates/web/nginx/php5-fpm/default.tpl | 46 + .../web/nginx/php5-fpm/dokuwiki.stpl | 67 + .../templates/web/nginx/php5-fpm/dokuwiki.tpl | 62 + .../templates/web/nginx/php5-fpm/drupal.stpl | 101 + .../templates/web/nginx/php5-fpm/drupal.tpl | 98 + .../templates/web/nginx/php5-fpm/joomla.stpl | 58 + .../templates/web/nginx/php5-fpm/joomla.tpl | 54 + .../web/nginx/php5-fpm/owncloud.stpl | 80 + .../templates/web/nginx/php5-fpm/owncloud.tpl | 76 + .../templates/web/nginx/php5-fpm/piwik.stpl | 68 + .../templates/web/nginx/php5-fpm/piwik.tpl | 64 + .../templates/web/nginx/php5-fpm/pyrocms.stpl | 61 + .../templates/web/nginx/php5-fpm/pyrocms.tpl | 57 + .../web/nginx/php5-fpm/wordpress.stpl | 50 + .../web/nginx/php5-fpm/wordpress.tpl | 46 + .../web/nginx/php5-fpm/wordpress2.stpl | 62 + .../web/nginx/php5-fpm/wordpress2.tpl | 58 + .../13.10/templates/web/nginx/proxy_ip.tpl | 9 + .../13.10/templates/web/php5-fpm/default.tpl | 18 + .../13.10/templates/web/php5-fpm/no-php.tpl | 13 + .../13.10/templates/web/php5-fpm/socket.tpl | 21 + .../web/skel/document_errors/403.html | 29 + .../web/skel/document_errors/404.html | 28 + .../web/skel/document_errors/50x.html | 29 + .../templates/web/skel/public_html/index.html | 26 + .../templates/web/skel/public_html/robots.txt | 3 + .../web/skel/public_shtml/index.html | 26 + .../web/skel/public_shtml/robots.txt | 3 + .../13.10/templates/web/suspend/.htaccess | 2 + .../13.10/templates/web/suspend/index.html | 27 + .../templates/web/webalizer/webalizer.tpl | 110 ++ install/ubuntu/13.10/vsftpd/vsftpd.conf | 24 + install/ubuntu/14.04/apache2/apache2.conf | 86 + install/ubuntu/14.04/apache2/status.conf | 8 + install/ubuntu/14.04/bind/named.conf | 12 + install/ubuntu/14.04/clamav/clamd.conf | 61 + install/ubuntu/14.04/deb_signing.key | 30 + install/ubuntu/14.04/dovecot.tar.gz | Bin 0 -> 3487 bytes .../ubuntu/14.04/dovecot/conf.d/10-auth.conf | 4 + .../14.04/dovecot/conf.d/10-logging.conf | 1 + .../ubuntu/14.04/dovecot/conf.d/10-mail.conf | 4 + .../14.04/dovecot/conf.d/10-master.conf | 29 + .../ubuntu/14.04/dovecot/conf.d/10-ssl.conf | 3 + .../ubuntu/14.04/dovecot/conf.d/20-imap.conf | 58 + .../ubuntu/14.04/dovecot/conf.d/20-pop3.conf | 91 + .../dovecot/conf.d/auth-passwdfile.conf.ext | 9 + install/ubuntu/14.04/dovecot/dovecot.conf | 4 + install/ubuntu/14.04/exim/dnsbl.conf | 2 + install/ubuntu/14.04/exim/exim4.conf.template | 377 ++++ install/ubuntu/14.04/exim/spam-blocks.conf | 0 install/ubuntu/14.04/fail2ban.tar.gz | Bin 0 -> 721 bytes .../ubuntu/14.04/fail2ban/action.d/vesta.conf | 9 + .../ubuntu/14.04/fail2ban/filter.d/vesta.conf | 10 + install/ubuntu/14.04/fail2ban/jail.local | 39 + install/ubuntu/14.04/firewall.tar.gz | Bin 0 -> 540 bytes install/ubuntu/14.04/firewall/ports.conf | 16 + install/ubuntu/14.04/firewall/rules.conf | 10 + install/ubuntu/14.04/logrotate/apache2 | 19 + install/ubuntu/14.04/logrotate/nginx | 13 + install/ubuntu/14.04/logrotate/vesta | 7 + install/ubuntu/14.04/mysql/my-large.cnf | 42 + install/ubuntu/14.04/mysql/my-medium.cnf | 40 + install/ubuntu/14.04/mysql/my-small.cnf | 40 + install/ubuntu/14.04/nginx/nginx.conf | 124 ++ install/ubuntu/14.04/nginx/phpmyadmin.inc | 15 + install/ubuntu/14.04/nginx/phppgadmin.inc | 11 + install/ubuntu/14.04/nginx/status.conf | 9 + install/ubuntu/14.04/nginx/webmail.inc | 15 + install/ubuntu/14.04/packages.tar.gz | Bin 0 -> 562 bytes install/ubuntu/14.04/packages/default.pkg | 18 + install/ubuntu/14.04/packages/gainsboro.pkg | 18 + install/ubuntu/14.04/packages/palegreen.pkg | 18 + install/ubuntu/14.04/packages/slategrey.pkg | 18 + install/ubuntu/14.04/pga/config.inc.php | 159 ++ install/ubuntu/14.04/pga/phppgadmin.conf | 31 + install/ubuntu/14.04/php5-fpm/www.conf | 10 + install/ubuntu/14.04/pma/apache.conf | 42 + install/ubuntu/14.04/pma/config.inc.php | 146 ++ install/ubuntu/14.04/postgresql/pg_hba.conf | 11 + install/ubuntu/14.04/proftpd/proftpd.conf | 32 + install/ubuntu/14.04/roundcube/apache.conf | 40 + install/ubuntu/14.04/roundcube/config.inc.php | 33 + install/ubuntu/14.04/roundcube/db.inc.php | 66 + install/ubuntu/14.04/roundcube/main.inc.php | 850 ++++++++ install/ubuntu/14.04/roundcube/vesta.php | 62 + install/ubuntu/14.04/sudo/admin | 7 + install/ubuntu/14.04/templates.tar.gz | Bin 0 -> 12935 bytes .../ubuntu/14.04/templates/dns/child-ns.tpl | 11 + .../ubuntu/14.04/templates/dns/default.tpl | 9 + install/ubuntu/14.04/templates/dns/gmail.tpl | 14 + .../14.04/templates/web/apache2/basedir.stpl | 41 + .../14.04/templates/web/apache2/basedir.tpl | 35 + .../14.04/templates/web/apache2/default.stpl | 40 + .../14.04/templates/web/apache2/default.tpl | 34 + .../14.04/templates/web/apache2/hosting.stpl | 49 + .../14.04/templates/web/apache2/hosting.tpl | 43 + .../14.04/templates/web/apache2/phpcgi.sh | 16 + .../14.04/templates/web/apache2/phpcgi.stpl | 35 + .../14.04/templates/web/apache2/phpcgi.tpl | 28 + .../14.04/templates/web/apache2/phpfcgid.sh | 22 + .../14.04/templates/web/apache2/phpfcgid.stpl | 36 + .../14.04/templates/web/apache2/phpfcgid.tpl | 28 + .../14.04/templates/web/awstats/awstats.tpl | 133 ++ .../14.04/templates/web/awstats/index.tpl | 10 + .../14.04/templates/web/awstats/nav.tpl | 23 + .../14.04/templates/web/nginx/caching.sh | 12 + .../14.04/templates/web/nginx/caching.stpl | 44 + .../14.04/templates/web/nginx/caching.tpl | 41 + .../14.04/templates/web/nginx/default.stpl | 36 + .../14.04/templates/web/nginx/default.tpl | 33 + .../14.04/templates/web/nginx/hosting.sh | 11 + .../14.04/templates/web/nginx/hosting.stpl | 38 + .../14.04/templates/web/nginx/hosting.tpl | 35 + .../web/nginx/php5-fpm/cms_made_simple.stpl | 51 + .../web/nginx/php5-fpm/cms_made_simple.tpl | 47 + .../web/nginx/php5-fpm/codeigniter2.stpl | 56 + .../web/nginx/php5-fpm/codeigniter2.tpl | 52 + .../web/nginx/php5-fpm/codeigniter3.stpl | 51 + .../web/nginx/php5-fpm/codeigniter3.tpl | 47 + .../web/nginx/php5-fpm/datalife_engine.stpl | 122 ++ .../web/nginx/php5-fpm/datalife_engine.tpl | 118 ++ .../templates/web/nginx/php5-fpm/default.stpl | 50 + .../templates/web/nginx/php5-fpm/default.tpl | 46 + .../web/nginx/php5-fpm/dokuwiki.stpl | 67 + .../templates/web/nginx/php5-fpm/dokuwiki.tpl | 62 + .../templates/web/nginx/php5-fpm/drupal.stpl | 101 + .../templates/web/nginx/php5-fpm/drupal.tpl | 98 + .../templates/web/nginx/php5-fpm/joomla.stpl | 58 + .../templates/web/nginx/php5-fpm/joomla.tpl | 54 + .../web/nginx/php5-fpm/owncloud.stpl | 80 + .../templates/web/nginx/php5-fpm/owncloud.tpl | 76 + .../templates/web/nginx/php5-fpm/piwik.stpl | 68 + .../templates/web/nginx/php5-fpm/piwik.tpl | 64 + .../templates/web/nginx/php5-fpm/pyrocms.stpl | 61 + .../templates/web/nginx/php5-fpm/pyrocms.tpl | 57 + .../web/nginx/php5-fpm/wordpress.stpl | 50 + .../web/nginx/php5-fpm/wordpress.tpl | 46 + .../web/nginx/php5-fpm/wordpress2.stpl | 62 + .../web/nginx/php5-fpm/wordpress2.tpl | 58 + .../14.04/templates/web/nginx/proxy_ip.tpl | 9 + .../14.04/templates/web/php5-fpm/default.tpl | 18 + .../14.04/templates/web/php5-fpm/no-php.tpl | 13 + .../14.04/templates/web/php5-fpm/socket.tpl | 21 + .../web/skel/document_errors/403.html | 29 + .../web/skel/document_errors/404.html | 28 + .../web/skel/document_errors/50x.html | 29 + .../templates/web/skel/public_html/index.html | 26 + .../templates/web/skel/public_html/robots.txt | 3 + .../web/skel/public_shtml/index.html | 26 + .../web/skel/public_shtml/robots.txt | 3 + .../14.04/templates/web/suspend/.htaccess | 2 + .../14.04/templates/web/suspend/index.html | 27 + .../templates/web/webalizer/webalizer.tpl | 110 ++ install/ubuntu/14.04/vsftpd/vsftpd.conf | 24 + install/ubuntu/14.10/apache2/apache2.conf | 86 + install/ubuntu/14.10/apache2/status.conf | 8 + install/ubuntu/14.10/bind/named.conf | 12 + install/ubuntu/14.10/clamav/clamd.conf | 61 + install/ubuntu/14.10/deb_signing.key | 30 + install/ubuntu/14.10/dovecot.tar.gz | Bin 0 -> 3487 bytes .../ubuntu/14.10/dovecot/conf.d/10-auth.conf | 4 + .../14.10/dovecot/conf.d/10-logging.conf | 1 + .../ubuntu/14.10/dovecot/conf.d/10-mail.conf | 4 + .../14.10/dovecot/conf.d/10-master.conf | 29 + .../ubuntu/14.10/dovecot/conf.d/10-ssl.conf | 3 + .../ubuntu/14.10/dovecot/conf.d/20-imap.conf | 58 + .../ubuntu/14.10/dovecot/conf.d/20-pop3.conf | 91 + .../dovecot/conf.d/auth-passwdfile.conf.ext | 9 + install/ubuntu/14.10/dovecot/dovecot.conf | 4 + install/ubuntu/14.10/exim/dnsbl.conf | 2 + install/ubuntu/14.10/exim/exim4.conf.template | 377 ++++ install/ubuntu/14.10/exim/spam-blocks.conf | 0 install/ubuntu/14.10/fail2ban.tar.gz | Bin 0 -> 721 bytes .../ubuntu/14.10/fail2ban/action.d/vesta.conf | 9 + .../ubuntu/14.10/fail2ban/filter.d/vesta.conf | 10 + install/ubuntu/14.10/fail2ban/jail.local | 39 + install/ubuntu/14.10/firewall.tar.gz | Bin 0 -> 540 bytes install/ubuntu/14.10/firewall/ports.conf | 16 + install/ubuntu/14.10/firewall/rules.conf | 10 + install/ubuntu/14.10/logrotate/apache2 | 19 + install/ubuntu/14.10/logrotate/nginx | 13 + install/ubuntu/14.10/logrotate/vesta | 7 + install/ubuntu/14.10/mysql/my-large.cnf | 42 + install/ubuntu/14.10/mysql/my-medium.cnf | 40 + install/ubuntu/14.10/mysql/my-small.cnf | 40 + install/ubuntu/14.10/nginx/nginx.conf | 124 ++ install/ubuntu/14.10/nginx/phpmyadmin.inc | 15 + install/ubuntu/14.10/nginx/phppgadmin.inc | 11 + install/ubuntu/14.10/nginx/status.conf | 9 + install/ubuntu/14.10/nginx/webmail.inc | 15 + install/ubuntu/14.10/packages.tar.gz | Bin 0 -> 562 bytes install/ubuntu/14.10/packages/default.pkg | 18 + install/ubuntu/14.10/packages/gainsboro.pkg | 18 + install/ubuntu/14.10/packages/palegreen.pkg | 18 + install/ubuntu/14.10/packages/slategrey.pkg | 18 + install/ubuntu/14.10/pga/config.inc.php | 159 ++ install/ubuntu/14.10/pga/phppgadmin.conf | 31 + install/ubuntu/14.10/php5-fpm/www.conf | 10 + install/ubuntu/14.10/pma/apache.conf | 42 + install/ubuntu/14.10/pma/config.inc.php | 146 ++ install/ubuntu/14.10/postgresql/pg_hba.conf | 11 + install/ubuntu/14.10/proftpd/proftpd.conf | 32 + install/ubuntu/14.10/roundcube/apache.conf | 40 + install/ubuntu/14.10/roundcube/config.inc.php | 33 + install/ubuntu/14.10/roundcube/db.inc.php | 66 + install/ubuntu/14.10/roundcube/main.inc.php | 850 ++++++++ install/ubuntu/14.10/roundcube/vesta.php | 62 + install/ubuntu/14.10/sudo/admin | 7 + install/ubuntu/14.10/templates.tar.gz | Bin 0 -> 12935 bytes .../ubuntu/14.10/templates/dns/child-ns.tpl | 11 + .../ubuntu/14.10/templates/dns/default.tpl | 9 + install/ubuntu/14.10/templates/dns/gmail.tpl | 14 + .../14.10/templates/web/apache2/basedir.stpl | 41 + .../14.10/templates/web/apache2/basedir.tpl | 35 + .../14.10/templates/web/apache2/default.stpl | 40 + .../14.10/templates/web/apache2/default.tpl | 34 + .../14.10/templates/web/apache2/hosting.stpl | 49 + .../14.10/templates/web/apache2/hosting.tpl | 43 + .../14.10/templates/web/apache2/phpcgi.sh | 16 + .../14.10/templates/web/apache2/phpcgi.stpl | 35 + .../14.10/templates/web/apache2/phpcgi.tpl | 28 + .../14.10/templates/web/apache2/phpfcgid.sh | 22 + .../14.10/templates/web/apache2/phpfcgid.stpl | 36 + .../14.10/templates/web/apache2/phpfcgid.tpl | 28 + .../14.10/templates/web/awstats/awstats.tpl | 133 ++ .../14.10/templates/web/awstats/index.tpl | 10 + .../14.10/templates/web/awstats/nav.tpl | 23 + .../14.10/templates/web/nginx/caching.sh | 12 + .../14.10/templates/web/nginx/caching.stpl | 44 + .../14.10/templates/web/nginx/caching.tpl | 41 + .../14.10/templates/web/nginx/default.stpl | 36 + .../14.10/templates/web/nginx/default.tpl | 33 + .../14.10/templates/web/nginx/hosting.sh | 11 + .../14.10/templates/web/nginx/hosting.stpl | 38 + .../14.10/templates/web/nginx/hosting.tpl | 35 + .../web/nginx/php5-fpm/cms_made_simple.stpl | 51 + .../web/nginx/php5-fpm/cms_made_simple.tpl | 47 + .../web/nginx/php5-fpm/codeigniter2.stpl | 56 + .../web/nginx/php5-fpm/codeigniter2.tpl | 52 + .../web/nginx/php5-fpm/codeigniter3.stpl | 51 + .../web/nginx/php5-fpm/codeigniter3.tpl | 47 + .../web/nginx/php5-fpm/datalife_engine.stpl | 122 ++ .../web/nginx/php5-fpm/datalife_engine.tpl | 118 ++ .../templates/web/nginx/php5-fpm/default.stpl | 50 + .../templates/web/nginx/php5-fpm/default.tpl | 46 + .../web/nginx/php5-fpm/dokuwiki.stpl | 67 + .../templates/web/nginx/php5-fpm/dokuwiki.tpl | 62 + .../templates/web/nginx/php5-fpm/drupal.stpl | 101 + .../templates/web/nginx/php5-fpm/drupal.tpl | 98 + .../templates/web/nginx/php5-fpm/joomla.stpl | 58 + .../templates/web/nginx/php5-fpm/joomla.tpl | 54 + .../web/nginx/php5-fpm/owncloud.stpl | 80 + .../templates/web/nginx/php5-fpm/owncloud.tpl | 76 + .../templates/web/nginx/php5-fpm/piwik.stpl | 68 + .../templates/web/nginx/php5-fpm/piwik.tpl | 64 + .../templates/web/nginx/php5-fpm/pyrocms.stpl | 61 + .../templates/web/nginx/php5-fpm/pyrocms.tpl | 57 + .../web/nginx/php5-fpm/wordpress.stpl | 50 + .../web/nginx/php5-fpm/wordpress.tpl | 46 + .../web/nginx/php5-fpm/wordpress2.stpl | 62 + .../web/nginx/php5-fpm/wordpress2.tpl | 58 + .../14.10/templates/web/nginx/proxy_ip.tpl | 9 + .../14.10/templates/web/php5-fpm/default.tpl | 18 + .../14.10/templates/web/php5-fpm/no-php.tpl | 13 + .../14.10/templates/web/php5-fpm/socket.tpl | 21 + .../web/skel/document_errors/403.html | 29 + .../web/skel/document_errors/404.html | 28 + .../web/skel/document_errors/50x.html | 29 + .../templates/web/skel/public_html/index.html | 26 + .../templates/web/skel/public_html/robots.txt | 3 + .../web/skel/public_shtml/index.html | 26 + .../web/skel/public_shtml/robots.txt | 3 + .../14.10/templates/web/suspend/.htaccess | 2 + .../14.10/templates/web/suspend/index.html | 27 + .../templates/web/webalizer/webalizer.tpl | 110 ++ install/ubuntu/14.10/vsftpd/vsftpd.conf | 24 + install/ubuntu/15.04/apache2/apache2.conf | 86 + install/ubuntu/15.04/apache2/status.conf | 8 + install/ubuntu/15.04/bind/named.conf | 12 + install/ubuntu/15.04/clamav/clamd.conf | 61 + install/ubuntu/15.04/deb_signing.key | 30 + install/ubuntu/15.04/dovecot.tar.gz | Bin 0 -> 3487 bytes .../ubuntu/15.04/dovecot/conf.d/10-auth.conf | 4 + .../15.04/dovecot/conf.d/10-logging.conf | 1 + .../ubuntu/15.04/dovecot/conf.d/10-mail.conf | 4 + .../15.04/dovecot/conf.d/10-master.conf | 29 + .../ubuntu/15.04/dovecot/conf.d/10-ssl.conf | 3 + .../ubuntu/15.04/dovecot/conf.d/20-imap.conf | 58 + .../ubuntu/15.04/dovecot/conf.d/20-pop3.conf | 91 + .../dovecot/conf.d/auth-passwdfile.conf.ext | 9 + install/ubuntu/15.04/dovecot/dovecot.conf | 4 + install/ubuntu/15.04/exim/dnsbl.conf | 2 + install/ubuntu/15.04/exim/exim4.conf.template | 377 ++++ install/ubuntu/15.04/exim/spam-blocks.conf | 0 install/ubuntu/15.04/fail2ban.tar.gz | Bin 0 -> 721 bytes .../ubuntu/15.04/fail2ban/action.d/vesta.conf | 9 + .../ubuntu/15.04/fail2ban/filter.d/vesta.conf | 10 + install/ubuntu/15.04/fail2ban/jail.local | 39 + install/ubuntu/15.04/firewall.tar.gz | Bin 0 -> 540 bytes install/ubuntu/15.04/firewall/ports.conf | 16 + install/ubuntu/15.04/firewall/rules.conf | 10 + install/ubuntu/15.04/logrotate/apache2 | 19 + install/ubuntu/15.04/logrotate/nginx | 13 + install/ubuntu/15.04/logrotate/vesta | 7 + install/ubuntu/15.04/mysql/my-large.cnf | 42 + install/ubuntu/15.04/mysql/my-medium.cnf | 40 + install/ubuntu/15.04/mysql/my-small.cnf | 40 + install/ubuntu/15.04/nginx/nginx.conf | 124 ++ install/ubuntu/15.04/nginx/phpmyadmin.inc | 15 + install/ubuntu/15.04/nginx/phppgadmin.inc | 11 + install/ubuntu/15.04/nginx/status.conf | 9 + install/ubuntu/15.04/nginx/webmail.inc | 15 + install/ubuntu/15.04/packages.tar.gz | Bin 0 -> 562 bytes install/ubuntu/15.04/packages/default.pkg | 18 + install/ubuntu/15.04/packages/gainsboro.pkg | 18 + install/ubuntu/15.04/packages/palegreen.pkg | 18 + install/ubuntu/15.04/packages/slategrey.pkg | 18 + install/ubuntu/15.04/pga/config.inc.php | 159 ++ install/ubuntu/15.04/pga/phppgadmin.conf | 31 + install/ubuntu/15.04/php5-fpm/www.conf | 10 + install/ubuntu/15.04/pma/apache.conf | 42 + install/ubuntu/15.04/pma/config.inc.php | 146 ++ install/ubuntu/15.04/postgresql/pg_hba.conf | 11 + install/ubuntu/15.04/proftpd/proftpd.conf | 32 + install/ubuntu/15.04/roundcube/apache.conf | 40 + install/ubuntu/15.04/roundcube/config.inc.php | 33 + install/ubuntu/15.04/roundcube/db.inc.php | 66 + install/ubuntu/15.04/roundcube/main.inc.php | 850 ++++++++ install/ubuntu/15.04/roundcube/vesta.php | 62 + install/ubuntu/15.04/sudo/admin | 7 + install/ubuntu/15.04/templates.tar.gz | Bin 0 -> 12935 bytes .../ubuntu/15.04/templates/dns/child-ns.tpl | 11 + .../{ => 15.04}/templates/dns/default.tpl | 0 install/ubuntu/15.04/templates/dns/gmail.tpl | 14 + .../15.04/templates/web/apache2/basedir.stpl | 41 + .../15.04/templates/web/apache2/basedir.tpl | 35 + .../15.04/templates/web/apache2/default.stpl | 40 + .../15.04/templates/web/apache2/default.tpl | 34 + .../15.04/templates/web/apache2/hosting.stpl | 49 + .../15.04/templates/web/apache2/hosting.tpl | 43 + .../15.04/templates/web/apache2/phpcgi.sh | 16 + .../15.04/templates/web/apache2/phpcgi.stpl | 35 + .../15.04/templates/web/apache2/phpcgi.tpl | 28 + .../15.04/templates/web/apache2/phpfcgid.sh | 22 + .../15.04/templates/web/apache2/phpfcgid.stpl | 36 + .../15.04/templates/web/apache2/phpfcgid.tpl | 28 + .../15.04/templates/web/awstats/awstats.tpl | 133 ++ .../15.04/templates/web/awstats/index.tpl | 10 + .../15.04/templates/web/awstats/nav.tpl | 23 + .../15.04/templates/web/nginx/caching.sh | 12 + .../15.04/templates/web/nginx/caching.stpl | 44 + .../15.04/templates/web/nginx/caching.tpl | 41 + .../15.04/templates/web/nginx/default.stpl | 36 + .../15.04/templates/web/nginx/default.tpl | 33 + .../15.04/templates/web/nginx/hosting.sh | 11 + .../15.04/templates/web/nginx/hosting.stpl | 38 + .../15.04/templates/web/nginx/hosting.tpl | 35 + .../web/nginx/php5-fpm/cms_made_simple.stpl | 51 + .../web/nginx/php5-fpm/cms_made_simple.tpl | 47 + .../web/nginx/php5-fpm/codeigniter2.stpl | 56 + .../web/nginx/php5-fpm/codeigniter2.tpl | 52 + .../web/nginx/php5-fpm/codeigniter3.stpl | 51 + .../web/nginx/php5-fpm/codeigniter3.tpl | 47 + .../web/nginx/php5-fpm/datalife_engine.stpl | 122 ++ .../web/nginx/php5-fpm/datalife_engine.tpl | 118 ++ .../templates/web/nginx/php5-fpm/default.stpl | 50 + .../templates/web/nginx/php5-fpm/default.tpl | 46 + .../web/nginx/php5-fpm/dokuwiki.stpl | 67 + .../templates/web/nginx/php5-fpm/dokuwiki.tpl | 62 + .../templates/web/nginx/php5-fpm/drupal.stpl | 101 + .../templates/web/nginx/php5-fpm/drupal.tpl | 98 + .../templates/web/nginx/php5-fpm/joomla.stpl | 58 + .../templates/web/nginx/php5-fpm/joomla.tpl | 54 + .../web/nginx/php5-fpm/owncloud.stpl | 80 + .../templates/web/nginx/php5-fpm/owncloud.tpl | 76 + .../templates/web/nginx/php5-fpm/piwik.stpl | 68 + .../templates/web/nginx/php5-fpm/piwik.tpl | 64 + .../templates/web/nginx/php5-fpm/pyrocms.stpl | 61 + .../templates/web/nginx/php5-fpm/pyrocms.tpl | 57 + .../web/nginx/php5-fpm/wordpress.stpl | 50 + .../web/nginx/php5-fpm/wordpress.tpl | 46 + .../web/nginx/php5-fpm/wordpress2.stpl | 62 + .../web/nginx/php5-fpm/wordpress2.tpl | 58 + .../15.04/templates/web/nginx/proxy_ip.tpl | 9 + .../15.04/templates/web/php5-fpm/default.tpl | 18 + .../15.04/templates/web/php5-fpm/no-php.tpl | 13 + .../15.04/templates/web/php5-fpm/socket.tpl | 21 + .../web/skel/document_errors/403.html | 29 + .../web/skel/document_errors/404.html | 28 + .../web/skel/document_errors/50x.html | 29 + .../templates/web/skel/public_html/index.html | 26 + .../templates/web/skel/public_html/robots.txt | 3 + .../web/skel/public_shtml/index.html | 26 + .../web/skel/public_shtml/robots.txt | 3 + .../15.04/templates/web/suspend/.htaccess | 2 + .../15.04/templates/web/suspend/index.html | 27 + .../templates/web/webalizer/webalizer.tpl | 110 ++ install/ubuntu/15.04/vsftpd/vsftpd.conf | 24 + install/ubuntu/apache2.readme.txt | 11 - install/ubuntu/certificate.crt | 22 - install/ubuntu/certificate.key | 27 - install/ubuntu/freshclam.conf | 27 - install/ubuntu/nginx.readme.txt | 11 - install/ubuntu/sudoers.vestacp.conf | 1 - install/ubuntu/vesta.conf | 24 - install/ubuntu/whmcs-module.php | 359 ---- install/vst-install-debian.sh | 1517 +++++++++------ install/vst-install-rhel.sh | 1715 ++++++++++------- install/vst-install-ubuntu.sh | 1525 +++++++++------ install/vst-install.sh | 8 +- 1545 files changed, 59733 insertions(+), 3626 deletions(-) rename install/debian/{ => 7/apache2}/apache2.conf (100%) rename install/debian/{apache2-status.conf => 7/apache2/status.conf} (100%) rename install/debian/{ => 7/bind}/named.conf (100%) rename install/debian/{ => 7/clamav}/clamd.conf (100%) create mode 100644 install/debian/7/deb_signing.key create mode 100644 install/debian/7/dovecot.tar.gz rename install/debian/{ => 7}/dovecot/conf.d/10-auth.conf (100%) rename install/debian/{ => 7}/dovecot/conf.d/10-logging.conf (100%) rename install/debian/{ => 7}/dovecot/conf.d/10-mail.conf (100%) rename install/debian/{ => 7}/dovecot/conf.d/10-master.conf (100%) rename install/debian/{ => 7}/dovecot/conf.d/10-ssl.conf (100%) rename install/debian/{ => 7}/dovecot/conf.d/20-imap.conf (100%) rename install/debian/{ => 7}/dovecot/conf.d/20-pop3.conf (100%) rename install/debian/{ => 7}/dovecot/conf.d/auth-passwdfile.conf.ext (100%) rename install/{ubuntu => debian/7/dovecot}/dovecot.conf (100%) rename install/debian/{ => 7/exim}/dnsbl.conf (100%) rename install/debian/{ => 7/exim}/exim4.conf.template (99%) rename install/debian/{ => 7/exim}/spam-blocks.conf (100%) create mode 100644 install/debian/7/fail2ban.tar.gz create mode 100644 install/debian/7/fail2ban/action.d/vesta.conf rename install/debian/{fail2ban.filter.conf => 7/fail2ban/filter.d/vesta.conf} (100%) create mode 100644 install/debian/7/fail2ban/jail.local create mode 100644 install/debian/7/firewall.tar.gz rename install/debian/{ => 7}/firewall/ports.conf (93%) rename install/debian/{ => 7}/firewall/rules.conf (89%) rename install/debian/{apache2.log => 7/logrotate/apache2} (100%) create mode 100644 install/debian/7/logrotate/nginx rename install/debian/{vesta.log => 7/logrotate/vesta} (100%) create mode 100644 install/debian/7/mysql/my-large.cnf rename install/{ubuntu/my.cnf => debian/7/mysql/my-medium.cnf} (59%) create mode 100644 install/debian/7/mysql/my-small.cnf rename install/debian/{ => 7/nginx}/nginx.conf (100%) create mode 100644 install/debian/7/nginx/phpmyadmin.inc create mode 100644 install/debian/7/nginx/phppgadmin.inc rename install/debian/{nginx-status.conf => 7/nginx/status.conf} (100%) create mode 100644 install/debian/7/nginx/webmail.inc create mode 100644 install/debian/7/packages.tar.gz rename install/debian/{ => 7}/packages/default.pkg (100%) rename install/debian/{ => 7}/packages/gainsboro.pkg (100%) rename install/debian/{ => 7}/packages/palegreen.pkg (100%) rename install/debian/{ => 7}/packages/slategrey.pkg (100%) rename install/debian/{pga.conf => 7/pga/config.inc.php} (100%) rename install/debian/{apache2-pga.conf => 7/pga/phppgadmin.conf} (100%) rename install/debian/{apache2-pma.conf => 7/pma/apache.conf} (100%) rename install/debian/{pma.conf => 7/pma/config.inc.php} (100%) rename install/debian/{ => 7/postgresql}/pg_hba.conf (100%) rename install/{ubuntu => debian/7/proftpd}/proftpd.conf (100%) rename install/debian/{apache2-webmail.conf => 7/roundcube/apache.conf} (100%) rename install/debian/{roundcube-pw.conf => 7/roundcube/config.inc.php} (100%) rename install/debian/{roundcube-db.conf => 7/roundcube/db.inc.php} (100%) rename install/debian/{roundcube-main.conf => 7/roundcube/main.inc.php} (100%) rename install/debian/{roundcube-driver.php => 7/roundcube/vesta.php} (100%) rename install/debian/{sudoers.admin.conf => 7/sudo/admin} (56%) create mode 100644 install/debian/7/templates.tar.gz rename install/debian/{ => 7}/templates/dns/child-ns.tpl (100%) create mode 100755 install/debian/7/templates/dns/default.tpl rename install/debian/{ => 7}/templates/dns/gmail.tpl (100%) rename install/debian/{ => 7}/templates/web/apache2/basedir.stpl (86%) rename install/{ubuntu => debian/7}/templates/web/apache2/basedir.tpl (84%) rename install/debian/{ => 7}/templates/web/apache2/default.stpl (100%) rename install/debian/{ => 7}/templates/web/apache2/default.tpl (100%) rename install/debian/{ => 7}/templates/web/apache2/hosting.stpl (100%) rename install/debian/{ => 7}/templates/web/apache2/hosting.tpl (100%) rename install/debian/{ => 7}/templates/web/apache2/phpcgi.sh (100%) rename install/debian/{ => 7}/templates/web/apache2/phpcgi.stpl (100%) rename install/debian/{ => 7}/templates/web/apache2/phpcgi.tpl (100%) rename install/debian/{ => 7}/templates/web/apache2/phpfcgid.sh (100%) rename install/debian/{ => 7}/templates/web/apache2/phpfcgid.stpl (100%) rename install/debian/{ => 7}/templates/web/apache2/phpfcgid.tpl (100%) rename install/debian/{ => 7}/templates/web/awstats/awstats.tpl (100%) rename install/debian/{ => 7}/templates/web/awstats/index.tpl (100%) rename install/debian/{ => 7}/templates/web/awstats/nav.tpl (100%) rename install/debian/{ => 7}/templates/web/nginx/caching.stpl (100%) rename install/debian/{ => 7}/templates/web/nginx/caching.tpl (100%) rename install/debian/{ => 7}/templates/web/nginx/default.stpl (100%) rename install/debian/{ => 7}/templates/web/nginx/default.tpl (100%) rename install/debian/{ => 7}/templates/web/nginx/hosting.sh (100%) rename install/debian/{ => 7}/templates/web/nginx/hosting.stpl (100%) rename install/debian/{ => 7}/templates/web/nginx/hosting.tpl (100%) create mode 100644 install/debian/7/templates/web/nginx/php5-fpm/cms_made_simple.stpl create mode 100644 install/debian/7/templates/web/nginx/php5-fpm/cms_made_simple.tpl create mode 100644 install/debian/7/templates/web/nginx/php5-fpm/codeigniter2.stpl create mode 100644 install/debian/7/templates/web/nginx/php5-fpm/codeigniter2.tpl create mode 100644 install/debian/7/templates/web/nginx/php5-fpm/codeigniter3.stpl create mode 100644 install/debian/7/templates/web/nginx/php5-fpm/codeigniter3.tpl create mode 100644 install/debian/7/templates/web/nginx/php5-fpm/datalife_engine.stpl create mode 100644 install/debian/7/templates/web/nginx/php5-fpm/datalife_engine.tpl create mode 100644 install/debian/7/templates/web/nginx/php5-fpm/default.stpl create mode 100644 install/debian/7/templates/web/nginx/php5-fpm/default.tpl create mode 100644 install/debian/7/templates/web/nginx/php5-fpm/dokuwiki.stpl create mode 100644 install/debian/7/templates/web/nginx/php5-fpm/dokuwiki.tpl create mode 100644 install/debian/7/templates/web/nginx/php5-fpm/drupal.stpl create mode 100644 install/debian/7/templates/web/nginx/php5-fpm/drupal.tpl create mode 100644 install/debian/7/templates/web/nginx/php5-fpm/joomla.stpl create mode 100644 install/debian/7/templates/web/nginx/php5-fpm/joomla.tpl create mode 100644 install/debian/7/templates/web/nginx/php5-fpm/owncloud.stpl create mode 100644 install/debian/7/templates/web/nginx/php5-fpm/owncloud.tpl create mode 100644 install/debian/7/templates/web/nginx/php5-fpm/piwik.stpl create mode 100644 install/debian/7/templates/web/nginx/php5-fpm/piwik.tpl create mode 100644 install/debian/7/templates/web/nginx/php5-fpm/pyrocms.stpl create mode 100644 install/debian/7/templates/web/nginx/php5-fpm/pyrocms.tpl create mode 100644 install/debian/7/templates/web/nginx/php5-fpm/wordpress.stpl create mode 100644 install/debian/7/templates/web/nginx/php5-fpm/wordpress.tpl create mode 100644 install/debian/7/templates/web/nginx/php5-fpm/wordpress2.stpl create mode 100644 install/debian/7/templates/web/nginx/php5-fpm/wordpress2.tpl create mode 100644 install/debian/7/templates/web/nginx/php5-fpm/www.conf rename install/debian/{ => 7}/templates/web/nginx/proxy_ip.tpl (100%) create mode 100644 install/debian/7/templates/web/php5-fpm/default.tpl create mode 100644 install/debian/7/templates/web/php5-fpm/no-php.tpl create mode 100644 install/debian/7/templates/web/php5-fpm/socket.tpl create mode 100755 install/debian/7/templates/web/skel/document_errors/403.html create mode 100755 install/debian/7/templates/web/skel/document_errors/404.html create mode 100755 install/debian/7/templates/web/skel/document_errors/50x.html rename install/debian/{ => 7}/templates/web/skel/public_html/index.html (100%) rename install/debian/{ => 7}/templates/web/skel/public_html/robots.txt (100%) rename install/debian/{ => 7}/templates/web/skel/public_shtml/index.html (100%) rename install/debian/{ => 7}/templates/web/skel/public_shtml/robots.txt (100%) rename install/debian/{ => 7}/templates/web/suspend/.htaccess (100%) create mode 100755 install/debian/7/templates/web/suspend/index.html rename install/debian/{ => 7}/templates/web/webalizer/webalizer.tpl (100%) rename install/debian/{ => 7/vsftpd}/vsftpd.conf (100%) rename install/{ubuntu => debian/8/apache2}/apache2.conf (98%) rename install/{ubuntu/apache2-status.conf => debian/8/apache2/status.conf} (100%) rename install/{ubuntu => debian/8/bind}/named.conf (100%) rename install/{ubuntu => debian/8/clamav}/clamd.conf (100%) create mode 100644 install/debian/8/deb_signing.key create mode 100644 install/debian/8/dovecot.tar.gz rename install/{rhel => debian/8}/dovecot/conf.d/10-auth.conf (100%) rename install/{rhel => debian/8}/dovecot/conf.d/10-logging.conf (100%) rename install/{rhel => debian/8}/dovecot/conf.d/10-mail.conf (100%) rename install/{rhel => debian/8}/dovecot/conf.d/10-master.conf (100%) rename install/{ubuntu => debian/8}/dovecot/conf.d/10-ssl.conf (100%) create mode 100644 install/debian/8/dovecot/conf.d/20-imap.conf rename install/{ubuntu => debian/8}/dovecot/conf.d/20-pop3.conf (100%) rename install/{ubuntu => debian/8}/dovecot/conf.d/auth-passwdfile.conf.ext (100%) create mode 100644 install/debian/8/dovecot/dovecot.conf rename install/{rhel => debian/8/exim}/dnsbl.conf (100%) rename install/{ubuntu => debian/8/exim}/exim4.conf.template (99%) rename install/{rhel => debian/8/exim}/spam-blocks.conf (100%) create mode 100644 install/debian/8/fail2ban.tar.gz create mode 100644 install/debian/8/fail2ban/action.d/vesta.conf rename install/{rhel/fail2ban.filter.conf => debian/8/fail2ban/filter.d/vesta.conf} (100%) create mode 100644 install/debian/8/fail2ban/jail.local create mode 100644 install/debian/8/firewall.tar.gz rename install/{rhel => debian/8}/firewall/ports.conf (93%) rename install/{rhel => debian/8}/firewall/rules.conf (89%) rename install/{ubuntu/apache2.log => debian/8/logrotate/apache2} (100%) create mode 100644 install/debian/8/logrotate/nginx rename install/{rhel/vesta.log => debian/8/logrotate/vesta} (100%) create mode 100644 install/debian/8/mysql/my-large.cnf rename install/debian/{my.cnf => 8/mysql/my-medium.cnf} (59%) create mode 100644 install/debian/8/mysql/my-small.cnf rename install/{rhel => debian/8/nginx}/nginx.conf (99%) create mode 100644 install/debian/8/nginx/phpmyadmin.inc create mode 100644 install/debian/8/nginx/phppgadmin.inc rename install/{rhel/nginx-status.conf => debian/8/nginx/status.conf} (100%) create mode 100644 install/debian/8/nginx/webmail.inc create mode 100644 install/debian/8/packages.tar.gz rename install/{rhel => debian/8}/packages/default.pkg (100%) rename install/{rhel => debian/8}/packages/gainsboro.pkg (100%) rename install/{rhel => debian/8}/packages/palegreen.pkg (100%) rename install/{rhel => debian/8}/packages/slategrey.pkg (100%) rename install/{rhel/pga.conf => debian/8/pga/config.inc.php} (100%) rename install/{ubuntu/apache2-pga.conf => debian/8/pga/phppgadmin.conf} (100%) create mode 100644 install/debian/8/php5-fpm/www.conf rename install/{ubuntu/apache2-pma.conf => debian/8/pma/apache.conf} (92%) rename install/{ubuntu/pma.conf => debian/8/pma/config.inc.php} (100%) rename install/{rhel => debian/8/postgresql}/pg_hba.conf (100%) create mode 100644 install/debian/8/proftpd/proftpd.conf rename install/{ubuntu/apache2-webmail.conf => debian/8/roundcube/apache.conf} (100%) rename install/{rhel/roundcube-pw.conf => debian/8/roundcube/config.inc.php} (100%) rename install/{rhel/roundcube-db.conf => debian/8/roundcube/db.inc.php} (100%) rename install/{rhel/roundcube-main.conf => debian/8/roundcube/main.inc.php} (99%) rename install/{ubuntu/roundcube-driver.php => debian/8/roundcube/vesta.php} (100%) rename install/{rhel/sudoers.admin.conf => debian/8/sudo/admin} (56%) create mode 100644 install/debian/8/templates.tar.gz rename install/{rhel => debian/8}/templates/dns/child-ns.tpl (100%) rename install/debian/{ => 8}/templates/dns/default.tpl (100%) rename install/{rhel => debian/8}/templates/dns/gmail.tpl (100%) create mode 100755 install/debian/8/templates/web/apache2/basedir.stpl create mode 100755 install/debian/8/templates/web/apache2/basedir.tpl create mode 100755 install/debian/8/templates/web/apache2/default.stpl create mode 100755 install/debian/8/templates/web/apache2/default.tpl rename install/{ubuntu => debian/8}/templates/web/apache2/hosting.stpl (96%) rename install/{ubuntu => debian/8}/templates/web/apache2/hosting.tpl (95%) rename install/{rhel/templates/web/httpd => debian/8/templates/web/apache2}/phpcgi.sh (100%) rename install/{ubuntu => debian/8}/templates/web/apache2/phpcgi.stpl (93%) rename install/{ubuntu => debian/8}/templates/web/apache2/phpcgi.tpl (92%) rename install/{rhel/templates/web/httpd => debian/8/templates/web/apache2}/phpfcgid.sh (100%) rename install/{ubuntu => debian/8}/templates/web/apache2/phpfcgid.stpl (94%) rename install/{ubuntu => debian/8}/templates/web/apache2/phpfcgid.tpl (92%) rename install/{rhel => debian/8}/templates/web/awstats/awstats.tpl (100%) rename install/{rhel => debian/8}/templates/web/awstats/index.tpl (100%) rename install/{rhel => debian/8}/templates/web/awstats/nav.tpl (100%) create mode 100755 install/debian/8/templates/web/nginx/caching.sh rename install/{rhel => debian/8}/templates/web/nginx/caching.stpl (100%) rename install/{rhel => debian/8}/templates/web/nginx/caching.tpl (100%) rename install/{ubuntu => debian/8}/templates/web/nginx/default.stpl (100%) rename install/{ubuntu => debian/8}/templates/web/nginx/default.tpl (100%) rename install/{rhel => debian/8}/templates/web/nginx/hosting.sh (100%) rename install/{ubuntu => debian/8}/templates/web/nginx/hosting.stpl (100%) rename install/{ubuntu => debian/8}/templates/web/nginx/hosting.tpl (100%) create mode 100644 install/debian/8/templates/web/nginx/php5-fpm/cms_made_simple.stpl create mode 100644 install/debian/8/templates/web/nginx/php5-fpm/cms_made_simple.tpl create mode 100644 install/debian/8/templates/web/nginx/php5-fpm/codeigniter2.stpl create mode 100644 install/debian/8/templates/web/nginx/php5-fpm/codeigniter2.tpl create mode 100644 install/debian/8/templates/web/nginx/php5-fpm/codeigniter3.stpl create mode 100644 install/debian/8/templates/web/nginx/php5-fpm/codeigniter3.tpl create mode 100644 install/debian/8/templates/web/nginx/php5-fpm/datalife_engine.stpl create mode 100644 install/debian/8/templates/web/nginx/php5-fpm/datalife_engine.tpl create mode 100644 install/debian/8/templates/web/nginx/php5-fpm/default.stpl create mode 100644 install/debian/8/templates/web/nginx/php5-fpm/default.tpl create mode 100644 install/debian/8/templates/web/nginx/php5-fpm/dokuwiki.stpl create mode 100644 install/debian/8/templates/web/nginx/php5-fpm/dokuwiki.tpl create mode 100644 install/debian/8/templates/web/nginx/php5-fpm/drupal.stpl create mode 100644 install/debian/8/templates/web/nginx/php5-fpm/drupal.tpl create mode 100644 install/debian/8/templates/web/nginx/php5-fpm/joomla.stpl create mode 100644 install/debian/8/templates/web/nginx/php5-fpm/joomla.tpl create mode 100644 install/debian/8/templates/web/nginx/php5-fpm/owncloud.stpl create mode 100644 install/debian/8/templates/web/nginx/php5-fpm/owncloud.tpl create mode 100644 install/debian/8/templates/web/nginx/php5-fpm/piwik.stpl create mode 100644 install/debian/8/templates/web/nginx/php5-fpm/piwik.tpl create mode 100644 install/debian/8/templates/web/nginx/php5-fpm/pyrocms.stpl create mode 100644 install/debian/8/templates/web/nginx/php5-fpm/pyrocms.tpl create mode 100644 install/debian/8/templates/web/nginx/php5-fpm/wordpress.stpl create mode 100644 install/debian/8/templates/web/nginx/php5-fpm/wordpress.tpl create mode 100644 install/debian/8/templates/web/nginx/php5-fpm/wordpress2.stpl create mode 100644 install/debian/8/templates/web/nginx/php5-fpm/wordpress2.tpl rename install/{rhel => debian/8}/templates/web/nginx/proxy_ip.tpl (100%) create mode 100644 install/debian/8/templates/web/php5-fpm/default.tpl create mode 100644 install/debian/8/templates/web/php5-fpm/no-php.tpl create mode 100644 install/debian/8/templates/web/php5-fpm/socket.tpl create mode 100755 install/debian/8/templates/web/skel/document_errors/403.html create mode 100755 install/debian/8/templates/web/skel/document_errors/404.html create mode 100755 install/debian/8/templates/web/skel/document_errors/50x.html rename install/{rhel => debian/8}/templates/web/skel/public_html/index.html (100%) rename install/{rhel => debian/8}/templates/web/skel/public_html/robots.txt (100%) rename install/{rhel => debian/8}/templates/web/skel/public_shtml/index.html (100%) rename install/{rhel => debian/8}/templates/web/skel/public_shtml/robots.txt (100%) rename install/{rhel => debian/8}/templates/web/suspend/.htaccess (100%) create mode 100755 install/debian/8/templates/web/suspend/index.html rename install/{rhel => debian/8}/templates/web/webalizer/webalizer.tpl (100%) rename install/{ubuntu => debian/8/vsftpd}/vsftpd.conf (100%) delete mode 100644 install/debian/apache2.readme.txt delete mode 100644 install/debian/certificate.crt delete mode 100644 install/debian/certificate.key delete mode 100644 install/debian/dovecot.conf delete mode 100644 install/debian/freshclam.conf delete mode 100644 install/debian/nginx.readme.txt delete mode 100644 install/debian/sudoers.conf delete mode 100644 install/debian/vesta.conf delete mode 100644 install/debian/whmcs-module.php create mode 100644 install/rhel/5/GPG.txt rename install/rhel/{ => 5/clamav}/clamd.conf (100%) create mode 100644 install/rhel/5/clamav/clamd.service rename install/rhel/{ => 5/clamav}/freshclam.conf (100%) create mode 100644 install/rhel/5/dovecot.tar.gz rename install/rhel/{ => 5/dovecot}/dovecot.conf (83%) create mode 100644 install/rhel/5/epel-release.rpm rename install/{ubuntu => rhel/5/exim}/dnsbl.conf (100%) rename install/rhel/{ => 5/exim}/exim-smarthost.conf (100%) rename install/rhel/{ => 5/exim}/exim.conf (99%) rename install/{ubuntu => rhel/5/exim}/spam-blocks.conf (100%) create mode 100644 install/rhel/5/fail2ban.tar.gz rename install/{debian => rhel/5/fail2ban}/fail2ban.action.conf (100%) rename install/{ubuntu => rhel/5/fail2ban}/fail2ban.filter.conf (100%) rename install/{debian => rhel/5/fail2ban}/fail2ban.jail.conf (100%) create mode 100644 install/rhel/5/firewall.tar.gz rename install/{ubuntu => rhel/5}/firewall/ports.conf (93%) rename install/{ubuntu => rhel/5}/firewall/rules.conf (89%) rename install/rhel/{ => 5/httpd}/httpd.conf (100%) create mode 100644 install/rhel/5/httpd/ruid2.conf rename install/rhel/{httpd-ssl.conf => 5/httpd/ssl.conf} (100%) rename install/rhel/{httpd-status.conf => 5/httpd/status.conf} (100%) rename install/rhel/{httpd.log => 5/logrotate/httpd} (100%) create mode 100644 install/rhel/5/logrotate/nginx rename install/{ubuntu/vesta.log => rhel/5/logrotate/vesta} (100%) create mode 100644 install/rhel/5/mariadb/my-large.cnf create mode 100644 install/rhel/5/mariadb/my-medium.cnf create mode 100644 install/rhel/5/mariadb/my-small.cnf rename install/rhel/{ => 5}/monit/clamd.conf (100%) rename install/rhel/{ => 5}/monit/dovecot.conf (100%) rename install/rhel/{ => 5}/monit/exim.conf (100%) rename install/rhel/{ => 5}/monit/httpd.conf (100%) rename install/rhel/{ => 5}/monit/mysql.conf (100%) rename install/rhel/{ => 5}/monit/nginx.conf (100%) rename install/rhel/{ => 5}/monit/spamassassin.conf (100%) rename install/rhel/{ => 5}/monit/sshd.conf (100%) rename install/rhel/{ => 5}/monit/vesta-nginx.conf (100%) rename install/rhel/{ => 5}/monit/vesta-php.conf (100%) create mode 100644 install/rhel/5/mysqld/my-large.cnf create mode 100644 install/rhel/5/mysqld/my-medium.cnf create mode 100644 install/rhel/5/mysqld/my-small.cnf rename install/rhel/{ => 5/named}/named.conf (100%) create mode 100644 install/rhel/5/nginx/nginx.conf create mode 100644 install/rhel/5/nginx/phpmyadmin.inc create mode 100644 install/rhel/5/nginx/phppgadmin.inc rename install/{ubuntu/nginx-status.conf => rhel/5/nginx/status.conf} (100%) create mode 100644 install/rhel/5/nginx/webmail.inc create mode 100644 install/rhel/5/packages.tar.gz create mode 100644 install/rhel/5/packages/default.pkg create mode 100644 install/rhel/5/packages/gainsboro.pkg create mode 100644 install/rhel/5/packages/palegreen.pkg create mode 100644 install/rhel/5/packages/slategrey.pkg rename install/{ubuntu/pga.conf => rhel/5/pga/config.inc.php} (100%) rename install/rhel/{httpd-pga.conf => 5/pga/phpPgAdmin.conf} (100%) create mode 100644 install/rhel/5/php-fpm/www.conf rename install/rhel/{pma.conf => 5/pma/config.inc.conf} (100%) rename install/rhel/{httpd-pma.conf => 5/pma/phpMyAdmin.conf} (89%) create mode 100644 install/rhel/5/postgresql/pg_hba.conf rename install/rhel/{ => 5/proftpd}/proftpd.conf (100%) create mode 100644 install/rhel/5/remi-release.rpm rename install/{ubuntu/roundcube-pw.conf => rhel/5/roundcube/config.inc.php} (100%) rename install/{ubuntu/roundcube-db.conf => rhel/5/roundcube/db.inc.php} (100%) create mode 100644 install/rhel/5/roundcube/main.inc.php rename install/rhel/{httpd-webmail.conf => 5/roundcube/roundcubemail.conf} (53%) rename install/rhel/{roundcube-driver.php => 5/roundcube/vesta.php} (100%) rename install/{ubuntu/sudoers.admin.conf => rhel/5/sudo/admin} (56%) create mode 100644 install/rhel/5/templates.tar.gz rename install/{ubuntu => rhel/5}/templates/dns/child-ns.tpl (100%) create mode 100755 install/rhel/5/templates/dns/default.tpl rename install/{ubuntu => rhel/5}/templates/dns/gmail.tpl (90%) rename install/{ubuntu => rhel/5}/templates/web/awstats/awstats.tpl (100%) rename install/{ubuntu => rhel/5}/templates/web/awstats/index.tpl (100%) rename install/{ubuntu => rhel/5}/templates/web/awstats/nav.tpl (100%) rename install/rhel/{ => 5}/templates/web/httpd/basedir.stpl (86%) rename install/rhel/{ => 5}/templates/web/httpd/basedir.tpl (84%) rename install/rhel/{ => 5}/templates/web/httpd/default.stpl (100%) rename install/rhel/{ => 5}/templates/web/httpd/default.tpl (100%) rename install/rhel/{ => 5}/templates/web/httpd/hosting.stpl (100%) rename install/rhel/{ => 5}/templates/web/httpd/hosting.tpl (100%) rename install/{ubuntu/templates/web/apache2 => rhel/5/templates/web/httpd}/phpcgi.sh (100%) rename install/rhel/{ => 5}/templates/web/httpd/phpcgi.stpl (100%) rename install/rhel/{ => 5}/templates/web/httpd/phpcgi.tpl (100%) rename install/{ubuntu/templates/web/apache2 => rhel/5/templates/web/httpd}/phpfcgid.sh (100%) rename install/rhel/{ => 5}/templates/web/httpd/phpfcgid.stpl (100%) rename install/rhel/{ => 5}/templates/web/httpd/phpfcgid.tpl (100%) create mode 100755 install/rhel/5/templates/web/nginx/caching.sh create mode 100755 install/rhel/5/templates/web/nginx/caching.stpl create mode 100755 install/rhel/5/templates/web/nginx/caching.tpl rename install/rhel/{ => 5}/templates/web/nginx/default.stpl (100%) rename install/rhel/{ => 5}/templates/web/nginx/default.tpl (100%) rename install/{ubuntu => rhel/5}/templates/web/nginx/hosting.sh (100%) rename install/rhel/{ => 5}/templates/web/nginx/hosting.stpl (100%) rename install/rhel/{ => 5}/templates/web/nginx/hosting.tpl (100%) create mode 100644 install/rhel/5/templates/web/nginx/php-fpm/cms_made_simple.stpl create mode 100644 install/rhel/5/templates/web/nginx/php-fpm/cms_made_simple.tpl create mode 100644 install/rhel/5/templates/web/nginx/php-fpm/codeigniter2.stpl create mode 100644 install/rhel/5/templates/web/nginx/php-fpm/codeigniter2.tpl create mode 100644 install/rhel/5/templates/web/nginx/php-fpm/codeigniter3.stpl create mode 100644 install/rhel/5/templates/web/nginx/php-fpm/codeigniter3.tpl create mode 100644 install/rhel/5/templates/web/nginx/php-fpm/datalife_engine.stpl create mode 100644 install/rhel/5/templates/web/nginx/php-fpm/datalife_engine.tpl create mode 100644 install/rhel/5/templates/web/nginx/php-fpm/default.stpl create mode 100644 install/rhel/5/templates/web/nginx/php-fpm/default.tpl create mode 100644 install/rhel/5/templates/web/nginx/php-fpm/dokuwiki.stpl create mode 100644 install/rhel/5/templates/web/nginx/php-fpm/dokuwiki.tpl create mode 100644 install/rhel/5/templates/web/nginx/php-fpm/drupal.stpl create mode 100644 install/rhel/5/templates/web/nginx/php-fpm/drupal.tpl create mode 100644 install/rhel/5/templates/web/nginx/php-fpm/joomla.stpl create mode 100644 install/rhel/5/templates/web/nginx/php-fpm/joomla.tpl create mode 100644 install/rhel/5/templates/web/nginx/php-fpm/owncloud.stpl create mode 100644 install/rhel/5/templates/web/nginx/php-fpm/owncloud.tpl create mode 100644 install/rhel/5/templates/web/nginx/php-fpm/piwik.stpl create mode 100644 install/rhel/5/templates/web/nginx/php-fpm/piwik.tpl create mode 100644 install/rhel/5/templates/web/nginx/php-fpm/pyrocms.stpl create mode 100644 install/rhel/5/templates/web/nginx/php-fpm/pyrocms.tpl create mode 100644 install/rhel/5/templates/web/nginx/php-fpm/wordpress.stpl create mode 100644 install/rhel/5/templates/web/nginx/php-fpm/wordpress.tpl create mode 100644 install/rhel/5/templates/web/nginx/php-fpm/wordpress2.stpl create mode 100644 install/rhel/5/templates/web/nginx/php-fpm/wordpress2.tpl rename install/{ubuntu => rhel/5}/templates/web/nginx/proxy_ip.tpl (100%) create mode 100644 install/rhel/5/templates/web/php-fpm/default.tpl create mode 100644 install/rhel/5/templates/web/php-fpm/no-php.tpl create mode 100644 install/rhel/5/templates/web/php-fpm/socket.tpl rename install/{debian => rhel/5}/templates/web/skel/document_errors/403.html (100%) rename install/{debian => rhel/5}/templates/web/skel/document_errors/404.html (100%) rename install/{debian => rhel/5}/templates/web/skel/document_errors/50x.html (100%) rename install/{ubuntu => rhel/5}/templates/web/skel/public_html/index.html (100%) rename install/{ubuntu => rhel/5}/templates/web/skel/public_html/robots.txt (100%) rename install/{ubuntu => rhel/5}/templates/web/skel/public_shtml/index.html (100%) rename install/{ubuntu => rhel/5}/templates/web/skel/public_shtml/robots.txt (100%) rename install/{ubuntu => rhel/5}/templates/web/suspend/.htaccess (100%) rename install/{debian => rhel/5}/templates/web/suspend/index.html (100%) rename install/{ubuntu => rhel/5}/templates/web/webalizer/webalizer.tpl (100%) rename install/rhel/{ => 5/vsftpd}/vsftpd.conf (100%) create mode 100644 install/rhel/5/wsgi/httpd.tar.gz create mode 100755 install/rhel/5/wsgi/httpd/wsgi.sh create mode 100755 install/rhel/5/wsgi/httpd/wsgi.stpl create mode 100644 install/rhel/5/wsgi/httpd/wsgi.tpl create mode 100644 install/rhel/6/GPG.txt create mode 100644 install/rhel/6/clamav/clamd.conf create mode 100644 install/rhel/6/clamav/clamd.service create mode 100644 install/rhel/6/clamav/freshclam.conf create mode 100644 install/rhel/6/dovecot.tar.gz rename install/{ubuntu => rhel/6}/dovecot/conf.d/10-auth.conf (100%) rename install/{ubuntu => rhel/6}/dovecot/conf.d/10-logging.conf (100%) rename install/{ubuntu => rhel/6}/dovecot/conf.d/10-mail.conf (100%) rename install/{ubuntu => rhel/6}/dovecot/conf.d/10-master.conf (100%) create mode 100644 install/rhel/6/dovecot/conf.d/10-ssl.conf rename install/rhel/{ => 6}/dovecot/conf.d/20-imap.conf (100%) rename install/rhel/{ => 6}/dovecot/conf.d/20-pop3.conf (100%) rename install/rhel/{ => 6}/dovecot/conf.d/auth-passwdfile.conf.ext (100%) rename install/rhel/{ => 6}/dovecot/dovecot.conf (100%) create mode 100644 install/rhel/6/epel-release.rpm create mode 100644 install/rhel/6/exim/dnsbl.conf create mode 100644 install/rhel/6/exim/exim-smarthost.conf create mode 100644 install/rhel/6/exim/exim.conf create mode 100644 install/rhel/6/exim/spam-blocks.conf create mode 100644 install/rhel/6/fail2ban.tar.gz rename install/rhel/{ => 6/fail2ban}/fail2ban.action.conf (100%) create mode 100644 install/rhel/6/fail2ban/fail2ban.filter.conf rename install/rhel/{ => 6/fail2ban}/fail2ban.jail.conf (100%) create mode 100644 install/rhel/6/firewall.tar.gz create mode 100644 install/rhel/6/firewall/ports.conf create mode 100644 install/rhel/6/firewall/rules.conf create mode 100644 install/rhel/6/httpd/httpd.conf create mode 100644 install/rhel/6/httpd/ruid2.conf create mode 100644 install/rhel/6/httpd/ssl.conf create mode 100644 install/rhel/6/httpd/status.conf create mode 100644 install/rhel/6/logrotate/httpd create mode 100644 install/rhel/6/logrotate/nginx create mode 100644 install/rhel/6/logrotate/vesta create mode 100644 install/rhel/6/mariadb/my-large.cnf create mode 100644 install/rhel/6/mariadb/my-medium.cnf create mode 100644 install/rhel/6/mariadb/my-small.cnf create mode 100644 install/rhel/6/mysqld/my-large.cnf create mode 100644 install/rhel/6/mysqld/my-medium.cnf create mode 100644 install/rhel/6/mysqld/my-small.cnf create mode 100644 install/rhel/6/named/named.conf create mode 100644 install/rhel/6/nginx/nginx.conf create mode 100644 install/rhel/6/nginx/phpmyadmin.inc create mode 100644 install/rhel/6/nginx/phppgadmin.inc create mode 100644 install/rhel/6/nginx/status.conf create mode 100644 install/rhel/6/nginx/webmail.inc create mode 100644 install/rhel/6/packages.tar.gz create mode 100644 install/rhel/6/packages/default.pkg create mode 100644 install/rhel/6/packages/gainsboro.pkg create mode 100644 install/rhel/6/packages/palegreen.pkg create mode 100644 install/rhel/6/packages/slategrey.pkg create mode 100644 install/rhel/6/pga/config.inc.php create mode 100644 install/rhel/6/pga/phpPgAdmin.conf create mode 100644 install/rhel/6/php-fpm/www.conf create mode 100644 install/rhel/6/pma/config.inc.conf create mode 100644 install/rhel/6/pma/phpMyAdmin.conf rename install/{ubuntu => rhel/6/postgresql}/pg_hba.conf (100%) rename install/{debian => rhel/6/proftpd}/proftpd.conf (84%) create mode 100644 install/rhel/6/remi-release.rpm create mode 100644 install/rhel/6/roundcube/config.inc.php create mode 100644 install/rhel/6/roundcube/db.inc.php create mode 100644 install/rhel/6/roundcube/main.inc.php create mode 100644 install/rhel/6/roundcube/roundcubemail.conf create mode 100644 install/rhel/6/roundcube/vesta.php create mode 100644 install/rhel/6/sudo/admin create mode 100644 install/rhel/6/templates.tar.gz create mode 100755 install/rhel/6/templates/dns/child-ns.tpl create mode 100755 install/rhel/6/templates/dns/default.tpl create mode 100755 install/rhel/6/templates/dns/gmail.tpl create mode 100755 install/rhel/6/templates/web/awstats/awstats.tpl create mode 100755 install/rhel/6/templates/web/awstats/index.tpl create mode 100755 install/rhel/6/templates/web/awstats/nav.tpl rename install/{ubuntu/templates/web/apache2 => rhel/6/templates/web/httpd}/basedir.stpl (85%) rename install/{debian/templates/web/apache2 => rhel/6/templates/web/httpd}/basedir.tpl (82%) rename install/{ubuntu/templates/web/apache2 => rhel/6/templates/web/httpd}/default.stpl (97%) rename install/{ubuntu/templates/web/apache2 => rhel/6/templates/web/httpd}/default.tpl (97%) create mode 100755 install/rhel/6/templates/web/httpd/hosting.stpl create mode 100755 install/rhel/6/templates/web/httpd/hosting.tpl create mode 100755 install/rhel/6/templates/web/httpd/phpcgi.sh create mode 100755 install/rhel/6/templates/web/httpd/phpcgi.stpl create mode 100755 install/rhel/6/templates/web/httpd/phpcgi.tpl create mode 100755 install/rhel/6/templates/web/httpd/phpfcgid.sh create mode 100755 install/rhel/6/templates/web/httpd/phpfcgid.stpl create mode 100755 install/rhel/6/templates/web/httpd/phpfcgid.tpl create mode 100755 install/rhel/6/templates/web/nginx/caching.sh create mode 100755 install/rhel/6/templates/web/nginx/caching.stpl create mode 100755 install/rhel/6/templates/web/nginx/caching.tpl create mode 100755 install/rhel/6/templates/web/nginx/default.stpl create mode 100755 install/rhel/6/templates/web/nginx/default.tpl create mode 100755 install/rhel/6/templates/web/nginx/hosting.sh create mode 100755 install/rhel/6/templates/web/nginx/hosting.stpl create mode 100755 install/rhel/6/templates/web/nginx/hosting.tpl create mode 100644 install/rhel/6/templates/web/nginx/php-fpm/cms_made_simple.stpl create mode 100644 install/rhel/6/templates/web/nginx/php-fpm/cms_made_simple.tpl create mode 100644 install/rhel/6/templates/web/nginx/php-fpm/codeigniter2.stpl create mode 100644 install/rhel/6/templates/web/nginx/php-fpm/codeigniter2.tpl create mode 100644 install/rhel/6/templates/web/nginx/php-fpm/codeigniter3.stpl create mode 100644 install/rhel/6/templates/web/nginx/php-fpm/codeigniter3.tpl create mode 100644 install/rhel/6/templates/web/nginx/php-fpm/datalife_engine.stpl create mode 100644 install/rhel/6/templates/web/nginx/php-fpm/datalife_engine.tpl create mode 100644 install/rhel/6/templates/web/nginx/php-fpm/default.stpl create mode 100644 install/rhel/6/templates/web/nginx/php-fpm/default.tpl create mode 100644 install/rhel/6/templates/web/nginx/php-fpm/dokuwiki.stpl create mode 100644 install/rhel/6/templates/web/nginx/php-fpm/dokuwiki.tpl create mode 100644 install/rhel/6/templates/web/nginx/php-fpm/drupal.stpl create mode 100644 install/rhel/6/templates/web/nginx/php-fpm/drupal.tpl create mode 100644 install/rhel/6/templates/web/nginx/php-fpm/joomla.stpl create mode 100644 install/rhel/6/templates/web/nginx/php-fpm/joomla.tpl create mode 100644 install/rhel/6/templates/web/nginx/php-fpm/owncloud.stpl create mode 100644 install/rhel/6/templates/web/nginx/php-fpm/owncloud.tpl create mode 100644 install/rhel/6/templates/web/nginx/php-fpm/piwik.stpl create mode 100644 install/rhel/6/templates/web/nginx/php-fpm/piwik.tpl create mode 100644 install/rhel/6/templates/web/nginx/php-fpm/pyrocms.stpl create mode 100644 install/rhel/6/templates/web/nginx/php-fpm/pyrocms.tpl create mode 100644 install/rhel/6/templates/web/nginx/php-fpm/wordpress.stpl create mode 100644 install/rhel/6/templates/web/nginx/php-fpm/wordpress.tpl create mode 100644 install/rhel/6/templates/web/nginx/php-fpm/wordpress2.stpl create mode 100644 install/rhel/6/templates/web/nginx/php-fpm/wordpress2.tpl create mode 100755 install/rhel/6/templates/web/nginx/proxy_ip.tpl create mode 100644 install/rhel/6/templates/web/php-fpm/default.tpl create mode 100644 install/rhel/6/templates/web/php-fpm/no-php.tpl create mode 100644 install/rhel/6/templates/web/php-fpm/socket.tpl rename install/rhel/{ => 6}/templates/web/skel/document_errors/403.html (100%) rename install/rhel/{ => 6}/templates/web/skel/document_errors/404.html (100%) rename install/rhel/{ => 6}/templates/web/skel/document_errors/50x.html (100%) create mode 100755 install/rhel/6/templates/web/skel/public_html/index.html create mode 100755 install/rhel/6/templates/web/skel/public_html/robots.txt create mode 100755 install/rhel/6/templates/web/skel/public_shtml/index.html create mode 100755 install/rhel/6/templates/web/skel/public_shtml/robots.txt create mode 100755 install/rhel/6/templates/web/suspend/.htaccess rename install/rhel/{ => 6}/templates/web/suspend/index.html (100%) create mode 100755 install/rhel/6/templates/web/webalizer/webalizer.tpl create mode 100644 install/rhel/6/vsftpd/vsftpd.conf create mode 100644 install/rhel/6/wsgi/httpd.tar.gz create mode 100755 install/rhel/6/wsgi/httpd/wsgi.sh create mode 100755 install/rhel/6/wsgi/httpd/wsgi.stpl create mode 100644 install/rhel/6/wsgi/httpd/wsgi.tpl create mode 100644 install/rhel/7/GPG.txt create mode 100644 install/rhel/7/clamav/clamd.conf create mode 100644 install/rhel/7/clamav/clamd.service create mode 100644 install/rhel/7/clamav/freshclam.conf create mode 100644 install/rhel/7/dovecot.tar.gz create mode 100644 install/rhel/7/dovecot/conf.d/10-auth.conf create mode 100644 install/rhel/7/dovecot/conf.d/10-logging.conf create mode 100644 install/rhel/7/dovecot/conf.d/10-mail.conf create mode 100644 install/rhel/7/dovecot/conf.d/10-master.conf create mode 100644 install/rhel/7/dovecot/conf.d/10-ssl.conf rename install/{ubuntu => rhel/7}/dovecot/conf.d/20-imap.conf (100%) create mode 100644 install/rhel/7/dovecot/conf.d/20-pop3.conf create mode 100644 install/rhel/7/dovecot/conf.d/auth-passwdfile.conf.ext create mode 100644 install/rhel/7/dovecot/dovecot.conf create mode 100644 install/rhel/7/epel-release.rpm create mode 100644 install/rhel/7/exim/dnsbl.conf create mode 100644 install/rhel/7/exim/exim-smarthost.conf create mode 100644 install/rhel/7/exim/exim.conf create mode 100644 install/rhel/7/exim/spam-blocks.conf create mode 100644 install/rhel/7/fail2ban.tar.gz rename install/{ubuntu => rhel/7/fail2ban}/fail2ban.action.conf (100%) create mode 100644 install/rhel/7/fail2ban/fail2ban.filter.conf rename install/{ubuntu => rhel/7/fail2ban}/fail2ban.jail.conf (100%) create mode 100644 install/rhel/7/firewall.tar.gz create mode 100644 install/rhel/7/firewall/ports.conf create mode 100644 install/rhel/7/firewall/rules.conf create mode 100644 install/rhel/7/httpd/httpd.conf create mode 100644 install/rhel/7/httpd/ruid2.conf create mode 100644 install/rhel/7/httpd/ssl.conf create mode 100644 install/rhel/7/httpd/status.conf create mode 100644 install/rhel/7/logrotate/httpd create mode 100644 install/rhel/7/logrotate/nginx create mode 100644 install/rhel/7/logrotate/vesta create mode 100644 install/rhel/7/mariadb/my-large.cnf create mode 100644 install/rhel/7/mariadb/my-medium.cnf create mode 100644 install/rhel/7/mariadb/my-small.cnf create mode 100644 install/rhel/7/monit/clamd.conf create mode 100644 install/rhel/7/monit/dovecot.conf create mode 100644 install/rhel/7/monit/exim.conf create mode 100644 install/rhel/7/monit/httpd.conf create mode 100644 install/rhel/7/monit/mysql.conf create mode 100644 install/rhel/7/monit/nginx.conf create mode 100644 install/rhel/7/monit/spamassassin.conf create mode 100644 install/rhel/7/monit/sshd.conf create mode 100644 install/rhel/7/monit/vesta-nginx.conf create mode 100644 install/rhel/7/monit/vesta-php.conf create mode 100644 install/rhel/7/mysqld/my-large.cnf create mode 100644 install/rhel/7/mysqld/my-medium.cnf create mode 100644 install/rhel/7/mysqld/my-small.cnf create mode 100644 install/rhel/7/named/named.conf create mode 100644 install/rhel/7/nginx/nginx.conf create mode 100644 install/rhel/7/nginx/phpmyadmin.inc create mode 100644 install/rhel/7/nginx/phppgadmin.inc create mode 100644 install/rhel/7/nginx/status.conf create mode 100644 install/rhel/7/nginx/webmail.inc create mode 100644 install/rhel/7/packages.tar.gz create mode 100644 install/rhel/7/packages/default.pkg create mode 100644 install/rhel/7/packages/gainsboro.pkg create mode 100644 install/rhel/7/packages/palegreen.pkg create mode 100644 install/rhel/7/packages/slategrey.pkg create mode 100644 install/rhel/7/pga/config.inc.php create mode 100644 install/rhel/7/pga/phpPgAdmin.conf create mode 100644 install/rhel/7/php-fpm/www.conf create mode 100644 install/rhel/7/pma/config.inc.conf create mode 100644 install/rhel/7/pma/phpMyAdmin.conf create mode 100644 install/rhel/7/postgresql/pg_hba.conf create mode 100644 install/rhel/7/proftpd/proftpd.conf create mode 100644 install/rhel/7/remi-release.rpm create mode 100644 install/rhel/7/roundcube/config.inc.php create mode 100644 install/rhel/7/roundcube/db.inc.php create mode 100644 install/rhel/7/roundcube/main.inc.php create mode 100644 install/rhel/7/roundcube/roundcubemail.conf create mode 100644 install/rhel/7/roundcube/vesta.php create mode 100644 install/rhel/7/sudo/admin create mode 100644 install/rhel/7/templates.tar.gz create mode 100755 install/rhel/7/templates/dns/child-ns.tpl rename install/rhel/{ => 7}/templates/dns/default.tpl (100%) create mode 100755 install/rhel/7/templates/dns/gmail.tpl create mode 100755 install/rhel/7/templates/web/awstats/awstats.tpl create mode 100755 install/rhel/7/templates/web/awstats/index.tpl create mode 100755 install/rhel/7/templates/web/awstats/nav.tpl create mode 100755 install/rhel/7/templates/web/httpd/basedir.stpl create mode 100755 install/rhel/7/templates/web/httpd/basedir.tpl create mode 100755 install/rhel/7/templates/web/httpd/default.stpl create mode 100755 install/rhel/7/templates/web/httpd/default.tpl create mode 100755 install/rhel/7/templates/web/httpd/hosting.stpl create mode 100755 install/rhel/7/templates/web/httpd/hosting.tpl create mode 100755 install/rhel/7/templates/web/httpd/phpcgi.sh create mode 100755 install/rhel/7/templates/web/httpd/phpcgi.stpl create mode 100755 install/rhel/7/templates/web/httpd/phpcgi.tpl create mode 100755 install/rhel/7/templates/web/httpd/phpfcgid.sh create mode 100755 install/rhel/7/templates/web/httpd/phpfcgid.stpl create mode 100755 install/rhel/7/templates/web/httpd/phpfcgid.tpl create mode 100755 install/rhel/7/templates/web/nginx/caching.sh create mode 100755 install/rhel/7/templates/web/nginx/caching.stpl create mode 100755 install/rhel/7/templates/web/nginx/caching.tpl create mode 100755 install/rhel/7/templates/web/nginx/default.stpl create mode 100755 install/rhel/7/templates/web/nginx/default.tpl create mode 100755 install/rhel/7/templates/web/nginx/hosting.sh create mode 100755 install/rhel/7/templates/web/nginx/hosting.stpl create mode 100755 install/rhel/7/templates/web/nginx/hosting.tpl create mode 100644 install/rhel/7/templates/web/nginx/php-fpm/cms_made_simple.stpl create mode 100644 install/rhel/7/templates/web/nginx/php-fpm/cms_made_simple.tpl create mode 100644 install/rhel/7/templates/web/nginx/php-fpm/codeigniter2.stpl create mode 100644 install/rhel/7/templates/web/nginx/php-fpm/codeigniter2.tpl create mode 100644 install/rhel/7/templates/web/nginx/php-fpm/codeigniter3.stpl create mode 100644 install/rhel/7/templates/web/nginx/php-fpm/codeigniter3.tpl create mode 100644 install/rhel/7/templates/web/nginx/php-fpm/datalife_engine.stpl create mode 100644 install/rhel/7/templates/web/nginx/php-fpm/datalife_engine.tpl create mode 100644 install/rhel/7/templates/web/nginx/php-fpm/default.stpl create mode 100644 install/rhel/7/templates/web/nginx/php-fpm/default.tpl create mode 100644 install/rhel/7/templates/web/nginx/php-fpm/dokuwiki.stpl create mode 100644 install/rhel/7/templates/web/nginx/php-fpm/dokuwiki.tpl create mode 100644 install/rhel/7/templates/web/nginx/php-fpm/drupal.stpl create mode 100644 install/rhel/7/templates/web/nginx/php-fpm/drupal.tpl create mode 100644 install/rhel/7/templates/web/nginx/php-fpm/joomla.stpl create mode 100644 install/rhel/7/templates/web/nginx/php-fpm/joomla.tpl create mode 100644 install/rhel/7/templates/web/nginx/php-fpm/owncloud.stpl create mode 100644 install/rhel/7/templates/web/nginx/php-fpm/owncloud.tpl create mode 100644 install/rhel/7/templates/web/nginx/php-fpm/piwik.stpl create mode 100644 install/rhel/7/templates/web/nginx/php-fpm/piwik.tpl create mode 100644 install/rhel/7/templates/web/nginx/php-fpm/pyrocms.stpl create mode 100644 install/rhel/7/templates/web/nginx/php-fpm/pyrocms.tpl create mode 100644 install/rhel/7/templates/web/nginx/php-fpm/wordpress.stpl create mode 100644 install/rhel/7/templates/web/nginx/php-fpm/wordpress.tpl create mode 100644 install/rhel/7/templates/web/nginx/php-fpm/wordpress2.stpl create mode 100644 install/rhel/7/templates/web/nginx/php-fpm/wordpress2.tpl create mode 100755 install/rhel/7/templates/web/nginx/proxy_ip.tpl create mode 100644 install/rhel/7/templates/web/php-fpm/default.tpl create mode 100644 install/rhel/7/templates/web/php-fpm/no-php.tpl create mode 100644 install/rhel/7/templates/web/php-fpm/socket.tpl rename install/{ubuntu => rhel/7}/templates/web/skel/document_errors/403.html (100%) rename install/{ubuntu => rhel/7}/templates/web/skel/document_errors/404.html (100%) rename install/{ubuntu => rhel/7}/templates/web/skel/document_errors/50x.html (100%) create mode 100755 install/rhel/7/templates/web/skel/public_html/index.html create mode 100755 install/rhel/7/templates/web/skel/public_html/robots.txt create mode 100755 install/rhel/7/templates/web/skel/public_shtml/index.html create mode 100755 install/rhel/7/templates/web/skel/public_shtml/robots.txt create mode 100755 install/rhel/7/templates/web/suspend/.htaccess rename install/{ubuntu => rhel/7}/templates/web/suspend/index.html (100%) create mode 100755 install/rhel/7/templates/web/webalizer/webalizer.tpl create mode 100644 install/rhel/7/vsftpd/vsftpd.conf create mode 100644 install/rhel/7/wsgi/httpd.tar.gz create mode 100755 install/rhel/7/wsgi/httpd/wsgi.sh create mode 100755 install/rhel/7/wsgi/httpd/wsgi.stpl create mode 100644 install/rhel/7/wsgi/httpd/wsgi.tpl delete mode 100644 install/rhel/apc.ini delete mode 100644 install/rhel/dovecot/conf.d/10-ssl.conf delete mode 100644 install/rhel/mysql-512.cnf delete mode 100644 install/rhel/mysql.cnf delete mode 100644 install/rhel/sudoers.conf delete mode 100644 install/rhel/vesta.conf delete mode 100644 install/rhel/whmcs-module.php create mode 100644 install/ubuntu/12.04/apache2/apache2.conf create mode 100644 install/ubuntu/12.04/apache2/status.conf create mode 100644 install/ubuntu/12.04/bind/named.conf create mode 100644 install/ubuntu/12.04/clamav/clamd.conf create mode 100644 install/ubuntu/12.04/deb_signing.key create mode 100644 install/ubuntu/12.04/dovecot.tar.gz create mode 100644 install/ubuntu/12.04/dovecot/conf.d/10-auth.conf create mode 100644 install/ubuntu/12.04/dovecot/conf.d/10-logging.conf create mode 100644 install/ubuntu/12.04/dovecot/conf.d/10-mail.conf create mode 100644 install/ubuntu/12.04/dovecot/conf.d/10-master.conf create mode 100644 install/ubuntu/12.04/dovecot/conf.d/10-ssl.conf create mode 100644 install/ubuntu/12.04/dovecot/conf.d/20-imap.conf create mode 100644 install/ubuntu/12.04/dovecot/conf.d/20-pop3.conf create mode 100644 install/ubuntu/12.04/dovecot/conf.d/auth-passwdfile.conf.ext create mode 100644 install/ubuntu/12.04/dovecot/dovecot.conf create mode 100644 install/ubuntu/12.04/exim/dnsbl.conf create mode 100644 install/ubuntu/12.04/exim/exim4.conf.template create mode 100644 install/ubuntu/12.04/exim/spam-blocks.conf create mode 100644 install/ubuntu/12.04/fail2ban.tar.gz create mode 100644 install/ubuntu/12.04/fail2ban/action.d/vesta.conf create mode 100644 install/ubuntu/12.04/fail2ban/filter.d/vesta.conf create mode 100644 install/ubuntu/12.04/fail2ban/jail.local create mode 100644 install/ubuntu/12.04/firewall.tar.gz create mode 100644 install/ubuntu/12.04/firewall/ports.conf create mode 100644 install/ubuntu/12.04/firewall/rules.conf create mode 100644 install/ubuntu/12.04/logrotate/apache2 create mode 100644 install/ubuntu/12.04/logrotate/nginx create mode 100644 install/ubuntu/12.04/logrotate/vesta create mode 100644 install/ubuntu/12.04/mysql/my-large.cnf create mode 100644 install/ubuntu/12.04/mysql/my-medium.cnf create mode 100644 install/ubuntu/12.04/mysql/my-small.cnf rename install/ubuntu/{ => 12.04/nginx}/nginx.conf (99%) create mode 100644 install/ubuntu/12.04/nginx/phpmyadmin.inc create mode 100644 install/ubuntu/12.04/nginx/phppgadmin.inc create mode 100644 install/ubuntu/12.04/nginx/status.conf create mode 100644 install/ubuntu/12.04/nginx/webmail.inc create mode 100644 install/ubuntu/12.04/packages.tar.gz rename install/ubuntu/{ => 12.04}/packages/default.pkg (100%) rename install/ubuntu/{ => 12.04}/packages/gainsboro.pkg (100%) rename install/ubuntu/{ => 12.04}/packages/palegreen.pkg (100%) rename install/ubuntu/{ => 12.04}/packages/slategrey.pkg (100%) create mode 100644 install/ubuntu/12.04/pga/config.inc.php create mode 100644 install/ubuntu/12.04/pga/phppgadmin.conf create mode 100644 install/ubuntu/12.04/php5-fpm/www.conf create mode 100644 install/ubuntu/12.04/pma/apache.conf create mode 100644 install/ubuntu/12.04/pma/config.inc.php create mode 100644 install/ubuntu/12.04/postgresql/pg_hba.conf create mode 100644 install/ubuntu/12.04/proftpd/proftpd.conf create mode 100644 install/ubuntu/12.04/roundcube/apache.conf create mode 100644 install/ubuntu/12.04/roundcube/config.inc.php create mode 100644 install/ubuntu/12.04/roundcube/db.inc.php rename install/ubuntu/{roundcube-main.conf => 12.04/roundcube/main.inc.php} (99%) create mode 100644 install/ubuntu/12.04/roundcube/vesta.php create mode 100644 install/ubuntu/12.04/sudo/admin create mode 100644 install/ubuntu/12.04/templates.tar.gz create mode 100755 install/ubuntu/12.04/templates/dns/child-ns.tpl create mode 100755 install/ubuntu/12.04/templates/dns/default.tpl create mode 100755 install/ubuntu/12.04/templates/dns/gmail.tpl create mode 100755 install/ubuntu/12.04/templates/web/apache2/basedir.stpl create mode 100755 install/ubuntu/12.04/templates/web/apache2/basedir.tpl create mode 100755 install/ubuntu/12.04/templates/web/apache2/default.stpl create mode 100755 install/ubuntu/12.04/templates/web/apache2/default.tpl create mode 100755 install/ubuntu/12.04/templates/web/apache2/hosting.stpl create mode 100755 install/ubuntu/12.04/templates/web/apache2/hosting.tpl create mode 100755 install/ubuntu/12.04/templates/web/apache2/phpcgi.sh create mode 100755 install/ubuntu/12.04/templates/web/apache2/phpcgi.stpl create mode 100755 install/ubuntu/12.04/templates/web/apache2/phpcgi.tpl create mode 100755 install/ubuntu/12.04/templates/web/apache2/phpfcgid.sh create mode 100755 install/ubuntu/12.04/templates/web/apache2/phpfcgid.stpl create mode 100755 install/ubuntu/12.04/templates/web/apache2/phpfcgid.tpl create mode 100755 install/ubuntu/12.04/templates/web/awstats/awstats.tpl create mode 100755 install/ubuntu/12.04/templates/web/awstats/index.tpl create mode 100755 install/ubuntu/12.04/templates/web/awstats/nav.tpl create mode 100755 install/ubuntu/12.04/templates/web/nginx/caching.sh rename install/ubuntu/{ => 12.04}/templates/web/nginx/caching.stpl (100%) rename install/ubuntu/{ => 12.04}/templates/web/nginx/caching.tpl (95%) create mode 100755 install/ubuntu/12.04/templates/web/nginx/default.stpl create mode 100755 install/ubuntu/12.04/templates/web/nginx/default.tpl create mode 100755 install/ubuntu/12.04/templates/web/nginx/hosting.sh create mode 100755 install/ubuntu/12.04/templates/web/nginx/hosting.stpl create mode 100755 install/ubuntu/12.04/templates/web/nginx/hosting.tpl create mode 100644 install/ubuntu/12.04/templates/web/nginx/php5-fpm/cms_made_simple.stpl create mode 100644 install/ubuntu/12.04/templates/web/nginx/php5-fpm/cms_made_simple.tpl create mode 100644 install/ubuntu/12.04/templates/web/nginx/php5-fpm/codeigniter2.stpl create mode 100644 install/ubuntu/12.04/templates/web/nginx/php5-fpm/codeigniter2.tpl create mode 100644 install/ubuntu/12.04/templates/web/nginx/php5-fpm/codeigniter3.stpl create mode 100644 install/ubuntu/12.04/templates/web/nginx/php5-fpm/codeigniter3.tpl create mode 100644 install/ubuntu/12.04/templates/web/nginx/php5-fpm/datalife_engine.stpl create mode 100644 install/ubuntu/12.04/templates/web/nginx/php5-fpm/datalife_engine.tpl create mode 100644 install/ubuntu/12.04/templates/web/nginx/php5-fpm/default.stpl create mode 100644 install/ubuntu/12.04/templates/web/nginx/php5-fpm/default.tpl create mode 100644 install/ubuntu/12.04/templates/web/nginx/php5-fpm/dokuwiki.stpl create mode 100644 install/ubuntu/12.04/templates/web/nginx/php5-fpm/dokuwiki.tpl create mode 100644 install/ubuntu/12.04/templates/web/nginx/php5-fpm/drupal.stpl create mode 100644 install/ubuntu/12.04/templates/web/nginx/php5-fpm/drupal.tpl create mode 100644 install/ubuntu/12.04/templates/web/nginx/php5-fpm/joomla.stpl create mode 100644 install/ubuntu/12.04/templates/web/nginx/php5-fpm/joomla.tpl create mode 100644 install/ubuntu/12.04/templates/web/nginx/php5-fpm/owncloud.stpl create mode 100644 install/ubuntu/12.04/templates/web/nginx/php5-fpm/owncloud.tpl create mode 100644 install/ubuntu/12.04/templates/web/nginx/php5-fpm/piwik.stpl create mode 100644 install/ubuntu/12.04/templates/web/nginx/php5-fpm/piwik.tpl create mode 100644 install/ubuntu/12.04/templates/web/nginx/php5-fpm/pyrocms.stpl create mode 100644 install/ubuntu/12.04/templates/web/nginx/php5-fpm/pyrocms.tpl create mode 100644 install/ubuntu/12.04/templates/web/nginx/php5-fpm/wordpress.stpl create mode 100644 install/ubuntu/12.04/templates/web/nginx/php5-fpm/wordpress.tpl create mode 100644 install/ubuntu/12.04/templates/web/nginx/php5-fpm/wordpress2.stpl create mode 100644 install/ubuntu/12.04/templates/web/nginx/php5-fpm/wordpress2.tpl create mode 100755 install/ubuntu/12.04/templates/web/nginx/proxy_ip.tpl create mode 100644 install/ubuntu/12.04/templates/web/php5-fpm/default.tpl create mode 100644 install/ubuntu/12.04/templates/web/php5-fpm/no-php.tpl create mode 100644 install/ubuntu/12.04/templates/web/php5-fpm/socket.tpl create mode 100755 install/ubuntu/12.04/templates/web/skel/document_errors/403.html create mode 100755 install/ubuntu/12.04/templates/web/skel/document_errors/404.html create mode 100755 install/ubuntu/12.04/templates/web/skel/document_errors/50x.html create mode 100755 install/ubuntu/12.04/templates/web/skel/public_html/index.html create mode 100755 install/ubuntu/12.04/templates/web/skel/public_html/robots.txt create mode 100755 install/ubuntu/12.04/templates/web/skel/public_shtml/index.html create mode 100755 install/ubuntu/12.04/templates/web/skel/public_shtml/robots.txt create mode 100755 install/ubuntu/12.04/templates/web/suspend/.htaccess create mode 100755 install/ubuntu/12.04/templates/web/suspend/index.html create mode 100755 install/ubuntu/12.04/templates/web/webalizer/webalizer.tpl create mode 100644 install/ubuntu/12.04/vsftpd/vsftpd.conf create mode 100644 install/ubuntu/12.10/apache2/apache2.conf create mode 100644 install/ubuntu/12.10/apache2/status.conf create mode 100644 install/ubuntu/12.10/bind/named.conf create mode 100644 install/ubuntu/12.10/clamav/clamd.conf create mode 100644 install/ubuntu/12.10/deb_signing.key create mode 100644 install/ubuntu/12.10/dovecot.tar.gz create mode 100644 install/ubuntu/12.10/dovecot/conf.d/10-auth.conf create mode 100644 install/ubuntu/12.10/dovecot/conf.d/10-logging.conf create mode 100644 install/ubuntu/12.10/dovecot/conf.d/10-mail.conf create mode 100644 install/ubuntu/12.10/dovecot/conf.d/10-master.conf create mode 100644 install/ubuntu/12.10/dovecot/conf.d/10-ssl.conf create mode 100644 install/ubuntu/12.10/dovecot/conf.d/20-imap.conf create mode 100644 install/ubuntu/12.10/dovecot/conf.d/20-pop3.conf create mode 100644 install/ubuntu/12.10/dovecot/conf.d/auth-passwdfile.conf.ext create mode 100644 install/ubuntu/12.10/dovecot/dovecot.conf create mode 100644 install/ubuntu/12.10/exim/dnsbl.conf create mode 100644 install/ubuntu/12.10/exim/exim4.conf.template create mode 100644 install/ubuntu/12.10/exim/spam-blocks.conf create mode 100644 install/ubuntu/12.10/fail2ban.tar.gz create mode 100644 install/ubuntu/12.10/fail2ban/action.d/vesta.conf create mode 100644 install/ubuntu/12.10/fail2ban/filter.d/vesta.conf create mode 100644 install/ubuntu/12.10/fail2ban/jail.local create mode 100644 install/ubuntu/12.10/firewall.tar.gz create mode 100644 install/ubuntu/12.10/firewall/ports.conf create mode 100644 install/ubuntu/12.10/firewall/rules.conf create mode 100644 install/ubuntu/12.10/logrotate/apache2 create mode 100644 install/ubuntu/12.10/logrotate/nginx create mode 100644 install/ubuntu/12.10/logrotate/vesta create mode 100644 install/ubuntu/12.10/mysql/my-large.cnf create mode 100644 install/ubuntu/12.10/mysql/my-medium.cnf create mode 100644 install/ubuntu/12.10/mysql/my-small.cnf create mode 100644 install/ubuntu/12.10/nginx/nginx.conf create mode 100644 install/ubuntu/12.10/nginx/phpmyadmin.inc create mode 100644 install/ubuntu/12.10/nginx/phppgadmin.inc create mode 100644 install/ubuntu/12.10/nginx/status.conf create mode 100644 install/ubuntu/12.10/nginx/webmail.inc create mode 100644 install/ubuntu/12.10/packages.tar.gz create mode 100644 install/ubuntu/12.10/packages/default.pkg create mode 100644 install/ubuntu/12.10/packages/gainsboro.pkg create mode 100644 install/ubuntu/12.10/packages/palegreen.pkg create mode 100644 install/ubuntu/12.10/packages/slategrey.pkg create mode 100644 install/ubuntu/12.10/pga/config.inc.php create mode 100644 install/ubuntu/12.10/pga/phppgadmin.conf create mode 100644 install/ubuntu/12.10/php5-fpm/www.conf create mode 100644 install/ubuntu/12.10/pma/apache.conf create mode 100644 install/ubuntu/12.10/pma/config.inc.php create mode 100644 install/ubuntu/12.10/postgresql/pg_hba.conf create mode 100644 install/ubuntu/12.10/proftpd/proftpd.conf create mode 100644 install/ubuntu/12.10/roundcube/apache.conf create mode 100644 install/ubuntu/12.10/roundcube/config.inc.php create mode 100644 install/ubuntu/12.10/roundcube/db.inc.php create mode 100644 install/ubuntu/12.10/roundcube/main.inc.php create mode 100644 install/ubuntu/12.10/roundcube/vesta.php create mode 100644 install/ubuntu/12.10/sudo/admin create mode 100644 install/ubuntu/12.10/templates.tar.gz create mode 100755 install/ubuntu/12.10/templates/dns/child-ns.tpl create mode 100755 install/ubuntu/12.10/templates/dns/default.tpl create mode 100755 install/ubuntu/12.10/templates/dns/gmail.tpl create mode 100755 install/ubuntu/12.10/templates/web/apache2/basedir.stpl create mode 100755 install/ubuntu/12.10/templates/web/apache2/basedir.tpl create mode 100755 install/ubuntu/12.10/templates/web/apache2/default.stpl create mode 100755 install/ubuntu/12.10/templates/web/apache2/default.tpl create mode 100755 install/ubuntu/12.10/templates/web/apache2/hosting.stpl create mode 100755 install/ubuntu/12.10/templates/web/apache2/hosting.tpl create mode 100755 install/ubuntu/12.10/templates/web/apache2/phpcgi.sh create mode 100755 install/ubuntu/12.10/templates/web/apache2/phpcgi.stpl create mode 100755 install/ubuntu/12.10/templates/web/apache2/phpcgi.tpl create mode 100755 install/ubuntu/12.10/templates/web/apache2/phpfcgid.sh create mode 100755 install/ubuntu/12.10/templates/web/apache2/phpfcgid.stpl create mode 100755 install/ubuntu/12.10/templates/web/apache2/phpfcgid.tpl create mode 100755 install/ubuntu/12.10/templates/web/awstats/awstats.tpl create mode 100755 install/ubuntu/12.10/templates/web/awstats/index.tpl create mode 100755 install/ubuntu/12.10/templates/web/awstats/nav.tpl create mode 100755 install/ubuntu/12.10/templates/web/nginx/caching.sh create mode 100755 install/ubuntu/12.10/templates/web/nginx/caching.stpl create mode 100755 install/ubuntu/12.10/templates/web/nginx/caching.tpl create mode 100755 install/ubuntu/12.10/templates/web/nginx/default.stpl create mode 100755 install/ubuntu/12.10/templates/web/nginx/default.tpl create mode 100755 install/ubuntu/12.10/templates/web/nginx/hosting.sh create mode 100755 install/ubuntu/12.10/templates/web/nginx/hosting.stpl create mode 100755 install/ubuntu/12.10/templates/web/nginx/hosting.tpl create mode 100644 install/ubuntu/12.10/templates/web/nginx/php5-fpm/cms_made_simple.stpl create mode 100644 install/ubuntu/12.10/templates/web/nginx/php5-fpm/cms_made_simple.tpl create mode 100644 install/ubuntu/12.10/templates/web/nginx/php5-fpm/codeigniter2.stpl create mode 100644 install/ubuntu/12.10/templates/web/nginx/php5-fpm/codeigniter2.tpl create mode 100644 install/ubuntu/12.10/templates/web/nginx/php5-fpm/codeigniter3.stpl create mode 100644 install/ubuntu/12.10/templates/web/nginx/php5-fpm/codeigniter3.tpl create mode 100644 install/ubuntu/12.10/templates/web/nginx/php5-fpm/datalife_engine.stpl create mode 100644 install/ubuntu/12.10/templates/web/nginx/php5-fpm/datalife_engine.tpl create mode 100644 install/ubuntu/12.10/templates/web/nginx/php5-fpm/default.stpl create mode 100644 install/ubuntu/12.10/templates/web/nginx/php5-fpm/default.tpl create mode 100644 install/ubuntu/12.10/templates/web/nginx/php5-fpm/dokuwiki.stpl create mode 100644 install/ubuntu/12.10/templates/web/nginx/php5-fpm/dokuwiki.tpl create mode 100644 install/ubuntu/12.10/templates/web/nginx/php5-fpm/drupal.stpl create mode 100644 install/ubuntu/12.10/templates/web/nginx/php5-fpm/drupal.tpl create mode 100644 install/ubuntu/12.10/templates/web/nginx/php5-fpm/joomla.stpl create mode 100644 install/ubuntu/12.10/templates/web/nginx/php5-fpm/joomla.tpl create mode 100644 install/ubuntu/12.10/templates/web/nginx/php5-fpm/owncloud.stpl create mode 100644 install/ubuntu/12.10/templates/web/nginx/php5-fpm/owncloud.tpl create mode 100644 install/ubuntu/12.10/templates/web/nginx/php5-fpm/piwik.stpl create mode 100644 install/ubuntu/12.10/templates/web/nginx/php5-fpm/piwik.tpl create mode 100644 install/ubuntu/12.10/templates/web/nginx/php5-fpm/pyrocms.stpl create mode 100644 install/ubuntu/12.10/templates/web/nginx/php5-fpm/pyrocms.tpl create mode 100644 install/ubuntu/12.10/templates/web/nginx/php5-fpm/wordpress.stpl create mode 100644 install/ubuntu/12.10/templates/web/nginx/php5-fpm/wordpress.tpl create mode 100644 install/ubuntu/12.10/templates/web/nginx/php5-fpm/wordpress2.stpl create mode 100644 install/ubuntu/12.10/templates/web/nginx/php5-fpm/wordpress2.tpl create mode 100755 install/ubuntu/12.10/templates/web/nginx/proxy_ip.tpl create mode 100644 install/ubuntu/12.10/templates/web/php5-fpm/default.tpl create mode 100644 install/ubuntu/12.10/templates/web/php5-fpm/no-php.tpl create mode 100644 install/ubuntu/12.10/templates/web/php5-fpm/socket.tpl create mode 100755 install/ubuntu/12.10/templates/web/skel/document_errors/403.html create mode 100755 install/ubuntu/12.10/templates/web/skel/document_errors/404.html create mode 100755 install/ubuntu/12.10/templates/web/skel/document_errors/50x.html create mode 100755 install/ubuntu/12.10/templates/web/skel/public_html/index.html create mode 100755 install/ubuntu/12.10/templates/web/skel/public_html/robots.txt create mode 100755 install/ubuntu/12.10/templates/web/skel/public_shtml/index.html create mode 100755 install/ubuntu/12.10/templates/web/skel/public_shtml/robots.txt create mode 100755 install/ubuntu/12.10/templates/web/suspend/.htaccess create mode 100755 install/ubuntu/12.10/templates/web/suspend/index.html create mode 100755 install/ubuntu/12.10/templates/web/webalizer/webalizer.tpl create mode 100644 install/ubuntu/12.10/vsftpd/vsftpd.conf create mode 100644 install/ubuntu/13.04/apache2/apache2.conf create mode 100644 install/ubuntu/13.04/apache2/status.conf create mode 100644 install/ubuntu/13.04/bind/named.conf create mode 100644 install/ubuntu/13.04/clamav/clamd.conf create mode 100644 install/ubuntu/13.04/deb_signing.key create mode 100644 install/ubuntu/13.04/dovecot.tar.gz create mode 100644 install/ubuntu/13.04/dovecot/conf.d/10-auth.conf create mode 100644 install/ubuntu/13.04/dovecot/conf.d/10-logging.conf create mode 100644 install/ubuntu/13.04/dovecot/conf.d/10-mail.conf create mode 100644 install/ubuntu/13.04/dovecot/conf.d/10-master.conf create mode 100644 install/ubuntu/13.04/dovecot/conf.d/10-ssl.conf create mode 100644 install/ubuntu/13.04/dovecot/conf.d/20-imap.conf create mode 100644 install/ubuntu/13.04/dovecot/conf.d/20-pop3.conf create mode 100644 install/ubuntu/13.04/dovecot/conf.d/auth-passwdfile.conf.ext create mode 100644 install/ubuntu/13.04/dovecot/dovecot.conf create mode 100644 install/ubuntu/13.04/exim/dnsbl.conf create mode 100644 install/ubuntu/13.04/exim/exim4.conf.template create mode 100644 install/ubuntu/13.04/exim/spam-blocks.conf create mode 100644 install/ubuntu/13.04/fail2ban.tar.gz create mode 100644 install/ubuntu/13.04/fail2ban/action.d/vesta.conf create mode 100644 install/ubuntu/13.04/fail2ban/filter.d/vesta.conf create mode 100644 install/ubuntu/13.04/fail2ban/jail.local create mode 100644 install/ubuntu/13.04/firewall.tar.gz create mode 100644 install/ubuntu/13.04/firewall/ports.conf create mode 100644 install/ubuntu/13.04/firewall/rules.conf create mode 100644 install/ubuntu/13.04/logrotate/apache2 create mode 100644 install/ubuntu/13.04/logrotate/nginx create mode 100644 install/ubuntu/13.04/logrotate/vesta create mode 100644 install/ubuntu/13.04/mysql/my-large.cnf create mode 100644 install/ubuntu/13.04/mysql/my-medium.cnf create mode 100644 install/ubuntu/13.04/mysql/my-small.cnf create mode 100644 install/ubuntu/13.04/nginx/nginx.conf create mode 100644 install/ubuntu/13.04/nginx/phpmyadmin.inc create mode 100644 install/ubuntu/13.04/nginx/phppgadmin.inc create mode 100644 install/ubuntu/13.04/nginx/status.conf create mode 100644 install/ubuntu/13.04/nginx/webmail.inc create mode 100644 install/ubuntu/13.04/packages.tar.gz create mode 100644 install/ubuntu/13.04/packages/default.pkg create mode 100644 install/ubuntu/13.04/packages/gainsboro.pkg create mode 100644 install/ubuntu/13.04/packages/palegreen.pkg create mode 100644 install/ubuntu/13.04/packages/slategrey.pkg create mode 100644 install/ubuntu/13.04/pga/config.inc.php create mode 100644 install/ubuntu/13.04/pga/phppgadmin.conf create mode 100644 install/ubuntu/13.04/php5-fpm/www.conf create mode 100644 install/ubuntu/13.04/pma/apache.conf create mode 100644 install/ubuntu/13.04/pma/config.inc.php create mode 100644 install/ubuntu/13.04/postgresql/pg_hba.conf create mode 100644 install/ubuntu/13.04/proftpd/proftpd.conf create mode 100644 install/ubuntu/13.04/roundcube/apache.conf create mode 100644 install/ubuntu/13.04/roundcube/config.inc.php create mode 100644 install/ubuntu/13.04/roundcube/db.inc.php create mode 100644 install/ubuntu/13.04/roundcube/main.inc.php create mode 100644 install/ubuntu/13.04/roundcube/vesta.php create mode 100644 install/ubuntu/13.04/sudo/admin create mode 100644 install/ubuntu/13.04/templates.tar.gz create mode 100755 install/ubuntu/13.04/templates/dns/child-ns.tpl create mode 100755 install/ubuntu/13.04/templates/dns/default.tpl create mode 100755 install/ubuntu/13.04/templates/dns/gmail.tpl create mode 100755 install/ubuntu/13.04/templates/web/apache2/basedir.stpl create mode 100755 install/ubuntu/13.04/templates/web/apache2/basedir.tpl create mode 100755 install/ubuntu/13.04/templates/web/apache2/default.stpl create mode 100755 install/ubuntu/13.04/templates/web/apache2/default.tpl create mode 100755 install/ubuntu/13.04/templates/web/apache2/hosting.stpl create mode 100755 install/ubuntu/13.04/templates/web/apache2/hosting.tpl create mode 100755 install/ubuntu/13.04/templates/web/apache2/phpcgi.sh create mode 100755 install/ubuntu/13.04/templates/web/apache2/phpcgi.stpl create mode 100755 install/ubuntu/13.04/templates/web/apache2/phpcgi.tpl create mode 100755 install/ubuntu/13.04/templates/web/apache2/phpfcgid.sh create mode 100755 install/ubuntu/13.04/templates/web/apache2/phpfcgid.stpl create mode 100755 install/ubuntu/13.04/templates/web/apache2/phpfcgid.tpl create mode 100755 install/ubuntu/13.04/templates/web/awstats/awstats.tpl create mode 100755 install/ubuntu/13.04/templates/web/awstats/index.tpl create mode 100755 install/ubuntu/13.04/templates/web/awstats/nav.tpl create mode 100755 install/ubuntu/13.04/templates/web/nginx/caching.sh create mode 100755 install/ubuntu/13.04/templates/web/nginx/caching.stpl create mode 100755 install/ubuntu/13.04/templates/web/nginx/caching.tpl create mode 100755 install/ubuntu/13.04/templates/web/nginx/default.stpl create mode 100755 install/ubuntu/13.04/templates/web/nginx/default.tpl create mode 100755 install/ubuntu/13.04/templates/web/nginx/hosting.sh create mode 100755 install/ubuntu/13.04/templates/web/nginx/hosting.stpl create mode 100755 install/ubuntu/13.04/templates/web/nginx/hosting.tpl create mode 100644 install/ubuntu/13.04/templates/web/nginx/php5-fpm/cms_made_simple.stpl create mode 100644 install/ubuntu/13.04/templates/web/nginx/php5-fpm/cms_made_simple.tpl create mode 100644 install/ubuntu/13.04/templates/web/nginx/php5-fpm/codeigniter2.stpl create mode 100644 install/ubuntu/13.04/templates/web/nginx/php5-fpm/codeigniter2.tpl create mode 100644 install/ubuntu/13.04/templates/web/nginx/php5-fpm/codeigniter3.stpl create mode 100644 install/ubuntu/13.04/templates/web/nginx/php5-fpm/codeigniter3.tpl create mode 100644 install/ubuntu/13.04/templates/web/nginx/php5-fpm/datalife_engine.stpl create mode 100644 install/ubuntu/13.04/templates/web/nginx/php5-fpm/datalife_engine.tpl create mode 100644 install/ubuntu/13.04/templates/web/nginx/php5-fpm/default.stpl create mode 100644 install/ubuntu/13.04/templates/web/nginx/php5-fpm/default.tpl create mode 100644 install/ubuntu/13.04/templates/web/nginx/php5-fpm/dokuwiki.stpl create mode 100644 install/ubuntu/13.04/templates/web/nginx/php5-fpm/dokuwiki.tpl create mode 100644 install/ubuntu/13.04/templates/web/nginx/php5-fpm/drupal.stpl create mode 100644 install/ubuntu/13.04/templates/web/nginx/php5-fpm/drupal.tpl create mode 100644 install/ubuntu/13.04/templates/web/nginx/php5-fpm/joomla.stpl create mode 100644 install/ubuntu/13.04/templates/web/nginx/php5-fpm/joomla.tpl create mode 100644 install/ubuntu/13.04/templates/web/nginx/php5-fpm/owncloud.stpl create mode 100644 install/ubuntu/13.04/templates/web/nginx/php5-fpm/owncloud.tpl create mode 100644 install/ubuntu/13.04/templates/web/nginx/php5-fpm/piwik.stpl create mode 100644 install/ubuntu/13.04/templates/web/nginx/php5-fpm/piwik.tpl create mode 100644 install/ubuntu/13.04/templates/web/nginx/php5-fpm/pyrocms.stpl create mode 100644 install/ubuntu/13.04/templates/web/nginx/php5-fpm/pyrocms.tpl create mode 100644 install/ubuntu/13.04/templates/web/nginx/php5-fpm/wordpress.stpl create mode 100644 install/ubuntu/13.04/templates/web/nginx/php5-fpm/wordpress.tpl create mode 100644 install/ubuntu/13.04/templates/web/nginx/php5-fpm/wordpress2.stpl create mode 100644 install/ubuntu/13.04/templates/web/nginx/php5-fpm/wordpress2.tpl create mode 100755 install/ubuntu/13.04/templates/web/nginx/proxy_ip.tpl create mode 100644 install/ubuntu/13.04/templates/web/php5-fpm/default.tpl create mode 100644 install/ubuntu/13.04/templates/web/php5-fpm/no-php.tpl create mode 100644 install/ubuntu/13.04/templates/web/php5-fpm/socket.tpl create mode 100755 install/ubuntu/13.04/templates/web/skel/document_errors/403.html create mode 100755 install/ubuntu/13.04/templates/web/skel/document_errors/404.html create mode 100755 install/ubuntu/13.04/templates/web/skel/document_errors/50x.html create mode 100755 install/ubuntu/13.04/templates/web/skel/public_html/index.html create mode 100755 install/ubuntu/13.04/templates/web/skel/public_html/robots.txt create mode 100755 install/ubuntu/13.04/templates/web/skel/public_shtml/index.html create mode 100755 install/ubuntu/13.04/templates/web/skel/public_shtml/robots.txt create mode 100755 install/ubuntu/13.04/templates/web/suspend/.htaccess create mode 100755 install/ubuntu/13.04/templates/web/suspend/index.html create mode 100755 install/ubuntu/13.04/templates/web/webalizer/webalizer.tpl create mode 100644 install/ubuntu/13.04/vsftpd/vsftpd.conf create mode 100644 install/ubuntu/13.10/apache2/apache2.conf create mode 100644 install/ubuntu/13.10/apache2/status.conf create mode 100644 install/ubuntu/13.10/bind/named.conf create mode 100644 install/ubuntu/13.10/clamav/clamd.conf create mode 100644 install/ubuntu/13.10/deb_signing.key create mode 100644 install/ubuntu/13.10/dovecot.tar.gz create mode 100644 install/ubuntu/13.10/dovecot/conf.d/10-auth.conf create mode 100644 install/ubuntu/13.10/dovecot/conf.d/10-logging.conf create mode 100644 install/ubuntu/13.10/dovecot/conf.d/10-mail.conf create mode 100644 install/ubuntu/13.10/dovecot/conf.d/10-master.conf create mode 100644 install/ubuntu/13.10/dovecot/conf.d/10-ssl.conf create mode 100644 install/ubuntu/13.10/dovecot/conf.d/20-imap.conf create mode 100644 install/ubuntu/13.10/dovecot/conf.d/20-pop3.conf create mode 100644 install/ubuntu/13.10/dovecot/conf.d/auth-passwdfile.conf.ext create mode 100644 install/ubuntu/13.10/dovecot/dovecot.conf create mode 100644 install/ubuntu/13.10/exim/dnsbl.conf create mode 100644 install/ubuntu/13.10/exim/exim4.conf.template create mode 100644 install/ubuntu/13.10/exim/spam-blocks.conf create mode 100644 install/ubuntu/13.10/fail2ban.tar.gz create mode 100644 install/ubuntu/13.10/fail2ban/action.d/vesta.conf create mode 100644 install/ubuntu/13.10/fail2ban/filter.d/vesta.conf create mode 100644 install/ubuntu/13.10/fail2ban/jail.local create mode 100644 install/ubuntu/13.10/firewall.tar.gz create mode 100644 install/ubuntu/13.10/firewall/ports.conf create mode 100644 install/ubuntu/13.10/firewall/rules.conf create mode 100644 install/ubuntu/13.10/logrotate/apache2 create mode 100644 install/ubuntu/13.10/logrotate/nginx create mode 100644 install/ubuntu/13.10/logrotate/vesta create mode 100644 install/ubuntu/13.10/mysql/my-large.cnf create mode 100644 install/ubuntu/13.10/mysql/my-medium.cnf create mode 100644 install/ubuntu/13.10/mysql/my-small.cnf create mode 100644 install/ubuntu/13.10/nginx/nginx.conf create mode 100644 install/ubuntu/13.10/nginx/phpmyadmin.inc create mode 100644 install/ubuntu/13.10/nginx/phppgadmin.inc create mode 100644 install/ubuntu/13.10/nginx/status.conf create mode 100644 install/ubuntu/13.10/nginx/webmail.inc create mode 100644 install/ubuntu/13.10/packages.tar.gz create mode 100644 install/ubuntu/13.10/packages/default.pkg create mode 100644 install/ubuntu/13.10/packages/gainsboro.pkg create mode 100644 install/ubuntu/13.10/packages/palegreen.pkg create mode 100644 install/ubuntu/13.10/packages/slategrey.pkg create mode 100644 install/ubuntu/13.10/pga/config.inc.php create mode 100644 install/ubuntu/13.10/pga/phppgadmin.conf create mode 100644 install/ubuntu/13.10/php5-fpm/www.conf create mode 100644 install/ubuntu/13.10/pma/apache.conf create mode 100644 install/ubuntu/13.10/pma/config.inc.php create mode 100644 install/ubuntu/13.10/postgresql/pg_hba.conf create mode 100644 install/ubuntu/13.10/proftpd/proftpd.conf create mode 100644 install/ubuntu/13.10/roundcube/apache.conf create mode 100644 install/ubuntu/13.10/roundcube/config.inc.php create mode 100644 install/ubuntu/13.10/roundcube/db.inc.php create mode 100644 install/ubuntu/13.10/roundcube/main.inc.php create mode 100644 install/ubuntu/13.10/roundcube/vesta.php create mode 100644 install/ubuntu/13.10/sudo/admin create mode 100644 install/ubuntu/13.10/templates.tar.gz create mode 100755 install/ubuntu/13.10/templates/dns/child-ns.tpl create mode 100755 install/ubuntu/13.10/templates/dns/default.tpl create mode 100755 install/ubuntu/13.10/templates/dns/gmail.tpl create mode 100755 install/ubuntu/13.10/templates/web/apache2/basedir.stpl create mode 100755 install/ubuntu/13.10/templates/web/apache2/basedir.tpl create mode 100755 install/ubuntu/13.10/templates/web/apache2/default.stpl create mode 100755 install/ubuntu/13.10/templates/web/apache2/default.tpl create mode 100755 install/ubuntu/13.10/templates/web/apache2/hosting.stpl create mode 100755 install/ubuntu/13.10/templates/web/apache2/hosting.tpl create mode 100755 install/ubuntu/13.10/templates/web/apache2/phpcgi.sh create mode 100755 install/ubuntu/13.10/templates/web/apache2/phpcgi.stpl create mode 100755 install/ubuntu/13.10/templates/web/apache2/phpcgi.tpl create mode 100755 install/ubuntu/13.10/templates/web/apache2/phpfcgid.sh create mode 100755 install/ubuntu/13.10/templates/web/apache2/phpfcgid.stpl create mode 100755 install/ubuntu/13.10/templates/web/apache2/phpfcgid.tpl create mode 100755 install/ubuntu/13.10/templates/web/awstats/awstats.tpl create mode 100755 install/ubuntu/13.10/templates/web/awstats/index.tpl create mode 100755 install/ubuntu/13.10/templates/web/awstats/nav.tpl create mode 100755 install/ubuntu/13.10/templates/web/nginx/caching.sh create mode 100755 install/ubuntu/13.10/templates/web/nginx/caching.stpl create mode 100755 install/ubuntu/13.10/templates/web/nginx/caching.tpl create mode 100755 install/ubuntu/13.10/templates/web/nginx/default.stpl create mode 100755 install/ubuntu/13.10/templates/web/nginx/default.tpl create mode 100755 install/ubuntu/13.10/templates/web/nginx/hosting.sh create mode 100755 install/ubuntu/13.10/templates/web/nginx/hosting.stpl create mode 100755 install/ubuntu/13.10/templates/web/nginx/hosting.tpl create mode 100644 install/ubuntu/13.10/templates/web/nginx/php5-fpm/cms_made_simple.stpl create mode 100644 install/ubuntu/13.10/templates/web/nginx/php5-fpm/cms_made_simple.tpl create mode 100644 install/ubuntu/13.10/templates/web/nginx/php5-fpm/codeigniter2.stpl create mode 100644 install/ubuntu/13.10/templates/web/nginx/php5-fpm/codeigniter2.tpl create mode 100644 install/ubuntu/13.10/templates/web/nginx/php5-fpm/codeigniter3.stpl create mode 100644 install/ubuntu/13.10/templates/web/nginx/php5-fpm/codeigniter3.tpl create mode 100644 install/ubuntu/13.10/templates/web/nginx/php5-fpm/datalife_engine.stpl create mode 100644 install/ubuntu/13.10/templates/web/nginx/php5-fpm/datalife_engine.tpl create mode 100644 install/ubuntu/13.10/templates/web/nginx/php5-fpm/default.stpl create mode 100644 install/ubuntu/13.10/templates/web/nginx/php5-fpm/default.tpl create mode 100644 install/ubuntu/13.10/templates/web/nginx/php5-fpm/dokuwiki.stpl create mode 100644 install/ubuntu/13.10/templates/web/nginx/php5-fpm/dokuwiki.tpl create mode 100644 install/ubuntu/13.10/templates/web/nginx/php5-fpm/drupal.stpl create mode 100644 install/ubuntu/13.10/templates/web/nginx/php5-fpm/drupal.tpl create mode 100644 install/ubuntu/13.10/templates/web/nginx/php5-fpm/joomla.stpl create mode 100644 install/ubuntu/13.10/templates/web/nginx/php5-fpm/joomla.tpl create mode 100644 install/ubuntu/13.10/templates/web/nginx/php5-fpm/owncloud.stpl create mode 100644 install/ubuntu/13.10/templates/web/nginx/php5-fpm/owncloud.tpl create mode 100644 install/ubuntu/13.10/templates/web/nginx/php5-fpm/piwik.stpl create mode 100644 install/ubuntu/13.10/templates/web/nginx/php5-fpm/piwik.tpl create mode 100644 install/ubuntu/13.10/templates/web/nginx/php5-fpm/pyrocms.stpl create mode 100644 install/ubuntu/13.10/templates/web/nginx/php5-fpm/pyrocms.tpl create mode 100644 install/ubuntu/13.10/templates/web/nginx/php5-fpm/wordpress.stpl create mode 100644 install/ubuntu/13.10/templates/web/nginx/php5-fpm/wordpress.tpl create mode 100644 install/ubuntu/13.10/templates/web/nginx/php5-fpm/wordpress2.stpl create mode 100644 install/ubuntu/13.10/templates/web/nginx/php5-fpm/wordpress2.tpl create mode 100755 install/ubuntu/13.10/templates/web/nginx/proxy_ip.tpl create mode 100644 install/ubuntu/13.10/templates/web/php5-fpm/default.tpl create mode 100644 install/ubuntu/13.10/templates/web/php5-fpm/no-php.tpl create mode 100644 install/ubuntu/13.10/templates/web/php5-fpm/socket.tpl create mode 100755 install/ubuntu/13.10/templates/web/skel/document_errors/403.html create mode 100755 install/ubuntu/13.10/templates/web/skel/document_errors/404.html create mode 100755 install/ubuntu/13.10/templates/web/skel/document_errors/50x.html create mode 100755 install/ubuntu/13.10/templates/web/skel/public_html/index.html create mode 100755 install/ubuntu/13.10/templates/web/skel/public_html/robots.txt create mode 100755 install/ubuntu/13.10/templates/web/skel/public_shtml/index.html create mode 100755 install/ubuntu/13.10/templates/web/skel/public_shtml/robots.txt create mode 100755 install/ubuntu/13.10/templates/web/suspend/.htaccess create mode 100755 install/ubuntu/13.10/templates/web/suspend/index.html create mode 100755 install/ubuntu/13.10/templates/web/webalizer/webalizer.tpl create mode 100644 install/ubuntu/13.10/vsftpd/vsftpd.conf create mode 100644 install/ubuntu/14.04/apache2/apache2.conf create mode 100644 install/ubuntu/14.04/apache2/status.conf create mode 100644 install/ubuntu/14.04/bind/named.conf create mode 100644 install/ubuntu/14.04/clamav/clamd.conf create mode 100644 install/ubuntu/14.04/deb_signing.key create mode 100644 install/ubuntu/14.04/dovecot.tar.gz create mode 100644 install/ubuntu/14.04/dovecot/conf.d/10-auth.conf create mode 100644 install/ubuntu/14.04/dovecot/conf.d/10-logging.conf create mode 100644 install/ubuntu/14.04/dovecot/conf.d/10-mail.conf create mode 100644 install/ubuntu/14.04/dovecot/conf.d/10-master.conf create mode 100644 install/ubuntu/14.04/dovecot/conf.d/10-ssl.conf create mode 100644 install/ubuntu/14.04/dovecot/conf.d/20-imap.conf create mode 100644 install/ubuntu/14.04/dovecot/conf.d/20-pop3.conf create mode 100644 install/ubuntu/14.04/dovecot/conf.d/auth-passwdfile.conf.ext create mode 100644 install/ubuntu/14.04/dovecot/dovecot.conf create mode 100644 install/ubuntu/14.04/exim/dnsbl.conf create mode 100644 install/ubuntu/14.04/exim/exim4.conf.template create mode 100644 install/ubuntu/14.04/exim/spam-blocks.conf create mode 100644 install/ubuntu/14.04/fail2ban.tar.gz create mode 100644 install/ubuntu/14.04/fail2ban/action.d/vesta.conf create mode 100644 install/ubuntu/14.04/fail2ban/filter.d/vesta.conf create mode 100644 install/ubuntu/14.04/fail2ban/jail.local create mode 100644 install/ubuntu/14.04/firewall.tar.gz create mode 100644 install/ubuntu/14.04/firewall/ports.conf create mode 100644 install/ubuntu/14.04/firewall/rules.conf create mode 100644 install/ubuntu/14.04/logrotate/apache2 create mode 100644 install/ubuntu/14.04/logrotate/nginx create mode 100644 install/ubuntu/14.04/logrotate/vesta create mode 100644 install/ubuntu/14.04/mysql/my-large.cnf create mode 100644 install/ubuntu/14.04/mysql/my-medium.cnf create mode 100644 install/ubuntu/14.04/mysql/my-small.cnf create mode 100644 install/ubuntu/14.04/nginx/nginx.conf create mode 100644 install/ubuntu/14.04/nginx/phpmyadmin.inc create mode 100644 install/ubuntu/14.04/nginx/phppgadmin.inc create mode 100644 install/ubuntu/14.04/nginx/status.conf create mode 100644 install/ubuntu/14.04/nginx/webmail.inc create mode 100644 install/ubuntu/14.04/packages.tar.gz create mode 100644 install/ubuntu/14.04/packages/default.pkg create mode 100644 install/ubuntu/14.04/packages/gainsboro.pkg create mode 100644 install/ubuntu/14.04/packages/palegreen.pkg create mode 100644 install/ubuntu/14.04/packages/slategrey.pkg create mode 100644 install/ubuntu/14.04/pga/config.inc.php create mode 100644 install/ubuntu/14.04/pga/phppgadmin.conf create mode 100644 install/ubuntu/14.04/php5-fpm/www.conf create mode 100644 install/ubuntu/14.04/pma/apache.conf create mode 100644 install/ubuntu/14.04/pma/config.inc.php create mode 100644 install/ubuntu/14.04/postgresql/pg_hba.conf create mode 100644 install/ubuntu/14.04/proftpd/proftpd.conf create mode 100644 install/ubuntu/14.04/roundcube/apache.conf create mode 100644 install/ubuntu/14.04/roundcube/config.inc.php create mode 100644 install/ubuntu/14.04/roundcube/db.inc.php create mode 100644 install/ubuntu/14.04/roundcube/main.inc.php create mode 100644 install/ubuntu/14.04/roundcube/vesta.php create mode 100644 install/ubuntu/14.04/sudo/admin create mode 100644 install/ubuntu/14.04/templates.tar.gz create mode 100755 install/ubuntu/14.04/templates/dns/child-ns.tpl create mode 100755 install/ubuntu/14.04/templates/dns/default.tpl create mode 100755 install/ubuntu/14.04/templates/dns/gmail.tpl create mode 100755 install/ubuntu/14.04/templates/web/apache2/basedir.stpl create mode 100755 install/ubuntu/14.04/templates/web/apache2/basedir.tpl create mode 100755 install/ubuntu/14.04/templates/web/apache2/default.stpl create mode 100755 install/ubuntu/14.04/templates/web/apache2/default.tpl create mode 100755 install/ubuntu/14.04/templates/web/apache2/hosting.stpl create mode 100755 install/ubuntu/14.04/templates/web/apache2/hosting.tpl create mode 100755 install/ubuntu/14.04/templates/web/apache2/phpcgi.sh create mode 100755 install/ubuntu/14.04/templates/web/apache2/phpcgi.stpl create mode 100755 install/ubuntu/14.04/templates/web/apache2/phpcgi.tpl create mode 100755 install/ubuntu/14.04/templates/web/apache2/phpfcgid.sh create mode 100755 install/ubuntu/14.04/templates/web/apache2/phpfcgid.stpl create mode 100755 install/ubuntu/14.04/templates/web/apache2/phpfcgid.tpl create mode 100755 install/ubuntu/14.04/templates/web/awstats/awstats.tpl create mode 100755 install/ubuntu/14.04/templates/web/awstats/index.tpl create mode 100755 install/ubuntu/14.04/templates/web/awstats/nav.tpl create mode 100755 install/ubuntu/14.04/templates/web/nginx/caching.sh create mode 100755 install/ubuntu/14.04/templates/web/nginx/caching.stpl create mode 100755 install/ubuntu/14.04/templates/web/nginx/caching.tpl create mode 100755 install/ubuntu/14.04/templates/web/nginx/default.stpl create mode 100755 install/ubuntu/14.04/templates/web/nginx/default.tpl create mode 100755 install/ubuntu/14.04/templates/web/nginx/hosting.sh create mode 100755 install/ubuntu/14.04/templates/web/nginx/hosting.stpl create mode 100755 install/ubuntu/14.04/templates/web/nginx/hosting.tpl create mode 100644 install/ubuntu/14.04/templates/web/nginx/php5-fpm/cms_made_simple.stpl create mode 100644 install/ubuntu/14.04/templates/web/nginx/php5-fpm/cms_made_simple.tpl create mode 100644 install/ubuntu/14.04/templates/web/nginx/php5-fpm/codeigniter2.stpl create mode 100644 install/ubuntu/14.04/templates/web/nginx/php5-fpm/codeigniter2.tpl create mode 100644 install/ubuntu/14.04/templates/web/nginx/php5-fpm/codeigniter3.stpl create mode 100644 install/ubuntu/14.04/templates/web/nginx/php5-fpm/codeigniter3.tpl create mode 100644 install/ubuntu/14.04/templates/web/nginx/php5-fpm/datalife_engine.stpl create mode 100644 install/ubuntu/14.04/templates/web/nginx/php5-fpm/datalife_engine.tpl create mode 100644 install/ubuntu/14.04/templates/web/nginx/php5-fpm/default.stpl create mode 100644 install/ubuntu/14.04/templates/web/nginx/php5-fpm/default.tpl create mode 100644 install/ubuntu/14.04/templates/web/nginx/php5-fpm/dokuwiki.stpl create mode 100644 install/ubuntu/14.04/templates/web/nginx/php5-fpm/dokuwiki.tpl create mode 100644 install/ubuntu/14.04/templates/web/nginx/php5-fpm/drupal.stpl create mode 100644 install/ubuntu/14.04/templates/web/nginx/php5-fpm/drupal.tpl create mode 100644 install/ubuntu/14.04/templates/web/nginx/php5-fpm/joomla.stpl create mode 100644 install/ubuntu/14.04/templates/web/nginx/php5-fpm/joomla.tpl create mode 100644 install/ubuntu/14.04/templates/web/nginx/php5-fpm/owncloud.stpl create mode 100644 install/ubuntu/14.04/templates/web/nginx/php5-fpm/owncloud.tpl create mode 100644 install/ubuntu/14.04/templates/web/nginx/php5-fpm/piwik.stpl create mode 100644 install/ubuntu/14.04/templates/web/nginx/php5-fpm/piwik.tpl create mode 100644 install/ubuntu/14.04/templates/web/nginx/php5-fpm/pyrocms.stpl create mode 100644 install/ubuntu/14.04/templates/web/nginx/php5-fpm/pyrocms.tpl create mode 100644 install/ubuntu/14.04/templates/web/nginx/php5-fpm/wordpress.stpl create mode 100644 install/ubuntu/14.04/templates/web/nginx/php5-fpm/wordpress.tpl create mode 100644 install/ubuntu/14.04/templates/web/nginx/php5-fpm/wordpress2.stpl create mode 100644 install/ubuntu/14.04/templates/web/nginx/php5-fpm/wordpress2.tpl create mode 100755 install/ubuntu/14.04/templates/web/nginx/proxy_ip.tpl create mode 100644 install/ubuntu/14.04/templates/web/php5-fpm/default.tpl create mode 100644 install/ubuntu/14.04/templates/web/php5-fpm/no-php.tpl create mode 100644 install/ubuntu/14.04/templates/web/php5-fpm/socket.tpl create mode 100755 install/ubuntu/14.04/templates/web/skel/document_errors/403.html create mode 100755 install/ubuntu/14.04/templates/web/skel/document_errors/404.html create mode 100755 install/ubuntu/14.04/templates/web/skel/document_errors/50x.html create mode 100755 install/ubuntu/14.04/templates/web/skel/public_html/index.html create mode 100755 install/ubuntu/14.04/templates/web/skel/public_html/robots.txt create mode 100755 install/ubuntu/14.04/templates/web/skel/public_shtml/index.html create mode 100755 install/ubuntu/14.04/templates/web/skel/public_shtml/robots.txt create mode 100755 install/ubuntu/14.04/templates/web/suspend/.htaccess create mode 100755 install/ubuntu/14.04/templates/web/suspend/index.html create mode 100755 install/ubuntu/14.04/templates/web/webalizer/webalizer.tpl create mode 100644 install/ubuntu/14.04/vsftpd/vsftpd.conf create mode 100644 install/ubuntu/14.10/apache2/apache2.conf create mode 100644 install/ubuntu/14.10/apache2/status.conf create mode 100644 install/ubuntu/14.10/bind/named.conf create mode 100644 install/ubuntu/14.10/clamav/clamd.conf create mode 100644 install/ubuntu/14.10/deb_signing.key create mode 100644 install/ubuntu/14.10/dovecot.tar.gz create mode 100644 install/ubuntu/14.10/dovecot/conf.d/10-auth.conf create mode 100644 install/ubuntu/14.10/dovecot/conf.d/10-logging.conf create mode 100644 install/ubuntu/14.10/dovecot/conf.d/10-mail.conf create mode 100644 install/ubuntu/14.10/dovecot/conf.d/10-master.conf create mode 100644 install/ubuntu/14.10/dovecot/conf.d/10-ssl.conf create mode 100644 install/ubuntu/14.10/dovecot/conf.d/20-imap.conf create mode 100644 install/ubuntu/14.10/dovecot/conf.d/20-pop3.conf create mode 100644 install/ubuntu/14.10/dovecot/conf.d/auth-passwdfile.conf.ext create mode 100644 install/ubuntu/14.10/dovecot/dovecot.conf create mode 100644 install/ubuntu/14.10/exim/dnsbl.conf create mode 100644 install/ubuntu/14.10/exim/exim4.conf.template create mode 100644 install/ubuntu/14.10/exim/spam-blocks.conf create mode 100644 install/ubuntu/14.10/fail2ban.tar.gz create mode 100644 install/ubuntu/14.10/fail2ban/action.d/vesta.conf create mode 100644 install/ubuntu/14.10/fail2ban/filter.d/vesta.conf create mode 100644 install/ubuntu/14.10/fail2ban/jail.local create mode 100644 install/ubuntu/14.10/firewall.tar.gz create mode 100644 install/ubuntu/14.10/firewall/ports.conf create mode 100644 install/ubuntu/14.10/firewall/rules.conf create mode 100644 install/ubuntu/14.10/logrotate/apache2 create mode 100644 install/ubuntu/14.10/logrotate/nginx create mode 100644 install/ubuntu/14.10/logrotate/vesta create mode 100644 install/ubuntu/14.10/mysql/my-large.cnf create mode 100644 install/ubuntu/14.10/mysql/my-medium.cnf create mode 100644 install/ubuntu/14.10/mysql/my-small.cnf create mode 100644 install/ubuntu/14.10/nginx/nginx.conf create mode 100644 install/ubuntu/14.10/nginx/phpmyadmin.inc create mode 100644 install/ubuntu/14.10/nginx/phppgadmin.inc create mode 100644 install/ubuntu/14.10/nginx/status.conf create mode 100644 install/ubuntu/14.10/nginx/webmail.inc create mode 100644 install/ubuntu/14.10/packages.tar.gz create mode 100644 install/ubuntu/14.10/packages/default.pkg create mode 100644 install/ubuntu/14.10/packages/gainsboro.pkg create mode 100644 install/ubuntu/14.10/packages/palegreen.pkg create mode 100644 install/ubuntu/14.10/packages/slategrey.pkg create mode 100644 install/ubuntu/14.10/pga/config.inc.php create mode 100644 install/ubuntu/14.10/pga/phppgadmin.conf create mode 100644 install/ubuntu/14.10/php5-fpm/www.conf create mode 100644 install/ubuntu/14.10/pma/apache.conf create mode 100644 install/ubuntu/14.10/pma/config.inc.php create mode 100644 install/ubuntu/14.10/postgresql/pg_hba.conf create mode 100644 install/ubuntu/14.10/proftpd/proftpd.conf create mode 100644 install/ubuntu/14.10/roundcube/apache.conf create mode 100644 install/ubuntu/14.10/roundcube/config.inc.php create mode 100644 install/ubuntu/14.10/roundcube/db.inc.php create mode 100644 install/ubuntu/14.10/roundcube/main.inc.php create mode 100644 install/ubuntu/14.10/roundcube/vesta.php create mode 100644 install/ubuntu/14.10/sudo/admin create mode 100644 install/ubuntu/14.10/templates.tar.gz create mode 100755 install/ubuntu/14.10/templates/dns/child-ns.tpl create mode 100755 install/ubuntu/14.10/templates/dns/default.tpl create mode 100755 install/ubuntu/14.10/templates/dns/gmail.tpl create mode 100755 install/ubuntu/14.10/templates/web/apache2/basedir.stpl create mode 100755 install/ubuntu/14.10/templates/web/apache2/basedir.tpl create mode 100755 install/ubuntu/14.10/templates/web/apache2/default.stpl create mode 100755 install/ubuntu/14.10/templates/web/apache2/default.tpl create mode 100755 install/ubuntu/14.10/templates/web/apache2/hosting.stpl create mode 100755 install/ubuntu/14.10/templates/web/apache2/hosting.tpl create mode 100755 install/ubuntu/14.10/templates/web/apache2/phpcgi.sh create mode 100755 install/ubuntu/14.10/templates/web/apache2/phpcgi.stpl create mode 100755 install/ubuntu/14.10/templates/web/apache2/phpcgi.tpl create mode 100755 install/ubuntu/14.10/templates/web/apache2/phpfcgid.sh create mode 100755 install/ubuntu/14.10/templates/web/apache2/phpfcgid.stpl create mode 100755 install/ubuntu/14.10/templates/web/apache2/phpfcgid.tpl create mode 100755 install/ubuntu/14.10/templates/web/awstats/awstats.tpl create mode 100755 install/ubuntu/14.10/templates/web/awstats/index.tpl create mode 100755 install/ubuntu/14.10/templates/web/awstats/nav.tpl create mode 100755 install/ubuntu/14.10/templates/web/nginx/caching.sh create mode 100755 install/ubuntu/14.10/templates/web/nginx/caching.stpl create mode 100755 install/ubuntu/14.10/templates/web/nginx/caching.tpl create mode 100755 install/ubuntu/14.10/templates/web/nginx/default.stpl create mode 100755 install/ubuntu/14.10/templates/web/nginx/default.tpl create mode 100755 install/ubuntu/14.10/templates/web/nginx/hosting.sh create mode 100755 install/ubuntu/14.10/templates/web/nginx/hosting.stpl create mode 100755 install/ubuntu/14.10/templates/web/nginx/hosting.tpl create mode 100644 install/ubuntu/14.10/templates/web/nginx/php5-fpm/cms_made_simple.stpl create mode 100644 install/ubuntu/14.10/templates/web/nginx/php5-fpm/cms_made_simple.tpl create mode 100644 install/ubuntu/14.10/templates/web/nginx/php5-fpm/codeigniter2.stpl create mode 100644 install/ubuntu/14.10/templates/web/nginx/php5-fpm/codeigniter2.tpl create mode 100644 install/ubuntu/14.10/templates/web/nginx/php5-fpm/codeigniter3.stpl create mode 100644 install/ubuntu/14.10/templates/web/nginx/php5-fpm/codeigniter3.tpl create mode 100644 install/ubuntu/14.10/templates/web/nginx/php5-fpm/datalife_engine.stpl create mode 100644 install/ubuntu/14.10/templates/web/nginx/php5-fpm/datalife_engine.tpl create mode 100644 install/ubuntu/14.10/templates/web/nginx/php5-fpm/default.stpl create mode 100644 install/ubuntu/14.10/templates/web/nginx/php5-fpm/default.tpl create mode 100644 install/ubuntu/14.10/templates/web/nginx/php5-fpm/dokuwiki.stpl create mode 100644 install/ubuntu/14.10/templates/web/nginx/php5-fpm/dokuwiki.tpl create mode 100644 install/ubuntu/14.10/templates/web/nginx/php5-fpm/drupal.stpl create mode 100644 install/ubuntu/14.10/templates/web/nginx/php5-fpm/drupal.tpl create mode 100644 install/ubuntu/14.10/templates/web/nginx/php5-fpm/joomla.stpl create mode 100644 install/ubuntu/14.10/templates/web/nginx/php5-fpm/joomla.tpl create mode 100644 install/ubuntu/14.10/templates/web/nginx/php5-fpm/owncloud.stpl create mode 100644 install/ubuntu/14.10/templates/web/nginx/php5-fpm/owncloud.tpl create mode 100644 install/ubuntu/14.10/templates/web/nginx/php5-fpm/piwik.stpl create mode 100644 install/ubuntu/14.10/templates/web/nginx/php5-fpm/piwik.tpl create mode 100644 install/ubuntu/14.10/templates/web/nginx/php5-fpm/pyrocms.stpl create mode 100644 install/ubuntu/14.10/templates/web/nginx/php5-fpm/pyrocms.tpl create mode 100644 install/ubuntu/14.10/templates/web/nginx/php5-fpm/wordpress.stpl create mode 100644 install/ubuntu/14.10/templates/web/nginx/php5-fpm/wordpress.tpl create mode 100644 install/ubuntu/14.10/templates/web/nginx/php5-fpm/wordpress2.stpl create mode 100644 install/ubuntu/14.10/templates/web/nginx/php5-fpm/wordpress2.tpl create mode 100755 install/ubuntu/14.10/templates/web/nginx/proxy_ip.tpl create mode 100644 install/ubuntu/14.10/templates/web/php5-fpm/default.tpl create mode 100644 install/ubuntu/14.10/templates/web/php5-fpm/no-php.tpl create mode 100644 install/ubuntu/14.10/templates/web/php5-fpm/socket.tpl create mode 100755 install/ubuntu/14.10/templates/web/skel/document_errors/403.html create mode 100755 install/ubuntu/14.10/templates/web/skel/document_errors/404.html create mode 100755 install/ubuntu/14.10/templates/web/skel/document_errors/50x.html create mode 100755 install/ubuntu/14.10/templates/web/skel/public_html/index.html create mode 100755 install/ubuntu/14.10/templates/web/skel/public_html/robots.txt create mode 100755 install/ubuntu/14.10/templates/web/skel/public_shtml/index.html create mode 100755 install/ubuntu/14.10/templates/web/skel/public_shtml/robots.txt create mode 100755 install/ubuntu/14.10/templates/web/suspend/.htaccess create mode 100755 install/ubuntu/14.10/templates/web/suspend/index.html create mode 100755 install/ubuntu/14.10/templates/web/webalizer/webalizer.tpl create mode 100644 install/ubuntu/14.10/vsftpd/vsftpd.conf create mode 100644 install/ubuntu/15.04/apache2/apache2.conf create mode 100644 install/ubuntu/15.04/apache2/status.conf create mode 100644 install/ubuntu/15.04/bind/named.conf create mode 100644 install/ubuntu/15.04/clamav/clamd.conf create mode 100644 install/ubuntu/15.04/deb_signing.key create mode 100644 install/ubuntu/15.04/dovecot.tar.gz create mode 100644 install/ubuntu/15.04/dovecot/conf.d/10-auth.conf create mode 100644 install/ubuntu/15.04/dovecot/conf.d/10-logging.conf create mode 100644 install/ubuntu/15.04/dovecot/conf.d/10-mail.conf create mode 100644 install/ubuntu/15.04/dovecot/conf.d/10-master.conf create mode 100644 install/ubuntu/15.04/dovecot/conf.d/10-ssl.conf create mode 100644 install/ubuntu/15.04/dovecot/conf.d/20-imap.conf create mode 100644 install/ubuntu/15.04/dovecot/conf.d/20-pop3.conf create mode 100644 install/ubuntu/15.04/dovecot/conf.d/auth-passwdfile.conf.ext create mode 100644 install/ubuntu/15.04/dovecot/dovecot.conf create mode 100644 install/ubuntu/15.04/exim/dnsbl.conf create mode 100644 install/ubuntu/15.04/exim/exim4.conf.template create mode 100644 install/ubuntu/15.04/exim/spam-blocks.conf create mode 100644 install/ubuntu/15.04/fail2ban.tar.gz create mode 100644 install/ubuntu/15.04/fail2ban/action.d/vesta.conf create mode 100644 install/ubuntu/15.04/fail2ban/filter.d/vesta.conf create mode 100644 install/ubuntu/15.04/fail2ban/jail.local create mode 100644 install/ubuntu/15.04/firewall.tar.gz create mode 100644 install/ubuntu/15.04/firewall/ports.conf create mode 100644 install/ubuntu/15.04/firewall/rules.conf create mode 100644 install/ubuntu/15.04/logrotate/apache2 create mode 100644 install/ubuntu/15.04/logrotate/nginx create mode 100644 install/ubuntu/15.04/logrotate/vesta create mode 100644 install/ubuntu/15.04/mysql/my-large.cnf create mode 100644 install/ubuntu/15.04/mysql/my-medium.cnf create mode 100644 install/ubuntu/15.04/mysql/my-small.cnf create mode 100644 install/ubuntu/15.04/nginx/nginx.conf create mode 100644 install/ubuntu/15.04/nginx/phpmyadmin.inc create mode 100644 install/ubuntu/15.04/nginx/phppgadmin.inc create mode 100644 install/ubuntu/15.04/nginx/status.conf create mode 100644 install/ubuntu/15.04/nginx/webmail.inc create mode 100644 install/ubuntu/15.04/packages.tar.gz create mode 100644 install/ubuntu/15.04/packages/default.pkg create mode 100644 install/ubuntu/15.04/packages/gainsboro.pkg create mode 100644 install/ubuntu/15.04/packages/palegreen.pkg create mode 100644 install/ubuntu/15.04/packages/slategrey.pkg create mode 100644 install/ubuntu/15.04/pga/config.inc.php create mode 100644 install/ubuntu/15.04/pga/phppgadmin.conf create mode 100644 install/ubuntu/15.04/php5-fpm/www.conf create mode 100644 install/ubuntu/15.04/pma/apache.conf create mode 100644 install/ubuntu/15.04/pma/config.inc.php create mode 100644 install/ubuntu/15.04/postgresql/pg_hba.conf create mode 100644 install/ubuntu/15.04/proftpd/proftpd.conf create mode 100644 install/ubuntu/15.04/roundcube/apache.conf create mode 100644 install/ubuntu/15.04/roundcube/config.inc.php create mode 100644 install/ubuntu/15.04/roundcube/db.inc.php create mode 100644 install/ubuntu/15.04/roundcube/main.inc.php create mode 100644 install/ubuntu/15.04/roundcube/vesta.php create mode 100644 install/ubuntu/15.04/sudo/admin create mode 100644 install/ubuntu/15.04/templates.tar.gz create mode 100755 install/ubuntu/15.04/templates/dns/child-ns.tpl rename install/ubuntu/{ => 15.04}/templates/dns/default.tpl (100%) create mode 100755 install/ubuntu/15.04/templates/dns/gmail.tpl create mode 100755 install/ubuntu/15.04/templates/web/apache2/basedir.stpl create mode 100755 install/ubuntu/15.04/templates/web/apache2/basedir.tpl create mode 100755 install/ubuntu/15.04/templates/web/apache2/default.stpl create mode 100755 install/ubuntu/15.04/templates/web/apache2/default.tpl create mode 100755 install/ubuntu/15.04/templates/web/apache2/hosting.stpl create mode 100755 install/ubuntu/15.04/templates/web/apache2/hosting.tpl create mode 100755 install/ubuntu/15.04/templates/web/apache2/phpcgi.sh create mode 100755 install/ubuntu/15.04/templates/web/apache2/phpcgi.stpl create mode 100755 install/ubuntu/15.04/templates/web/apache2/phpcgi.tpl create mode 100755 install/ubuntu/15.04/templates/web/apache2/phpfcgid.sh create mode 100755 install/ubuntu/15.04/templates/web/apache2/phpfcgid.stpl create mode 100755 install/ubuntu/15.04/templates/web/apache2/phpfcgid.tpl create mode 100755 install/ubuntu/15.04/templates/web/awstats/awstats.tpl create mode 100755 install/ubuntu/15.04/templates/web/awstats/index.tpl create mode 100755 install/ubuntu/15.04/templates/web/awstats/nav.tpl create mode 100755 install/ubuntu/15.04/templates/web/nginx/caching.sh create mode 100755 install/ubuntu/15.04/templates/web/nginx/caching.stpl create mode 100755 install/ubuntu/15.04/templates/web/nginx/caching.tpl create mode 100755 install/ubuntu/15.04/templates/web/nginx/default.stpl create mode 100755 install/ubuntu/15.04/templates/web/nginx/default.tpl create mode 100755 install/ubuntu/15.04/templates/web/nginx/hosting.sh create mode 100755 install/ubuntu/15.04/templates/web/nginx/hosting.stpl create mode 100755 install/ubuntu/15.04/templates/web/nginx/hosting.tpl create mode 100644 install/ubuntu/15.04/templates/web/nginx/php5-fpm/cms_made_simple.stpl create mode 100644 install/ubuntu/15.04/templates/web/nginx/php5-fpm/cms_made_simple.tpl create mode 100644 install/ubuntu/15.04/templates/web/nginx/php5-fpm/codeigniter2.stpl create mode 100644 install/ubuntu/15.04/templates/web/nginx/php5-fpm/codeigniter2.tpl create mode 100644 install/ubuntu/15.04/templates/web/nginx/php5-fpm/codeigniter3.stpl create mode 100644 install/ubuntu/15.04/templates/web/nginx/php5-fpm/codeigniter3.tpl create mode 100644 install/ubuntu/15.04/templates/web/nginx/php5-fpm/datalife_engine.stpl create mode 100644 install/ubuntu/15.04/templates/web/nginx/php5-fpm/datalife_engine.tpl create mode 100644 install/ubuntu/15.04/templates/web/nginx/php5-fpm/default.stpl create mode 100644 install/ubuntu/15.04/templates/web/nginx/php5-fpm/default.tpl create mode 100644 install/ubuntu/15.04/templates/web/nginx/php5-fpm/dokuwiki.stpl create mode 100644 install/ubuntu/15.04/templates/web/nginx/php5-fpm/dokuwiki.tpl create mode 100644 install/ubuntu/15.04/templates/web/nginx/php5-fpm/drupal.stpl create mode 100644 install/ubuntu/15.04/templates/web/nginx/php5-fpm/drupal.tpl create mode 100644 install/ubuntu/15.04/templates/web/nginx/php5-fpm/joomla.stpl create mode 100644 install/ubuntu/15.04/templates/web/nginx/php5-fpm/joomla.tpl create mode 100644 install/ubuntu/15.04/templates/web/nginx/php5-fpm/owncloud.stpl create mode 100644 install/ubuntu/15.04/templates/web/nginx/php5-fpm/owncloud.tpl create mode 100644 install/ubuntu/15.04/templates/web/nginx/php5-fpm/piwik.stpl create mode 100644 install/ubuntu/15.04/templates/web/nginx/php5-fpm/piwik.tpl create mode 100644 install/ubuntu/15.04/templates/web/nginx/php5-fpm/pyrocms.stpl create mode 100644 install/ubuntu/15.04/templates/web/nginx/php5-fpm/pyrocms.tpl create mode 100644 install/ubuntu/15.04/templates/web/nginx/php5-fpm/wordpress.stpl create mode 100644 install/ubuntu/15.04/templates/web/nginx/php5-fpm/wordpress.tpl create mode 100644 install/ubuntu/15.04/templates/web/nginx/php5-fpm/wordpress2.stpl create mode 100644 install/ubuntu/15.04/templates/web/nginx/php5-fpm/wordpress2.tpl create mode 100755 install/ubuntu/15.04/templates/web/nginx/proxy_ip.tpl create mode 100644 install/ubuntu/15.04/templates/web/php5-fpm/default.tpl create mode 100644 install/ubuntu/15.04/templates/web/php5-fpm/no-php.tpl create mode 100644 install/ubuntu/15.04/templates/web/php5-fpm/socket.tpl create mode 100755 install/ubuntu/15.04/templates/web/skel/document_errors/403.html create mode 100755 install/ubuntu/15.04/templates/web/skel/document_errors/404.html create mode 100755 install/ubuntu/15.04/templates/web/skel/document_errors/50x.html create mode 100755 install/ubuntu/15.04/templates/web/skel/public_html/index.html create mode 100755 install/ubuntu/15.04/templates/web/skel/public_html/robots.txt create mode 100755 install/ubuntu/15.04/templates/web/skel/public_shtml/index.html create mode 100755 install/ubuntu/15.04/templates/web/skel/public_shtml/robots.txt create mode 100755 install/ubuntu/15.04/templates/web/suspend/.htaccess create mode 100755 install/ubuntu/15.04/templates/web/suspend/index.html create mode 100755 install/ubuntu/15.04/templates/web/webalizer/webalizer.tpl create mode 100644 install/ubuntu/15.04/vsftpd/vsftpd.conf delete mode 100644 install/ubuntu/apache2.readme.txt delete mode 100644 install/ubuntu/certificate.crt delete mode 100644 install/ubuntu/certificate.key delete mode 100644 install/ubuntu/freshclam.conf delete mode 100644 install/ubuntu/nginx.readme.txt delete mode 100644 install/ubuntu/sudoers.vestacp.conf delete mode 100644 install/ubuntu/vesta.conf delete mode 100644 install/ubuntu/whmcs-module.php mode change 100644 => 100755 install/vst-install-debian.sh mode change 100644 => 100755 install/vst-install-rhel.sh mode change 100644 => 100755 install/vst-install-ubuntu.sh mode change 100644 => 100755 install/vst-install.sh diff --git a/install/debian/apache2.conf b/install/debian/7/apache2/apache2.conf similarity index 100% rename from install/debian/apache2.conf rename to install/debian/7/apache2/apache2.conf diff --git a/install/debian/apache2-status.conf b/install/debian/7/apache2/status.conf similarity index 100% rename from install/debian/apache2-status.conf rename to install/debian/7/apache2/status.conf diff --git a/install/debian/named.conf b/install/debian/7/bind/named.conf similarity index 100% rename from install/debian/named.conf rename to install/debian/7/bind/named.conf diff --git a/install/debian/clamd.conf b/install/debian/7/clamav/clamd.conf similarity index 100% rename from install/debian/clamd.conf rename to install/debian/7/clamav/clamd.conf diff --git a/install/debian/7/deb_signing.key b/install/debian/7/deb_signing.key new file mode 100644 index 000000000..2ad2db8bc --- /dev/null +++ b/install/debian/7/deb_signing.key @@ -0,0 +1,30 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.12 (GNU/Linux) + +mQENBFJIGbEBCAC8SHOOFo7iDTbnC2GhNZ+uBGCh226Dn1QPoFZNFM/DNakHZ6rD +G3wzr8++eKz4fJual/VLllE2N9XDPuxbozb3LLkcyY1WzJqtIXbXhFGQ/SuIeT+x +QY90XU6t2Ckze2c+zUniAWmJ8GSyVmXOoc9JxAQ1u47wvGXLzrjWXc8u8PNRYXuf +fZplTL+dFu9P0d6lP8FGsV+r9wXvvazpRTz3+H8PKrGCYT55ZQIEdG9Jgamylto2 +oVPFXkwGML+TLw6oeCIBuz2y2vtivphW4MJ3ifQjDj7k3n+DTIxfDFs8lB6VRhhY +2nMHCrcZC6U2mhmXmr6O4s1fu6irBVx05ejPABEBAAG0IFNlcmdoZXkgUm9kaW4g +PHNraWRAdmVzdGFjcC5jb20+iQE4BBMBAgAiBQJSSBmxAhsDBgsJCAcDAgYVCAIJ +CgsEFgIDAQIeAQIXgAAKCRBCxbITCh93FPdqB/93GjV9g+wBfeZYLHQK9MDU2wBb +VloYOJJae6IvYKYQVAJayD3PbHdpxrF8s9e23vdnmb9jKu6jX6oV54EIyqP2HPiN +QYc8wcea+eSHerznBixCtoQh8mtdWGFeN71zU/ig7L5qlOVF/EmxDVZTFUeivFxh +IV6qyBnktQKktE45585yKZyyLtfGoXA54DGK69OtJFh+wdkKEMmUXocMl7wUrxW6 +Cx2CuKeEXEgvwu8mRHQi3S3T9XP456qWEn5dWyMVcP660IzEuZfSJApZusNK7zG3 +WMy0/EuX7xHNY3mcNxTOUN1LsO7iHnhHD9+iKWJo9parGkMZzc92MpjDK/g7uQEN +BFJIGbEBCAC7k5QEA9WQM7E3ceNaeLMrA9lXfuzaNCcySq7ONdVAa5PxzbSKdHvz +QFoL1VFqBTYQ038lbil1XqnoM0zvIfAI3LcpS8sq92El/vPxp6jZh2Ari9Uw7x95 +k2cZMgI67g+zQMGdjVRA155nFQRCgg000xU4F7JA6+WsuLlVUmccsDv7YWJExMtC +YPxiuz5DFu8RALnw4Ckts+dbwsrcvUHhkm9b6RAsdCKjjRpUZjLgdltjH83gUVvt +i1YmdjjsVpt95dtsaG+ad852g/Rk8EdxNMkjPF6HLA67CLADP9wYaj80yPcPtylS +ycvPtcclVeHkFBRVM8xZpQd4iD19MWI1ABEBAAGJAR8EGAECAAkFAlJIGbECGwwA +CgkQQsWyEwofdxQ7tQgAhB0FwTs7L8Qr63DHC2yAnXVxgtTAY1/36CccNXVculyR ++EkLcwahms9AKhz7eQb+Mud+5vH0GRohLp2npgO38CjVUfIP5d+Y6dsthmrkF6p8 +XdV1dVK9vWX+i/YZSw/Mded30Cq4P2Yhq9EaemMT0rtli8lz2NnkZ9dFJZk1lzJC +CZmRpbjSNWqRU4f7qyh21lYk/OC/0XE8fh8CaO23TZ+6gBionoCztwb7NyC9OArN +qYlNnbmh9iNqdblykPS3bkjf34n2xyMgnIehNrM89tk8PY4UfNPhgT1TMD9W3Svq +ynNZvLuF/FIDwDeC1qcfjGbfDn9fXO/lMIIRooQYKQ== +=J2HJ +-----END PGP PUBLIC KEY BLOCK----- diff --git a/install/debian/7/dovecot.tar.gz b/install/debian/7/dovecot.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..bfabaa030981d087ea4ccd8c7b86cc4d7ab1b7c6 GIT binary patch literal 3487 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 N{0}P55eWcL004dY&`|&Y literal 0 HcmV?d00001 diff --git a/install/debian/dovecot/conf.d/10-auth.conf b/install/debian/7/dovecot/conf.d/10-auth.conf similarity index 100% rename from install/debian/dovecot/conf.d/10-auth.conf rename to install/debian/7/dovecot/conf.d/10-auth.conf diff --git a/install/debian/dovecot/conf.d/10-logging.conf b/install/debian/7/dovecot/conf.d/10-logging.conf similarity index 100% rename from install/debian/dovecot/conf.d/10-logging.conf rename to install/debian/7/dovecot/conf.d/10-logging.conf diff --git a/install/debian/dovecot/conf.d/10-mail.conf b/install/debian/7/dovecot/conf.d/10-mail.conf similarity index 100% rename from install/debian/dovecot/conf.d/10-mail.conf rename to install/debian/7/dovecot/conf.d/10-mail.conf diff --git a/install/debian/dovecot/conf.d/10-master.conf b/install/debian/7/dovecot/conf.d/10-master.conf similarity index 100% rename from install/debian/dovecot/conf.d/10-master.conf rename to install/debian/7/dovecot/conf.d/10-master.conf diff --git a/install/debian/dovecot/conf.d/10-ssl.conf b/install/debian/7/dovecot/conf.d/10-ssl.conf similarity index 100% rename from install/debian/dovecot/conf.d/10-ssl.conf rename to install/debian/7/dovecot/conf.d/10-ssl.conf diff --git a/install/debian/dovecot/conf.d/20-imap.conf b/install/debian/7/dovecot/conf.d/20-imap.conf similarity index 100% rename from install/debian/dovecot/conf.d/20-imap.conf rename to install/debian/7/dovecot/conf.d/20-imap.conf diff --git a/install/debian/dovecot/conf.d/20-pop3.conf b/install/debian/7/dovecot/conf.d/20-pop3.conf similarity index 100% rename from install/debian/dovecot/conf.d/20-pop3.conf rename to install/debian/7/dovecot/conf.d/20-pop3.conf diff --git a/install/debian/dovecot/conf.d/auth-passwdfile.conf.ext b/install/debian/7/dovecot/conf.d/auth-passwdfile.conf.ext similarity index 100% rename from install/debian/dovecot/conf.d/auth-passwdfile.conf.ext rename to install/debian/7/dovecot/conf.d/auth-passwdfile.conf.ext diff --git a/install/ubuntu/dovecot.conf b/install/debian/7/dovecot/dovecot.conf similarity index 100% rename from install/ubuntu/dovecot.conf rename to install/debian/7/dovecot/dovecot.conf diff --git a/install/debian/dnsbl.conf b/install/debian/7/exim/dnsbl.conf similarity index 100% rename from install/debian/dnsbl.conf rename to install/debian/7/exim/dnsbl.conf diff --git a/install/debian/exim4.conf.template b/install/debian/7/exim/exim4.conf.template similarity index 99% rename from install/debian/exim4.conf.template rename to install/debian/7/exim/exim4.conf.template index 64cd03fca..742f0409e 100644 --- a/install/debian/exim4.conf.template +++ b/install/debian/7/exim/exim4.conf.template @@ -108,7 +108,7 @@ acl_check_rcpt: require message = relay not permitted domains = +local_domains : +relay_to_domains - deny message = smtp auth required + deny message = smtp auth requried sender_domains = +local_domains !authenticated = * diff --git a/install/debian/spam-blocks.conf b/install/debian/7/exim/spam-blocks.conf similarity index 100% rename from install/debian/spam-blocks.conf rename to install/debian/7/exim/spam-blocks.conf diff --git a/install/debian/7/fail2ban.tar.gz b/install/debian/7/fail2ban.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..628545b6b12d83a4dfcf4529b41f62792c228c85 GIT binary patch literal 721 zcmV;?0xta@iwFR?P)1Y$1MQbhZ{jczhB^CJjMPJ=l>#Ira4D7AZL1=&Z6#&~ zz`KruB3xbg09_DCMo>VRAaZ-;y)^U@ z_5_W1em^5}=Uk3M(j5%0M~Fp}7>lVIYRqubkoOIoiK#qP6BOckLPYW;2OWgmSsIAg zuZ|mFmaYUYjJJfo8s1fhF1)IOlQ|75La(j33(9U0btUMJvtIut>QYeUVmCrexr&Qi zKbjFQ61zkzP2U-?^r{!(!l(3+?Yga{u}aaFy}dZE-rC%=GOfyYm&N9W)k}T291PDY z*P0t`IZ}uIjJ_-j{V$SH_dlT#cu)PeEcx8DI+m&H|328vfBu=(y@&@N72}Qi-)t}U ze|i14JEpGxd*KMK)CoAp98}8bBuj9v%2KQe1W{6IHF7UVKsi-oBUDPa+B%^mI!l#A z%iggR=`rPvnSp)Z2xvn7V8#q@Dyt%#D2+c|xJU7JZ=WzC$g2~0Q{w%WGdx!uFgO@} z=-u4i58*FN5)y;)2*=Nd+$g+V_$fxmCp11?eTVGz8P->^KFOi;zxe)( z;(T!ZH#>H&|F+iuy|9`8{p-KwZ0f&dYyIB`OZs27=SuT4o@Sm$(ja3D9@K#V)prvv zs8^H+ECdN-k)k768hSV1`}Y@@gAp1N=}x2^dQlk4c0wJawc4RhTtX&fF0G*c4Nk6a z2g6fPkL6zl5rJ&(DMxg| +actionstop = /usr/local/vesta/bin/v-delete-firewall-chain +actioncheck = iptables -n -L INPUT | grep -q 'fail2ban-[ \t]' +actionban = /usr/local/vesta/bin/v-add-firewall-ban +actionunban = /usr/local/vesta/bin/v-delete-firewall-ban diff --git a/install/debian/fail2ban.filter.conf b/install/debian/7/fail2ban/filter.d/vesta.conf similarity index 100% rename from install/debian/fail2ban.filter.conf rename to install/debian/7/fail2ban/filter.d/vesta.conf diff --git a/install/debian/7/fail2ban/jail.local b/install/debian/7/fail2ban/jail.local new file mode 100644 index 000000000..eccea0685 --- /dev/null +++ b/install/debian/7/fail2ban/jail.local @@ -0,0 +1,39 @@ +[ssh-iptables] +enabled = true +filter = sshd +action = vesta[name=SSH] +logpath = /var/log/auth.log +maxretry = 5 + +[vsftpd-iptables] +enabled = false +filter = vsftpd +action = vesta[name=FTP] +logpath = /var/log/vsftpd.log +maxretry = 5 + +[exim-iptables] +enabled = true +filter = exim +action = vesta[name=MAIL] +logpath = /var/log/exim4/mainlog + +[dovecot-iptables] +enabled = true +filter = dovecot +action = vesta[name=MAIL] +logpath = /var/log/dovecot.log + +[mysqld-iptables] +enabled = false +filter = mysqld-auth +action = vesta[name=DB] +logpath = /var/log/mysql.log +maxretry = 5 + +[vesta-iptables] +enabled = true +filter = vesta +action = vesta[name=VESTA] +logpath = /var/log/vesta/auth.log +maxretry = 5 diff --git a/install/debian/7/firewall.tar.gz b/install/debian/7/firewall.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..e8556008077364323d7d6b6934e7a2cf7a734983 GIT binary patch literal 540 zcmV+%0^|K3iwFQ5XyQ}=1MQVdkJ>O4Mzij(@XnhsKo&*MSlh#7(1g=&0&FEG%?Me6ampuO4>y-_`!)kpP&FT0Pj|*j)GSV93 zG0u%P9?@5H>Ue&9TJ8w(mS4U;YbU>kw!5dto6pc!`1H`piz?!Qs? zZ2zTY(j)A}O)l`C?|(Hfn=&r%X0(YbN~&_+%&1`W&E*1z3IZzVUki(*D`*Kk5kQkG z1wFz!17_g@d9ch)G0;wCGL8I9sNtr~X-yEB=^d3PuoC0XT$oBik3eT~aJ zPYYM7vf@1@^`frQB1w}O-E1jovb=r04Y>?eKuHocY1?18ny~4FyPO>aM4!NUUOmFePy(-1M3SddTi>v8NVjB&*t=IgAYbgkDfmmx*FWy-yM^~-2uA1 z`-8QZ4$iCJUfZClsXi!k+gGp^gsj(jT}WJxQ(W4?Rswg^FKlTCd%;5d=XH e1VIo4K@bE%5ClOG1VIqwGCu%8Tmj4gC;$K)2?m1z literal 0 HcmV?d00001 diff --git a/install/debian/firewall/ports.conf b/install/debian/7/firewall/ports.conf similarity index 93% rename from install/debian/firewall/ports.conf rename to install/debian/7/firewall/ports.conf index e970f91de..a6ef4dae5 100644 --- a/install/debian/firewall/ports.conf +++ b/install/debian/7/firewall/ports.conf @@ -11,6 +11,6 @@ PROTOCOL='TCP' PORT='143' PROTOCOL='TCP' PORT='3306' PROTOCOL='TCP' PORT='5432' PROTOCOL='TCP' PORT='8080' -PROTOCOL='TCP' PORT='8443' +PROTOCOL='TCP' PORT='8433' PROTOCOL='TCP' PORT='8083' PROTOCOL='TCP' PORT='12000:12100' diff --git a/install/debian/firewall/rules.conf b/install/debian/7/firewall/rules.conf similarity index 89% rename from install/debian/firewall/rules.conf rename to install/debian/7/firewall/rules.conf index 60136e1a5..956c2e1d9 100644 --- a/install/debian/firewall/rules.conf +++ b/install/debian/7/firewall/rules.conf @@ -1,6 +1,6 @@ RULE='1' ACTION='ACCEPT' PROTOCOL='ICMP' PORT='0' IP='0.0.0.0/0' COMMENT='PING' SUSPENDED='no' TIME='17:13:48' DATE='2014-09-16' RULE='2' ACTION='ACCEPT' PROTOCOL='TCP' PORT='8083' IP='0.0.0.0/0' COMMENT='VESTA' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' -RULE='3' ACTION='ACCEPT' PROTOCOL='TCP' PORT='3306,5432' IP='127.0.0.1/32' COMMENT='DB' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' +RULE='3' ACTION='ACCEPT' PROTOCOL='TCP' PORT='3306,5432' IP='0.0.0.0/0' COMMENT='DB' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' RULE='4' ACTION='ACCEPT' PROTOCOL='TCP' PORT='143,993' IP='0.0.0.0/0' COMMENT='IMAP' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' RULE='5' ACTION='ACCEPT' PROTOCOL='TCP' PORT='110,995' IP='0.0.0.0/0' COMMENT='POP3' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' RULE='6' ACTION='ACCEPT' PROTOCOL='TCP' PORT='25,465,587,2525' IP='0.0.0.0/0' COMMENT='SMTP' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' diff --git a/install/debian/apache2.log b/install/debian/7/logrotate/apache2 similarity index 100% rename from install/debian/apache2.log rename to install/debian/7/logrotate/apache2 diff --git a/install/debian/7/logrotate/nginx b/install/debian/7/logrotate/nginx new file mode 100644 index 000000000..d667f2135 --- /dev/null +++ b/install/debian/7/logrotate/nginx @@ -0,0 +1,13 @@ +/var/log/nginx/*log /var/log/nginx/domains/*log { + daily + missingok + rotate 52 + compress + delaycompress + notifempty + create 640 nginx adm + sharedscripts + postrotate + [ -f /var/run/nginx.pid ] && kill -USR1 `cat /var/run/nginx.pid` + endscript +} diff --git a/install/debian/vesta.log b/install/debian/7/logrotate/vesta similarity index 100% rename from install/debian/vesta.log rename to install/debian/7/logrotate/vesta diff --git a/install/debian/7/mysql/my-large.cnf b/install/debian/7/mysql/my-large.cnf new file mode 100644 index 000000000..d0bab3907 --- /dev/null +++ b/install/debian/7/mysql/my-large.cnf @@ -0,0 +1,42 @@ +[client] +port=3306 +socket=/var/run/mysqld/mysqld.sock + +[mysqld_safe] +socket=/var/run/mysqld/mysqld.sock + +[mysqld] +user=mysql +pid-file=/var/run/mysqld/mysqld.pid +socket=/var/run/mysqld/mysqld.sock +port=3306 +basedir=/usr +datadir=/var/lib/mysql +tmpdir=/tmp +lc-messages-dir=/usr/share/mysql +log_error=/var/log/mysql/error.log + +symbolic-links=0 + +skip-external-locking +key_buffer_size = 256M +max_allowed_packet = 32M +table_open_cache = 256 +sort_buffer_size = 1M +read_buffer_size = 1M +read_rnd_buffer_size = 4M +myisam_sort_buffer_size = 64M +thread_cache_size = 8 +query_cache_size= 16M +thread_concurrency = 8 + +#innodb_use_native_aio = 0 +innodb_file_per_table + +max_connections=200 +max_user_connections=50 +wait_timeout=10 +interactive_timeout=50 +long_query_time=5 + +!includedir /etc/mysql/conf.d/ diff --git a/install/ubuntu/my.cnf b/install/debian/7/mysql/my-medium.cnf similarity index 59% rename from install/ubuntu/my.cnf rename to install/debian/7/mysql/my-medium.cnf index 1b5ff1d24..1c10ab9a6 100644 --- a/install/ubuntu/my.cnf +++ b/install/debian/7/mysql/my-medium.cnf @@ -15,11 +15,26 @@ datadir=/var/lib/mysql tmpdir=/tmp lc-messages-dir=/usr/share/mysql log_error=/var/log/mysql/error.log -max_connections=200 -max_user_connections=30 -wait_timeout=30 -interactive_timeout=50 -long_query_time=5 + +symbolic-links=0 + +skip-external-locking +key_buffer_size = 16M +max_allowed_packet = 16M +table_open_cache = 64 +sort_buffer_size = 512K +net_buffer_length = 8K +read_buffer_size = 256K +read_rnd_buffer_size = 512K +myisam_sort_buffer_size = 8M + +#innodb_use_native_aio = 0 innodb_file_per_table +max_connections=70 +max_user_connections=30 +wait_timeout=10 +interactive_timeout=50 +long_query_time=5 + !includedir /etc/mysql/conf.d/ diff --git a/install/debian/7/mysql/my-small.cnf b/install/debian/7/mysql/my-small.cnf new file mode 100644 index 000000000..26a804781 --- /dev/null +++ b/install/debian/7/mysql/my-small.cnf @@ -0,0 +1,40 @@ +[client] +port=3306 +socket=/var/run/mysqld/mysqld.sock + +[mysqld_safe] +socket=/var/run/mysqld/mysqld.sock + +[mysqld] +user=mysql +pid-file=/var/run/mysqld/mysqld.pid +socket=/var/run/mysqld/mysqld.sock +port=3306 +basedir=/usr +datadir=/var/lib/mysql +tmpdir=/tmp +lc-messages-dir=/usr/share/mysql +log_error=/var/log/mysql/error.log + +symbolic-links=0 + +skip-external-locking +key_buffer_size = 16K +max_allowed_packet = 1M +table_open_cache = 4 +sort_buffer_size = 64K +read_buffer_size = 256K +read_rnd_buffer_size = 256K +net_buffer_length = 2K +thread_stack = 240K + +#innodb_use_native_aio = 0 +innodb_file_per_table + +max_connections=30 +max_user_connections=20 +wait_timeout=10 +interactive_timeout=50 +long_query_time=5 + +!includedir /etc/mysql/conf.d/ diff --git a/install/debian/nginx.conf b/install/debian/7/nginx/nginx.conf similarity index 100% rename from install/debian/nginx.conf rename to install/debian/7/nginx/nginx.conf diff --git a/install/debian/7/nginx/phpmyadmin.inc b/install/debian/7/nginx/phpmyadmin.inc new file mode 100644 index 000000000..d70ca3e3c --- /dev/null +++ b/install/debian/7/nginx/phpmyadmin.inc @@ -0,0 +1,15 @@ +location /phpmyadmin { + alias /usr/share/phpmyadmin/; + + location ~ /(libraries|setup) { + return 404; + } + + location ~ ^/phpmyadmin/(.*\.php)$ { + alias /usr/share/phpmyadmin/$1; + fastcgi_pass 127.0.0.1:9000; + fastcgi_index index.php; + include fastcgi_params; + fastcgi_param SCRIPT_FILENAME $request_filename; + } +} diff --git a/install/debian/7/nginx/phppgadmin.inc b/install/debian/7/nginx/phppgadmin.inc new file mode 100644 index 000000000..cd1e5806b --- /dev/null +++ b/install/debian/7/nginx/phppgadmin.inc @@ -0,0 +1,11 @@ +location /phppgadmin { + alias /usr/share/phppgadmin/; + + location ~ ^/phppgadmin/(.*\.php)$ { + alias /usr/share/phppgadmin/$1; + fastcgi_pass 127.0.0.1:9000; + fastcgi_index index.php; + include fastcgi_params; + fastcgi_param SCRIPT_FILENAME $request_filename; + } +} diff --git a/install/debian/nginx-status.conf b/install/debian/7/nginx/status.conf similarity index 100% rename from install/debian/nginx-status.conf rename to install/debian/7/nginx/status.conf diff --git a/install/debian/7/nginx/webmail.inc b/install/debian/7/nginx/webmail.inc new file mode 100644 index 000000000..ad66895bc --- /dev/null +++ b/install/debian/7/nginx/webmail.inc @@ -0,0 +1,15 @@ +location /webmail { + alias /var/lib/roundcube/; + + location ~ /(config|temp|logs) { + return 404; + } + + location ~ ^/webmail/(.*\.php)$ { + alias /var/lib/roundcube/$1; + fastcgi_pass 127.0.0.1:9000; + fastcgi_index index.php; + include fastcgi_params; + fastcgi_param SCRIPT_FILENAME $request_filename; + } +} diff --git a/install/debian/7/packages.tar.gz b/install/debian/7/packages.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..4b778dadce20a61f03a8ca920ec81c55a8730fee GIT binary patch literal 562 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 AllowOverride All diff --git a/install/ubuntu/templates/web/apache2/basedir.tpl b/install/debian/7/templates/web/apache2/basedir.tpl similarity index 84% rename from install/ubuntu/templates/web/apache2/basedir.tpl rename to install/debian/7/templates/web/apache2/basedir.tpl index c24b12796..07ec38c98 100755 --- a/install/ubuntu/templates/web/apache2/basedir.tpl +++ b/install/debian/7/templates/web/apache2/basedir.tpl @@ -14,9 +14,7 @@ AllowOverride All Options +Includes -Indexes +ExecCGI - php_admin_value open_basedir %docroot%:%home%/%user%/tmp - php_admin_value upload_tmp_dir %home%/%user%/tmp - php_admin_value session.save_path %home%/%user%/tmp + php_admin_value open_basedir %docroot% AllowOverride All diff --git a/install/debian/templates/web/apache2/default.stpl b/install/debian/7/templates/web/apache2/default.stpl similarity index 100% rename from install/debian/templates/web/apache2/default.stpl rename to install/debian/7/templates/web/apache2/default.stpl diff --git a/install/debian/templates/web/apache2/default.tpl b/install/debian/7/templates/web/apache2/default.tpl similarity index 100% rename from install/debian/templates/web/apache2/default.tpl rename to install/debian/7/templates/web/apache2/default.tpl diff --git a/install/debian/templates/web/apache2/hosting.stpl b/install/debian/7/templates/web/apache2/hosting.stpl similarity index 100% rename from install/debian/templates/web/apache2/hosting.stpl rename to install/debian/7/templates/web/apache2/hosting.stpl diff --git a/install/debian/templates/web/apache2/hosting.tpl b/install/debian/7/templates/web/apache2/hosting.tpl similarity index 100% rename from install/debian/templates/web/apache2/hosting.tpl rename to install/debian/7/templates/web/apache2/hosting.tpl diff --git a/install/debian/templates/web/apache2/phpcgi.sh b/install/debian/7/templates/web/apache2/phpcgi.sh similarity index 100% rename from install/debian/templates/web/apache2/phpcgi.sh rename to install/debian/7/templates/web/apache2/phpcgi.sh diff --git a/install/debian/templates/web/apache2/phpcgi.stpl b/install/debian/7/templates/web/apache2/phpcgi.stpl similarity index 100% rename from install/debian/templates/web/apache2/phpcgi.stpl rename to install/debian/7/templates/web/apache2/phpcgi.stpl diff --git a/install/debian/templates/web/apache2/phpcgi.tpl b/install/debian/7/templates/web/apache2/phpcgi.tpl similarity index 100% rename from install/debian/templates/web/apache2/phpcgi.tpl rename to install/debian/7/templates/web/apache2/phpcgi.tpl diff --git a/install/debian/templates/web/apache2/phpfcgid.sh b/install/debian/7/templates/web/apache2/phpfcgid.sh similarity index 100% rename from install/debian/templates/web/apache2/phpfcgid.sh rename to install/debian/7/templates/web/apache2/phpfcgid.sh diff --git a/install/debian/templates/web/apache2/phpfcgid.stpl b/install/debian/7/templates/web/apache2/phpfcgid.stpl similarity index 100% rename from install/debian/templates/web/apache2/phpfcgid.stpl rename to install/debian/7/templates/web/apache2/phpfcgid.stpl diff --git a/install/debian/templates/web/apache2/phpfcgid.tpl b/install/debian/7/templates/web/apache2/phpfcgid.tpl similarity index 100% rename from install/debian/templates/web/apache2/phpfcgid.tpl rename to install/debian/7/templates/web/apache2/phpfcgid.tpl diff --git a/install/debian/templates/web/awstats/awstats.tpl b/install/debian/7/templates/web/awstats/awstats.tpl similarity index 100% rename from install/debian/templates/web/awstats/awstats.tpl rename to install/debian/7/templates/web/awstats/awstats.tpl diff --git a/install/debian/templates/web/awstats/index.tpl b/install/debian/7/templates/web/awstats/index.tpl similarity index 100% rename from install/debian/templates/web/awstats/index.tpl rename to install/debian/7/templates/web/awstats/index.tpl diff --git a/install/debian/templates/web/awstats/nav.tpl b/install/debian/7/templates/web/awstats/nav.tpl similarity index 100% rename from install/debian/templates/web/awstats/nav.tpl rename to install/debian/7/templates/web/awstats/nav.tpl diff --git a/install/debian/templates/web/nginx/caching.stpl b/install/debian/7/templates/web/nginx/caching.stpl similarity index 100% rename from install/debian/templates/web/nginx/caching.stpl rename to install/debian/7/templates/web/nginx/caching.stpl diff --git a/install/debian/templates/web/nginx/caching.tpl b/install/debian/7/templates/web/nginx/caching.tpl similarity index 100% rename from install/debian/templates/web/nginx/caching.tpl rename to install/debian/7/templates/web/nginx/caching.tpl diff --git a/install/debian/templates/web/nginx/default.stpl b/install/debian/7/templates/web/nginx/default.stpl similarity index 100% rename from install/debian/templates/web/nginx/default.stpl rename to install/debian/7/templates/web/nginx/default.stpl diff --git a/install/debian/templates/web/nginx/default.tpl b/install/debian/7/templates/web/nginx/default.tpl similarity index 100% rename from install/debian/templates/web/nginx/default.tpl rename to install/debian/7/templates/web/nginx/default.tpl diff --git a/install/debian/templates/web/nginx/hosting.sh b/install/debian/7/templates/web/nginx/hosting.sh similarity index 100% rename from install/debian/templates/web/nginx/hosting.sh rename to install/debian/7/templates/web/nginx/hosting.sh diff --git a/install/debian/templates/web/nginx/hosting.stpl b/install/debian/7/templates/web/nginx/hosting.stpl similarity index 100% rename from install/debian/templates/web/nginx/hosting.stpl rename to install/debian/7/templates/web/nginx/hosting.stpl diff --git a/install/debian/templates/web/nginx/hosting.tpl b/install/debian/7/templates/web/nginx/hosting.tpl similarity index 100% rename from install/debian/templates/web/nginx/hosting.tpl rename to install/debian/7/templates/web/nginx/hosting.tpl diff --git a/install/debian/7/templates/web/nginx/php5-fpm/cms_made_simple.stpl b/install/debian/7/templates/web/nginx/php5-fpm/cms_made_simple.stpl new file mode 100644 index 000000000..01d82b603 --- /dev/null +++ b/install/debian/7/templates/web/nginx/php5-fpm/cms_made_simple.stpl @@ -0,0 +1,51 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + try_files $uri $uri/ /index.php?page=$request_uri; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/debian/7/templates/web/nginx/php5-fpm/cms_made_simple.tpl b/install/debian/7/templates/web/nginx/php5-fpm/cms_made_simple.tpl new file mode 100644 index 000000000..af452d19f --- /dev/null +++ b/install/debian/7/templates/web/nginx/php5-fpm/cms_made_simple.tpl @@ -0,0 +1,47 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + try_files $uri $uri/ /index.php?page=$request_uri; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/debian/7/templates/web/nginx/php5-fpm/codeigniter2.stpl b/install/debian/7/templates/web/nginx/php5-fpm/codeigniter2.stpl new file mode 100644 index 000000000..a592a652d --- /dev/null +++ b/install/debian/7/templates/web/nginx/php5-fpm/codeigniter2.stpl @@ -0,0 +1,56 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + try_files $uri $uri/ /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location = /index.php { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME /var/www/html/ci$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + location ~ \.php$ { + return 444; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/debian/7/templates/web/nginx/php5-fpm/codeigniter2.tpl b/install/debian/7/templates/web/nginx/php5-fpm/codeigniter2.tpl new file mode 100644 index 000000000..9b955aa6a --- /dev/null +++ b/install/debian/7/templates/web/nginx/php5-fpm/codeigniter2.tpl @@ -0,0 +1,52 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + try_files $uri $uri/ /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location = /index.php { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME /var/www/html/ci$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + location ~ \.php$ { + return 444; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/debian/7/templates/web/nginx/php5-fpm/codeigniter3.stpl b/install/debian/7/templates/web/nginx/php5-fpm/codeigniter3.stpl new file mode 100644 index 000000000..4d330d34f --- /dev/null +++ b/install/debian/7/templates/web/nginx/php5-fpm/codeigniter3.stpl @@ -0,0 +1,51 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + try_files $uri $uri/ /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/debian/7/templates/web/nginx/php5-fpm/codeigniter3.tpl b/install/debian/7/templates/web/nginx/php5-fpm/codeigniter3.tpl new file mode 100644 index 000000000..1f446e5d3 --- /dev/null +++ b/install/debian/7/templates/web/nginx/php5-fpm/codeigniter3.tpl @@ -0,0 +1,47 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + try_files $uri $uri/ /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/debian/7/templates/web/nginx/php5-fpm/datalife_engine.stpl b/install/debian/7/templates/web/nginx/php5-fpm/datalife_engine.stpl new file mode 100644 index 000000000..d1b5bcd24 --- /dev/null +++ b/install/debian/7/templates/web/nginx/php5-fpm/datalife_engine.stpl @@ -0,0 +1,122 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + rewrite "^/page/([0-9]+)(/?)$" /index.php?cstart=$1 last; + + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page,([0-9]+),([0-9]+),(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&cstart=$5&news_name=$6&seourl=$6 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page,([0-9]+),(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&news_name=$5&seourl=$5 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/print:page,([0-9]+),(.*).html(/?)+$" /engine/print.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&news_name=$5&seourl=$5 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_name=$4&seourl=$4 last; + + rewrite "^/([^.]+)/page,([0-9]+),([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$4&news_page=$2&cstart=$3&seourl=$5&seocat=$1 last; + rewrite "^/([^.]+)/page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$3&news_page=$2&seourl=$4&seocat=$1 last; + rewrite "^/([^.]+)/print:page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /engine/print.php?news_page=$2&newsid=$3&seourl=$4&seocat=$1 last; + rewrite "^/([^.]+)/([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$2&seourl=$3&seocat=$1 last; + + rewrite "^/page,([0-9]+),([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$3&news_page=$1&cstart=$2&seourl=$4 last; + rewrite "^/page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$2&news_page=$1&seourl=$3 last; + rewrite "^/print:page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /engine/print.php?news_page=$1&newsid=$2&seourl=$3 last; + rewrite "^/([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$1&seourl=$2 last; + + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})(/?)+$" /index.php?year=$1&month=$2&day=$3 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page/([0-9]+)(/?)+$" /index.php?year=$1&month=$2&day=$3&cstart=$4 last; + + rewrite "^/([0-9]{4})/([0-9]{2})(/?)+$" /index.php?year=$1&month=$2 last; + rewrite "^/([0-9]{4})/([0-9]{2})/page/([0-9]+)(/?)+$" /index.php?year=$1&month=$2&cstart=$3 last; + + rewrite "^/([0-9]{4})(/?)+$" /index.php?year=$1 last; + rewrite "^/([0-9]{4})/page/([0-9]+)(/?)+$" /index.php?year=$1&cstart=$2 last; + + rewrite "^/tags/([^/]*)(/?)+$" /index.php?do=tags&tag=$1 last; + rewrite "^/tags/([^/]*)/page/([0-9]+)(/?)+$" /index.php?do=tags&tag=$1&cstart=$2 last; + + rewrite "^/xfsearch/([^/]*)(/?)+$" /index.php?do=xfsearch&xf=$1 last; + rewrite "^/xfsearch/([^/]*)/page/([0-9]+)(/?)+$" /index.php?do=xfsearch&xf=$1&cstart=$2 last; + + rewrite "^/user/([^/]*)/rss.xml$" /engine/rss.php?subaction=allnews&user=$1 last; + rewrite "^/user/([^/]*)(/?)+$" /index.php?subaction=userinfo&user=$1 last; + rewrite "^/user/([^/]*)/page/([0-9]+)(/?)+$" /index.php?subaction=userinfo&user=$1&cstart=$2 last; + rewrite "^/user/([^/]*)/news(/?)+$" /index.php?subaction=allnews&user=$1 last; + rewrite "^/user/([^/]*)/news/page/([0-9]+)(/?)+$" /index.php?subaction=allnews&user=$1&cstart=$2 last; + rewrite "^/user/([^/]*)/news/rss.xml(/?)+$" /engine/rss.php?subaction=allnews&user=$1 last; + + rewrite "^/lastnews(/?)+$" /index.php?do=lastnews last; + rewrite "^/lastnews/page/([0-9]+)(/?)+$" /index.php?do=lastnews&cstart=$1 last; + + rewrite "^/catalog/([^/]*)/rss.xml$" /engine/rss.php?catalog=$1 last; + rewrite "^/catalog/([^/]*)(/?)+$" /index.php?catalog=$1 last; + rewrite "^/catalog/([^/]*)/page/([0-9]+)(/?)+$" /index.php?catalog=$1&cstart=$2 last; + + rewrite "^/newposts(/?)+$" /index.php?subaction=newposts last; + rewrite "^/newposts/page/([0-9]+)(/?)+$" /index.php?subaction=newposts&cstart=$1 last; + + rewrite "^/favorites(/?)+$" /index.php?do=favorites last; + rewrite "^/favorites/page/([0-9]+)(/?)+$" /index.php?do=favorites&cstart=$1 last; + + rewrite "^/rules.html$" /index.php?do=rules last; + rewrite "^/statistics.html$" /index.php?do=stats last; + rewrite "^/addnews.html$" /index.php?do=addnews last; + rewrite "^/rss.xml$" /engine/rss.php last; + rewrite "^/sitemap.xml$" /uploads/sitemap.xml last; + + if (!-d $request_filename) { + rewrite "^/([^.]+)/page/([0-9]+)(/?)+$" /index.php?do=cat&category=$1&cstart=$2 last; + rewrite "^/([^.]+)/?$" /index.php?do=cat&category=$1 last; + } + + if (!-f $request_filename) { + rewrite "^/([^.]+)/rss.xml$" /engine/rss.php?do=cat&category=$1 last; + rewrite "^/page,([0-9]+),([^/]+).html$" /index.php?do=static&page=$2&news_page=$1 last; + rewrite "^/print:([^/]+).html$" /engine/print.php?do=static&page=$1 last; + } + + if (!-f $request_filename) { + rewrite "^/([^/]+).html$" /index.php?do=static&page=$1 last; + } + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/debian/7/templates/web/nginx/php5-fpm/datalife_engine.tpl b/install/debian/7/templates/web/nginx/php5-fpm/datalife_engine.tpl new file mode 100644 index 000000000..ff33c2325 --- /dev/null +++ b/install/debian/7/templates/web/nginx/php5-fpm/datalife_engine.tpl @@ -0,0 +1,118 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + rewrite "^/page/([0-9]+)(/?)$" /index.php?cstart=$1 last; + + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page,([0-9]+),([0-9]+),(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&cstart=$5&news_name=$6&seourl=$6 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page,([0-9]+),(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&news_name=$5&seourl=$5 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/print:page,([0-9]+),(.*).html(/?)+$" /engine/print.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&news_name=$5&seourl=$5 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_name=$4&seourl=$4 last; + + rewrite "^/([^.]+)/page,([0-9]+),([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$4&news_page=$2&cstart=$3&seourl=$5&seocat=$1 last; + rewrite "^/([^.]+)/page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$3&news_page=$2&seourl=$4&seocat=$1 last; + rewrite "^/([^.]+)/print:page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /engine/print.php?news_page=$2&newsid=$3&seourl=$4&seocat=$1 last; + rewrite "^/([^.]+)/([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$2&seourl=$3&seocat=$1 last; + + rewrite "^/page,([0-9]+),([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$3&news_page=$1&cstart=$2&seourl=$4 last; + rewrite "^/page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$2&news_page=$1&seourl=$3 last; + rewrite "^/print:page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /engine/print.php?news_page=$1&newsid=$2&seourl=$3 last; + rewrite "^/([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$1&seourl=$2 last; + + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})(/?)+$" /index.php?year=$1&month=$2&day=$3 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page/([0-9]+)(/?)+$" /index.php?year=$1&month=$2&day=$3&cstart=$4 last; + + rewrite "^/([0-9]{4})/([0-9]{2})(/?)+$" /index.php?year=$1&month=$2 last; + rewrite "^/([0-9]{4})/([0-9]{2})/page/([0-9]+)(/?)+$" /index.php?year=$1&month=$2&cstart=$3 last; + + rewrite "^/([0-9]{4})(/?)+$" /index.php?year=$1 last; + rewrite "^/([0-9]{4})/page/([0-9]+)(/?)+$" /index.php?year=$1&cstart=$2 last; + + rewrite "^/tags/([^/]*)(/?)+$" /index.php?do=tags&tag=$1 last; + rewrite "^/tags/([^/]*)/page/([0-9]+)(/?)+$" /index.php?do=tags&tag=$1&cstart=$2 last; + + rewrite "^/xfsearch/([^/]*)(/?)+$" /index.php?do=xfsearch&xf=$1 last; + rewrite "^/xfsearch/([^/]*)/page/([0-9]+)(/?)+$" /index.php?do=xfsearch&xf=$1&cstart=$2 last; + + rewrite "^/user/([^/]*)/rss.xml$" /engine/rss.php?subaction=allnews&user=$1 last; + rewrite "^/user/([^/]*)(/?)+$" /index.php?subaction=userinfo&user=$1 last; + rewrite "^/user/([^/]*)/page/([0-9]+)(/?)+$" /index.php?subaction=userinfo&user=$1&cstart=$2 last; + rewrite "^/user/([^/]*)/news(/?)+$" /index.php?subaction=allnews&user=$1 last; + rewrite "^/user/([^/]*)/news/page/([0-9]+)(/?)+$" /index.php?subaction=allnews&user=$1&cstart=$2 last; + rewrite "^/user/([^/]*)/news/rss.xml(/?)+$" /engine/rss.php?subaction=allnews&user=$1 last; + + rewrite "^/lastnews(/?)+$" /index.php?do=lastnews last; + rewrite "^/lastnews/page/([0-9]+)(/?)+$" /index.php?do=lastnews&cstart=$1 last; + + rewrite "^/catalog/([^/]*)/rss.xml$" /engine/rss.php?catalog=$1 last; + rewrite "^/catalog/([^/]*)(/?)+$" /index.php?catalog=$1 last; + rewrite "^/catalog/([^/]*)/page/([0-9]+)(/?)+$" /index.php?catalog=$1&cstart=$2 last; + + rewrite "^/newposts(/?)+$" /index.php?subaction=newposts last; + rewrite "^/newposts/page/([0-9]+)(/?)+$" /index.php?subaction=newposts&cstart=$1 last; + + rewrite "^/favorites(/?)+$" /index.php?do=favorites last; + rewrite "^/favorites/page/([0-9]+)(/?)+$" /index.php?do=favorites&cstart=$1 last; + + rewrite "^/rules.html$" /index.php?do=rules last; + rewrite "^/statistics.html$" /index.php?do=stats last; + rewrite "^/addnews.html$" /index.php?do=addnews last; + rewrite "^/rss.xml$" /engine/rss.php last; + rewrite "^/sitemap.xml$" /uploads/sitemap.xml last; + + if (!-d $request_filename) { + rewrite "^/([^.]+)/page/([0-9]+)(/?)+$" /index.php?do=cat&category=$1&cstart=$2 last; + rewrite "^/([^.]+)/?$" /index.php?do=cat&category=$1 last; + } + + if (!-f $request_filename) { + rewrite "^/([^.]+)/rss.xml$" /engine/rss.php?do=cat&category=$1 last; + rewrite "^/page,([0-9]+),([^/]+).html$" /index.php?do=static&page=$2&news_page=$1 last; + rewrite "^/print:([^/]+).html$" /engine/print.php?do=static&page=$1 last; + } + + if (!-f $request_filename) { + rewrite "^/([^/]+).html$" /index.php?do=static&page=$1 last; + } + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/debian/7/templates/web/nginx/php5-fpm/default.stpl b/install/debian/7/templates/web/nginx/php5-fpm/default.stpl new file mode 100644 index 000000000..a68c99861 --- /dev/null +++ b/install/debian/7/templates/web/nginx/php5-fpm/default.stpl @@ -0,0 +1,50 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %sdocroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/snginx.%domain%.conf*; +} diff --git a/install/debian/7/templates/web/nginx/php5-fpm/default.tpl b/install/debian/7/templates/web/nginx/php5-fpm/default.tpl new file mode 100644 index 000000000..b143e53ba --- /dev/null +++ b/install/debian/7/templates/web/nginx/php5-fpm/default.tpl @@ -0,0 +1,46 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/debian/7/templates/web/nginx/php5-fpm/dokuwiki.stpl b/install/debian/7/templates/web/nginx/php5-fpm/dokuwiki.stpl new file mode 100644 index 000000000..27483cd8c --- /dev/null +++ b/install/debian/7/templates/web/nginx/php5-fpm/dokuwiki.stpl @@ -0,0 +1,67 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + index doku.php; + try_files $uri $uri/ @dokuwiki; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + location ^~ /lib/ { + expires 30d; + } + + location ^~ /conf/ { return 403; } + location ^~ /data/ { return 403; } + + location @dokuwiki { + rewrite ^/_media/(.*) /lib/exe/fetch.php?media=$1 last; + rewrite ^/_detail/(.*) /lib/exe/detail.php?media=$1 last; + rewrite ^/_export/([^/]+)/(.*) /doku.php?do=export_$1&id=$2 last; + rewrite ^/(.*) /doku.php?id=$1 last; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/debian/7/templates/web/nginx/php5-fpm/dokuwiki.tpl b/install/debian/7/templates/web/nginx/php5-fpm/dokuwiki.tpl new file mode 100644 index 000000000..31647c9ff --- /dev/null +++ b/install/debian/7/templates/web/nginx/php5-fpm/dokuwiki.tpl @@ -0,0 +1,62 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + index doku.php; + try_files $uri $uri/ @dokuwiki; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + location ^~ /lib/ { + expires 30d; + } + + location ^~ /conf/ { return 403; } + location ^~ /data/ { return 403; } + location @dokuwiki { + rewrite ^/_media/(.*) /lib/exe/fetch.php?media=$1 last; + rewrite ^/_detail/(.*) /lib/exe/detail.php?media=$1 last; + rewrite ^/_export/([^/]+)/(.*) /doku.php?do=export_$1&id=$2 last; + rewrite ^/(.*) /doku.php?id=$1 last; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/debian/7/templates/web/nginx/php5-fpm/drupal.stpl b/install/debian/7/templates/web/nginx/php5-fpm/drupal.stpl new file mode 100644 index 000000000..9a5484396 --- /dev/null +++ b/install/debian/7/templates/web/nginx/php5-fpm/drupal.stpl @@ -0,0 +1,101 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + + location / { + try_files $uri @rewrite; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # You have 2 options here + # For D7 and above: + # Clean URLs are handled in drupal_environment_initialize(). + rewrite ^ /index.php; + + # For Drupal 6 and bwlow: + # Some modules enforce no slash (/) at the end of the URL + # Else this rewrite block wouldn't be needed (GlobalRedirect) + #rewrite ^/(.*)$ /index.php?q=$1; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/debian/7/templates/web/nginx/php5-fpm/drupal.tpl b/install/debian/7/templates/web/nginx/php5-fpm/drupal.tpl new file mode 100644 index 000000000..417762c18 --- /dev/null +++ b/install/debian/7/templates/web/nginx/php5-fpm/drupal.tpl @@ -0,0 +1,98 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + # Very rarely should these ever be accessed outside of your lan + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + + location / { + try_files $uri @rewrite; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # You have 2 options here + # For D7 and above: + # Clean URLs are handled in drupal_environment_initialize(). + rewrite ^ /index.php; + + # For Drupal 6 and bwlow: + # Some modules enforce no slash (/) at the end of the URL + # Else this rewrite block wouldn't be needed (GlobalRedirect) + #rewrite ^/(.*)$ /index.php?q=$1; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/debian/7/templates/web/nginx/php5-fpm/joomla.stpl b/install/debian/7/templates/web/nginx/php5-fpm/joomla.stpl new file mode 100644 index 000000000..235a01216 --- /dev/null +++ b/install/debian/7/templates/web/nginx/php5-fpm/joomla.stpl @@ -0,0 +1,58 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + try_files $uri $uri/ /index.php?$args; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + # deny running scripts inside writable directories + location ~* /(images|cache|media|logs|tmp)/.*\.(php|pl|py|jsp|asp|sh|cgi)$ { + return 403; + error_page 403 /403_error.html; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/debian/7/templates/web/nginx/php5-fpm/joomla.tpl b/install/debian/7/templates/web/nginx/php5-fpm/joomla.tpl new file mode 100644 index 000000000..997c268de --- /dev/null +++ b/install/debian/7/templates/web/nginx/php5-fpm/joomla.tpl @@ -0,0 +1,54 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + try_files $uri $uri/ /index.php?$args; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + # deny running scripts inside writable directories + location ~* /(images|cache|media|logs|tmp)/.*\.(php|pl|py|jsp|asp|sh|cgi)$ { + return 403; + error_page 403 /403_error.html; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/debian/7/templates/web/nginx/php5-fpm/owncloud.stpl b/install/debian/7/templates/web/nginx/php5-fpm/owncloud.stpl new file mode 100644 index 000000000..8311ca43f --- /dev/null +++ b/install/debian/7/templates/web/nginx/php5-fpm/owncloud.stpl @@ -0,0 +1,80 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + rewrite ^/caldav(.*)$ /remote.php/caldav$1 redirect; + rewrite ^/carddav(.*)$ /remote.php/carddav$1 redirect; + rewrite ^/webdav(.*)$ /remote.php/webdav$1 redirect; + + error_page 403 = /core/templates/403.php; + error_page 404 = /core/templates/404.php; + + location ~ ^/(?:\.htaccess|data|config|db_structure\.xml|README){ + deny all; + } + + location / { + # The following 2 rules are only needed with webfinger + rewrite ^/.well-known/host-meta /public.php?service=host-meta last; + rewrite ^/.well-known/host-meta.json /public.php?service=host-meta-json last; + rewrite ^/.well-known/carddav /remote.php/carddav/ redirect; + rewrite ^/.well-known/caldav /remote.php/caldav/ redirect; + rewrite ^(/core/doc/[^\/]+/)$ $1/index.html; + try_files $uri $uri/ /index.php; + + location ~ \.php(?:$|/) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param PATH_INFO $fastcgi_path_info; + #fastcgi_param HTTPS on; + fastcgi_pass %backend_lsnr%; + } + } + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + # Some basic cache-control for static files to be sent to the browser + add_header Pragma public; + add_header Cache-Control "public, must-revalidate, proxy-revalidate"; + } + + #error_page 403 /error/404.html; + #error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/debian/7/templates/web/nginx/php5-fpm/owncloud.tpl b/install/debian/7/templates/web/nginx/php5-fpm/owncloud.tpl new file mode 100644 index 000000000..57cac2f85 --- /dev/null +++ b/install/debian/7/templates/web/nginx/php5-fpm/owncloud.tpl @@ -0,0 +1,76 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + rewrite ^/caldav(.*)$ /remote.php/caldav$1 redirect; + rewrite ^/carddav(.*)$ /remote.php/carddav$1 redirect; + rewrite ^/webdav(.*)$ /remote.php/webdav$1 redirect; + + error_page 403 = /core/templates/403.php; + error_page 404 = /core/templates/404.php; + + location ~ ^/(?:\.htaccess|data|config|db_structure\.xml|README){ + deny all; + } + + location / { + # The following 2 rules are only needed with webfinger + rewrite ^/.well-known/host-meta /public.php?service=host-meta last; + rewrite ^/.well-known/host-meta.json /public.php?service=host-meta-json last; + rewrite ^/.well-known/carddav /remote.php/carddav/ redirect; + rewrite ^/.well-known/caldav /remote.php/caldav/ redirect; + rewrite ^(/core/doc/[^\/]+/)$ $1/index.html; + try_files $uri $uri/ /index.php; + + location ~ \.php(?:$|/) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param PATH_INFO $fastcgi_path_info; + #fastcgi_param HTTPS on; + fastcgi_pass %backend_lsnr%; + } + } + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + # Some basic cache-control for static files to be sent to the browser + add_header Pragma public; + add_header Cache-Control "public, must-revalidate, proxy-revalidate"; + } + + #error_page 403 /error/404.html; + #error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/debian/7/templates/web/nginx/php5-fpm/piwik.stpl b/install/debian/7/templates/web/nginx/php5-fpm/piwik.stpl new file mode 100644 index 000000000..c53af4011 --- /dev/null +++ b/install/debian/7/templates/web/nginx/php5-fpm/piwik.stpl @@ -0,0 +1,68 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location = /favicon.ico { + try_files /favicon.ico =204; + } + + location / { + try_files $uri /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + valid_referers none blocked %domain_idn% %alias_idn%; + if ($invalid_referer) { + return 444; + } + expires max; + } + + location ~* ^/(?:index|piwik)\.php$ { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + include /etc/nginx/fastcgi_params; + } + } + + # Any other attempt to access PHP files returns a 404. + location ~* ^.+\.php$ { + return 404; + } + + # Return a 404 for all text files. + location ~* ^/(?:README|LICENSE[^.]*|LEGALNOTICE)(?:\.txt)*$ { + return 404; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/debian/7/templates/web/nginx/php5-fpm/piwik.tpl b/install/debian/7/templates/web/nginx/php5-fpm/piwik.tpl new file mode 100644 index 000000000..6b4a94a68 --- /dev/null +++ b/install/debian/7/templates/web/nginx/php5-fpm/piwik.tpl @@ -0,0 +1,64 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location = /favicon.ico { + try_files /favicon.ico =204; + } + + location / { + try_files $uri /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + valid_referers none blocked %domain_idn% %alias_idn%; + if ($invalid_referer) { + return 444; + } + expires max; + } + + location ~* ^/(?:index|piwik)\.php$ { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + include /etc/nginx/fastcgi_params; + } + } + + # Any other attempt to access PHP files returns a 404. + location ~* ^.+\.php$ { + return 404; + } + + # Return a 404 for all text files. + location ~* ^/(?:README|LICENSE[^.]*|LEGALNOTICE)(?:\.txt)*$ { + return 404; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/debian/7/templates/web/nginx/php5-fpm/pyrocms.stpl b/install/debian/7/templates/web/nginx/php5-fpm/pyrocms.stpl new file mode 100644 index 000000000..a6fc67556 --- /dev/null +++ b/install/debian/7/templates/web/nginx/php5-fpm/pyrocms.stpl @@ -0,0 +1,61 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location /installer { + try_files $uri $uri/ /installer/index.php; + } + + location / { + try_files $uri $uri/ /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + location = /robots.txt { access_log off; log_not_found off; } + location = /favicon.ico { access_log off; log_not_found off; } + location ~ /\. { access_log off; log_not_found off; deny all; } + location ~ ~$ { access_log off; log_not_found off; deny all; } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/debian/7/templates/web/nginx/php5-fpm/pyrocms.tpl b/install/debian/7/templates/web/nginx/php5-fpm/pyrocms.tpl new file mode 100644 index 000000000..68b378efd --- /dev/null +++ b/install/debian/7/templates/web/nginx/php5-fpm/pyrocms.tpl @@ -0,0 +1,57 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location /installer { + try_files $uri $uri/ /installer/index.php; + } + + location / { + try_files $uri $uri/ /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + location = /robots.txt { access_log off; log_not_found off; } + location = /favicon.ico { access_log off; log_not_found off; } + location ~ /\. { access_log off; log_not_found off; deny all; } + location ~ ~$ { access_log off; log_not_found off; deny all; } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/debian/7/templates/web/nginx/php5-fpm/wordpress.stpl b/install/debian/7/templates/web/nginx/php5-fpm/wordpress.stpl new file mode 100644 index 000000000..910c28b69 --- /dev/null +++ b/install/debian/7/templates/web/nginx/php5-fpm/wordpress.stpl @@ -0,0 +1,50 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/debian/7/templates/web/nginx/php5-fpm/wordpress.tpl b/install/debian/7/templates/web/nginx/php5-fpm/wordpress.tpl new file mode 100644 index 000000000..b143e53ba --- /dev/null +++ b/install/debian/7/templates/web/nginx/php5-fpm/wordpress.tpl @@ -0,0 +1,46 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/debian/7/templates/web/nginx/php5-fpm/wordpress2.stpl b/install/debian/7/templates/web/nginx/php5-fpm/wordpress2.stpl new file mode 100644 index 000000000..2822f8754 --- /dev/null +++ b/install/debian/7/templates/web/nginx/php5-fpm/wordpress2.stpl @@ -0,0 +1,62 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + location / { + try_files $uri $uri/ /index.php?$args; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/debian/7/templates/web/nginx/php5-fpm/wordpress2.tpl b/install/debian/7/templates/web/nginx/php5-fpm/wordpress2.tpl new file mode 100644 index 000000000..37b8be305 --- /dev/null +++ b/install/debian/7/templates/web/nginx/php5-fpm/wordpress2.tpl @@ -0,0 +1,58 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + location / { + try_files $uri $uri/ /index.php?$args; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/debian/7/templates/web/nginx/php5-fpm/www.conf b/install/debian/7/templates/web/nginx/php5-fpm/www.conf new file mode 100644 index 000000000..d046bceef --- /dev/null +++ b/install/debian/7/templates/web/nginx/php5-fpm/www.conf @@ -0,0 +1,10 @@ +[www] +listen = 127.0.0.1:9000 +listen.allowed_clients = 127.0.0.1 +user = www-data +group = www-data +pm = dynamic +pm.max_children = 50 +pm.start_servers = 5 +pm.min_spare_servers = 3 +pm.max_spare_servers = 35 diff --git a/install/debian/templates/web/nginx/proxy_ip.tpl b/install/debian/7/templates/web/nginx/proxy_ip.tpl similarity index 100% rename from install/debian/templates/web/nginx/proxy_ip.tpl rename to install/debian/7/templates/web/nginx/proxy_ip.tpl diff --git a/install/debian/7/templates/web/php5-fpm/default.tpl b/install/debian/7/templates/web/php5-fpm/default.tpl new file mode 100644 index 000000000..44ccf7a42 --- /dev/null +++ b/install/debian/7/templates/web/php5-fpm/default.tpl @@ -0,0 +1,18 @@ +[%backend%] +listen = 127.0.0.1:%backend_port% +listen.allowed_clients = 127.0.0.1 + +user = %user% +group = %user% + +pm = dynamic +pm.max_children = 50 +pm.start_servers = 3 +pm.min_spare_servers = 2 +pm.max_spare_servers = 10 + +env[HOSTNAME] = $HOSTNAME +env[PATH] = /usr/local/bin:/usr/bin:/bin +env[TMP] = /tmp +env[TMPDIR] = /tmp +env[TEMP] = /tmp diff --git a/install/debian/7/templates/web/php5-fpm/no-php.tpl b/install/debian/7/templates/web/php5-fpm/no-php.tpl new file mode 100644 index 000000000..89487d5f5 --- /dev/null +++ b/install/debian/7/templates/web/php5-fpm/no-php.tpl @@ -0,0 +1,13 @@ +#[%backend%] +#user = %user% +#group = %user% +#listen = /dev/null + +#listen.owner = %user% +#listen.group = nginx + +#pm = dynamic +#pm.max_children = 50 +#pm.start_servers = 3 +#pm.min_spare_servers = 2 +#pm.max_spare_servers = 10 diff --git a/install/debian/7/templates/web/php5-fpm/socket.tpl b/install/debian/7/templates/web/php5-fpm/socket.tpl new file mode 100644 index 000000000..f0513da3e --- /dev/null +++ b/install/debian/7/templates/web/php5-fpm/socket.tpl @@ -0,0 +1,21 @@ +[%backend%] +listen = /var/run/php5-%backend%.sock +listen.allowed_clients = 127.0.0.1 + +user = %user% +group = %user% + +listen.owner = %user% +listen.group = nginx + +pm = dynamic +pm.max_children = 50 +pm.start_servers = 3 +pm.min_spare_servers = 2 +pm.max_spare_servers = 10 + +env[HOSTNAME] = $HOSTNAME +env[PATH] = /usr/local/bin:/usr/bin:/bin +env[TMP] = /tmp +env[TMPDIR] = /tmp +env[TEMP] = /tmp diff --git a/install/debian/7/templates/web/skel/document_errors/403.html b/install/debian/7/templates/web/skel/document_errors/403.html new file mode 100755 index 000000000..9c3f6baab --- /dev/null +++ b/install/debian/7/templates/web/skel/document_errors/403.html @@ -0,0 +1,29 @@ + + + 403 — Forbidden + + + + + + +

          %domain%

          + +

          403

          +

          Forbidden

          +
          + Unfortunately, you do not have permission to view this +
          + + + diff --git a/install/debian/7/templates/web/skel/document_errors/404.html b/install/debian/7/templates/web/skel/document_errors/404.html new file mode 100755 index 000000000..2cee77084 --- /dev/null +++ b/install/debian/7/templates/web/skel/document_errors/404.html @@ -0,0 +1,28 @@ + + + 404 — Not Found + + + + + + +

          %domain%

          +

          404

          +

          Page Not Found

          +
          + It seems that the page you were trying to reach does not exist anymore, or maybe it has just moved. + You can start again from the home or go back to previous page. +
          + + diff --git a/install/debian/7/templates/web/skel/document_errors/50x.html b/install/debian/7/templates/web/skel/document_errors/50x.html new file mode 100755 index 000000000..85ba648b7 --- /dev/null +++ b/install/debian/7/templates/web/skel/document_errors/50x.html @@ -0,0 +1,29 @@ + + + 500 — Internal Sever Error + + + + + + +

          %domain%

          + +

          500

          +

          Internal Server Error

          +
          + Sorry, something went wrong :( +
          + + + diff --git a/install/debian/templates/web/skel/public_html/index.html b/install/debian/7/templates/web/skel/public_html/index.html similarity index 100% rename from install/debian/templates/web/skel/public_html/index.html rename to install/debian/7/templates/web/skel/public_html/index.html diff --git a/install/debian/templates/web/skel/public_html/robots.txt b/install/debian/7/templates/web/skel/public_html/robots.txt similarity index 100% rename from install/debian/templates/web/skel/public_html/robots.txt rename to install/debian/7/templates/web/skel/public_html/robots.txt diff --git a/install/debian/templates/web/skel/public_shtml/index.html b/install/debian/7/templates/web/skel/public_shtml/index.html similarity index 100% rename from install/debian/templates/web/skel/public_shtml/index.html rename to install/debian/7/templates/web/skel/public_shtml/index.html diff --git a/install/debian/templates/web/skel/public_shtml/robots.txt b/install/debian/7/templates/web/skel/public_shtml/robots.txt similarity index 100% rename from install/debian/templates/web/skel/public_shtml/robots.txt rename to install/debian/7/templates/web/skel/public_shtml/robots.txt diff --git a/install/debian/templates/web/suspend/.htaccess b/install/debian/7/templates/web/suspend/.htaccess similarity index 100% rename from install/debian/templates/web/suspend/.htaccess rename to install/debian/7/templates/web/suspend/.htaccess diff --git a/install/debian/7/templates/web/suspend/index.html b/install/debian/7/templates/web/suspend/index.html new file mode 100755 index 000000000..9d4fa67b3 --- /dev/null +++ b/install/debian/7/templates/web/suspend/index.html @@ -0,0 +1,27 @@ + + + SUSPEND + + + + + + +

          SUSPEND

          +

          This site has been suspended

          +
          + Please contact technical support departament. +
          + + + diff --git a/install/debian/templates/web/webalizer/webalizer.tpl b/install/debian/7/templates/web/webalizer/webalizer.tpl similarity index 100% rename from install/debian/templates/web/webalizer/webalizer.tpl rename to install/debian/7/templates/web/webalizer/webalizer.tpl diff --git a/install/debian/vsftpd.conf b/install/debian/7/vsftpd/vsftpd.conf similarity index 100% rename from install/debian/vsftpd.conf rename to install/debian/7/vsftpd/vsftpd.conf diff --git a/install/ubuntu/apache2.conf b/install/debian/8/apache2/apache2.conf similarity index 98% rename from install/ubuntu/apache2.conf rename to install/debian/8/apache2/apache2.conf index 140acee09..221780117 100644 --- a/install/ubuntu/apache2.conf +++ b/install/debian/8/apache2/apache2.conf @@ -11,7 +11,6 @@ # | `-- * # Global configuration -LockFile ${APACHE_LOCK_DIR}/accept.lock PidFile ${APACHE_PID_FILE} Timeout 30 KeepAlive Off diff --git a/install/ubuntu/apache2-status.conf b/install/debian/8/apache2/status.conf similarity index 100% rename from install/ubuntu/apache2-status.conf rename to install/debian/8/apache2/status.conf diff --git a/install/ubuntu/named.conf b/install/debian/8/bind/named.conf similarity index 100% rename from install/ubuntu/named.conf rename to install/debian/8/bind/named.conf diff --git a/install/ubuntu/clamd.conf b/install/debian/8/clamav/clamd.conf similarity index 100% rename from install/ubuntu/clamd.conf rename to install/debian/8/clamav/clamd.conf diff --git a/install/debian/8/deb_signing.key b/install/debian/8/deb_signing.key new file mode 100644 index 000000000..2ad2db8bc --- /dev/null +++ b/install/debian/8/deb_signing.key @@ -0,0 +1,30 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.12 (GNU/Linux) + +mQENBFJIGbEBCAC8SHOOFo7iDTbnC2GhNZ+uBGCh226Dn1QPoFZNFM/DNakHZ6rD +G3wzr8++eKz4fJual/VLllE2N9XDPuxbozb3LLkcyY1WzJqtIXbXhFGQ/SuIeT+x +QY90XU6t2Ckze2c+zUniAWmJ8GSyVmXOoc9JxAQ1u47wvGXLzrjWXc8u8PNRYXuf +fZplTL+dFu9P0d6lP8FGsV+r9wXvvazpRTz3+H8PKrGCYT55ZQIEdG9Jgamylto2 +oVPFXkwGML+TLw6oeCIBuz2y2vtivphW4MJ3ifQjDj7k3n+DTIxfDFs8lB6VRhhY +2nMHCrcZC6U2mhmXmr6O4s1fu6irBVx05ejPABEBAAG0IFNlcmdoZXkgUm9kaW4g +PHNraWRAdmVzdGFjcC5jb20+iQE4BBMBAgAiBQJSSBmxAhsDBgsJCAcDAgYVCAIJ +CgsEFgIDAQIeAQIXgAAKCRBCxbITCh93FPdqB/93GjV9g+wBfeZYLHQK9MDU2wBb +VloYOJJae6IvYKYQVAJayD3PbHdpxrF8s9e23vdnmb9jKu6jX6oV54EIyqP2HPiN +QYc8wcea+eSHerznBixCtoQh8mtdWGFeN71zU/ig7L5qlOVF/EmxDVZTFUeivFxh +IV6qyBnktQKktE45585yKZyyLtfGoXA54DGK69OtJFh+wdkKEMmUXocMl7wUrxW6 +Cx2CuKeEXEgvwu8mRHQi3S3T9XP456qWEn5dWyMVcP660IzEuZfSJApZusNK7zG3 +WMy0/EuX7xHNY3mcNxTOUN1LsO7iHnhHD9+iKWJo9parGkMZzc92MpjDK/g7uQEN +BFJIGbEBCAC7k5QEA9WQM7E3ceNaeLMrA9lXfuzaNCcySq7ONdVAa5PxzbSKdHvz +QFoL1VFqBTYQ038lbil1XqnoM0zvIfAI3LcpS8sq92El/vPxp6jZh2Ari9Uw7x95 +k2cZMgI67g+zQMGdjVRA155nFQRCgg000xU4F7JA6+WsuLlVUmccsDv7YWJExMtC +YPxiuz5DFu8RALnw4Ckts+dbwsrcvUHhkm9b6RAsdCKjjRpUZjLgdltjH83gUVvt +i1YmdjjsVpt95dtsaG+ad852g/Rk8EdxNMkjPF6HLA67CLADP9wYaj80yPcPtylS +ycvPtcclVeHkFBRVM8xZpQd4iD19MWI1ABEBAAGJAR8EGAECAAkFAlJIGbECGwwA +CgkQQsWyEwofdxQ7tQgAhB0FwTs7L8Qr63DHC2yAnXVxgtTAY1/36CccNXVculyR ++EkLcwahms9AKhz7eQb+Mud+5vH0GRohLp2npgO38CjVUfIP5d+Y6dsthmrkF6p8 +XdV1dVK9vWX+i/YZSw/Mded30Cq4P2Yhq9EaemMT0rtli8lz2NnkZ9dFJZk1lzJC +CZmRpbjSNWqRU4f7qyh21lYk/OC/0XE8fh8CaO23TZ+6gBionoCztwb7NyC9OArN +qYlNnbmh9iNqdblykPS3bkjf34n2xyMgnIehNrM89tk8PY4UfNPhgT1TMD9W3Svq +ynNZvLuF/FIDwDeC1qcfjGbfDn9fXO/lMIIRooQYKQ== +=J2HJ +-----END PGP PUBLIC KEY BLOCK----- diff --git a/install/debian/8/dovecot.tar.gz b/install/debian/8/dovecot.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..bfabaa030981d087ea4ccd8c7b86cc4d7ab1b7c6 GIT binary patch literal 3487 zcmV;Q4Pf#giwFRAz^+vQ1MM4YZyPrJESWH#l7u_ru?rTWOchsOV;5PJCsTFqMF@1q7J z@8Lu8?+=Fk(NVY80r~evgQH6Rj{$e&-|I9Jo%CDy^^@&^0v-(pACmu3uh#|ncRQo* z(dY>0bqAx~@CoaDG73Hde{=aieOi0^lwDn3^_fjXAZIdQR-~y^a|aq$g|DKQfwbnIX+x!UC0o24+8Ev1e?6`TyF z8`vq$jB@adI3@)oZi~NBA63I*Z>0~uk2KT zaHU4N^Mslf!x4zfNM=3)9v~#FmW9FwMovM>Qqk&A2kn)-mF@3y zG_7=ebDkGV094j@@Vs@0BEc@7@e)9w1lqm6#<#5dEoiE=m z@xRQ?I@Os$l_|q95)Rz0FPp%ZgQ-R*OzH}@2pfc;P;nNeTnTN9qnvI`X4%2lW7cbR zTm3_iDcc$Smm3}Aqsvx4A-9-ir}foWtu?zhA>BPnKH=r8;MprpW)8}EnWd=Ptk>xv zZ$wNMvfvPJARK}+#op!#f3DIl7_7MUF_H+{N8OxpIBtVkjrIw0*#{pt%}|=4)|}#i zlK@)fN@oy7fK{B$wRYhG42V-$TW~dZzNkgA$Vec}F7ibQ_$LtX40NJt`OMjEVY}## zC!XAK34ym>0Rsw56(X|5!=mP(gHmL#q$xf~(P8ePbmY17uP8?-2-eo4Yq8S|{0ePC z{%@rXcpy}2$J3Wi&9@E*NtxUUBtI;i4*_q;ryATy&))c2YhFE=mCZghykWlY>c z$`*4-IYg9zGgoBu+J$PTs?J72mMO7@v=QizHl?Ho^Q6trYBp`MA?apM!Dq&&Fw%;NZ>9uNV(Q;Ji1D zSC=o5I^LcO}XbK_ij~ctOc^?0jNp{bgsnFkh!dQ`x4_i~A(yWFTp;L}~+`2=c6K z3cll({3CicV6e|ZnwY%i*D{1yLZ+?e{=TLY6c|SC1fzpMzDZJI%5L+?v>Mfe#D|AM zu{H~_Ze62e^kh|%!fz>Q2_H!3659BJZVC(0Vjnu9`FU}gzn7>vr-tO$G^OH$ojEgYPB34n)nCN z6_up>=y0fnu2v=w9^ctv_X*FyQ{qy%dak!9@p03;bsS}E4*n(qZ-c&>9>6_P!1vB* z)S>Sb1jo$Vh9~sS!@r29x^Mp=wK=--Pv-z0vj5JYQ`rBokM&>pe^A-~V*p5dl5jAb zF>6B()Q0bEuM;i!{MS(O3O)$;`#>Hz_&+?N{?F*Bvj4{b*Z-lK^uDrs5Xa-jP|B-A`z+-YdcF%DyCW+}{uQ7yN8dB=smp0>#5MR`=XA`_M|@&2rY zZx3;qcSKw<4eRNIXYWR9hn<^w7Q@ziSccrYPi2Y|VUpNm!WeDfdNYG$fi5R_OuDV& z%!xY>ILFc8_Cq&nkN@v}qb4?dwsIDU?QXGzCXef~UH4_fOVB_gLqVlFBKY*=>g4(P z#re%UtS=?NLD9nMx$84TnP5{vXD0pJ|6<>@c0hzQWe!47Af$v-WgUAoa7#{glGpk@ zZ>{epa?OlGyuBkz|5C-&D zX>62B5bhh91xMVx7HNLb_;K4>S8Csx=x_yj>G+sP zYoJHLc3^{Pi~pL%ck9}<&CEpGF9Nl;%!vsdCTDtnY_DI_P0mWP6p-FC77Gq+7U;;R z_qKx!=CJW^E-!^5;+v)tDti>M$qK zMmnu|b$NMJAVUeBetUNMT~T|z0-^}BogfM`fY)aDoF=l zFMF--Ve4Me$(NX7#5m<475cGv?HcmvADsJ6x3wm4@D{7`xTjg;lm*- zO4=y45Y&e@WBcuWP~+K5uALR;b!oED-5MP=oo!)vr2}oHT*3-gpQ8UohXrhNy=W@A zO9iGU!=1fKT!?HoZPJScC9TDy{`g8;5kWx8UpoLTy10Jxob*!`{qijf$TcD#4)2si z-J1<%o&tptmg1?o0}&FNOl~vk2qPa!kx-KhTyrBfzd5u2ed#}{;xeAy8rjP#r?n6>GmN1 zKk8Tc|KkA4I-F8o9~!x&5|@*I6BPg+L!OMPYXh(-F@E`C*gSpx?&_vUSADuQt}E6S zY0wss9}n802Ct!PyB@Y3I;_;;l3%siZ^!+)`S@pr`}IF-qfdMNf6)HB!~UK3e+O6w ztnB|00Hh7}wt@T_K1~8)@ZR)wJF{2{40zOD3Sdwh2HQC3(oTpACZz?pV)Lu!!@SBw z|A=tk{xJo3)cPOT|IxPo-|4&hUuFM~0-?0@@^2DxEC#I83ANGaO)LB~fhax2m$#gg zphvO5S5~BrF;vq+Mye+;{o z{XYh{IxZyRV5V~sPIh|ZG{}QMSnCGt&Iktl)V+-F-%UQQFWUGKQ}ep2ef*u%&wca? zo^0(u@A-b(%-;do|L7z3-|zbT|ESaL;O{>N_>;iO{vQGI_8wX`b@3Y9jdImf(k0Apn?i2sGx!hDyX1>3M#0ef(kxA N{0}P55eWcL004dY&`|&Y literal 0 HcmV?d00001 diff --git a/install/rhel/dovecot/conf.d/10-auth.conf b/install/debian/8/dovecot/conf.d/10-auth.conf similarity index 100% rename from install/rhel/dovecot/conf.d/10-auth.conf rename to install/debian/8/dovecot/conf.d/10-auth.conf diff --git a/install/rhel/dovecot/conf.d/10-logging.conf b/install/debian/8/dovecot/conf.d/10-logging.conf similarity index 100% rename from install/rhel/dovecot/conf.d/10-logging.conf rename to install/debian/8/dovecot/conf.d/10-logging.conf diff --git a/install/rhel/dovecot/conf.d/10-mail.conf b/install/debian/8/dovecot/conf.d/10-mail.conf similarity index 100% rename from install/rhel/dovecot/conf.d/10-mail.conf rename to install/debian/8/dovecot/conf.d/10-mail.conf diff --git a/install/rhel/dovecot/conf.d/10-master.conf b/install/debian/8/dovecot/conf.d/10-master.conf similarity index 100% rename from install/rhel/dovecot/conf.d/10-master.conf rename to install/debian/8/dovecot/conf.d/10-master.conf diff --git a/install/ubuntu/dovecot/conf.d/10-ssl.conf b/install/debian/8/dovecot/conf.d/10-ssl.conf similarity index 100% rename from install/ubuntu/dovecot/conf.d/10-ssl.conf rename to install/debian/8/dovecot/conf.d/10-ssl.conf diff --git a/install/debian/8/dovecot/conf.d/20-imap.conf b/install/debian/8/dovecot/conf.d/20-imap.conf new file mode 100644 index 000000000..1a459f8e4 --- /dev/null +++ b/install/debian/8/dovecot/conf.d/20-imap.conf @@ -0,0 +1,58 @@ +## +## IMAP specific settings +## + +protocol imap { + # Maximum IMAP command line length. Some clients generate very long command + # lines with huge mailboxes, so you may need to raise this if you get + # "Too long argument" or "IMAP command line too large" errors often. + #imap_max_line_length = 64k + + # Maximum number of IMAP connections allowed for a user from each IP address. + # NOTE: The username is compared case-sensitively. + #mail_max_userip_connections = 10 + + # Space separated list of plugins to load (default is global mail_plugins). + #mail_plugins = $mail_plugins + + # IMAP logout format string: + # %i - total number of bytes read from client + # %o - total number of bytes sent to client + #imap_logout_format = bytes=%i/%o + + # Override the IMAP CAPABILITY response. If the value begins with '+', + # add the given capabilities on top of the defaults (e.g. +XFOO XBAR). + #imap_capability = + + # How long to wait between "OK Still here" notifications when client is + # IDLEing. + #imap_idle_notify_interval = 2 mins + + # ID field names and values to send to clients. Using * as the value makes + # Dovecot use the default value. The following fields have default values + # currently: name, version, os, os-version, support-url, support-email. + #imap_id_send = + + # ID fields sent by client to log. * means everything. + #imap_id_log = + + # Workarounds for various client bugs: + # delay-newmail: + # Send EXISTS/RECENT new mail notifications only when replying to NOOP + # and CHECK commands. Some clients ignore them otherwise, for example OSX + # Mail (#Ira4D7AZL1=&Z6#&~ zz`KruB3xbg09_DCMo>VRAaZ-;y)^U@ z_5_W1em^5}=Uk3M(j5%0M~Fp}7>lVIYRqubkoOIoiK#qP6BOckLPYW;2OWgmSsIAg zuZ|mFmaYUYjJJfo8s1fhF1)IOlQ|75La(j33(9U0btUMJvtIut>QYeUVmCrexr&Qi zKbjFQ61zkzP2U-?^r{!(!l(3+?Yga{u}aaFy}dZE-rC%=GOfyYm&N9W)k}T291PDY z*P0t`IZ}uIjJ_-j{V$SH_dlT#cu)PeEcx8DI+m&H|328vfBu=(y@&@N72}Qi-)t}U ze|i14JEpGxd*KMK)CoAp98}8bBuj9v%2KQe1W{6IHF7UVKsi-oBUDPa+B%^mI!l#A z%iggR=`rPvnSp)Z2xvn7V8#q@Dyt%#D2+c|xJU7JZ=WzC$g2~0Q{w%WGdx!uFgO@} z=-u4i58*FN5)y;)2*=Nd+$g+V_$fxmCp11?eTVGz8P->^KFOi;zxe)( z;(T!ZH#>H&|F+iuy|9`8{p-KwZ0f&dYyIB`OZs27=SuT4o@Sm$(ja3D9@K#V)prvv zs8^H+ECdN-k)k768hSV1`}Y@@gAp1N=}x2^dQlk4c0wJawc4RhTtX&fF0G*c4Nk6a z2g6fPkL6zl5rJ&(DMxg| +actionstop = /usr/local/vesta/bin/v-delete-firewall-chain +actioncheck = iptables -n -L INPUT | grep -q 'fail2ban-[ \t]' +actionban = /usr/local/vesta/bin/v-add-firewall-ban +actionunban = /usr/local/vesta/bin/v-delete-firewall-ban diff --git a/install/rhel/fail2ban.filter.conf b/install/debian/8/fail2ban/filter.d/vesta.conf similarity index 100% rename from install/rhel/fail2ban.filter.conf rename to install/debian/8/fail2ban/filter.d/vesta.conf diff --git a/install/debian/8/fail2ban/jail.local b/install/debian/8/fail2ban/jail.local new file mode 100644 index 000000000..eccea0685 --- /dev/null +++ b/install/debian/8/fail2ban/jail.local @@ -0,0 +1,39 @@ +[ssh-iptables] +enabled = true +filter = sshd +action = vesta[name=SSH] +logpath = /var/log/auth.log +maxretry = 5 + +[vsftpd-iptables] +enabled = false +filter = vsftpd +action = vesta[name=FTP] +logpath = /var/log/vsftpd.log +maxretry = 5 + +[exim-iptables] +enabled = true +filter = exim +action = vesta[name=MAIL] +logpath = /var/log/exim4/mainlog + +[dovecot-iptables] +enabled = true +filter = dovecot +action = vesta[name=MAIL] +logpath = /var/log/dovecot.log + +[mysqld-iptables] +enabled = false +filter = mysqld-auth +action = vesta[name=DB] +logpath = /var/log/mysql.log +maxretry = 5 + +[vesta-iptables] +enabled = true +filter = vesta +action = vesta[name=VESTA] +logpath = /var/log/vesta/auth.log +maxretry = 5 diff --git a/install/debian/8/firewall.tar.gz b/install/debian/8/firewall.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..e8556008077364323d7d6b6934e7a2cf7a734983 GIT binary patch literal 540 zcmV+%0^|K3iwFQ5XyQ}=1MQVdkJ>O4Mzij(@XnhsKo&*MSlh#7(1g=&0&FEG%?Me6ampuO4>y-_`!)kpP&FT0Pj|*j)GSV93 zG0u%P9?@5H>Ue&9TJ8w(mS4U;YbU>kw!5dto6pc!`1H`piz?!Qs? zZ2zTY(j)A}O)l`C?|(Hfn=&r%X0(YbN~&_+%&1`W&E*1z3IZzVUki(*D`*Kk5kQkG z1wFz!17_g@d9ch)G0;wCGL8I9sNtr~X-yEB=^d3PuoC0XT$oBik3eT~aJ zPYYM7vf@1@^`frQB1w}O-E1jovb=r04Y>?eKuHocY1?18ny~4FyPO>aM4!NUUOmFePy(-1M3SddTi>v8NVjB&*t=IgAYbgkDfmmx*FWy-yM^~-2uA1 z`-8QZ4$iCJUfZClsXi!k+gGp^gsj(jT}WJxQ(W4?Rswg^FKlTCd%;5d=XH e1VIo4K@bE%5ClOG1VIqwGCu%8Tmj4gC;$K)2?m1z literal 0 HcmV?d00001 diff --git a/install/rhel/firewall/ports.conf b/install/debian/8/firewall/ports.conf similarity index 93% rename from install/rhel/firewall/ports.conf rename to install/debian/8/firewall/ports.conf index e970f91de..a6ef4dae5 100644 --- a/install/rhel/firewall/ports.conf +++ b/install/debian/8/firewall/ports.conf @@ -11,6 +11,6 @@ PROTOCOL='TCP' PORT='143' PROTOCOL='TCP' PORT='3306' PROTOCOL='TCP' PORT='5432' PROTOCOL='TCP' PORT='8080' -PROTOCOL='TCP' PORT='8443' +PROTOCOL='TCP' PORT='8433' PROTOCOL='TCP' PORT='8083' PROTOCOL='TCP' PORT='12000:12100' diff --git a/install/rhel/firewall/rules.conf b/install/debian/8/firewall/rules.conf similarity index 89% rename from install/rhel/firewall/rules.conf rename to install/debian/8/firewall/rules.conf index 60136e1a5..956c2e1d9 100644 --- a/install/rhel/firewall/rules.conf +++ b/install/debian/8/firewall/rules.conf @@ -1,6 +1,6 @@ RULE='1' ACTION='ACCEPT' PROTOCOL='ICMP' PORT='0' IP='0.0.0.0/0' COMMENT='PING' SUSPENDED='no' TIME='17:13:48' DATE='2014-09-16' RULE='2' ACTION='ACCEPT' PROTOCOL='TCP' PORT='8083' IP='0.0.0.0/0' COMMENT='VESTA' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' -RULE='3' ACTION='ACCEPT' PROTOCOL='TCP' PORT='3306,5432' IP='127.0.0.1/32' COMMENT='DB' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' +RULE='3' ACTION='ACCEPT' PROTOCOL='TCP' PORT='3306,5432' IP='0.0.0.0/0' COMMENT='DB' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' RULE='4' ACTION='ACCEPT' PROTOCOL='TCP' PORT='143,993' IP='0.0.0.0/0' COMMENT='IMAP' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' RULE='5' ACTION='ACCEPT' PROTOCOL='TCP' PORT='110,995' IP='0.0.0.0/0' COMMENT='POP3' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' RULE='6' ACTION='ACCEPT' PROTOCOL='TCP' PORT='25,465,587,2525' IP='0.0.0.0/0' COMMENT='SMTP' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' diff --git a/install/ubuntu/apache2.log b/install/debian/8/logrotate/apache2 similarity index 100% rename from install/ubuntu/apache2.log rename to install/debian/8/logrotate/apache2 diff --git a/install/debian/8/logrotate/nginx b/install/debian/8/logrotate/nginx new file mode 100644 index 000000000..d667f2135 --- /dev/null +++ b/install/debian/8/logrotate/nginx @@ -0,0 +1,13 @@ +/var/log/nginx/*log /var/log/nginx/domains/*log { + daily + missingok + rotate 52 + compress + delaycompress + notifempty + create 640 nginx adm + sharedscripts + postrotate + [ -f /var/run/nginx.pid ] && kill -USR1 `cat /var/run/nginx.pid` + endscript +} diff --git a/install/rhel/vesta.log b/install/debian/8/logrotate/vesta similarity index 100% rename from install/rhel/vesta.log rename to install/debian/8/logrotate/vesta diff --git a/install/debian/8/mysql/my-large.cnf b/install/debian/8/mysql/my-large.cnf new file mode 100644 index 000000000..d0bab3907 --- /dev/null +++ b/install/debian/8/mysql/my-large.cnf @@ -0,0 +1,42 @@ +[client] +port=3306 +socket=/var/run/mysqld/mysqld.sock + +[mysqld_safe] +socket=/var/run/mysqld/mysqld.sock + +[mysqld] +user=mysql +pid-file=/var/run/mysqld/mysqld.pid +socket=/var/run/mysqld/mysqld.sock +port=3306 +basedir=/usr +datadir=/var/lib/mysql +tmpdir=/tmp +lc-messages-dir=/usr/share/mysql +log_error=/var/log/mysql/error.log + +symbolic-links=0 + +skip-external-locking +key_buffer_size = 256M +max_allowed_packet = 32M +table_open_cache = 256 +sort_buffer_size = 1M +read_buffer_size = 1M +read_rnd_buffer_size = 4M +myisam_sort_buffer_size = 64M +thread_cache_size = 8 +query_cache_size= 16M +thread_concurrency = 8 + +#innodb_use_native_aio = 0 +innodb_file_per_table + +max_connections=200 +max_user_connections=50 +wait_timeout=10 +interactive_timeout=50 +long_query_time=5 + +!includedir /etc/mysql/conf.d/ diff --git a/install/debian/my.cnf b/install/debian/8/mysql/my-medium.cnf similarity index 59% rename from install/debian/my.cnf rename to install/debian/8/mysql/my-medium.cnf index 1b5ff1d24..1c10ab9a6 100644 --- a/install/debian/my.cnf +++ b/install/debian/8/mysql/my-medium.cnf @@ -15,11 +15,26 @@ datadir=/var/lib/mysql tmpdir=/tmp lc-messages-dir=/usr/share/mysql log_error=/var/log/mysql/error.log -max_connections=200 -max_user_connections=30 -wait_timeout=30 -interactive_timeout=50 -long_query_time=5 + +symbolic-links=0 + +skip-external-locking +key_buffer_size = 16M +max_allowed_packet = 16M +table_open_cache = 64 +sort_buffer_size = 512K +net_buffer_length = 8K +read_buffer_size = 256K +read_rnd_buffer_size = 512K +myisam_sort_buffer_size = 8M + +#innodb_use_native_aio = 0 innodb_file_per_table +max_connections=70 +max_user_connections=30 +wait_timeout=10 +interactive_timeout=50 +long_query_time=5 + !includedir /etc/mysql/conf.d/ diff --git a/install/debian/8/mysql/my-small.cnf b/install/debian/8/mysql/my-small.cnf new file mode 100644 index 000000000..26a804781 --- /dev/null +++ b/install/debian/8/mysql/my-small.cnf @@ -0,0 +1,40 @@ +[client] +port=3306 +socket=/var/run/mysqld/mysqld.sock + +[mysqld_safe] +socket=/var/run/mysqld/mysqld.sock + +[mysqld] +user=mysql +pid-file=/var/run/mysqld/mysqld.pid +socket=/var/run/mysqld/mysqld.sock +port=3306 +basedir=/usr +datadir=/var/lib/mysql +tmpdir=/tmp +lc-messages-dir=/usr/share/mysql +log_error=/var/log/mysql/error.log + +symbolic-links=0 + +skip-external-locking +key_buffer_size = 16K +max_allowed_packet = 1M +table_open_cache = 4 +sort_buffer_size = 64K +read_buffer_size = 256K +read_rnd_buffer_size = 256K +net_buffer_length = 2K +thread_stack = 240K + +#innodb_use_native_aio = 0 +innodb_file_per_table + +max_connections=30 +max_user_connections=20 +wait_timeout=10 +interactive_timeout=50 +long_query_time=5 + +!includedir /etc/mysql/conf.d/ diff --git a/install/rhel/nginx.conf b/install/debian/8/nginx/nginx.conf similarity index 99% rename from install/rhel/nginx.conf rename to install/debian/8/nginx/nginx.conf index f7a77b52d..7937301c1 100644 --- a/install/rhel/nginx.conf +++ b/install/debian/8/nginx/nginx.conf @@ -1,5 +1,5 @@ # Server globals -user nginx; +user www-data; worker_processes 2; error_log /var/log/nginx/error.log; pid /var/run/nginx.pid; @@ -106,8 +106,8 @@ http { # Cache proxy_cache_path /var/cache/nginx levels=2 keys_zone=cache:10m inactive=60m max_size=512m; - proxy_temp_path /var/cache/nginx/temp; proxy_cache_key "$host$request_uri $cookie_user"; + proxy_temp_path /var/cache/nginx/temp; proxy_ignore_headers Expires Cache-Control; proxy_cache_use_stale error timeout invalid_header http_502; proxy_cache_valid any 3d; diff --git a/install/debian/8/nginx/phpmyadmin.inc b/install/debian/8/nginx/phpmyadmin.inc new file mode 100644 index 000000000..d70ca3e3c --- /dev/null +++ b/install/debian/8/nginx/phpmyadmin.inc @@ -0,0 +1,15 @@ +location /phpmyadmin { + alias /usr/share/phpmyadmin/; + + location ~ /(libraries|setup) { + return 404; + } + + location ~ ^/phpmyadmin/(.*\.php)$ { + alias /usr/share/phpmyadmin/$1; + fastcgi_pass 127.0.0.1:9000; + fastcgi_index index.php; + include fastcgi_params; + fastcgi_param SCRIPT_FILENAME $request_filename; + } +} diff --git a/install/debian/8/nginx/phppgadmin.inc b/install/debian/8/nginx/phppgadmin.inc new file mode 100644 index 000000000..cd1e5806b --- /dev/null +++ b/install/debian/8/nginx/phppgadmin.inc @@ -0,0 +1,11 @@ +location /phppgadmin { + alias /usr/share/phppgadmin/; + + location ~ ^/phppgadmin/(.*\.php)$ { + alias /usr/share/phppgadmin/$1; + fastcgi_pass 127.0.0.1:9000; + fastcgi_index index.php; + include fastcgi_params; + fastcgi_param SCRIPT_FILENAME $request_filename; + } +} diff --git a/install/rhel/nginx-status.conf b/install/debian/8/nginx/status.conf similarity index 100% rename from install/rhel/nginx-status.conf rename to install/debian/8/nginx/status.conf diff --git a/install/debian/8/nginx/webmail.inc b/install/debian/8/nginx/webmail.inc new file mode 100644 index 000000000..ad66895bc --- /dev/null +++ b/install/debian/8/nginx/webmail.inc @@ -0,0 +1,15 @@ +location /webmail { + alias /var/lib/roundcube/; + + location ~ /(config|temp|logs) { + return 404; + } + + location ~ ^/webmail/(.*\.php)$ { + alias /var/lib/roundcube/$1; + fastcgi_pass 127.0.0.1:9000; + fastcgi_index index.php; + include fastcgi_params; + fastcgi_param SCRIPT_FILENAME $request_filename; + } +} diff --git a/install/debian/8/packages.tar.gz b/install/debian/8/packages.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..4b778dadce20a61f03a8ca920ec81c55a8730fee GIT binary patch literal 562 zcmV-20?qv&iwFRHoJ3Lp1MQYgkD5>vhFSY7+_9e37(#VaFxE7E(hXh3fdi2rFJZkFya3gX^b)n zVXSCG>M9q!r;?X63%1>^6fD25GP?9(Zs8i zm#eSAOO(kSvCYUG8}`JzlNGcp7>;dtR#6ZOYcoV)W|{76R22A_Q=gJo4AXSy6Mw(T z@QvYNS99i079ZTgdF&uH#Hm!H2Tkno>k1^mATb^lABoBo#r=lG9NGXU~REdk0(83B2vo&kr_ zAp~{{4=IqJS7Kl{UdaJ`lmmICl^~$|AizYY10B;!5Re`k^vG)ug3|w@mF?UAH~v$N z5%B*SfdB3Ik9DT%#Rp2&fAy{S9|r3<{gP~x+kO96-v30?!2fG-8UK&;KeGQw{$uw~ zsNXQZA^ut3x1l|*XixdCp}qF{wFdwI0000000000000000RC})0(q@EkpL(F05           diff --git a/install/ubuntu/pma.conf b/install/debian/8/pma/config.inc.php similarity index 100% rename from install/ubuntu/pma.conf rename to install/debian/8/pma/config.inc.php diff --git a/install/rhel/pg_hba.conf b/install/debian/8/postgresql/pg_hba.conf similarity index 100% rename from install/rhel/pg_hba.conf rename to install/debian/8/postgresql/pg_hba.conf diff --git a/install/debian/8/proftpd/proftpd.conf b/install/debian/8/proftpd/proftpd.conf new file mode 100644 index 000000000..69ec6b2ec --- /dev/null +++ b/install/debian/8/proftpd/proftpd.conf @@ -0,0 +1,32 @@ +ServerName "FTP" +ServerIdent on "FTP Server ready." +ServerAdmin root@localhost +DefaultServer on +DefaultRoot ~ !adm + + + VRootEngine on + VRootAlias /etc/security/pam_env.conf etc/security/pam_env.conf + + +AuthPAMConfig proftpd +AuthOrder mod_auth_pam.c* mod_auth_unix.c +UseReverseDNS off +User proftpd +Group nogroup +MaxInstances 20 +UseSendfile off +LogFormat default "%h %l %u %t \"%r\" %s %b" +LogFormat auth "%v [%P] %h %t \"%r\" %s" +ListOptions -a +RequireValidShell off +PassivePorts 12000 12100 + + + Umask 002 + IdentLookups off + AllowOverwrite yes + + AllowAll + + diff --git a/install/ubuntu/apache2-webmail.conf b/install/debian/8/roundcube/apache.conf similarity index 100% rename from install/ubuntu/apache2-webmail.conf rename to install/debian/8/roundcube/apache.conf diff --git a/install/rhel/roundcube-pw.conf b/install/debian/8/roundcube/config.inc.php similarity index 100% rename from install/rhel/roundcube-pw.conf rename to install/debian/8/roundcube/config.inc.php diff --git a/install/rhel/roundcube-db.conf b/install/debian/8/roundcube/db.inc.php similarity index 100% rename from install/rhel/roundcube-db.conf rename to install/debian/8/roundcube/db.inc.php diff --git a/install/rhel/roundcube-main.conf b/install/debian/8/roundcube/main.inc.php similarity index 99% rename from install/rhel/roundcube-main.conf rename to install/debian/8/roundcube/main.inc.php index a6e1fc2ee..97cdbf2df 100644 --- a/install/rhel/roundcube-main.conf +++ b/install/debian/8/roundcube/main.inc.php @@ -175,6 +175,8 @@ $rcmail_config['smtp_timeout'] = 0; // ---------------------------------- // SYSTEM // ---------------------------------- +include_once("/etc/roundcube/debian-db-roundcube.php"); + // THIS OPTION WILL ALLOW THE INSTALLER TO RUN AND CAN EXPOSE SENSITIVE CONFIG DATA. // ONLY ENABLE IT IF YOU'RE REALLY SURE WHAT YOU'RE DOING! @@ -437,6 +439,7 @@ $rcmail_config['trash_mbox'] = 'Trash'; // these folders will also be displayed with localized names // NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP) $rcmail_config['default_folders'] = array('INBOX', 'Drafts', 'Sent', 'Spam', 'Trash'); +$rcmail_config['default_imap_folders'] = array('INBOX', 'Drafts', 'Sent', 'Spam', 'Trash'); // automatically create the above listed default folders on first login $rcmail_config['create_default_folders'] = true; diff --git a/install/ubuntu/roundcube-driver.php b/install/debian/8/roundcube/vesta.php similarity index 100% rename from install/ubuntu/roundcube-driver.php rename to install/debian/8/roundcube/vesta.php diff --git a/install/rhel/sudoers.admin.conf b/install/debian/8/sudo/admin similarity index 56% rename from install/rhel/sudoers.admin.conf rename to install/debian/8/sudo/admin index b4f870395..47e16098c 100644 --- a/install/rhel/sudoers.admin.conf +++ b/install/debian/8/sudo/admin @@ -1,3 +1,7 @@ # Created by vesta installer +Defaults env_keep="VESTA" +Defaults:admin !syslog +Defaults:admin !requiretty + admin ALL=(ALL) ALL admin ALL=NOPASSWD:/usr/local/vesta/bin/* diff --git a/install/debian/8/templates.tar.gz b/install/debian/8/templates.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..ce385d269736561780cb42d07b447572cebc7831 GIT binary patch literal 12935 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 + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %sdocroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + #SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + AllowOverride All + SSLRequireSSL + Options +Includes -Indexes +ExecCGI + php_admin_value open_basedir %docroot% + + + AllowOverride All + + SSLEngine on + SSLVerifyClient none + SSLCertificateFile %ssl_crt% + SSLCertificateKeyFile %ssl_key% + %ssl_ca_str%SSLCertificateChainFile %ssl_ca% + + + RMode config + RUidGid %user% %group% + RGroups www-data + + + AssignUserID %user% %group% + + + IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* + + + diff --git a/install/debian/8/templates/web/apache2/basedir.tpl b/install/debian/8/templates/web/apache2/basedir.tpl new file mode 100755 index 000000000..75daf0e10 --- /dev/null +++ b/install/debian/8/templates/web/apache2/basedir.tpl @@ -0,0 +1,35 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %docroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + #SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + AllowOverride All + Options +Includes -Indexes +ExecCGI + php_admin_value open_basedir %docroot% + + + AllowOverride All + + + + RMode config + RUidGid %user% %group% + RGroups www-data + + + AssignUserID %user% %group% + + + IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + + + diff --git a/install/debian/8/templates/web/apache2/default.stpl b/install/debian/8/templates/web/apache2/default.stpl new file mode 100755 index 000000000..e884a95b9 --- /dev/null +++ b/install/debian/8/templates/web/apache2/default.stpl @@ -0,0 +1,40 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %sdocroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + #SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + AllowOverride All + SSLRequireSSL + Options +Includes -Indexes +ExecCGI + + + AllowOverride All + + SSLEngine on + SSLVerifyClient none + SSLCertificateFile %ssl_crt% + SSLCertificateKeyFile %ssl_key% + %ssl_ca_str%SSLCertificateChainFile %ssl_ca% + + + RMode config + RUidGid %user% %group% + RGroups www-data + + + AssignUserID %user% %group% + + + IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* + + + diff --git a/install/debian/8/templates/web/apache2/default.tpl b/install/debian/8/templates/web/apache2/default.tpl new file mode 100755 index 000000000..073724ce0 --- /dev/null +++ b/install/debian/8/templates/web/apache2/default.tpl @@ -0,0 +1,34 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %docroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + #SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + AllowOverride All + Options +Includes -Indexes +ExecCGI + + + AllowOverride All + + + + RMode config + RUidGid %user% %group% + RGroups www-data + + + AssignUserID %user% %group% + + + IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + + + diff --git a/install/ubuntu/templates/web/apache2/hosting.stpl b/install/debian/8/templates/web/apache2/hosting.stpl similarity index 96% rename from install/ubuntu/templates/web/apache2/hosting.stpl rename to install/debian/8/templates/web/apache2/hosting.stpl index c1c91e22e..7a5d7787f 100755 --- a/install/ubuntu/templates/web/apache2/hosting.stpl +++ b/install/debian/8/templates/web/apache2/hosting.stpl @@ -43,7 +43,7 @@ AssignUserID %user% %group% - Include %home%/%user%/conf/web/s%web_system%.%domain%.conf* + IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* diff --git a/install/ubuntu/templates/web/apache2/hosting.tpl b/install/debian/8/templates/web/apache2/hosting.tpl similarity index 95% rename from install/ubuntu/templates/web/apache2/hosting.tpl rename to install/debian/8/templates/web/apache2/hosting.tpl index 8f3ec012a..ab844dc74 100755 --- a/install/ubuntu/templates/web/apache2/hosting.tpl +++ b/install/debian/8/templates/web/apache2/hosting.tpl @@ -37,7 +37,7 @@ AssignUserID %user% %group% - Include %home%/%user%/conf/web/%web_system%.%domain%.conf* + IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* diff --git a/install/rhel/templates/web/httpd/phpcgi.sh b/install/debian/8/templates/web/apache2/phpcgi.sh similarity index 100% rename from install/rhel/templates/web/httpd/phpcgi.sh rename to install/debian/8/templates/web/apache2/phpcgi.sh diff --git a/install/ubuntu/templates/web/apache2/phpcgi.stpl b/install/debian/8/templates/web/apache2/phpcgi.stpl similarity index 93% rename from install/ubuntu/templates/web/apache2/phpcgi.stpl rename to install/debian/8/templates/web/apache2/phpcgi.stpl index 58c4baf90..aa5137308 100755 --- a/install/ubuntu/templates/web/apache2/phpcgi.stpl +++ b/install/debian/8/templates/web/apache2/phpcgi.stpl @@ -29,7 +29,7 @@ SSLCertificateKeyFile %ssl_key% %ssl_ca_str%SSLCertificateChainFile %ssl_ca% - Include %home%/%user%/conf/web/s%web_system%.%domain%.conf* + IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* diff --git a/install/ubuntu/templates/web/apache2/phpcgi.tpl b/install/debian/8/templates/web/apache2/phpcgi.tpl similarity index 92% rename from install/ubuntu/templates/web/apache2/phpcgi.tpl rename to install/debian/8/templates/web/apache2/phpcgi.tpl index 21be2cdd7..a05ff252d 100755 --- a/install/ubuntu/templates/web/apache2/phpcgi.tpl +++ b/install/debian/8/templates/web/apache2/phpcgi.tpl @@ -22,7 +22,7 @@ AllowOverride All - Include %home%/%user%/conf/web/%web_system%.%domain%.conf* + IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* diff --git a/install/rhel/templates/web/httpd/phpfcgid.sh b/install/debian/8/templates/web/apache2/phpfcgid.sh similarity index 100% rename from install/rhel/templates/web/httpd/phpfcgid.sh rename to install/debian/8/templates/web/apache2/phpfcgid.sh diff --git a/install/ubuntu/templates/web/apache2/phpfcgid.stpl b/install/debian/8/templates/web/apache2/phpfcgid.stpl similarity index 94% rename from install/ubuntu/templates/web/apache2/phpfcgid.stpl rename to install/debian/8/templates/web/apache2/phpfcgid.stpl index 20a580093..622495756 100755 --- a/install/ubuntu/templates/web/apache2/phpfcgid.stpl +++ b/install/debian/8/templates/web/apache2/phpfcgid.stpl @@ -30,7 +30,7 @@ SSLCertificateKeyFile %ssl_key% %ssl_ca_str%SSLCertificateChainFile %ssl_ca% - Include %home%/%user%/conf/web/s%web_system%.%domain%.conf* + IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* diff --git a/install/ubuntu/templates/web/apache2/phpfcgid.tpl b/install/debian/8/templates/web/apache2/phpfcgid.tpl similarity index 92% rename from install/ubuntu/templates/web/apache2/phpfcgid.tpl rename to install/debian/8/templates/web/apache2/phpfcgid.tpl index 72e7d8d44..5c1f16e20 100755 --- a/install/ubuntu/templates/web/apache2/phpfcgid.tpl +++ b/install/debian/8/templates/web/apache2/phpfcgid.tpl @@ -22,7 +22,7 @@ AllowOverride All - Include %home%/%user%/conf/web/%web_system%.%domain%.conf* + IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* diff --git a/install/rhel/templates/web/awstats/awstats.tpl b/install/debian/8/templates/web/awstats/awstats.tpl similarity index 100% rename from install/rhel/templates/web/awstats/awstats.tpl rename to install/debian/8/templates/web/awstats/awstats.tpl diff --git a/install/rhel/templates/web/awstats/index.tpl b/install/debian/8/templates/web/awstats/index.tpl similarity index 100% rename from install/rhel/templates/web/awstats/index.tpl rename to install/debian/8/templates/web/awstats/index.tpl diff --git a/install/rhel/templates/web/awstats/nav.tpl b/install/debian/8/templates/web/awstats/nav.tpl similarity index 100% rename from install/rhel/templates/web/awstats/nav.tpl rename to install/debian/8/templates/web/awstats/nav.tpl diff --git a/install/debian/8/templates/web/nginx/caching.sh b/install/debian/8/templates/web/nginx/caching.sh new file mode 100755 index 000000000..6eb9126db --- /dev/null +++ b/install/debian/8/templates/web/nginx/caching.sh @@ -0,0 +1,12 @@ +#!/bin/bash + +user=$1 +domain=$2 +ip=$3 +home=$4 +docroot=$5 + +str="proxy_cache_path /var/cache/nginx/$domain levels=2" +str="$str keys_zone=$domain:10m inactive=60m max_size=512m;" +echo "$str" >> /etc/nginx/conf.d/01_caching_pool.conf + diff --git a/install/rhel/templates/web/nginx/caching.stpl b/install/debian/8/templates/web/nginx/caching.stpl similarity index 100% rename from install/rhel/templates/web/nginx/caching.stpl rename to install/debian/8/templates/web/nginx/caching.stpl diff --git a/install/rhel/templates/web/nginx/caching.tpl b/install/debian/8/templates/web/nginx/caching.tpl similarity index 100% rename from install/rhel/templates/web/nginx/caching.tpl rename to install/debian/8/templates/web/nginx/caching.tpl diff --git a/install/ubuntu/templates/web/nginx/default.stpl b/install/debian/8/templates/web/nginx/default.stpl similarity index 100% rename from install/ubuntu/templates/web/nginx/default.stpl rename to install/debian/8/templates/web/nginx/default.stpl diff --git a/install/ubuntu/templates/web/nginx/default.tpl b/install/debian/8/templates/web/nginx/default.tpl similarity index 100% rename from install/ubuntu/templates/web/nginx/default.tpl rename to install/debian/8/templates/web/nginx/default.tpl diff --git a/install/rhel/templates/web/nginx/hosting.sh b/install/debian/8/templates/web/nginx/hosting.sh similarity index 100% rename from install/rhel/templates/web/nginx/hosting.sh rename to install/debian/8/templates/web/nginx/hosting.sh diff --git a/install/ubuntu/templates/web/nginx/hosting.stpl b/install/debian/8/templates/web/nginx/hosting.stpl similarity index 100% rename from install/ubuntu/templates/web/nginx/hosting.stpl rename to install/debian/8/templates/web/nginx/hosting.stpl diff --git a/install/ubuntu/templates/web/nginx/hosting.tpl b/install/debian/8/templates/web/nginx/hosting.tpl similarity index 100% rename from install/ubuntu/templates/web/nginx/hosting.tpl rename to install/debian/8/templates/web/nginx/hosting.tpl diff --git a/install/debian/8/templates/web/nginx/php5-fpm/cms_made_simple.stpl b/install/debian/8/templates/web/nginx/php5-fpm/cms_made_simple.stpl new file mode 100644 index 000000000..01d82b603 --- /dev/null +++ b/install/debian/8/templates/web/nginx/php5-fpm/cms_made_simple.stpl @@ -0,0 +1,51 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + try_files $uri $uri/ /index.php?page=$request_uri; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/debian/8/templates/web/nginx/php5-fpm/cms_made_simple.tpl b/install/debian/8/templates/web/nginx/php5-fpm/cms_made_simple.tpl new file mode 100644 index 000000000..af452d19f --- /dev/null +++ b/install/debian/8/templates/web/nginx/php5-fpm/cms_made_simple.tpl @@ -0,0 +1,47 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + try_files $uri $uri/ /index.php?page=$request_uri; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/debian/8/templates/web/nginx/php5-fpm/codeigniter2.stpl b/install/debian/8/templates/web/nginx/php5-fpm/codeigniter2.stpl new file mode 100644 index 000000000..a592a652d --- /dev/null +++ b/install/debian/8/templates/web/nginx/php5-fpm/codeigniter2.stpl @@ -0,0 +1,56 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + try_files $uri $uri/ /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location = /index.php { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME /var/www/html/ci$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + location ~ \.php$ { + return 444; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/debian/8/templates/web/nginx/php5-fpm/codeigniter2.tpl b/install/debian/8/templates/web/nginx/php5-fpm/codeigniter2.tpl new file mode 100644 index 000000000..9b955aa6a --- /dev/null +++ b/install/debian/8/templates/web/nginx/php5-fpm/codeigniter2.tpl @@ -0,0 +1,52 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + try_files $uri $uri/ /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location = /index.php { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME /var/www/html/ci$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + location ~ \.php$ { + return 444; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/debian/8/templates/web/nginx/php5-fpm/codeigniter3.stpl b/install/debian/8/templates/web/nginx/php5-fpm/codeigniter3.stpl new file mode 100644 index 000000000..4d330d34f --- /dev/null +++ b/install/debian/8/templates/web/nginx/php5-fpm/codeigniter3.stpl @@ -0,0 +1,51 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + try_files $uri $uri/ /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/debian/8/templates/web/nginx/php5-fpm/codeigniter3.tpl b/install/debian/8/templates/web/nginx/php5-fpm/codeigniter3.tpl new file mode 100644 index 000000000..1f446e5d3 --- /dev/null +++ b/install/debian/8/templates/web/nginx/php5-fpm/codeigniter3.tpl @@ -0,0 +1,47 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + try_files $uri $uri/ /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/debian/8/templates/web/nginx/php5-fpm/datalife_engine.stpl b/install/debian/8/templates/web/nginx/php5-fpm/datalife_engine.stpl new file mode 100644 index 000000000..d1b5bcd24 --- /dev/null +++ b/install/debian/8/templates/web/nginx/php5-fpm/datalife_engine.stpl @@ -0,0 +1,122 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + rewrite "^/page/([0-9]+)(/?)$" /index.php?cstart=$1 last; + + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page,([0-9]+),([0-9]+),(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&cstart=$5&news_name=$6&seourl=$6 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page,([0-9]+),(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&news_name=$5&seourl=$5 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/print:page,([0-9]+),(.*).html(/?)+$" /engine/print.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&news_name=$5&seourl=$5 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_name=$4&seourl=$4 last; + + rewrite "^/([^.]+)/page,([0-9]+),([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$4&news_page=$2&cstart=$3&seourl=$5&seocat=$1 last; + rewrite "^/([^.]+)/page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$3&news_page=$2&seourl=$4&seocat=$1 last; + rewrite "^/([^.]+)/print:page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /engine/print.php?news_page=$2&newsid=$3&seourl=$4&seocat=$1 last; + rewrite "^/([^.]+)/([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$2&seourl=$3&seocat=$1 last; + + rewrite "^/page,([0-9]+),([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$3&news_page=$1&cstart=$2&seourl=$4 last; + rewrite "^/page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$2&news_page=$1&seourl=$3 last; + rewrite "^/print:page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /engine/print.php?news_page=$1&newsid=$2&seourl=$3 last; + rewrite "^/([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$1&seourl=$2 last; + + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})(/?)+$" /index.php?year=$1&month=$2&day=$3 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page/([0-9]+)(/?)+$" /index.php?year=$1&month=$2&day=$3&cstart=$4 last; + + rewrite "^/([0-9]{4})/([0-9]{2})(/?)+$" /index.php?year=$1&month=$2 last; + rewrite "^/([0-9]{4})/([0-9]{2})/page/([0-9]+)(/?)+$" /index.php?year=$1&month=$2&cstart=$3 last; + + rewrite "^/([0-9]{4})(/?)+$" /index.php?year=$1 last; + rewrite "^/([0-9]{4})/page/([0-9]+)(/?)+$" /index.php?year=$1&cstart=$2 last; + + rewrite "^/tags/([^/]*)(/?)+$" /index.php?do=tags&tag=$1 last; + rewrite "^/tags/([^/]*)/page/([0-9]+)(/?)+$" /index.php?do=tags&tag=$1&cstart=$2 last; + + rewrite "^/xfsearch/([^/]*)(/?)+$" /index.php?do=xfsearch&xf=$1 last; + rewrite "^/xfsearch/([^/]*)/page/([0-9]+)(/?)+$" /index.php?do=xfsearch&xf=$1&cstart=$2 last; + + rewrite "^/user/([^/]*)/rss.xml$" /engine/rss.php?subaction=allnews&user=$1 last; + rewrite "^/user/([^/]*)(/?)+$" /index.php?subaction=userinfo&user=$1 last; + rewrite "^/user/([^/]*)/page/([0-9]+)(/?)+$" /index.php?subaction=userinfo&user=$1&cstart=$2 last; + rewrite "^/user/([^/]*)/news(/?)+$" /index.php?subaction=allnews&user=$1 last; + rewrite "^/user/([^/]*)/news/page/([0-9]+)(/?)+$" /index.php?subaction=allnews&user=$1&cstart=$2 last; + rewrite "^/user/([^/]*)/news/rss.xml(/?)+$" /engine/rss.php?subaction=allnews&user=$1 last; + + rewrite "^/lastnews(/?)+$" /index.php?do=lastnews last; + rewrite "^/lastnews/page/([0-9]+)(/?)+$" /index.php?do=lastnews&cstart=$1 last; + + rewrite "^/catalog/([^/]*)/rss.xml$" /engine/rss.php?catalog=$1 last; + rewrite "^/catalog/([^/]*)(/?)+$" /index.php?catalog=$1 last; + rewrite "^/catalog/([^/]*)/page/([0-9]+)(/?)+$" /index.php?catalog=$1&cstart=$2 last; + + rewrite "^/newposts(/?)+$" /index.php?subaction=newposts last; + rewrite "^/newposts/page/([0-9]+)(/?)+$" /index.php?subaction=newposts&cstart=$1 last; + + rewrite "^/favorites(/?)+$" /index.php?do=favorites last; + rewrite "^/favorites/page/([0-9]+)(/?)+$" /index.php?do=favorites&cstart=$1 last; + + rewrite "^/rules.html$" /index.php?do=rules last; + rewrite "^/statistics.html$" /index.php?do=stats last; + rewrite "^/addnews.html$" /index.php?do=addnews last; + rewrite "^/rss.xml$" /engine/rss.php last; + rewrite "^/sitemap.xml$" /uploads/sitemap.xml last; + + if (!-d $request_filename) { + rewrite "^/([^.]+)/page/([0-9]+)(/?)+$" /index.php?do=cat&category=$1&cstart=$2 last; + rewrite "^/([^.]+)/?$" /index.php?do=cat&category=$1 last; + } + + if (!-f $request_filename) { + rewrite "^/([^.]+)/rss.xml$" /engine/rss.php?do=cat&category=$1 last; + rewrite "^/page,([0-9]+),([^/]+).html$" /index.php?do=static&page=$2&news_page=$1 last; + rewrite "^/print:([^/]+).html$" /engine/print.php?do=static&page=$1 last; + } + + if (!-f $request_filename) { + rewrite "^/([^/]+).html$" /index.php?do=static&page=$1 last; + } + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/debian/8/templates/web/nginx/php5-fpm/datalife_engine.tpl b/install/debian/8/templates/web/nginx/php5-fpm/datalife_engine.tpl new file mode 100644 index 000000000..ff33c2325 --- /dev/null +++ b/install/debian/8/templates/web/nginx/php5-fpm/datalife_engine.tpl @@ -0,0 +1,118 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + rewrite "^/page/([0-9]+)(/?)$" /index.php?cstart=$1 last; + + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page,([0-9]+),([0-9]+),(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&cstart=$5&news_name=$6&seourl=$6 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page,([0-9]+),(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&news_name=$5&seourl=$5 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/print:page,([0-9]+),(.*).html(/?)+$" /engine/print.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&news_name=$5&seourl=$5 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_name=$4&seourl=$4 last; + + rewrite "^/([^.]+)/page,([0-9]+),([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$4&news_page=$2&cstart=$3&seourl=$5&seocat=$1 last; + rewrite "^/([^.]+)/page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$3&news_page=$2&seourl=$4&seocat=$1 last; + rewrite "^/([^.]+)/print:page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /engine/print.php?news_page=$2&newsid=$3&seourl=$4&seocat=$1 last; + rewrite "^/([^.]+)/([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$2&seourl=$3&seocat=$1 last; + + rewrite "^/page,([0-9]+),([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$3&news_page=$1&cstart=$2&seourl=$4 last; + rewrite "^/page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$2&news_page=$1&seourl=$3 last; + rewrite "^/print:page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /engine/print.php?news_page=$1&newsid=$2&seourl=$3 last; + rewrite "^/([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$1&seourl=$2 last; + + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})(/?)+$" /index.php?year=$1&month=$2&day=$3 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page/([0-9]+)(/?)+$" /index.php?year=$1&month=$2&day=$3&cstart=$4 last; + + rewrite "^/([0-9]{4})/([0-9]{2})(/?)+$" /index.php?year=$1&month=$2 last; + rewrite "^/([0-9]{4})/([0-9]{2})/page/([0-9]+)(/?)+$" /index.php?year=$1&month=$2&cstart=$3 last; + + rewrite "^/([0-9]{4})(/?)+$" /index.php?year=$1 last; + rewrite "^/([0-9]{4})/page/([0-9]+)(/?)+$" /index.php?year=$1&cstart=$2 last; + + rewrite "^/tags/([^/]*)(/?)+$" /index.php?do=tags&tag=$1 last; + rewrite "^/tags/([^/]*)/page/([0-9]+)(/?)+$" /index.php?do=tags&tag=$1&cstart=$2 last; + + rewrite "^/xfsearch/([^/]*)(/?)+$" /index.php?do=xfsearch&xf=$1 last; + rewrite "^/xfsearch/([^/]*)/page/([0-9]+)(/?)+$" /index.php?do=xfsearch&xf=$1&cstart=$2 last; + + rewrite "^/user/([^/]*)/rss.xml$" /engine/rss.php?subaction=allnews&user=$1 last; + rewrite "^/user/([^/]*)(/?)+$" /index.php?subaction=userinfo&user=$1 last; + rewrite "^/user/([^/]*)/page/([0-9]+)(/?)+$" /index.php?subaction=userinfo&user=$1&cstart=$2 last; + rewrite "^/user/([^/]*)/news(/?)+$" /index.php?subaction=allnews&user=$1 last; + rewrite "^/user/([^/]*)/news/page/([0-9]+)(/?)+$" /index.php?subaction=allnews&user=$1&cstart=$2 last; + rewrite "^/user/([^/]*)/news/rss.xml(/?)+$" /engine/rss.php?subaction=allnews&user=$1 last; + + rewrite "^/lastnews(/?)+$" /index.php?do=lastnews last; + rewrite "^/lastnews/page/([0-9]+)(/?)+$" /index.php?do=lastnews&cstart=$1 last; + + rewrite "^/catalog/([^/]*)/rss.xml$" /engine/rss.php?catalog=$1 last; + rewrite "^/catalog/([^/]*)(/?)+$" /index.php?catalog=$1 last; + rewrite "^/catalog/([^/]*)/page/([0-9]+)(/?)+$" /index.php?catalog=$1&cstart=$2 last; + + rewrite "^/newposts(/?)+$" /index.php?subaction=newposts last; + rewrite "^/newposts/page/([0-9]+)(/?)+$" /index.php?subaction=newposts&cstart=$1 last; + + rewrite "^/favorites(/?)+$" /index.php?do=favorites last; + rewrite "^/favorites/page/([0-9]+)(/?)+$" /index.php?do=favorites&cstart=$1 last; + + rewrite "^/rules.html$" /index.php?do=rules last; + rewrite "^/statistics.html$" /index.php?do=stats last; + rewrite "^/addnews.html$" /index.php?do=addnews last; + rewrite "^/rss.xml$" /engine/rss.php last; + rewrite "^/sitemap.xml$" /uploads/sitemap.xml last; + + if (!-d $request_filename) { + rewrite "^/([^.]+)/page/([0-9]+)(/?)+$" /index.php?do=cat&category=$1&cstart=$2 last; + rewrite "^/([^.]+)/?$" /index.php?do=cat&category=$1 last; + } + + if (!-f $request_filename) { + rewrite "^/([^.]+)/rss.xml$" /engine/rss.php?do=cat&category=$1 last; + rewrite "^/page,([0-9]+),([^/]+).html$" /index.php?do=static&page=$2&news_page=$1 last; + rewrite "^/print:([^/]+).html$" /engine/print.php?do=static&page=$1 last; + } + + if (!-f $request_filename) { + rewrite "^/([^/]+).html$" /index.php?do=static&page=$1 last; + } + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/debian/8/templates/web/nginx/php5-fpm/default.stpl b/install/debian/8/templates/web/nginx/php5-fpm/default.stpl new file mode 100644 index 000000000..a68c99861 --- /dev/null +++ b/install/debian/8/templates/web/nginx/php5-fpm/default.stpl @@ -0,0 +1,50 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %sdocroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/snginx.%domain%.conf*; +} diff --git a/install/debian/8/templates/web/nginx/php5-fpm/default.tpl b/install/debian/8/templates/web/nginx/php5-fpm/default.tpl new file mode 100644 index 000000000..b143e53ba --- /dev/null +++ b/install/debian/8/templates/web/nginx/php5-fpm/default.tpl @@ -0,0 +1,46 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/debian/8/templates/web/nginx/php5-fpm/dokuwiki.stpl b/install/debian/8/templates/web/nginx/php5-fpm/dokuwiki.stpl new file mode 100644 index 000000000..27483cd8c --- /dev/null +++ b/install/debian/8/templates/web/nginx/php5-fpm/dokuwiki.stpl @@ -0,0 +1,67 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + index doku.php; + try_files $uri $uri/ @dokuwiki; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + location ^~ /lib/ { + expires 30d; + } + + location ^~ /conf/ { return 403; } + location ^~ /data/ { return 403; } + + location @dokuwiki { + rewrite ^/_media/(.*) /lib/exe/fetch.php?media=$1 last; + rewrite ^/_detail/(.*) /lib/exe/detail.php?media=$1 last; + rewrite ^/_export/([^/]+)/(.*) /doku.php?do=export_$1&id=$2 last; + rewrite ^/(.*) /doku.php?id=$1 last; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/debian/8/templates/web/nginx/php5-fpm/dokuwiki.tpl b/install/debian/8/templates/web/nginx/php5-fpm/dokuwiki.tpl new file mode 100644 index 000000000..31647c9ff --- /dev/null +++ b/install/debian/8/templates/web/nginx/php5-fpm/dokuwiki.tpl @@ -0,0 +1,62 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + index doku.php; + try_files $uri $uri/ @dokuwiki; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + location ^~ /lib/ { + expires 30d; + } + + location ^~ /conf/ { return 403; } + location ^~ /data/ { return 403; } + location @dokuwiki { + rewrite ^/_media/(.*) /lib/exe/fetch.php?media=$1 last; + rewrite ^/_detail/(.*) /lib/exe/detail.php?media=$1 last; + rewrite ^/_export/([^/]+)/(.*) /doku.php?do=export_$1&id=$2 last; + rewrite ^/(.*) /doku.php?id=$1 last; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/debian/8/templates/web/nginx/php5-fpm/drupal.stpl b/install/debian/8/templates/web/nginx/php5-fpm/drupal.stpl new file mode 100644 index 000000000..9a5484396 --- /dev/null +++ b/install/debian/8/templates/web/nginx/php5-fpm/drupal.stpl @@ -0,0 +1,101 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + + location / { + try_files $uri @rewrite; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # You have 2 options here + # For D7 and above: + # Clean URLs are handled in drupal_environment_initialize(). + rewrite ^ /index.php; + + # For Drupal 6 and bwlow: + # Some modules enforce no slash (/) at the end of the URL + # Else this rewrite block wouldn't be needed (GlobalRedirect) + #rewrite ^/(.*)$ /index.php?q=$1; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/debian/8/templates/web/nginx/php5-fpm/drupal.tpl b/install/debian/8/templates/web/nginx/php5-fpm/drupal.tpl new file mode 100644 index 000000000..417762c18 --- /dev/null +++ b/install/debian/8/templates/web/nginx/php5-fpm/drupal.tpl @@ -0,0 +1,98 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + # Very rarely should these ever be accessed outside of your lan + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + + location / { + try_files $uri @rewrite; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # You have 2 options here + # For D7 and above: + # Clean URLs are handled in drupal_environment_initialize(). + rewrite ^ /index.php; + + # For Drupal 6 and bwlow: + # Some modules enforce no slash (/) at the end of the URL + # Else this rewrite block wouldn't be needed (GlobalRedirect) + #rewrite ^/(.*)$ /index.php?q=$1; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/debian/8/templates/web/nginx/php5-fpm/joomla.stpl b/install/debian/8/templates/web/nginx/php5-fpm/joomla.stpl new file mode 100644 index 000000000..235a01216 --- /dev/null +++ b/install/debian/8/templates/web/nginx/php5-fpm/joomla.stpl @@ -0,0 +1,58 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + try_files $uri $uri/ /index.php?$args; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + # deny running scripts inside writable directories + location ~* /(images|cache|media|logs|tmp)/.*\.(php|pl|py|jsp|asp|sh|cgi)$ { + return 403; + error_page 403 /403_error.html; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/debian/8/templates/web/nginx/php5-fpm/joomla.tpl b/install/debian/8/templates/web/nginx/php5-fpm/joomla.tpl new file mode 100644 index 000000000..997c268de --- /dev/null +++ b/install/debian/8/templates/web/nginx/php5-fpm/joomla.tpl @@ -0,0 +1,54 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + try_files $uri $uri/ /index.php?$args; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + # deny running scripts inside writable directories + location ~* /(images|cache|media|logs|tmp)/.*\.(php|pl|py|jsp|asp|sh|cgi)$ { + return 403; + error_page 403 /403_error.html; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/debian/8/templates/web/nginx/php5-fpm/owncloud.stpl b/install/debian/8/templates/web/nginx/php5-fpm/owncloud.stpl new file mode 100644 index 000000000..8311ca43f --- /dev/null +++ b/install/debian/8/templates/web/nginx/php5-fpm/owncloud.stpl @@ -0,0 +1,80 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + rewrite ^/caldav(.*)$ /remote.php/caldav$1 redirect; + rewrite ^/carddav(.*)$ /remote.php/carddav$1 redirect; + rewrite ^/webdav(.*)$ /remote.php/webdav$1 redirect; + + error_page 403 = /core/templates/403.php; + error_page 404 = /core/templates/404.php; + + location ~ ^/(?:\.htaccess|data|config|db_structure\.xml|README){ + deny all; + } + + location / { + # The following 2 rules are only needed with webfinger + rewrite ^/.well-known/host-meta /public.php?service=host-meta last; + rewrite ^/.well-known/host-meta.json /public.php?service=host-meta-json last; + rewrite ^/.well-known/carddav /remote.php/carddav/ redirect; + rewrite ^/.well-known/caldav /remote.php/caldav/ redirect; + rewrite ^(/core/doc/[^\/]+/)$ $1/index.html; + try_files $uri $uri/ /index.php; + + location ~ \.php(?:$|/) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param PATH_INFO $fastcgi_path_info; + #fastcgi_param HTTPS on; + fastcgi_pass %backend_lsnr%; + } + } + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + # Some basic cache-control for static files to be sent to the browser + add_header Pragma public; + add_header Cache-Control "public, must-revalidate, proxy-revalidate"; + } + + #error_page 403 /error/404.html; + #error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/debian/8/templates/web/nginx/php5-fpm/owncloud.tpl b/install/debian/8/templates/web/nginx/php5-fpm/owncloud.tpl new file mode 100644 index 000000000..57cac2f85 --- /dev/null +++ b/install/debian/8/templates/web/nginx/php5-fpm/owncloud.tpl @@ -0,0 +1,76 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + rewrite ^/caldav(.*)$ /remote.php/caldav$1 redirect; + rewrite ^/carddav(.*)$ /remote.php/carddav$1 redirect; + rewrite ^/webdav(.*)$ /remote.php/webdav$1 redirect; + + error_page 403 = /core/templates/403.php; + error_page 404 = /core/templates/404.php; + + location ~ ^/(?:\.htaccess|data|config|db_structure\.xml|README){ + deny all; + } + + location / { + # The following 2 rules are only needed with webfinger + rewrite ^/.well-known/host-meta /public.php?service=host-meta last; + rewrite ^/.well-known/host-meta.json /public.php?service=host-meta-json last; + rewrite ^/.well-known/carddav /remote.php/carddav/ redirect; + rewrite ^/.well-known/caldav /remote.php/caldav/ redirect; + rewrite ^(/core/doc/[^\/]+/)$ $1/index.html; + try_files $uri $uri/ /index.php; + + location ~ \.php(?:$|/) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param PATH_INFO $fastcgi_path_info; + #fastcgi_param HTTPS on; + fastcgi_pass %backend_lsnr%; + } + } + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + # Some basic cache-control for static files to be sent to the browser + add_header Pragma public; + add_header Cache-Control "public, must-revalidate, proxy-revalidate"; + } + + #error_page 403 /error/404.html; + #error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/debian/8/templates/web/nginx/php5-fpm/piwik.stpl b/install/debian/8/templates/web/nginx/php5-fpm/piwik.stpl new file mode 100644 index 000000000..c53af4011 --- /dev/null +++ b/install/debian/8/templates/web/nginx/php5-fpm/piwik.stpl @@ -0,0 +1,68 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location = /favicon.ico { + try_files /favicon.ico =204; + } + + location / { + try_files $uri /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + valid_referers none blocked %domain_idn% %alias_idn%; + if ($invalid_referer) { + return 444; + } + expires max; + } + + location ~* ^/(?:index|piwik)\.php$ { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + include /etc/nginx/fastcgi_params; + } + } + + # Any other attempt to access PHP files returns a 404. + location ~* ^.+\.php$ { + return 404; + } + + # Return a 404 for all text files. + location ~* ^/(?:README|LICENSE[^.]*|LEGALNOTICE)(?:\.txt)*$ { + return 404; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/debian/8/templates/web/nginx/php5-fpm/piwik.tpl b/install/debian/8/templates/web/nginx/php5-fpm/piwik.tpl new file mode 100644 index 000000000..6b4a94a68 --- /dev/null +++ b/install/debian/8/templates/web/nginx/php5-fpm/piwik.tpl @@ -0,0 +1,64 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location = /favicon.ico { + try_files /favicon.ico =204; + } + + location / { + try_files $uri /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + valid_referers none blocked %domain_idn% %alias_idn%; + if ($invalid_referer) { + return 444; + } + expires max; + } + + location ~* ^/(?:index|piwik)\.php$ { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + include /etc/nginx/fastcgi_params; + } + } + + # Any other attempt to access PHP files returns a 404. + location ~* ^.+\.php$ { + return 404; + } + + # Return a 404 for all text files. + location ~* ^/(?:README|LICENSE[^.]*|LEGALNOTICE)(?:\.txt)*$ { + return 404; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/debian/8/templates/web/nginx/php5-fpm/pyrocms.stpl b/install/debian/8/templates/web/nginx/php5-fpm/pyrocms.stpl new file mode 100644 index 000000000..a6fc67556 --- /dev/null +++ b/install/debian/8/templates/web/nginx/php5-fpm/pyrocms.stpl @@ -0,0 +1,61 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location /installer { + try_files $uri $uri/ /installer/index.php; + } + + location / { + try_files $uri $uri/ /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + location = /robots.txt { access_log off; log_not_found off; } + location = /favicon.ico { access_log off; log_not_found off; } + location ~ /\. { access_log off; log_not_found off; deny all; } + location ~ ~$ { access_log off; log_not_found off; deny all; } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/debian/8/templates/web/nginx/php5-fpm/pyrocms.tpl b/install/debian/8/templates/web/nginx/php5-fpm/pyrocms.tpl new file mode 100644 index 000000000..68b378efd --- /dev/null +++ b/install/debian/8/templates/web/nginx/php5-fpm/pyrocms.tpl @@ -0,0 +1,57 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location /installer { + try_files $uri $uri/ /installer/index.php; + } + + location / { + try_files $uri $uri/ /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + location = /robots.txt { access_log off; log_not_found off; } + location = /favicon.ico { access_log off; log_not_found off; } + location ~ /\. { access_log off; log_not_found off; deny all; } + location ~ ~$ { access_log off; log_not_found off; deny all; } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/debian/8/templates/web/nginx/php5-fpm/wordpress.stpl b/install/debian/8/templates/web/nginx/php5-fpm/wordpress.stpl new file mode 100644 index 000000000..910c28b69 --- /dev/null +++ b/install/debian/8/templates/web/nginx/php5-fpm/wordpress.stpl @@ -0,0 +1,50 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/debian/8/templates/web/nginx/php5-fpm/wordpress.tpl b/install/debian/8/templates/web/nginx/php5-fpm/wordpress.tpl new file mode 100644 index 000000000..b143e53ba --- /dev/null +++ b/install/debian/8/templates/web/nginx/php5-fpm/wordpress.tpl @@ -0,0 +1,46 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/debian/8/templates/web/nginx/php5-fpm/wordpress2.stpl b/install/debian/8/templates/web/nginx/php5-fpm/wordpress2.stpl new file mode 100644 index 000000000..2822f8754 --- /dev/null +++ b/install/debian/8/templates/web/nginx/php5-fpm/wordpress2.stpl @@ -0,0 +1,62 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + location / { + try_files $uri $uri/ /index.php?$args; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/debian/8/templates/web/nginx/php5-fpm/wordpress2.tpl b/install/debian/8/templates/web/nginx/php5-fpm/wordpress2.tpl new file mode 100644 index 000000000..37b8be305 --- /dev/null +++ b/install/debian/8/templates/web/nginx/php5-fpm/wordpress2.tpl @@ -0,0 +1,58 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + location / { + try_files $uri $uri/ /index.php?$args; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/rhel/templates/web/nginx/proxy_ip.tpl b/install/debian/8/templates/web/nginx/proxy_ip.tpl similarity index 100% rename from install/rhel/templates/web/nginx/proxy_ip.tpl rename to install/debian/8/templates/web/nginx/proxy_ip.tpl diff --git a/install/debian/8/templates/web/php5-fpm/default.tpl b/install/debian/8/templates/web/php5-fpm/default.tpl new file mode 100644 index 000000000..44ccf7a42 --- /dev/null +++ b/install/debian/8/templates/web/php5-fpm/default.tpl @@ -0,0 +1,18 @@ +[%backend%] +listen = 127.0.0.1:%backend_port% +listen.allowed_clients = 127.0.0.1 + +user = %user% +group = %user% + +pm = dynamic +pm.max_children = 50 +pm.start_servers = 3 +pm.min_spare_servers = 2 +pm.max_spare_servers = 10 + +env[HOSTNAME] = $HOSTNAME +env[PATH] = /usr/local/bin:/usr/bin:/bin +env[TMP] = /tmp +env[TMPDIR] = /tmp +env[TEMP] = /tmp diff --git a/install/debian/8/templates/web/php5-fpm/no-php.tpl b/install/debian/8/templates/web/php5-fpm/no-php.tpl new file mode 100644 index 000000000..89487d5f5 --- /dev/null +++ b/install/debian/8/templates/web/php5-fpm/no-php.tpl @@ -0,0 +1,13 @@ +#[%backend%] +#user = %user% +#group = %user% +#listen = /dev/null + +#listen.owner = %user% +#listen.group = nginx + +#pm = dynamic +#pm.max_children = 50 +#pm.start_servers = 3 +#pm.min_spare_servers = 2 +#pm.max_spare_servers = 10 diff --git a/install/debian/8/templates/web/php5-fpm/socket.tpl b/install/debian/8/templates/web/php5-fpm/socket.tpl new file mode 100644 index 000000000..f0513da3e --- /dev/null +++ b/install/debian/8/templates/web/php5-fpm/socket.tpl @@ -0,0 +1,21 @@ +[%backend%] +listen = /var/run/php5-%backend%.sock +listen.allowed_clients = 127.0.0.1 + +user = %user% +group = %user% + +listen.owner = %user% +listen.group = nginx + +pm = dynamic +pm.max_children = 50 +pm.start_servers = 3 +pm.min_spare_servers = 2 +pm.max_spare_servers = 10 + +env[HOSTNAME] = $HOSTNAME +env[PATH] = /usr/local/bin:/usr/bin:/bin +env[TMP] = /tmp +env[TMPDIR] = /tmp +env[TEMP] = /tmp diff --git a/install/debian/8/templates/web/skel/document_errors/403.html b/install/debian/8/templates/web/skel/document_errors/403.html new file mode 100755 index 000000000..9c3f6baab --- /dev/null +++ b/install/debian/8/templates/web/skel/document_errors/403.html @@ -0,0 +1,29 @@ + + + 403 — Forbidden + + + + + + +

          %domain%

          + +

          403

          +

          Forbidden

          +
          + Unfortunately, you do not have permission to view this +
          + + + diff --git a/install/debian/8/templates/web/skel/document_errors/404.html b/install/debian/8/templates/web/skel/document_errors/404.html new file mode 100755 index 000000000..2cee77084 --- /dev/null +++ b/install/debian/8/templates/web/skel/document_errors/404.html @@ -0,0 +1,28 @@ + + + 404 — Not Found + + + + + + +

          %domain%

          +

          404

          +

          Page Not Found

          +
          + It seems that the page you were trying to reach does not exist anymore, or maybe it has just moved. + You can start again from the home or go back to previous page. +
          + + diff --git a/install/debian/8/templates/web/skel/document_errors/50x.html b/install/debian/8/templates/web/skel/document_errors/50x.html new file mode 100755 index 000000000..85ba648b7 --- /dev/null +++ b/install/debian/8/templates/web/skel/document_errors/50x.html @@ -0,0 +1,29 @@ + + + 500 — Internal Sever Error + + + + + + +

          %domain%

          + +

          500

          +

          Internal Server Error

          +
          + Sorry, something went wrong :( +
          + + + diff --git a/install/rhel/templates/web/skel/public_html/index.html b/install/debian/8/templates/web/skel/public_html/index.html similarity index 100% rename from install/rhel/templates/web/skel/public_html/index.html rename to install/debian/8/templates/web/skel/public_html/index.html diff --git a/install/rhel/templates/web/skel/public_html/robots.txt b/install/debian/8/templates/web/skel/public_html/robots.txt similarity index 100% rename from install/rhel/templates/web/skel/public_html/robots.txt rename to install/debian/8/templates/web/skel/public_html/robots.txt diff --git a/install/rhel/templates/web/skel/public_shtml/index.html b/install/debian/8/templates/web/skel/public_shtml/index.html similarity index 100% rename from install/rhel/templates/web/skel/public_shtml/index.html rename to install/debian/8/templates/web/skel/public_shtml/index.html diff --git a/install/rhel/templates/web/skel/public_shtml/robots.txt b/install/debian/8/templates/web/skel/public_shtml/robots.txt similarity index 100% rename from install/rhel/templates/web/skel/public_shtml/robots.txt rename to install/debian/8/templates/web/skel/public_shtml/robots.txt diff --git a/install/rhel/templates/web/suspend/.htaccess b/install/debian/8/templates/web/suspend/.htaccess similarity index 100% rename from install/rhel/templates/web/suspend/.htaccess rename to install/debian/8/templates/web/suspend/.htaccess diff --git a/install/debian/8/templates/web/suspend/index.html b/install/debian/8/templates/web/suspend/index.html new file mode 100755 index 000000000..9d4fa67b3 --- /dev/null +++ b/install/debian/8/templates/web/suspend/index.html @@ -0,0 +1,27 @@ + + + SUSPEND + + + + + + +

          SUSPEND

          +

          This site has been suspended

          +
          + Please contact technical support departament. +
          + + + diff --git a/install/rhel/templates/web/webalizer/webalizer.tpl b/install/debian/8/templates/web/webalizer/webalizer.tpl similarity index 100% rename from install/rhel/templates/web/webalizer/webalizer.tpl rename to install/debian/8/templates/web/webalizer/webalizer.tpl diff --git a/install/ubuntu/vsftpd.conf b/install/debian/8/vsftpd/vsftpd.conf similarity index 100% rename from install/ubuntu/vsftpd.conf rename to install/debian/8/vsftpd/vsftpd.conf index 9c3c2742f..0902899e7 100644 --- a/install/ubuntu/vsftpd.conf +++ b/install/debian/8/vsftpd/vsftpd.conf @@ -5,9 +5,9 @@ local_umask=002 anon_upload_enable=NO dirmessage_enable=YES xferlog_enable=YES -dual_log_enable=YES connect_from_port_20=YES xferlog_std_format=YES +dual_log_enable=YES chroot_local_user=YES listen=YES pam_service_name=vsftpd diff --git a/install/debian/apache2.readme.txt b/install/debian/apache2.readme.txt deleted file mode 100644 index b8d05cbe1..000000000 --- a/install/debian/apache2.readme.txt +++ /dev/null @@ -1,11 +0,0 @@ -# -# _| _| _|_|_|_| _|_|_| _|_|_|_|_| _|_| -# _| _| _| _| _| _| _| -# _| _| _|_|_| _|_| _| _|_|_|_| -# _| _| _| _| _| _| _| -# _| _|_|_|_| _|_|_| _| _| _| -# -# -# Server is manager by Vesta Control Panel. -# See /etc/apache2/conf.d/vesta.conf to get a full list of running vhosts. -# diff --git a/install/debian/certificate.crt b/install/debian/certificate.crt deleted file mode 100644 index 4a3230ac2..000000000 --- a/install/debian/certificate.crt +++ /dev/null @@ -1,22 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDqjCCApICCQCBAQdAxoNnAjANBgkqhkiG9w0BAQUFADCBljELMAkGA1UEBhMC -VVMxFjAUBgNVBAgMDU1hc3NhY2h1c2V0dHMxEzARBgNVBAcMClN3YW1wc2NvdHQx -EDAOBgNVBAoMB1Zlc3RhQ1AxCzAJBgNVBAsMAklUMRowGAYDVQQDDBFwYW5lbC52 -ZXN0YWNwLmNvbTEfMB0GCSqGSIb3DQEJARYQaW5mb0B2ZXN0YWNwLmNvbTAeFw0x -MzA5MjMwNzA0NDVaFw0xNDA5MjMwNzA0NDVaMIGWMQswCQYDVQQGEwJVUzEWMBQG -A1UECAwNTWFzc2FjaHVzZXR0czETMBEGA1UEBwwKU3dhbXBzY290dDEQMA4GA1UE -CgwHVmVzdGFDUDELMAkGA1UECwwCSVQxGjAYBgNVBAMMEXBhbmVsLnZlc3RhY3Au -Y29tMR8wHQYJKoZIhvcNAQkBFhBpbmZvQHZlc3RhY3AuY29tMIIBIjANBgkqhkiG -9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvu84meigHrwPmzEbFpKe/o8FTKwO5w1VL0HU -ILVW5EBGT76VEBqpWC+x0QrChHit14FV7m+hZRvhhkulXrknChTTNA500EVNZ5Wb -UpDWezZDivTKAHzzq0aUwKB230Tz+k3j+duBcbzwFwirnDXb5dE5RqzBOhiIvDw9 -mjP66UyH8RxFF+pTAPlcF18zWak7KnaDreyGknzy7m+Zqs07uLnb0wTgcwIcqREP -eqgw0E8xrEdjz1N9HIvxi+glfnjNgHja3cCYhe9ZCpDDr9ERXrEcULrqRuch6Zfv -QKoscG4dankbq0V4DfpMBYMTvFvFLLp/uWvwLjunzfu37XmBLQIDAQABMA0GCSqG -SIb3DQEBBQUAA4IBAQBl+GF4Ii+7cW0tWVTsDh0Kw+rjc9bEA0eF4p3LBLEsFRkP -Yeqp2t0g8RTAAiq3OyUWYISzOX8xu0i56/3jUFazABBjz0P0w2A0BfRZS5TAEwxJ -TS9zAgobBuLtTh3FDJJIRXLJOKLJZVUmi6D+8QIQVOox0925tMIxGc9CxLK05bIc -HUYdHsn1gDwmTWem/XED559eWV/vGnvf3Ea0EHU76kTQaLPkul2y8BTbbLaHSw96 -1xFc8x9gqxWTT70YmBpZIApmSzvOGVXqTduMY/CeEbmigo1/1i2YMVjePFEDYnmE -/f6rNQrtM9kgtE+glWdA7zHlaigKl3SVof1ETStB ------END CERTIFICATE----- diff --git a/install/debian/certificate.key b/install/debian/certificate.key deleted file mode 100644 index eb913d684..000000000 --- a/install/debian/certificate.key +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEowIBAAKCAQEAvu84meigHrwPmzEbFpKe/o8FTKwO5w1VL0HUILVW5EBGT76V -EBqpWC+x0QrChHit14FV7m+hZRvhhkulXrknChTTNA500EVNZ5WbUpDWezZDivTK -AHzzq0aUwKB230Tz+k3j+duBcbzwFwirnDXb5dE5RqzBOhiIvDw9mjP66UyH8RxF -F+pTAPlcF18zWak7KnaDreyGknzy7m+Zqs07uLnb0wTgcwIcqREPeqgw0E8xrEdj -z1N9HIvxi+glfnjNgHja3cCYhe9ZCpDDr9ERXrEcULrqRuch6ZfvQKoscG4dankb -q0V4DfpMBYMTvFvFLLp/uWvwLjunzfu37XmBLQIDAQABAoIBAF59YsSAJCWxqgOC -dMZh/z85JkVAbQuZRIvjhwg81eiVinZSedCDcUUMLXKnYYZPdrDM9+rM4dF4z843 -R3quJIzPq4n6kYK0mU7m8fwVY5+MRjbRV9qP+8LKZjlB8DIkHJ3FyEnRgKj5+NNd -Xhgra0y7kx3Pxrxqgdit80qJ6OVlN2gsMjUcDBhqQev9Xs8cKYjYc1uPtFw14B2G -5fsNE8cHJA+hH/aym7xTaEQlz/JOKn2GsH/dOhm3RM2QygdyrVOBBj6rKSi03LMb -7QOkDvZ3nBltxQKOqs2PkYyEAdqR4dMZIPNxye/k21iVovLeMVe4lG7BmNOD6XwB -+TOhYh0CgYEA9WyUeSNPP309Br65wg61GdapWmQIaj7HSZE06BWhp82PPwHaF1yY -p9hWgo6fDxwHiTSLeUqEPXJMaPG+RxvYFc7Lc3JjOKU4ezR9fqz01LLtWXHVVT/x -RZuogMyaDhIjhwMyu4mybpUMkBQ/B3DFufrzTv0y8ljAc0nlFsuXaPMCgYEAxymI -btxZFGES6UNG7ldEaihll9MpP22/VghUeAaia0qgnXlYkbngIIhGpGJUkvZ2pduE -tfw2S20k38qvrWXx/NhLxmiVSIvq5TFi/22dfT20kfrdCcnkrp/tRpeR72IrQ6Kx -+6l7QHV5Gjcc4rvNc8mw7itVu+StgCYx+koD9V8CgYA8sThaaLf9XGxOEbaAXgC9 -Pg+tcdV+6L2B3O33gvnyNGx7SWr0ogqCX4atTLXbF7RpYtwnB52CUJTC0x2aGjGq -2vQHPb95z6oTFdz/CaiWPRVjLDp0lZaF/0OBbpeeaS/uAIV4SUod/LAZpVgc7++F -2aB35TfHJNma6ShFJd3wrwKBgBH444DtjXRTVjuKgKodYeUahCBxQ7Wfl7aRxd2W -66027MuJGb78wQbuhUFsRimE6CwLZSxu+A9SaBNx3OyO2Ilyk1PyOBZ12dqY3FAk -eiPFH7hUpQGvIF3JvMW0A81QVIsj8V++aYrljuoYsxiaze128+pqKrBr8GQyDiyB -5V2NAoGBAIPWovM20cbx6LpEuFN5Pmkl500F6sTc8F3DQVRe3JhwVhqHQXv7tUE1 -VHMqpMybUQin8q/RXvJ0vr2sQEe2fVC2a0FWJTqww1eMwu1V9ppUJAfXfaYWY+XJ -4d3myajakr0Eh3ia+IrSBcMRJ2sD3sL5KQC6jbD0R8odex4syiu2 ------END RSA PRIVATE KEY----- diff --git a/install/debian/dovecot.conf b/install/debian/dovecot.conf deleted file mode 100644 index 005e97aaa..000000000 --- a/install/debian/dovecot.conf +++ /dev/null @@ -1,28 +0,0 @@ -protocols = imap pop3 -listen = *, :: -base_dir = /var/run/dovecot/ -!include conf.d/*.conf - - namespace { - type = private - separator = / - prefix = - inbox = yes - - mailbox Sent { - auto = subscribe - special_use = \Sent - } - mailbox Drafts { - auto = subscribe - special_use = \Drafts - } - mailbox Trash { - auto = subscribe - special_use = \Trash - } - mailbox Junk { - auto = subscribe - special_use = \Junk - } - } diff --git a/install/debian/freshclam.conf b/install/debian/freshclam.conf deleted file mode 100644 index 5e6ca56c1..000000000 --- a/install/debian/freshclam.conf +++ /dev/null @@ -1,27 +0,0 @@ -# Automatically created by the clamav-freshclam postinst -# Comments will get lost when you reconfigure the clamav-freshclam package - -DatabaseOwner clamav -UpdateLogFile /var/log/clamav/freshclam.log -LogVerbose false -LogSyslog false -LogFacility LOG_LOCAL6 -LogFileMaxSize 0 -LogTime true -Foreground false -Debug false -MaxAttempts 5 -DatabaseDirectory /var/lib/clamav -DNSDatabaseInfo current.cvd.clamav.net -AllowSupplementaryGroups false -PidFile /var/run/clamav/freshclam.pid -ConnectTimeout 30 -ReceiveTimeout 30 -TestDatabases yes -ScriptedUpdates yes -CompressLocalDatabase no -Bytecode true -# Check for new database 24 times a day -Checks 24 -DatabaseMirror db.local.clamav.net -DatabaseMirror database.clamav.net diff --git a/install/debian/nginx.readme.txt b/install/debian/nginx.readme.txt deleted file mode 100644 index e5db79e79..000000000 --- a/install/debian/nginx.readme.txt +++ /dev/null @@ -1,11 +0,0 @@ -# -# _| _| _|_|_|_| _|_|_| _|_|_|_|_| _|_| -# _| _| _| _| _| _| _| -# _| _| _|_|_| _|_| _| _|_|_|_| -# _| _| _| _| _| _| _| -# _| _|_|_|_| _|_|_| _| _| _| -# -# -# Server is manager by Vesta Control Panel. -# See /etc/nginx/conf.d/vesta.conf to get a full list of running vhosts. -# diff --git a/install/debian/sudoers.conf b/install/debian/sudoers.conf deleted file mode 100644 index efe9ce9c9..000000000 --- a/install/debian/sudoers.conf +++ /dev/null @@ -1,32 +0,0 @@ -# -# This file MUST be edited with the 'visudo' command as root. -# -# Please consider adding local content in /etc/sudoers.d/ instead of -# directly modifying this file. -# -# See the man page for details on how to write a sudoers file. -# -Defaults env_reset -Defaults mail_badpass -Defaults secure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" -Defaults env_keep="VESTA" -Defaults:admin !requiretty - -# Host alias specification - -# User alias specification - -# Cmnd alias specification - -# User privilege specification -root ALL=(ALL:ALL) ALL - -# Members of the admin group may gain root privileges -%admin ALL=(ALL) ALL - -# Allow members of group sudo to execute any command -%sudo ALL=(ALL:ALL) ALL - -# See sudoers(5) for more information on "#include" directives: - -#includedir /etc/sudoers.d diff --git a/install/debian/vesta.conf b/install/debian/vesta.conf deleted file mode 100644 index 6c148bd17..000000000 --- a/install/debian/vesta.conf +++ /dev/null @@ -1,24 +0,0 @@ -WEB_SYSTEM='apache2' -WEB_RGROUPS='www-data' -WEB_PORT='8080' -WEB_SSL='mod_ssl' -WEB_SSL_PORT='8443' -PROXY_SYSTEM='nginx' -PROXY_PORT='80' -PROXY_SSL_PORT='443' -FTP_SYSTEM='vsftpd' -MAIL_SYSTEM='exim4' -IMAP_SYSTEM='dovecot' -ANTIVIRUS_SYSTEM='clamav-daemon' -ANTISPAM_SYSTEM='spamassassin' -DB_SYSTEM='mysql' -DNS_SYSTEM='bind9' -STATS_SYSTEM='webalizer,awstats' -BACKUP_SYSTEM='local' -CRON_SYSTEM='cron' -DISK_QUOTA='no' -FIREWALL_SYSTEM='iptables' -FIREWALL_EXTENSION='fail2ban' -REPOSITORY='cmmnt' -VERSION='0.9.8' -LANGUAGE='en' diff --git a/install/debian/whmcs-module.php b/install/debian/whmcs-module.php deleted file mode 100644 index 1cb250611..000000000 --- a/install/debian/whmcs-module.php +++ /dev/null @@ -1,359 +0,0 @@ - array( "Type" => "text", "Default" => "default"), - "SSH Access" => array( "Type" => "yesno", "Description" => "Tick to grant access", ), - "IP Address (optional)" => array( "Type" => "text" ), - ); - return $configarray; - -} - -function vesta_CreateAccount($params) { - - // Execute only if there is assigned server - if ($params["server"] == 1) { - - // Prepare variables - $postvars = array( - 'user' => $params["serverusername"], - 'password' => $params["serverpassword"], - 'hash' => $params["serveraccesshash"], - 'cmd' => 'v-add-user', - 'arg1' => $params["username"], - 'arg2' => $params["password"], - 'arg3' => $params["clientsdetails"]["email"], - 'arg4' => $params["configoption1"], - 'arg5' => $params["clientsdetails"]["firstname"], - 'arg6' => $params["clientsdetails"]["lastname"], - ); - $postdata = http_build_query($postvars); - - // Create user account - $curl = curl_init(); - curl_setopt($curl, CURLOPT_URL, 'https://' . $params["serverhostname"] . ':8083/api/'); - curl_setopt($curl, CURLOPT_RETURNTRANSFER,true); - curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false); - curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, false); - curl_setopt($curl, CURLOPT_POST, true); - curl_setopt($curl, CURLOPT_POSTFIELDS, $postdata); - $answer = curl_exec($curl); - - logModuleCall('vesta','CreateAccount_UserAccount','https://'.$params["serverhostname"].':8083/api/'.$postdata,$answer); - - // Enable ssh access - if(($answer == 'OK') && ($params["configoption2"] == 'on')) { - $postvars = array( - 'user' => $params["serverusername"], - 'password' => $params["serverpassword"], - 'hash' => $params["serveraccesshash"], - 'cmd' => 'v-change-user-shell', - 'arg1' => $params["username"], - 'arg2' => 'bash' - ); - $postdata = http_build_query($postvars); - $curl = curl_init(); - curl_setopt($curl, CURLOPT_URL, 'https://' . $params["serverhostname"] . ':8083/api/'); - curl_setopt($curl, CURLOPT_RETURNTRANSFER,true); - curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false); - curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, false); - curl_setopt($curl, CURLOPT_POST, true); - curl_setopt($curl, CURLOPT_POSTFIELDS, $postdata); - $answer = curl_exec($curl); - - logModuleCall('vesta','CreateAccount_EnableSSH','https://'.$params["serverhostname"].':8083/api/'.$postdata,$answer); - } - - // Add domain - if(($answer == 'OK') && (!empty($params["domain"]))) { - $postvars = array( - 'user' => $params["serverusername"], - 'password' => $params["serverpassword"], - 'hash' => $params["serveraccesshash"], - 'cmd' => 'v-add-domain', - 'arg1' => $params["username"], - 'arg2' => $params["domain"], - 'arg3' => $params["configoption3"], - ); - $postdata = http_build_query($postvars); - $curl = curl_init(); - curl_setopt($curl, CURLOPT_URL, 'https://' . $params["serverhostname"] . ':8083/api/'); - curl_setopt($curl, CURLOPT_RETURNTRANSFER,true); - curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false); - curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, false); - curl_setopt($curl, CURLOPT_POST, true); - curl_setopt($curl, CURLOPT_POSTFIELDS, $postdata); - $answer = curl_exec($curl); - - logModuleCall('vesta','CreateAccount_AddDomain','https://'.$params["serverhostname"].':8083/api/'.$postdata,$answer); - } - } - - if($answer == 'OK') { - $result = "success"; - } else { - $result = $answer; - } - - return $result; -} - -function vesta_TerminateAccount($params) { - - // Execute only if there is assigned server - if ($params["server"] == 1) { - - // Prepare variables - $postvars = array( - 'user' => $params["serverusername"], - 'password' => $params["serverpassword"], - 'hash' => $params["serveraccesshash"], - 'cmd' => 'v-delete-user', - 'arg1' => $params["username"] - ); - $postdata = http_build_query($postvars); - - // Delete user account - $curl = curl_init(); - curl_setopt($curl, CURLOPT_URL, 'https://' . $params["serverhostname"] . ':8083/api/'); - curl_setopt($curl, CURLOPT_RETURNTRANSFER,true); - curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false); - curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, false); - curl_setopt($curl, CURLOPT_POST, true); - curl_setopt($curl, CURLOPT_POSTFIELDS, $postdata); - $answer = curl_exec($curl); - } - - logModuleCall('vesta','TerminateAccount','https://'.$params["serverhostname"].':8083/api/'.$postdata,$answer); - - if($answer == 'OK') { - $result = "success"; - } else { - $result = $answer; - } - - return $result; -} - -function vesta_SuspendAccount($params) { - - // Execute only if there is assigned server - if ($params["server"] == 1) { - - // Prepare variables - $postvars = array( - 'user' => $params["serverusername"], - 'password' => $params["serverpassword"], - 'hash' => $params["serveraccesshash"], - 'cmd' => 'v-suspend-user', - 'arg1' => $params["username"] - ); - $postdata = http_build_query($postvars); - - // Susupend user account - $curl = curl_init(); - curl_setopt($curl, CURLOPT_URL, 'https://' . $params["serverhostname"] . ':8083/api/'); - curl_setopt($curl, CURLOPT_RETURNTRANSFER,true); - curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false); - curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, false); - curl_setopt($curl, CURLOPT_POST, true); - curl_setopt($curl, CURLOPT_POSTFIELDS, $postdata); - $answer = curl_exec($curl); - } - - logModuleCall('vesta','SuspendAccount','https://'.$params["serverhostname"].':8083/api/'.$postdata,$answer); - - if($answer == 'OK') { - $result = "success"; - } else { - $result = $answer; - } - - return $result; -} - -function vesta_UnsuspendAccount($params) { - - // Execute only if there is assigned server - if ($params["server"] == 1) { - - // Prepare variables - $postvars = array( - 'user' => $params["serverusername"], - 'password' => $params["serverpassword"], - 'hash' => $params["serveraccesshash"], - 'cmd' => 'v-unsuspend-user', - 'arg1' => $params["username"] - ); - $postdata = http_build_query($postvars); - - // Unsusupend user account - $curl = curl_init(); - curl_setopt($curl, CURLOPT_URL, 'https://' . $params["serverhostname"] . ':8083/api/'); - curl_setopt($curl, CURLOPT_RETURNTRANSFER,true); - curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false); - curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, false); - curl_setopt($curl, CURLOPT_POST, true); - curl_setopt($curl, CURLOPT_POSTFIELDS, $postdata); - $answer = curl_exec($curl); - } - - logModuleCall('vesta','UnsuspendAccount','https://'.$params["serverhostname"].':8083/api/'.$postdata,$answer); - - if($answer == 'OK') { - $result = "success"; - } else { - $result = $answer; - } - - return $result; -} - -function vesta_ChangePassword($params) { - - // Execute only if there is assigned server - if ($params["server"] == 1) { - - // Prepare variables - $postvars = array( - 'user' => $params["serverusername"], - 'password' => $params["serverpassword"], - 'hash' => $params["serveraccesshash"], - 'cmd' => 'v-change-user-password', - 'arg1' => $params["username"], - 'arg2' => $params["password"] - ); - $postdata = http_build_query($postvars); - - // Change user package - $curl = curl_init(); - curl_setopt($curl, CURLOPT_URL, 'https://' . $params["serverhostname"] . ':8083/api/'); - curl_setopt($curl, CURLOPT_RETURNTRANSFER,true); - curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false); - curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, false); - curl_setopt($curl, CURLOPT_POST, true); - curl_setopt($curl, CURLOPT_POSTFIELDS, $postdata); - $answer = curl_exec($curl); - } - - logModuleCall('vesta','ChangePassword','https://'.$params["serverhostname"].':8083/api/'.$postdata,$answer); - - if($answer == 'OK') { - $result = "success"; - } else { - $result = $answer; - } - - return $result; -} - -function vesta_ChangePackage($params) { - - // Execute only if there is assigned server - if ($params["server"] == 1) { - - // Prepare variables - $postvars = array( - 'user' => $params["serverusername"], - 'password' => $params["serverpassword"], - 'hash' => $params["serveraccesshash"], - 'cmd' => 'v-change-user-package', - 'arg1' => $params["username"], - 'arg2' => $params["configoption1"] - ); - $postdata = http_build_query($postvars); - - // Change user package - $curl = curl_init(); - curl_setopt($curl, CURLOPT_URL, 'https://' . $params["serverhostname"] . ':8083/api/'); - curl_setopt($curl, CURLOPT_RETURNTRANSFER,true); - curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false); - curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, false); - curl_setopt($curl, CURLOPT_POST, true); - curl_setopt($curl, CURLOPT_POSTFIELDS, $postdata); - $answer = curl_exec($curl); - } - - logModuleCall('vesta','ChangePackage','https://'.$params["serverhostname"].':8083/api/'.$postdata,$answer); - - if($answer == 'OK') { - $result = "success"; - } else { - $result = $answer; - } - - return $result; -} - -function vesta_ClientArea($params) { - - $code = '
          - - - - -'; - return $code; - -} - -function vesta_AdminLink($params) { - - $code = '
          - - - -'; - return $code; - -} - -function vesta_LoginLink($params) { - - echo "control panel"; - -} - -function vesta_UsageUpdate($params) { - - // Prepare variables - $postvars = array( - 'user' => $params["serverusername"], - 'password' => $params["serverpassword"], - 'hash' => $params["serveraccesshash"], - 'cmd' => 'v-list-users', - 'arg1' => 'json' - ); - $postdata = http_build_query($postvars); - - // Get user stats - $curl = curl_init(); - curl_setopt($curl, CURLOPT_URL, 'https://' . $params["serverhostname"] . ':8083/api/'); - curl_setopt($curl, CURLOPT_RETURNTRANSFER,true); - curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false); - curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, false); - curl_setopt($curl, CURLOPT_POST, true); - curl_setopt($curl, CURLOPT_POSTFIELDS, $postdata); - $answer = curl_exec($curl); - - // Decode json data - $results = json_decode($answer, true); - - // Loop through results and update DB - foreach ($results AS $user=>$values) { - update_query("tblhosting",array( - "diskusage"=>$values['U_DISK'], - "disklimit"=>$values['DISK_QUOTA'], - "bwusage"=>$values['U_BANDWIDTH'], - "bwlimit"=>$values['BANDWIDTH'], - "lastupdate"=>"now()", - ),array("server"=>$params['serverid'], "username"=>$user)); - } - -} - -?> diff --git a/install/rhel/5/GPG.txt b/install/rhel/5/GPG.txt new file mode 100644 index 000000000..33bb1ff26 --- /dev/null +++ b/install/rhel/5/GPG.txt @@ -0,0 +1,30 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.5 (GNU/Linux) + +mQGiBExUOVkRBACPJeB3bdrAggHlFpkaB1aRDXDz7clRg6jyEzdMYHhrniSyjhAH ++b53zE4iapCHFIamEG2Fa7zS2lSx7068AmqHsZK5jwmyhTVVYuTtbebj1C4Y5ToW +icHhy4ullB7qeDmAod6EY4YSx2kYO3dR/QLk5QM4lWuV/OLdXWTeoKiiYwCg0UAP +yUkBXgNcKXrFqoJelmG3JEMEAIYM7CGwVd47FsM1UCu56HNQPErxLoUPBUlAQFtx +OMOFDMEm7qH7ve8FgGGRL9oHF7mSJ3y7HgM1BF5MHkKz6FjDrT1U5+Lub6oI2e90 +gfCMGlQAzUm9o+fijfbhKoEQ/xQRkUoqWEaf9zlFx1/4+NH+Qz/L8ZDTHvSLvUgt +HyZlA/916St5suAUugXu9PeLRVqboiHjhz0JWKneQEQ2QcTu8lhHsu/mZTWL9FYn +XwtiCJLZT8bpBSfl8Oeqhof1+sPgnv7t/LuKQ6JJmyJ46Sa453wfrs+xs32hKAe+ +ZN0VGBmHe7NhuhW/LdM0KMMr/LHuJJJAgmt+XVHi2RFwsZvdMbQkVmVzdGEgUGFj +a2FnZXMgPGJ1aWxkZXJAdmVzdGFjcC5jb20+iGAEExECACAFAkxUOVkCGwMGCwkI +BwMCBBUCCAMEFgIDAQIeAQIXgAAKCRBbjeFzoXeCtp6dAKDQfeTPHi6hCgg4L+sx +LEjXvVdLOwCfe9yfr+en+uz6qst0QBT2cAwB+q+5Ag0ETFQ5bBAIAJYZa9pV9l/R +OUFgIvdJd1mvzJpRAXsRBBJc22WuOHp22Uj+lMKrJMTRQZvFBvk9s7Mb1/ACXrL4 +vIbsKqXNAlVFp9kF1tKV2ejZ1MrJaQ4819bIkyG0lJzjl6u9lzJopF7ie00YHKC6 +1rltLaevfFjUXq1DoYZBg42hT/SOj+3+2D0e9qcxeuxXbsjnvwtxxUkWcP/ftOSt +HsAAbM1YtwGl9+fZLWG9+WIKNOE9kp+h2ywZtFA4v/Ms2op7oZGAL7C95k1EgLrH +mOZ0B2oKOLctV1z9keWksPN/osyG7Mg8ljv8zF3XwQFqHOHRntDqSWoFBMvJBkNS +vtm6u5WyKd8ABAsH/0RbeWVA+JqpZ24Rl57XoDRPRzno0m0EnkJMXr22uBq1lPg8 +VkadrGOshFXpM3Rho57f3U7fwKmShQXGEV7RHsWcxcfwOSKVJtI468sDuYXc2l1f +5nFo+rCtVh3BBq+JtZFKX0x53BesCT/M7l33Dfm9MDi34tEdPTPjumBIH1dowYdv +9/2HPlPp4NZte7gOO/VIAiS+jJ30aBn09t8duW5md7/rkOPIM5It05LGCLjb9hVm +R9zTwzw30fIrkeyWZdAbk76lH8u8j6PX30U6RRzb33+XIFR4ab3nlyqOQOpoTqyG +cs7B02sgBbyC+RG1EYfcelSEvLXkR8mjcqjs+MCISQQYEQIACQUCTFQ5bAIbDAAK +CRBbjeFzoXeCtlpcAKDLh59svtq/Gn99O9ZZw0nBjWv6sACfffDxPhCP1F852Jab +d8P1WGhr2Q8= +=Z1Jj +-----END PGP PUBLIC KEY BLOCK----- diff --git a/install/rhel/clamd.conf b/install/rhel/5/clamav/clamd.conf similarity index 100% rename from install/rhel/clamd.conf rename to install/rhel/5/clamav/clamd.conf diff --git a/install/rhel/5/clamav/clamd.service b/install/rhel/5/clamav/clamd.service new file mode 100644 index 000000000..fdb3af7fd --- /dev/null +++ b/install/rhel/5/clamav/clamd.service @@ -0,0 +1,12 @@ +[Unit] +Description = clamd scanner (clamd) daemon +After = syslog.target nss-lookup.target network.target + +[Service] +Type = simple +ExecStart = /usr/sbin/clamd -c /etc/clamd.conf --nofork=yes +Restart = on-failure +PrivateTmp = true + +[Install] +WantedBy=multi-user.target diff --git a/install/rhel/freshclam.conf b/install/rhel/5/clamav/freshclam.conf similarity index 100% rename from install/rhel/freshclam.conf rename to install/rhel/5/clamav/freshclam.conf diff --git a/install/rhel/5/dovecot.tar.gz b/install/rhel/5/dovecot.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..430dbc3488efdf225540151192da124cfe4a7dfe GIT binary patch literal 439 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

          4#gFY{Hifuu@N@Uq2 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 literal 0 HcmV?d00001 diff --git a/install/ubuntu/firewall/ports.conf b/install/rhel/5/firewall/ports.conf similarity index 93% rename from install/ubuntu/firewall/ports.conf rename to install/rhel/5/firewall/ports.conf index e970f91de..a6ef4dae5 100644 --- a/install/ubuntu/firewall/ports.conf +++ b/install/rhel/5/firewall/ports.conf @@ -11,6 +11,6 @@ PROTOCOL='TCP' PORT='143' PROTOCOL='TCP' PORT='3306' PROTOCOL='TCP' PORT='5432' PROTOCOL='TCP' PORT='8080' -PROTOCOL='TCP' PORT='8443' +PROTOCOL='TCP' PORT='8433' PROTOCOL='TCP' PORT='8083' PROTOCOL='TCP' PORT='12000:12100' diff --git a/install/ubuntu/firewall/rules.conf b/install/rhel/5/firewall/rules.conf similarity index 89% rename from install/ubuntu/firewall/rules.conf rename to install/rhel/5/firewall/rules.conf index 60136e1a5..956c2e1d9 100644 --- a/install/ubuntu/firewall/rules.conf +++ b/install/rhel/5/firewall/rules.conf @@ -1,6 +1,6 @@ RULE='1' ACTION='ACCEPT' PROTOCOL='ICMP' PORT='0' IP='0.0.0.0/0' COMMENT='PING' SUSPENDED='no' TIME='17:13:48' DATE='2014-09-16' RULE='2' ACTION='ACCEPT' PROTOCOL='TCP' PORT='8083' IP='0.0.0.0/0' COMMENT='VESTA' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' -RULE='3' ACTION='ACCEPT' PROTOCOL='TCP' PORT='3306,5432' IP='127.0.0.1/32' COMMENT='DB' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' +RULE='3' ACTION='ACCEPT' PROTOCOL='TCP' PORT='3306,5432' IP='0.0.0.0/0' COMMENT='DB' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' RULE='4' ACTION='ACCEPT' PROTOCOL='TCP' PORT='143,993' IP='0.0.0.0/0' COMMENT='IMAP' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' RULE='5' ACTION='ACCEPT' PROTOCOL='TCP' PORT='110,995' IP='0.0.0.0/0' COMMENT='POP3' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' RULE='6' ACTION='ACCEPT' PROTOCOL='TCP' PORT='25,465,587,2525' IP='0.0.0.0/0' COMMENT='SMTP' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' diff --git a/install/rhel/httpd.conf b/install/rhel/5/httpd/httpd.conf similarity index 100% rename from install/rhel/httpd.conf rename to install/rhel/5/httpd/httpd.conf diff --git a/install/rhel/5/httpd/ruid2.conf b/install/rhel/5/httpd/ruid2.conf new file mode 100644 index 000000000..42f908a85 --- /dev/null +++ b/install/rhel/5/httpd/ruid2.conf @@ -0,0 +1,8 @@ +LoadModule ruid2_module modules/mod_ruid2.so + + + RMode config + RDefaultUidGid apache apache + RUidGid apache apache + RGroups apache + diff --git a/install/rhel/httpd-ssl.conf b/install/rhel/5/httpd/ssl.conf similarity index 100% rename from install/rhel/httpd-ssl.conf rename to install/rhel/5/httpd/ssl.conf diff --git a/install/rhel/httpd-status.conf b/install/rhel/5/httpd/status.conf similarity index 100% rename from install/rhel/httpd-status.conf rename to install/rhel/5/httpd/status.conf diff --git a/install/rhel/httpd.log b/install/rhel/5/logrotate/httpd similarity index 100% rename from install/rhel/httpd.log rename to install/rhel/5/logrotate/httpd diff --git a/install/rhel/5/logrotate/nginx b/install/rhel/5/logrotate/nginx new file mode 100644 index 000000000..b1da1bf16 --- /dev/null +++ b/install/rhel/5/logrotate/nginx @@ -0,0 +1,12 @@ +/var/log/nginx/*log /var/log/nginx/domains/*log { + create 0644 nginx nginx + daily + rotate 10 + missingok + notifempty + compress + sharedscripts + postrotate + [ -f /var/run/nginx.pid ] && kill -USR1 `cat /var/run/nginx.pid` + endscript +} diff --git a/install/ubuntu/vesta.log b/install/rhel/5/logrotate/vesta similarity index 100% rename from install/ubuntu/vesta.log rename to install/rhel/5/logrotate/vesta diff --git a/install/rhel/5/mariadb/my-large.cnf b/install/rhel/5/mariadb/my-large.cnf new file mode 100644 index 000000000..4e6c2225c --- /dev/null +++ b/install/rhel/5/mariadb/my-large.cnf @@ -0,0 +1,38 @@ +[mysqld] +datadir=/var/lib/mysql +socket=/var/lib/mysql/mysql.sock +symbolic-links=0 + +skip-external-locking +key_buffer_size = 256M +max_allowed_packet = 32M +table_open_cache = 256 +sort_buffer_size = 1M +read_buffer_size = 1M +read_rnd_buffer_size = 4M +myisam_sort_buffer_size = 64M +thread_cache_size = 8 +query_cache_size= 16M +thread_concurrency = 8 + +#innodb_use_native_aio = 0 +innodb_file_per_table + +max_connections=200 +max_user_connections=50 +wait_timeout=10 +interactive_timeout=50 +long_query_time=5 + +#slow_query_log=1 +#slow_query_log_file=/var/log/mysql-slow-queries.log + + +[mysqld_safe] +log-error=/var/log/mariadb/mariadb.log +pid-file=/var/run/mariadb/mariadb.pid + +# +# include all files from the config directory +# +!includedir /etc/my.cnf.d diff --git a/install/rhel/5/mariadb/my-medium.cnf b/install/rhel/5/mariadb/my-medium.cnf new file mode 100644 index 000000000..fa255ec52 --- /dev/null +++ b/install/rhel/5/mariadb/my-medium.cnf @@ -0,0 +1,37 @@ +[mysqld] +datadir=/var/lib/mysql +socket=/var/lib/mysql/mysql.sock +symbolic-links=0 + +skip-external-locking +key_buffer_size = 16M +max_allowed_packet = 16M +table_open_cache = 64 +sort_buffer_size = 512K +net_buffer_length = 8K +read_buffer_size = 256K +read_rnd_buffer_size = 512K +myisam_sort_buffer_size = 8M + +#innodb_use_native_aio = 0 +innodb_file_per_table + +max_connections=70 +max_user_connections=30 +wait_timeout=10 +interactive_timeout=50 +long_query_time=5 + +#slow_query_log=1 +#slow_query_log_file=/var/log/mysql-slow-queries.log + + + +[mysqld_safe] +log-error=/var/log/mariadb/mariadb.log +pid-file=/var/run/mariadb/mariadb.pid + +# +# include all files from the config directory +# +!includedir /etc/my.cnf.d diff --git a/install/rhel/5/mariadb/my-small.cnf b/install/rhel/5/mariadb/my-small.cnf new file mode 100644 index 000000000..7d2fdc1b3 --- /dev/null +++ b/install/rhel/5/mariadb/my-small.cnf @@ -0,0 +1,35 @@ +[mysqld] +datadir=/var/lib/mysql +socket=/var/lib/mysql/mysql.sock +symbolic-links=0 + +skip-external-locking +key_buffer_size = 32K +max_allowed_packet = 8M +table_open_cache = 4 +sort_buffer_size = 128K +read_buffer_size = 256K +read_rnd_buffer_size = 256K +net_buffer_length = 2K +thread_stack = 240K + +#innodb_use_native_aio = 0 +innodb_file_per_table + +max_connections=50 +max_user_connections=25 +wait_timeout=10 +interactive_timeout=50 +long_query_time=5 + +#slow_query_log=1 +#slow_query_log_file=/var/log/mysql-slow-queries.log + +[mysqld_safe] +log-error=/var/log/mariadb/mariadb.log +pid-file=/var/run/mariadb/mariadb.pid + +# +# include all files from the config directory +# +!includedir /etc/my.cnf.d diff --git a/install/rhel/monit/clamd.conf b/install/rhel/5/monit/clamd.conf similarity index 100% rename from install/rhel/monit/clamd.conf rename to install/rhel/5/monit/clamd.conf diff --git a/install/rhel/monit/dovecot.conf b/install/rhel/5/monit/dovecot.conf similarity index 100% rename from install/rhel/monit/dovecot.conf rename to install/rhel/5/monit/dovecot.conf diff --git a/install/rhel/monit/exim.conf b/install/rhel/5/monit/exim.conf similarity index 100% rename from install/rhel/monit/exim.conf rename to install/rhel/5/monit/exim.conf diff --git a/install/rhel/monit/httpd.conf b/install/rhel/5/monit/httpd.conf similarity index 100% rename from install/rhel/monit/httpd.conf rename to install/rhel/5/monit/httpd.conf diff --git a/install/rhel/monit/mysql.conf b/install/rhel/5/monit/mysql.conf similarity index 100% rename from install/rhel/monit/mysql.conf rename to install/rhel/5/monit/mysql.conf diff --git a/install/rhel/monit/nginx.conf b/install/rhel/5/monit/nginx.conf similarity index 100% rename from install/rhel/monit/nginx.conf rename to install/rhel/5/monit/nginx.conf diff --git a/install/rhel/monit/spamassassin.conf b/install/rhel/5/monit/spamassassin.conf similarity index 100% rename from install/rhel/monit/spamassassin.conf rename to install/rhel/5/monit/spamassassin.conf diff --git a/install/rhel/monit/sshd.conf b/install/rhel/5/monit/sshd.conf similarity index 100% rename from install/rhel/monit/sshd.conf rename to install/rhel/5/monit/sshd.conf diff --git a/install/rhel/monit/vesta-nginx.conf b/install/rhel/5/monit/vesta-nginx.conf similarity index 100% rename from install/rhel/monit/vesta-nginx.conf rename to install/rhel/5/monit/vesta-nginx.conf diff --git a/install/rhel/monit/vesta-php.conf b/install/rhel/5/monit/vesta-php.conf similarity index 100% rename from install/rhel/monit/vesta-php.conf rename to install/rhel/5/monit/vesta-php.conf diff --git a/install/rhel/5/mysqld/my-large.cnf b/install/rhel/5/mysqld/my-large.cnf new file mode 100644 index 000000000..b548eeb87 --- /dev/null +++ b/install/rhel/5/mysqld/my-large.cnf @@ -0,0 +1,38 @@ +[mysqld] +datadir=/var/lib/mysql +socket=/var/lib/mysql/mysql.sock +symbolic-links=0 + +skip-external-locking +key_buffer_size = 256M +max_allowed_packet = 32M +table_open_cache = 256 +sort_buffer_size = 1M +read_buffer_size = 1M +read_rnd_buffer_size = 4M +myisam_sort_buffer_size = 64M +thread_cache_size = 8 +query_cache_size= 16M +thread_concurrency = 8 + +#innodb_use_native_aio = 0 +innodb_file_per_table + +max_connections=200 +max_user_connections=50 +wait_timeout=10 +interactive_timeout=50 +long_query_time=5 + +#slow_query_log=1 +#slow_query_log_file=/var/log/mysql-slow-queries.log + + +[mysqld_safe] +log-error=/var/log/mysqld.log +pid-file=/var/run/mysqld/mysqld.pid + +# +# include all files from the config directory +# +!includedir /etc/my.cnf.d diff --git a/install/rhel/5/mysqld/my-medium.cnf b/install/rhel/5/mysqld/my-medium.cnf new file mode 100644 index 000000000..e5f2677fc --- /dev/null +++ b/install/rhel/5/mysqld/my-medium.cnf @@ -0,0 +1,37 @@ +[mysqld] +datadir=/var/lib/mysql +socket=/var/lib/mysql/mysql.sock +symbolic-links=0 + +skip-external-locking +key_buffer_size = 16M +max_allowed_packet = 16M +table_open_cache = 64 +sort_buffer_size = 512K +net_buffer_length = 8K +read_buffer_size = 256K +read_rnd_buffer_size = 512K +myisam_sort_buffer_size = 8M + +#innodb_use_native_aio = 0 +innodb_file_per_table + +max_connections=70 +max_user_connections=30 +wait_timeout=10 +interactive_timeout=50 +long_query_time=5 + +#slow_query_log=1 +#slow_query_log_file=/var/log/mysql-slow-queries.log + + + +[mysqld_safe] +log-error=/var/log/mysqld.log +pid-file=/var/run/mysqld/mysqld.pid + +# +# include all files from the config directory +# +!includedir /etc/my.cnf.d diff --git a/install/rhel/5/mysqld/my-small.cnf b/install/rhel/5/mysqld/my-small.cnf new file mode 100644 index 000000000..52a3d33a6 --- /dev/null +++ b/install/rhel/5/mysqld/my-small.cnf @@ -0,0 +1,35 @@ +[mysqld] +datadir=/var/lib/mysql +socket=/var/lib/mysql/mysql.sock +symbolic-links=0 + +skip-external-locking +key_buffer_size = 32K +max_allowed_packet = 8M +table_open_cache = 4 +sort_buffer_size = 128K +read_buffer_size = 256K +read_rnd_buffer_size = 256K +net_buffer_length = 2K +thread_stack = 240K + +#innodb_use_native_aio = 0 +innodb_file_per_table + +max_connections=50 +max_user_connections=25 +wait_timeout=10 +interactive_timeout=50 +long_query_time=5 + +#slow_query_log=1 +#slow_query_log_file=/var/log/mysql-slow-queries.log + +[mysqld_safe] +log-error=/var/log/mysqld.log +pid-file=/var/run/mysqld/mysqld.pid + +# +# include all files from the config directory +# +!includedir /etc/my.cnf.d diff --git a/install/rhel/named.conf b/install/rhel/5/named/named.conf similarity index 100% rename from install/rhel/named.conf rename to install/rhel/5/named/named.conf diff --git a/install/rhel/5/nginx/nginx.conf b/install/rhel/5/nginx/nginx.conf new file mode 100644 index 000000000..0316de7ac --- /dev/null +++ b/install/rhel/5/nginx/nginx.conf @@ -0,0 +1,101 @@ +# Server globals +user nginx; +worker_processes 2; +error_log /var/log/nginx/error.log; +pid /var/run/nginx.pid; + + +# Worker config +events { + worker_connections 1024; + use epoll; +} + + +http { + # Main settings + sendfile on; + tcp_nopush on; + tcp_nodelay on; + client_header_timeout 1m; + client_body_timeout 1m; + client_header_buffer_size 2k; + client_body_buffer_size 256k; + client_max_body_size 100m; + large_client_header_buffers 4 8k; + send_timeout 30; + keepalive_timeout 60 60; + reset_timedout_connection on; + server_tokens off; + server_name_in_redirect off; + server_names_hash_max_size 512; + server_names_hash_bucket_size 512; + + + # Log format + log_format main '$remote_addr - $remote_user [$time_local] $request ' + '"$status" $body_bytes_sent "$http_referer" ' + '"$http_user_agent" "$http_x_forwarded_for"'; + log_format bytes '$body_bytes_sent'; + #access_log /var/log/nginx/access.log main; + access_log off; + + + # Mime settings + include /etc/nginx/mime.types; + default_type application/octet-stream; + + + # Compression + gzip on; + gzip_comp_level 9; + gzip_min_length 512; + gzip_buffers 8 64k; + gzip_types text/plain text/css text/javascript + application/x-javascript; + gzip_proxied any; + + + # Proxy settings + proxy_redirect off; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_pass_header Set-Cookie; + proxy_connect_timeout 90; + proxy_send_timeout 90; + proxy_read_timeout 90; + proxy_buffers 32 4k; + + + # SSL PCI Compliance + ssl_session_cache shared:SSL:10m; + ssl_protocols TLSv1 TLSv1.1 TLSv1.2; + ssl_prefer_server_ciphers on; + ssl_ciphers "ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA:ECDHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES128-SHA256:DHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES256-GCM-SHA384:AES128-GCM-SHA256:AES256-SHA256:AES128-SHA256:AES256-SHA:AES128-SHA:DES-CBC3-SHA:HIGH:!aNULL:!eNULL:!EXPORT:!DES:!MD5:!PSK:!RC4"; + + + # Error pages + error_page 403 /error/403.html; + error_page 404 /error/404.html; + error_page 502 503 504 /error/50x.html; + + + # Cache + proxy_cache_path /var/cache/nginx levels=2 keys_zone=cache:10m inactive=60m max_size=512m; + proxy_temp_path /var/cache/nginx/temp; + proxy_cache_key "$host$request_uri $cookie_user"; + proxy_ignore_headers Expires Cache-Control; + proxy_cache_use_stale error timeout invalid_header http_502; + proxy_cache_valid any 3d; + + map $http_cookie $no_cache { + default 0; + ~SESS 1; + ~wordpress_logged_in 1; + } + + + # Wildcard include + include /etc/nginx/conf.d/*.conf; +} diff --git a/install/rhel/5/nginx/phpmyadmin.inc b/install/rhel/5/nginx/phpmyadmin.inc new file mode 100644 index 000000000..09da52076 --- /dev/null +++ b/install/rhel/5/nginx/phpmyadmin.inc @@ -0,0 +1,15 @@ +location /phpmyadmin { + alias /usr/share/phpMyAdmin/; + + location ~ /(libraries|setup) { + return 404; + } + + location ~ ^/phpmyadmin/(.*\.php)$ { + alias /usr/share/phpMyAdmin/$1; + fastcgi_pass 127.0.0.1:9000; + fastcgi_index index.php; + include fastcgi_params; + fastcgi_param SCRIPT_FILENAME $request_filename; + } +} diff --git a/install/rhel/5/nginx/phppgadmin.inc b/install/rhel/5/nginx/phppgadmin.inc new file mode 100644 index 000000000..333e560a2 --- /dev/null +++ b/install/rhel/5/nginx/phppgadmin.inc @@ -0,0 +1,11 @@ +location /phppgadmin { + alias /usr/share/phpPgAdmin/; + + location ~ ^/phppgadmin/(.*\.php)$ { + alias /usr/share/phpPgAdmin/$1; + fastcgi_pass 127.0.0.1:9000; + fastcgi_index index.php; + include fastcgi_params; + fastcgi_param SCRIPT_FILENAME $request_filename; + } +} diff --git a/install/ubuntu/nginx-status.conf b/install/rhel/5/nginx/status.conf similarity index 100% rename from install/ubuntu/nginx-status.conf rename to install/rhel/5/nginx/status.conf diff --git a/install/rhel/5/nginx/webmail.inc b/install/rhel/5/nginx/webmail.inc new file mode 100644 index 000000000..2d0fbe293 --- /dev/null +++ b/install/rhel/5/nginx/webmail.inc @@ -0,0 +1,15 @@ +location /webmail { + alias /usr/share/roundcubemail/; + + location ~ /(config|temp|logs) { + return 404; + } + + location ~ ^/webmail/(.*\.php)$ { + alias /usr/share/roundcubemail/$1; + fastcgi_pass 127.0.0.1:9000; + fastcgi_index index.php; + include fastcgi_params; + fastcgi_param SCRIPT_FILENAME $request_filename; + } +} diff --git a/install/rhel/5/packages.tar.gz b/install/rhel/5/packages.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..269d9bee0b4daf7297f7c0f253ab0208388a9940 GIT binary patch literal 552 zcmV+@0@wW?iwFSH#Bfyr1MQVxZ<{a_#q*p`kvCq}%r*v8q&^TpDl3635OsTsSi@LU z22r37`}VUTaYD$pRw944-Jc?XkFPQ0>Kw14r{^e%i}$_Lff$-X>#M3Xt{ZxoC^E&A z5MGC|ig9nCoba6lFGU%x2ZLU;_`b}3Q}?I&zm(Os|EnmClXVth#pl)B|IRAP7AMMdRw8svL}te)>+`D4TJf;&k;wP3i85!f4nFKkqBVQQQH)Y=Ga&TW=dieZ}m z%nP@xjL;bEo@!2gZ~nm_ZD*a}Vg7OEhXx-r_(yuyqhp2lLg7!(3Or2nrzqtgHcZRK zyR0BhMd}Clw(GLmJk673R{vkK3ExWUht8ONKhku1t5dCdFE%C!D>q2JL9F7^P2WTK zzeuB!2f&XD_+L{G@}J5C{C^gj{uicwga5_EYy6MVVE|N0BLRdWBA`;58L*RfAy6;e zr9d^_i-CH6F9&cd2P&nLAdt5~fQc^O>R7(cAQ1jfqGeWm$=CUX&wo_=A7SwSIXJuj zTlR0czh(Zm_m5cr!1)Kpf0ggMuss&G$GXgZ=sImL5dPovt9$pq?fl1F$Fimn@c%i0 q^Z(@MKh~+LE7u+b0000000000000000002MKgCa859^TtC;$NBUl=j~ literal 0 HcmV?d00001 diff --git a/install/rhel/5/packages/default.pkg b/install/rhel/5/packages/default.pkg new file mode 100644 index 000000000..3df21d3df --- /dev/null +++ b/install/rhel/5/packages/default.pkg @@ -0,0 +1,19 @@ +WEB_TEMPLATE='default' +BACKEND_TEMPLATE='default' +PROXY_TEMPLATE='default' +DNS_TEMPLATE='default' +WEB_DOMAINS='100' +WEB_ALIASES='100' +DNS_DOMAINS='100' +DNS_RECORDS='100' +MAIL_DOMAINS='100' +MAIL_ACCOUNTS='100' +DATABASES='100' +CRON_JOBS='100' +DISK_QUOTA='10000' +BANDWIDTH='100000' +NS='ns1.localhost.ltd,ns2.localhost.ltd' +SHELL='nologin' +BACKUPS='3' +TIME='11:46:50' +DATE='2015-06-05' diff --git a/install/rhel/5/packages/gainsboro.pkg b/install/rhel/5/packages/gainsboro.pkg new file mode 100644 index 000000000..2b66b7d17 --- /dev/null +++ b/install/rhel/5/packages/gainsboro.pkg @@ -0,0 +1,19 @@ +WEB_TEMPLATE='default' +BACKEND_TEMPLATE='default' +PROXY_TEMPLATE='default' +DNS_TEMPLATE='default' +WEB_DOMAINS='10' +WEB_ALIASES='10' +DNS_DOMAINS='10' +DNS_RECORDS='10' +MAIL_DOMAINS='10' +MAIL_ACCOUNTS='10' +DATABASES='10' +CRON_JOBS='10' +DISK_QUOTA='10000' +BANDWIDTH='10000' +NS='ns1.localhost.ltd,ns2.localhost.ltd' +SHELL='nologin' +BACKUPS='1' +TIME='11:31:30' +DATE='2015-06-05' diff --git a/install/rhel/5/packages/palegreen.pkg b/install/rhel/5/packages/palegreen.pkg new file mode 100644 index 000000000..b17e5e1b2 --- /dev/null +++ b/install/rhel/5/packages/palegreen.pkg @@ -0,0 +1,19 @@ +WEB_TEMPLATE='hosting' +BACKEND_TEMPLATE='default' +PROXY_TEMPLATE='hosting' +DNS_TEMPLATE='default' +WEB_DOMAINS='50' +WEB_ALIASES='50' +DNS_DOMAINS='50' +DNS_RECORDS='50' +MAIL_DOMAINS='50' +MAIL_ACCOUNTS='50' +DATABASES='50' +CRON_JOBS='50' +DISK_QUOTA='50000' +BANDWIDTH='50000' +NS='ns1.localhost.ltd,ns2.localhost.ltd' +SHELL='nologin' +BACKUPS='5' +TIME='07:49:47' +DATE='2015-06-05' diff --git a/install/rhel/5/packages/slategrey.pkg b/install/rhel/5/packages/slategrey.pkg new file mode 100644 index 000000000..cc9ef423c --- /dev/null +++ b/install/rhel/5/packages/slategrey.pkg @@ -0,0 +1,19 @@ +WEB_TEMPLATE='default' +BACKEND_TEMPLATE='default' +PROXY_TEMPLATE='default' +DNS_TEMPLATE='default' +WEB_DOMAINS='100' +WEB_ALIASES='100' +DNS_DOMAINS='100' +DNS_RECORDS='100' +MAIL_DOMAINS='100' +MAIL_ACCOUNTS='100' +DATABASES='100' +CRON_JOBS='100' +DISK_QUOTA='10000' +BANDWIDTH='100000' +NS='ns1.localhost.ltd,ns2.localhost.ltd' +SHELL='nologin' +BACKUPS='3' +TIME='12:39:13' +DATE='2015-06-05' diff --git a/install/ubuntu/pga.conf b/install/rhel/5/pga/config.inc.php similarity index 100% rename from install/ubuntu/pga.conf rename to install/rhel/5/pga/config.inc.php diff --git a/install/rhel/httpd-pga.conf b/install/rhel/5/pga/phpPgAdmin.conf similarity index 100% rename from install/rhel/httpd-pga.conf rename to install/rhel/5/pga/phpPgAdmin.conf diff --git a/install/rhel/5/php-fpm/www.conf b/install/rhel/5/php-fpm/www.conf new file mode 100644 index 000000000..260109d8f --- /dev/null +++ b/install/rhel/5/php-fpm/www.conf @@ -0,0 +1,10 @@ +[www] +listen = 127.0.0.1:9000 +listen.allowed_clients = 127.0.0.1 +user = apache +group = apache +pm = dynamic +pm.max_children = 50 +pm.start_servers = 5 +pm.min_spare_servers = 3 +pm.max_spare_servers = 35 diff --git a/install/rhel/pma.conf b/install/rhel/5/pma/config.inc.conf similarity index 100% rename from install/rhel/pma.conf rename to install/rhel/5/pma/config.inc.conf diff --git a/install/rhel/httpd-pma.conf b/install/rhel/5/pma/phpMyAdmin.conf similarity index 89% rename from install/rhel/httpd-pma.conf rename to install/rhel/5/pma/phpMyAdmin.conf index 3950860ef..0049ef2b7 100644 --- a/install/rhel/httpd-pma.conf +++ b/install/rhel/5/pma/phpMyAdmin.conf @@ -37,9 +37,3 @@ Alias /phpmyadmin /usr/share/phpMyAdmin # SecRuleInheritance Off # # - - - Order Deny,Allow - Deny from All - Allow from None - diff --git a/install/rhel/5/postgresql/pg_hba.conf b/install/rhel/5/postgresql/pg_hba.conf new file mode 100644 index 000000000..b65e66434 --- /dev/null +++ b/install/rhel/5/postgresql/pg_hba.conf @@ -0,0 +1,11 @@ +# "local" is for Unix domain socket connections only +local all all md5 + +# IPv4 local connections: +host all all 127.0.0.1/32 md5 + +# IPv6 local connections: +host all all ::1/128 md5 + +# Others +host all all 0.0.0.0/0 md5 diff --git a/install/rhel/proftpd.conf b/install/rhel/5/proftpd/proftpd.conf similarity index 100% rename from install/rhel/proftpd.conf rename to install/rhel/5/proftpd/proftpd.conf diff --git a/install/rhel/5/remi-release.rpm b/install/rhel/5/remi-release.rpm new file mode 100644 index 0000000000000000000000000000000000000000..e0c3696c4822bf6f14f7464c2a3447c2997c966c GIT binary patch literal 5450 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 - Order Deny,Allow - Deny from all - Allow from all - - - - Order Deny,Allow - Deny from all - Allow from None + Order Deny,Allow + Deny from all + Allow from all diff --git a/install/rhel/roundcube-driver.php b/install/rhel/5/roundcube/vesta.php similarity index 100% rename from install/rhel/roundcube-driver.php rename to install/rhel/5/roundcube/vesta.php diff --git a/install/ubuntu/sudoers.admin.conf b/install/rhel/5/sudo/admin similarity index 56% rename from install/ubuntu/sudoers.admin.conf rename to install/rhel/5/sudo/admin index b4f870395..47e16098c 100644 --- a/install/ubuntu/sudoers.admin.conf +++ b/install/rhel/5/sudo/admin @@ -1,3 +1,7 @@ # Created by vesta installer +Defaults env_keep="VESTA" +Defaults:admin !syslog +Defaults:admin !requiretty + admin ALL=(ALL) ALL admin ALL=NOPASSWD:/usr/local/vesta/bin/* diff --git a/install/rhel/5/templates.tar.gz b/install/rhel/5/templates.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..6a2fd89099235ba19e1e41e099639d3b4b6d9b66 GIT binary patch literal 12995 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 nSy|!Qq8n2-{Y3{JtgNJ|KlV AllowOverride All diff --git a/install/rhel/templates/web/httpd/basedir.tpl b/install/rhel/5/templates/web/httpd/basedir.tpl similarity index 84% rename from install/rhel/templates/web/httpd/basedir.tpl rename to install/rhel/5/templates/web/httpd/basedir.tpl index 94288db02..41b77334a 100755 --- a/install/rhel/templates/web/httpd/basedir.tpl +++ b/install/rhel/5/templates/web/httpd/basedir.tpl @@ -14,9 +14,7 @@ AllowOverride All Options +Includes -Indexes +ExecCGI - php_admin_value open_basedir %docroot%:%home%/%user%/tmp - php_admin_value upload_tmp_dir %home%/%user%/tmp - php_admin_value session.save_path %home%/%user%/tmp + php_admin_value open_basedir %docroot% AllowOverride All diff --git a/install/rhel/templates/web/httpd/default.stpl b/install/rhel/5/templates/web/httpd/default.stpl similarity index 100% rename from install/rhel/templates/web/httpd/default.stpl rename to install/rhel/5/templates/web/httpd/default.stpl diff --git a/install/rhel/templates/web/httpd/default.tpl b/install/rhel/5/templates/web/httpd/default.tpl similarity index 100% rename from install/rhel/templates/web/httpd/default.tpl rename to install/rhel/5/templates/web/httpd/default.tpl diff --git a/install/rhel/templates/web/httpd/hosting.stpl b/install/rhel/5/templates/web/httpd/hosting.stpl similarity index 100% rename from install/rhel/templates/web/httpd/hosting.stpl rename to install/rhel/5/templates/web/httpd/hosting.stpl diff --git a/install/rhel/templates/web/httpd/hosting.tpl b/install/rhel/5/templates/web/httpd/hosting.tpl similarity index 100% rename from install/rhel/templates/web/httpd/hosting.tpl rename to install/rhel/5/templates/web/httpd/hosting.tpl diff --git a/install/ubuntu/templates/web/apache2/phpcgi.sh b/install/rhel/5/templates/web/httpd/phpcgi.sh similarity index 100% rename from install/ubuntu/templates/web/apache2/phpcgi.sh rename to install/rhel/5/templates/web/httpd/phpcgi.sh diff --git a/install/rhel/templates/web/httpd/phpcgi.stpl b/install/rhel/5/templates/web/httpd/phpcgi.stpl similarity index 100% rename from install/rhel/templates/web/httpd/phpcgi.stpl rename to install/rhel/5/templates/web/httpd/phpcgi.stpl diff --git a/install/rhel/templates/web/httpd/phpcgi.tpl b/install/rhel/5/templates/web/httpd/phpcgi.tpl similarity index 100% rename from install/rhel/templates/web/httpd/phpcgi.tpl rename to install/rhel/5/templates/web/httpd/phpcgi.tpl diff --git a/install/ubuntu/templates/web/apache2/phpfcgid.sh b/install/rhel/5/templates/web/httpd/phpfcgid.sh similarity index 100% rename from install/ubuntu/templates/web/apache2/phpfcgid.sh rename to install/rhel/5/templates/web/httpd/phpfcgid.sh diff --git a/install/rhel/templates/web/httpd/phpfcgid.stpl b/install/rhel/5/templates/web/httpd/phpfcgid.stpl similarity index 100% rename from install/rhel/templates/web/httpd/phpfcgid.stpl rename to install/rhel/5/templates/web/httpd/phpfcgid.stpl diff --git a/install/rhel/templates/web/httpd/phpfcgid.tpl b/install/rhel/5/templates/web/httpd/phpfcgid.tpl similarity index 100% rename from install/rhel/templates/web/httpd/phpfcgid.tpl rename to install/rhel/5/templates/web/httpd/phpfcgid.tpl diff --git a/install/rhel/5/templates/web/nginx/caching.sh b/install/rhel/5/templates/web/nginx/caching.sh new file mode 100755 index 000000000..6eb9126db --- /dev/null +++ b/install/rhel/5/templates/web/nginx/caching.sh @@ -0,0 +1,12 @@ +#!/bin/bash + +user=$1 +domain=$2 +ip=$3 +home=$4 +docroot=$5 + +str="proxy_cache_path /var/cache/nginx/$domain levels=2" +str="$str keys_zone=$domain:10m inactive=60m max_size=512m;" +echo "$str" >> /etc/nginx/conf.d/01_caching_pool.conf + diff --git a/install/rhel/5/templates/web/nginx/caching.stpl b/install/rhel/5/templates/web/nginx/caching.stpl new file mode 100755 index 000000000..1109c924f --- /dev/null +++ b/install/rhel/5/templates/web/nginx/caching.stpl @@ -0,0 +1,44 @@ +server { + listen %ip%:%proxy_ssl_port%; + server_name %domain_idn% %alias_idn%; + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + error_log /var/log/%web_system%/domains/%domain%.error.log error; + + location / { + proxy_pass http://%ip%:%web_port%; + + proxy_cache %domain%; + proxy_cache_valid 15m; + proxy_cache_valid 404 1m; + proxy_no_cache $no_cache; + proxy_cache_bypass $no_cache; + proxy_cache_bypass $cookie_session $http_x_update; + + location ~* ^.+\.(%proxy_extentions%)$ { + proxy_cache off; + root %docroot%; + access_log /var/log/%web_system%/domains/%domain%.log combined; + access_log /var/log/%web_system%/domains/%domain%.bytes bytes; + expires max; + try_files $uri @fallback; + } + } + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location @fallback { + proxy_pass http://%ip%:%web_port%; + } + + location ~ /\.ht {return 404;} + location ~ /\.svn/ {return 404;} + location ~ /\.git/ {return 404;} + location ~ /\.hg/ {return 404;} + location ~ /\.bzr/ {return 404;} + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/rhel/5/templates/web/nginx/caching.tpl b/install/rhel/5/templates/web/nginx/caching.tpl new file mode 100755 index 000000000..6d727c67f --- /dev/null +++ b/install/rhel/5/templates/web/nginx/caching.tpl @@ -0,0 +1,41 @@ +server { + listen %ip%:%proxy_port%; + server_name %domain_idn% %alias_idn%; + error_log /var/log/%web_system%/domains/%domain%.error.log error; + + location / { + proxy_pass http://%ip%:%web_port%; + + proxy_cache %domain%; + proxy_cache_valid 15m; + proxy_cache_valid 404 1m; + proxy_no_cache $no_cache; + proxy_cache_bypass $no_cache; + proxy_cache_bypass $cookie_session $http_x_update; + + location ~* ^.+\.(%proxy_extentions%)$ { + proxy_cache off; + root %docroot%; + access_log /var/log/%web_system%/domains/%domain%.log combined; + access_log /var/log/%web_system%/domains/%domain%.bytes bytes; + expires max; + try_files $uri @fallback; + } + } + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location @fallback { + proxy_pass http://%ip%:%web_port%; + } + + location ~ /\.ht {return 404;} + location ~ /\.svn/ {return 404;} + location ~ /\.git/ {return 404;} + location ~ /\.hg/ {return 404;} + location ~ /\.bzr/ {return 404;} + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/rhel/templates/web/nginx/default.stpl b/install/rhel/5/templates/web/nginx/default.stpl similarity index 100% rename from install/rhel/templates/web/nginx/default.stpl rename to install/rhel/5/templates/web/nginx/default.stpl diff --git a/install/rhel/templates/web/nginx/default.tpl b/install/rhel/5/templates/web/nginx/default.tpl similarity index 100% rename from install/rhel/templates/web/nginx/default.tpl rename to install/rhel/5/templates/web/nginx/default.tpl diff --git a/install/ubuntu/templates/web/nginx/hosting.sh b/install/rhel/5/templates/web/nginx/hosting.sh similarity index 100% rename from install/ubuntu/templates/web/nginx/hosting.sh rename to install/rhel/5/templates/web/nginx/hosting.sh diff --git a/install/rhel/templates/web/nginx/hosting.stpl b/install/rhel/5/templates/web/nginx/hosting.stpl similarity index 100% rename from install/rhel/templates/web/nginx/hosting.stpl rename to install/rhel/5/templates/web/nginx/hosting.stpl diff --git a/install/rhel/templates/web/nginx/hosting.tpl b/install/rhel/5/templates/web/nginx/hosting.tpl similarity index 100% rename from install/rhel/templates/web/nginx/hosting.tpl rename to install/rhel/5/templates/web/nginx/hosting.tpl diff --git a/install/rhel/5/templates/web/nginx/php-fpm/cms_made_simple.stpl b/install/rhel/5/templates/web/nginx/php-fpm/cms_made_simple.stpl new file mode 100644 index 000000000..01d82b603 --- /dev/null +++ b/install/rhel/5/templates/web/nginx/php-fpm/cms_made_simple.stpl @@ -0,0 +1,51 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + try_files $uri $uri/ /index.php?page=$request_uri; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/rhel/5/templates/web/nginx/php-fpm/cms_made_simple.tpl b/install/rhel/5/templates/web/nginx/php-fpm/cms_made_simple.tpl new file mode 100644 index 000000000..af452d19f --- /dev/null +++ b/install/rhel/5/templates/web/nginx/php-fpm/cms_made_simple.tpl @@ -0,0 +1,47 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + try_files $uri $uri/ /index.php?page=$request_uri; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/rhel/5/templates/web/nginx/php-fpm/codeigniter2.stpl b/install/rhel/5/templates/web/nginx/php-fpm/codeigniter2.stpl new file mode 100644 index 000000000..a592a652d --- /dev/null +++ b/install/rhel/5/templates/web/nginx/php-fpm/codeigniter2.stpl @@ -0,0 +1,56 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + try_files $uri $uri/ /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location = /index.php { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME /var/www/html/ci$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + location ~ \.php$ { + return 444; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/rhel/5/templates/web/nginx/php-fpm/codeigniter2.tpl b/install/rhel/5/templates/web/nginx/php-fpm/codeigniter2.tpl new file mode 100644 index 000000000..9b955aa6a --- /dev/null +++ b/install/rhel/5/templates/web/nginx/php-fpm/codeigniter2.tpl @@ -0,0 +1,52 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + try_files $uri $uri/ /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location = /index.php { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME /var/www/html/ci$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + location ~ \.php$ { + return 444; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/rhel/5/templates/web/nginx/php-fpm/codeigniter3.stpl b/install/rhel/5/templates/web/nginx/php-fpm/codeigniter3.stpl new file mode 100644 index 000000000..4d330d34f --- /dev/null +++ b/install/rhel/5/templates/web/nginx/php-fpm/codeigniter3.stpl @@ -0,0 +1,51 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + try_files $uri $uri/ /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/rhel/5/templates/web/nginx/php-fpm/codeigniter3.tpl b/install/rhel/5/templates/web/nginx/php-fpm/codeigniter3.tpl new file mode 100644 index 000000000..1f446e5d3 --- /dev/null +++ b/install/rhel/5/templates/web/nginx/php-fpm/codeigniter3.tpl @@ -0,0 +1,47 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + try_files $uri $uri/ /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/rhel/5/templates/web/nginx/php-fpm/datalife_engine.stpl b/install/rhel/5/templates/web/nginx/php-fpm/datalife_engine.stpl new file mode 100644 index 000000000..d1b5bcd24 --- /dev/null +++ b/install/rhel/5/templates/web/nginx/php-fpm/datalife_engine.stpl @@ -0,0 +1,122 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + rewrite "^/page/([0-9]+)(/?)$" /index.php?cstart=$1 last; + + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page,([0-9]+),([0-9]+),(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&cstart=$5&news_name=$6&seourl=$6 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page,([0-9]+),(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&news_name=$5&seourl=$5 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/print:page,([0-9]+),(.*).html(/?)+$" /engine/print.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&news_name=$5&seourl=$5 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_name=$4&seourl=$4 last; + + rewrite "^/([^.]+)/page,([0-9]+),([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$4&news_page=$2&cstart=$3&seourl=$5&seocat=$1 last; + rewrite "^/([^.]+)/page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$3&news_page=$2&seourl=$4&seocat=$1 last; + rewrite "^/([^.]+)/print:page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /engine/print.php?news_page=$2&newsid=$3&seourl=$4&seocat=$1 last; + rewrite "^/([^.]+)/([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$2&seourl=$3&seocat=$1 last; + + rewrite "^/page,([0-9]+),([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$3&news_page=$1&cstart=$2&seourl=$4 last; + rewrite "^/page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$2&news_page=$1&seourl=$3 last; + rewrite "^/print:page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /engine/print.php?news_page=$1&newsid=$2&seourl=$3 last; + rewrite "^/([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$1&seourl=$2 last; + + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})(/?)+$" /index.php?year=$1&month=$2&day=$3 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page/([0-9]+)(/?)+$" /index.php?year=$1&month=$2&day=$3&cstart=$4 last; + + rewrite "^/([0-9]{4})/([0-9]{2})(/?)+$" /index.php?year=$1&month=$2 last; + rewrite "^/([0-9]{4})/([0-9]{2})/page/([0-9]+)(/?)+$" /index.php?year=$1&month=$2&cstart=$3 last; + + rewrite "^/([0-9]{4})(/?)+$" /index.php?year=$1 last; + rewrite "^/([0-9]{4})/page/([0-9]+)(/?)+$" /index.php?year=$1&cstart=$2 last; + + rewrite "^/tags/([^/]*)(/?)+$" /index.php?do=tags&tag=$1 last; + rewrite "^/tags/([^/]*)/page/([0-9]+)(/?)+$" /index.php?do=tags&tag=$1&cstart=$2 last; + + rewrite "^/xfsearch/([^/]*)(/?)+$" /index.php?do=xfsearch&xf=$1 last; + rewrite "^/xfsearch/([^/]*)/page/([0-9]+)(/?)+$" /index.php?do=xfsearch&xf=$1&cstart=$2 last; + + rewrite "^/user/([^/]*)/rss.xml$" /engine/rss.php?subaction=allnews&user=$1 last; + rewrite "^/user/([^/]*)(/?)+$" /index.php?subaction=userinfo&user=$1 last; + rewrite "^/user/([^/]*)/page/([0-9]+)(/?)+$" /index.php?subaction=userinfo&user=$1&cstart=$2 last; + rewrite "^/user/([^/]*)/news(/?)+$" /index.php?subaction=allnews&user=$1 last; + rewrite "^/user/([^/]*)/news/page/([0-9]+)(/?)+$" /index.php?subaction=allnews&user=$1&cstart=$2 last; + rewrite "^/user/([^/]*)/news/rss.xml(/?)+$" /engine/rss.php?subaction=allnews&user=$1 last; + + rewrite "^/lastnews(/?)+$" /index.php?do=lastnews last; + rewrite "^/lastnews/page/([0-9]+)(/?)+$" /index.php?do=lastnews&cstart=$1 last; + + rewrite "^/catalog/([^/]*)/rss.xml$" /engine/rss.php?catalog=$1 last; + rewrite "^/catalog/([^/]*)(/?)+$" /index.php?catalog=$1 last; + rewrite "^/catalog/([^/]*)/page/([0-9]+)(/?)+$" /index.php?catalog=$1&cstart=$2 last; + + rewrite "^/newposts(/?)+$" /index.php?subaction=newposts last; + rewrite "^/newposts/page/([0-9]+)(/?)+$" /index.php?subaction=newposts&cstart=$1 last; + + rewrite "^/favorites(/?)+$" /index.php?do=favorites last; + rewrite "^/favorites/page/([0-9]+)(/?)+$" /index.php?do=favorites&cstart=$1 last; + + rewrite "^/rules.html$" /index.php?do=rules last; + rewrite "^/statistics.html$" /index.php?do=stats last; + rewrite "^/addnews.html$" /index.php?do=addnews last; + rewrite "^/rss.xml$" /engine/rss.php last; + rewrite "^/sitemap.xml$" /uploads/sitemap.xml last; + + if (!-d $request_filename) { + rewrite "^/([^.]+)/page/([0-9]+)(/?)+$" /index.php?do=cat&category=$1&cstart=$2 last; + rewrite "^/([^.]+)/?$" /index.php?do=cat&category=$1 last; + } + + if (!-f $request_filename) { + rewrite "^/([^.]+)/rss.xml$" /engine/rss.php?do=cat&category=$1 last; + rewrite "^/page,([0-9]+),([^/]+).html$" /index.php?do=static&page=$2&news_page=$1 last; + rewrite "^/print:([^/]+).html$" /engine/print.php?do=static&page=$1 last; + } + + if (!-f $request_filename) { + rewrite "^/([^/]+).html$" /index.php?do=static&page=$1 last; + } + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/rhel/5/templates/web/nginx/php-fpm/datalife_engine.tpl b/install/rhel/5/templates/web/nginx/php-fpm/datalife_engine.tpl new file mode 100644 index 000000000..ff33c2325 --- /dev/null +++ b/install/rhel/5/templates/web/nginx/php-fpm/datalife_engine.tpl @@ -0,0 +1,118 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + rewrite "^/page/([0-9]+)(/?)$" /index.php?cstart=$1 last; + + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page,([0-9]+),([0-9]+),(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&cstart=$5&news_name=$6&seourl=$6 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page,([0-9]+),(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&news_name=$5&seourl=$5 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/print:page,([0-9]+),(.*).html(/?)+$" /engine/print.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&news_name=$5&seourl=$5 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_name=$4&seourl=$4 last; + + rewrite "^/([^.]+)/page,([0-9]+),([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$4&news_page=$2&cstart=$3&seourl=$5&seocat=$1 last; + rewrite "^/([^.]+)/page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$3&news_page=$2&seourl=$4&seocat=$1 last; + rewrite "^/([^.]+)/print:page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /engine/print.php?news_page=$2&newsid=$3&seourl=$4&seocat=$1 last; + rewrite "^/([^.]+)/([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$2&seourl=$3&seocat=$1 last; + + rewrite "^/page,([0-9]+),([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$3&news_page=$1&cstart=$2&seourl=$4 last; + rewrite "^/page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$2&news_page=$1&seourl=$3 last; + rewrite "^/print:page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /engine/print.php?news_page=$1&newsid=$2&seourl=$3 last; + rewrite "^/([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$1&seourl=$2 last; + + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})(/?)+$" /index.php?year=$1&month=$2&day=$3 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page/([0-9]+)(/?)+$" /index.php?year=$1&month=$2&day=$3&cstart=$4 last; + + rewrite "^/([0-9]{4})/([0-9]{2})(/?)+$" /index.php?year=$1&month=$2 last; + rewrite "^/([0-9]{4})/([0-9]{2})/page/([0-9]+)(/?)+$" /index.php?year=$1&month=$2&cstart=$3 last; + + rewrite "^/([0-9]{4})(/?)+$" /index.php?year=$1 last; + rewrite "^/([0-9]{4})/page/([0-9]+)(/?)+$" /index.php?year=$1&cstart=$2 last; + + rewrite "^/tags/([^/]*)(/?)+$" /index.php?do=tags&tag=$1 last; + rewrite "^/tags/([^/]*)/page/([0-9]+)(/?)+$" /index.php?do=tags&tag=$1&cstart=$2 last; + + rewrite "^/xfsearch/([^/]*)(/?)+$" /index.php?do=xfsearch&xf=$1 last; + rewrite "^/xfsearch/([^/]*)/page/([0-9]+)(/?)+$" /index.php?do=xfsearch&xf=$1&cstart=$2 last; + + rewrite "^/user/([^/]*)/rss.xml$" /engine/rss.php?subaction=allnews&user=$1 last; + rewrite "^/user/([^/]*)(/?)+$" /index.php?subaction=userinfo&user=$1 last; + rewrite "^/user/([^/]*)/page/([0-9]+)(/?)+$" /index.php?subaction=userinfo&user=$1&cstart=$2 last; + rewrite "^/user/([^/]*)/news(/?)+$" /index.php?subaction=allnews&user=$1 last; + rewrite "^/user/([^/]*)/news/page/([0-9]+)(/?)+$" /index.php?subaction=allnews&user=$1&cstart=$2 last; + rewrite "^/user/([^/]*)/news/rss.xml(/?)+$" /engine/rss.php?subaction=allnews&user=$1 last; + + rewrite "^/lastnews(/?)+$" /index.php?do=lastnews last; + rewrite "^/lastnews/page/([0-9]+)(/?)+$" /index.php?do=lastnews&cstart=$1 last; + + rewrite "^/catalog/([^/]*)/rss.xml$" /engine/rss.php?catalog=$1 last; + rewrite "^/catalog/([^/]*)(/?)+$" /index.php?catalog=$1 last; + rewrite "^/catalog/([^/]*)/page/([0-9]+)(/?)+$" /index.php?catalog=$1&cstart=$2 last; + + rewrite "^/newposts(/?)+$" /index.php?subaction=newposts last; + rewrite "^/newposts/page/([0-9]+)(/?)+$" /index.php?subaction=newposts&cstart=$1 last; + + rewrite "^/favorites(/?)+$" /index.php?do=favorites last; + rewrite "^/favorites/page/([0-9]+)(/?)+$" /index.php?do=favorites&cstart=$1 last; + + rewrite "^/rules.html$" /index.php?do=rules last; + rewrite "^/statistics.html$" /index.php?do=stats last; + rewrite "^/addnews.html$" /index.php?do=addnews last; + rewrite "^/rss.xml$" /engine/rss.php last; + rewrite "^/sitemap.xml$" /uploads/sitemap.xml last; + + if (!-d $request_filename) { + rewrite "^/([^.]+)/page/([0-9]+)(/?)+$" /index.php?do=cat&category=$1&cstart=$2 last; + rewrite "^/([^.]+)/?$" /index.php?do=cat&category=$1 last; + } + + if (!-f $request_filename) { + rewrite "^/([^.]+)/rss.xml$" /engine/rss.php?do=cat&category=$1 last; + rewrite "^/page,([0-9]+),([^/]+).html$" /index.php?do=static&page=$2&news_page=$1 last; + rewrite "^/print:([^/]+).html$" /engine/print.php?do=static&page=$1 last; + } + + if (!-f $request_filename) { + rewrite "^/([^/]+).html$" /index.php?do=static&page=$1 last; + } + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/rhel/5/templates/web/nginx/php-fpm/default.stpl b/install/rhel/5/templates/web/nginx/php-fpm/default.stpl new file mode 100644 index 000000000..a68c99861 --- /dev/null +++ b/install/rhel/5/templates/web/nginx/php-fpm/default.stpl @@ -0,0 +1,50 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %sdocroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/snginx.%domain%.conf*; +} diff --git a/install/rhel/5/templates/web/nginx/php-fpm/default.tpl b/install/rhel/5/templates/web/nginx/php-fpm/default.tpl new file mode 100644 index 000000000..b143e53ba --- /dev/null +++ b/install/rhel/5/templates/web/nginx/php-fpm/default.tpl @@ -0,0 +1,46 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/rhel/5/templates/web/nginx/php-fpm/dokuwiki.stpl b/install/rhel/5/templates/web/nginx/php-fpm/dokuwiki.stpl new file mode 100644 index 000000000..27483cd8c --- /dev/null +++ b/install/rhel/5/templates/web/nginx/php-fpm/dokuwiki.stpl @@ -0,0 +1,67 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + index doku.php; + try_files $uri $uri/ @dokuwiki; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + location ^~ /lib/ { + expires 30d; + } + + location ^~ /conf/ { return 403; } + location ^~ /data/ { return 403; } + + location @dokuwiki { + rewrite ^/_media/(.*) /lib/exe/fetch.php?media=$1 last; + rewrite ^/_detail/(.*) /lib/exe/detail.php?media=$1 last; + rewrite ^/_export/([^/]+)/(.*) /doku.php?do=export_$1&id=$2 last; + rewrite ^/(.*) /doku.php?id=$1 last; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/rhel/5/templates/web/nginx/php-fpm/dokuwiki.tpl b/install/rhel/5/templates/web/nginx/php-fpm/dokuwiki.tpl new file mode 100644 index 000000000..31647c9ff --- /dev/null +++ b/install/rhel/5/templates/web/nginx/php-fpm/dokuwiki.tpl @@ -0,0 +1,62 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + index doku.php; + try_files $uri $uri/ @dokuwiki; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + location ^~ /lib/ { + expires 30d; + } + + location ^~ /conf/ { return 403; } + location ^~ /data/ { return 403; } + location @dokuwiki { + rewrite ^/_media/(.*) /lib/exe/fetch.php?media=$1 last; + rewrite ^/_detail/(.*) /lib/exe/detail.php?media=$1 last; + rewrite ^/_export/([^/]+)/(.*) /doku.php?do=export_$1&id=$2 last; + rewrite ^/(.*) /doku.php?id=$1 last; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/rhel/5/templates/web/nginx/php-fpm/drupal.stpl b/install/rhel/5/templates/web/nginx/php-fpm/drupal.stpl new file mode 100644 index 000000000..9a5484396 --- /dev/null +++ b/install/rhel/5/templates/web/nginx/php-fpm/drupal.stpl @@ -0,0 +1,101 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + + location / { + try_files $uri @rewrite; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # You have 2 options here + # For D7 and above: + # Clean URLs are handled in drupal_environment_initialize(). + rewrite ^ /index.php; + + # For Drupal 6 and bwlow: + # Some modules enforce no slash (/) at the end of the URL + # Else this rewrite block wouldn't be needed (GlobalRedirect) + #rewrite ^/(.*)$ /index.php?q=$1; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/rhel/5/templates/web/nginx/php-fpm/drupal.tpl b/install/rhel/5/templates/web/nginx/php-fpm/drupal.tpl new file mode 100644 index 000000000..417762c18 --- /dev/null +++ b/install/rhel/5/templates/web/nginx/php-fpm/drupal.tpl @@ -0,0 +1,98 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + # Very rarely should these ever be accessed outside of your lan + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + + location / { + try_files $uri @rewrite; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # You have 2 options here + # For D7 and above: + # Clean URLs are handled in drupal_environment_initialize(). + rewrite ^ /index.php; + + # For Drupal 6 and bwlow: + # Some modules enforce no slash (/) at the end of the URL + # Else this rewrite block wouldn't be needed (GlobalRedirect) + #rewrite ^/(.*)$ /index.php?q=$1; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/rhel/5/templates/web/nginx/php-fpm/joomla.stpl b/install/rhel/5/templates/web/nginx/php-fpm/joomla.stpl new file mode 100644 index 000000000..235a01216 --- /dev/null +++ b/install/rhel/5/templates/web/nginx/php-fpm/joomla.stpl @@ -0,0 +1,58 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + try_files $uri $uri/ /index.php?$args; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + # deny running scripts inside writable directories + location ~* /(images|cache|media|logs|tmp)/.*\.(php|pl|py|jsp|asp|sh|cgi)$ { + return 403; + error_page 403 /403_error.html; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/rhel/5/templates/web/nginx/php-fpm/joomla.tpl b/install/rhel/5/templates/web/nginx/php-fpm/joomla.tpl new file mode 100644 index 000000000..997c268de --- /dev/null +++ b/install/rhel/5/templates/web/nginx/php-fpm/joomla.tpl @@ -0,0 +1,54 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + try_files $uri $uri/ /index.php?$args; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + # deny running scripts inside writable directories + location ~* /(images|cache|media|logs|tmp)/.*\.(php|pl|py|jsp|asp|sh|cgi)$ { + return 403; + error_page 403 /403_error.html; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/rhel/5/templates/web/nginx/php-fpm/owncloud.stpl b/install/rhel/5/templates/web/nginx/php-fpm/owncloud.stpl new file mode 100644 index 000000000..8311ca43f --- /dev/null +++ b/install/rhel/5/templates/web/nginx/php-fpm/owncloud.stpl @@ -0,0 +1,80 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + rewrite ^/caldav(.*)$ /remote.php/caldav$1 redirect; + rewrite ^/carddav(.*)$ /remote.php/carddav$1 redirect; + rewrite ^/webdav(.*)$ /remote.php/webdav$1 redirect; + + error_page 403 = /core/templates/403.php; + error_page 404 = /core/templates/404.php; + + location ~ ^/(?:\.htaccess|data|config|db_structure\.xml|README){ + deny all; + } + + location / { + # The following 2 rules are only needed with webfinger + rewrite ^/.well-known/host-meta /public.php?service=host-meta last; + rewrite ^/.well-known/host-meta.json /public.php?service=host-meta-json last; + rewrite ^/.well-known/carddav /remote.php/carddav/ redirect; + rewrite ^/.well-known/caldav /remote.php/caldav/ redirect; + rewrite ^(/core/doc/[^\/]+/)$ $1/index.html; + try_files $uri $uri/ /index.php; + + location ~ \.php(?:$|/) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param PATH_INFO $fastcgi_path_info; + #fastcgi_param HTTPS on; + fastcgi_pass %backend_lsnr%; + } + } + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + # Some basic cache-control for static files to be sent to the browser + add_header Pragma public; + add_header Cache-Control "public, must-revalidate, proxy-revalidate"; + } + + #error_page 403 /error/404.html; + #error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/rhel/5/templates/web/nginx/php-fpm/owncloud.tpl b/install/rhel/5/templates/web/nginx/php-fpm/owncloud.tpl new file mode 100644 index 000000000..57cac2f85 --- /dev/null +++ b/install/rhel/5/templates/web/nginx/php-fpm/owncloud.tpl @@ -0,0 +1,76 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + rewrite ^/caldav(.*)$ /remote.php/caldav$1 redirect; + rewrite ^/carddav(.*)$ /remote.php/carddav$1 redirect; + rewrite ^/webdav(.*)$ /remote.php/webdav$1 redirect; + + error_page 403 = /core/templates/403.php; + error_page 404 = /core/templates/404.php; + + location ~ ^/(?:\.htaccess|data|config|db_structure\.xml|README){ + deny all; + } + + location / { + # The following 2 rules are only needed with webfinger + rewrite ^/.well-known/host-meta /public.php?service=host-meta last; + rewrite ^/.well-known/host-meta.json /public.php?service=host-meta-json last; + rewrite ^/.well-known/carddav /remote.php/carddav/ redirect; + rewrite ^/.well-known/caldav /remote.php/caldav/ redirect; + rewrite ^(/core/doc/[^\/]+/)$ $1/index.html; + try_files $uri $uri/ /index.php; + + location ~ \.php(?:$|/) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param PATH_INFO $fastcgi_path_info; + #fastcgi_param HTTPS on; + fastcgi_pass %backend_lsnr%; + } + } + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + # Some basic cache-control for static files to be sent to the browser + add_header Pragma public; + add_header Cache-Control "public, must-revalidate, proxy-revalidate"; + } + + #error_page 403 /error/404.html; + #error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/rhel/5/templates/web/nginx/php-fpm/piwik.stpl b/install/rhel/5/templates/web/nginx/php-fpm/piwik.stpl new file mode 100644 index 000000000..c53af4011 --- /dev/null +++ b/install/rhel/5/templates/web/nginx/php-fpm/piwik.stpl @@ -0,0 +1,68 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location = /favicon.ico { + try_files /favicon.ico =204; + } + + location / { + try_files $uri /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + valid_referers none blocked %domain_idn% %alias_idn%; + if ($invalid_referer) { + return 444; + } + expires max; + } + + location ~* ^/(?:index|piwik)\.php$ { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + include /etc/nginx/fastcgi_params; + } + } + + # Any other attempt to access PHP files returns a 404. + location ~* ^.+\.php$ { + return 404; + } + + # Return a 404 for all text files. + location ~* ^/(?:README|LICENSE[^.]*|LEGALNOTICE)(?:\.txt)*$ { + return 404; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/rhel/5/templates/web/nginx/php-fpm/piwik.tpl b/install/rhel/5/templates/web/nginx/php-fpm/piwik.tpl new file mode 100644 index 000000000..6b4a94a68 --- /dev/null +++ b/install/rhel/5/templates/web/nginx/php-fpm/piwik.tpl @@ -0,0 +1,64 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location = /favicon.ico { + try_files /favicon.ico =204; + } + + location / { + try_files $uri /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + valid_referers none blocked %domain_idn% %alias_idn%; + if ($invalid_referer) { + return 444; + } + expires max; + } + + location ~* ^/(?:index|piwik)\.php$ { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + include /etc/nginx/fastcgi_params; + } + } + + # Any other attempt to access PHP files returns a 404. + location ~* ^.+\.php$ { + return 404; + } + + # Return a 404 for all text files. + location ~* ^/(?:README|LICENSE[^.]*|LEGALNOTICE)(?:\.txt)*$ { + return 404; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/rhel/5/templates/web/nginx/php-fpm/pyrocms.stpl b/install/rhel/5/templates/web/nginx/php-fpm/pyrocms.stpl new file mode 100644 index 000000000..a6fc67556 --- /dev/null +++ b/install/rhel/5/templates/web/nginx/php-fpm/pyrocms.stpl @@ -0,0 +1,61 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location /installer { + try_files $uri $uri/ /installer/index.php; + } + + location / { + try_files $uri $uri/ /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + location = /robots.txt { access_log off; log_not_found off; } + location = /favicon.ico { access_log off; log_not_found off; } + location ~ /\. { access_log off; log_not_found off; deny all; } + location ~ ~$ { access_log off; log_not_found off; deny all; } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/rhel/5/templates/web/nginx/php-fpm/pyrocms.tpl b/install/rhel/5/templates/web/nginx/php-fpm/pyrocms.tpl new file mode 100644 index 000000000..68b378efd --- /dev/null +++ b/install/rhel/5/templates/web/nginx/php-fpm/pyrocms.tpl @@ -0,0 +1,57 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location /installer { + try_files $uri $uri/ /installer/index.php; + } + + location / { + try_files $uri $uri/ /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + location = /robots.txt { access_log off; log_not_found off; } + location = /favicon.ico { access_log off; log_not_found off; } + location ~ /\. { access_log off; log_not_found off; deny all; } + location ~ ~$ { access_log off; log_not_found off; deny all; } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/rhel/5/templates/web/nginx/php-fpm/wordpress.stpl b/install/rhel/5/templates/web/nginx/php-fpm/wordpress.stpl new file mode 100644 index 000000000..910c28b69 --- /dev/null +++ b/install/rhel/5/templates/web/nginx/php-fpm/wordpress.stpl @@ -0,0 +1,50 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/rhel/5/templates/web/nginx/php-fpm/wordpress.tpl b/install/rhel/5/templates/web/nginx/php-fpm/wordpress.tpl new file mode 100644 index 000000000..b143e53ba --- /dev/null +++ b/install/rhel/5/templates/web/nginx/php-fpm/wordpress.tpl @@ -0,0 +1,46 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/rhel/5/templates/web/nginx/php-fpm/wordpress2.stpl b/install/rhel/5/templates/web/nginx/php-fpm/wordpress2.stpl new file mode 100644 index 000000000..2822f8754 --- /dev/null +++ b/install/rhel/5/templates/web/nginx/php-fpm/wordpress2.stpl @@ -0,0 +1,62 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + location / { + try_files $uri $uri/ /index.php?$args; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/rhel/5/templates/web/nginx/php-fpm/wordpress2.tpl b/install/rhel/5/templates/web/nginx/php-fpm/wordpress2.tpl new file mode 100644 index 000000000..37b8be305 --- /dev/null +++ b/install/rhel/5/templates/web/nginx/php-fpm/wordpress2.tpl @@ -0,0 +1,58 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + location / { + try_files $uri $uri/ /index.php?$args; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/templates/web/nginx/proxy_ip.tpl b/install/rhel/5/templates/web/nginx/proxy_ip.tpl similarity index 100% rename from install/ubuntu/templates/web/nginx/proxy_ip.tpl rename to install/rhel/5/templates/web/nginx/proxy_ip.tpl diff --git a/install/rhel/5/templates/web/php-fpm/default.tpl b/install/rhel/5/templates/web/php-fpm/default.tpl new file mode 100644 index 000000000..44ccf7a42 --- /dev/null +++ b/install/rhel/5/templates/web/php-fpm/default.tpl @@ -0,0 +1,18 @@ +[%backend%] +listen = 127.0.0.1:%backend_port% +listen.allowed_clients = 127.0.0.1 + +user = %user% +group = %user% + +pm = dynamic +pm.max_children = 50 +pm.start_servers = 3 +pm.min_spare_servers = 2 +pm.max_spare_servers = 10 + +env[HOSTNAME] = $HOSTNAME +env[PATH] = /usr/local/bin:/usr/bin:/bin +env[TMP] = /tmp +env[TMPDIR] = /tmp +env[TEMP] = /tmp diff --git a/install/rhel/5/templates/web/php-fpm/no-php.tpl b/install/rhel/5/templates/web/php-fpm/no-php.tpl new file mode 100644 index 000000000..89487d5f5 --- /dev/null +++ b/install/rhel/5/templates/web/php-fpm/no-php.tpl @@ -0,0 +1,13 @@ +#[%backend%] +#user = %user% +#group = %user% +#listen = /dev/null + +#listen.owner = %user% +#listen.group = nginx + +#pm = dynamic +#pm.max_children = 50 +#pm.start_servers = 3 +#pm.min_spare_servers = 2 +#pm.max_spare_servers = 10 diff --git a/install/rhel/5/templates/web/php-fpm/socket.tpl b/install/rhel/5/templates/web/php-fpm/socket.tpl new file mode 100644 index 000000000..f0513da3e --- /dev/null +++ b/install/rhel/5/templates/web/php-fpm/socket.tpl @@ -0,0 +1,21 @@ +[%backend%] +listen = /var/run/php5-%backend%.sock +listen.allowed_clients = 127.0.0.1 + +user = %user% +group = %user% + +listen.owner = %user% +listen.group = nginx + +pm = dynamic +pm.max_children = 50 +pm.start_servers = 3 +pm.min_spare_servers = 2 +pm.max_spare_servers = 10 + +env[HOSTNAME] = $HOSTNAME +env[PATH] = /usr/local/bin:/usr/bin:/bin +env[TMP] = /tmp +env[TMPDIR] = /tmp +env[TEMP] = /tmp diff --git a/install/debian/templates/web/skel/document_errors/403.html b/install/rhel/5/templates/web/skel/document_errors/403.html similarity index 100% rename from install/debian/templates/web/skel/document_errors/403.html rename to install/rhel/5/templates/web/skel/document_errors/403.html diff --git a/install/debian/templates/web/skel/document_errors/404.html b/install/rhel/5/templates/web/skel/document_errors/404.html similarity index 100% rename from install/debian/templates/web/skel/document_errors/404.html rename to install/rhel/5/templates/web/skel/document_errors/404.html diff --git a/install/debian/templates/web/skel/document_errors/50x.html b/install/rhel/5/templates/web/skel/document_errors/50x.html similarity index 100% rename from install/debian/templates/web/skel/document_errors/50x.html rename to install/rhel/5/templates/web/skel/document_errors/50x.html diff --git a/install/ubuntu/templates/web/skel/public_html/index.html b/install/rhel/5/templates/web/skel/public_html/index.html similarity index 100% rename from install/ubuntu/templates/web/skel/public_html/index.html rename to install/rhel/5/templates/web/skel/public_html/index.html diff --git a/install/ubuntu/templates/web/skel/public_html/robots.txt b/install/rhel/5/templates/web/skel/public_html/robots.txt similarity index 100% rename from install/ubuntu/templates/web/skel/public_html/robots.txt rename to install/rhel/5/templates/web/skel/public_html/robots.txt diff --git a/install/ubuntu/templates/web/skel/public_shtml/index.html b/install/rhel/5/templates/web/skel/public_shtml/index.html similarity index 100% rename from install/ubuntu/templates/web/skel/public_shtml/index.html rename to install/rhel/5/templates/web/skel/public_shtml/index.html diff --git a/install/ubuntu/templates/web/skel/public_shtml/robots.txt b/install/rhel/5/templates/web/skel/public_shtml/robots.txt similarity index 100% rename from install/ubuntu/templates/web/skel/public_shtml/robots.txt rename to install/rhel/5/templates/web/skel/public_shtml/robots.txt diff --git a/install/ubuntu/templates/web/suspend/.htaccess b/install/rhel/5/templates/web/suspend/.htaccess similarity index 100% rename from install/ubuntu/templates/web/suspend/.htaccess rename to install/rhel/5/templates/web/suspend/.htaccess diff --git a/install/debian/templates/web/suspend/index.html b/install/rhel/5/templates/web/suspend/index.html similarity index 100% rename from install/debian/templates/web/suspend/index.html rename to install/rhel/5/templates/web/suspend/index.html diff --git a/install/ubuntu/templates/web/webalizer/webalizer.tpl b/install/rhel/5/templates/web/webalizer/webalizer.tpl similarity index 100% rename from install/ubuntu/templates/web/webalizer/webalizer.tpl rename to install/rhel/5/templates/web/webalizer/webalizer.tpl diff --git a/install/rhel/vsftpd.conf b/install/rhel/5/vsftpd/vsftpd.conf similarity index 100% rename from install/rhel/vsftpd.conf rename to install/rhel/5/vsftpd/vsftpd.conf diff --git a/install/rhel/5/wsgi/httpd.tar.gz b/install/rhel/5/wsgi/httpd.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..b25acd68e8a2a11305b57b3f2f79f7bbf0cb4995 GIT binary patch literal 1311 zcmV+)1>pK0iwFSs4QNsT1MOGqZ`(Kw?`QuNS{9?*uC-&QNr9p%kW14vcWKil>Gold zK(&=vt1TIl(kvMIzaM2guRd{)bU4fe@~}kyNRc#21xm%fy|qy)0qs{R>2G!YH=`}b zb<1w4RNb%aZlV1r9vi+%>#2vu7*;E!JxE8#5s-# zGJPIl%7)ZuX0m7EkYYKMN>Da7SJ>;?WymDJ9;WNZ+?zy%sUGK`P5Rsu@Gq0`1dUZ) zVk|Y-9#JBBpIlBoU?!rrDW(bHS5HXL2_XO(mZcOF34Bh!9*nDdT5$4-?i* zx<4V`iFXOyEx{)-N(GTQ)=%k~8jxK)>hLjGhJ_vSv7NeiCKZV^uEv)OMb_0!5s8xT ze+B>?$m0?Ch4=|VQ(OEu0Fo1Gm_+*Um>t3Gfn!#_UMfJ6IhS9KNJ({yOy^+W)C(AIGc^=c)55<{TB5f zN`_=RNfn83jJ<$lewnK|x}%k<>s5VqDe0K$d}|*+g#S2@Ha{uxD`+44t@be{5oZ^I zdqirRzVAZ7Fw)SqOhJM_e~42~B5Mv(fgsqIwF>g7j6*!zWl$Yz=8smddwFq-;+YCK z+l{dbYEPt2Ea(k{!1ljkHs;H9!fx!4UfC&(YgKJY6#+Q!8jrJ=V}6Y60O?yeKgAkH zJ&r>iYRXymuKs9sy1&;uxA#1EFYOmq>ahgZnbT$?zS!=@T9HIeC=ZQR8?~7am11f0 z*(6l-hLWi~!^#WLDQ131guDmv+X>g2`m?A*+4ai4@QFZJ@9p@6&DIS=Bf%rRd;hgd zR@%%9Ct&w_RCFFEp^>Zg!CKS>z5mWI4(*kO0f0Zdf93S=Xm$PzHl*X3`Om4kWtjh* zea9_TOM81T|G9hBy?p+A33~m?)-%)NgkC={K7kyZlu z?-mRi!*97@=n^vYspi-t&?FQwKt)#Xkj}bYnT&nN z(hr8wBU1r&KAQ`=Y_Zbd44UeX)4||kc-rj`Zqe82bZQmd&z6{cE}~E8jW2WFp6+>H z-&pV7!iG-p1KTdT_UEF5KJ{wllC#tKau>MQe1F;O4~8f0PV>Be*1Scpc1I5aX00kQ zIK_P5ukTz8G-v@Gp $docroot/.htaccess +chown $user:$user $docroot/.htaccess + + +echo "import os, sys +sys.path.insert(0, '$home_dir/$user/web/$domain/private/django/$domain/env/lib/python2.6/site-packages') +sys.path.insert(0, '$home_dir/$user/web/$domain/private/django/$domain/project/src/shared/') +sys.path.insert(0, '$home_dir/$user/web/$domain/private/django/$domain/project/src/') + +os.environ['DJANGO_SETTINGS_MODULE'] = 'main.settings' +import django.core.handlers.wsgi +application = django.core.handlers.wsgi.WSGIHandler()" > $docroot/django.wsgi +chown $user:$user $docroot/django.wsgi + +exit 0 diff --git a/install/rhel/5/wsgi/httpd/wsgi.stpl b/install/rhel/5/wsgi/httpd/wsgi.stpl new file mode 100755 index 000000000..e2fdd3f40 --- /dev/null +++ b/install/rhel/5/wsgi/httpd/wsgi.stpl @@ -0,0 +1,49 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %sdocroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + AllowOverride All + + SSLEngine on + SSLVerifyClient none + SSLCertificateFile %ssl_crt% + SSLCertificateKeyFile %ssl_key% + %ssl_ca_str%SSLCertificateChainFile %ssl_ca% + + + RMode config + RUidGid %user% %group% + RGroups apache + + + AssignUserID %user% %group% + + + WSGIDaemonProcess apx-idea user=%user% group=%user% processes=1 threads=5 display-name=%{GROUP} python-path=%home%/%user%/web/%domain%/private/django/%domain%/env/lib/python2.6/site-packages + WSGIProcessGroup apx-idea + WSGIApplicationGroup %{GLOBAL} + + + + AllowOverride FileInfo + Options ExecCGI Indexes + MultiviewsMatch Handlers + Options +FollowSymLinks + Order allow,deny + Allow from all + + + Include %home%/%user%/conf/web/s%web_system%.%domain%.conf* + + + diff --git a/install/rhel/5/wsgi/httpd/wsgi.tpl b/install/rhel/5/wsgi/httpd/wsgi.tpl new file mode 100644 index 000000000..ad5d8a076 --- /dev/null +++ b/install/rhel/5/wsgi/httpd/wsgi.tpl @@ -0,0 +1,44 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %docroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + AllowOverride All + + + + RMode config + RUidGid %user% %group% + RGroups apache + + + AssignUserID %user% %group% + + + WSGIDaemonProcess apx-idea user=%user% group=%user% processes=1 threads=5 display-name=%{GROUP} python-path=%home%/%user%/web/%domain%/private/django/%domain%/env/lib/python2.6/site-packages + WSGIProcessGroup apx-idea + WSGIApplicationGroup %{GLOBAL} + + + + AllowOverride FileInfo + Options ExecCGI Indexes + MultiviewsMatch Handlers + Options +FollowSymLinks + Order allow,deny + Allow from all + + + Include %home%/%user%/conf/web/%web_system%.%domain%.conf* + + + diff --git a/install/rhel/6/GPG.txt b/install/rhel/6/GPG.txt new file mode 100644 index 000000000..33bb1ff26 --- /dev/null +++ b/install/rhel/6/GPG.txt @@ -0,0 +1,30 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.5 (GNU/Linux) + +mQGiBExUOVkRBACPJeB3bdrAggHlFpkaB1aRDXDz7clRg6jyEzdMYHhrniSyjhAH ++b53zE4iapCHFIamEG2Fa7zS2lSx7068AmqHsZK5jwmyhTVVYuTtbebj1C4Y5ToW +icHhy4ullB7qeDmAod6EY4YSx2kYO3dR/QLk5QM4lWuV/OLdXWTeoKiiYwCg0UAP +yUkBXgNcKXrFqoJelmG3JEMEAIYM7CGwVd47FsM1UCu56HNQPErxLoUPBUlAQFtx +OMOFDMEm7qH7ve8FgGGRL9oHF7mSJ3y7HgM1BF5MHkKz6FjDrT1U5+Lub6oI2e90 +gfCMGlQAzUm9o+fijfbhKoEQ/xQRkUoqWEaf9zlFx1/4+NH+Qz/L8ZDTHvSLvUgt +HyZlA/916St5suAUugXu9PeLRVqboiHjhz0JWKneQEQ2QcTu8lhHsu/mZTWL9FYn +XwtiCJLZT8bpBSfl8Oeqhof1+sPgnv7t/LuKQ6JJmyJ46Sa453wfrs+xs32hKAe+ +ZN0VGBmHe7NhuhW/LdM0KMMr/LHuJJJAgmt+XVHi2RFwsZvdMbQkVmVzdGEgUGFj +a2FnZXMgPGJ1aWxkZXJAdmVzdGFjcC5jb20+iGAEExECACAFAkxUOVkCGwMGCwkI +BwMCBBUCCAMEFgIDAQIeAQIXgAAKCRBbjeFzoXeCtp6dAKDQfeTPHi6hCgg4L+sx +LEjXvVdLOwCfe9yfr+en+uz6qst0QBT2cAwB+q+5Ag0ETFQ5bBAIAJYZa9pV9l/R +OUFgIvdJd1mvzJpRAXsRBBJc22WuOHp22Uj+lMKrJMTRQZvFBvk9s7Mb1/ACXrL4 +vIbsKqXNAlVFp9kF1tKV2ejZ1MrJaQ4819bIkyG0lJzjl6u9lzJopF7ie00YHKC6 +1rltLaevfFjUXq1DoYZBg42hT/SOj+3+2D0e9qcxeuxXbsjnvwtxxUkWcP/ftOSt +HsAAbM1YtwGl9+fZLWG9+WIKNOE9kp+h2ywZtFA4v/Ms2op7oZGAL7C95k1EgLrH +mOZ0B2oKOLctV1z9keWksPN/osyG7Mg8ljv8zF3XwQFqHOHRntDqSWoFBMvJBkNS +vtm6u5WyKd8ABAsH/0RbeWVA+JqpZ24Rl57XoDRPRzno0m0EnkJMXr22uBq1lPg8 +VkadrGOshFXpM3Rho57f3U7fwKmShQXGEV7RHsWcxcfwOSKVJtI468sDuYXc2l1f +5nFo+rCtVh3BBq+JtZFKX0x53BesCT/M7l33Dfm9MDi34tEdPTPjumBIH1dowYdv +9/2HPlPp4NZte7gOO/VIAiS+jJ30aBn09t8duW5md7/rkOPIM5It05LGCLjb9hVm +R9zTwzw30fIrkeyWZdAbk76lH8u8j6PX30U6RRzb33+XIFR4ab3nlyqOQOpoTqyG +cs7B02sgBbyC+RG1EYfcelSEvLXkR8mjcqjs+MCISQQYEQIACQUCTFQ5bAIbDAAK +CRBbjeFzoXeCtlpcAKDLh59svtq/Gn99O9ZZw0nBjWv6sACfffDxPhCP1F852Jab +d8P1WGhr2Q8= +=Z1Jj +-----END PGP PUBLIC KEY BLOCK----- diff --git a/install/rhel/6/clamav/clamd.conf b/install/rhel/6/clamav/clamd.conf new file mode 100644 index 000000000..c215bcb98 --- /dev/null +++ b/install/rhel/6/clamav/clamd.conf @@ -0,0 +1,502 @@ +## +## Example config file for the Clam AV daemon +## Please read the clamd.conf(5) manual before editing this file. +## + + +# Comment or remove the line below. +#Example + +# Uncomment this option to enable logging. +# LogFile must be writable for the user running daemon. +# A full path is required. +# Default: disabled +LogFile /var/log/clamav/clamd.log + +# By default the log file is locked for writing - the lock protects against +# running clamd multiple times (if want to run another clamd, please +# copy the configuration file, change the LogFile variable, and run +# the daemon with --config-file option). +# This option disables log file locking. +# Default: no +#LogFileUnlock yes + +# Maximum size of the log file. +# Value of 0 disables the limit. +# You may use 'M' or 'm' for megabytes (1M = 1m = 1048576 bytes) +# and 'K' or 'k' for kilobytes (1K = 1k = 1024 bytes). To specify the size +# in bytes just don't use modifiers. +# Default: 1M +LogFileMaxSize 0 + +# Log time with each message. +# Default: no +LogTime yes + +# Also log clean files. Useful in debugging but drastically increases the +# log size. +# Default: no +#LogClean yes + +# Use system logger (can work together with LogFile). +# Default: no +LogSyslog yes + +# Specify the type of syslog messages - please refer to 'man syslog' +# for facility names. +# Default: LOG_LOCAL6 +#LogFacility LOG_MAIL + +# Enable verbose logging. +# Default: no +#LogVerbose yes + +# Log additional information about the infected file, such as its +# size and hash, together with the virus name. +#ExtendedDetectionInfo yes + +# This option allows you to save a process identifier of the listening +# daemon (main thread). +# Default: disabled +PidFile /var/run/clamav/clamd.pid + +# Optional path to the global temporary directory. +# Default: system specific (usually /tmp or /var/tmp). +TemporaryDirectory /var/tmp + +# Path to the database directory. +# Default: hardcoded (depends on installation options) +DatabaseDirectory /var/lib/clamav + +# Only load the official signatures published by the ClamAV project. +# Default: no +#OfficialDatabaseOnly no + +# The daemon can work in local mode, network mode or both. +# Due to security reasons we recommend the local mode. + +# Path to a local socket file the daemon will listen on. +# Default: disabled (must be specified by a user) +LocalSocket /var/run/clamav/clamd.sock + +# Sets the group ownership on the unix socket. +# Default: disabled (the primary group of the user running clamd) +#LocalSocketGroup virusgroup + +# Sets the permissions on the unix socket to the specified mode. +# Default: disabled (socket is world accessible) +#LocalSocketMode 660 + +# Remove stale socket after unclean shutdown. +# Default: yes +FixStaleSocket yes + +# TCP port address. +# Default: no +TCPSocket 3310 + +# TCP address. +# By default we bind to INADDR_ANY, probably not wise. +# Enable the following to provide some degree of protection +# from the outside world. +# Default: no +TCPAddr 127.0.0.1 + +# Maximum length the queue of pending connections may grow to. +# Default: 200 +MaxConnectionQueueLength 30 + +# Clamd uses FTP-like protocol to receive data from remote clients. +# If you are using clamav-milter to balance load between remote clamd daemons +# on firewall servers you may need to tune the options below. + +# Close the connection when the data size limit is exceeded. +# The value should match your MTA's limit for a maximum attachment size. +# Default: 25M +#StreamMaxLength 10M + +# Limit port range. +# Default: 1024 +#StreamMinPort 30000 +# Default: 2048 +#StreamMaxPort 32000 + +# Maximum number of threads running at the same time. +# Default: 10 +MaxThreads 50 + +# Waiting for data from a client socket will timeout after this time (seconds). +# Default: 120 +ReadTimeout 300 + +# This option specifies the time (in seconds) after which clamd should +# timeout if a client doesn't provide any initial command after connecting. +# Default: 5 +#CommandReadTimeout 5 + +# This option specifies how long to wait (in miliseconds) if the send buffer is full. +# Keep this value low to prevent clamd hanging +# +# Default: 500 +#SendBufTimeout 200 + +# Maximum number of queued items (including those being processed by MaxThreads threads) +# It is recommended to have this value at least twice MaxThreads if possible. +# WARNING: you shouldn't increase this too much to avoid running out of file descriptors, +# the following condition should hold: +# MaxThreads*MaxRecursion + (MaxQueue - MaxThreads) + 6< RLIMIT_NOFILE (usual max is 1024) +# +# Default: 100 +#MaxQueue 200 + +# Waiting for a new job will timeout after this time (seconds). +# Default: 30 +#IdleTimeout 60 + +# Don't scan files and directories matching regex +# This directive can be used multiple times +# Default: scan all +#ExcludePath ^/proc/ +#ExcludePath ^/sys/ + +# Maximum depth directories are scanned at. +# Default: 15 +#MaxDirectoryRecursion 20 + +# Follow directory symlinks. +# Default: no +#FollowDirectorySymlinks yes + +# Follow regular file symlinks. +# Default: no +#FollowFileSymlinks yes + +# Scan files and directories on other filesystems. +# Default: yes +#CrossFilesystems yes + +# Perform a database check. +# Default: 600 (10 min) +#SelfCheck 600 + +# Execute a command when virus is found. In the command string %v will +# be replaced with the virus name. +# Default: no +#VirusEvent /usr/local/bin/send_sms 123456789 "VIRUS ALERT: %v" + +# Run as another user (clamd must be started by root for this option to work) +# Default: don't drop privileges +User clam + +# Initialize supplementary group access (clamd must be started by root). +# Default: no +AllowSupplementaryGroups yes + +# Stop daemon when libclamav reports out of memory condition. +#ExitOnOOM yes + +# Don't fork into background. +# Default: no +#Foreground yes + +# Enable debug messages in libclamav. +# Default: no +#Debug yes + +# Do not remove temporary files (for debug purposes). +# Default: no +#LeaveTemporaryFiles yes + +# Detect Possibly Unwanted Applications. +# Default: no +#DetectPUA yes + +# Exclude a specific PUA category. This directive can be used multiple times. +# See http://www.clamav.net/support/pua for the complete list of PUA +# categories. +# Default: Load all categories (if DetectPUA is activated) +#ExcludePUA NetTool +#ExcludePUA PWTool + +# Only include a specific PUA category. This directive can be used multiple +# times. +# Default: Load all categories (if DetectPUA is activated) +#IncludePUA Spy +#IncludePUA Scanner +#IncludePUA RAT + +# In some cases (eg. complex malware, exploits in graphic files, and others), +# ClamAV uses special algorithms to provide accurate detection. This option +# controls the algorithmic detection. +# Default: yes +#AlgorithmicDetection yes + + +## +## Executable files +## + +# PE stands for Portable Executable - it's an executable file format used +# in all 32 and 64-bit versions of Windows operating systems. This option allows +# ClamAV to perform a deeper analysis of executable files and it's also +# required for decompression of popular executable packers such as UPX, FSG, +# and Petite. If you turn off this option, the original files will still be +# scanned, but without additional processing. +# Default: yes +ScanPE yes + +# Executable and Linking Format is a standard format for UN*X executables. +# This option allows you to control the scanning of ELF files. +# If you turn off this option, the original files will still be scanned, but +# without additional processing. +# Default: yes +ScanELF yes + +# With this option clamav will try to detect broken executables (both PE and +# ELF) and mark them as Broken.Executable. +# Default: no +DetectBrokenExecutables yes + + +## +## Documents +## + +# This option enables scanning of OLE2 files, such as Microsoft Office +# documents and .msi files. +# If you turn off this option, the original files will still be scanned, but +# without additional processing. +# Default: yes +ScanOLE2 yes + + +# With this option enabled OLE2 files with VBA macros, which were not +# detected by signatures will be marked as "Heuristics.OLE2.ContainsMacros". +# Default: no +#OLE2BlockMacros no + +# This option enables scanning within PDF files. +# If you turn off this option, the original files will still be scanned, but +# without decoding and additional processing. +# Default: yes +#ScanPDF yes + + +## +## Mail files +## + +# Enable internal e-mail scanner. +# If you turn off this option, the original files will still be scanned, but +# without parsing individual messages/attachments. +# Default: yes +ScanMail yes + +# Scan RFC1341 messages split over many emails. +# You will need to periodically clean up $TemporaryDirectory/clamav-partial directory. +# WARNING: This option may open your system to a DoS attack. +# Never use it on loaded servers. +# Default: no +#ScanPartialMessages yes + + +# With this option enabled ClamAV will try to detect phishing attempts by using +# signatures. +# Default: yes +#PhishingSignatures yes + +# Scan URLs found in mails for phishing attempts using heuristics. +# Default: yes +#PhishingScanURLs yes + +# Always block SSL mismatches in URLs, even if the URL isn't in the database. +# This can lead to false positives. +# +# Default: no +#PhishingAlwaysBlockSSLMismatch no + +# Always block cloaked URLs, even if URL isn't in database. +# This can lead to false positives. +# +# Default: no +#PhishingAlwaysBlockCloak no + +# Allow heuristic match to take precedence. +# When enabled, if a heuristic scan (such as phishingScan) detects +# a possible virus/phish it will stop scan immediately. Recommended, saves CPU +# scan-time. +# When disabled, virus/phish detected by heuristic scans will be reported only at +# the end of a scan. If an archive contains both a heuristically detected +# virus/phish, and a real malware, the real malware will be reported +# +# Keep this disabled if you intend to handle "*.Heuristics.*" viruses +# differently from "real" malware. +# If a non-heuristically-detected virus (signature-based) is found first, +# the scan is interrupted immediately, regardless of this config option. +# +# Default: no +#HeuristicScanPrecedence yes + +## +## Data Loss Prevention (DLP) +## + +# Enable the DLP module +# Default: No +#StructuredDataDetection yes + +# This option sets the lowest number of Credit Card numbers found in a file +# to generate a detect. +# Default: 3 +#StructuredMinCreditCardCount 5 + +# This option sets the lowest number of Social Security Numbers found +# in a file to generate a detect. +# Default: 3 +#StructuredMinSSNCount 5 + +# With this option enabled the DLP module will search for valid +# SSNs formatted as xxx-yy-zzzz +# Default: yes +#StructuredSSNFormatNormal yes + +# With this option enabled the DLP module will search for valid +# SSNs formatted as xxxyyzzzz +# Default: no +#StructuredSSNFormatStripped yes + + +## +## HTML +## + +# Perform HTML normalisation and decryption of MS Script Encoder code. +# Default: yes +# If you turn off this option, the original files will still be scanned, but +# without additional processing. +#ScanHTML yes + + +## +## Archives +## + +# ClamAV can scan within archives and compressed files. +# If you turn off this option, the original files will still be scanned, but +# without unpacking and additional processing. +# Default: yes +ScanArchive yes + +# Mark encrypted archives as viruses (Encrypted.Zip, Encrypted.RAR). +# Default: no +ArchiveBlockEncrypted no + + +## +## Limits +## + +# The options below protect your system against Denial of Service attacks +# using archive bombs. + +# This option sets the maximum amount of data to be scanned for each input file. +# Archives and other containers are recursively extracted and scanned up to this +# value. +# Value of 0 disables the limit +# Note: disabling this limit or setting it too high may result in severe damage +# to the system. +# Default: 100M +#MaxScanSize 150M + +# Files larger than this limit won't be scanned. Affects the input file itself +# as well as files contained inside it (when the input file is an archive, a +# document or some other kind of container). +# Value of 0 disables the limit. +# Note: disabling this limit or setting it too high may result in severe damage +# to the system. +# Default: 25M +#MaxFileSize 30M + +# Nested archives are scanned recursively, e.g. if a Zip archive contains a RAR +# file, all files within it will also be scanned. This options specifies how +# deeply the process should be continued. +# Note: setting this limit too high may result in severe damage to the system. +# Default: 16 +#MaxRecursion 10 + +# Number of files to be scanned within an archive, a document, or any other +# container file. +# Value of 0 disables the limit. +# Note: disabling this limit or setting it too high may result in severe damage +# to the system. +# Default: 10000 +#MaxFiles 15000 + + +## +## Clamuko settings +## + +# Enable Clamuko. Dazuko must be configured and running. Clamuko supports +# both Dazuko (/dev/dazuko) and DazukoFS (/dev/dazukofs.ctrl). DazukoFS +# is the preferred option. For more information please visit www.dazuko.org +# Default: no +#ClamukoScanOnAccess yes + +# The number of scanner threads that will be started (DazukoFS only). +# Having multiple scanner threads allows Clamuko to serve multiple +# processes simultaneously. This is particularly beneficial on SMP machines. +# Default: 3 +#ClamukoScannerCount 3 + +# Don't scan files larger than ClamukoMaxFileSize +# Value of 0 disables the limit. +# Default: 5M +#ClamukoMaxFileSize 10M + +# Set access mask for Clamuko (Dazuko only). +# Default: no +#ClamukoScanOnOpen yes +#ClamukoScanOnClose yes +#ClamukoScanOnExec yes + +# Set the include paths (all files inside them will be scanned). You can have +# multiple ClamukoIncludePath directives but each directory must be added +# in a seperate line. (Dazuko only) +# Default: disabled +#ClamukoIncludePath /home +#ClamukoIncludePath /students + +# Set the exclude paths. All subdirectories are also excluded. (Dazuko only) +# Default: disabled +#ClamukoExcludePath /home/bofh + +# With this option you can whitelist specific UIDs. Processes with these UIDs +# will be able to access all files. +# This option can be used multiple times (one per line). +# Default: disabled +#ClamukoExcludeUID 0 + +# With this option enabled ClamAV will load bytecode from the database. +# It is highly recommended you keep this option on, otherwise you'll miss detections for many new viruses. +# Default: yes +#Bytecode yes + +# Set bytecode security level. +# Possible values: +# None - no security at all, meant for debugging. DO NOT USE THIS ON PRODUCTION SYSTEMS +# This value is only available if clamav was built with --enable-debug! +# TrustSigned - trust bytecode loaded from signed .c[lv]d files, +# insert runtime safety checks for bytecode loaded from other sources +# Paranoid - don't trust any bytecode, insert runtime checks for all +# Recommended: TrustSigned, because bytecode in .cvd files already has these checks +# Note that by default only signed bytecode is loaded, currently you can only +# load unsigned bytecode in --enable-debug mode. +# +# Default: TrustSigned +#BytecodeSecurity TrustSigned + +# Set bytecode timeout in miliseconds. +# +# Default: 5000 +# BytecodeTimeout 1000 diff --git a/install/rhel/6/clamav/clamd.service b/install/rhel/6/clamav/clamd.service new file mode 100644 index 000000000..fdb3af7fd --- /dev/null +++ b/install/rhel/6/clamav/clamd.service @@ -0,0 +1,12 @@ +[Unit] +Description = clamd scanner (clamd) daemon +After = syslog.target nss-lookup.target network.target + +[Service] +Type = simple +ExecStart = /usr/sbin/clamd -c /etc/clamd.conf --nofork=yes +Restart = on-failure +PrivateTmp = true + +[Install] +WantedBy=multi-user.target diff --git a/install/rhel/6/clamav/freshclam.conf b/install/rhel/6/clamav/freshclam.conf new file mode 100644 index 000000000..61fb36465 --- /dev/null +++ b/install/rhel/6/clamav/freshclam.conf @@ -0,0 +1,6 @@ +DatabaseDirectory /var/lib/clamav +UpdateLogFile /var/log/clamav/freshclam.log +LogSyslog yes +DatabaseOwner clam +DatabaseMirror db.ca.clamav.net +DatabaseMirror db.local.clamav.net diff --git a/install/rhel/6/dovecot.tar.gz b/install/rhel/6/dovecot.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..9efb91bebbb483918ea5bd862e0776b9e6eee301 GIT binary patch literal 2640 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 literal 0 HcmV?d00001 diff --git a/install/rhel/6/exim/dnsbl.conf b/install/rhel/6/exim/dnsbl.conf new file mode 100644 index 000000000..5166b255e --- /dev/null +++ b/install/rhel/6/exim/dnsbl.conf @@ -0,0 +1,2 @@ +bl.spamcop.net +zen.spamhaus.org diff --git a/install/rhel/6/exim/exim-smarthost.conf b/install/rhel/6/exim/exim-smarthost.conf new file mode 100644 index 000000000..086ca6507 --- /dev/null +++ b/install/rhel/6/exim/exim-smarthost.conf @@ -0,0 +1,384 @@ +###################################################################### +# # +# Exim configuration file for Vesta Control Panel # +# # +###################################################################### + +#SPAMASSASSIN = yes +#SPAM_SCORE = 50 +#CLAMD = yes + +domainlist local_domains = dsearch;/etc/exim/domains/ +domainlist relay_to_domains = dsearch;/etc/exim/domains/ +hostlist relay_from_hosts = 127.0.0.1 +hostlist whitelist = net-iplsearch;/etc/exim/white-blocks.conf +hostlist spammers = net-iplsearch;/etc/exim/spam-blocks.conf +no_local_from_check +untrusted_set_sender = * +acl_smtp_connect = acl_check_spammers +acl_smtp_mail = acl_check_mail +acl_smtp_rcpt = acl_check_rcpt +acl_smtp_data = acl_check_data +acl_smtp_mime = acl_check_mime + +.ifdef SPAMASSASSIN +spamd_address = 127.0.0.1 783 +.endif + +.ifdef CLAMD +av_scanner = clamd: /var/run/clamav/clamd.sock +.endif + +tls_advertise_hosts = * +tls_certificate = /etc/pki/tls/certs/exim.pem +tls_privatekey = /etc/pki/tls/private/exim.pem + +daemon_smtp_ports = 25 : 465 : 587 : 2525 +tls_on_connect_ports = 465 +never_users = root +host_lookup = * +rfc1413_hosts = * +rfc1413_query_timeout = 5s +ignore_bounce_errors_after = 2d +timeout_frozen_after = 7d + +DKIM_DOMAIN = ${lc:${domain:$h_from:}} +DKIM_FILE = /etc/exim/domains/${lc:${domain:$h_from:}}/dkim.pem +DKIM_PRIVATE_KEY = ${if exists{DKIM_FILE}{DKIM_FILE}{0}} + + +###################################################################### +# ACL CONFIGURATION # +# Specifies access control lists for incoming SMTP mail # +###################################################################### +begin acl + +acl_check_spammers: + accept hosts = +whitelist + + drop message = Your host in blacklist on this server. + log_message = Host in blacklist + hosts = +spammers + + accept + + +acl_check_mail: + deny condition = ${if eq{$sender_helo_name}{}} + message = HELO required before MAIL + + drop message = Helo name contains a ip address (HELO was $sender_helo_name) and not is valid + condition = ${if match{$sender_helo_name}{\N((\d{1,3}[.-]\d{1,3}[.-]\d{1,3}[.-]\d{1,3})|([0-9a-f]{8})|([0-9A-F]{8}))\N}{yes}{no}} + condition = ${if match {${lookup dnsdb{>: defer_never,ptr=$sender_host_address}}\}{$sender_helo_name}{no}{yes}} + delay = 45s + + drop condition = ${if isip{$sender_helo_name}} + message = Access denied - Invalid HELO name (See RFC2821 4.1.3) + + drop condition = ${if eq{[$interface_address]}{$sender_helo_name}} + message = $interface_address is _my_ address + + accept + + +acl_check_rcpt: + accept hosts = : + + deny message = Restricted characters in address + domains = +local_domains + local_parts = ^[.] : ^.*[@%!/|] + + deny message = Restricted characters in address + domains = !+local_domains + local_parts = ^[./|] : ^.*[@%!] : ^.*/\\.\\./ + + require verify = sender + + accept hosts = +relay_from_hosts + control = submission + + accept authenticated = * + control = submission/domain= + + deny message = Rejected because $sender_host_address is in a black list at $dnslist_domain\n$dnslist_text + hosts = !+whitelist + dnslists = ${readfile {/etc/exim/dnsbl.conf}{:}} + + require message = relay not permitted + domains = +local_domains : +relay_to_domains + + deny message = smtp auth requried + sender_domains = +local_domains + !authenticated = * + + require verify = recipient + +.ifdef CLAMD + warn set acl_m0 = no + + warn condition = ${if exists {/etc/exim/domains/$domain/antivirus}{yes}{no}} + set acl_m0 = yes +.endif + +.ifdef SPAMASSASSIN + warn set acl_m1 = no + + warn condition = ${if exists {/etc/exim/domains/$domain/antispam}{yes}{no}} + set acl_m1 = yes +.endif + + accept + + +acl_check_data: +.ifdef CLAMD + deny message = Message contains a virus ($malware_name) and has been rejected + malware = * + condition = ${if eq{$acl_m0}{yes}{yes}{no}} +.endif + +.ifdef SPAMASSASSIN + warn !authenticated = * + hosts = !+relay_from_hosts + condition = ${if < {$message_size}{100K}} + condition = ${if eq{$acl_m1}{yes}{yes}{no}} + spam = nobody:true/defer_ok + add_header = X-Spam-Score: $spam_score_int + add_header = X-Spam-Bar: $spam_bar + add_header = X-Spam-Report: $spam_report + set acl_m2 = $spam_score_int + + warn condition = ${if !eq{$acl_m2}{} {yes}{no}} + condition = ${if >{$acl_m2}{SPAM_SCORE} {yes}{no}} + add_header = X-Spam-Status: Yes + message = SpamAssassin detected spam (from $sender_address to $recipients). +.endif + + accept + + +acl_check_mime: + deny message = Blacklisted file extension detected + condition = ${if match {${lc:$mime_filename}}{\N(\.ade|\.adp|\.bat|\.chm|\.cmd|\.com|\.cpl|\.exe|\.hta|\.ins|\.isp|\.jse|\.lib|\.lnk|\.mde|\.msc|\.msp|\.mst|\.pif|\.scr|\.sct|\.shb|\.sys|\.vb|\.vbe|\.vbs|\.vxd|\.wsc|\.wsf|\.wsh)$\N}{1}{0}} + + accept + + + +###################################################################### +# AUTHENTICATION CONFIGURATION # +###################################################################### +begin authenticators + +login: + driver = plaintext + public_name = LOGIN + client_send = ": user@smartrelay.vestacp.com : p4sw0rd" + server_set_id = $auth1 + +dovecot_plain: + driver = dovecot + public_name = PLAIN + server_socket = /var/run/dovecot/auth-client + server_set_id = $auth1 + +dovecot_login: + driver = dovecot + public_name = LOGIN + server_socket = /var/run/dovecot/auth-client + server_set_id = $auth1 + + + +###################################################################### +# ROUTERS CONFIGURATION # +# Specifies how addresses are handled # +###################################################################### +begin routers + +smarthost: + driver = manualroute + domains = ! +local_domains + transport = remote_smtp_auth + route_list = * smartrelay.vestacp.com + +dnslookup: + driver = dnslookup + domains = !+local_domains + transport = remote_smtp + no_more + +userforward: + driver = redirect + check_local_user + file = $home/.forward + allow_filter + no_verify + no_expn + check_ancestor + file_transport = address_file + pipe_transport = address_pipe + reply_transport = address_reply + +procmail: + driver = accept + check_local_user + require_files = ${local_part}:+${home}/.procmailrc:/usr/bin/procmail + transport = procmail + no_verify + +autoreplay: + driver = accept + require_files = /etc/exim/domains/$domain/autoreply.${local_part}.msg + condition = ${if exists{/etc/exim/domains/$domain/autoreply.${local_part}.msg}}{yes}{no}} + retry_use_local_part + transport = userautoreply + unseen + +aliases: + driver = redirect + headers_add = X-redirected: yes + data = ${extract{1}{:}{${lookup{$local_part@$domain}lsearch{/etc/exim/domains/$domain/aliases}}}} + require_files = /etc/exim/domains/$domain/aliases + redirect_router = dnslookup + pipe_transport = address_pipe + unseen + +localuser_fwd_only: + driver = accept + transport = devnull + condition = ${if exists{/etc/exim/domains/$domain/fwd_only}{${lookup{$local_part}lsearch{/etc/exim/domains/$domain/fwd_only}{true}{false}}}} + +localuser_spam: + driver = accept + transport = local_spam_delivery + condition = ${if eq {${if match{$h_X-Spam-Status:}{\N^Yes\N}{yes}{no}}} {${lookup{$local_part}lsearch{/etc/exim/domains/$domain/passwd}{yes}{no_such_user}}}} + +localuser: + driver = accept + transport = local_delivery + condition = ${lookup{$local_part}lsearch{/etc/exim/domains/$domain/passwd}{true}{false}} + +catchall: + driver = redirect + headers_add = X-redirected: yes + require_files = /etc/exim/domains/$domain/aliases + data = ${extract{1}{:}{${lookup{*@$domain}lsearch{/etc/exim/domains/$domain/aliases}}}} + file_transport = local_delivery + redirect_router = dnslookup + +terminate_alias: + driver = accept + transport = devnull + condition = ${lookup{$local_part@$domain}lsearch{/etc/exim/domains/$domain/aliases}{true}{false}} + + + +###################################################################### +# TRANSPORTS CONFIGURATION # +###################################################################### +begin transports + +remote_smtp: + driver = smtp + dkim_domain = DKIM_DOMAIN + dkim_selector = mail + dkim_private_key = DKIM_PRIVATE_KEY + dkim_canon = relaxed + dkim_strict = 0 + +remote_smtp_auth: + driver = smtp + hosts = smartrelay.vestacp.com + hosts_require_auth = smartrelay.vestacp.com + +procmail: + driver = pipe + command = "/usr/bin/procmail -d $local_part" + return_path_add + delivery_date_add + envelope_to_add + user = $local_part + initgroups + return_output + +local_delivery: + driver = appendfile + maildir_format + maildir_use_size_file + user = ${extract{2}{:}{${lookup{$local_part}lsearch{/etc/exim/domains/$domain/passwd}}}} + group = mail + create_directory + directory_mode = 770 + mode = 660 + use_lockfile = no + delivery_date_add + envelope_to_add + return_path_add + directory = "${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim/domains/$domain/passwd}}}}/mail/$domain/$local_part" + quota = ${extract{6}{:}{${lookup{$local_part}lsearch{/etc/exim/domains/$domain/passwd}}}}M + quota_warn_threshold = 75% + +local_spam_delivery: + driver = appendfile + maildir_format + maildir_use_size_file + user = ${extract{2}{:}{${lookup{$local_part}lsearch{/etc/exim/domains/$domain/passwd}}}} + group = mail + create_directory + directory_mode = 770 + mode = 660 + use_lockfile = no + delivery_date_add + envelope_to_add + return_path_add + directory = "${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim/domains/$domain/passwd}}}}/mail/$domain/$local_part/.Spam" + quota = ${extract{6}{:}{${lookup{$local_part}lsearch{/etc/exim/domains/$domain/passwd}}}}M + quota_directory = "${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim/domains/$domain/passwd}}}}/mail/$domain/$local_part" + quota_warn_threshold = 75% + +address_pipe: + driver = pipe + return_output + +address_file: + driver = appendfile + delivery_date_add + envelope_to_add + return_path_add + +address_reply: + driver = autoreply + +userautoreply: + driver = autoreply + file = /etc/exim/domains/$domain/autoreply.${local_part}.msg + from = "${local_part}@${domain}" + subject = "${if def:h_Subject: {Autoreply: ${quote:${escape:$h_Subject:}}} {Autoreply Message}}" + to = "${sender_address}" + +devnull: + driver = appendfile + file = /dev/null + + + +###################################################################### +# RETRY CONFIGURATION # +###################################################################### +begin retry + +# Address or Domain Error Retries +# ----------------- ----- ------- +* * F,2h,15m; G,16h,1h,1.5; F,4d,6h + + + +###################################################################### +# REWRITE CONFIGURATION # +###################################################################### +begin rewrite + + + +###################################################################### diff --git a/install/rhel/6/exim/exim.conf b/install/rhel/6/exim/exim.conf new file mode 100644 index 000000000..0f9830168 --- /dev/null +++ b/install/rhel/6/exim/exim.conf @@ -0,0 +1,376 @@ +###################################################################### +# # +# Exim configuration file for Vesta Control Panel # +# # +###################################################################### + +#SPAMASSASSIN = yes +#SPAM_SCORE = 50 +#CLAMD = yes + +domainlist local_domains = dsearch;/etc/exim/domains/ +domainlist relay_to_domains = dsearch;/etc/exim/domains/ +hostlist relay_from_hosts = 127.0.0.1 +hostlist whitelist = net-iplsearch;/etc/exim/white-blocks.conf +hostlist spammers = net-iplsearch;/etc/exim/spam-blocks.conf +no_local_from_check +untrusted_set_sender = * +acl_smtp_connect = acl_check_spammers +acl_smtp_mail = acl_check_mail +acl_smtp_rcpt = acl_check_rcpt +acl_smtp_data = acl_check_data +acl_smtp_mime = acl_check_mime + +.ifdef SPAMASSASSIN +spamd_address = 127.0.0.1 783 +.endif + +.ifdef CLAMD +av_scanner = clamd: /var/run/clamav/clamd.sock +.endif + +tls_advertise_hosts = * +tls_certificate = /usr/local/vesta/ssl/certificate.crt +tls_privatekey = /usr/local/vesta/ssl/certificate.key + +daemon_smtp_ports = 25 : 465 : 587 : 2525 +tls_on_connect_ports = 465 +never_users = root +host_lookup = * +rfc1413_hosts = * +rfc1413_query_timeout = 5s +ignore_bounce_errors_after = 2d +timeout_frozen_after = 7d + +DKIM_DOMAIN = ${lc:${domain:$h_from:}} +DKIM_FILE = /etc/exim/domains/${lc:${domain:$h_from:}}/dkim.pem +DKIM_PRIVATE_KEY = ${if exists{DKIM_FILE}{DKIM_FILE}{0}} + + + +###################################################################### +# ACL CONFIGURATION # +# Specifies access control lists for incoming SMTP mail # +###################################################################### +begin acl + +acl_check_spammers: + accept hosts = +whitelist + + drop message = Your host in blacklist on this server. + log_message = Host in blacklist + hosts = +spammers + + accept + + +acl_check_mail: + deny condition = ${if eq{$sender_helo_name}{}} + message = HELO required before MAIL + + drop message = Helo name contains a ip address (HELO was $sender_helo_name) and not is valid + condition = ${if match{$sender_helo_name}{\N((\d{1,3}[.-]\d{1,3}[.-]\d{1,3}[.-]\d{1,3})|([0-9a-f]{8})|([0-9A-F]{8}))\N}{yes}{no}} + condition = ${if match {${lookup dnsdb{>: defer_never,ptr=$sender_host_address}}\}{$sender_helo_name}{no}{yes}} + delay = 45s + + drop condition = ${if isip{$sender_helo_name}} + message = Access denied - Invalid HELO name (See RFC2821 4.1.3) + + drop condition = ${if eq{[$interface_address]}{$sender_helo_name}} + message = $interface_address is _my_ address + + accept + + +acl_check_rcpt: + accept hosts = : + + deny message = Restricted characters in address + domains = +local_domains + local_parts = ^[.] : ^.*[@%!/|] + + deny message = Restricted characters in address + domains = !+local_domains + local_parts = ^[./|] : ^.*[@%!] : ^.*/\\.\\./ + + require verify = sender + + accept hosts = +relay_from_hosts + control = submission + + accept authenticated = * + control = submission/domain= + + deny message = Rejected because $sender_host_address is in a black list at $dnslist_domain\n$dnslist_text + hosts = !+whitelist + dnslists = ${readfile {/etc/exim/dnsbl.conf}{:}} + + require message = relay not permitted + domains = +local_domains : +relay_to_domains + + deny message = smtp auth requried + sender_domains = +local_domains + !authenticated = * + + require verify = recipient + +.ifdef CLAMD + warn set acl_m0 = no + + warn condition = ${if exists {/etc/exim/domains/$domain/antivirus}{yes}{no}} + set acl_m0 = yes +.endif + +.ifdef SPAMASSASSIN + warn set acl_m1 = no + + warn condition = ${if exists {/etc/exim/domains/$domain/antispam}{yes}{no}} + set acl_m1 = yes +.endif + + accept + + +acl_check_data: +.ifdef CLAMD + deny message = Message contains a virus ($malware_name) and has been rejected + malware = * + condition = ${if eq{$acl_m0}{yes}{yes}{no}} +.endif + +.ifdef SPAMASSASSIN + warn !authenticated = * + hosts = !+relay_from_hosts + condition = ${if < {$message_size}{100K}} + condition = ${if eq{$acl_m1}{yes}{yes}{no}} + spam = nobody:true/defer_ok + add_header = X-Spam-Score: $spam_score_int + add_header = X-Spam-Bar: $spam_bar + add_header = X-Spam-Report: $spam_report + set acl_m2 = $spam_score_int + + warn condition = ${if !eq{$acl_m2}{} {yes}{no}} + condition = ${if >{$acl_m2}{SPAM_SCORE} {yes}{no}} + add_header = X-Spam-Status: Yes + message = SpamAssassin detected spam (from $sender_address to $recipients). +.endif + + accept + + +acl_check_mime: + deny message = Blacklisted file extension detected + condition = ${if match {${lc:$mime_filename}}{\N(\.ade|\.adp|\.bat|\.chm|\.cmd|\.com|\.cpl|\.exe|\.hta|\.ins|\.isp|\.jse|\.lib|\.lnk|\.mde|\.msc|\.msp|\.mst|\.pif|\.scr|\.sct|\.shb|\.sys|\.vb|\.vbe|\.vbs|\.vxd|\.wsc|\.wsf|\.wsh)$\N}{1}{0}} + + accept + + + +###################################################################### +# AUTHENTICATION CONFIGURATION # +###################################################################### +begin authenticators + +dovecot_plain: + driver = dovecot + public_name = PLAIN + server_socket = /var/run/dovecot/auth-client + server_set_id = $auth1 + +dovecot_login: + driver = dovecot + public_name = LOGIN + server_socket = /var/run/dovecot/auth-client + server_set_id = $auth1 + + + +###################################################################### +# ROUTERS CONFIGURATION # +# Specifies how addresses are handled # +###################################################################### +begin routers + +#smarthost: +# driver = manualroute +# domains = ! +local_domains +# transport = remote_smtp +# route_list = * smartrelay.vestacp.com +# no_more +# no_verify + +dnslookup: + driver = dnslookup + domains = !+local_domains + transport = remote_smtp + no_more + +userforward: + driver = redirect + check_local_user + file = $home/.forward + allow_filter + no_verify + no_expn + check_ancestor + file_transport = address_file + pipe_transport = address_pipe + reply_transport = address_reply + +procmail: + driver = accept + check_local_user + require_files = ${local_part}:+${home}/.procmailrc:/usr/bin/procmail + transport = procmail + no_verify + +autoreplay: + driver = accept + require_files = /etc/exim/domains/$domain/autoreply.${local_part}.msg + condition = ${if exists{/etc/exim/domains/$domain/autoreply.${local_part}.msg}}{yes}{no}} + retry_use_local_part + transport = userautoreply + unseen + +aliases: + driver = redirect + headers_add = X-redirected: yes + data = ${extract{1}{:}{${lookup{$local_part@$domain}lsearch{/etc/exim/domains/$domain/aliases}}}} + require_files = /etc/exim/domains/$domain/aliases + redirect_router = dnslookup + pipe_transport = address_pipe + unseen + +localuser_fwd_only: + driver = accept + transport = devnull + condition = ${if exists{/etc/exim/domains/$domain/fwd_only}{${lookup{$local_part}lsearch{/etc/exim/domains/$domain/fwd_only}{true}{false}}}} + +localuser_spam: + driver = accept + transport = local_spam_delivery + condition = ${if eq {${if match{$h_X-Spam-Status:}{\N^Yes\N}{yes}{no}}} {${lookup{$local_part}lsearch{/etc/exim/domains/$domain/passwd}{yes}{no_such_user}}}} + +localuser: + driver = accept + transport = local_delivery + condition = ${lookup{$local_part}lsearch{/etc/exim/domains/$domain/passwd}{true}{false}} + +catchall: + driver = redirect + headers_add = X-redirected: yes + require_files = /etc/exim/domains/$domain/aliases + data = ${extract{1}{:}{${lookup{*@$domain}lsearch{/etc/exim/domains/$domain/aliases}}}} + file_transport = local_delivery + redirect_router = dnslookup + +terminate_alias: + driver = accept + transport = devnull + condition = ${lookup{$local_part@$domain}lsearch{/etc/exim/domains/$domain/aliases}{true}{false}} + + + +###################################################################### +# TRANSPORTS CONFIGURATION # +###################################################################### +begin transports + +remote_smtp: + driver = smtp + #helo_data = $sender_address_domain + dkim_domain = DKIM_DOMAIN + dkim_selector = mail + dkim_private_key = DKIM_PRIVATE_KEY + dkim_canon = relaxed + dkim_strict = 0 + +procmail: + driver = pipe + command = "/usr/bin/procmail -d $local_part" + return_path_add + delivery_date_add + envelope_to_add + user = $local_part + initgroups + return_output + +local_delivery: + driver = appendfile + maildir_format + maildir_use_size_file + user = ${extract{2}{:}{${lookup{$local_part}lsearch{/etc/exim/domains/$domain/passwd}}}} + group = mail + create_directory + directory_mode = 770 + mode = 660 + use_lockfile = no + delivery_date_add + envelope_to_add + return_path_add + directory = "${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim/domains/$domain/passwd}}}}/mail/$domain/$local_part" + quota = ${extract{6}{:}{${lookup{$local_part}lsearch{/etc/exim/domains/$domain/passwd}}}}M + quota_warn_threshold = 75% + +local_spam_delivery: + driver = appendfile + maildir_format + maildir_use_size_file + user = ${extract{2}{:}{${lookup{$local_part}lsearch{/etc/exim/domains/$domain/passwd}}}} + group = mail + create_directory + directory_mode = 770 + mode = 660 + use_lockfile = no + delivery_date_add + envelope_to_add + return_path_add + directory = "${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim/domains/$domain/passwd}}}}/mail/$domain/$local_part/.Spam" + quota = ${extract{6}{:}{${lookup{$local_part}lsearch{/etc/exim/domains/$domain/passwd}}}}M + quota_directory = "${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim/domains/$domain/passwd}}}}/mail/$domain/$local_part" + quota_warn_threshold = 75% + +address_pipe: + driver = pipe + return_output + +address_file: + driver = appendfile + delivery_date_add + envelope_to_add + return_path_add + +address_reply: + driver = autoreply + +userautoreply: + driver = autoreply + file = /etc/exim/domains/$domain/autoreply.${local_part}.msg + from = "${local_part}@${domain}" + subject = "${if def:h_Subject: {Autoreply: ${quote:${escape:$h_Subject:}}} {Autoreply Message}}" + to = "${sender_address}" + +devnull: + driver = appendfile + file = /dev/null + + +###################################################################### +# RETRY CONFIGURATION # +###################################################################### +begin retry + +# Address or Domain Error Retries +# ----------------- ----- ------- +* * F,2h,15m; G,16h,1h,1.5; F,4d,6h + + + +###################################################################### +# REWRITE CONFIGURATION # +###################################################################### +begin rewrite + + + +###################################################################### diff --git a/install/rhel/6/exim/spam-blocks.conf b/install/rhel/6/exim/spam-blocks.conf new file mode 100644 index 000000000..e69de29bb diff --git a/install/rhel/6/fail2ban.tar.gz b/install/rhel/6/fail2ban.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..563451b41911801445523d68e3fe4f910f1adc7c GIT binary patch literal 727 zcmV;|0x10-iwFR>PexP#1MQbfPvbBU$9vAF7>NVYN@*TV+6y4T0s@I;ky^NPdvKFU z>fOW%iPHsXKm6KBD6~yWk)Yj&f0yPl@i_R>*Fv5J=ZON1&hDswPicD z-1Fox50A!rzlpW?IkRDFAW*suH&qXf7i60>)#Z1meaHC7MSn#0qgkB384%Q7>V&{=ANXhy?u<3!{eK%Q$AA0%-*(NV{@+pke=EG`|5XN*J-=Xi;dz(`MHIoEOb8$apCIGZtF{Ni zImRi^wLP&lTwZ^^x;;JXkF+rgcNFc=OX64@CuABe>>V=WG7RxSSV8*}99(?u4~{@S zMjv=VUA66~gC(n`Yt4OXPF7D2@*_ZjfG>?;%LLnd+SA zm*dN;XVn*?(#43yDYewqhJG?dFX5Z0)uwM0ti5Wv_%XkaHeJ@*Sa$UlYkPXqytI{P z)6$mCo6NTQOVK#jyR-h_xN)-8sak&Uvi7d4NTER9egiTc J failed to login +ignoreregex = + diff --git a/install/rhel/fail2ban.jail.conf b/install/rhel/6/fail2ban/fail2ban.jail.conf similarity index 100% rename from install/rhel/fail2ban.jail.conf rename to install/rhel/6/fail2ban/fail2ban.jail.conf diff --git a/install/rhel/6/firewall.tar.gz b/install/rhel/6/firewall.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..e8556008077364323d7d6b6934e7a2cf7a734983 GIT binary patch literal 540 zcmV+%0^|K3iwFQ5XyQ}=1MQVdkJ>O4Mzij(@XnhsKo&*MSlh#7(1g=&0&FEG%?Me6ampuO4>y-_`!)kpP&FT0Pj|*j)GSV93 zG0u%P9?@5H>Ue&9TJ8w(mS4U;YbU>kw!5dto6pc!`1H`piz?!Qs? zZ2zTY(j)A}O)l`C?|(Hfn=&r%X0(YbN~&_+%&1`W&E*1z3IZzVUki(*D`*Kk5kQkG z1wFz!17_g@d9ch)G0;wCGL8I9sNtr~X-yEB=^d3PuoC0XT$oBik3eT~aJ zPYYM7vf@1@^`frQB1w}O-E1jovb=r04Y>?eKuHocY1?18ny~4FyPO>aM4!NUUOmFePy(-1M3SddTi>v8NVjB&*t=IgAYbgkDfmmx*FWy-yM^~-2uA1 z`-8QZ4$iCJUfZClsXi!k+gGp^gsj(jT}WJxQ(W4?Rswg^FKlTCd%;5d=XH e1VIo4K@bE%5ClOG1VIqwGCu%8Tmj4gC;$K)2?m1z literal 0 HcmV?d00001 diff --git a/install/rhel/6/firewall/ports.conf b/install/rhel/6/firewall/ports.conf new file mode 100644 index 000000000..a6ef4dae5 --- /dev/null +++ b/install/rhel/6/firewall/ports.conf @@ -0,0 +1,16 @@ +PROTOCOL='TCP' PORT='20' +PROTOCOL='TCP' PORT='21' +PROTOCOL='TCP' PORT='22' +PROTOCOL='TCP' PORT='25' +PROTOCOL='UDP' PORT='53' +PROTOCOL='TCP' PORT='80' +PROTOCOL='TCP' PORT='443' +PROTOCOL='TCP' PORT='110' +PROTOCOL='UDP' PORT='123' +PROTOCOL='TCP' PORT='143' +PROTOCOL='TCP' PORT='3306' +PROTOCOL='TCP' PORT='5432' +PROTOCOL='TCP' PORT='8080' +PROTOCOL='TCP' PORT='8433' +PROTOCOL='TCP' PORT='8083' +PROTOCOL='TCP' PORT='12000:12100' diff --git a/install/rhel/6/firewall/rules.conf b/install/rhel/6/firewall/rules.conf new file mode 100644 index 000000000..956c2e1d9 --- /dev/null +++ b/install/rhel/6/firewall/rules.conf @@ -0,0 +1,10 @@ +RULE='1' ACTION='ACCEPT' PROTOCOL='ICMP' PORT='0' IP='0.0.0.0/0' COMMENT='PING' SUSPENDED='no' TIME='17:13:48' DATE='2014-09-16' +RULE='2' ACTION='ACCEPT' PROTOCOL='TCP' PORT='8083' IP='0.0.0.0/0' COMMENT='VESTA' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' +RULE='3' ACTION='ACCEPT' PROTOCOL='TCP' PORT='3306,5432' IP='0.0.0.0/0' COMMENT='DB' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' +RULE='4' ACTION='ACCEPT' PROTOCOL='TCP' PORT='143,993' IP='0.0.0.0/0' COMMENT='IMAP' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' +RULE='5' ACTION='ACCEPT' PROTOCOL='TCP' PORT='110,995' IP='0.0.0.0/0' COMMENT='POP3' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' +RULE='6' ACTION='ACCEPT' PROTOCOL='TCP' PORT='25,465,587,2525' IP='0.0.0.0/0' COMMENT='SMTP' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' +RULE='7' ACTION='ACCEPT' PROTOCOL='UDP' PORT='53' IP='0.0.0.0/0' COMMENT='DNS' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' +RULE='8' ACTION='ACCEPT' PROTOCOL='TCP' PORT='21,12000-12100' IP='0.0.0.0/0' COMMENT='FTP' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' +RULE='9' ACTION='ACCEPT' PROTOCOL='TCP' PORT='80,443' IP='0.0.0.0/0' COMMENT='WEB' SUSPENDED='no' TIME='17:04:27' DATE='2014-09-24' +RULE='10' ACTION='ACCEPT' PROTOCOL='TCP' PORT='22' IP='0.0.0.0/0' COMMENT='SSH' SUSPENDED='no' TIME='17:14:41' DATE='2014-09-16' diff --git a/install/rhel/6/httpd/httpd.conf b/install/rhel/6/httpd/httpd.conf new file mode 100644 index 000000000..e4ca29eb5 --- /dev/null +++ b/install/rhel/6/httpd/httpd.conf @@ -0,0 +1,256 @@ +ServerTokens OS +ServerRoot "/etc/httpd" +PidFile run/httpd.pid +Timeout 30 +KeepAlive Off +MaxKeepAliveRequests 100 +KeepAliveTimeout 10 + + + StartServers 8 + MinSpareServers 5 + MaxSpareServers 20 + ServerLimit 256 + MaxClients 200 + MaxRequestsPerChild 4000 + + + + StartServers 2 + MaxClients 200 + MinSpareThreads 25 + MaxSpareThreads 75 + ThreadsPerChild 25 + MaxRequestsPerChild 4000 + + + + StartServers 8 + MinSpareServers 5 + MaxSpareServers 20 + ServerLimit 256 + MaxClients 256 + MaxRequestsPerChild 4000 + + +LoadModule auth_basic_module modules/mod_auth_basic.so +LoadModule auth_digest_module modules/mod_auth_digest.so +LoadModule authn_file_module modules/mod_authn_file.so +LoadModule authn_alias_module modules/mod_authn_alias.so +LoadModule authn_anon_module modules/mod_authn_anon.so +#LoadModule authn_dbm_module modules/mod_authn_dbm.so +LoadModule authn_default_module modules/mod_authn_default.so +LoadModule authz_host_module modules/mod_authz_host.so +LoadModule authz_user_module modules/mod_authz_user.so +LoadModule authz_owner_module modules/mod_authz_owner.so +LoadModule authz_groupfile_module modules/mod_authz_groupfile.so +#LoadModule authz_dbm_module modules/mod_authz_dbm.so +LoadModule authz_default_module modules/mod_authz_default.so +#LoadModule ldap_module modules/mod_ldap.so +#LoadModule authnz_ldap_module modules/mod_authnz_ldap.so +LoadModule include_module modules/mod_include.so +LoadModule log_config_module modules/mod_log_config.so +LoadModule logio_module modules/mod_logio.so +LoadModule env_module modules/mod_env.so +LoadModule ext_filter_module modules/mod_ext_filter.so +LoadModule mime_magic_module modules/mod_mime_magic.so +LoadModule expires_module modules/mod_expires.so +LoadModule deflate_module modules/mod_deflate.so +LoadModule headers_module modules/mod_headers.so +LoadModule usertrack_module modules/mod_usertrack.so +LoadModule setenvif_module modules/mod_setenvif.so +LoadModule mime_module modules/mod_mime.so +LoadModule dav_module modules/mod_dav.so +LoadModule status_module modules/mod_status.so +LoadModule autoindex_module modules/mod_autoindex.so +#LoadModule info_module modules/mod_info.so +#LoadModule dav_fs_module modules/mod_dav_fs.so +LoadModule vhost_alias_module modules/mod_vhost_alias.so +LoadModule negotiation_module modules/mod_negotiation.so +LoadModule dir_module modules/mod_dir.so +LoadModule actions_module modules/mod_actions.so +#LoadModule speling_module modules/mod_speling.so +#LoadModule userdir_module modules/mod_userdir.so +LoadModule alias_module modules/mod_alias.so +LoadModule rewrite_module modules/mod_rewrite.so +LoadModule proxy_module modules/mod_proxy.so +#LoadModule proxy_balancer_module modules/mod_proxy_balancer.so +#LoadModule proxy_ftp_module modules/mod_proxy_ftp.so +#LoadModule proxy_http_module modules/mod_proxy_http.so +#LoadModule proxy_connect_module modules/mod_proxy_connect.so +LoadModule cache_module modules/mod_cache.so +LoadModule suexec_module modules/mod_suexec.so +#LoadModule disk_cache_module modules/mod_disk_cache.so +#LoadModule file_cache_module modules/mod_file_cache.so +#LoadModule mem_cache_module modules/mod_mem_cache.so +LoadModule cgi_module modules/mod_cgi.so +LoadModule version_module modules/mod_version.so + +Include conf.d/*.conf + +ExtendedStatus On + +User apache +Group apache + +ServerAdmin root@localhost +UseCanonicalName Off +DocumentRoot "/var/www/html" + + Options SymLinksIfOwnerMatch + AllowOverride None + + + + Options Indexes SymLinksIfOwnerMatch + AllowOverride None + Order allow,deny + Allow from all + + + + UserDir public_html + + +DirectoryIndex index.php index.htm index.html + +AccessFileName .htaccess + + Order allow,deny + Deny from all + +TypesConfig /etc/mime.types + +DefaultType text/plain + + + MIMEMagicFile conf/magic + + +HostnameLookups Off + +ErrorLog logs/error_log +LogLevel warn + +LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined +LogFormat "%h %l %u %t \"%r\" %>s %b" common +LogFormat "%{Referer}i -> %U" referer +LogFormat "%{User-agent}i" agent +LogFormat "%b" bytes +CustomLog logs/access_log combined + +ServerSignature On + +Alias /icons/ "/var/www/icons/" + + + Options Indexes MultiViews + AllowOverride None + Order allow,deny + Allow from all + + + + AllowOverride None + Order allow,deny + Allow from all + + +ScriptAlias /cgi-bin/ "/var/www/cgi-bin/" + + + AllowOverride None + Options ExecCGI + Order allow,deny + Allow from all + + +IndexOptions FancyIndexing VersionSort NameWidth=* HTMLTable + +AddIconByEncoding (CMP,/icons/compressed.gif) x-compress x-gzip +AddIconByType (TXT,/icons/text.gif) text/* +AddIconByType (IMG,/icons/image2.gif) image/* +AddIconByType (SND,/icons/sound2.gif) audio/* +AddIconByType (VID,/icons/movie.gif) video/* +AddIcon /icons/binary.gif .bin .exe +AddIcon /icons/binhex.gif .hqx +AddIcon /icons/tar.gif .tar +AddIcon /icons/world2.gif .wrl .wrl.gz .vrml .vrm .iv +AddIcon /icons/compressed.gif .Z .z .tgz .gz .zip +AddIcon /icons/a.gif .ps .ai .eps +AddIcon /icons/layout.gif .html .shtml .htm .pdf +AddIcon /icons/text.gif .txt +AddIcon /icons/c.gif .c +AddIcon /icons/p.gif .pl .py +AddIcon /icons/f.gif .for +AddIcon /icons/dvi.gif .dvi +AddIcon /icons/uuencoded.gif .uu +AddIcon /icons/script.gif .conf .sh .shar .csh .ksh .tcl +AddIcon /icons/tex.gif .tex +AddIcon /icons/bomb.gif core +AddIcon /icons/back.gif .. +AddIcon /icons/hand.right.gif README +AddIcon /icons/folder.gif ^^DIRECTORY^^ +AddIcon /icons/blank.gif ^^BLANKICON^^ +DefaultIcon /icons/unknown.gif +ReadmeName README.html +HeaderName HEADER.html +IndexIgnore .??* *~ *# HEADER* README* RCS CVS *,v *,t +AddLanguage ca .ca +AddLanguage cs .cz .cs +AddLanguage da .dk +AddLanguage de .de +AddLanguage el .el +AddLanguage en .en +AddLanguage eo .eo +AddLanguage es .es +AddLanguage et .et +AddLanguage fr .fr +AddLanguage he .he +AddLanguage hr .hr +AddLanguage it .it +AddLanguage ja .ja +AddLanguage ko .ko +AddLanguage ltz .ltz +AddLanguage nl .nl +AddLanguage nn .nn +AddLanguage no .no +AddLanguage pl .po +AddLanguage pt .pt +AddLanguage pt-BR .pt-br +AddLanguage ru .ru +AddLanguage sv .sv +AddLanguage zh-CN .zh-cn +AddLanguage zh-TW .zh-tw +LanguagePriority en ca cs da de el eo es et fr he hr it ja ko ltz nl nn no pl pt pt-BR ru sv zh-CN zh-TW +ForceLanguagePriority Prefer Fallback + +AddDefaultCharset UTF-8 + +AddType application/x-compress .Z +AddType application/x-gzip .gz .tgz +AddType image/x-icon .ico + +AddType text/html .shtml +AddOutputFilter INCLUDES .shtml + +ErrorDocument 403 /error/403.html +ErrorDocument 404 /error/404.html +ErrorDocument 500 /error/50x.html +ErrorDocument 501 /error/50x.html +ErrorDocument 502 /error/50x.html +ErrorDocument 503 /error/50x.html +ErrorDocument 506 /error/50x.html + +BrowserMatch "Mozilla/2" nokeepalive +BrowserMatch "MSIE 4\.0b2;" nokeepalive downgrade-1.0 force-response-1.0 +BrowserMatch "RealPlayer 4\.0" force-response-1.0 +BrowserMatch "Java/1\.0" force-response-1.0 +BrowserMatch "JDK/1\.0" force-response-1.0 +BrowserMatch "Microsoft Data Access Internet Publishing Provider" redirect-carefully +BrowserMatch "MS FrontPage" redirect-carefully +BrowserMatch "^WebDrive" redirect-carefully +BrowserMatch "^WebDAVFS/1.[0123]" redirect-carefully +BrowserMatch "^gnome-vfs/1.0" redirect-carefully +BrowserMatch "^XML Spy" redirect-carefully +BrowserMatch "^Dreamweaver-WebDAV-SCM1" redirect-carefully diff --git a/install/rhel/6/httpd/ruid2.conf b/install/rhel/6/httpd/ruid2.conf new file mode 100644 index 000000000..42f908a85 --- /dev/null +++ b/install/rhel/6/httpd/ruid2.conf @@ -0,0 +1,8 @@ +LoadModule ruid2_module modules/mod_ruid2.so + + + RMode config + RDefaultUidGid apache apache + RUidGid apache apache + RGroups apache + diff --git a/install/rhel/6/httpd/ssl.conf b/install/rhel/6/httpd/ssl.conf new file mode 100644 index 000000000..6835e420b --- /dev/null +++ b/install/rhel/6/httpd/ssl.conf @@ -0,0 +1,12 @@ +LoadModule ssl_module modules/mod_ssl.so + +AddType application/x-x509-ca-cert .crt +AddType application/x-pkcs7-crl .crl + +SSLPassPhraseDialog builtin +SSLSessionCache shmcb:/var/cache/mod_ssl/scache(512000) +SSLSessionCacheTimeout 300 +SSLMutex default +SSLRandomSeed startup file:/dev/urandom 256 +SSLRandomSeed connect builtin +SSLCryptoDevice builtin diff --git a/install/rhel/6/httpd/status.conf b/install/rhel/6/httpd/status.conf new file mode 100644 index 000000000..f68f293dc --- /dev/null +++ b/install/rhel/6/httpd/status.conf @@ -0,0 +1,7 @@ +Listen 127.0.0.1:8081 + + SetHandler server-status + Order deny,allow + Deny from all + Allow from 127.0.0.1 + diff --git a/install/rhel/6/logrotate/httpd b/install/rhel/6/logrotate/httpd new file mode 100644 index 000000000..80dab8e29 --- /dev/null +++ b/install/rhel/6/logrotate/httpd @@ -0,0 +1,10 @@ +/var/log/httpd/*log /var/log/httpd/domains/*log { + missingok + notifempty + compress + sharedscripts + postrotate + /sbin/service httpd reload > /dev/null 2>/dev/null || true + [ ! -f /var/run/nginx.pid ] || kill -USR1 `cat /var/run/nginx.pid` + endscript +} diff --git a/install/rhel/6/logrotate/nginx b/install/rhel/6/logrotate/nginx new file mode 100644 index 000000000..b1da1bf16 --- /dev/null +++ b/install/rhel/6/logrotate/nginx @@ -0,0 +1,12 @@ +/var/log/nginx/*log /var/log/nginx/domains/*log { + create 0644 nginx nginx + daily + rotate 10 + missingok + notifempty + compress + sharedscripts + postrotate + [ -f /var/run/nginx.pid ] && kill -USR1 `cat /var/run/nginx.pid` + endscript +} diff --git a/install/rhel/6/logrotate/vesta b/install/rhel/6/logrotate/vesta new file mode 100644 index 000000000..027a34396 --- /dev/null +++ b/install/rhel/6/logrotate/vesta @@ -0,0 +1,7 @@ +/usr/local/vesta/log/*.log { + missingok + notifempty + size 30k + yearly + create 0600 root root +} diff --git a/install/rhel/6/mariadb/my-large.cnf b/install/rhel/6/mariadb/my-large.cnf new file mode 100644 index 000000000..4e6c2225c --- /dev/null +++ b/install/rhel/6/mariadb/my-large.cnf @@ -0,0 +1,38 @@ +[mysqld] +datadir=/var/lib/mysql +socket=/var/lib/mysql/mysql.sock +symbolic-links=0 + +skip-external-locking +key_buffer_size = 256M +max_allowed_packet = 32M +table_open_cache = 256 +sort_buffer_size = 1M +read_buffer_size = 1M +read_rnd_buffer_size = 4M +myisam_sort_buffer_size = 64M +thread_cache_size = 8 +query_cache_size= 16M +thread_concurrency = 8 + +#innodb_use_native_aio = 0 +innodb_file_per_table + +max_connections=200 +max_user_connections=50 +wait_timeout=10 +interactive_timeout=50 +long_query_time=5 + +#slow_query_log=1 +#slow_query_log_file=/var/log/mysql-slow-queries.log + + +[mysqld_safe] +log-error=/var/log/mariadb/mariadb.log +pid-file=/var/run/mariadb/mariadb.pid + +# +# include all files from the config directory +# +!includedir /etc/my.cnf.d diff --git a/install/rhel/6/mariadb/my-medium.cnf b/install/rhel/6/mariadb/my-medium.cnf new file mode 100644 index 000000000..fa255ec52 --- /dev/null +++ b/install/rhel/6/mariadb/my-medium.cnf @@ -0,0 +1,37 @@ +[mysqld] +datadir=/var/lib/mysql +socket=/var/lib/mysql/mysql.sock +symbolic-links=0 + +skip-external-locking +key_buffer_size = 16M +max_allowed_packet = 16M +table_open_cache = 64 +sort_buffer_size = 512K +net_buffer_length = 8K +read_buffer_size = 256K +read_rnd_buffer_size = 512K +myisam_sort_buffer_size = 8M + +#innodb_use_native_aio = 0 +innodb_file_per_table + +max_connections=70 +max_user_connections=30 +wait_timeout=10 +interactive_timeout=50 +long_query_time=5 + +#slow_query_log=1 +#slow_query_log_file=/var/log/mysql-slow-queries.log + + + +[mysqld_safe] +log-error=/var/log/mariadb/mariadb.log +pid-file=/var/run/mariadb/mariadb.pid + +# +# include all files from the config directory +# +!includedir /etc/my.cnf.d diff --git a/install/rhel/6/mariadb/my-small.cnf b/install/rhel/6/mariadb/my-small.cnf new file mode 100644 index 000000000..7d2fdc1b3 --- /dev/null +++ b/install/rhel/6/mariadb/my-small.cnf @@ -0,0 +1,35 @@ +[mysqld] +datadir=/var/lib/mysql +socket=/var/lib/mysql/mysql.sock +symbolic-links=0 + +skip-external-locking +key_buffer_size = 32K +max_allowed_packet = 8M +table_open_cache = 4 +sort_buffer_size = 128K +read_buffer_size = 256K +read_rnd_buffer_size = 256K +net_buffer_length = 2K +thread_stack = 240K + +#innodb_use_native_aio = 0 +innodb_file_per_table + +max_connections=50 +max_user_connections=25 +wait_timeout=10 +interactive_timeout=50 +long_query_time=5 + +#slow_query_log=1 +#slow_query_log_file=/var/log/mysql-slow-queries.log + +[mysqld_safe] +log-error=/var/log/mariadb/mariadb.log +pid-file=/var/run/mariadb/mariadb.pid + +# +# include all files from the config directory +# +!includedir /etc/my.cnf.d diff --git a/install/rhel/6/mysqld/my-large.cnf b/install/rhel/6/mysqld/my-large.cnf new file mode 100644 index 000000000..b548eeb87 --- /dev/null +++ b/install/rhel/6/mysqld/my-large.cnf @@ -0,0 +1,38 @@ +[mysqld] +datadir=/var/lib/mysql +socket=/var/lib/mysql/mysql.sock +symbolic-links=0 + +skip-external-locking +key_buffer_size = 256M +max_allowed_packet = 32M +table_open_cache = 256 +sort_buffer_size = 1M +read_buffer_size = 1M +read_rnd_buffer_size = 4M +myisam_sort_buffer_size = 64M +thread_cache_size = 8 +query_cache_size= 16M +thread_concurrency = 8 + +#innodb_use_native_aio = 0 +innodb_file_per_table + +max_connections=200 +max_user_connections=50 +wait_timeout=10 +interactive_timeout=50 +long_query_time=5 + +#slow_query_log=1 +#slow_query_log_file=/var/log/mysql-slow-queries.log + + +[mysqld_safe] +log-error=/var/log/mysqld.log +pid-file=/var/run/mysqld/mysqld.pid + +# +# include all files from the config directory +# +!includedir /etc/my.cnf.d diff --git a/install/rhel/6/mysqld/my-medium.cnf b/install/rhel/6/mysqld/my-medium.cnf new file mode 100644 index 000000000..e5f2677fc --- /dev/null +++ b/install/rhel/6/mysqld/my-medium.cnf @@ -0,0 +1,37 @@ +[mysqld] +datadir=/var/lib/mysql +socket=/var/lib/mysql/mysql.sock +symbolic-links=0 + +skip-external-locking +key_buffer_size = 16M +max_allowed_packet = 16M +table_open_cache = 64 +sort_buffer_size = 512K +net_buffer_length = 8K +read_buffer_size = 256K +read_rnd_buffer_size = 512K +myisam_sort_buffer_size = 8M + +#innodb_use_native_aio = 0 +innodb_file_per_table + +max_connections=70 +max_user_connections=30 +wait_timeout=10 +interactive_timeout=50 +long_query_time=5 + +#slow_query_log=1 +#slow_query_log_file=/var/log/mysql-slow-queries.log + + + +[mysqld_safe] +log-error=/var/log/mysqld.log +pid-file=/var/run/mysqld/mysqld.pid + +# +# include all files from the config directory +# +!includedir /etc/my.cnf.d diff --git a/install/rhel/6/mysqld/my-small.cnf b/install/rhel/6/mysqld/my-small.cnf new file mode 100644 index 000000000..966c49c3a --- /dev/null +++ b/install/rhel/6/mysqld/my-small.cnf @@ -0,0 +1,35 @@ +[mysqld] +datadir=/var/lib/mysql +socket=/var/lib/mysql/mysql.sock +symbolic-links=0 + +skip-external-locking +key_buffer_size = 16K +max_allowed_packet = 1M +table_open_cache = 4 +sort_buffer_size = 64K +read_buffer_size = 256K +read_rnd_buffer_size = 256K +net_buffer_length = 2K +thread_stack = 240K + +#innodb_use_native_aio = 0 +innodb_file_per_table + +max_connections=50 +max_user_connections=25 +wait_timeout=10 +interactive_timeout=50 +long_query_time=5 + +#slow_query_log=1 +#slow_query_log_file=/var/log/mysql-slow-queries.log + +[mysqld_safe] +log-error=/var/log/mysqld.log +pid-file=/var/run/mysqld/mysqld.pid + +# +# include all files from the config directory +# +!includedir /etc/my.cnf.d diff --git a/install/rhel/6/named/named.conf b/install/rhel/6/named/named.conf new file mode 100644 index 000000000..472bd829b --- /dev/null +++ b/install/rhel/6/named/named.conf @@ -0,0 +1,13 @@ +options { + directory "/var/named"; + dump-file "/var/named/data/cache_dump.db"; + pid-file "/var/run/named/named.pid"; + statistics-file "/var/named/data/named_stats.txt"; + version "get lost"; + allow-transfer {"none";}; + recursion no; + +}; + +include "/etc/rndc.key"; + diff --git a/install/rhel/6/nginx/nginx.conf b/install/rhel/6/nginx/nginx.conf new file mode 100644 index 000000000..0316de7ac --- /dev/null +++ b/install/rhel/6/nginx/nginx.conf @@ -0,0 +1,101 @@ +# Server globals +user nginx; +worker_processes 2; +error_log /var/log/nginx/error.log; +pid /var/run/nginx.pid; + + +# Worker config +events { + worker_connections 1024; + use epoll; +} + + +http { + # Main settings + sendfile on; + tcp_nopush on; + tcp_nodelay on; + client_header_timeout 1m; + client_body_timeout 1m; + client_header_buffer_size 2k; + client_body_buffer_size 256k; + client_max_body_size 100m; + large_client_header_buffers 4 8k; + send_timeout 30; + keepalive_timeout 60 60; + reset_timedout_connection on; + server_tokens off; + server_name_in_redirect off; + server_names_hash_max_size 512; + server_names_hash_bucket_size 512; + + + # Log format + log_format main '$remote_addr - $remote_user [$time_local] $request ' + '"$status" $body_bytes_sent "$http_referer" ' + '"$http_user_agent" "$http_x_forwarded_for"'; + log_format bytes '$body_bytes_sent'; + #access_log /var/log/nginx/access.log main; + access_log off; + + + # Mime settings + include /etc/nginx/mime.types; + default_type application/octet-stream; + + + # Compression + gzip on; + gzip_comp_level 9; + gzip_min_length 512; + gzip_buffers 8 64k; + gzip_types text/plain text/css text/javascript + application/x-javascript; + gzip_proxied any; + + + # Proxy settings + proxy_redirect off; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_pass_header Set-Cookie; + proxy_connect_timeout 90; + proxy_send_timeout 90; + proxy_read_timeout 90; + proxy_buffers 32 4k; + + + # SSL PCI Compliance + ssl_session_cache shared:SSL:10m; + ssl_protocols TLSv1 TLSv1.1 TLSv1.2; + ssl_prefer_server_ciphers on; + ssl_ciphers "ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA:ECDHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES128-SHA256:DHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES256-GCM-SHA384:AES128-GCM-SHA256:AES256-SHA256:AES128-SHA256:AES256-SHA:AES128-SHA:DES-CBC3-SHA:HIGH:!aNULL:!eNULL:!EXPORT:!DES:!MD5:!PSK:!RC4"; + + + # Error pages + error_page 403 /error/403.html; + error_page 404 /error/404.html; + error_page 502 503 504 /error/50x.html; + + + # Cache + proxy_cache_path /var/cache/nginx levels=2 keys_zone=cache:10m inactive=60m max_size=512m; + proxy_temp_path /var/cache/nginx/temp; + proxy_cache_key "$host$request_uri $cookie_user"; + proxy_ignore_headers Expires Cache-Control; + proxy_cache_use_stale error timeout invalid_header http_502; + proxy_cache_valid any 3d; + + map $http_cookie $no_cache { + default 0; + ~SESS 1; + ~wordpress_logged_in 1; + } + + + # Wildcard include + include /etc/nginx/conf.d/*.conf; +} diff --git a/install/rhel/6/nginx/phpmyadmin.inc b/install/rhel/6/nginx/phpmyadmin.inc new file mode 100644 index 000000000..09da52076 --- /dev/null +++ b/install/rhel/6/nginx/phpmyadmin.inc @@ -0,0 +1,15 @@ +location /phpmyadmin { + alias /usr/share/phpMyAdmin/; + + location ~ /(libraries|setup) { + return 404; + } + + location ~ ^/phpmyadmin/(.*\.php)$ { + alias /usr/share/phpMyAdmin/$1; + fastcgi_pass 127.0.0.1:9000; + fastcgi_index index.php; + include fastcgi_params; + fastcgi_param SCRIPT_FILENAME $request_filename; + } +} diff --git a/install/rhel/6/nginx/phppgadmin.inc b/install/rhel/6/nginx/phppgadmin.inc new file mode 100644 index 000000000..333e560a2 --- /dev/null +++ b/install/rhel/6/nginx/phppgadmin.inc @@ -0,0 +1,11 @@ +location /phppgadmin { + alias /usr/share/phpPgAdmin/; + + location ~ ^/phppgadmin/(.*\.php)$ { + alias /usr/share/phpPgAdmin/$1; + fastcgi_pass 127.0.0.1:9000; + fastcgi_index index.php; + include fastcgi_params; + fastcgi_param SCRIPT_FILENAME $request_filename; + } +} diff --git a/install/rhel/6/nginx/status.conf b/install/rhel/6/nginx/status.conf new file mode 100644 index 000000000..c0bcd0691 --- /dev/null +++ b/install/rhel/6/nginx/status.conf @@ -0,0 +1,9 @@ +server { + listen 127.0.0.1:8084 default; + server_name _; + server_name_in_redirect off; + location / { + stub_status on; + access_log off; + } +} diff --git a/install/rhel/6/nginx/webmail.inc b/install/rhel/6/nginx/webmail.inc new file mode 100644 index 000000000..2d0fbe293 --- /dev/null +++ b/install/rhel/6/nginx/webmail.inc @@ -0,0 +1,15 @@ +location /webmail { + alias /usr/share/roundcubemail/; + + location ~ /(config|temp|logs) { + return 404; + } + + location ~ ^/webmail/(.*\.php)$ { + alias /usr/share/roundcubemail/$1; + fastcgi_pass 127.0.0.1:9000; + fastcgi_index index.php; + include fastcgi_params; + fastcgi_param SCRIPT_FILENAME $request_filename; + } +} diff --git a/install/rhel/6/packages.tar.gz b/install/rhel/6/packages.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..8159005437ddef03e93df18548119984a8ee56b6 GIT binary patch literal 552 zcmV+@0@wW?iwFSC#Bfyr1MQVxZ<{a_#q*p`kvCq}%r*v8q&^TpDl3635OsTsSi@LU z22r37`}VUTaYD$pRw944-Jc?XkFPQ0>Kw14r{^e%i}$_Lff$-X>#M3Xt{ZxoC^E&A z5MGC|ig9nCoba6lFGU%x2ZLU;_`b}3Q}?I&zm(Os|EnmClXVth#pl)B|IRAP7AMMdRw8svL}te)>+`D4TJf;&k;wP3i85!f4nFKkqBVQQQH)Y=Ga&TW=dieZ}m z%nP@xjL;bEo@!2gZ~nm_ZD*a}Vg7OEhXx-r_(yuyqhp2lLg7!(3Or2nrzqtgHcZRK zyR0BhMd}Clw(GLmJk673R{vkK3ExWUht8ONKhku1t5dCdFE%C!D>q2JL9F7^P2WTK zzeuB!2f&XD_+L{G@}J5C{C^gj{uicwga5_EYy6MVVE|N0BLRdWBA`;58L*RfAy6;e zr9d^_i-CH6F9&cd2P&nLAdt5~fQc^O>R7(cAQ1jfqGeWm$=CUX&wo_=A7SwSIXJuj zTlR0czh(Zm_m5cr!1)Kpf0ggMuss&G$GXgZ=sImL5dPovt9$pq?fl1F$Fimn@c%i0 q^Z(@MKh~+LE7u+b0000000000000000002MKgCa859^TtC;$N0s~9Z+ literal 0 HcmV?d00001 diff --git a/install/rhel/6/packages/default.pkg b/install/rhel/6/packages/default.pkg new file mode 100644 index 000000000..3df21d3df --- /dev/null +++ b/install/rhel/6/packages/default.pkg @@ -0,0 +1,19 @@ +WEB_TEMPLATE='default' +BACKEND_TEMPLATE='default' +PROXY_TEMPLATE='default' +DNS_TEMPLATE='default' +WEB_DOMAINS='100' +WEB_ALIASES='100' +DNS_DOMAINS='100' +DNS_RECORDS='100' +MAIL_DOMAINS='100' +MAIL_ACCOUNTS='100' +DATABASES='100' +CRON_JOBS='100' +DISK_QUOTA='10000' +BANDWIDTH='100000' +NS='ns1.localhost.ltd,ns2.localhost.ltd' +SHELL='nologin' +BACKUPS='3' +TIME='11:46:50' +DATE='2015-06-05' diff --git a/install/rhel/6/packages/gainsboro.pkg b/install/rhel/6/packages/gainsboro.pkg new file mode 100644 index 000000000..2b66b7d17 --- /dev/null +++ b/install/rhel/6/packages/gainsboro.pkg @@ -0,0 +1,19 @@ +WEB_TEMPLATE='default' +BACKEND_TEMPLATE='default' +PROXY_TEMPLATE='default' +DNS_TEMPLATE='default' +WEB_DOMAINS='10' +WEB_ALIASES='10' +DNS_DOMAINS='10' +DNS_RECORDS='10' +MAIL_DOMAINS='10' +MAIL_ACCOUNTS='10' +DATABASES='10' +CRON_JOBS='10' +DISK_QUOTA='10000' +BANDWIDTH='10000' +NS='ns1.localhost.ltd,ns2.localhost.ltd' +SHELL='nologin' +BACKUPS='1' +TIME='11:31:30' +DATE='2015-06-05' diff --git a/install/rhel/6/packages/palegreen.pkg b/install/rhel/6/packages/palegreen.pkg new file mode 100644 index 000000000..b17e5e1b2 --- /dev/null +++ b/install/rhel/6/packages/palegreen.pkg @@ -0,0 +1,19 @@ +WEB_TEMPLATE='hosting' +BACKEND_TEMPLATE='default' +PROXY_TEMPLATE='hosting' +DNS_TEMPLATE='default' +WEB_DOMAINS='50' +WEB_ALIASES='50' +DNS_DOMAINS='50' +DNS_RECORDS='50' +MAIL_DOMAINS='50' +MAIL_ACCOUNTS='50' +DATABASES='50' +CRON_JOBS='50' +DISK_QUOTA='50000' +BANDWIDTH='50000' +NS='ns1.localhost.ltd,ns2.localhost.ltd' +SHELL='nologin' +BACKUPS='5' +TIME='07:49:47' +DATE='2015-06-05' diff --git a/install/rhel/6/packages/slategrey.pkg b/install/rhel/6/packages/slategrey.pkg new file mode 100644 index 000000000..cc9ef423c --- /dev/null +++ b/install/rhel/6/packages/slategrey.pkg @@ -0,0 +1,19 @@ +WEB_TEMPLATE='default' +BACKEND_TEMPLATE='default' +PROXY_TEMPLATE='default' +DNS_TEMPLATE='default' +WEB_DOMAINS='100' +WEB_ALIASES='100' +DNS_DOMAINS='100' +DNS_RECORDS='100' +MAIL_DOMAINS='100' +MAIL_ACCOUNTS='100' +DATABASES='100' +CRON_JOBS='100' +DISK_QUOTA='10000' +BANDWIDTH='100000' +NS='ns1.localhost.ltd,ns2.localhost.ltd' +SHELL='nologin' +BACKUPS='3' +TIME='12:39:13' +DATE='2015-06-05' diff --git a/install/rhel/6/pga/config.inc.php b/install/rhel/6/pga/config.inc.php new file mode 100644 index 000000000..1eec9776c --- /dev/null +++ b/install/rhel/6/pga/config.inc.php @@ -0,0 +1,159 @@ + diff --git a/install/rhel/6/pga/phpPgAdmin.conf b/install/rhel/6/pga/phpPgAdmin.conf new file mode 100644 index 000000000..4f6ea1b53 --- /dev/null +++ b/install/rhel/6/pga/phpPgAdmin.conf @@ -0,0 +1,14 @@ +# +# This configuration file maps the phpPgAdmin directory into the URL space. +# By default this application is only accessible from the local host. +# + +Alias /phpPgAdmin /usr/share/phpPgAdmin +Alias /phppgadmin /usr/share/phpPgAdmin + + + Order deny,allow + Deny from all + Allow from 127.0.0.1 + Allow from all + diff --git a/install/rhel/6/php-fpm/www.conf b/install/rhel/6/php-fpm/www.conf new file mode 100644 index 000000000..260109d8f --- /dev/null +++ b/install/rhel/6/php-fpm/www.conf @@ -0,0 +1,10 @@ +[www] +listen = 127.0.0.1:9000 +listen.allowed_clients = 127.0.0.1 +user = apache +group = apache +pm = dynamic +pm.max_children = 50 +pm.start_servers = 5 +pm.min_spare_servers = 3 +pm.max_spare_servers = 35 diff --git a/install/rhel/6/pma/config.inc.conf b/install/rhel/6/pma/config.inc.conf new file mode 100644 index 000000000..47ae207e4 --- /dev/null +++ b/install/rhel/6/pma/config.inc.conf @@ -0,0 +1,143 @@ +. + * + * @package phpMyAdmin + */ + +/* + * This is needed for cookie based authentication to encrypt password in + * cookie + */ +$cfg['blowfish_secret'] = '%blowfish_secret%'; /* YOU MUST FILL IN THIS FOR COOKIE AUTH! */ + +/* + * Servers configuration + */ +$i = 0; + +/* + * First server + */ +$i++; +/* Authentication type */ +$cfg['Servers'][$i]['auth_type'] = 'cookie'; +/* Server parameters */ +$cfg['Servers'][$i]['host'] = 'localhost'; +$cfg['Servers'][$i]['connect_type'] = 'tcp'; +$cfg['Servers'][$i]['compress'] = false; +/* Select mysqli if your server has it */ +$cfg['Servers'][$i]['extension'] = 'mysql'; +$cfg['Servers'][$i]['AllowNoPassword'] = false; + +/* + * phpMyAdmin configuration storage settings. + */ + +/* User used to manipulate with storage */ +// $cfg['Servers'][$i]['controluser'] = 'pma'; +// $cfg['Servers'][$i]['controlpass'] = 'pmapass'; + +/* Storage database and tables */ +// $cfg['Servers'][$i]['pmadb'] = 'phpmyadmin'; +// $cfg['Servers'][$i]['bookmarktable'] = 'pma_bookmark'; +// $cfg['Servers'][$i]['relation'] = 'pma_relation'; +// $cfg['Servers'][$i]['table_info'] = 'pma_table_info'; +// $cfg['Servers'][$i]['table_coords'] = 'pma_table_coords'; +// $cfg['Servers'][$i]['pdf_pages'] = 'pma_pdf_pages'; +// $cfg['Servers'][$i]['column_info'] = 'pma_column_info'; +// $cfg['Servers'][$i]['history'] = 'pma_history'; +// $cfg['Servers'][$i]['tracking'] = 'pma_tracking'; +// $cfg['Servers'][$i]['designer_coords'] = 'pma_designer_coords'; +// $cfg['Servers'][$i]['userconfig'] = 'pma_userconfig'; +/* Contrib / Swekey authentication */ +// $cfg['Servers'][$i]['auth_swekey_config'] = '/etc/swekey-pma.conf'; + +/* + * End of servers configuration + */ + +/* + * Directories for saving/loading files from server + */ +$cfg['UploadDir'] = ''; +$cfg['SaveDir'] = ''; + +/** + * Defines whether a user should be displayed a "show all (records)" + * button in browse mode or not. + * default = false + */ +//$cfg['ShowAll'] = true; + +/** + * Number of rows displayed when browsing a result set. If the result + * set contains more rows, "Previous" and "Next". + * default = 30 + */ +//$cfg['MaxRows'] = 50; + +/** + * Use graphically less intense menu tabs + * default = false + */ +//$cfg['LightTabs'] = true; + +/** + * disallow editing of binary fields + * valid values are: + * false allow editing + * 'blob' allow editing except for BLOB fields + * 'all' disallow editing + * default = blob + */ +//$cfg['ProtectBinary'] = 'false'; + +/** + * Default language to use, if not browser-defined or user-defined + * (you find all languages in the locale folder) + * uncomment the desired line: + * default = 'en' + */ +//$cfg['DefaultLang'] = 'en'; +//$cfg['DefaultLang'] = 'de'; + +/** + * default display direction (horizontal|vertical|horizontalflipped) + */ +//$cfg['DefaultDisplay'] = 'vertical'; + + +/** + * How many columns should be used for table display of a database? + * (a value larger than 1 results in some information being hidden) + * default = 1 + */ +//$cfg['PropertiesNumColumns'] = 2; + +/** + * Set to true if you want DB-based query history.If false, this utilizes + * JS-routines to display query history (lost by window close) + * + * This requires configuration storage enabled, see above. + * default = false + */ +//$cfg['QueryHistoryDB'] = true; + +/** + * When using DB-based query history, how many entries should be kept? + * + * default = 25 + */ +//$cfg['QueryHistoryMax'] = 100; + +/* + * You can find more configuration options in Documentation.html + * or here: http://wiki.phpmyadmin.net/pma/Config + */ +?> diff --git a/install/rhel/6/pma/phpMyAdmin.conf b/install/rhel/6/pma/phpMyAdmin.conf new file mode 100644 index 000000000..0049ef2b7 --- /dev/null +++ b/install/rhel/6/pma/phpMyAdmin.conf @@ -0,0 +1,39 @@ +# phpMyAdmin - Web based MySQL browser written in php +# +# Allows only localhost by default +# +# But allowing phpMyAdmin to anyone other than localhost should be considered +# dangerous unless properly secured by SSL + +Alias /phpMyAdmin /usr/share/phpMyAdmin +Alias /phpmyadmin /usr/share/phpMyAdmin + + + Order Deny,Allow + Deny from All + Allow from All + + + + Order Deny,Allow + Deny from All + Allow from All + + +# This directory does not require access over HTTP - taken from the original +# phpMyAdmin upstream tarball +# + + Order Deny,Allow + Deny from All + Allow from None + + +# This configuration prevents mod_security at phpMyAdmin directories from +# filtering SQL etc. This may break your mod_security implementation. +# +# +# +# SecRuleInheritance Off +# +# diff --git a/install/ubuntu/pg_hba.conf b/install/rhel/6/postgresql/pg_hba.conf similarity index 100% rename from install/ubuntu/pg_hba.conf rename to install/rhel/6/postgresql/pg_hba.conf diff --git a/install/debian/proftpd.conf b/install/rhel/6/proftpd/proftpd.conf similarity index 84% rename from install/debian/proftpd.conf rename to install/rhel/6/proftpd/proftpd.conf index e948e92a8..6b89d125e 100644 --- a/install/debian/proftpd.conf +++ b/install/rhel/6/proftpd/proftpd.conf @@ -1,15 +1,14 @@ -LoadModule mod_vroot.c ServerName "FTP" ServerIdent on "FTP Server ready." ServerAdmin root@localhost DefaultServer on -VRootEngine off +VRootEngine on DefaultRoot ~ !adm AuthPAMConfig proftpd AuthOrder mod_auth_pam.c* mod_auth_unix.c UseReverseDNS off -User proftpd -Group nogroup +User nobody +Group nobody MaxInstances 20 UseSendfile off LogFormat default "%h %l %u %t \"%r\" %s %b" diff --git a/install/rhel/6/remi-release.rpm b/install/rhel/6/remi-release.rpm new file mode 100644 index 0000000000000000000000000000000000000000..555c7abeb1dde19a38a81e61f93152a8f31ea46f GIT binary patch literal 5688 zcmbVP2Uru?_8%aC!~&@3Vp&EXAiO03LaGabbVLOyN)d6AnZQUIlZ38<9kCY#cU|m0 z3o7bjUr`Zt^(l(=zhZf^R@U-VKo|9$8^*f(|2{wG`)+>oyZ4-XN^Z`%`D62=-z+eA z%os{d^B77+5qgRz=8JgVd`czeqiMAMC65_q`MKD<%6n$)oHgJT7(-y7_Y*Mez;I`l z17JgecLlWSc*j83;vT$nV5ndq-VBKJbud8R;t!S=0)oE9V?ZQd3&U)dzl9|hYky!p zHc}ggy_`JS-u$%=tC)1MigRqwxf$yo&bwp3i1CjPWPZacjOyu{=)Tvap4D$7wm#c2 z=Y?JF4lhzEl*mZZn6@lU|TXP&$PKDNid`{5N zg0LiIlxbhv3jn6Py?y(30leFNlvfFcadTkK9|q)wn~v6DkT5#IK#w__N0e9e9icql z2SmI(%O9}37t2weZD0(5f%H+H5zl1#BS6Trc>*BX59J;9Gat+Hr|fzm%bx+F^=T|` zVL6Hi>9?|c3Cr66!Jhd}mbbI(r&#`)<#$;AhULg_*pCCgnf!YW2>x?WtZ>xL(LRWy zSb&>OKjK{Apksmb5J%?{@@LV7

          d<$8vN|kv#Gr$=kB)Wh_VE0g_+M@}7X;gT)p= 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 Ps_) diff --git a/install/rhel/6/roundcube/main.inc.php b/install/rhel/6/roundcube/main.inc.php new file mode 100644 index 000000000..a27c306eb --- /dev/null +++ b/install/rhel/6/roundcube/main.inc.php @@ -0,0 +1,40 @@ + + Order Deny,Allow + Deny from all + Allow from all + diff --git a/install/rhel/6/roundcube/vesta.php b/install/rhel/6/roundcube/vesta.php new file mode 100644 index 000000000..b8695bd17 --- /dev/null +++ b/install/rhel/6/roundcube/vesta.php @@ -0,0 +1,59 @@ + + */ + +class rcube_vesta_password +{ + function save($curpass, $passwd) + { + $rcmail = rcmail::get_instance(); + $vesta_host = $rcmail->config->get('password_vesta_host'); + + if (empty($vesta_host)) + { + $vesta_host = 'localhost'; + } + + $vesta_port = $rcmail->config->get('password_vesta_port'); + if (empty($vesta_port)) + { + $vesta_port = '8083'; + } + + $postvars = array( + 'email' => $_SESSION['username'], + 'password' => $curpass, + 'new' => $passwd + ); + + $postdata = http_build_query($postvars); + + $send = 'POST /reset/mail/ HTTP/1.1' . PHP_EOL; + $send .= 'Host: ' . $vesta_host . PHP_EOL; + $send .= 'User-Agent: PHP Script' . PHP_EOL; + $send .= 'Content-length: ' . strlen($postdata) . PHP_EOL; + $send .= 'Content-type: application/x-www-form-urlencoded' . PHP_EOL; + $send .= 'Connection: close' . PHP_EOL; + $send .= PHP_EOL; + $send .= $postdata . PHP_EOL . PHP_EOL; + + $fp = fsockopen('ssl://' . $vesta_host, $vesta_port); + fputs($fp, $send); + $result = fread($fp, 2048); + fclose($fp); + + if(strpos($result, 'ok') && !strpos($result, 'error')) + { + return PASSWORD_SUCCESS; + } + else { + return PASSWORD_ERROR; + } + + } +} diff --git a/install/rhel/6/sudo/admin b/install/rhel/6/sudo/admin new file mode 100644 index 000000000..47e16098c --- /dev/null +++ b/install/rhel/6/sudo/admin @@ -0,0 +1,7 @@ +# Created by vesta installer +Defaults env_keep="VESTA" +Defaults:admin !syslog +Defaults:admin !requiretty + +admin ALL=(ALL) ALL +admin ALL=NOPASSWD:/usr/local/vesta/bin/* diff --git a/install/rhel/6/templates.tar.gz b/install/rhel/6/templates.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..c81c85510aeb8c669dd3d2f1e5f2fb2fdf26c1c0 GIT binary patch literal 12998 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 + + + Awstats log analyzer + + + + + + diff --git a/install/rhel/6/templates/web/awstats/nav.tpl b/install/rhel/6/templates/web/awstats/nav.tpl new file mode 100755 index 000000000..f29bed68b --- /dev/null +++ b/install/rhel/6/templates/web/awstats/nav.tpl @@ -0,0 +1,23 @@ + + + Awstats navigation + + + +

        + + + + +
        vesta
        + +
        +
        + + diff --git a/install/ubuntu/templates/web/apache2/basedir.stpl b/install/rhel/6/templates/web/httpd/basedir.stpl similarity index 85% rename from install/ubuntu/templates/web/apache2/basedir.stpl rename to install/rhel/6/templates/web/httpd/basedir.stpl index 269c09711..d568276df 100755 --- a/install/ubuntu/templates/web/apache2/basedir.stpl +++ b/install/rhel/6/templates/web/httpd/basedir.stpl @@ -15,9 +15,7 @@ AllowOverride All SSLRequireSSL Options +Includes -Indexes +ExecCGI - php_admin_value open_basedir %docroot%:%home%/%user%/tmp - php_admin_value upload_tmp_dir %home%/%user%/tmp - php_admin_value session.save_path %home%/%user%/tmp + php_admin_value open_basedir %docroot% AllowOverride All @@ -31,7 +29,7 @@ RMode config RUidGid %user% %group% - RGroups www-data + RGroups apache AssignUserID %user% %group% diff --git a/install/debian/templates/web/apache2/basedir.tpl b/install/rhel/6/templates/web/httpd/basedir.tpl similarity index 82% rename from install/debian/templates/web/apache2/basedir.tpl rename to install/rhel/6/templates/web/httpd/basedir.tpl index c24b12796..41b77334a 100755 --- a/install/debian/templates/web/apache2/basedir.tpl +++ b/install/rhel/6/templates/web/httpd/basedir.tpl @@ -14,9 +14,7 @@ AllowOverride All Options +Includes -Indexes +ExecCGI - php_admin_value open_basedir %docroot%:%home%/%user%/tmp - php_admin_value upload_tmp_dir %home%/%user%/tmp - php_admin_value session.save_path %home%/%user%/tmp + php_admin_value open_basedir %docroot% AllowOverride All @@ -25,7 +23,7 @@ RMode config RUidGid %user% %group% - RGroups www-data + RGroups apache AssignUserID %user% %group% diff --git a/install/ubuntu/templates/web/apache2/default.stpl b/install/rhel/6/templates/web/httpd/default.stpl similarity index 97% rename from install/ubuntu/templates/web/apache2/default.stpl rename to install/rhel/6/templates/web/httpd/default.stpl index da523c138..ffb536c54 100755 --- a/install/ubuntu/templates/web/apache2/default.stpl +++ b/install/rhel/6/templates/web/httpd/default.stpl @@ -28,7 +28,7 @@ RMode config RUidGid %user% %group% - RGroups www-data + RGroups apache AssignUserID %user% %group% diff --git a/install/ubuntu/templates/web/apache2/default.tpl b/install/rhel/6/templates/web/httpd/default.tpl similarity index 97% rename from install/ubuntu/templates/web/apache2/default.tpl rename to install/rhel/6/templates/web/httpd/default.tpl index b95c1ee38..29de125f9 100755 --- a/install/ubuntu/templates/web/apache2/default.tpl +++ b/install/rhel/6/templates/web/httpd/default.tpl @@ -22,7 +22,7 @@ RMode config RUidGid %user% %group% - RGroups www-data + RGroups apache AssignUserID %user% %group% diff --git a/install/rhel/6/templates/web/httpd/hosting.stpl b/install/rhel/6/templates/web/httpd/hosting.stpl new file mode 100755 index 000000000..ee06dfce7 --- /dev/null +++ b/install/rhel/6/templates/web/httpd/hosting.stpl @@ -0,0 +1,49 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %sdocroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + #SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + AllowOverride All + SSLRequireSSL + Options +Includes -Indexes +ExecCGI + php_admin_value upload_tmp_dir %home%/%user%/tmp + php_admin_value upload_max_filesize 10M + php_admin_value max_execution_time 20 + php_admin_value post_max_size 8M + php_admin_value memory_limit 32M + php_admin_flag mysql.allow_persistent off + php_admin_flag safe_mode off + php_admin_value session.save_path %home%/%user%/tmp + php_admin_value sendmail_path '/usr/sbin/sendmail -t -i -f %email%' + + + AllowOverride All + + php_admin_value open_basedir %home%/%user%/web:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpMyAdmin:/etc/phpmyadmin:/etc/roundcubemail:/etc/roundcube:/var/lib/roundcube + SSLEngine on + SSLVerifyClient none + SSLCertificateFile %ssl_crt% + SSLCertificateKeyFile %ssl_key% + %ssl_ca_str%SSLCertificateChainFile %ssl_ca% + + RMode config + RUidGid %user% %group% + RGroups apache + + + AssignUserID %user% %group% + + + Include %home%/%user%/conf/web/s%web_system%.%domain%.conf* + + + diff --git a/install/rhel/6/templates/web/httpd/hosting.tpl b/install/rhel/6/templates/web/httpd/hosting.tpl new file mode 100755 index 000000000..c3b839972 --- /dev/null +++ b/install/rhel/6/templates/web/httpd/hosting.tpl @@ -0,0 +1,43 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %docroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + #SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + AllowOverride All + Options +Includes -Indexes +ExecCGI + php_admin_value upload_tmp_dir %home%/%user%/tmp + php_admin_value upload_max_filesize 10M + php_admin_value max_execution_time 20 + php_admin_value post_max_size 8M + php_admin_value memory_limit 32M + php_admin_flag mysql.allow_persistent off + php_admin_flag safe_mode off + php_admin_value session.save_path %home%/%user%/tmp + php_admin_value sendmail_path '/usr/sbin/sendmail -t -i -f %email%' + + + AllowOverride All + + php_admin_value open_basedir %home%/%user%/web:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpMyAdmin:/etc/phpmyadmin:/etc/roundcubemail:/etc/roundcube:/var/lib/roundcube + + RMode config + RUidGid %user% %group% + RGroups apache + + + AssignUserID %user% %group% + + + Include %home%/%user%/conf/web/%web_system%.%domain%.conf* + + + diff --git a/install/rhel/6/templates/web/httpd/phpcgi.sh b/install/rhel/6/templates/web/httpd/phpcgi.sh new file mode 100755 index 000000000..6565e103d --- /dev/null +++ b/install/rhel/6/templates/web/httpd/phpcgi.sh @@ -0,0 +1,16 @@ +#!/bin/bash +# Adding php wrapper +user="$1" +domain="$2" +ip="$3" +home_dir="$4" +docroot="$5" + +wrapper_script='#!/usr/bin/php-cgi -cphp5-cgi.ini' +wrapper_file="$home_dir/$user/web/$domain/cgi-bin/php" + +echo "$wrapper_script" > $wrapper_file +chown $user:$user $wrapper_file +chmod -f 751 $wrapper_file + +exit 0 diff --git a/install/rhel/6/templates/web/httpd/phpcgi.stpl b/install/rhel/6/templates/web/httpd/phpcgi.stpl new file mode 100755 index 000000000..b3e6488a6 --- /dev/null +++ b/install/rhel/6/templates/web/httpd/phpcgi.stpl @@ -0,0 +1,35 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %sdocroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + SuexecUserGroup %user% %group% + CustomLog /var/log/httpd/domains/%domain%.bytes bytes + CustomLog /var/log/httpd/domains/%domain%.log combined + ErrorLog /var/log/httpd/domains/%domain%.error.log + + SSLRequireSSL + AllowOverride All + Options +Includes -Indexes +ExecCGI + Action phpcgi-script /cgi-bin/php + + SetHandler phpcgi-script + + + + AllowOverride All + + SSLEngine on + SSLVerifyClient none + SSLCertificateFile %ssl_crt% + SSLCertificateKeyFile %ssl_key% + %ssl_ca_str%SSLCertificateChainFile %ssl_ca% + + Include %home%/%user%/conf/web/shttpd.%domain%.conf* + + + diff --git a/install/rhel/6/templates/web/httpd/phpcgi.tpl b/install/rhel/6/templates/web/httpd/phpcgi.tpl new file mode 100755 index 000000000..952d2b493 --- /dev/null +++ b/install/rhel/6/templates/web/httpd/phpcgi.tpl @@ -0,0 +1,28 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %docroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + SuexecUserGroup %user% %group% + CustomLog /var/log/httpd/domains/%domain%.bytes bytes + CustomLog /var/log/httpd/domains/%domain%.log combined + ErrorLog /var/log/httpd/domains/%domain%.error.log + + AllowOverride All + Options +Includes -Indexes +ExecCGI + Action phpcgi-script /cgi-bin/php + + SetHandler phpcgi-script + + + + AllowOverride All + + Include %home%/%user%/conf/web/httpd.%domain%.conf* + + + diff --git a/install/rhel/6/templates/web/httpd/phpfcgid.sh b/install/rhel/6/templates/web/httpd/phpfcgid.sh new file mode 100755 index 000000000..e80582492 --- /dev/null +++ b/install/rhel/6/templates/web/httpd/phpfcgid.sh @@ -0,0 +1,22 @@ +#!/bin/bash +# Adding php wrapper +user="$1" +domain="$2" +ip="$3" +home_dir="$4" +docroot="$5" + +wrapper_script="#!/bin/sh +PHPRC=/usr/local/lib +export PHPRC +export PHP_FCGI_MAX_REQUESTS=1000 +export PHP_FCGI_CHILDREN=20 +exec /usr/bin/php-cgi +" +wrapper_file="$home_dir/$user/web/$domain/cgi-bin/fcgi-starter" + +echo "$wrapper_script" > $wrapper_file +chown $user:$user $wrapper_file +chmod -f 751 $wrapper_file + +exit 0 diff --git a/install/rhel/6/templates/web/httpd/phpfcgid.stpl b/install/rhel/6/templates/web/httpd/phpfcgid.stpl new file mode 100755 index 000000000..352d268b6 --- /dev/null +++ b/install/rhel/6/templates/web/httpd/phpfcgid.stpl @@ -0,0 +1,36 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %sdocroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + SuexecUserGroup %user% %group% + CustomLog /var/log/httpd/domains/%domain%.bytes bytes + CustomLog /var/log/httpd/domains/%domain%.log combined + ErrorLog /var/log/httpd/domains/%domain%.error.log + + SSLRequireSSL + AllowOverride All + Options +Includes -Indexes +ExecCGI + + SetHandler fcgid-script + + FCGIWrapper %home%/%user%/web/%domain%/cgi-bin/fcgi-starter .php + + + AllowOverride All + + php_admin_value open_basedir none + SSLEngine on + SSLVerifyClient none + SSLCertificateFile %ssl_crt% + SSLCertificateKeyFile %ssl_key% + %ssl_ca_str%SSLCertificateChainFile %ssl_ca% + + Include %home%/%user%/conf/web/shttpd.%domain%.conf* + + + diff --git a/install/rhel/6/templates/web/httpd/phpfcgid.tpl b/install/rhel/6/templates/web/httpd/phpfcgid.tpl new file mode 100755 index 000000000..9826c9464 --- /dev/null +++ b/install/rhel/6/templates/web/httpd/phpfcgid.tpl @@ -0,0 +1,28 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %docroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + SuexecUserGroup %user% %group% + CustomLog /var/log/httpd/domains/%domain%.bytes bytes + CustomLog /var/log/httpd/domains/%domain%.log combined + ErrorLog /var/log/httpd/domains/%domain%.error.log + + AllowOverride All + Options +Includes -Indexes +ExecCGI + + SetHandler fcgid-script + + FCGIWrapper %home%/%user%/web/%domain%/cgi-bin/fcgi-starter .php + + + AllowOverride All + + Include %home%/%user%/conf/web/httpd.%domain%.conf* + + + diff --git a/install/rhel/6/templates/web/nginx/caching.sh b/install/rhel/6/templates/web/nginx/caching.sh new file mode 100755 index 000000000..6eb9126db --- /dev/null +++ b/install/rhel/6/templates/web/nginx/caching.sh @@ -0,0 +1,12 @@ +#!/bin/bash + +user=$1 +domain=$2 +ip=$3 +home=$4 +docroot=$5 + +str="proxy_cache_path /var/cache/nginx/$domain levels=2" +str="$str keys_zone=$domain:10m inactive=60m max_size=512m;" +echo "$str" >> /etc/nginx/conf.d/01_caching_pool.conf + diff --git a/install/rhel/6/templates/web/nginx/caching.stpl b/install/rhel/6/templates/web/nginx/caching.stpl new file mode 100755 index 000000000..1109c924f --- /dev/null +++ b/install/rhel/6/templates/web/nginx/caching.stpl @@ -0,0 +1,44 @@ +server { + listen %ip%:%proxy_ssl_port%; + server_name %domain_idn% %alias_idn%; + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + error_log /var/log/%web_system%/domains/%domain%.error.log error; + + location / { + proxy_pass http://%ip%:%web_port%; + + proxy_cache %domain%; + proxy_cache_valid 15m; + proxy_cache_valid 404 1m; + proxy_no_cache $no_cache; + proxy_cache_bypass $no_cache; + proxy_cache_bypass $cookie_session $http_x_update; + + location ~* ^.+\.(%proxy_extentions%)$ { + proxy_cache off; + root %docroot%; + access_log /var/log/%web_system%/domains/%domain%.log combined; + access_log /var/log/%web_system%/domains/%domain%.bytes bytes; + expires max; + try_files $uri @fallback; + } + } + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location @fallback { + proxy_pass http://%ip%:%web_port%; + } + + location ~ /\.ht {return 404;} + location ~ /\.svn/ {return 404;} + location ~ /\.git/ {return 404;} + location ~ /\.hg/ {return 404;} + location ~ /\.bzr/ {return 404;} + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/rhel/6/templates/web/nginx/caching.tpl b/install/rhel/6/templates/web/nginx/caching.tpl new file mode 100755 index 000000000..6d727c67f --- /dev/null +++ b/install/rhel/6/templates/web/nginx/caching.tpl @@ -0,0 +1,41 @@ +server { + listen %ip%:%proxy_port%; + server_name %domain_idn% %alias_idn%; + error_log /var/log/%web_system%/domains/%domain%.error.log error; + + location / { + proxy_pass http://%ip%:%web_port%; + + proxy_cache %domain%; + proxy_cache_valid 15m; + proxy_cache_valid 404 1m; + proxy_no_cache $no_cache; + proxy_cache_bypass $no_cache; + proxy_cache_bypass $cookie_session $http_x_update; + + location ~* ^.+\.(%proxy_extentions%)$ { + proxy_cache off; + root %docroot%; + access_log /var/log/%web_system%/domains/%domain%.log combined; + access_log /var/log/%web_system%/domains/%domain%.bytes bytes; + expires max; + try_files $uri @fallback; + } + } + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location @fallback { + proxy_pass http://%ip%:%web_port%; + } + + location ~ /\.ht {return 404;} + location ~ /\.svn/ {return 404;} + location ~ /\.git/ {return 404;} + location ~ /\.hg/ {return 404;} + location ~ /\.bzr/ {return 404;} + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/rhel/6/templates/web/nginx/default.stpl b/install/rhel/6/templates/web/nginx/default.stpl new file mode 100755 index 000000000..53ad8d1b8 --- /dev/null +++ b/install/rhel/6/templates/web/nginx/default.stpl @@ -0,0 +1,36 @@ +server { + listen %ip%:%proxy_ssl_port%; + server_name %domain_idn% %alias_idn%; + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + error_log /var/log/httpd/domains/%domain%.error.log error; + + location / { + proxy_pass https://%ip%:%web_ssl_port%; + location ~* ^.+\.(%proxy_extentions%)$ { + root %sdocroot%; + access_log /var/log/httpd/domains/%domain%.log combined; + access_log /var/log/httpd/domains/%domain%.bytes bytes; + expires max; + try_files $uri @fallback; + } + } + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location @fallback { + proxy_pass https://%ip%:%web_ssl_port%; + } + + location ~ /\.ht {return 404;} + location ~ /\.svn/ {return 404;} + location ~ /\.git/ {return 404;} + location ~ /\.hg/ {return 404;} + location ~ /\.bzr/ {return 404;} + + include %home%/%user%/conf/web/snginx.%domain%.conf*; +} + diff --git a/install/rhel/6/templates/web/nginx/default.tpl b/install/rhel/6/templates/web/nginx/default.tpl new file mode 100755 index 000000000..c1fec114f --- /dev/null +++ b/install/rhel/6/templates/web/nginx/default.tpl @@ -0,0 +1,33 @@ +server { + listen %ip%:%proxy_port%; + server_name %domain_idn% %alias_idn%; + error_log /var/log/httpd/domains/%domain%.error.log error; + + location / { + proxy_pass http://%ip%:%web_port%; + location ~* ^.+\.(%proxy_extentions%)$ { + root %docroot%; + access_log /var/log/httpd/domains/%domain%.log combined; + access_log /var/log/httpd/domains/%domain%.bytes bytes; + expires max; + try_files $uri @fallback; + } + } + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location @fallback { + proxy_pass http://%ip%:%web_port%; + } + + location ~ /\.ht {return 404;} + location ~ /\.svn/ {return 404;} + location ~ /\.git/ {return 404;} + location ~ /\.hg/ {return 404;} + location ~ /\.bzr/ {return 404;} + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} + diff --git a/install/rhel/6/templates/web/nginx/hosting.sh b/install/rhel/6/templates/web/nginx/hosting.sh new file mode 100755 index 000000000..eeed37ef9 --- /dev/null +++ b/install/rhel/6/templates/web/nginx/hosting.sh @@ -0,0 +1,11 @@ +#!/bin/bash +# Changing public_html permission +user="$1" +domain="$2" +ip="$3" +home_dir="$4" +docroot="$5" + +chmod 755 $docroot + +exit 0 diff --git a/install/rhel/6/templates/web/nginx/hosting.stpl b/install/rhel/6/templates/web/nginx/hosting.stpl new file mode 100755 index 000000000..aca458a4b --- /dev/null +++ b/install/rhel/6/templates/web/nginx/hosting.stpl @@ -0,0 +1,38 @@ +server { + listen %ip%:%proxy_ssl_port%; + server_name %domain_idn% %alias_idn%; + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + error_log /var/log/httpd/domains/%domain%.error.log error; + + location / { + proxy_pass https://%ip%:%web_ssl_port%; + location ~* ^.+\.(%proxy_extentions%)$ { + root %sdocroot%; + access_log /var/log/httpd/domains/%domain%.log combined; + access_log /var/log/httpd/domains/%domain%.bytes bytes; + expires max; + try_files $uri @fallback; + } + } + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location @fallback { + proxy_pass https://%ip%:%web_ssl_port%; + } + + location ~ /\.ht {return 404;} + location ~ /\.svn/ {return 404;} + location ~ /\.git/ {return 404;} + location ~ /\.hg/ {return 404;} + location ~ /\.bzr/ {return 404;} + + disable_symlinks if_not_owner from=%docroot%; + + include %home%/%user%/conf/web/snginx.%domain%.conf*; +} + diff --git a/install/rhel/6/templates/web/nginx/hosting.tpl b/install/rhel/6/templates/web/nginx/hosting.tpl new file mode 100755 index 000000000..44d874962 --- /dev/null +++ b/install/rhel/6/templates/web/nginx/hosting.tpl @@ -0,0 +1,35 @@ +server { + listen %ip%:%proxy_port%; + server_name %domain_idn% %alias_idn%; + error_log /var/log/httpd/domains/%domain%.error.log error; + + location / { + proxy_pass http://%ip%:%web_port%; + location ~* ^.+\.(%proxy_extentions%)$ { + root %docroot%; + access_log /var/log/httpd/domains/%domain%.log combined; + access_log /var/log/httpd/domains/%domain%.bytes bytes; + expires max; + try_files $uri @fallback; + } + } + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location @fallback { + proxy_pass http://%ip%:%web_port%; + } + + location ~ /\.ht {return 404;} + location ~ /\.svn/ {return 404;} + location ~ /\.git/ {return 404;} + location ~ /\.hg/ {return 404;} + location ~ /\.bzr/ {return 404;} + + disable_symlinks if_not_owner from=%docroot%; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} + diff --git a/install/rhel/6/templates/web/nginx/php-fpm/cms_made_simple.stpl b/install/rhel/6/templates/web/nginx/php-fpm/cms_made_simple.stpl new file mode 100644 index 000000000..01d82b603 --- /dev/null +++ b/install/rhel/6/templates/web/nginx/php-fpm/cms_made_simple.stpl @@ -0,0 +1,51 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + try_files $uri $uri/ /index.php?page=$request_uri; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/rhel/6/templates/web/nginx/php-fpm/cms_made_simple.tpl b/install/rhel/6/templates/web/nginx/php-fpm/cms_made_simple.tpl new file mode 100644 index 000000000..af452d19f --- /dev/null +++ b/install/rhel/6/templates/web/nginx/php-fpm/cms_made_simple.tpl @@ -0,0 +1,47 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + try_files $uri $uri/ /index.php?page=$request_uri; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/rhel/6/templates/web/nginx/php-fpm/codeigniter2.stpl b/install/rhel/6/templates/web/nginx/php-fpm/codeigniter2.stpl new file mode 100644 index 000000000..a592a652d --- /dev/null +++ b/install/rhel/6/templates/web/nginx/php-fpm/codeigniter2.stpl @@ -0,0 +1,56 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + try_files $uri $uri/ /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location = /index.php { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME /var/www/html/ci$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + location ~ \.php$ { + return 444; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/rhel/6/templates/web/nginx/php-fpm/codeigniter2.tpl b/install/rhel/6/templates/web/nginx/php-fpm/codeigniter2.tpl new file mode 100644 index 000000000..9b955aa6a --- /dev/null +++ b/install/rhel/6/templates/web/nginx/php-fpm/codeigniter2.tpl @@ -0,0 +1,52 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + try_files $uri $uri/ /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location = /index.php { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME /var/www/html/ci$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + location ~ \.php$ { + return 444; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/rhel/6/templates/web/nginx/php-fpm/codeigniter3.stpl b/install/rhel/6/templates/web/nginx/php-fpm/codeigniter3.stpl new file mode 100644 index 000000000..4d330d34f --- /dev/null +++ b/install/rhel/6/templates/web/nginx/php-fpm/codeigniter3.stpl @@ -0,0 +1,51 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + try_files $uri $uri/ /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/rhel/6/templates/web/nginx/php-fpm/codeigniter3.tpl b/install/rhel/6/templates/web/nginx/php-fpm/codeigniter3.tpl new file mode 100644 index 000000000..1f446e5d3 --- /dev/null +++ b/install/rhel/6/templates/web/nginx/php-fpm/codeigniter3.tpl @@ -0,0 +1,47 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + try_files $uri $uri/ /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/rhel/6/templates/web/nginx/php-fpm/datalife_engine.stpl b/install/rhel/6/templates/web/nginx/php-fpm/datalife_engine.stpl new file mode 100644 index 000000000..d1b5bcd24 --- /dev/null +++ b/install/rhel/6/templates/web/nginx/php-fpm/datalife_engine.stpl @@ -0,0 +1,122 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + rewrite "^/page/([0-9]+)(/?)$" /index.php?cstart=$1 last; + + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page,([0-9]+),([0-9]+),(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&cstart=$5&news_name=$6&seourl=$6 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page,([0-9]+),(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&news_name=$5&seourl=$5 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/print:page,([0-9]+),(.*).html(/?)+$" /engine/print.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&news_name=$5&seourl=$5 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_name=$4&seourl=$4 last; + + rewrite "^/([^.]+)/page,([0-9]+),([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$4&news_page=$2&cstart=$3&seourl=$5&seocat=$1 last; + rewrite "^/([^.]+)/page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$3&news_page=$2&seourl=$4&seocat=$1 last; + rewrite "^/([^.]+)/print:page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /engine/print.php?news_page=$2&newsid=$3&seourl=$4&seocat=$1 last; + rewrite "^/([^.]+)/([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$2&seourl=$3&seocat=$1 last; + + rewrite "^/page,([0-9]+),([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$3&news_page=$1&cstart=$2&seourl=$4 last; + rewrite "^/page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$2&news_page=$1&seourl=$3 last; + rewrite "^/print:page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /engine/print.php?news_page=$1&newsid=$2&seourl=$3 last; + rewrite "^/([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$1&seourl=$2 last; + + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})(/?)+$" /index.php?year=$1&month=$2&day=$3 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page/([0-9]+)(/?)+$" /index.php?year=$1&month=$2&day=$3&cstart=$4 last; + + rewrite "^/([0-9]{4})/([0-9]{2})(/?)+$" /index.php?year=$1&month=$2 last; + rewrite "^/([0-9]{4})/([0-9]{2})/page/([0-9]+)(/?)+$" /index.php?year=$1&month=$2&cstart=$3 last; + + rewrite "^/([0-9]{4})(/?)+$" /index.php?year=$1 last; + rewrite "^/([0-9]{4})/page/([0-9]+)(/?)+$" /index.php?year=$1&cstart=$2 last; + + rewrite "^/tags/([^/]*)(/?)+$" /index.php?do=tags&tag=$1 last; + rewrite "^/tags/([^/]*)/page/([0-9]+)(/?)+$" /index.php?do=tags&tag=$1&cstart=$2 last; + + rewrite "^/xfsearch/([^/]*)(/?)+$" /index.php?do=xfsearch&xf=$1 last; + rewrite "^/xfsearch/([^/]*)/page/([0-9]+)(/?)+$" /index.php?do=xfsearch&xf=$1&cstart=$2 last; + + rewrite "^/user/([^/]*)/rss.xml$" /engine/rss.php?subaction=allnews&user=$1 last; + rewrite "^/user/([^/]*)(/?)+$" /index.php?subaction=userinfo&user=$1 last; + rewrite "^/user/([^/]*)/page/([0-9]+)(/?)+$" /index.php?subaction=userinfo&user=$1&cstart=$2 last; + rewrite "^/user/([^/]*)/news(/?)+$" /index.php?subaction=allnews&user=$1 last; + rewrite "^/user/([^/]*)/news/page/([0-9]+)(/?)+$" /index.php?subaction=allnews&user=$1&cstart=$2 last; + rewrite "^/user/([^/]*)/news/rss.xml(/?)+$" /engine/rss.php?subaction=allnews&user=$1 last; + + rewrite "^/lastnews(/?)+$" /index.php?do=lastnews last; + rewrite "^/lastnews/page/([0-9]+)(/?)+$" /index.php?do=lastnews&cstart=$1 last; + + rewrite "^/catalog/([^/]*)/rss.xml$" /engine/rss.php?catalog=$1 last; + rewrite "^/catalog/([^/]*)(/?)+$" /index.php?catalog=$1 last; + rewrite "^/catalog/([^/]*)/page/([0-9]+)(/?)+$" /index.php?catalog=$1&cstart=$2 last; + + rewrite "^/newposts(/?)+$" /index.php?subaction=newposts last; + rewrite "^/newposts/page/([0-9]+)(/?)+$" /index.php?subaction=newposts&cstart=$1 last; + + rewrite "^/favorites(/?)+$" /index.php?do=favorites last; + rewrite "^/favorites/page/([0-9]+)(/?)+$" /index.php?do=favorites&cstart=$1 last; + + rewrite "^/rules.html$" /index.php?do=rules last; + rewrite "^/statistics.html$" /index.php?do=stats last; + rewrite "^/addnews.html$" /index.php?do=addnews last; + rewrite "^/rss.xml$" /engine/rss.php last; + rewrite "^/sitemap.xml$" /uploads/sitemap.xml last; + + if (!-d $request_filename) { + rewrite "^/([^.]+)/page/([0-9]+)(/?)+$" /index.php?do=cat&category=$1&cstart=$2 last; + rewrite "^/([^.]+)/?$" /index.php?do=cat&category=$1 last; + } + + if (!-f $request_filename) { + rewrite "^/([^.]+)/rss.xml$" /engine/rss.php?do=cat&category=$1 last; + rewrite "^/page,([0-9]+),([^/]+).html$" /index.php?do=static&page=$2&news_page=$1 last; + rewrite "^/print:([^/]+).html$" /engine/print.php?do=static&page=$1 last; + } + + if (!-f $request_filename) { + rewrite "^/([^/]+).html$" /index.php?do=static&page=$1 last; + } + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/rhel/6/templates/web/nginx/php-fpm/datalife_engine.tpl b/install/rhel/6/templates/web/nginx/php-fpm/datalife_engine.tpl new file mode 100644 index 000000000..ff33c2325 --- /dev/null +++ b/install/rhel/6/templates/web/nginx/php-fpm/datalife_engine.tpl @@ -0,0 +1,118 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + rewrite "^/page/([0-9]+)(/?)$" /index.php?cstart=$1 last; + + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page,([0-9]+),([0-9]+),(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&cstart=$5&news_name=$6&seourl=$6 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page,([0-9]+),(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&news_name=$5&seourl=$5 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/print:page,([0-9]+),(.*).html(/?)+$" /engine/print.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&news_name=$5&seourl=$5 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_name=$4&seourl=$4 last; + + rewrite "^/([^.]+)/page,([0-9]+),([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$4&news_page=$2&cstart=$3&seourl=$5&seocat=$1 last; + rewrite "^/([^.]+)/page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$3&news_page=$2&seourl=$4&seocat=$1 last; + rewrite "^/([^.]+)/print:page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /engine/print.php?news_page=$2&newsid=$3&seourl=$4&seocat=$1 last; + rewrite "^/([^.]+)/([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$2&seourl=$3&seocat=$1 last; + + rewrite "^/page,([0-9]+),([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$3&news_page=$1&cstart=$2&seourl=$4 last; + rewrite "^/page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$2&news_page=$1&seourl=$3 last; + rewrite "^/print:page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /engine/print.php?news_page=$1&newsid=$2&seourl=$3 last; + rewrite "^/([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$1&seourl=$2 last; + + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})(/?)+$" /index.php?year=$1&month=$2&day=$3 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page/([0-9]+)(/?)+$" /index.php?year=$1&month=$2&day=$3&cstart=$4 last; + + rewrite "^/([0-9]{4})/([0-9]{2})(/?)+$" /index.php?year=$1&month=$2 last; + rewrite "^/([0-9]{4})/([0-9]{2})/page/([0-9]+)(/?)+$" /index.php?year=$1&month=$2&cstart=$3 last; + + rewrite "^/([0-9]{4})(/?)+$" /index.php?year=$1 last; + rewrite "^/([0-9]{4})/page/([0-9]+)(/?)+$" /index.php?year=$1&cstart=$2 last; + + rewrite "^/tags/([^/]*)(/?)+$" /index.php?do=tags&tag=$1 last; + rewrite "^/tags/([^/]*)/page/([0-9]+)(/?)+$" /index.php?do=tags&tag=$1&cstart=$2 last; + + rewrite "^/xfsearch/([^/]*)(/?)+$" /index.php?do=xfsearch&xf=$1 last; + rewrite "^/xfsearch/([^/]*)/page/([0-9]+)(/?)+$" /index.php?do=xfsearch&xf=$1&cstart=$2 last; + + rewrite "^/user/([^/]*)/rss.xml$" /engine/rss.php?subaction=allnews&user=$1 last; + rewrite "^/user/([^/]*)(/?)+$" /index.php?subaction=userinfo&user=$1 last; + rewrite "^/user/([^/]*)/page/([0-9]+)(/?)+$" /index.php?subaction=userinfo&user=$1&cstart=$2 last; + rewrite "^/user/([^/]*)/news(/?)+$" /index.php?subaction=allnews&user=$1 last; + rewrite "^/user/([^/]*)/news/page/([0-9]+)(/?)+$" /index.php?subaction=allnews&user=$1&cstart=$2 last; + rewrite "^/user/([^/]*)/news/rss.xml(/?)+$" /engine/rss.php?subaction=allnews&user=$1 last; + + rewrite "^/lastnews(/?)+$" /index.php?do=lastnews last; + rewrite "^/lastnews/page/([0-9]+)(/?)+$" /index.php?do=lastnews&cstart=$1 last; + + rewrite "^/catalog/([^/]*)/rss.xml$" /engine/rss.php?catalog=$1 last; + rewrite "^/catalog/([^/]*)(/?)+$" /index.php?catalog=$1 last; + rewrite "^/catalog/([^/]*)/page/([0-9]+)(/?)+$" /index.php?catalog=$1&cstart=$2 last; + + rewrite "^/newposts(/?)+$" /index.php?subaction=newposts last; + rewrite "^/newposts/page/([0-9]+)(/?)+$" /index.php?subaction=newposts&cstart=$1 last; + + rewrite "^/favorites(/?)+$" /index.php?do=favorites last; + rewrite "^/favorites/page/([0-9]+)(/?)+$" /index.php?do=favorites&cstart=$1 last; + + rewrite "^/rules.html$" /index.php?do=rules last; + rewrite "^/statistics.html$" /index.php?do=stats last; + rewrite "^/addnews.html$" /index.php?do=addnews last; + rewrite "^/rss.xml$" /engine/rss.php last; + rewrite "^/sitemap.xml$" /uploads/sitemap.xml last; + + if (!-d $request_filename) { + rewrite "^/([^.]+)/page/([0-9]+)(/?)+$" /index.php?do=cat&category=$1&cstart=$2 last; + rewrite "^/([^.]+)/?$" /index.php?do=cat&category=$1 last; + } + + if (!-f $request_filename) { + rewrite "^/([^.]+)/rss.xml$" /engine/rss.php?do=cat&category=$1 last; + rewrite "^/page,([0-9]+),([^/]+).html$" /index.php?do=static&page=$2&news_page=$1 last; + rewrite "^/print:([^/]+).html$" /engine/print.php?do=static&page=$1 last; + } + + if (!-f $request_filename) { + rewrite "^/([^/]+).html$" /index.php?do=static&page=$1 last; + } + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/rhel/6/templates/web/nginx/php-fpm/default.stpl b/install/rhel/6/templates/web/nginx/php-fpm/default.stpl new file mode 100644 index 000000000..a68c99861 --- /dev/null +++ b/install/rhel/6/templates/web/nginx/php-fpm/default.stpl @@ -0,0 +1,50 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %sdocroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/snginx.%domain%.conf*; +} diff --git a/install/rhel/6/templates/web/nginx/php-fpm/default.tpl b/install/rhel/6/templates/web/nginx/php-fpm/default.tpl new file mode 100644 index 000000000..b143e53ba --- /dev/null +++ b/install/rhel/6/templates/web/nginx/php-fpm/default.tpl @@ -0,0 +1,46 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/rhel/6/templates/web/nginx/php-fpm/dokuwiki.stpl b/install/rhel/6/templates/web/nginx/php-fpm/dokuwiki.stpl new file mode 100644 index 000000000..27483cd8c --- /dev/null +++ b/install/rhel/6/templates/web/nginx/php-fpm/dokuwiki.stpl @@ -0,0 +1,67 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + index doku.php; + try_files $uri $uri/ @dokuwiki; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + location ^~ /lib/ { + expires 30d; + } + + location ^~ /conf/ { return 403; } + location ^~ /data/ { return 403; } + + location @dokuwiki { + rewrite ^/_media/(.*) /lib/exe/fetch.php?media=$1 last; + rewrite ^/_detail/(.*) /lib/exe/detail.php?media=$1 last; + rewrite ^/_export/([^/]+)/(.*) /doku.php?do=export_$1&id=$2 last; + rewrite ^/(.*) /doku.php?id=$1 last; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/rhel/6/templates/web/nginx/php-fpm/dokuwiki.tpl b/install/rhel/6/templates/web/nginx/php-fpm/dokuwiki.tpl new file mode 100644 index 000000000..31647c9ff --- /dev/null +++ b/install/rhel/6/templates/web/nginx/php-fpm/dokuwiki.tpl @@ -0,0 +1,62 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + index doku.php; + try_files $uri $uri/ @dokuwiki; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + location ^~ /lib/ { + expires 30d; + } + + location ^~ /conf/ { return 403; } + location ^~ /data/ { return 403; } + location @dokuwiki { + rewrite ^/_media/(.*) /lib/exe/fetch.php?media=$1 last; + rewrite ^/_detail/(.*) /lib/exe/detail.php?media=$1 last; + rewrite ^/_export/([^/]+)/(.*) /doku.php?do=export_$1&id=$2 last; + rewrite ^/(.*) /doku.php?id=$1 last; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/rhel/6/templates/web/nginx/php-fpm/drupal.stpl b/install/rhel/6/templates/web/nginx/php-fpm/drupal.stpl new file mode 100644 index 000000000..9a5484396 --- /dev/null +++ b/install/rhel/6/templates/web/nginx/php-fpm/drupal.stpl @@ -0,0 +1,101 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + + location / { + try_files $uri @rewrite; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # You have 2 options here + # For D7 and above: + # Clean URLs are handled in drupal_environment_initialize(). + rewrite ^ /index.php; + + # For Drupal 6 and bwlow: + # Some modules enforce no slash (/) at the end of the URL + # Else this rewrite block wouldn't be needed (GlobalRedirect) + #rewrite ^/(.*)$ /index.php?q=$1; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/rhel/6/templates/web/nginx/php-fpm/drupal.tpl b/install/rhel/6/templates/web/nginx/php-fpm/drupal.tpl new file mode 100644 index 000000000..417762c18 --- /dev/null +++ b/install/rhel/6/templates/web/nginx/php-fpm/drupal.tpl @@ -0,0 +1,98 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + # Very rarely should these ever be accessed outside of your lan + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + + location / { + try_files $uri @rewrite; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # You have 2 options here + # For D7 and above: + # Clean URLs are handled in drupal_environment_initialize(). + rewrite ^ /index.php; + + # For Drupal 6 and bwlow: + # Some modules enforce no slash (/) at the end of the URL + # Else this rewrite block wouldn't be needed (GlobalRedirect) + #rewrite ^/(.*)$ /index.php?q=$1; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/rhel/6/templates/web/nginx/php-fpm/joomla.stpl b/install/rhel/6/templates/web/nginx/php-fpm/joomla.stpl new file mode 100644 index 000000000..235a01216 --- /dev/null +++ b/install/rhel/6/templates/web/nginx/php-fpm/joomla.stpl @@ -0,0 +1,58 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + try_files $uri $uri/ /index.php?$args; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + # deny running scripts inside writable directories + location ~* /(images|cache|media|logs|tmp)/.*\.(php|pl|py|jsp|asp|sh|cgi)$ { + return 403; + error_page 403 /403_error.html; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/rhel/6/templates/web/nginx/php-fpm/joomla.tpl b/install/rhel/6/templates/web/nginx/php-fpm/joomla.tpl new file mode 100644 index 000000000..997c268de --- /dev/null +++ b/install/rhel/6/templates/web/nginx/php-fpm/joomla.tpl @@ -0,0 +1,54 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + try_files $uri $uri/ /index.php?$args; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + # deny running scripts inside writable directories + location ~* /(images|cache|media|logs|tmp)/.*\.(php|pl|py|jsp|asp|sh|cgi)$ { + return 403; + error_page 403 /403_error.html; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/rhel/6/templates/web/nginx/php-fpm/owncloud.stpl b/install/rhel/6/templates/web/nginx/php-fpm/owncloud.stpl new file mode 100644 index 000000000..8311ca43f --- /dev/null +++ b/install/rhel/6/templates/web/nginx/php-fpm/owncloud.stpl @@ -0,0 +1,80 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + rewrite ^/caldav(.*)$ /remote.php/caldav$1 redirect; + rewrite ^/carddav(.*)$ /remote.php/carddav$1 redirect; + rewrite ^/webdav(.*)$ /remote.php/webdav$1 redirect; + + error_page 403 = /core/templates/403.php; + error_page 404 = /core/templates/404.php; + + location ~ ^/(?:\.htaccess|data|config|db_structure\.xml|README){ + deny all; + } + + location / { + # The following 2 rules are only needed with webfinger + rewrite ^/.well-known/host-meta /public.php?service=host-meta last; + rewrite ^/.well-known/host-meta.json /public.php?service=host-meta-json last; + rewrite ^/.well-known/carddav /remote.php/carddav/ redirect; + rewrite ^/.well-known/caldav /remote.php/caldav/ redirect; + rewrite ^(/core/doc/[^\/]+/)$ $1/index.html; + try_files $uri $uri/ /index.php; + + location ~ \.php(?:$|/) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param PATH_INFO $fastcgi_path_info; + #fastcgi_param HTTPS on; + fastcgi_pass %backend_lsnr%; + } + } + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + # Some basic cache-control for static files to be sent to the browser + add_header Pragma public; + add_header Cache-Control "public, must-revalidate, proxy-revalidate"; + } + + #error_page 403 /error/404.html; + #error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/rhel/6/templates/web/nginx/php-fpm/owncloud.tpl b/install/rhel/6/templates/web/nginx/php-fpm/owncloud.tpl new file mode 100644 index 000000000..57cac2f85 --- /dev/null +++ b/install/rhel/6/templates/web/nginx/php-fpm/owncloud.tpl @@ -0,0 +1,76 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + rewrite ^/caldav(.*)$ /remote.php/caldav$1 redirect; + rewrite ^/carddav(.*)$ /remote.php/carddav$1 redirect; + rewrite ^/webdav(.*)$ /remote.php/webdav$1 redirect; + + error_page 403 = /core/templates/403.php; + error_page 404 = /core/templates/404.php; + + location ~ ^/(?:\.htaccess|data|config|db_structure\.xml|README){ + deny all; + } + + location / { + # The following 2 rules are only needed with webfinger + rewrite ^/.well-known/host-meta /public.php?service=host-meta last; + rewrite ^/.well-known/host-meta.json /public.php?service=host-meta-json last; + rewrite ^/.well-known/carddav /remote.php/carddav/ redirect; + rewrite ^/.well-known/caldav /remote.php/caldav/ redirect; + rewrite ^(/core/doc/[^\/]+/)$ $1/index.html; + try_files $uri $uri/ /index.php; + + location ~ \.php(?:$|/) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param PATH_INFO $fastcgi_path_info; + #fastcgi_param HTTPS on; + fastcgi_pass %backend_lsnr%; + } + } + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + # Some basic cache-control for static files to be sent to the browser + add_header Pragma public; + add_header Cache-Control "public, must-revalidate, proxy-revalidate"; + } + + #error_page 403 /error/404.html; + #error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/rhel/6/templates/web/nginx/php-fpm/piwik.stpl b/install/rhel/6/templates/web/nginx/php-fpm/piwik.stpl new file mode 100644 index 000000000..c53af4011 --- /dev/null +++ b/install/rhel/6/templates/web/nginx/php-fpm/piwik.stpl @@ -0,0 +1,68 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location = /favicon.ico { + try_files /favicon.ico =204; + } + + location / { + try_files $uri /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + valid_referers none blocked %domain_idn% %alias_idn%; + if ($invalid_referer) { + return 444; + } + expires max; + } + + location ~* ^/(?:index|piwik)\.php$ { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + include /etc/nginx/fastcgi_params; + } + } + + # Any other attempt to access PHP files returns a 404. + location ~* ^.+\.php$ { + return 404; + } + + # Return a 404 for all text files. + location ~* ^/(?:README|LICENSE[^.]*|LEGALNOTICE)(?:\.txt)*$ { + return 404; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/rhel/6/templates/web/nginx/php-fpm/piwik.tpl b/install/rhel/6/templates/web/nginx/php-fpm/piwik.tpl new file mode 100644 index 000000000..6b4a94a68 --- /dev/null +++ b/install/rhel/6/templates/web/nginx/php-fpm/piwik.tpl @@ -0,0 +1,64 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location = /favicon.ico { + try_files /favicon.ico =204; + } + + location / { + try_files $uri /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + valid_referers none blocked %domain_idn% %alias_idn%; + if ($invalid_referer) { + return 444; + } + expires max; + } + + location ~* ^/(?:index|piwik)\.php$ { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + include /etc/nginx/fastcgi_params; + } + } + + # Any other attempt to access PHP files returns a 404. + location ~* ^.+\.php$ { + return 404; + } + + # Return a 404 for all text files. + location ~* ^/(?:README|LICENSE[^.]*|LEGALNOTICE)(?:\.txt)*$ { + return 404; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/rhel/6/templates/web/nginx/php-fpm/pyrocms.stpl b/install/rhel/6/templates/web/nginx/php-fpm/pyrocms.stpl new file mode 100644 index 000000000..a6fc67556 --- /dev/null +++ b/install/rhel/6/templates/web/nginx/php-fpm/pyrocms.stpl @@ -0,0 +1,61 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location /installer { + try_files $uri $uri/ /installer/index.php; + } + + location / { + try_files $uri $uri/ /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + location = /robots.txt { access_log off; log_not_found off; } + location = /favicon.ico { access_log off; log_not_found off; } + location ~ /\. { access_log off; log_not_found off; deny all; } + location ~ ~$ { access_log off; log_not_found off; deny all; } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/rhel/6/templates/web/nginx/php-fpm/pyrocms.tpl b/install/rhel/6/templates/web/nginx/php-fpm/pyrocms.tpl new file mode 100644 index 000000000..68b378efd --- /dev/null +++ b/install/rhel/6/templates/web/nginx/php-fpm/pyrocms.tpl @@ -0,0 +1,57 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location /installer { + try_files $uri $uri/ /installer/index.php; + } + + location / { + try_files $uri $uri/ /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + location = /robots.txt { access_log off; log_not_found off; } + location = /favicon.ico { access_log off; log_not_found off; } + location ~ /\. { access_log off; log_not_found off; deny all; } + location ~ ~$ { access_log off; log_not_found off; deny all; } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/rhel/6/templates/web/nginx/php-fpm/wordpress.stpl b/install/rhel/6/templates/web/nginx/php-fpm/wordpress.stpl new file mode 100644 index 000000000..910c28b69 --- /dev/null +++ b/install/rhel/6/templates/web/nginx/php-fpm/wordpress.stpl @@ -0,0 +1,50 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/rhel/6/templates/web/nginx/php-fpm/wordpress.tpl b/install/rhel/6/templates/web/nginx/php-fpm/wordpress.tpl new file mode 100644 index 000000000..b143e53ba --- /dev/null +++ b/install/rhel/6/templates/web/nginx/php-fpm/wordpress.tpl @@ -0,0 +1,46 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/rhel/6/templates/web/nginx/php-fpm/wordpress2.stpl b/install/rhel/6/templates/web/nginx/php-fpm/wordpress2.stpl new file mode 100644 index 000000000..2822f8754 --- /dev/null +++ b/install/rhel/6/templates/web/nginx/php-fpm/wordpress2.stpl @@ -0,0 +1,62 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + location / { + try_files $uri $uri/ /index.php?$args; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/rhel/6/templates/web/nginx/php-fpm/wordpress2.tpl b/install/rhel/6/templates/web/nginx/php-fpm/wordpress2.tpl new file mode 100644 index 000000000..37b8be305 --- /dev/null +++ b/install/rhel/6/templates/web/nginx/php-fpm/wordpress2.tpl @@ -0,0 +1,58 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + location / { + try_files $uri $uri/ /index.php?$args; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/rhel/6/templates/web/nginx/proxy_ip.tpl b/install/rhel/6/templates/web/nginx/proxy_ip.tpl new file mode 100755 index 000000000..ae1956173 --- /dev/null +++ b/install/rhel/6/templates/web/nginx/proxy_ip.tpl @@ -0,0 +1,9 @@ +server { + listen %ip%:%proxy_port% default; + server_name _; + #access_log /var/log/nginx/%ip%.log main; + location / { + proxy_pass http://%ip%:%web_port%; + } +} + diff --git a/install/rhel/6/templates/web/php-fpm/default.tpl b/install/rhel/6/templates/web/php-fpm/default.tpl new file mode 100644 index 000000000..44ccf7a42 --- /dev/null +++ b/install/rhel/6/templates/web/php-fpm/default.tpl @@ -0,0 +1,18 @@ +[%backend%] +listen = 127.0.0.1:%backend_port% +listen.allowed_clients = 127.0.0.1 + +user = %user% +group = %user% + +pm = dynamic +pm.max_children = 50 +pm.start_servers = 3 +pm.min_spare_servers = 2 +pm.max_spare_servers = 10 + +env[HOSTNAME] = $HOSTNAME +env[PATH] = /usr/local/bin:/usr/bin:/bin +env[TMP] = /tmp +env[TMPDIR] = /tmp +env[TEMP] = /tmp diff --git a/install/rhel/6/templates/web/php-fpm/no-php.tpl b/install/rhel/6/templates/web/php-fpm/no-php.tpl new file mode 100644 index 000000000..89487d5f5 --- /dev/null +++ b/install/rhel/6/templates/web/php-fpm/no-php.tpl @@ -0,0 +1,13 @@ +#[%backend%] +#user = %user% +#group = %user% +#listen = /dev/null + +#listen.owner = %user% +#listen.group = nginx + +#pm = dynamic +#pm.max_children = 50 +#pm.start_servers = 3 +#pm.min_spare_servers = 2 +#pm.max_spare_servers = 10 diff --git a/install/rhel/6/templates/web/php-fpm/socket.tpl b/install/rhel/6/templates/web/php-fpm/socket.tpl new file mode 100644 index 000000000..f0513da3e --- /dev/null +++ b/install/rhel/6/templates/web/php-fpm/socket.tpl @@ -0,0 +1,21 @@ +[%backend%] +listen = /var/run/php5-%backend%.sock +listen.allowed_clients = 127.0.0.1 + +user = %user% +group = %user% + +listen.owner = %user% +listen.group = nginx + +pm = dynamic +pm.max_children = 50 +pm.start_servers = 3 +pm.min_spare_servers = 2 +pm.max_spare_servers = 10 + +env[HOSTNAME] = $HOSTNAME +env[PATH] = /usr/local/bin:/usr/bin:/bin +env[TMP] = /tmp +env[TMPDIR] = /tmp +env[TEMP] = /tmp diff --git a/install/rhel/templates/web/skel/document_errors/403.html b/install/rhel/6/templates/web/skel/document_errors/403.html similarity index 100% rename from install/rhel/templates/web/skel/document_errors/403.html rename to install/rhel/6/templates/web/skel/document_errors/403.html diff --git a/install/rhel/templates/web/skel/document_errors/404.html b/install/rhel/6/templates/web/skel/document_errors/404.html similarity index 100% rename from install/rhel/templates/web/skel/document_errors/404.html rename to install/rhel/6/templates/web/skel/document_errors/404.html diff --git a/install/rhel/templates/web/skel/document_errors/50x.html b/install/rhel/6/templates/web/skel/document_errors/50x.html similarity index 100% rename from install/rhel/templates/web/skel/document_errors/50x.html rename to install/rhel/6/templates/web/skel/document_errors/50x.html diff --git a/install/rhel/6/templates/web/skel/public_html/index.html b/install/rhel/6/templates/web/skel/public_html/index.html new file mode 100755 index 000000000..4f5bb7244 --- /dev/null +++ b/install/rhel/6/templates/web/skel/public_html/index.html @@ -0,0 +1,26 @@ + + + %domain% — Coming Soon + + + + + + +

        %domain%

        + + + + + diff --git a/install/rhel/6/templates/web/skel/public_html/robots.txt b/install/rhel/6/templates/web/skel/public_html/robots.txt new file mode 100755 index 000000000..00ee83dcf --- /dev/null +++ b/install/rhel/6/templates/web/skel/public_html/robots.txt @@ -0,0 +1,3 @@ +# vestacp autogenerated robots.txt +User-agent: * +Crawl-delay: 10 diff --git a/install/rhel/6/templates/web/skel/public_shtml/index.html b/install/rhel/6/templates/web/skel/public_shtml/index.html new file mode 100755 index 000000000..4f5bb7244 --- /dev/null +++ b/install/rhel/6/templates/web/skel/public_shtml/index.html @@ -0,0 +1,26 @@ + + + %domain% — Coming Soon + + + + + + +

        %domain%

        + + + + + diff --git a/install/rhel/6/templates/web/skel/public_shtml/robots.txt b/install/rhel/6/templates/web/skel/public_shtml/robots.txt new file mode 100755 index 000000000..00ee83dcf --- /dev/null +++ b/install/rhel/6/templates/web/skel/public_shtml/robots.txt @@ -0,0 +1,3 @@ +# vestacp autogenerated robots.txt +User-agent: * +Crawl-delay: 10 diff --git a/install/rhel/6/templates/web/suspend/.htaccess b/install/rhel/6/templates/web/suspend/.htaccess new file mode 100755 index 000000000..5a6df83fb --- /dev/null +++ b/install/rhel/6/templates/web/suspend/.htaccess @@ -0,0 +1,2 @@ +ErrorDocument 403 /index.html +ErrorDocument 404 /index.html diff --git a/install/rhel/templates/web/suspend/index.html b/install/rhel/6/templates/web/suspend/index.html similarity index 100% rename from install/rhel/templates/web/suspend/index.html rename to install/rhel/6/templates/web/suspend/index.html diff --git a/install/rhel/6/templates/web/webalizer/webalizer.tpl b/install/rhel/6/templates/web/webalizer/webalizer.tpl new file mode 100755 index 000000000..068adcfb9 --- /dev/null +++ b/install/rhel/6/templates/web/webalizer/webalizer.tpl @@ -0,0 +1,110 @@ +HostName %domain_idn% +LogFile /var/log/%web_system%/domains/%domain%.log +OutputDir %home%/%user%/web/%domain%/stats +HistoryName %home%/%user%/web/%domain%/stats/%domain%.hist +Incremental yes +IncrementalName %home%/%user%/web/%domain%/stats/%domain%.current +PageType htm* +PageType cgi +PageType php +PageType shtml +DNSCache /var/lib/webalizer/dns_cache.db +DNSChildren 10 +Quiet yes +FoldSeqErr yes +IndexAlias index.php +HideURL *.gif +HideURL *.GIF +HideURL *.jpg +HideURL *.JPG +HideURL *.png +HideURL *.PNG +HideURL *.ra +SearchEngine abcsearch. terms= +SearchEngine alexa. q= +SearchEngine alltheweb. q= +SearchEngine alltheweb. query= +SearchEngine alot. q= +SearchEngine altavista. q= +SearchEngine aolsearch. query= +SearchEngine aport.ru r= +SearchEngine ask. q= +SearchEngine atlas.cz q= +SearchEngine bbc. q= +SearchEngine bing. q= +SearchEngine blingo. q= +SearchEngine blogs.yandex.ru text= +SearchEngine btopenworld query= +SearchEngine buscador.ya.com q= +SearchEngine busca. q= +SearchEngine business. query= +SearchEngine centrum.cz q= +SearchEngine chiff. q= +SearchEngine clusty. query= +SearchEngine comcast. q= +SearchEngine crawler. q= +SearchEngine cuil. q= +SearchEngine dmoz. search= +SearchEngine dogpile.com q= +SearchEngine dpxml qkw= +SearchEngine eureka. searchword= +SearchEngine euroseek. string= +SearchEngine exalead. q= +SearchEngine excite search= +SearchEngine ezilon. q= +SearchEngine fastbrowsersearch. q= +SearchEngine feedster.com q= +SearchEngine fireball.de q= +SearchEngine fireball. keyword= +SearchEngine freeserve. q= +SearchEngine gigablast. q= +SearchEngine gogo.ru q= +SearchEngine go.mail.ru q= +SearchEngine google. q= +SearchEngine hakia. q= +SearchEngine hotbot. query= +SearchEngine infoseek. qt= +SearchEngine iwon searchfor= +SearchEngine ixquick.com query= +SearchEngine joeant. keywords= +SearchEngine jyxo.cz s= +SearchEngine looksmart. key= +SearchEngine lycos. query= +SearchEngine mamma. q= +SearchEngine metacrawler q= +SearchEngine msn. MT= +SearchEngine msxml qkw= +SearchEngine mysearch. searchfor= +SearchEngine mywebsearch. searchfor= +SearchEngine netscape. q= +SearchEngine nigma.ru q= +SearchEngine northernlight. qr= +SearchEngine ntlworld. q= +SearchEngine orange. q= +SearchEngine overture. Keywords= +SearchEngine punto.ru text= +SearchEngine rambler. keyword= +SearchEngine search.aol. q= +SearchEngine search.babylon. q= +SearchEngine search.centrum. phrase= +SearchEngine search.conduit. q= +SearchEngine search.earthlink q= +SearchEngine search.icq. q= +SearchEngine search.live.com q= +SearchEngine search.rambler.ru words= +SearchEngine search.winamp. q= +SearchEngine searchy. q= +SearchEngine seznam.cz w= +SearchEngine snap. query= +SearchEngine teoma. q= +SearchEngine teradex.com q= +SearchEngine ukplus key= +SearchEngine verizon. q= +SearchEngine virginmedia. q= +SearchEngine voila. rdata= +SearchEngine webcrawler searchText= +SearchEngine web.search.naver. query= +SearchEngine wisenut q= +SearchEngine yahoo. p= +SearchEngine yandex. text= +SearchEngine yodao. q= diff --git a/install/rhel/6/vsftpd/vsftpd.conf b/install/rhel/6/vsftpd/vsftpd.conf new file mode 100644 index 000000000..7a986aff0 --- /dev/null +++ b/install/rhel/6/vsftpd/vsftpd.conf @@ -0,0 +1,21 @@ +anonymous_enable=NO +local_enable=YES +write_enable=YES +local_umask=002 +anon_upload_enable=NO +dirmessage_enable=YES +xferlog_enable=YES +dual_log_enable=YES +connect_from_port_20=YES +xferlog_std_format=YES +chroot_local_user=YES +listen=YES +pam_service_name=vsftpd +userlist_enable=YES +tcp_wrappers=YES +force_dot_files=YES +ascii_upload_enable=YES +ascii_download_enable=YES +pasv_enable=YES +pasv_max_port=12100 +pasv_min_port=12000 diff --git a/install/rhel/6/wsgi/httpd.tar.gz b/install/rhel/6/wsgi/httpd.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..b25acd68e8a2a11305b57b3f2f79f7bbf0cb4995 GIT binary patch literal 1311 zcmV+)1>pK0iwFSs4QNsT1MOGqZ`(Kw?`QuNS{9?*uC-&QNr9p%kW14vcWKil>Gold zK(&=vt1TIl(kvMIzaM2guRd{)bU4fe@~}kyNRc#21xm%fy|qy)0qs{R>2G!YH=`}b zb<1w4RNb%aZlV1r9vi+%>#2vu7*;E!JxE8#5s-# zGJPIl%7)ZuX0m7EkYYKMN>Da7SJ>;?WymDJ9;WNZ+?zy%sUGK`P5Rsu@Gq0`1dUZ) zVk|Y-9#JBBpIlBoU?!rrDW(bHS5HXL2_XO(mZcOF34Bh!9*nDdT5$4-?i* zx<4V`iFXOyEx{)-N(GTQ)=%k~8jxK)>hLjGhJ_vSv7NeiCKZV^uEv)OMb_0!5s8xT ze+B>?$m0?Ch4=|VQ(OEu0Fo1Gm_+*Um>t3Gfn!#_UMfJ6IhS9KNJ({yOy^+W)C(AIGc^=c)55<{TB5f zN`_=RNfn83jJ<$lewnK|x}%k<>s5VqDe0K$d}|*+g#S2@Ha{uxD`+44t@be{5oZ^I zdqirRzVAZ7Fw)SqOhJM_e~42~B5Mv(fgsqIwF>g7j6*!zWl$Yz=8smddwFq-;+YCK z+l{dbYEPt2Ea(k{!1ljkHs;H9!fx!4UfC&(YgKJY6#+Q!8jrJ=V}6Y60O?yeKgAkH zJ&r>iYRXymuKs9sy1&;uxA#1EFYOmq>ahgZnbT$?zS!=@T9HIeC=ZQR8?~7am11f0 z*(6l-hLWi~!^#WLDQ131guDmv+X>g2`m?A*+4ai4@QFZJ@9p@6&DIS=Bf%rRd;hgd zR@%%9Ct&w_RCFFEp^>Zg!CKS>z5mWI4(*kO0f0Zdf93S=Xm$PzHl*X3`Om4kWtjh* zea9_TOM81T|G9hBy?p+A33~m?)-%)NgkC={K7kyZlu z?-mRi!*97@=n^vYspi-t&?FQwKt)#Xkj}bYnT&nN z(hr8wBU1r&KAQ`=Y_Zbd44UeX)4||kc-rj`Zqe82bZQmd&z6{cE}~E8jW2WFp6+>H z-&pV7!iG-p1KTdT_UEF5KJ{wllC#tKau>MQe1F;O4~8f0PV>Be*1Scpc1I5aX00kQ zIK_P5ukTz8G-v@Gp $docroot/.htaccess +chown $user:$user $docroot/.htaccess + + +echo "import os, sys +sys.path.insert(0, '$home_dir/$user/web/$domain/private/django/$domain/env/lib/python2.6/site-packages') +sys.path.insert(0, '$home_dir/$user/web/$domain/private/django/$domain/project/src/shared/') +sys.path.insert(0, '$home_dir/$user/web/$domain/private/django/$domain/project/src/') + +os.environ['DJANGO_SETTINGS_MODULE'] = 'main.settings' +import django.core.handlers.wsgi +application = django.core.handlers.wsgi.WSGIHandler()" > $docroot/django.wsgi +chown $user:$user $docroot/django.wsgi + +exit 0 diff --git a/install/rhel/6/wsgi/httpd/wsgi.stpl b/install/rhel/6/wsgi/httpd/wsgi.stpl new file mode 100755 index 000000000..e2fdd3f40 --- /dev/null +++ b/install/rhel/6/wsgi/httpd/wsgi.stpl @@ -0,0 +1,49 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %sdocroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + AllowOverride All + + SSLEngine on + SSLVerifyClient none + SSLCertificateFile %ssl_crt% + SSLCertificateKeyFile %ssl_key% + %ssl_ca_str%SSLCertificateChainFile %ssl_ca% + + + RMode config + RUidGid %user% %group% + RGroups apache + + + AssignUserID %user% %group% + + + WSGIDaemonProcess apx-idea user=%user% group=%user% processes=1 threads=5 display-name=%{GROUP} python-path=%home%/%user%/web/%domain%/private/django/%domain%/env/lib/python2.6/site-packages + WSGIProcessGroup apx-idea + WSGIApplicationGroup %{GLOBAL} + + + + AllowOverride FileInfo + Options ExecCGI Indexes + MultiviewsMatch Handlers + Options +FollowSymLinks + Order allow,deny + Allow from all + + + Include %home%/%user%/conf/web/s%web_system%.%domain%.conf* + + + diff --git a/install/rhel/6/wsgi/httpd/wsgi.tpl b/install/rhel/6/wsgi/httpd/wsgi.tpl new file mode 100644 index 000000000..ad5d8a076 --- /dev/null +++ b/install/rhel/6/wsgi/httpd/wsgi.tpl @@ -0,0 +1,44 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %docroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + AllowOverride All + + + + RMode config + RUidGid %user% %group% + RGroups apache + + + AssignUserID %user% %group% + + + WSGIDaemonProcess apx-idea user=%user% group=%user% processes=1 threads=5 display-name=%{GROUP} python-path=%home%/%user%/web/%domain%/private/django/%domain%/env/lib/python2.6/site-packages + WSGIProcessGroup apx-idea + WSGIApplicationGroup %{GLOBAL} + + + + AllowOverride FileInfo + Options ExecCGI Indexes + MultiviewsMatch Handlers + Options +FollowSymLinks + Order allow,deny + Allow from all + + + Include %home%/%user%/conf/web/%web_system%.%domain%.conf* + + + diff --git a/install/rhel/7/GPG.txt b/install/rhel/7/GPG.txt new file mode 100644 index 000000000..33bb1ff26 --- /dev/null +++ b/install/rhel/7/GPG.txt @@ -0,0 +1,30 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.5 (GNU/Linux) + +mQGiBExUOVkRBACPJeB3bdrAggHlFpkaB1aRDXDz7clRg6jyEzdMYHhrniSyjhAH ++b53zE4iapCHFIamEG2Fa7zS2lSx7068AmqHsZK5jwmyhTVVYuTtbebj1C4Y5ToW +icHhy4ullB7qeDmAod6EY4YSx2kYO3dR/QLk5QM4lWuV/OLdXWTeoKiiYwCg0UAP +yUkBXgNcKXrFqoJelmG3JEMEAIYM7CGwVd47FsM1UCu56HNQPErxLoUPBUlAQFtx +OMOFDMEm7qH7ve8FgGGRL9oHF7mSJ3y7HgM1BF5MHkKz6FjDrT1U5+Lub6oI2e90 +gfCMGlQAzUm9o+fijfbhKoEQ/xQRkUoqWEaf9zlFx1/4+NH+Qz/L8ZDTHvSLvUgt +HyZlA/916St5suAUugXu9PeLRVqboiHjhz0JWKneQEQ2QcTu8lhHsu/mZTWL9FYn +XwtiCJLZT8bpBSfl8Oeqhof1+sPgnv7t/LuKQ6JJmyJ46Sa453wfrs+xs32hKAe+ +ZN0VGBmHe7NhuhW/LdM0KMMr/LHuJJJAgmt+XVHi2RFwsZvdMbQkVmVzdGEgUGFj +a2FnZXMgPGJ1aWxkZXJAdmVzdGFjcC5jb20+iGAEExECACAFAkxUOVkCGwMGCwkI +BwMCBBUCCAMEFgIDAQIeAQIXgAAKCRBbjeFzoXeCtp6dAKDQfeTPHi6hCgg4L+sx +LEjXvVdLOwCfe9yfr+en+uz6qst0QBT2cAwB+q+5Ag0ETFQ5bBAIAJYZa9pV9l/R +OUFgIvdJd1mvzJpRAXsRBBJc22WuOHp22Uj+lMKrJMTRQZvFBvk9s7Mb1/ACXrL4 +vIbsKqXNAlVFp9kF1tKV2ejZ1MrJaQ4819bIkyG0lJzjl6u9lzJopF7ie00YHKC6 +1rltLaevfFjUXq1DoYZBg42hT/SOj+3+2D0e9qcxeuxXbsjnvwtxxUkWcP/ftOSt +HsAAbM1YtwGl9+fZLWG9+WIKNOE9kp+h2ywZtFA4v/Ms2op7oZGAL7C95k1EgLrH +mOZ0B2oKOLctV1z9keWksPN/osyG7Mg8ljv8zF3XwQFqHOHRntDqSWoFBMvJBkNS +vtm6u5WyKd8ABAsH/0RbeWVA+JqpZ24Rl57XoDRPRzno0m0EnkJMXr22uBq1lPg8 +VkadrGOshFXpM3Rho57f3U7fwKmShQXGEV7RHsWcxcfwOSKVJtI468sDuYXc2l1f +5nFo+rCtVh3BBq+JtZFKX0x53BesCT/M7l33Dfm9MDi34tEdPTPjumBIH1dowYdv +9/2HPlPp4NZte7gOO/VIAiS+jJ30aBn09t8duW5md7/rkOPIM5It05LGCLjb9hVm +R9zTwzw30fIrkeyWZdAbk76lH8u8j6PX30U6RRzb33+XIFR4ab3nlyqOQOpoTqyG +cs7B02sgBbyC+RG1EYfcelSEvLXkR8mjcqjs+MCISQQYEQIACQUCTFQ5bAIbDAAK +CRBbjeFzoXeCtlpcAKDLh59svtq/Gn99O9ZZw0nBjWv6sACfffDxPhCP1F852Jab +d8P1WGhr2Q8= +=Z1Jj +-----END PGP PUBLIC KEY BLOCK----- diff --git a/install/rhel/7/clamav/clamd.conf b/install/rhel/7/clamav/clamd.conf new file mode 100644 index 000000000..c215bcb98 --- /dev/null +++ b/install/rhel/7/clamav/clamd.conf @@ -0,0 +1,502 @@ +## +## Example config file for the Clam AV daemon +## Please read the clamd.conf(5) manual before editing this file. +## + + +# Comment or remove the line below. +#Example + +# Uncomment this option to enable logging. +# LogFile must be writable for the user running daemon. +# A full path is required. +# Default: disabled +LogFile /var/log/clamav/clamd.log + +# By default the log file is locked for writing - the lock protects against +# running clamd multiple times (if want to run another clamd, please +# copy the configuration file, change the LogFile variable, and run +# the daemon with --config-file option). +# This option disables log file locking. +# Default: no +#LogFileUnlock yes + +# Maximum size of the log file. +# Value of 0 disables the limit. +# You may use 'M' or 'm' for megabytes (1M = 1m = 1048576 bytes) +# and 'K' or 'k' for kilobytes (1K = 1k = 1024 bytes). To specify the size +# in bytes just don't use modifiers. +# Default: 1M +LogFileMaxSize 0 + +# Log time with each message. +# Default: no +LogTime yes + +# Also log clean files. Useful in debugging but drastically increases the +# log size. +# Default: no +#LogClean yes + +# Use system logger (can work together with LogFile). +# Default: no +LogSyslog yes + +# Specify the type of syslog messages - please refer to 'man syslog' +# for facility names. +# Default: LOG_LOCAL6 +#LogFacility LOG_MAIL + +# Enable verbose logging. +# Default: no +#LogVerbose yes + +# Log additional information about the infected file, such as its +# size and hash, together with the virus name. +#ExtendedDetectionInfo yes + +# This option allows you to save a process identifier of the listening +# daemon (main thread). +# Default: disabled +PidFile /var/run/clamav/clamd.pid + +# Optional path to the global temporary directory. +# Default: system specific (usually /tmp or /var/tmp). +TemporaryDirectory /var/tmp + +# Path to the database directory. +# Default: hardcoded (depends on installation options) +DatabaseDirectory /var/lib/clamav + +# Only load the official signatures published by the ClamAV project. +# Default: no +#OfficialDatabaseOnly no + +# The daemon can work in local mode, network mode or both. +# Due to security reasons we recommend the local mode. + +# Path to a local socket file the daemon will listen on. +# Default: disabled (must be specified by a user) +LocalSocket /var/run/clamav/clamd.sock + +# Sets the group ownership on the unix socket. +# Default: disabled (the primary group of the user running clamd) +#LocalSocketGroup virusgroup + +# Sets the permissions on the unix socket to the specified mode. +# Default: disabled (socket is world accessible) +#LocalSocketMode 660 + +# Remove stale socket after unclean shutdown. +# Default: yes +FixStaleSocket yes + +# TCP port address. +# Default: no +TCPSocket 3310 + +# TCP address. +# By default we bind to INADDR_ANY, probably not wise. +# Enable the following to provide some degree of protection +# from the outside world. +# Default: no +TCPAddr 127.0.0.1 + +# Maximum length the queue of pending connections may grow to. +# Default: 200 +MaxConnectionQueueLength 30 + +# Clamd uses FTP-like protocol to receive data from remote clients. +# If you are using clamav-milter to balance load between remote clamd daemons +# on firewall servers you may need to tune the options below. + +# Close the connection when the data size limit is exceeded. +# The value should match your MTA's limit for a maximum attachment size. +# Default: 25M +#StreamMaxLength 10M + +# Limit port range. +# Default: 1024 +#StreamMinPort 30000 +# Default: 2048 +#StreamMaxPort 32000 + +# Maximum number of threads running at the same time. +# Default: 10 +MaxThreads 50 + +# Waiting for data from a client socket will timeout after this time (seconds). +# Default: 120 +ReadTimeout 300 + +# This option specifies the time (in seconds) after which clamd should +# timeout if a client doesn't provide any initial command after connecting. +# Default: 5 +#CommandReadTimeout 5 + +# This option specifies how long to wait (in miliseconds) if the send buffer is full. +# Keep this value low to prevent clamd hanging +# +# Default: 500 +#SendBufTimeout 200 + +# Maximum number of queued items (including those being processed by MaxThreads threads) +# It is recommended to have this value at least twice MaxThreads if possible. +# WARNING: you shouldn't increase this too much to avoid running out of file descriptors, +# the following condition should hold: +# MaxThreads*MaxRecursion + (MaxQueue - MaxThreads) + 6< RLIMIT_NOFILE (usual max is 1024) +# +# Default: 100 +#MaxQueue 200 + +# Waiting for a new job will timeout after this time (seconds). +# Default: 30 +#IdleTimeout 60 + +# Don't scan files and directories matching regex +# This directive can be used multiple times +# Default: scan all +#ExcludePath ^/proc/ +#ExcludePath ^/sys/ + +# Maximum depth directories are scanned at. +# Default: 15 +#MaxDirectoryRecursion 20 + +# Follow directory symlinks. +# Default: no +#FollowDirectorySymlinks yes + +# Follow regular file symlinks. +# Default: no +#FollowFileSymlinks yes + +# Scan files and directories on other filesystems. +# Default: yes +#CrossFilesystems yes + +# Perform a database check. +# Default: 600 (10 min) +#SelfCheck 600 + +# Execute a command when virus is found. In the command string %v will +# be replaced with the virus name. +# Default: no +#VirusEvent /usr/local/bin/send_sms 123456789 "VIRUS ALERT: %v" + +# Run as another user (clamd must be started by root for this option to work) +# Default: don't drop privileges +User clam + +# Initialize supplementary group access (clamd must be started by root). +# Default: no +AllowSupplementaryGroups yes + +# Stop daemon when libclamav reports out of memory condition. +#ExitOnOOM yes + +# Don't fork into background. +# Default: no +#Foreground yes + +# Enable debug messages in libclamav. +# Default: no +#Debug yes + +# Do not remove temporary files (for debug purposes). +# Default: no +#LeaveTemporaryFiles yes + +# Detect Possibly Unwanted Applications. +# Default: no +#DetectPUA yes + +# Exclude a specific PUA category. This directive can be used multiple times. +# See http://www.clamav.net/support/pua for the complete list of PUA +# categories. +# Default: Load all categories (if DetectPUA is activated) +#ExcludePUA NetTool +#ExcludePUA PWTool + +# Only include a specific PUA category. This directive can be used multiple +# times. +# Default: Load all categories (if DetectPUA is activated) +#IncludePUA Spy +#IncludePUA Scanner +#IncludePUA RAT + +# In some cases (eg. complex malware, exploits in graphic files, and others), +# ClamAV uses special algorithms to provide accurate detection. This option +# controls the algorithmic detection. +# Default: yes +#AlgorithmicDetection yes + + +## +## Executable files +## + +# PE stands for Portable Executable - it's an executable file format used +# in all 32 and 64-bit versions of Windows operating systems. This option allows +# ClamAV to perform a deeper analysis of executable files and it's also +# required for decompression of popular executable packers such as UPX, FSG, +# and Petite. If you turn off this option, the original files will still be +# scanned, but without additional processing. +# Default: yes +ScanPE yes + +# Executable and Linking Format is a standard format for UN*X executables. +# This option allows you to control the scanning of ELF files. +# If you turn off this option, the original files will still be scanned, but +# without additional processing. +# Default: yes +ScanELF yes + +# With this option clamav will try to detect broken executables (both PE and +# ELF) and mark them as Broken.Executable. +# Default: no +DetectBrokenExecutables yes + + +## +## Documents +## + +# This option enables scanning of OLE2 files, such as Microsoft Office +# documents and .msi files. +# If you turn off this option, the original files will still be scanned, but +# without additional processing. +# Default: yes +ScanOLE2 yes + + +# With this option enabled OLE2 files with VBA macros, which were not +# detected by signatures will be marked as "Heuristics.OLE2.ContainsMacros". +# Default: no +#OLE2BlockMacros no + +# This option enables scanning within PDF files. +# If you turn off this option, the original files will still be scanned, but +# without decoding and additional processing. +# Default: yes +#ScanPDF yes + + +## +## Mail files +## + +# Enable internal e-mail scanner. +# If you turn off this option, the original files will still be scanned, but +# without parsing individual messages/attachments. +# Default: yes +ScanMail yes + +# Scan RFC1341 messages split over many emails. +# You will need to periodically clean up $TemporaryDirectory/clamav-partial directory. +# WARNING: This option may open your system to a DoS attack. +# Never use it on loaded servers. +# Default: no +#ScanPartialMessages yes + + +# With this option enabled ClamAV will try to detect phishing attempts by using +# signatures. +# Default: yes +#PhishingSignatures yes + +# Scan URLs found in mails for phishing attempts using heuristics. +# Default: yes +#PhishingScanURLs yes + +# Always block SSL mismatches in URLs, even if the URL isn't in the database. +# This can lead to false positives. +# +# Default: no +#PhishingAlwaysBlockSSLMismatch no + +# Always block cloaked URLs, even if URL isn't in database. +# This can lead to false positives. +# +# Default: no +#PhishingAlwaysBlockCloak no + +# Allow heuristic match to take precedence. +# When enabled, if a heuristic scan (such as phishingScan) detects +# a possible virus/phish it will stop scan immediately. Recommended, saves CPU +# scan-time. +# When disabled, virus/phish detected by heuristic scans will be reported only at +# the end of a scan. If an archive contains both a heuristically detected +# virus/phish, and a real malware, the real malware will be reported +# +# Keep this disabled if you intend to handle "*.Heuristics.*" viruses +# differently from "real" malware. +# If a non-heuristically-detected virus (signature-based) is found first, +# the scan is interrupted immediately, regardless of this config option. +# +# Default: no +#HeuristicScanPrecedence yes + +## +## Data Loss Prevention (DLP) +## + +# Enable the DLP module +# Default: No +#StructuredDataDetection yes + +# This option sets the lowest number of Credit Card numbers found in a file +# to generate a detect. +# Default: 3 +#StructuredMinCreditCardCount 5 + +# This option sets the lowest number of Social Security Numbers found +# in a file to generate a detect. +# Default: 3 +#StructuredMinSSNCount 5 + +# With this option enabled the DLP module will search for valid +# SSNs formatted as xxx-yy-zzzz +# Default: yes +#StructuredSSNFormatNormal yes + +# With this option enabled the DLP module will search for valid +# SSNs formatted as xxxyyzzzz +# Default: no +#StructuredSSNFormatStripped yes + + +## +## HTML +## + +# Perform HTML normalisation and decryption of MS Script Encoder code. +# Default: yes +# If you turn off this option, the original files will still be scanned, but +# without additional processing. +#ScanHTML yes + + +## +## Archives +## + +# ClamAV can scan within archives and compressed files. +# If you turn off this option, the original files will still be scanned, but +# without unpacking and additional processing. +# Default: yes +ScanArchive yes + +# Mark encrypted archives as viruses (Encrypted.Zip, Encrypted.RAR). +# Default: no +ArchiveBlockEncrypted no + + +## +## Limits +## + +# The options below protect your system against Denial of Service attacks +# using archive bombs. + +# This option sets the maximum amount of data to be scanned for each input file. +# Archives and other containers are recursively extracted and scanned up to this +# value. +# Value of 0 disables the limit +# Note: disabling this limit or setting it too high may result in severe damage +# to the system. +# Default: 100M +#MaxScanSize 150M + +# Files larger than this limit won't be scanned. Affects the input file itself +# as well as files contained inside it (when the input file is an archive, a +# document or some other kind of container). +# Value of 0 disables the limit. +# Note: disabling this limit or setting it too high may result in severe damage +# to the system. +# Default: 25M +#MaxFileSize 30M + +# Nested archives are scanned recursively, e.g. if a Zip archive contains a RAR +# file, all files within it will also be scanned. This options specifies how +# deeply the process should be continued. +# Note: setting this limit too high may result in severe damage to the system. +# Default: 16 +#MaxRecursion 10 + +# Number of files to be scanned within an archive, a document, or any other +# container file. +# Value of 0 disables the limit. +# Note: disabling this limit or setting it too high may result in severe damage +# to the system. +# Default: 10000 +#MaxFiles 15000 + + +## +## Clamuko settings +## + +# Enable Clamuko. Dazuko must be configured and running. Clamuko supports +# both Dazuko (/dev/dazuko) and DazukoFS (/dev/dazukofs.ctrl). DazukoFS +# is the preferred option. For more information please visit www.dazuko.org +# Default: no +#ClamukoScanOnAccess yes + +# The number of scanner threads that will be started (DazukoFS only). +# Having multiple scanner threads allows Clamuko to serve multiple +# processes simultaneously. This is particularly beneficial on SMP machines. +# Default: 3 +#ClamukoScannerCount 3 + +# Don't scan files larger than ClamukoMaxFileSize +# Value of 0 disables the limit. +# Default: 5M +#ClamukoMaxFileSize 10M + +# Set access mask for Clamuko (Dazuko only). +# Default: no +#ClamukoScanOnOpen yes +#ClamukoScanOnClose yes +#ClamukoScanOnExec yes + +# Set the include paths (all files inside them will be scanned). You can have +# multiple ClamukoIncludePath directives but each directory must be added +# in a seperate line. (Dazuko only) +# Default: disabled +#ClamukoIncludePath /home +#ClamukoIncludePath /students + +# Set the exclude paths. All subdirectories are also excluded. (Dazuko only) +# Default: disabled +#ClamukoExcludePath /home/bofh + +# With this option you can whitelist specific UIDs. Processes with these UIDs +# will be able to access all files. +# This option can be used multiple times (one per line). +# Default: disabled +#ClamukoExcludeUID 0 + +# With this option enabled ClamAV will load bytecode from the database. +# It is highly recommended you keep this option on, otherwise you'll miss detections for many new viruses. +# Default: yes +#Bytecode yes + +# Set bytecode security level. +# Possible values: +# None - no security at all, meant for debugging. DO NOT USE THIS ON PRODUCTION SYSTEMS +# This value is only available if clamav was built with --enable-debug! +# TrustSigned - trust bytecode loaded from signed .c[lv]d files, +# insert runtime safety checks for bytecode loaded from other sources +# Paranoid - don't trust any bytecode, insert runtime checks for all +# Recommended: TrustSigned, because bytecode in .cvd files already has these checks +# Note that by default only signed bytecode is loaded, currently you can only +# load unsigned bytecode in --enable-debug mode. +# +# Default: TrustSigned +#BytecodeSecurity TrustSigned + +# Set bytecode timeout in miliseconds. +# +# Default: 5000 +# BytecodeTimeout 1000 diff --git a/install/rhel/7/clamav/clamd.service b/install/rhel/7/clamav/clamd.service new file mode 100644 index 000000000..fdb3af7fd --- /dev/null +++ b/install/rhel/7/clamav/clamd.service @@ -0,0 +1,12 @@ +[Unit] +Description = clamd scanner (clamd) daemon +After = syslog.target nss-lookup.target network.target + +[Service] +Type = simple +ExecStart = /usr/sbin/clamd -c /etc/clamd.conf --nofork=yes +Restart = on-failure +PrivateTmp = true + +[Install] +WantedBy=multi-user.target diff --git a/install/rhel/7/clamav/freshclam.conf b/install/rhel/7/clamav/freshclam.conf new file mode 100644 index 000000000..61fb36465 --- /dev/null +++ b/install/rhel/7/clamav/freshclam.conf @@ -0,0 +1,6 @@ +DatabaseDirectory /var/lib/clamav +UpdateLogFile /var/log/clamav/freshclam.log +LogSyslog yes +DatabaseOwner clam +DatabaseMirror db.ca.clamav.net +DatabaseMirror db.local.clamav.net diff --git a/install/rhel/7/dovecot.tar.gz b/install/rhel/7/dovecot.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..24182a6adcbfc3b30f761408504e09d519842fad GIT binary patch literal 2640 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 literal 0 HcmV?d00001 diff --git a/install/rhel/7/dovecot/conf.d/10-auth.conf b/install/rhel/7/dovecot/conf.d/10-auth.conf new file mode 100644 index 000000000..dfcc83110 --- /dev/null +++ b/install/rhel/7/dovecot/conf.d/10-auth.conf @@ -0,0 +1,4 @@ +disable_plaintext_auth = no +auth_verbose = yes +auth_mechanisms = plain login +!include auth-passwdfile.conf.ext diff --git a/install/rhel/7/dovecot/conf.d/10-logging.conf b/install/rhel/7/dovecot/conf.d/10-logging.conf new file mode 100644 index 000000000..a5f207d51 --- /dev/null +++ b/install/rhel/7/dovecot/conf.d/10-logging.conf @@ -0,0 +1 @@ +log_path = /var/log/dovecot.log diff --git a/install/rhel/7/dovecot/conf.d/10-mail.conf b/install/rhel/7/dovecot/conf.d/10-mail.conf new file mode 100644 index 000000000..55313419e --- /dev/null +++ b/install/rhel/7/dovecot/conf.d/10-mail.conf @@ -0,0 +1,4 @@ +mail_privileged_group = mail +mail_access_groups = mail +mail_location = maildir:%h/mail/%d/%n +pop3_uidl_format = %08Xu%08Xv diff --git a/install/rhel/7/dovecot/conf.d/10-master.conf b/install/rhel/7/dovecot/conf.d/10-master.conf new file mode 100644 index 000000000..a75a9aaa4 --- /dev/null +++ b/install/rhel/7/dovecot/conf.d/10-master.conf @@ -0,0 +1,29 @@ +service imap-login { + inet_listener imap { + } + inet_listener imaps { + } +} + +service pop3-login { + inet_listener pop3 { + } + inet_listener pop3s { + } +} + + +service imap { +} + +service pop3 { +} + +service auth { + unix_listener auth-client { + group = mail + mode = 0660 + user = dovecot + } + user = dovecot +} diff --git a/install/rhel/7/dovecot/conf.d/10-ssl.conf b/install/rhel/7/dovecot/conf.d/10-ssl.conf new file mode 100644 index 000000000..3aaff6eec --- /dev/null +++ b/install/rhel/7/dovecot/conf.d/10-ssl.conf @@ -0,0 +1,3 @@ +ssl = yes +ssl_cert = = 2.1.4) : %v.%u + # Dovecot v0.99.x : %v.%u + # tpop3d : %Mf + # + # Note that Outlook 2003 seems to have problems with %v.%u format which was + # Dovecot's default, so if you're building a new server it would be a good + # idea to change this. %08Xu%08Xv should be pretty fail-safe. + # + #pop3_uidl_format = %08Xu%08Xv + + # Permanently save UIDLs sent to POP3 clients, so pop3_uidl_format changes + # won't change those UIDLs. Currently this works only with Maildir. + #pop3_save_uidl = no + + # POP3 logout format string: + # %i - total number of bytes read from client + # %o - total number of bytes sent to client + # %t - number of TOP commands + # %p - number of bytes sent to client as a result of TOP command + # %r - number of RETR commands + # %b - number of bytes sent to client as a result of RETR command + # %d - number of deleted messages + # %m - number of messages (before deletion) + # %s - mailbox size in bytes (before deletion) + # %u - old/new UIDL hash. may help finding out if UIDLs changed unexpectedly + #pop3_logout_format = top=%t/%p, retr=%r/%b, del=%d/%m, size=%s + + # Maximum number of POP3 connections allowed for a user from each IP address. + # NOTE: The username is compared case-sensitively. + #mail_max_userip_connections = 3 + + # Space separated list of plugins to load (default is global mail_plugins). + #mail_plugins = $mail_plugins + + # Workarounds for various client bugs: + # outlook-no-nuls: + # Outlook and Outlook Express hang if mails contain NUL characters. + # This setting replaces them with 0x80 character. + # oe-ns-eoh: + # Outlook Express and Netscape Mail breaks if end of headers-line is + # missing. This option simply sends it if it's missing. + # The list is space-separated. + #pop3_client_workarounds = +} diff --git a/install/rhel/7/dovecot/conf.d/auth-passwdfile.conf.ext b/install/rhel/7/dovecot/conf.d/auth-passwdfile.conf.ext new file mode 100644 index 000000000..69ab3a5d9 --- /dev/null +++ b/install/rhel/7/dovecot/conf.d/auth-passwdfile.conf.ext @@ -0,0 +1,9 @@ +passdb { + driver = passwd-file + args = scheme=MD5-CRYPT username_format=%n /etc/exim/domains/%d/passwd +} + +userdb { + driver = passwd-file + args = username_format=%n /etc/exim/domains/%d/passwd +} diff --git a/install/rhel/7/dovecot/dovecot.conf b/install/rhel/7/dovecot/dovecot.conf new file mode 100644 index 000000000..b44bd6a82 --- /dev/null +++ b/install/rhel/7/dovecot/dovecot.conf @@ -0,0 +1,4 @@ +protocols = imap pop3 +listen = * +base_dir = /var/run/dovecot/ +!include conf.d/*.conf diff --git a/install/rhel/7/epel-release.rpm b/install/rhel/7/epel-release.rpm new file mode 100644 index 0000000000000000000000000000000000000000..6c2a040be2d2fad18a7a2c4e194a4380786c945e GIT binary patch literal 14524 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 literal 0 HcmV?d00001 diff --git a/install/rhel/7/exim/dnsbl.conf b/install/rhel/7/exim/dnsbl.conf new file mode 100644 index 000000000..5166b255e --- /dev/null +++ b/install/rhel/7/exim/dnsbl.conf @@ -0,0 +1,2 @@ +bl.spamcop.net +zen.spamhaus.org diff --git a/install/rhel/7/exim/exim-smarthost.conf b/install/rhel/7/exim/exim-smarthost.conf new file mode 100644 index 000000000..086ca6507 --- /dev/null +++ b/install/rhel/7/exim/exim-smarthost.conf @@ -0,0 +1,384 @@ +###################################################################### +# # +# Exim configuration file for Vesta Control Panel # +# # +###################################################################### + +#SPAMASSASSIN = yes +#SPAM_SCORE = 50 +#CLAMD = yes + +domainlist local_domains = dsearch;/etc/exim/domains/ +domainlist relay_to_domains = dsearch;/etc/exim/domains/ +hostlist relay_from_hosts = 127.0.0.1 +hostlist whitelist = net-iplsearch;/etc/exim/white-blocks.conf +hostlist spammers = net-iplsearch;/etc/exim/spam-blocks.conf +no_local_from_check +untrusted_set_sender = * +acl_smtp_connect = acl_check_spammers +acl_smtp_mail = acl_check_mail +acl_smtp_rcpt = acl_check_rcpt +acl_smtp_data = acl_check_data +acl_smtp_mime = acl_check_mime + +.ifdef SPAMASSASSIN +spamd_address = 127.0.0.1 783 +.endif + +.ifdef CLAMD +av_scanner = clamd: /var/run/clamav/clamd.sock +.endif + +tls_advertise_hosts = * +tls_certificate = /etc/pki/tls/certs/exim.pem +tls_privatekey = /etc/pki/tls/private/exim.pem + +daemon_smtp_ports = 25 : 465 : 587 : 2525 +tls_on_connect_ports = 465 +never_users = root +host_lookup = * +rfc1413_hosts = * +rfc1413_query_timeout = 5s +ignore_bounce_errors_after = 2d +timeout_frozen_after = 7d + +DKIM_DOMAIN = ${lc:${domain:$h_from:}} +DKIM_FILE = /etc/exim/domains/${lc:${domain:$h_from:}}/dkim.pem +DKIM_PRIVATE_KEY = ${if exists{DKIM_FILE}{DKIM_FILE}{0}} + + +###################################################################### +# ACL CONFIGURATION # +# Specifies access control lists for incoming SMTP mail # +###################################################################### +begin acl + +acl_check_spammers: + accept hosts = +whitelist + + drop message = Your host in blacklist on this server. + log_message = Host in blacklist + hosts = +spammers + + accept + + +acl_check_mail: + deny condition = ${if eq{$sender_helo_name}{}} + message = HELO required before MAIL + + drop message = Helo name contains a ip address (HELO was $sender_helo_name) and not is valid + condition = ${if match{$sender_helo_name}{\N((\d{1,3}[.-]\d{1,3}[.-]\d{1,3}[.-]\d{1,3})|([0-9a-f]{8})|([0-9A-F]{8}))\N}{yes}{no}} + condition = ${if match {${lookup dnsdb{>: defer_never,ptr=$sender_host_address}}\}{$sender_helo_name}{no}{yes}} + delay = 45s + + drop condition = ${if isip{$sender_helo_name}} + message = Access denied - Invalid HELO name (See RFC2821 4.1.3) + + drop condition = ${if eq{[$interface_address]}{$sender_helo_name}} + message = $interface_address is _my_ address + + accept + + +acl_check_rcpt: + accept hosts = : + + deny message = Restricted characters in address + domains = +local_domains + local_parts = ^[.] : ^.*[@%!/|] + + deny message = Restricted characters in address + domains = !+local_domains + local_parts = ^[./|] : ^.*[@%!] : ^.*/\\.\\./ + + require verify = sender + + accept hosts = +relay_from_hosts + control = submission + + accept authenticated = * + control = submission/domain= + + deny message = Rejected because $sender_host_address is in a black list at $dnslist_domain\n$dnslist_text + hosts = !+whitelist + dnslists = ${readfile {/etc/exim/dnsbl.conf}{:}} + + require message = relay not permitted + domains = +local_domains : +relay_to_domains + + deny message = smtp auth requried + sender_domains = +local_domains + !authenticated = * + + require verify = recipient + +.ifdef CLAMD + warn set acl_m0 = no + + warn condition = ${if exists {/etc/exim/domains/$domain/antivirus}{yes}{no}} + set acl_m0 = yes +.endif + +.ifdef SPAMASSASSIN + warn set acl_m1 = no + + warn condition = ${if exists {/etc/exim/domains/$domain/antispam}{yes}{no}} + set acl_m1 = yes +.endif + + accept + + +acl_check_data: +.ifdef CLAMD + deny message = Message contains a virus ($malware_name) and has been rejected + malware = * + condition = ${if eq{$acl_m0}{yes}{yes}{no}} +.endif + +.ifdef SPAMASSASSIN + warn !authenticated = * + hosts = !+relay_from_hosts + condition = ${if < {$message_size}{100K}} + condition = ${if eq{$acl_m1}{yes}{yes}{no}} + spam = nobody:true/defer_ok + add_header = X-Spam-Score: $spam_score_int + add_header = X-Spam-Bar: $spam_bar + add_header = X-Spam-Report: $spam_report + set acl_m2 = $spam_score_int + + warn condition = ${if !eq{$acl_m2}{} {yes}{no}} + condition = ${if >{$acl_m2}{SPAM_SCORE} {yes}{no}} + add_header = X-Spam-Status: Yes + message = SpamAssassin detected spam (from $sender_address to $recipients). +.endif + + accept + + +acl_check_mime: + deny message = Blacklisted file extension detected + condition = ${if match {${lc:$mime_filename}}{\N(\.ade|\.adp|\.bat|\.chm|\.cmd|\.com|\.cpl|\.exe|\.hta|\.ins|\.isp|\.jse|\.lib|\.lnk|\.mde|\.msc|\.msp|\.mst|\.pif|\.scr|\.sct|\.shb|\.sys|\.vb|\.vbe|\.vbs|\.vxd|\.wsc|\.wsf|\.wsh)$\N}{1}{0}} + + accept + + + +###################################################################### +# AUTHENTICATION CONFIGURATION # +###################################################################### +begin authenticators + +login: + driver = plaintext + public_name = LOGIN + client_send = ": user@smartrelay.vestacp.com : p4sw0rd" + server_set_id = $auth1 + +dovecot_plain: + driver = dovecot + public_name = PLAIN + server_socket = /var/run/dovecot/auth-client + server_set_id = $auth1 + +dovecot_login: + driver = dovecot + public_name = LOGIN + server_socket = /var/run/dovecot/auth-client + server_set_id = $auth1 + + + +###################################################################### +# ROUTERS CONFIGURATION # +# Specifies how addresses are handled # +###################################################################### +begin routers + +smarthost: + driver = manualroute + domains = ! +local_domains + transport = remote_smtp_auth + route_list = * smartrelay.vestacp.com + +dnslookup: + driver = dnslookup + domains = !+local_domains + transport = remote_smtp + no_more + +userforward: + driver = redirect + check_local_user + file = $home/.forward + allow_filter + no_verify + no_expn + check_ancestor + file_transport = address_file + pipe_transport = address_pipe + reply_transport = address_reply + +procmail: + driver = accept + check_local_user + require_files = ${local_part}:+${home}/.procmailrc:/usr/bin/procmail + transport = procmail + no_verify + +autoreplay: + driver = accept + require_files = /etc/exim/domains/$domain/autoreply.${local_part}.msg + condition = ${if exists{/etc/exim/domains/$domain/autoreply.${local_part}.msg}}{yes}{no}} + retry_use_local_part + transport = userautoreply + unseen + +aliases: + driver = redirect + headers_add = X-redirected: yes + data = ${extract{1}{:}{${lookup{$local_part@$domain}lsearch{/etc/exim/domains/$domain/aliases}}}} + require_files = /etc/exim/domains/$domain/aliases + redirect_router = dnslookup + pipe_transport = address_pipe + unseen + +localuser_fwd_only: + driver = accept + transport = devnull + condition = ${if exists{/etc/exim/domains/$domain/fwd_only}{${lookup{$local_part}lsearch{/etc/exim/domains/$domain/fwd_only}{true}{false}}}} + +localuser_spam: + driver = accept + transport = local_spam_delivery + condition = ${if eq {${if match{$h_X-Spam-Status:}{\N^Yes\N}{yes}{no}}} {${lookup{$local_part}lsearch{/etc/exim/domains/$domain/passwd}{yes}{no_such_user}}}} + +localuser: + driver = accept + transport = local_delivery + condition = ${lookup{$local_part}lsearch{/etc/exim/domains/$domain/passwd}{true}{false}} + +catchall: + driver = redirect + headers_add = X-redirected: yes + require_files = /etc/exim/domains/$domain/aliases + data = ${extract{1}{:}{${lookup{*@$domain}lsearch{/etc/exim/domains/$domain/aliases}}}} + file_transport = local_delivery + redirect_router = dnslookup + +terminate_alias: + driver = accept + transport = devnull + condition = ${lookup{$local_part@$domain}lsearch{/etc/exim/domains/$domain/aliases}{true}{false}} + + + +###################################################################### +# TRANSPORTS CONFIGURATION # +###################################################################### +begin transports + +remote_smtp: + driver = smtp + dkim_domain = DKIM_DOMAIN + dkim_selector = mail + dkim_private_key = DKIM_PRIVATE_KEY + dkim_canon = relaxed + dkim_strict = 0 + +remote_smtp_auth: + driver = smtp + hosts = smartrelay.vestacp.com + hosts_require_auth = smartrelay.vestacp.com + +procmail: + driver = pipe + command = "/usr/bin/procmail -d $local_part" + return_path_add + delivery_date_add + envelope_to_add + user = $local_part + initgroups + return_output + +local_delivery: + driver = appendfile + maildir_format + maildir_use_size_file + user = ${extract{2}{:}{${lookup{$local_part}lsearch{/etc/exim/domains/$domain/passwd}}}} + group = mail + create_directory + directory_mode = 770 + mode = 660 + use_lockfile = no + delivery_date_add + envelope_to_add + return_path_add + directory = "${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim/domains/$domain/passwd}}}}/mail/$domain/$local_part" + quota = ${extract{6}{:}{${lookup{$local_part}lsearch{/etc/exim/domains/$domain/passwd}}}}M + quota_warn_threshold = 75% + +local_spam_delivery: + driver = appendfile + maildir_format + maildir_use_size_file + user = ${extract{2}{:}{${lookup{$local_part}lsearch{/etc/exim/domains/$domain/passwd}}}} + group = mail + create_directory + directory_mode = 770 + mode = 660 + use_lockfile = no + delivery_date_add + envelope_to_add + return_path_add + directory = "${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim/domains/$domain/passwd}}}}/mail/$domain/$local_part/.Spam" + quota = ${extract{6}{:}{${lookup{$local_part}lsearch{/etc/exim/domains/$domain/passwd}}}}M + quota_directory = "${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim/domains/$domain/passwd}}}}/mail/$domain/$local_part" + quota_warn_threshold = 75% + +address_pipe: + driver = pipe + return_output + +address_file: + driver = appendfile + delivery_date_add + envelope_to_add + return_path_add + +address_reply: + driver = autoreply + +userautoreply: + driver = autoreply + file = /etc/exim/domains/$domain/autoreply.${local_part}.msg + from = "${local_part}@${domain}" + subject = "${if def:h_Subject: {Autoreply: ${quote:${escape:$h_Subject:}}} {Autoreply Message}}" + to = "${sender_address}" + +devnull: + driver = appendfile + file = /dev/null + + + +###################################################################### +# RETRY CONFIGURATION # +###################################################################### +begin retry + +# Address or Domain Error Retries +# ----------------- ----- ------- +* * F,2h,15m; G,16h,1h,1.5; F,4d,6h + + + +###################################################################### +# REWRITE CONFIGURATION # +###################################################################### +begin rewrite + + + +###################################################################### diff --git a/install/rhel/7/exim/exim.conf b/install/rhel/7/exim/exim.conf new file mode 100644 index 000000000..0f9830168 --- /dev/null +++ b/install/rhel/7/exim/exim.conf @@ -0,0 +1,376 @@ +###################################################################### +# # +# Exim configuration file for Vesta Control Panel # +# # +###################################################################### + +#SPAMASSASSIN = yes +#SPAM_SCORE = 50 +#CLAMD = yes + +domainlist local_domains = dsearch;/etc/exim/domains/ +domainlist relay_to_domains = dsearch;/etc/exim/domains/ +hostlist relay_from_hosts = 127.0.0.1 +hostlist whitelist = net-iplsearch;/etc/exim/white-blocks.conf +hostlist spammers = net-iplsearch;/etc/exim/spam-blocks.conf +no_local_from_check +untrusted_set_sender = * +acl_smtp_connect = acl_check_spammers +acl_smtp_mail = acl_check_mail +acl_smtp_rcpt = acl_check_rcpt +acl_smtp_data = acl_check_data +acl_smtp_mime = acl_check_mime + +.ifdef SPAMASSASSIN +spamd_address = 127.0.0.1 783 +.endif + +.ifdef CLAMD +av_scanner = clamd: /var/run/clamav/clamd.sock +.endif + +tls_advertise_hosts = * +tls_certificate = /usr/local/vesta/ssl/certificate.crt +tls_privatekey = /usr/local/vesta/ssl/certificate.key + +daemon_smtp_ports = 25 : 465 : 587 : 2525 +tls_on_connect_ports = 465 +never_users = root +host_lookup = * +rfc1413_hosts = * +rfc1413_query_timeout = 5s +ignore_bounce_errors_after = 2d +timeout_frozen_after = 7d + +DKIM_DOMAIN = ${lc:${domain:$h_from:}} +DKIM_FILE = /etc/exim/domains/${lc:${domain:$h_from:}}/dkim.pem +DKIM_PRIVATE_KEY = ${if exists{DKIM_FILE}{DKIM_FILE}{0}} + + + +###################################################################### +# ACL CONFIGURATION # +# Specifies access control lists for incoming SMTP mail # +###################################################################### +begin acl + +acl_check_spammers: + accept hosts = +whitelist + + drop message = Your host in blacklist on this server. + log_message = Host in blacklist + hosts = +spammers + + accept + + +acl_check_mail: + deny condition = ${if eq{$sender_helo_name}{}} + message = HELO required before MAIL + + drop message = Helo name contains a ip address (HELO was $sender_helo_name) and not is valid + condition = ${if match{$sender_helo_name}{\N((\d{1,3}[.-]\d{1,3}[.-]\d{1,3}[.-]\d{1,3})|([0-9a-f]{8})|([0-9A-F]{8}))\N}{yes}{no}} + condition = ${if match {${lookup dnsdb{>: defer_never,ptr=$sender_host_address}}\}{$sender_helo_name}{no}{yes}} + delay = 45s + + drop condition = ${if isip{$sender_helo_name}} + message = Access denied - Invalid HELO name (See RFC2821 4.1.3) + + drop condition = ${if eq{[$interface_address]}{$sender_helo_name}} + message = $interface_address is _my_ address + + accept + + +acl_check_rcpt: + accept hosts = : + + deny message = Restricted characters in address + domains = +local_domains + local_parts = ^[.] : ^.*[@%!/|] + + deny message = Restricted characters in address + domains = !+local_domains + local_parts = ^[./|] : ^.*[@%!] : ^.*/\\.\\./ + + require verify = sender + + accept hosts = +relay_from_hosts + control = submission + + accept authenticated = * + control = submission/domain= + + deny message = Rejected because $sender_host_address is in a black list at $dnslist_domain\n$dnslist_text + hosts = !+whitelist + dnslists = ${readfile {/etc/exim/dnsbl.conf}{:}} + + require message = relay not permitted + domains = +local_domains : +relay_to_domains + + deny message = smtp auth requried + sender_domains = +local_domains + !authenticated = * + + require verify = recipient + +.ifdef CLAMD + warn set acl_m0 = no + + warn condition = ${if exists {/etc/exim/domains/$domain/antivirus}{yes}{no}} + set acl_m0 = yes +.endif + +.ifdef SPAMASSASSIN + warn set acl_m1 = no + + warn condition = ${if exists {/etc/exim/domains/$domain/antispam}{yes}{no}} + set acl_m1 = yes +.endif + + accept + + +acl_check_data: +.ifdef CLAMD + deny message = Message contains a virus ($malware_name) and has been rejected + malware = * + condition = ${if eq{$acl_m0}{yes}{yes}{no}} +.endif + +.ifdef SPAMASSASSIN + warn !authenticated = * + hosts = !+relay_from_hosts + condition = ${if < {$message_size}{100K}} + condition = ${if eq{$acl_m1}{yes}{yes}{no}} + spam = nobody:true/defer_ok + add_header = X-Spam-Score: $spam_score_int + add_header = X-Spam-Bar: $spam_bar + add_header = X-Spam-Report: $spam_report + set acl_m2 = $spam_score_int + + warn condition = ${if !eq{$acl_m2}{} {yes}{no}} + condition = ${if >{$acl_m2}{SPAM_SCORE} {yes}{no}} + add_header = X-Spam-Status: Yes + message = SpamAssassin detected spam (from $sender_address to $recipients). +.endif + + accept + + +acl_check_mime: + deny message = Blacklisted file extension detected + condition = ${if match {${lc:$mime_filename}}{\N(\.ade|\.adp|\.bat|\.chm|\.cmd|\.com|\.cpl|\.exe|\.hta|\.ins|\.isp|\.jse|\.lib|\.lnk|\.mde|\.msc|\.msp|\.mst|\.pif|\.scr|\.sct|\.shb|\.sys|\.vb|\.vbe|\.vbs|\.vxd|\.wsc|\.wsf|\.wsh)$\N}{1}{0}} + + accept + + + +###################################################################### +# AUTHENTICATION CONFIGURATION # +###################################################################### +begin authenticators + +dovecot_plain: + driver = dovecot + public_name = PLAIN + server_socket = /var/run/dovecot/auth-client + server_set_id = $auth1 + +dovecot_login: + driver = dovecot + public_name = LOGIN + server_socket = /var/run/dovecot/auth-client + server_set_id = $auth1 + + + +###################################################################### +# ROUTERS CONFIGURATION # +# Specifies how addresses are handled # +###################################################################### +begin routers + +#smarthost: +# driver = manualroute +# domains = ! +local_domains +# transport = remote_smtp +# route_list = * smartrelay.vestacp.com +# no_more +# no_verify + +dnslookup: + driver = dnslookup + domains = !+local_domains + transport = remote_smtp + no_more + +userforward: + driver = redirect + check_local_user + file = $home/.forward + allow_filter + no_verify + no_expn + check_ancestor + file_transport = address_file + pipe_transport = address_pipe + reply_transport = address_reply + +procmail: + driver = accept + check_local_user + require_files = ${local_part}:+${home}/.procmailrc:/usr/bin/procmail + transport = procmail + no_verify + +autoreplay: + driver = accept + require_files = /etc/exim/domains/$domain/autoreply.${local_part}.msg + condition = ${if exists{/etc/exim/domains/$domain/autoreply.${local_part}.msg}}{yes}{no}} + retry_use_local_part + transport = userautoreply + unseen + +aliases: + driver = redirect + headers_add = X-redirected: yes + data = ${extract{1}{:}{${lookup{$local_part@$domain}lsearch{/etc/exim/domains/$domain/aliases}}}} + require_files = /etc/exim/domains/$domain/aliases + redirect_router = dnslookup + pipe_transport = address_pipe + unseen + +localuser_fwd_only: + driver = accept + transport = devnull + condition = ${if exists{/etc/exim/domains/$domain/fwd_only}{${lookup{$local_part}lsearch{/etc/exim/domains/$domain/fwd_only}{true}{false}}}} + +localuser_spam: + driver = accept + transport = local_spam_delivery + condition = ${if eq {${if match{$h_X-Spam-Status:}{\N^Yes\N}{yes}{no}}} {${lookup{$local_part}lsearch{/etc/exim/domains/$domain/passwd}{yes}{no_such_user}}}} + +localuser: + driver = accept + transport = local_delivery + condition = ${lookup{$local_part}lsearch{/etc/exim/domains/$domain/passwd}{true}{false}} + +catchall: + driver = redirect + headers_add = X-redirected: yes + require_files = /etc/exim/domains/$domain/aliases + data = ${extract{1}{:}{${lookup{*@$domain}lsearch{/etc/exim/domains/$domain/aliases}}}} + file_transport = local_delivery + redirect_router = dnslookup + +terminate_alias: + driver = accept + transport = devnull + condition = ${lookup{$local_part@$domain}lsearch{/etc/exim/domains/$domain/aliases}{true}{false}} + + + +###################################################################### +# TRANSPORTS CONFIGURATION # +###################################################################### +begin transports + +remote_smtp: + driver = smtp + #helo_data = $sender_address_domain + dkim_domain = DKIM_DOMAIN + dkim_selector = mail + dkim_private_key = DKIM_PRIVATE_KEY + dkim_canon = relaxed + dkim_strict = 0 + +procmail: + driver = pipe + command = "/usr/bin/procmail -d $local_part" + return_path_add + delivery_date_add + envelope_to_add + user = $local_part + initgroups + return_output + +local_delivery: + driver = appendfile + maildir_format + maildir_use_size_file + user = ${extract{2}{:}{${lookup{$local_part}lsearch{/etc/exim/domains/$domain/passwd}}}} + group = mail + create_directory + directory_mode = 770 + mode = 660 + use_lockfile = no + delivery_date_add + envelope_to_add + return_path_add + directory = "${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim/domains/$domain/passwd}}}}/mail/$domain/$local_part" + quota = ${extract{6}{:}{${lookup{$local_part}lsearch{/etc/exim/domains/$domain/passwd}}}}M + quota_warn_threshold = 75% + +local_spam_delivery: + driver = appendfile + maildir_format + maildir_use_size_file + user = ${extract{2}{:}{${lookup{$local_part}lsearch{/etc/exim/domains/$domain/passwd}}}} + group = mail + create_directory + directory_mode = 770 + mode = 660 + use_lockfile = no + delivery_date_add + envelope_to_add + return_path_add + directory = "${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim/domains/$domain/passwd}}}}/mail/$domain/$local_part/.Spam" + quota = ${extract{6}{:}{${lookup{$local_part}lsearch{/etc/exim/domains/$domain/passwd}}}}M + quota_directory = "${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim/domains/$domain/passwd}}}}/mail/$domain/$local_part" + quota_warn_threshold = 75% + +address_pipe: + driver = pipe + return_output + +address_file: + driver = appendfile + delivery_date_add + envelope_to_add + return_path_add + +address_reply: + driver = autoreply + +userautoreply: + driver = autoreply + file = /etc/exim/domains/$domain/autoreply.${local_part}.msg + from = "${local_part}@${domain}" + subject = "${if def:h_Subject: {Autoreply: ${quote:${escape:$h_Subject:}}} {Autoreply Message}}" + to = "${sender_address}" + +devnull: + driver = appendfile + file = /dev/null + + +###################################################################### +# RETRY CONFIGURATION # +###################################################################### +begin retry + +# Address or Domain Error Retries +# ----------------- ----- ------- +* * F,2h,15m; G,16h,1h,1.5; F,4d,6h + + + +###################################################################### +# REWRITE CONFIGURATION # +###################################################################### +begin rewrite + + + +###################################################################### diff --git a/install/rhel/7/exim/spam-blocks.conf b/install/rhel/7/exim/spam-blocks.conf new file mode 100644 index 000000000..e69de29bb diff --git a/install/rhel/7/fail2ban.tar.gz b/install/rhel/7/fail2ban.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..563451b41911801445523d68e3fe4f910f1adc7c GIT binary patch literal 727 zcmV;|0x10-iwFR>PexP#1MQbfPvbBU$9vAF7>NVYN@*TV+6y4T0s@I;ky^NPdvKFU z>fOW%iPHsXKm6KBD6~yWk)Yj&f0yPl@i_R>*Fv5J=ZON1&hDswPicD z-1Fox50A!rzlpW?IkRDFAW*suH&qXf7i60>)#Z1meaHC7MSn#0qgkB384%Q7>V&{=ANXhy?u<3!{eK%Q$AA0%-*(NV{@+pke=EG`|5XN*J-=Xi;dz(`MHIoEOb8$apCIGZtF{Ni zImRi^wLP&lTwZ^^x;;JXkF+rgcNFc=OX64@CuABe>>V=WG7RxSSV8*}99(?u4~{@S zMjv=VUA66~gC(n`Yt4OXPF7D2@*_ZjfG>?;%LLnd+SA zm*dN;XVn*?(#43yDYewqhJG?dFX5Z0)uwM0ti5Wv_%XkaHeJ@*Sa$UlYkPXqytI{P z)6$mCo6NTQOVK#jyR-h_xN)-8sak&Uvi7d4NTER9egiTc J failed to login +ignoreregex = + diff --git a/install/ubuntu/fail2ban.jail.conf b/install/rhel/7/fail2ban/fail2ban.jail.conf similarity index 100% rename from install/ubuntu/fail2ban.jail.conf rename to install/rhel/7/fail2ban/fail2ban.jail.conf diff --git a/install/rhel/7/firewall.tar.gz b/install/rhel/7/firewall.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..e8556008077364323d7d6b6934e7a2cf7a734983 GIT binary patch literal 540 zcmV+%0^|K3iwFQ5XyQ}=1MQVdkJ>O4Mzij(@XnhsKo&*MSlh#7(1g=&0&FEG%?Me6ampuO4>y-_`!)kpP&FT0Pj|*j)GSV93 zG0u%P9?@5H>Ue&9TJ8w(mS4U;YbU>kw!5dto6pc!`1H`piz?!Qs? zZ2zTY(j)A}O)l`C?|(Hfn=&r%X0(YbN~&_+%&1`W&E*1z3IZzVUki(*D`*Kk5kQkG z1wFz!17_g@d9ch)G0;wCGL8I9sNtr~X-yEB=^d3PuoC0XT$oBik3eT~aJ zPYYM7vf@1@^`frQB1w}O-E1jovb=r04Y>?eKuHocY1?18ny~4FyPO>aM4!NUUOmFePy(-1M3SddTi>v8NVjB&*t=IgAYbgkDfmmx*FWy-yM^~-2uA1 z`-8QZ4$iCJUfZClsXi!k+gGp^gsj(jT}WJxQ(W4?Rswg^FKlTCd%;5d=XH e1VIo4K@bE%5ClOG1VIqwGCu%8Tmj4gC;$K)2?m1z literal 0 HcmV?d00001 diff --git a/install/rhel/7/firewall/ports.conf b/install/rhel/7/firewall/ports.conf new file mode 100644 index 000000000..a6ef4dae5 --- /dev/null +++ b/install/rhel/7/firewall/ports.conf @@ -0,0 +1,16 @@ +PROTOCOL='TCP' PORT='20' +PROTOCOL='TCP' PORT='21' +PROTOCOL='TCP' PORT='22' +PROTOCOL='TCP' PORT='25' +PROTOCOL='UDP' PORT='53' +PROTOCOL='TCP' PORT='80' +PROTOCOL='TCP' PORT='443' +PROTOCOL='TCP' PORT='110' +PROTOCOL='UDP' PORT='123' +PROTOCOL='TCP' PORT='143' +PROTOCOL='TCP' PORT='3306' +PROTOCOL='TCP' PORT='5432' +PROTOCOL='TCP' PORT='8080' +PROTOCOL='TCP' PORT='8433' +PROTOCOL='TCP' PORT='8083' +PROTOCOL='TCP' PORT='12000:12100' diff --git a/install/rhel/7/firewall/rules.conf b/install/rhel/7/firewall/rules.conf new file mode 100644 index 000000000..956c2e1d9 --- /dev/null +++ b/install/rhel/7/firewall/rules.conf @@ -0,0 +1,10 @@ +RULE='1' ACTION='ACCEPT' PROTOCOL='ICMP' PORT='0' IP='0.0.0.0/0' COMMENT='PING' SUSPENDED='no' TIME='17:13:48' DATE='2014-09-16' +RULE='2' ACTION='ACCEPT' PROTOCOL='TCP' PORT='8083' IP='0.0.0.0/0' COMMENT='VESTA' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' +RULE='3' ACTION='ACCEPT' PROTOCOL='TCP' PORT='3306,5432' IP='0.0.0.0/0' COMMENT='DB' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' +RULE='4' ACTION='ACCEPT' PROTOCOL='TCP' PORT='143,993' IP='0.0.0.0/0' COMMENT='IMAP' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' +RULE='5' ACTION='ACCEPT' PROTOCOL='TCP' PORT='110,995' IP='0.0.0.0/0' COMMENT='POP3' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' +RULE='6' ACTION='ACCEPT' PROTOCOL='TCP' PORT='25,465,587,2525' IP='0.0.0.0/0' COMMENT='SMTP' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' +RULE='7' ACTION='ACCEPT' PROTOCOL='UDP' PORT='53' IP='0.0.0.0/0' COMMENT='DNS' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' +RULE='8' ACTION='ACCEPT' PROTOCOL='TCP' PORT='21,12000-12100' IP='0.0.0.0/0' COMMENT='FTP' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' +RULE='9' ACTION='ACCEPT' PROTOCOL='TCP' PORT='80,443' IP='0.0.0.0/0' COMMENT='WEB' SUSPENDED='no' TIME='17:04:27' DATE='2014-09-24' +RULE='10' ACTION='ACCEPT' PROTOCOL='TCP' PORT='22' IP='0.0.0.0/0' COMMENT='SSH' SUSPENDED='no' TIME='17:14:41' DATE='2014-09-16' diff --git a/install/rhel/7/httpd/httpd.conf b/install/rhel/7/httpd/httpd.conf new file mode 100644 index 000000000..40b034885 --- /dev/null +++ b/install/rhel/7/httpd/httpd.conf @@ -0,0 +1,58 @@ +ServerRoot "/etc/httpd" +Include conf.modules.d/*.conf +User apache +Group apache +ServerAdmin root@localhost + + + AllowOverride none + + +DocumentRoot "/var/www/html" + + AllowOverride None + Require all granted + + + + Options Indexes FollowSymLinks + AllowOverride None + Require all granted + + +DirectoryIndex index.php index.html + + + Require all denied + + +ErrorLog "logs/error_log" +LogLevel warn + +LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined +LogFormat "%h %l %u %t \"%r\" %>s %b" common +LogFormat "%b" bytes +CustomLog "logs/access_log" combined + +TypesConfig /etc/mime.types +AddType application/x-compress .Z +AddType application/x-gzip .gz .tgz +AddType text/html .shtml +AddOutputFilter INCLUDES .shtml +#AddHandler cgi-script .cgi + +AddDefaultCharset UTF-8 + + + MIMEMagicFile conf/magic + + +EnableSendfile on + + + RemoteIPHeader X-Real-IP + LogFormat "%a %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined + LogFormat "%a %l %u %t \"%r\" %>s %b" common + + +IncludeOptional conf.d/*.conf diff --git a/install/rhel/7/httpd/ruid2.conf b/install/rhel/7/httpd/ruid2.conf new file mode 100644 index 000000000..42f908a85 --- /dev/null +++ b/install/rhel/7/httpd/ruid2.conf @@ -0,0 +1,8 @@ +LoadModule ruid2_module modules/mod_ruid2.so + + + RMode config + RDefaultUidGid apache apache + RUidGid apache apache + RGroups apache + diff --git a/install/rhel/7/httpd/ssl.conf b/install/rhel/7/httpd/ssl.conf new file mode 100644 index 000000000..ccc067c19 --- /dev/null +++ b/install/rhel/7/httpd/ssl.conf @@ -0,0 +1,6 @@ +SSLPassPhraseDialog exec:/usr/libexec/httpd-ssl-pass-dialog +SSLSessionCache shmcb:/run/httpd/sslcache(512000) +SSLSessionCacheTimeout 300 +SSLRandomSeed startup file:/dev/urandom 256 +SSLRandomSeed connect builtin +SSLCryptoDevice builtin diff --git a/install/rhel/7/httpd/status.conf b/install/rhel/7/httpd/status.conf new file mode 100644 index 000000000..f68f293dc --- /dev/null +++ b/install/rhel/7/httpd/status.conf @@ -0,0 +1,7 @@ +Listen 127.0.0.1:8081 + + SetHandler server-status + Order deny,allow + Deny from all + Allow from 127.0.0.1 + diff --git a/install/rhel/7/logrotate/httpd b/install/rhel/7/logrotate/httpd new file mode 100644 index 000000000..80dab8e29 --- /dev/null +++ b/install/rhel/7/logrotate/httpd @@ -0,0 +1,10 @@ +/var/log/httpd/*log /var/log/httpd/domains/*log { + missingok + notifempty + compress + sharedscripts + postrotate + /sbin/service httpd reload > /dev/null 2>/dev/null || true + [ ! -f /var/run/nginx.pid ] || kill -USR1 `cat /var/run/nginx.pid` + endscript +} diff --git a/install/rhel/7/logrotate/nginx b/install/rhel/7/logrotate/nginx new file mode 100644 index 000000000..b1da1bf16 --- /dev/null +++ b/install/rhel/7/logrotate/nginx @@ -0,0 +1,12 @@ +/var/log/nginx/*log /var/log/nginx/domains/*log { + create 0644 nginx nginx + daily + rotate 10 + missingok + notifempty + compress + sharedscripts + postrotate + [ -f /var/run/nginx.pid ] && kill -USR1 `cat /var/run/nginx.pid` + endscript +} diff --git a/install/rhel/7/logrotate/vesta b/install/rhel/7/logrotate/vesta new file mode 100644 index 000000000..027a34396 --- /dev/null +++ b/install/rhel/7/logrotate/vesta @@ -0,0 +1,7 @@ +/usr/local/vesta/log/*.log { + missingok + notifempty + size 30k + yearly + create 0600 root root +} diff --git a/install/rhel/7/mariadb/my-large.cnf b/install/rhel/7/mariadb/my-large.cnf new file mode 100644 index 000000000..4e6c2225c --- /dev/null +++ b/install/rhel/7/mariadb/my-large.cnf @@ -0,0 +1,38 @@ +[mysqld] +datadir=/var/lib/mysql +socket=/var/lib/mysql/mysql.sock +symbolic-links=0 + +skip-external-locking +key_buffer_size = 256M +max_allowed_packet = 32M +table_open_cache = 256 +sort_buffer_size = 1M +read_buffer_size = 1M +read_rnd_buffer_size = 4M +myisam_sort_buffer_size = 64M +thread_cache_size = 8 +query_cache_size= 16M +thread_concurrency = 8 + +#innodb_use_native_aio = 0 +innodb_file_per_table + +max_connections=200 +max_user_connections=50 +wait_timeout=10 +interactive_timeout=50 +long_query_time=5 + +#slow_query_log=1 +#slow_query_log_file=/var/log/mysql-slow-queries.log + + +[mysqld_safe] +log-error=/var/log/mariadb/mariadb.log +pid-file=/var/run/mariadb/mariadb.pid + +# +# include all files from the config directory +# +!includedir /etc/my.cnf.d diff --git a/install/rhel/7/mariadb/my-medium.cnf b/install/rhel/7/mariadb/my-medium.cnf new file mode 100644 index 000000000..fa255ec52 --- /dev/null +++ b/install/rhel/7/mariadb/my-medium.cnf @@ -0,0 +1,37 @@ +[mysqld] +datadir=/var/lib/mysql +socket=/var/lib/mysql/mysql.sock +symbolic-links=0 + +skip-external-locking +key_buffer_size = 16M +max_allowed_packet = 16M +table_open_cache = 64 +sort_buffer_size = 512K +net_buffer_length = 8K +read_buffer_size = 256K +read_rnd_buffer_size = 512K +myisam_sort_buffer_size = 8M + +#innodb_use_native_aio = 0 +innodb_file_per_table + +max_connections=70 +max_user_connections=30 +wait_timeout=10 +interactive_timeout=50 +long_query_time=5 + +#slow_query_log=1 +#slow_query_log_file=/var/log/mysql-slow-queries.log + + + +[mysqld_safe] +log-error=/var/log/mariadb/mariadb.log +pid-file=/var/run/mariadb/mariadb.pid + +# +# include all files from the config directory +# +!includedir /etc/my.cnf.d diff --git a/install/rhel/7/mariadb/my-small.cnf b/install/rhel/7/mariadb/my-small.cnf new file mode 100644 index 000000000..933d4ae0b --- /dev/null +++ b/install/rhel/7/mariadb/my-small.cnf @@ -0,0 +1,35 @@ +[mysqld] +datadir=/var/lib/mysql +socket=/var/lib/mysql/mysql.sock +symbolic-links=0 + +skip-external-locking +key_buffer_size = 16K +max_allowed_packet = 1M +table_open_cache = 4 +sort_buffer_size = 64K +read_buffer_size = 256K +read_rnd_buffer_size = 256K +net_buffer_length = 2K +thread_stack = 240K + +#innodb_use_native_aio = 0 +innodb_file_per_table + +max_connections=50 +max_user_connections=25 +wait_timeout=10 +interactive_timeout=50 +long_query_time=5 + +#slow_query_log=1 +#slow_query_log_file=/var/log/mysql-slow-queries.log + +[mysqld_safe] +log-error=/var/log/mariadb/mariadb.log +pid-file=/var/run/mariadb/mariadb.pid + +# +# include all files from the config directory +# +!includedir /etc/my.cnf.d diff --git a/install/rhel/7/monit/clamd.conf b/install/rhel/7/monit/clamd.conf new file mode 100644 index 000000000..a360b1097 --- /dev/null +++ b/install/rhel/7/monit/clamd.conf @@ -0,0 +1,3 @@ +check process clamd with pidfile /var/run/clamav/clamd.pid + start program = "/etc/init.d/clamd start" + stop program = "/etc/init.d/clamd stop" diff --git a/install/rhel/7/monit/dovecot.conf b/install/rhel/7/monit/dovecot.conf new file mode 100644 index 000000000..c78216565 --- /dev/null +++ b/install/rhel/7/monit/dovecot.conf @@ -0,0 +1,3 @@ +check process dovecot with pidfile /var/run/dovecot/master.pid + start program = "/etc/init.d/dovecot start" + stop program = "/etc/init.d/dovecot stop" diff --git a/install/rhel/7/monit/exim.conf b/install/rhel/7/monit/exim.conf new file mode 100644 index 000000000..e7988e47d --- /dev/null +++ b/install/rhel/7/monit/exim.conf @@ -0,0 +1,3 @@ +check process exim with pidfile /var/run/exim.pid + start program = "/etc/init.d/exim start" + stop program = "/etc/init.d/exim stop" diff --git a/install/rhel/7/monit/httpd.conf b/install/rhel/7/monit/httpd.conf new file mode 100644 index 000000000..1ce1a594d --- /dev/null +++ b/install/rhel/7/monit/httpd.conf @@ -0,0 +1,3 @@ +check process httpd with pidfile /var/run/httpd/httpd.pid + start program = "/etc/init.d/httpd start" + stop program = "/etc/init.d/httpd stop" diff --git a/install/rhel/7/monit/mysql.conf b/install/rhel/7/monit/mysql.conf new file mode 100644 index 000000000..aa413c438 --- /dev/null +++ b/install/rhel/7/monit/mysql.conf @@ -0,0 +1,3 @@ +check process mysql with pidfile /var/run/mysqld/mysqld.pid + start program = "/etc/init.d/mysqld start" + stop program = "/etc/init.d/mysqld stop" diff --git a/install/rhel/7/monit/nginx.conf b/install/rhel/7/monit/nginx.conf new file mode 100644 index 000000000..d29af043c --- /dev/null +++ b/install/rhel/7/monit/nginx.conf @@ -0,0 +1,3 @@ +check process nginx with pidfile /var/run/nginx.pid + start program = "/etc/init.d/nginx start" + stop program = "/etc/init.d/nginx stop" diff --git a/install/rhel/7/monit/spamassassin.conf b/install/rhel/7/monit/spamassassin.conf new file mode 100644 index 000000000..0c9729d51 --- /dev/null +++ b/install/rhel/7/monit/spamassassin.conf @@ -0,0 +1,3 @@ +check process spamassassin with pidfile /var/run/spamd.pid + start program = "/etc/init.d/spamassassin start" + stop program = "/etc/init.d/spamassassin stop" diff --git a/install/rhel/7/monit/sshd.conf b/install/rhel/7/monit/sshd.conf new file mode 100644 index 000000000..b28123129 --- /dev/null +++ b/install/rhel/7/monit/sshd.conf @@ -0,0 +1,3 @@ +check process sshd with pidfile /var/run/sshd.pid + start program = "/etc/init.d/sshd start" + stop program = "/etc/init.d/sshd stop" diff --git a/install/rhel/7/monit/vesta-nginx.conf b/install/rhel/7/monit/vesta-nginx.conf new file mode 100644 index 000000000..1a85cac3a --- /dev/null +++ b/install/rhel/7/monit/vesta-nginx.conf @@ -0,0 +1,3 @@ +check process vesta-nginx with pidfile /var/run/vesta-nginx.pid + start program = "/etc/init.d/vesta start" + stop program = "/etc/init.d/vesta stop" diff --git a/install/rhel/7/monit/vesta-php.conf b/install/rhel/7/monit/vesta-php.conf new file mode 100644 index 000000000..80731189f --- /dev/null +++ b/install/rhel/7/monit/vesta-php.conf @@ -0,0 +1,3 @@ +check process vesta-php with pidfile /var/run/vesta-php.pid + start program = "/etc/init.d/vesta start" + stop program = "/etc/init.d/vesta stop" diff --git a/install/rhel/7/mysqld/my-large.cnf b/install/rhel/7/mysqld/my-large.cnf new file mode 100644 index 000000000..b548eeb87 --- /dev/null +++ b/install/rhel/7/mysqld/my-large.cnf @@ -0,0 +1,38 @@ +[mysqld] +datadir=/var/lib/mysql +socket=/var/lib/mysql/mysql.sock +symbolic-links=0 + +skip-external-locking +key_buffer_size = 256M +max_allowed_packet = 32M +table_open_cache = 256 +sort_buffer_size = 1M +read_buffer_size = 1M +read_rnd_buffer_size = 4M +myisam_sort_buffer_size = 64M +thread_cache_size = 8 +query_cache_size= 16M +thread_concurrency = 8 + +#innodb_use_native_aio = 0 +innodb_file_per_table + +max_connections=200 +max_user_connections=50 +wait_timeout=10 +interactive_timeout=50 +long_query_time=5 + +#slow_query_log=1 +#slow_query_log_file=/var/log/mysql-slow-queries.log + + +[mysqld_safe] +log-error=/var/log/mysqld.log +pid-file=/var/run/mysqld/mysqld.pid + +# +# include all files from the config directory +# +!includedir /etc/my.cnf.d diff --git a/install/rhel/7/mysqld/my-medium.cnf b/install/rhel/7/mysqld/my-medium.cnf new file mode 100644 index 000000000..e5f2677fc --- /dev/null +++ b/install/rhel/7/mysqld/my-medium.cnf @@ -0,0 +1,37 @@ +[mysqld] +datadir=/var/lib/mysql +socket=/var/lib/mysql/mysql.sock +symbolic-links=0 + +skip-external-locking +key_buffer_size = 16M +max_allowed_packet = 16M +table_open_cache = 64 +sort_buffer_size = 512K +net_buffer_length = 8K +read_buffer_size = 256K +read_rnd_buffer_size = 512K +myisam_sort_buffer_size = 8M + +#innodb_use_native_aio = 0 +innodb_file_per_table + +max_connections=70 +max_user_connections=30 +wait_timeout=10 +interactive_timeout=50 +long_query_time=5 + +#slow_query_log=1 +#slow_query_log_file=/var/log/mysql-slow-queries.log + + + +[mysqld_safe] +log-error=/var/log/mysqld.log +pid-file=/var/run/mysqld/mysqld.pid + +# +# include all files from the config directory +# +!includedir /etc/my.cnf.d diff --git a/install/rhel/7/mysqld/my-small.cnf b/install/rhel/7/mysqld/my-small.cnf new file mode 100644 index 000000000..adc7cd1fb --- /dev/null +++ b/install/rhel/7/mysqld/my-small.cnf @@ -0,0 +1,35 @@ +[mysqld] +datadir=/var/lib/mysql +socket=/var/lib/mysql/mysql.sock +symbolic-links=0 + +skip-external-locking +key_buffer_size = 16K +max_allowed_packet = 1M +table_open_cache = 4 +sort_buffer_size = 64K +read_buffer_size = 256K +read_rnd_buffer_size = 256K +net_buffer_length = 2K +thread_stack = 240K + +#innodb_use_native_aio = 0 +innodb_file_per_table + +max_connections=30 +max_user_connections=20 +wait_timeout=10 +interactive_timeout=50 +long_query_time=5 + +#slow_query_log=1 +#slow_query_log_file=/var/log/mysql-slow-queries.log + +[mysqld_safe] +log-error=/var/log/mysqld.log +pid-file=/var/run/mysqld/mysqld.pid + +# +# include all files from the config directory +# +!includedir /etc/my.cnf.d diff --git a/install/rhel/7/named/named.conf b/install/rhel/7/named/named.conf new file mode 100644 index 000000000..472bd829b --- /dev/null +++ b/install/rhel/7/named/named.conf @@ -0,0 +1,13 @@ +options { + directory "/var/named"; + dump-file "/var/named/data/cache_dump.db"; + pid-file "/var/run/named/named.pid"; + statistics-file "/var/named/data/named_stats.txt"; + version "get lost"; + allow-transfer {"none";}; + recursion no; + +}; + +include "/etc/rndc.key"; + diff --git a/install/rhel/7/nginx/nginx.conf b/install/rhel/7/nginx/nginx.conf new file mode 100644 index 000000000..0316de7ac --- /dev/null +++ b/install/rhel/7/nginx/nginx.conf @@ -0,0 +1,101 @@ +# Server globals +user nginx; +worker_processes 2; +error_log /var/log/nginx/error.log; +pid /var/run/nginx.pid; + + +# Worker config +events { + worker_connections 1024; + use epoll; +} + + +http { + # Main settings + sendfile on; + tcp_nopush on; + tcp_nodelay on; + client_header_timeout 1m; + client_body_timeout 1m; + client_header_buffer_size 2k; + client_body_buffer_size 256k; + client_max_body_size 100m; + large_client_header_buffers 4 8k; + send_timeout 30; + keepalive_timeout 60 60; + reset_timedout_connection on; + server_tokens off; + server_name_in_redirect off; + server_names_hash_max_size 512; + server_names_hash_bucket_size 512; + + + # Log format + log_format main '$remote_addr - $remote_user [$time_local] $request ' + '"$status" $body_bytes_sent "$http_referer" ' + '"$http_user_agent" "$http_x_forwarded_for"'; + log_format bytes '$body_bytes_sent'; + #access_log /var/log/nginx/access.log main; + access_log off; + + + # Mime settings + include /etc/nginx/mime.types; + default_type application/octet-stream; + + + # Compression + gzip on; + gzip_comp_level 9; + gzip_min_length 512; + gzip_buffers 8 64k; + gzip_types text/plain text/css text/javascript + application/x-javascript; + gzip_proxied any; + + + # Proxy settings + proxy_redirect off; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_pass_header Set-Cookie; + proxy_connect_timeout 90; + proxy_send_timeout 90; + proxy_read_timeout 90; + proxy_buffers 32 4k; + + + # SSL PCI Compliance + ssl_session_cache shared:SSL:10m; + ssl_protocols TLSv1 TLSv1.1 TLSv1.2; + ssl_prefer_server_ciphers on; + ssl_ciphers "ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA:ECDHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES128-SHA256:DHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES256-GCM-SHA384:AES128-GCM-SHA256:AES256-SHA256:AES128-SHA256:AES256-SHA:AES128-SHA:DES-CBC3-SHA:HIGH:!aNULL:!eNULL:!EXPORT:!DES:!MD5:!PSK:!RC4"; + + + # Error pages + error_page 403 /error/403.html; + error_page 404 /error/404.html; + error_page 502 503 504 /error/50x.html; + + + # Cache + proxy_cache_path /var/cache/nginx levels=2 keys_zone=cache:10m inactive=60m max_size=512m; + proxy_temp_path /var/cache/nginx/temp; + proxy_cache_key "$host$request_uri $cookie_user"; + proxy_ignore_headers Expires Cache-Control; + proxy_cache_use_stale error timeout invalid_header http_502; + proxy_cache_valid any 3d; + + map $http_cookie $no_cache { + default 0; + ~SESS 1; + ~wordpress_logged_in 1; + } + + + # Wildcard include + include /etc/nginx/conf.d/*.conf; +} diff --git a/install/rhel/7/nginx/phpmyadmin.inc b/install/rhel/7/nginx/phpmyadmin.inc new file mode 100644 index 000000000..09da52076 --- /dev/null +++ b/install/rhel/7/nginx/phpmyadmin.inc @@ -0,0 +1,15 @@ +location /phpmyadmin { + alias /usr/share/phpMyAdmin/; + + location ~ /(libraries|setup) { + return 404; + } + + location ~ ^/phpmyadmin/(.*\.php)$ { + alias /usr/share/phpMyAdmin/$1; + fastcgi_pass 127.0.0.1:9000; + fastcgi_index index.php; + include fastcgi_params; + fastcgi_param SCRIPT_FILENAME $request_filename; + } +} diff --git a/install/rhel/7/nginx/phppgadmin.inc b/install/rhel/7/nginx/phppgadmin.inc new file mode 100644 index 000000000..333e560a2 --- /dev/null +++ b/install/rhel/7/nginx/phppgadmin.inc @@ -0,0 +1,11 @@ +location /phppgadmin { + alias /usr/share/phpPgAdmin/; + + location ~ ^/phppgadmin/(.*\.php)$ { + alias /usr/share/phpPgAdmin/$1; + fastcgi_pass 127.0.0.1:9000; + fastcgi_index index.php; + include fastcgi_params; + fastcgi_param SCRIPT_FILENAME $request_filename; + } +} diff --git a/install/rhel/7/nginx/status.conf b/install/rhel/7/nginx/status.conf new file mode 100644 index 000000000..c0bcd0691 --- /dev/null +++ b/install/rhel/7/nginx/status.conf @@ -0,0 +1,9 @@ +server { + listen 127.0.0.1:8084 default; + server_name _; + server_name_in_redirect off; + location / { + stub_status on; + access_log off; + } +} diff --git a/install/rhel/7/nginx/webmail.inc b/install/rhel/7/nginx/webmail.inc new file mode 100644 index 000000000..2d0fbe293 --- /dev/null +++ b/install/rhel/7/nginx/webmail.inc @@ -0,0 +1,15 @@ +location /webmail { + alias /usr/share/roundcubemail/; + + location ~ /(config|temp|logs) { + return 404; + } + + location ~ ^/webmail/(.*\.php)$ { + alias /usr/share/roundcubemail/$1; + fastcgi_pass 127.0.0.1:9000; + fastcgi_index index.php; + include fastcgi_params; + fastcgi_param SCRIPT_FILENAME $request_filename; + } +} diff --git a/install/rhel/7/packages.tar.gz b/install/rhel/7/packages.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..b857a50997708f615e832c6d84353378180f0280 GIT binary patch literal 552 zcmV+@0@wW?iwFSK#Bfyr1MQVxZ<{a_#q*p`kvCq}%r*v8q&^TpDl3635OsTsSi@LU z22r37`}VUTaYD$pRw944-Jc?XkFPQ0>Kw14r{^e%i}$_Lff$-X>#M3Xt{ZxoC^E&A z5MGC|ig9nCoba6lFGU%x2ZLU;_`b}3Q}?I&zm(Os|EnmClXVth#pl)B|IRAP7AMMdRw8svL}te)>+`D4TJf;&k;wP3i85!f4nFKkqBVQQQH)Y=Ga&TW=dieZ}m z%nP@xjL;bEo@!2gZ~nm_ZD*a}Vg7OEhXx-r_(yuyqhp2lLg7!(3Or2nrzqtgHcZRK zyR0BhMd}Clw(GLmJk673R{vkK3ExWUht8ONKhku1t5dCdFE%C!D>q2JL9F7^P2WTK zzeuB!2f&XD_+L{G@}J5C{C^gj{uicwga5_EYy6MVVE|N0BLRdWBA`;58L*RfAy6;e zr9d^_i-CH6F9&cd2P&nLAdt5~fQc^O>R7(cAQ1jfqGeWm$=CUX&wo_=A7SwSIXJuj zTlR0czh(Zm_m5cr!1)Kpf0ggMuss&G$GXgZ=sImL5dPovt9$pq?fl1F$Fimn@c%i0 q^Z(@MKh~+LE7u+b0000000000000000002MKgCa859^TtC;$NH%NR8P literal 0 HcmV?d00001 diff --git a/install/rhel/7/packages/default.pkg b/install/rhel/7/packages/default.pkg new file mode 100644 index 000000000..3df21d3df --- /dev/null +++ b/install/rhel/7/packages/default.pkg @@ -0,0 +1,19 @@ +WEB_TEMPLATE='default' +BACKEND_TEMPLATE='default' +PROXY_TEMPLATE='default' +DNS_TEMPLATE='default' +WEB_DOMAINS='100' +WEB_ALIASES='100' +DNS_DOMAINS='100' +DNS_RECORDS='100' +MAIL_DOMAINS='100' +MAIL_ACCOUNTS='100' +DATABASES='100' +CRON_JOBS='100' +DISK_QUOTA='10000' +BANDWIDTH='100000' +NS='ns1.localhost.ltd,ns2.localhost.ltd' +SHELL='nologin' +BACKUPS='3' +TIME='11:46:50' +DATE='2015-06-05' diff --git a/install/rhel/7/packages/gainsboro.pkg b/install/rhel/7/packages/gainsboro.pkg new file mode 100644 index 000000000..2b66b7d17 --- /dev/null +++ b/install/rhel/7/packages/gainsboro.pkg @@ -0,0 +1,19 @@ +WEB_TEMPLATE='default' +BACKEND_TEMPLATE='default' +PROXY_TEMPLATE='default' +DNS_TEMPLATE='default' +WEB_DOMAINS='10' +WEB_ALIASES='10' +DNS_DOMAINS='10' +DNS_RECORDS='10' +MAIL_DOMAINS='10' +MAIL_ACCOUNTS='10' +DATABASES='10' +CRON_JOBS='10' +DISK_QUOTA='10000' +BANDWIDTH='10000' +NS='ns1.localhost.ltd,ns2.localhost.ltd' +SHELL='nologin' +BACKUPS='1' +TIME='11:31:30' +DATE='2015-06-05' diff --git a/install/rhel/7/packages/palegreen.pkg b/install/rhel/7/packages/palegreen.pkg new file mode 100644 index 000000000..b17e5e1b2 --- /dev/null +++ b/install/rhel/7/packages/palegreen.pkg @@ -0,0 +1,19 @@ +WEB_TEMPLATE='hosting' +BACKEND_TEMPLATE='default' +PROXY_TEMPLATE='hosting' +DNS_TEMPLATE='default' +WEB_DOMAINS='50' +WEB_ALIASES='50' +DNS_DOMAINS='50' +DNS_RECORDS='50' +MAIL_DOMAINS='50' +MAIL_ACCOUNTS='50' +DATABASES='50' +CRON_JOBS='50' +DISK_QUOTA='50000' +BANDWIDTH='50000' +NS='ns1.localhost.ltd,ns2.localhost.ltd' +SHELL='nologin' +BACKUPS='5' +TIME='07:49:47' +DATE='2015-06-05' diff --git a/install/rhel/7/packages/slategrey.pkg b/install/rhel/7/packages/slategrey.pkg new file mode 100644 index 000000000..cc9ef423c --- /dev/null +++ b/install/rhel/7/packages/slategrey.pkg @@ -0,0 +1,19 @@ +WEB_TEMPLATE='default' +BACKEND_TEMPLATE='default' +PROXY_TEMPLATE='default' +DNS_TEMPLATE='default' +WEB_DOMAINS='100' +WEB_ALIASES='100' +DNS_DOMAINS='100' +DNS_RECORDS='100' +MAIL_DOMAINS='100' +MAIL_ACCOUNTS='100' +DATABASES='100' +CRON_JOBS='100' +DISK_QUOTA='10000' +BANDWIDTH='100000' +NS='ns1.localhost.ltd,ns2.localhost.ltd' +SHELL='nologin' +BACKUPS='3' +TIME='12:39:13' +DATE='2015-06-05' diff --git a/install/rhel/7/pga/config.inc.php b/install/rhel/7/pga/config.inc.php new file mode 100644 index 000000000..1eec9776c --- /dev/null +++ b/install/rhel/7/pga/config.inc.php @@ -0,0 +1,159 @@ + diff --git a/install/rhel/7/pga/phpPgAdmin.conf b/install/rhel/7/pga/phpPgAdmin.conf new file mode 100644 index 000000000..4f6ea1b53 --- /dev/null +++ b/install/rhel/7/pga/phpPgAdmin.conf @@ -0,0 +1,14 @@ +# +# This configuration file maps the phpPgAdmin directory into the URL space. +# By default this application is only accessible from the local host. +# + +Alias /phpPgAdmin /usr/share/phpPgAdmin +Alias /phppgadmin /usr/share/phpPgAdmin + + + Order deny,allow + Deny from all + Allow from 127.0.0.1 + Allow from all + diff --git a/install/rhel/7/php-fpm/www.conf b/install/rhel/7/php-fpm/www.conf new file mode 100644 index 000000000..260109d8f --- /dev/null +++ b/install/rhel/7/php-fpm/www.conf @@ -0,0 +1,10 @@ +[www] +listen = 127.0.0.1:9000 +listen.allowed_clients = 127.0.0.1 +user = apache +group = apache +pm = dynamic +pm.max_children = 50 +pm.start_servers = 5 +pm.min_spare_servers = 3 +pm.max_spare_servers = 35 diff --git a/install/rhel/7/pma/config.inc.conf b/install/rhel/7/pma/config.inc.conf new file mode 100644 index 000000000..47ae207e4 --- /dev/null +++ b/install/rhel/7/pma/config.inc.conf @@ -0,0 +1,143 @@ +. + * + * @package phpMyAdmin + */ + +/* + * This is needed for cookie based authentication to encrypt password in + * cookie + */ +$cfg['blowfish_secret'] = '%blowfish_secret%'; /* YOU MUST FILL IN THIS FOR COOKIE AUTH! */ + +/* + * Servers configuration + */ +$i = 0; + +/* + * First server + */ +$i++; +/* Authentication type */ +$cfg['Servers'][$i]['auth_type'] = 'cookie'; +/* Server parameters */ +$cfg['Servers'][$i]['host'] = 'localhost'; +$cfg['Servers'][$i]['connect_type'] = 'tcp'; +$cfg['Servers'][$i]['compress'] = false; +/* Select mysqli if your server has it */ +$cfg['Servers'][$i]['extension'] = 'mysql'; +$cfg['Servers'][$i]['AllowNoPassword'] = false; + +/* + * phpMyAdmin configuration storage settings. + */ + +/* User used to manipulate with storage */ +// $cfg['Servers'][$i]['controluser'] = 'pma'; +// $cfg['Servers'][$i]['controlpass'] = 'pmapass'; + +/* Storage database and tables */ +// $cfg['Servers'][$i]['pmadb'] = 'phpmyadmin'; +// $cfg['Servers'][$i]['bookmarktable'] = 'pma_bookmark'; +// $cfg['Servers'][$i]['relation'] = 'pma_relation'; +// $cfg['Servers'][$i]['table_info'] = 'pma_table_info'; +// $cfg['Servers'][$i]['table_coords'] = 'pma_table_coords'; +// $cfg['Servers'][$i]['pdf_pages'] = 'pma_pdf_pages'; +// $cfg['Servers'][$i]['column_info'] = 'pma_column_info'; +// $cfg['Servers'][$i]['history'] = 'pma_history'; +// $cfg['Servers'][$i]['tracking'] = 'pma_tracking'; +// $cfg['Servers'][$i]['designer_coords'] = 'pma_designer_coords'; +// $cfg['Servers'][$i]['userconfig'] = 'pma_userconfig'; +/* Contrib / Swekey authentication */ +// $cfg['Servers'][$i]['auth_swekey_config'] = '/etc/swekey-pma.conf'; + +/* + * End of servers configuration + */ + +/* + * Directories for saving/loading files from server + */ +$cfg['UploadDir'] = ''; +$cfg['SaveDir'] = ''; + +/** + * Defines whether a user should be displayed a "show all (records)" + * button in browse mode or not. + * default = false + */ +//$cfg['ShowAll'] = true; + +/** + * Number of rows displayed when browsing a result set. If the result + * set contains more rows, "Previous" and "Next". + * default = 30 + */ +//$cfg['MaxRows'] = 50; + +/** + * Use graphically less intense menu tabs + * default = false + */ +//$cfg['LightTabs'] = true; + +/** + * disallow editing of binary fields + * valid values are: + * false allow editing + * 'blob' allow editing except for BLOB fields + * 'all' disallow editing + * default = blob + */ +//$cfg['ProtectBinary'] = 'false'; + +/** + * Default language to use, if not browser-defined or user-defined + * (you find all languages in the locale folder) + * uncomment the desired line: + * default = 'en' + */ +//$cfg['DefaultLang'] = 'en'; +//$cfg['DefaultLang'] = 'de'; + +/** + * default display direction (horizontal|vertical|horizontalflipped) + */ +//$cfg['DefaultDisplay'] = 'vertical'; + + +/** + * How many columns should be used for table display of a database? + * (a value larger than 1 results in some information being hidden) + * default = 1 + */ +//$cfg['PropertiesNumColumns'] = 2; + +/** + * Set to true if you want DB-based query history.If false, this utilizes + * JS-routines to display query history (lost by window close) + * + * This requires configuration storage enabled, see above. + * default = false + */ +//$cfg['QueryHistoryDB'] = true; + +/** + * When using DB-based query history, how many entries should be kept? + * + * default = 25 + */ +//$cfg['QueryHistoryMax'] = 100; + +/* + * You can find more configuration options in Documentation.html + * or here: http://wiki.phpmyadmin.net/pma/Config + */ +?> diff --git a/install/rhel/7/pma/phpMyAdmin.conf b/install/rhel/7/pma/phpMyAdmin.conf new file mode 100644 index 000000000..0049ef2b7 --- /dev/null +++ b/install/rhel/7/pma/phpMyAdmin.conf @@ -0,0 +1,39 @@ +# phpMyAdmin - Web based MySQL browser written in php +# +# Allows only localhost by default +# +# But allowing phpMyAdmin to anyone other than localhost should be considered +# dangerous unless properly secured by SSL + +Alias /phpMyAdmin /usr/share/phpMyAdmin +Alias /phpmyadmin /usr/share/phpMyAdmin + + + Order Deny,Allow + Deny from All + Allow from All + + + + Order Deny,Allow + Deny from All + Allow from All + + +# This directory does not require access over HTTP - taken from the original +# phpMyAdmin upstream tarball +# + + Order Deny,Allow + Deny from All + Allow from None + + +# This configuration prevents mod_security at phpMyAdmin directories from +# filtering SQL etc. This may break your mod_security implementation. +# +# +# +# SecRuleInheritance Off +# +# diff --git a/install/rhel/7/postgresql/pg_hba.conf b/install/rhel/7/postgresql/pg_hba.conf new file mode 100644 index 000000000..1ba43941b --- /dev/null +++ b/install/rhel/7/postgresql/pg_hba.conf @@ -0,0 +1,11 @@ +# "local" is for Unix domain socket connections only +local all all ident + +# IPv4 local connections: +host all all 127.0.0.1/32 md5 + +# IPv6 local connections: +host all all ::1/128 md5 + +# Others +host all all 0.0.0.0/0 md5 diff --git a/install/rhel/7/proftpd/proftpd.conf b/install/rhel/7/proftpd/proftpd.conf new file mode 100644 index 000000000..a889ec82b --- /dev/null +++ b/install/rhel/7/proftpd/proftpd.conf @@ -0,0 +1,32 @@ +ServerName "FTP" +ServerIdent on "FTP Server ready." +ServerAdmin root@localhost +DefaultServer on +DefaultRoot ~ !adm + + + VRootEngine on + VRootAlias /etc/security/pam_env.conf etc/security/pam_env.conf + + +AuthPAMConfig proftpd +AuthOrder mod_auth_pam.c* mod_auth_unix.c +UseReverseDNS off +User nobody +Group nobody +MaxInstances 20 +UseSendfile off +LogFormat default "%h %l %u %t \"%r\" %s %b" +LogFormat auth "%v [%P] %h %t \"%r\" %s" +ListOptions -a +RequireValidShell off +PassivePorts 12000 12100 + + + Umask 002 + IdentLookups off + AllowOverwrite yes + + AllowAll + + diff --git a/install/rhel/7/remi-release.rpm b/install/rhel/7/remi-release.rpm new file mode 100644 index 0000000000000000000000000000000000000000..7eea9560b04fd594a5c12db9d740ff4100b6fce8 GIT binary patch literal 5764 zcmbVP2Urx>x1Xh`tQs&17Bq|o5F$g{28x1$AcBo1MFO+CvoNx|v&`<&W5AAxU2HL; zAO<^u7;I0BfExYVP>}>If3f$dsEG2;T?R{%_kBL+`|h0i-E+=8W$v7F=fSpze;Q+O z@mNYl6D*~qNG(N3oLvbwXG$q?M$?G@DHjhj{kzzr9k+ShTvwo%V2px+o{zz>0K?rm z3a^ffR*-}nKCvw?!X@gtx}z8VH^zPGU{78=D{ zfK6lquvgzl^fHR~#C|aQtJumeo_Wi>tZ5Gn`dailTJ!?j;CGyC9FiNYO1Petw2Jt7 z``r^|6I~SwnTV20r0yb-z)d2OkrIVM;VG926r@5Vq6Bg`iCpL*1!EZ2=j1tJk0>^^ zr>^|?DvOJ2`xg9*{qIj=8>Txsq(+=Qc5Qdlf2thxHyW&xE>~ec+MXMA@!HA3i)9Z> zuTfS9&y_unA8%OK{5%jt-rC#Sm%y{d2YHoX7$4=*8wTWsUy1lI6&!vE6zmz5bGVJ;pWyHt4&UVPTMi??VLcP@&EVfNpy0m=iWRoH z5n2af6boR(?njsp7<7!09>Qo}LjH_I2EJ3#WAINS#) z_+Y#pDDuw|DAGT}@%sWr@|QT=kK-eMVcw)aM+b6r07ol0>HrkhH)#fn*7pDk>zkl_ zfUhQ=Kw%wIoWsLAaMvRo4gd=BX2C#FJmWYV#^FGqpl>#f!;u_6p2JZ<5kHZ`NDi$x zpTn^nzcXLoa(ElZmjVU<%}xVF{>wWsU%_FD!$}-Q^B~Vxb6Ck?4Tp6=!9Ks!zMjLK z_EP|Zzx>reQM{=fznH^m97gX8_`R2N80DMiiz!&_!;*G&G~lLTw6u<4(=p$VB;*v1)HIBq#g!B;KT@hWQlT>_VPT217T1unBr<_Q z3+qT)t;N&zs(-PfOQi52$kY%#Wby<&i1DWwtzilj7psgjoA0h0spBr08t z>$Q{|*D<)3PEaEOl{23o26FFR#=#9Wqr)jRDOG|nsnAg@4!-C}rP2_n6Ru_ObViS> z^jaNSk&i49M27}iX`~?yjOJZhAPi^B7u+F}^^~qNLYh+RP#zStERhByke-h-`eDBG zI$B9D*x*W9txv<$49UvSSB;r^ z!6(z2Q=Ego5iICtoD=d_>MD1W3uUCMP(Zm$LwJC3b9b(DRZS{ zVuib_L?94J7@d_OmtOjk0bL0CJEOra*Tl!8uk#9%9Rs&OKL+QR_K+zo&IlCKxo0~JB(8#u`P>T$okO|X#rVMbd3cmbZ zRZwH!s=zn%d;-(rssi-~ssf5*d;&(*SNYGFR^=Z#*yn@2iF-j23ia{t*u@?D7470t zIDs2n!ah-0MrB`3xQLXXuDNLr3@-I)cy8asLb*)S6v{H@{IFuP&lc*7iKWKIz zOpE?GEvKaV1X`_N3@ko@%UMQ)D@a<&q)@Di(j_u-oU8c`+EiL6OGLeuW%O#0l+tQP zSRZ^q7CXIwc8Qa?ie_1cg?^^P!$X2WN=>C2j6mmt&Z>hM_|kDHDaUQOUpBA^T^NL* zilZKjJBUIl7R|~TN~<2K!&4bH30VXY@DJx|JZFou(P0?pItkPs?Z0)Bj%2Y^vYv)| zg@07q2z(;=3Wo{Yfl@&#a9JV=oeT~IP|xr{KQ3mJ&W@N-)kJ0U-GH;!yBgc=?=|b= z5{4uV7Y|Ad0jC%uXlxXeRrqCnmk7*-(#c#jNwf=uLnLStTsme@!!;ahoaHVUG07b# z5^zF8Yv8Cd6^=4+*EkV=asHD+!UFxH;zB2dhxm>i31SK=O-32cE?NL^?vW)C8kW&f zGC0x^S{*c3Sc%Y(EU6l))oKW-UZJ3XLuXJUg=P~X5nTt}s$wds8%aiFH1w=%uX}7X!Upru&*0aU^PH}l*L4{di}mZ-WFmEcrSG1->7e

        ?&SjP6`=nkw zTwAsud-T$Gs@;S&9{(vEdRn1=IMZfOjBUTj#hVtDd+_@83Z@>8p?+}C+cl4CcwCTm ze8Q~5G5)4|225GllKPFceVN6rsL`VGnaxqT*P9l^&dpvC+4a$n!jffEmK@j=zQ(3t zuTAOFO&k39b7zm39NznEbPwILfNt30;bVWXuDjDGW6;}*i1A&P_4HI8e5^E!HM$Y` z%b|V0K3cYyZ=Dt-72I7n?pEQ5HJXx~vf%j($~_Lp+GQV%yuMbXn&184Mf>SW%hTIR z3mo>U_PjkaV{p#|&-(v%eJ&~4_SBE~{;Qzy6~wKuEpr?bE_+0{T1>p#th60A)643+ zx|e$jCa#eLoftY|X~9Lo{-T2yBsZ;JG+iq2nc7MlKeNvBT7LS_^+it1j#G(G9gA+; z58BGpoQv_T-&;A(En^9h(n~35I=c5vp-kMK+1ro(ers|?ruWqrqvvLp!kRT^u{(y` z6V2(L7lJvr~Ts(>h4E*QAOIH$tnFvH45_>B*XnVoWc(usRz*KcP{&&z++ z_m5?^-Q?R;v-b-e4>bGoS6ZD4FfvZ_n^9QTrhXCiHXpb8ZJXmM+o}-1+WR}r{`+k& zD{KDgYq#9Hof0*zeD!#%Z!eB~=n!^cZF=OS6D3I=uh#u)Q@VY@zLMX(hYie|5q;@I zbuT+hVn032sfjm|2s2(@xOlW)URL^S%&)t$Hjgwr+iT2CZ*9`m=^I|0m&6R%_-aF{ z&}Oi$jlUjC{(5b<3o#Z!M$b#i$Xnv6EAq!3dcHY+U1FP8*Ou_5h4;T|+_2xN>PS+b z8k^lucFM8CwVDmL>YrvYhPaF>h8?cS=xgG`})S$RlAOTq4QjB z-q28g(mHU!_~h0*hds{y^4n_a==w{M_A6ia{&D@@>hEe6ggVUXQ`2&_?a~$#W3hK+ zYRjptyGDI3<&Epk_P$X$d~@+%xr)>ib4F|wW|qXf+Oo+qFEf9|pwgoaGi<^(&&fVN z=22!##6X9L*1($I-tqd4g)7a>n|?QaeV}IFP)6X96xMUjq^%J}ydfjjoA5Rj{+T~yOXk@( zu~V0A^4a^~kIO^S)^r^?Yg19~!#iIR$=F;ATj7n^WpBRCh%5Z&-h{~o!wPhb0drdg zqa~?dUzmL~`>NU2X+dmO`;?vaZ#hTphrAQ(YW`TaD@|py zWzCxHgO)5^NViw6Jbv?BO@9B{$KQ0hb=|x@)^F*vLTl?d-xPKDfUgptKZ!1Lv#D23 zt~lQ^>_En>^_F!d|#>Zj&E!V<57Oj zHU%rJ=pl7#_3kDdv!kjgrSOP0J@y>*4PQTNLFARZ_QTXQMPk{a@{HnPIbQ`>UKss& g?w6Vf=>v>+rN?<24BH%=6SL>em4Svv&yR}!Ul=4yT>t<8 literal 0 HcmV?d00001 diff --git a/install/rhel/7/roundcube/config.inc.php b/install/rhel/7/roundcube/config.inc.php new file mode 100644 index 000000000..0c82b1bc1 --- /dev/null +++ b/install/rhel/7/roundcube/config.inc.php @@ -0,0 +1,33 @@ + diff --git a/install/rhel/7/roundcube/main.inc.php b/install/rhel/7/roundcube/main.inc.php new file mode 100644 index 000000000..a27c306eb --- /dev/null +++ b/install/rhel/7/roundcube/main.inc.php @@ -0,0 +1,40 @@ + + Order Deny,Allow + Deny from all + Allow from all + diff --git a/install/rhel/7/roundcube/vesta.php b/install/rhel/7/roundcube/vesta.php new file mode 100644 index 000000000..b8695bd17 --- /dev/null +++ b/install/rhel/7/roundcube/vesta.php @@ -0,0 +1,59 @@ + + */ + +class rcube_vesta_password +{ + function save($curpass, $passwd) + { + $rcmail = rcmail::get_instance(); + $vesta_host = $rcmail->config->get('password_vesta_host'); + + if (empty($vesta_host)) + { + $vesta_host = 'localhost'; + } + + $vesta_port = $rcmail->config->get('password_vesta_port'); + if (empty($vesta_port)) + { + $vesta_port = '8083'; + } + + $postvars = array( + 'email' => $_SESSION['username'], + 'password' => $curpass, + 'new' => $passwd + ); + + $postdata = http_build_query($postvars); + + $send = 'POST /reset/mail/ HTTP/1.1' . PHP_EOL; + $send .= 'Host: ' . $vesta_host . PHP_EOL; + $send .= 'User-Agent: PHP Script' . PHP_EOL; + $send .= 'Content-length: ' . strlen($postdata) . PHP_EOL; + $send .= 'Content-type: application/x-www-form-urlencoded' . PHP_EOL; + $send .= 'Connection: close' . PHP_EOL; + $send .= PHP_EOL; + $send .= $postdata . PHP_EOL . PHP_EOL; + + $fp = fsockopen('ssl://' . $vesta_host, $vesta_port); + fputs($fp, $send); + $result = fread($fp, 2048); + fclose($fp); + + if(strpos($result, 'ok') && !strpos($result, 'error')) + { + return PASSWORD_SUCCESS; + } + else { + return PASSWORD_ERROR; + } + + } +} diff --git a/install/rhel/7/sudo/admin b/install/rhel/7/sudo/admin new file mode 100644 index 000000000..47e16098c --- /dev/null +++ b/install/rhel/7/sudo/admin @@ -0,0 +1,7 @@ +# Created by vesta installer +Defaults env_keep="VESTA" +Defaults:admin !syslog +Defaults:admin !requiretty + +admin ALL=(ALL) ALL +admin ALL=NOPASSWD:/usr/local/vesta/bin/* diff --git a/install/rhel/7/templates.tar.gz b/install/rhel/7/templates.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..fd86c50695d8193d1085ecc07a66b0355032bae9 GIT binary patch literal 12995 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 + + + Awstats log analyzer + + + + + + diff --git a/install/rhel/7/templates/web/awstats/nav.tpl b/install/rhel/7/templates/web/awstats/nav.tpl new file mode 100755 index 000000000..f29bed68b --- /dev/null +++ b/install/rhel/7/templates/web/awstats/nav.tpl @@ -0,0 +1,23 @@ + + + Awstats navigation + + + + + + + + +
        vesta
        + +
        +
        + + diff --git a/install/rhel/7/templates/web/httpd/basedir.stpl b/install/rhel/7/templates/web/httpd/basedir.stpl new file mode 100755 index 000000000..b90818f14 --- /dev/null +++ b/install/rhel/7/templates/web/httpd/basedir.stpl @@ -0,0 +1,41 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %sdocroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + #SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + AllowOverride All + SSLRequireSSL + Options +Includes -Indexes +ExecCGI + php_admin_value open_basedir %docroot% + + + AllowOverride All + + SSLEngine on + SSLVerifyClient none + SSLCertificateFile %ssl_crt% + SSLCertificateKeyFile %ssl_key% + %ssl_ca_str%SSLCertificateChainFile %ssl_ca% + + + RMode config + RUidGid %user% %group% + RGroups apache + + + AssignUserID %user% %group% + + + IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* + + + diff --git a/install/rhel/7/templates/web/httpd/basedir.tpl b/install/rhel/7/templates/web/httpd/basedir.tpl new file mode 100755 index 000000000..53188221e --- /dev/null +++ b/install/rhel/7/templates/web/httpd/basedir.tpl @@ -0,0 +1,35 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %docroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + #SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + AllowOverride All + Options +Includes -Indexes +ExecCGI + php_admin_value open_basedir %docroot% + + + AllowOverride All + + + + RMode config + RUidGid %user% %group% + RGroups apache + + + AssignUserID %user% %group% + + + IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + + + diff --git a/install/rhel/7/templates/web/httpd/default.stpl b/install/rhel/7/templates/web/httpd/default.stpl new file mode 100755 index 000000000..1134f39a8 --- /dev/null +++ b/install/rhel/7/templates/web/httpd/default.stpl @@ -0,0 +1,40 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %sdocroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + #SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + AllowOverride All + SSLRequireSSL + Options +Includes -Indexes +ExecCGI + + + AllowOverride All + + SSLEngine on + SSLVerifyClient none + SSLCertificateFile %ssl_crt% + SSLCertificateKeyFile %ssl_key% + %ssl_ca_str%SSLCertificateChainFile %ssl_ca% + + + RMode config + RUidGid %user% %group% + RGroups apache + + + AssignUserID %user% %group% + + + IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* + + + diff --git a/install/rhel/7/templates/web/httpd/default.tpl b/install/rhel/7/templates/web/httpd/default.tpl new file mode 100755 index 000000000..78caf0b8c --- /dev/null +++ b/install/rhel/7/templates/web/httpd/default.tpl @@ -0,0 +1,34 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %docroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + #SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + AllowOverride All + Options +Includes -Indexes +ExecCGI + + + AllowOverride All + + + + RMode config + RUidGid %user% %group% + RGroups apache + + + AssignUserID %user% %group% + + + IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + + + diff --git a/install/rhel/7/templates/web/httpd/hosting.stpl b/install/rhel/7/templates/web/httpd/hosting.stpl new file mode 100755 index 000000000..28ba49d59 --- /dev/null +++ b/install/rhel/7/templates/web/httpd/hosting.stpl @@ -0,0 +1,49 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %sdocroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + #SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + AllowOverride All + SSLRequireSSL + Options +Includes -Indexes +ExecCGI + php_admin_value upload_tmp_dir %home%/%user%/tmp + php_admin_value upload_max_filesize 10M + php_admin_value max_execution_time 20 + php_admin_value post_max_size 8M + php_admin_value memory_limit 32M + php_admin_flag mysql.allow_persistent off + php_admin_flag safe_mode off + php_admin_value session.save_path %home%/%user%/tmp + php_admin_value sendmail_path '/usr/sbin/sendmail -t -i -f %email%' + + + AllowOverride All + + php_admin_value open_basedir %home%/%user%/web:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpMyAdmin:/etc/phpmyadmin:/etc/roundcubemail:/etc/roundcube:/var/lib/roundcube + SSLEngine on + SSLVerifyClient none + SSLCertificateFile %ssl_crt% + SSLCertificateKeyFile %ssl_key% + %ssl_ca_str%SSLCertificateChainFile %ssl_ca% + + RMode config + RUidGid %user% %group% + RGroups apache + + + AssignUserID %user% %group% + + + IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* + + + diff --git a/install/rhel/7/templates/web/httpd/hosting.tpl b/install/rhel/7/templates/web/httpd/hosting.tpl new file mode 100755 index 000000000..3a9249701 --- /dev/null +++ b/install/rhel/7/templates/web/httpd/hosting.tpl @@ -0,0 +1,43 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %docroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + #SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + AllowOverride All + Options +Includes -Indexes +ExecCGI + php_admin_value upload_tmp_dir %home%/%user%/tmp + php_admin_value upload_max_filesize 10M + php_admin_value max_execution_time 20 + php_admin_value post_max_size 8M + php_admin_value memory_limit 32M + php_admin_flag mysql.allow_persistent off + php_admin_flag safe_mode off + php_admin_value session.save_path %home%/%user%/tmp + php_admin_value sendmail_path '/usr/sbin/sendmail -t -i -f %email%' + + + AllowOverride All + + php_admin_value open_basedir %home%/%user%/web:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpMyAdmin:/etc/phpmyadmin:/etc/roundcubemail:/etc/roundcube:/var/lib/roundcube + + RMode config + RUidGid %user% %group% + RGroups apache + + + AssignUserID %user% %group% + + + IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + + + diff --git a/install/rhel/7/templates/web/httpd/phpcgi.sh b/install/rhel/7/templates/web/httpd/phpcgi.sh new file mode 100755 index 000000000..6565e103d --- /dev/null +++ b/install/rhel/7/templates/web/httpd/phpcgi.sh @@ -0,0 +1,16 @@ +#!/bin/bash +# Adding php wrapper +user="$1" +domain="$2" +ip="$3" +home_dir="$4" +docroot="$5" + +wrapper_script='#!/usr/bin/php-cgi -cphp5-cgi.ini' +wrapper_file="$home_dir/$user/web/$domain/cgi-bin/php" + +echo "$wrapper_script" > $wrapper_file +chown $user:$user $wrapper_file +chmod -f 751 $wrapper_file + +exit 0 diff --git a/install/rhel/7/templates/web/httpd/phpcgi.stpl b/install/rhel/7/templates/web/httpd/phpcgi.stpl new file mode 100755 index 000000000..924e869ec --- /dev/null +++ b/install/rhel/7/templates/web/httpd/phpcgi.stpl @@ -0,0 +1,35 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %sdocroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + SuexecUserGroup %user% %group% + CustomLog /var/log/httpd/domains/%domain%.bytes bytes + CustomLog /var/log/httpd/domains/%domain%.log combined + ErrorLog /var/log/httpd/domains/%domain%.error.log + + SSLRequireSSL + AllowOverride All + Options +Includes -Indexes +ExecCGI + Action phpcgi-script /cgi-bin/php + + SetHandler phpcgi-script + + + + AllowOverride All + + SSLEngine on + SSLVerifyClient none + SSLCertificateFile %ssl_crt% + SSLCertificateKeyFile %ssl_key% + %ssl_ca_str%SSLCertificateChainFile %ssl_ca% + + IncludeOptional %home%/%user%/conf/web/shttpd.%domain%.conf* + + + diff --git a/install/rhel/7/templates/web/httpd/phpcgi.tpl b/install/rhel/7/templates/web/httpd/phpcgi.tpl new file mode 100755 index 000000000..bcefbfc4a --- /dev/null +++ b/install/rhel/7/templates/web/httpd/phpcgi.tpl @@ -0,0 +1,28 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %docroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + SuexecUserGroup %user% %group% + CustomLog /var/log/httpd/domains/%domain%.bytes bytes + CustomLog /var/log/httpd/domains/%domain%.log combined + ErrorLog /var/log/httpd/domains/%domain%.error.log + + AllowOverride All + Options +Includes -Indexes +ExecCGI + Action phpcgi-script /cgi-bin/php + + SetHandler phpcgi-script + + + + AllowOverride All + + IncludeOptional %home%/%user%/conf/web/httpd.%domain%.conf* + + + diff --git a/install/rhel/7/templates/web/httpd/phpfcgid.sh b/install/rhel/7/templates/web/httpd/phpfcgid.sh new file mode 100755 index 000000000..e80582492 --- /dev/null +++ b/install/rhel/7/templates/web/httpd/phpfcgid.sh @@ -0,0 +1,22 @@ +#!/bin/bash +# Adding php wrapper +user="$1" +domain="$2" +ip="$3" +home_dir="$4" +docroot="$5" + +wrapper_script="#!/bin/sh +PHPRC=/usr/local/lib +export PHPRC +export PHP_FCGI_MAX_REQUESTS=1000 +export PHP_FCGI_CHILDREN=20 +exec /usr/bin/php-cgi +" +wrapper_file="$home_dir/$user/web/$domain/cgi-bin/fcgi-starter" + +echo "$wrapper_script" > $wrapper_file +chown $user:$user $wrapper_file +chmod -f 751 $wrapper_file + +exit 0 diff --git a/install/rhel/7/templates/web/httpd/phpfcgid.stpl b/install/rhel/7/templates/web/httpd/phpfcgid.stpl new file mode 100755 index 000000000..64bdb1b07 --- /dev/null +++ b/install/rhel/7/templates/web/httpd/phpfcgid.stpl @@ -0,0 +1,36 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %sdocroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + SuexecUserGroup %user% %group% + CustomLog /var/log/httpd/domains/%domain%.bytes bytes + CustomLog /var/log/httpd/domains/%domain%.log combined + ErrorLog /var/log/httpd/domains/%domain%.error.log + + SSLRequireSSL + AllowOverride All + Options +Includes -Indexes +ExecCGI + + SetHandler fcgid-script + + FCGIWrapper %home%/%user%/web/%domain%/cgi-bin/fcgi-starter .php + + + AllowOverride All + + php_admin_value open_basedir none + SSLEngine on + SSLVerifyClient none + SSLCertificateFile %ssl_crt% + SSLCertificateKeyFile %ssl_key% + %ssl_ca_str%SSLCertificateChainFile %ssl_ca% + + IncludeOptional %home%/%user%/conf/web/shttpd.%domain%.conf* + + + diff --git a/install/rhel/7/templates/web/httpd/phpfcgid.tpl b/install/rhel/7/templates/web/httpd/phpfcgid.tpl new file mode 100755 index 000000000..d48da5eef --- /dev/null +++ b/install/rhel/7/templates/web/httpd/phpfcgid.tpl @@ -0,0 +1,28 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %docroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + SuexecUserGroup %user% %group% + CustomLog /var/log/httpd/domains/%domain%.bytes bytes + CustomLog /var/log/httpd/domains/%domain%.log combined + ErrorLog /var/log/httpd/domains/%domain%.error.log + + AllowOverride All + Options +Includes -Indexes +ExecCGI + + SetHandler fcgid-script + + FCGIWrapper %home%/%user%/web/%domain%/cgi-bin/fcgi-starter .php + + + AllowOverride All + + IncludeOptional %home%/%user%/conf/web/httpd.%domain%.conf* + + + diff --git a/install/rhel/7/templates/web/nginx/caching.sh b/install/rhel/7/templates/web/nginx/caching.sh new file mode 100755 index 000000000..6eb9126db --- /dev/null +++ b/install/rhel/7/templates/web/nginx/caching.sh @@ -0,0 +1,12 @@ +#!/bin/bash + +user=$1 +domain=$2 +ip=$3 +home=$4 +docroot=$5 + +str="proxy_cache_path /var/cache/nginx/$domain levels=2" +str="$str keys_zone=$domain:10m inactive=60m max_size=512m;" +echo "$str" >> /etc/nginx/conf.d/01_caching_pool.conf + diff --git a/install/rhel/7/templates/web/nginx/caching.stpl b/install/rhel/7/templates/web/nginx/caching.stpl new file mode 100755 index 000000000..1109c924f --- /dev/null +++ b/install/rhel/7/templates/web/nginx/caching.stpl @@ -0,0 +1,44 @@ +server { + listen %ip%:%proxy_ssl_port%; + server_name %domain_idn% %alias_idn%; + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + error_log /var/log/%web_system%/domains/%domain%.error.log error; + + location / { + proxy_pass http://%ip%:%web_port%; + + proxy_cache %domain%; + proxy_cache_valid 15m; + proxy_cache_valid 404 1m; + proxy_no_cache $no_cache; + proxy_cache_bypass $no_cache; + proxy_cache_bypass $cookie_session $http_x_update; + + location ~* ^.+\.(%proxy_extentions%)$ { + proxy_cache off; + root %docroot%; + access_log /var/log/%web_system%/domains/%domain%.log combined; + access_log /var/log/%web_system%/domains/%domain%.bytes bytes; + expires max; + try_files $uri @fallback; + } + } + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location @fallback { + proxy_pass http://%ip%:%web_port%; + } + + location ~ /\.ht {return 404;} + location ~ /\.svn/ {return 404;} + location ~ /\.git/ {return 404;} + location ~ /\.hg/ {return 404;} + location ~ /\.bzr/ {return 404;} + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/rhel/7/templates/web/nginx/caching.tpl b/install/rhel/7/templates/web/nginx/caching.tpl new file mode 100755 index 000000000..6d727c67f --- /dev/null +++ b/install/rhel/7/templates/web/nginx/caching.tpl @@ -0,0 +1,41 @@ +server { + listen %ip%:%proxy_port%; + server_name %domain_idn% %alias_idn%; + error_log /var/log/%web_system%/domains/%domain%.error.log error; + + location / { + proxy_pass http://%ip%:%web_port%; + + proxy_cache %domain%; + proxy_cache_valid 15m; + proxy_cache_valid 404 1m; + proxy_no_cache $no_cache; + proxy_cache_bypass $no_cache; + proxy_cache_bypass $cookie_session $http_x_update; + + location ~* ^.+\.(%proxy_extentions%)$ { + proxy_cache off; + root %docroot%; + access_log /var/log/%web_system%/domains/%domain%.log combined; + access_log /var/log/%web_system%/domains/%domain%.bytes bytes; + expires max; + try_files $uri @fallback; + } + } + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location @fallback { + proxy_pass http://%ip%:%web_port%; + } + + location ~ /\.ht {return 404;} + location ~ /\.svn/ {return 404;} + location ~ /\.git/ {return 404;} + location ~ /\.hg/ {return 404;} + location ~ /\.bzr/ {return 404;} + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/rhel/7/templates/web/nginx/default.stpl b/install/rhel/7/templates/web/nginx/default.stpl new file mode 100755 index 000000000..53ad8d1b8 --- /dev/null +++ b/install/rhel/7/templates/web/nginx/default.stpl @@ -0,0 +1,36 @@ +server { + listen %ip%:%proxy_ssl_port%; + server_name %domain_idn% %alias_idn%; + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + error_log /var/log/httpd/domains/%domain%.error.log error; + + location / { + proxy_pass https://%ip%:%web_ssl_port%; + location ~* ^.+\.(%proxy_extentions%)$ { + root %sdocroot%; + access_log /var/log/httpd/domains/%domain%.log combined; + access_log /var/log/httpd/domains/%domain%.bytes bytes; + expires max; + try_files $uri @fallback; + } + } + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location @fallback { + proxy_pass https://%ip%:%web_ssl_port%; + } + + location ~ /\.ht {return 404;} + location ~ /\.svn/ {return 404;} + location ~ /\.git/ {return 404;} + location ~ /\.hg/ {return 404;} + location ~ /\.bzr/ {return 404;} + + include %home%/%user%/conf/web/snginx.%domain%.conf*; +} + diff --git a/install/rhel/7/templates/web/nginx/default.tpl b/install/rhel/7/templates/web/nginx/default.tpl new file mode 100755 index 000000000..c1fec114f --- /dev/null +++ b/install/rhel/7/templates/web/nginx/default.tpl @@ -0,0 +1,33 @@ +server { + listen %ip%:%proxy_port%; + server_name %domain_idn% %alias_idn%; + error_log /var/log/httpd/domains/%domain%.error.log error; + + location / { + proxy_pass http://%ip%:%web_port%; + location ~* ^.+\.(%proxy_extentions%)$ { + root %docroot%; + access_log /var/log/httpd/domains/%domain%.log combined; + access_log /var/log/httpd/domains/%domain%.bytes bytes; + expires max; + try_files $uri @fallback; + } + } + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location @fallback { + proxy_pass http://%ip%:%web_port%; + } + + location ~ /\.ht {return 404;} + location ~ /\.svn/ {return 404;} + location ~ /\.git/ {return 404;} + location ~ /\.hg/ {return 404;} + location ~ /\.bzr/ {return 404;} + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} + diff --git a/install/rhel/7/templates/web/nginx/hosting.sh b/install/rhel/7/templates/web/nginx/hosting.sh new file mode 100755 index 000000000..eeed37ef9 --- /dev/null +++ b/install/rhel/7/templates/web/nginx/hosting.sh @@ -0,0 +1,11 @@ +#!/bin/bash +# Changing public_html permission +user="$1" +domain="$2" +ip="$3" +home_dir="$4" +docroot="$5" + +chmod 755 $docroot + +exit 0 diff --git a/install/rhel/7/templates/web/nginx/hosting.stpl b/install/rhel/7/templates/web/nginx/hosting.stpl new file mode 100755 index 000000000..aca458a4b --- /dev/null +++ b/install/rhel/7/templates/web/nginx/hosting.stpl @@ -0,0 +1,38 @@ +server { + listen %ip%:%proxy_ssl_port%; + server_name %domain_idn% %alias_idn%; + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + error_log /var/log/httpd/domains/%domain%.error.log error; + + location / { + proxy_pass https://%ip%:%web_ssl_port%; + location ~* ^.+\.(%proxy_extentions%)$ { + root %sdocroot%; + access_log /var/log/httpd/domains/%domain%.log combined; + access_log /var/log/httpd/domains/%domain%.bytes bytes; + expires max; + try_files $uri @fallback; + } + } + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location @fallback { + proxy_pass https://%ip%:%web_ssl_port%; + } + + location ~ /\.ht {return 404;} + location ~ /\.svn/ {return 404;} + location ~ /\.git/ {return 404;} + location ~ /\.hg/ {return 404;} + location ~ /\.bzr/ {return 404;} + + disable_symlinks if_not_owner from=%docroot%; + + include %home%/%user%/conf/web/snginx.%domain%.conf*; +} + diff --git a/install/rhel/7/templates/web/nginx/hosting.tpl b/install/rhel/7/templates/web/nginx/hosting.tpl new file mode 100755 index 000000000..44d874962 --- /dev/null +++ b/install/rhel/7/templates/web/nginx/hosting.tpl @@ -0,0 +1,35 @@ +server { + listen %ip%:%proxy_port%; + server_name %domain_idn% %alias_idn%; + error_log /var/log/httpd/domains/%domain%.error.log error; + + location / { + proxy_pass http://%ip%:%web_port%; + location ~* ^.+\.(%proxy_extentions%)$ { + root %docroot%; + access_log /var/log/httpd/domains/%domain%.log combined; + access_log /var/log/httpd/domains/%domain%.bytes bytes; + expires max; + try_files $uri @fallback; + } + } + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location @fallback { + proxy_pass http://%ip%:%web_port%; + } + + location ~ /\.ht {return 404;} + location ~ /\.svn/ {return 404;} + location ~ /\.git/ {return 404;} + location ~ /\.hg/ {return 404;} + location ~ /\.bzr/ {return 404;} + + disable_symlinks if_not_owner from=%docroot%; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} + diff --git a/install/rhel/7/templates/web/nginx/php-fpm/cms_made_simple.stpl b/install/rhel/7/templates/web/nginx/php-fpm/cms_made_simple.stpl new file mode 100644 index 000000000..01d82b603 --- /dev/null +++ b/install/rhel/7/templates/web/nginx/php-fpm/cms_made_simple.stpl @@ -0,0 +1,51 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + try_files $uri $uri/ /index.php?page=$request_uri; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/rhel/7/templates/web/nginx/php-fpm/cms_made_simple.tpl b/install/rhel/7/templates/web/nginx/php-fpm/cms_made_simple.tpl new file mode 100644 index 000000000..af452d19f --- /dev/null +++ b/install/rhel/7/templates/web/nginx/php-fpm/cms_made_simple.tpl @@ -0,0 +1,47 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + try_files $uri $uri/ /index.php?page=$request_uri; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/rhel/7/templates/web/nginx/php-fpm/codeigniter2.stpl b/install/rhel/7/templates/web/nginx/php-fpm/codeigniter2.stpl new file mode 100644 index 000000000..a592a652d --- /dev/null +++ b/install/rhel/7/templates/web/nginx/php-fpm/codeigniter2.stpl @@ -0,0 +1,56 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + try_files $uri $uri/ /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location = /index.php { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME /var/www/html/ci$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + location ~ \.php$ { + return 444; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/rhel/7/templates/web/nginx/php-fpm/codeigniter2.tpl b/install/rhel/7/templates/web/nginx/php-fpm/codeigniter2.tpl new file mode 100644 index 000000000..9b955aa6a --- /dev/null +++ b/install/rhel/7/templates/web/nginx/php-fpm/codeigniter2.tpl @@ -0,0 +1,52 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + try_files $uri $uri/ /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location = /index.php { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME /var/www/html/ci$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + location ~ \.php$ { + return 444; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/rhel/7/templates/web/nginx/php-fpm/codeigniter3.stpl b/install/rhel/7/templates/web/nginx/php-fpm/codeigniter3.stpl new file mode 100644 index 000000000..4d330d34f --- /dev/null +++ b/install/rhel/7/templates/web/nginx/php-fpm/codeigniter3.stpl @@ -0,0 +1,51 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + try_files $uri $uri/ /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/rhel/7/templates/web/nginx/php-fpm/codeigniter3.tpl b/install/rhel/7/templates/web/nginx/php-fpm/codeigniter3.tpl new file mode 100644 index 000000000..1f446e5d3 --- /dev/null +++ b/install/rhel/7/templates/web/nginx/php-fpm/codeigniter3.tpl @@ -0,0 +1,47 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + try_files $uri $uri/ /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/rhel/7/templates/web/nginx/php-fpm/datalife_engine.stpl b/install/rhel/7/templates/web/nginx/php-fpm/datalife_engine.stpl new file mode 100644 index 000000000..d1b5bcd24 --- /dev/null +++ b/install/rhel/7/templates/web/nginx/php-fpm/datalife_engine.stpl @@ -0,0 +1,122 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + rewrite "^/page/([0-9]+)(/?)$" /index.php?cstart=$1 last; + + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page,([0-9]+),([0-9]+),(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&cstart=$5&news_name=$6&seourl=$6 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page,([0-9]+),(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&news_name=$5&seourl=$5 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/print:page,([0-9]+),(.*).html(/?)+$" /engine/print.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&news_name=$5&seourl=$5 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_name=$4&seourl=$4 last; + + rewrite "^/([^.]+)/page,([0-9]+),([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$4&news_page=$2&cstart=$3&seourl=$5&seocat=$1 last; + rewrite "^/([^.]+)/page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$3&news_page=$2&seourl=$4&seocat=$1 last; + rewrite "^/([^.]+)/print:page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /engine/print.php?news_page=$2&newsid=$3&seourl=$4&seocat=$1 last; + rewrite "^/([^.]+)/([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$2&seourl=$3&seocat=$1 last; + + rewrite "^/page,([0-9]+),([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$3&news_page=$1&cstart=$2&seourl=$4 last; + rewrite "^/page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$2&news_page=$1&seourl=$3 last; + rewrite "^/print:page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /engine/print.php?news_page=$1&newsid=$2&seourl=$3 last; + rewrite "^/([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$1&seourl=$2 last; + + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})(/?)+$" /index.php?year=$1&month=$2&day=$3 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page/([0-9]+)(/?)+$" /index.php?year=$1&month=$2&day=$3&cstart=$4 last; + + rewrite "^/([0-9]{4})/([0-9]{2})(/?)+$" /index.php?year=$1&month=$2 last; + rewrite "^/([0-9]{4})/([0-9]{2})/page/([0-9]+)(/?)+$" /index.php?year=$1&month=$2&cstart=$3 last; + + rewrite "^/([0-9]{4})(/?)+$" /index.php?year=$1 last; + rewrite "^/([0-9]{4})/page/([0-9]+)(/?)+$" /index.php?year=$1&cstart=$2 last; + + rewrite "^/tags/([^/]*)(/?)+$" /index.php?do=tags&tag=$1 last; + rewrite "^/tags/([^/]*)/page/([0-9]+)(/?)+$" /index.php?do=tags&tag=$1&cstart=$2 last; + + rewrite "^/xfsearch/([^/]*)(/?)+$" /index.php?do=xfsearch&xf=$1 last; + rewrite "^/xfsearch/([^/]*)/page/([0-9]+)(/?)+$" /index.php?do=xfsearch&xf=$1&cstart=$2 last; + + rewrite "^/user/([^/]*)/rss.xml$" /engine/rss.php?subaction=allnews&user=$1 last; + rewrite "^/user/([^/]*)(/?)+$" /index.php?subaction=userinfo&user=$1 last; + rewrite "^/user/([^/]*)/page/([0-9]+)(/?)+$" /index.php?subaction=userinfo&user=$1&cstart=$2 last; + rewrite "^/user/([^/]*)/news(/?)+$" /index.php?subaction=allnews&user=$1 last; + rewrite "^/user/([^/]*)/news/page/([0-9]+)(/?)+$" /index.php?subaction=allnews&user=$1&cstart=$2 last; + rewrite "^/user/([^/]*)/news/rss.xml(/?)+$" /engine/rss.php?subaction=allnews&user=$1 last; + + rewrite "^/lastnews(/?)+$" /index.php?do=lastnews last; + rewrite "^/lastnews/page/([0-9]+)(/?)+$" /index.php?do=lastnews&cstart=$1 last; + + rewrite "^/catalog/([^/]*)/rss.xml$" /engine/rss.php?catalog=$1 last; + rewrite "^/catalog/([^/]*)(/?)+$" /index.php?catalog=$1 last; + rewrite "^/catalog/([^/]*)/page/([0-9]+)(/?)+$" /index.php?catalog=$1&cstart=$2 last; + + rewrite "^/newposts(/?)+$" /index.php?subaction=newposts last; + rewrite "^/newposts/page/([0-9]+)(/?)+$" /index.php?subaction=newposts&cstart=$1 last; + + rewrite "^/favorites(/?)+$" /index.php?do=favorites last; + rewrite "^/favorites/page/([0-9]+)(/?)+$" /index.php?do=favorites&cstart=$1 last; + + rewrite "^/rules.html$" /index.php?do=rules last; + rewrite "^/statistics.html$" /index.php?do=stats last; + rewrite "^/addnews.html$" /index.php?do=addnews last; + rewrite "^/rss.xml$" /engine/rss.php last; + rewrite "^/sitemap.xml$" /uploads/sitemap.xml last; + + if (!-d $request_filename) { + rewrite "^/([^.]+)/page/([0-9]+)(/?)+$" /index.php?do=cat&category=$1&cstart=$2 last; + rewrite "^/([^.]+)/?$" /index.php?do=cat&category=$1 last; + } + + if (!-f $request_filename) { + rewrite "^/([^.]+)/rss.xml$" /engine/rss.php?do=cat&category=$1 last; + rewrite "^/page,([0-9]+),([^/]+).html$" /index.php?do=static&page=$2&news_page=$1 last; + rewrite "^/print:([^/]+).html$" /engine/print.php?do=static&page=$1 last; + } + + if (!-f $request_filename) { + rewrite "^/([^/]+).html$" /index.php?do=static&page=$1 last; + } + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/rhel/7/templates/web/nginx/php-fpm/datalife_engine.tpl b/install/rhel/7/templates/web/nginx/php-fpm/datalife_engine.tpl new file mode 100644 index 000000000..ff33c2325 --- /dev/null +++ b/install/rhel/7/templates/web/nginx/php-fpm/datalife_engine.tpl @@ -0,0 +1,118 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + rewrite "^/page/([0-9]+)(/?)$" /index.php?cstart=$1 last; + + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page,([0-9]+),([0-9]+),(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&cstart=$5&news_name=$6&seourl=$6 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page,([0-9]+),(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&news_name=$5&seourl=$5 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/print:page,([0-9]+),(.*).html(/?)+$" /engine/print.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&news_name=$5&seourl=$5 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_name=$4&seourl=$4 last; + + rewrite "^/([^.]+)/page,([0-9]+),([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$4&news_page=$2&cstart=$3&seourl=$5&seocat=$1 last; + rewrite "^/([^.]+)/page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$3&news_page=$2&seourl=$4&seocat=$1 last; + rewrite "^/([^.]+)/print:page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /engine/print.php?news_page=$2&newsid=$3&seourl=$4&seocat=$1 last; + rewrite "^/([^.]+)/([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$2&seourl=$3&seocat=$1 last; + + rewrite "^/page,([0-9]+),([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$3&news_page=$1&cstart=$2&seourl=$4 last; + rewrite "^/page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$2&news_page=$1&seourl=$3 last; + rewrite "^/print:page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /engine/print.php?news_page=$1&newsid=$2&seourl=$3 last; + rewrite "^/([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$1&seourl=$2 last; + + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})(/?)+$" /index.php?year=$1&month=$2&day=$3 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page/([0-9]+)(/?)+$" /index.php?year=$1&month=$2&day=$3&cstart=$4 last; + + rewrite "^/([0-9]{4})/([0-9]{2})(/?)+$" /index.php?year=$1&month=$2 last; + rewrite "^/([0-9]{4})/([0-9]{2})/page/([0-9]+)(/?)+$" /index.php?year=$1&month=$2&cstart=$3 last; + + rewrite "^/([0-9]{4})(/?)+$" /index.php?year=$1 last; + rewrite "^/([0-9]{4})/page/([0-9]+)(/?)+$" /index.php?year=$1&cstart=$2 last; + + rewrite "^/tags/([^/]*)(/?)+$" /index.php?do=tags&tag=$1 last; + rewrite "^/tags/([^/]*)/page/([0-9]+)(/?)+$" /index.php?do=tags&tag=$1&cstart=$2 last; + + rewrite "^/xfsearch/([^/]*)(/?)+$" /index.php?do=xfsearch&xf=$1 last; + rewrite "^/xfsearch/([^/]*)/page/([0-9]+)(/?)+$" /index.php?do=xfsearch&xf=$1&cstart=$2 last; + + rewrite "^/user/([^/]*)/rss.xml$" /engine/rss.php?subaction=allnews&user=$1 last; + rewrite "^/user/([^/]*)(/?)+$" /index.php?subaction=userinfo&user=$1 last; + rewrite "^/user/([^/]*)/page/([0-9]+)(/?)+$" /index.php?subaction=userinfo&user=$1&cstart=$2 last; + rewrite "^/user/([^/]*)/news(/?)+$" /index.php?subaction=allnews&user=$1 last; + rewrite "^/user/([^/]*)/news/page/([0-9]+)(/?)+$" /index.php?subaction=allnews&user=$1&cstart=$2 last; + rewrite "^/user/([^/]*)/news/rss.xml(/?)+$" /engine/rss.php?subaction=allnews&user=$1 last; + + rewrite "^/lastnews(/?)+$" /index.php?do=lastnews last; + rewrite "^/lastnews/page/([0-9]+)(/?)+$" /index.php?do=lastnews&cstart=$1 last; + + rewrite "^/catalog/([^/]*)/rss.xml$" /engine/rss.php?catalog=$1 last; + rewrite "^/catalog/([^/]*)(/?)+$" /index.php?catalog=$1 last; + rewrite "^/catalog/([^/]*)/page/([0-9]+)(/?)+$" /index.php?catalog=$1&cstart=$2 last; + + rewrite "^/newposts(/?)+$" /index.php?subaction=newposts last; + rewrite "^/newposts/page/([0-9]+)(/?)+$" /index.php?subaction=newposts&cstart=$1 last; + + rewrite "^/favorites(/?)+$" /index.php?do=favorites last; + rewrite "^/favorites/page/([0-9]+)(/?)+$" /index.php?do=favorites&cstart=$1 last; + + rewrite "^/rules.html$" /index.php?do=rules last; + rewrite "^/statistics.html$" /index.php?do=stats last; + rewrite "^/addnews.html$" /index.php?do=addnews last; + rewrite "^/rss.xml$" /engine/rss.php last; + rewrite "^/sitemap.xml$" /uploads/sitemap.xml last; + + if (!-d $request_filename) { + rewrite "^/([^.]+)/page/([0-9]+)(/?)+$" /index.php?do=cat&category=$1&cstart=$2 last; + rewrite "^/([^.]+)/?$" /index.php?do=cat&category=$1 last; + } + + if (!-f $request_filename) { + rewrite "^/([^.]+)/rss.xml$" /engine/rss.php?do=cat&category=$1 last; + rewrite "^/page,([0-9]+),([^/]+).html$" /index.php?do=static&page=$2&news_page=$1 last; + rewrite "^/print:([^/]+).html$" /engine/print.php?do=static&page=$1 last; + } + + if (!-f $request_filename) { + rewrite "^/([^/]+).html$" /index.php?do=static&page=$1 last; + } + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/rhel/7/templates/web/nginx/php-fpm/default.stpl b/install/rhel/7/templates/web/nginx/php-fpm/default.stpl new file mode 100644 index 000000000..a68c99861 --- /dev/null +++ b/install/rhel/7/templates/web/nginx/php-fpm/default.stpl @@ -0,0 +1,50 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %sdocroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/snginx.%domain%.conf*; +} diff --git a/install/rhel/7/templates/web/nginx/php-fpm/default.tpl b/install/rhel/7/templates/web/nginx/php-fpm/default.tpl new file mode 100644 index 000000000..b143e53ba --- /dev/null +++ b/install/rhel/7/templates/web/nginx/php-fpm/default.tpl @@ -0,0 +1,46 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/rhel/7/templates/web/nginx/php-fpm/dokuwiki.stpl b/install/rhel/7/templates/web/nginx/php-fpm/dokuwiki.stpl new file mode 100644 index 000000000..27483cd8c --- /dev/null +++ b/install/rhel/7/templates/web/nginx/php-fpm/dokuwiki.stpl @@ -0,0 +1,67 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + index doku.php; + try_files $uri $uri/ @dokuwiki; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + location ^~ /lib/ { + expires 30d; + } + + location ^~ /conf/ { return 403; } + location ^~ /data/ { return 403; } + + location @dokuwiki { + rewrite ^/_media/(.*) /lib/exe/fetch.php?media=$1 last; + rewrite ^/_detail/(.*) /lib/exe/detail.php?media=$1 last; + rewrite ^/_export/([^/]+)/(.*) /doku.php?do=export_$1&id=$2 last; + rewrite ^/(.*) /doku.php?id=$1 last; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/rhel/7/templates/web/nginx/php-fpm/dokuwiki.tpl b/install/rhel/7/templates/web/nginx/php-fpm/dokuwiki.tpl new file mode 100644 index 000000000..31647c9ff --- /dev/null +++ b/install/rhel/7/templates/web/nginx/php-fpm/dokuwiki.tpl @@ -0,0 +1,62 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + index doku.php; + try_files $uri $uri/ @dokuwiki; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + location ^~ /lib/ { + expires 30d; + } + + location ^~ /conf/ { return 403; } + location ^~ /data/ { return 403; } + location @dokuwiki { + rewrite ^/_media/(.*) /lib/exe/fetch.php?media=$1 last; + rewrite ^/_detail/(.*) /lib/exe/detail.php?media=$1 last; + rewrite ^/_export/([^/]+)/(.*) /doku.php?do=export_$1&id=$2 last; + rewrite ^/(.*) /doku.php?id=$1 last; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/rhel/7/templates/web/nginx/php-fpm/drupal.stpl b/install/rhel/7/templates/web/nginx/php-fpm/drupal.stpl new file mode 100644 index 000000000..9a5484396 --- /dev/null +++ b/install/rhel/7/templates/web/nginx/php-fpm/drupal.stpl @@ -0,0 +1,101 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + + location / { + try_files $uri @rewrite; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # You have 2 options here + # For D7 and above: + # Clean URLs are handled in drupal_environment_initialize(). + rewrite ^ /index.php; + + # For Drupal 6 and bwlow: + # Some modules enforce no slash (/) at the end of the URL + # Else this rewrite block wouldn't be needed (GlobalRedirect) + #rewrite ^/(.*)$ /index.php?q=$1; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/rhel/7/templates/web/nginx/php-fpm/drupal.tpl b/install/rhel/7/templates/web/nginx/php-fpm/drupal.tpl new file mode 100644 index 000000000..417762c18 --- /dev/null +++ b/install/rhel/7/templates/web/nginx/php-fpm/drupal.tpl @@ -0,0 +1,98 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + # Very rarely should these ever be accessed outside of your lan + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + + location / { + try_files $uri @rewrite; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # You have 2 options here + # For D7 and above: + # Clean URLs are handled in drupal_environment_initialize(). + rewrite ^ /index.php; + + # For Drupal 6 and bwlow: + # Some modules enforce no slash (/) at the end of the URL + # Else this rewrite block wouldn't be needed (GlobalRedirect) + #rewrite ^/(.*)$ /index.php?q=$1; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/rhel/7/templates/web/nginx/php-fpm/joomla.stpl b/install/rhel/7/templates/web/nginx/php-fpm/joomla.stpl new file mode 100644 index 000000000..235a01216 --- /dev/null +++ b/install/rhel/7/templates/web/nginx/php-fpm/joomla.stpl @@ -0,0 +1,58 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + try_files $uri $uri/ /index.php?$args; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + # deny running scripts inside writable directories + location ~* /(images|cache|media|logs|tmp)/.*\.(php|pl|py|jsp|asp|sh|cgi)$ { + return 403; + error_page 403 /403_error.html; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/rhel/7/templates/web/nginx/php-fpm/joomla.tpl b/install/rhel/7/templates/web/nginx/php-fpm/joomla.tpl new file mode 100644 index 000000000..997c268de --- /dev/null +++ b/install/rhel/7/templates/web/nginx/php-fpm/joomla.tpl @@ -0,0 +1,54 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + try_files $uri $uri/ /index.php?$args; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + # deny running scripts inside writable directories + location ~* /(images|cache|media|logs|tmp)/.*\.(php|pl|py|jsp|asp|sh|cgi)$ { + return 403; + error_page 403 /403_error.html; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/rhel/7/templates/web/nginx/php-fpm/owncloud.stpl b/install/rhel/7/templates/web/nginx/php-fpm/owncloud.stpl new file mode 100644 index 000000000..8311ca43f --- /dev/null +++ b/install/rhel/7/templates/web/nginx/php-fpm/owncloud.stpl @@ -0,0 +1,80 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + rewrite ^/caldav(.*)$ /remote.php/caldav$1 redirect; + rewrite ^/carddav(.*)$ /remote.php/carddav$1 redirect; + rewrite ^/webdav(.*)$ /remote.php/webdav$1 redirect; + + error_page 403 = /core/templates/403.php; + error_page 404 = /core/templates/404.php; + + location ~ ^/(?:\.htaccess|data|config|db_structure\.xml|README){ + deny all; + } + + location / { + # The following 2 rules are only needed with webfinger + rewrite ^/.well-known/host-meta /public.php?service=host-meta last; + rewrite ^/.well-known/host-meta.json /public.php?service=host-meta-json last; + rewrite ^/.well-known/carddav /remote.php/carddav/ redirect; + rewrite ^/.well-known/caldav /remote.php/caldav/ redirect; + rewrite ^(/core/doc/[^\/]+/)$ $1/index.html; + try_files $uri $uri/ /index.php; + + location ~ \.php(?:$|/) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param PATH_INFO $fastcgi_path_info; + #fastcgi_param HTTPS on; + fastcgi_pass %backend_lsnr%; + } + } + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + # Some basic cache-control for static files to be sent to the browser + add_header Pragma public; + add_header Cache-Control "public, must-revalidate, proxy-revalidate"; + } + + #error_page 403 /error/404.html; + #error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/rhel/7/templates/web/nginx/php-fpm/owncloud.tpl b/install/rhel/7/templates/web/nginx/php-fpm/owncloud.tpl new file mode 100644 index 000000000..57cac2f85 --- /dev/null +++ b/install/rhel/7/templates/web/nginx/php-fpm/owncloud.tpl @@ -0,0 +1,76 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + rewrite ^/caldav(.*)$ /remote.php/caldav$1 redirect; + rewrite ^/carddav(.*)$ /remote.php/carddav$1 redirect; + rewrite ^/webdav(.*)$ /remote.php/webdav$1 redirect; + + error_page 403 = /core/templates/403.php; + error_page 404 = /core/templates/404.php; + + location ~ ^/(?:\.htaccess|data|config|db_structure\.xml|README){ + deny all; + } + + location / { + # The following 2 rules are only needed with webfinger + rewrite ^/.well-known/host-meta /public.php?service=host-meta last; + rewrite ^/.well-known/host-meta.json /public.php?service=host-meta-json last; + rewrite ^/.well-known/carddav /remote.php/carddav/ redirect; + rewrite ^/.well-known/caldav /remote.php/caldav/ redirect; + rewrite ^(/core/doc/[^\/]+/)$ $1/index.html; + try_files $uri $uri/ /index.php; + + location ~ \.php(?:$|/) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param PATH_INFO $fastcgi_path_info; + #fastcgi_param HTTPS on; + fastcgi_pass %backend_lsnr%; + } + } + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + # Some basic cache-control for static files to be sent to the browser + add_header Pragma public; + add_header Cache-Control "public, must-revalidate, proxy-revalidate"; + } + + #error_page 403 /error/404.html; + #error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/rhel/7/templates/web/nginx/php-fpm/piwik.stpl b/install/rhel/7/templates/web/nginx/php-fpm/piwik.stpl new file mode 100644 index 000000000..c53af4011 --- /dev/null +++ b/install/rhel/7/templates/web/nginx/php-fpm/piwik.stpl @@ -0,0 +1,68 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location = /favicon.ico { + try_files /favicon.ico =204; + } + + location / { + try_files $uri /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + valid_referers none blocked %domain_idn% %alias_idn%; + if ($invalid_referer) { + return 444; + } + expires max; + } + + location ~* ^/(?:index|piwik)\.php$ { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + include /etc/nginx/fastcgi_params; + } + } + + # Any other attempt to access PHP files returns a 404. + location ~* ^.+\.php$ { + return 404; + } + + # Return a 404 for all text files. + location ~* ^/(?:README|LICENSE[^.]*|LEGALNOTICE)(?:\.txt)*$ { + return 404; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/rhel/7/templates/web/nginx/php-fpm/piwik.tpl b/install/rhel/7/templates/web/nginx/php-fpm/piwik.tpl new file mode 100644 index 000000000..6b4a94a68 --- /dev/null +++ b/install/rhel/7/templates/web/nginx/php-fpm/piwik.tpl @@ -0,0 +1,64 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location = /favicon.ico { + try_files /favicon.ico =204; + } + + location / { + try_files $uri /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + valid_referers none blocked %domain_idn% %alias_idn%; + if ($invalid_referer) { + return 444; + } + expires max; + } + + location ~* ^/(?:index|piwik)\.php$ { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + include /etc/nginx/fastcgi_params; + } + } + + # Any other attempt to access PHP files returns a 404. + location ~* ^.+\.php$ { + return 404; + } + + # Return a 404 for all text files. + location ~* ^/(?:README|LICENSE[^.]*|LEGALNOTICE)(?:\.txt)*$ { + return 404; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/rhel/7/templates/web/nginx/php-fpm/pyrocms.stpl b/install/rhel/7/templates/web/nginx/php-fpm/pyrocms.stpl new file mode 100644 index 000000000..a6fc67556 --- /dev/null +++ b/install/rhel/7/templates/web/nginx/php-fpm/pyrocms.stpl @@ -0,0 +1,61 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location /installer { + try_files $uri $uri/ /installer/index.php; + } + + location / { + try_files $uri $uri/ /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + location = /robots.txt { access_log off; log_not_found off; } + location = /favicon.ico { access_log off; log_not_found off; } + location ~ /\. { access_log off; log_not_found off; deny all; } + location ~ ~$ { access_log off; log_not_found off; deny all; } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/rhel/7/templates/web/nginx/php-fpm/pyrocms.tpl b/install/rhel/7/templates/web/nginx/php-fpm/pyrocms.tpl new file mode 100644 index 000000000..68b378efd --- /dev/null +++ b/install/rhel/7/templates/web/nginx/php-fpm/pyrocms.tpl @@ -0,0 +1,57 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location /installer { + try_files $uri $uri/ /installer/index.php; + } + + location / { + try_files $uri $uri/ /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + location = /robots.txt { access_log off; log_not_found off; } + location = /favicon.ico { access_log off; log_not_found off; } + location ~ /\. { access_log off; log_not_found off; deny all; } + location ~ ~$ { access_log off; log_not_found off; deny all; } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/rhel/7/templates/web/nginx/php-fpm/wordpress.stpl b/install/rhel/7/templates/web/nginx/php-fpm/wordpress.stpl new file mode 100644 index 000000000..910c28b69 --- /dev/null +++ b/install/rhel/7/templates/web/nginx/php-fpm/wordpress.stpl @@ -0,0 +1,50 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/rhel/7/templates/web/nginx/php-fpm/wordpress.tpl b/install/rhel/7/templates/web/nginx/php-fpm/wordpress.tpl new file mode 100644 index 000000000..b143e53ba --- /dev/null +++ b/install/rhel/7/templates/web/nginx/php-fpm/wordpress.tpl @@ -0,0 +1,46 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/rhel/7/templates/web/nginx/php-fpm/wordpress2.stpl b/install/rhel/7/templates/web/nginx/php-fpm/wordpress2.stpl new file mode 100644 index 000000000..2822f8754 --- /dev/null +++ b/install/rhel/7/templates/web/nginx/php-fpm/wordpress2.stpl @@ -0,0 +1,62 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + location / { + try_files $uri $uri/ /index.php?$args; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/rhel/7/templates/web/nginx/php-fpm/wordpress2.tpl b/install/rhel/7/templates/web/nginx/php-fpm/wordpress2.tpl new file mode 100644 index 000000000..37b8be305 --- /dev/null +++ b/install/rhel/7/templates/web/nginx/php-fpm/wordpress2.tpl @@ -0,0 +1,58 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + location / { + try_files $uri $uri/ /index.php?$args; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/rhel/7/templates/web/nginx/proxy_ip.tpl b/install/rhel/7/templates/web/nginx/proxy_ip.tpl new file mode 100755 index 000000000..ae1956173 --- /dev/null +++ b/install/rhel/7/templates/web/nginx/proxy_ip.tpl @@ -0,0 +1,9 @@ +server { + listen %ip%:%proxy_port% default; + server_name _; + #access_log /var/log/nginx/%ip%.log main; + location / { + proxy_pass http://%ip%:%web_port%; + } +} + diff --git a/install/rhel/7/templates/web/php-fpm/default.tpl b/install/rhel/7/templates/web/php-fpm/default.tpl new file mode 100644 index 000000000..44ccf7a42 --- /dev/null +++ b/install/rhel/7/templates/web/php-fpm/default.tpl @@ -0,0 +1,18 @@ +[%backend%] +listen = 127.0.0.1:%backend_port% +listen.allowed_clients = 127.0.0.1 + +user = %user% +group = %user% + +pm = dynamic +pm.max_children = 50 +pm.start_servers = 3 +pm.min_spare_servers = 2 +pm.max_spare_servers = 10 + +env[HOSTNAME] = $HOSTNAME +env[PATH] = /usr/local/bin:/usr/bin:/bin +env[TMP] = /tmp +env[TMPDIR] = /tmp +env[TEMP] = /tmp diff --git a/install/rhel/7/templates/web/php-fpm/no-php.tpl b/install/rhel/7/templates/web/php-fpm/no-php.tpl new file mode 100644 index 000000000..89487d5f5 --- /dev/null +++ b/install/rhel/7/templates/web/php-fpm/no-php.tpl @@ -0,0 +1,13 @@ +#[%backend%] +#user = %user% +#group = %user% +#listen = /dev/null + +#listen.owner = %user% +#listen.group = nginx + +#pm = dynamic +#pm.max_children = 50 +#pm.start_servers = 3 +#pm.min_spare_servers = 2 +#pm.max_spare_servers = 10 diff --git a/install/rhel/7/templates/web/php-fpm/socket.tpl b/install/rhel/7/templates/web/php-fpm/socket.tpl new file mode 100644 index 000000000..f0513da3e --- /dev/null +++ b/install/rhel/7/templates/web/php-fpm/socket.tpl @@ -0,0 +1,21 @@ +[%backend%] +listen = /var/run/php5-%backend%.sock +listen.allowed_clients = 127.0.0.1 + +user = %user% +group = %user% + +listen.owner = %user% +listen.group = nginx + +pm = dynamic +pm.max_children = 50 +pm.start_servers = 3 +pm.min_spare_servers = 2 +pm.max_spare_servers = 10 + +env[HOSTNAME] = $HOSTNAME +env[PATH] = /usr/local/bin:/usr/bin:/bin +env[TMP] = /tmp +env[TMPDIR] = /tmp +env[TEMP] = /tmp diff --git a/install/ubuntu/templates/web/skel/document_errors/403.html b/install/rhel/7/templates/web/skel/document_errors/403.html similarity index 100% rename from install/ubuntu/templates/web/skel/document_errors/403.html rename to install/rhel/7/templates/web/skel/document_errors/403.html diff --git a/install/ubuntu/templates/web/skel/document_errors/404.html b/install/rhel/7/templates/web/skel/document_errors/404.html similarity index 100% rename from install/ubuntu/templates/web/skel/document_errors/404.html rename to install/rhel/7/templates/web/skel/document_errors/404.html diff --git a/install/ubuntu/templates/web/skel/document_errors/50x.html b/install/rhel/7/templates/web/skel/document_errors/50x.html similarity index 100% rename from install/ubuntu/templates/web/skel/document_errors/50x.html rename to install/rhel/7/templates/web/skel/document_errors/50x.html diff --git a/install/rhel/7/templates/web/skel/public_html/index.html b/install/rhel/7/templates/web/skel/public_html/index.html new file mode 100755 index 000000000..4f5bb7244 --- /dev/null +++ b/install/rhel/7/templates/web/skel/public_html/index.html @@ -0,0 +1,26 @@ + + + %domain% — Coming Soon + + + + + + +

        %domain%

        +         + + + + diff --git a/install/rhel/7/templates/web/skel/public_html/robots.txt b/install/rhel/7/templates/web/skel/public_html/robots.txt new file mode 100755 index 000000000..00ee83dcf --- /dev/null +++ b/install/rhel/7/templates/web/skel/public_html/robots.txt @@ -0,0 +1,3 @@ +# vestacp autogenerated robots.txt +User-agent: * +Crawl-delay: 10 diff --git a/install/rhel/7/templates/web/skel/public_shtml/index.html b/install/rhel/7/templates/web/skel/public_shtml/index.html new file mode 100755 index 000000000..4f5bb7244 --- /dev/null +++ b/install/rhel/7/templates/web/skel/public_shtml/index.html @@ -0,0 +1,26 @@ + + + %domain% — Coming Soon + + + + + + +

        %domain%

        + + + + + diff --git a/install/rhel/7/templates/web/skel/public_shtml/robots.txt b/install/rhel/7/templates/web/skel/public_shtml/robots.txt new file mode 100755 index 000000000..00ee83dcf --- /dev/null +++ b/install/rhel/7/templates/web/skel/public_shtml/robots.txt @@ -0,0 +1,3 @@ +# vestacp autogenerated robots.txt +User-agent: * +Crawl-delay: 10 diff --git a/install/rhel/7/templates/web/suspend/.htaccess b/install/rhel/7/templates/web/suspend/.htaccess new file mode 100755 index 000000000..5a6df83fb --- /dev/null +++ b/install/rhel/7/templates/web/suspend/.htaccess @@ -0,0 +1,2 @@ +ErrorDocument 403 /index.html +ErrorDocument 404 /index.html diff --git a/install/ubuntu/templates/web/suspend/index.html b/install/rhel/7/templates/web/suspend/index.html similarity index 100% rename from install/ubuntu/templates/web/suspend/index.html rename to install/rhel/7/templates/web/suspend/index.html diff --git a/install/rhel/7/templates/web/webalizer/webalizer.tpl b/install/rhel/7/templates/web/webalizer/webalizer.tpl new file mode 100755 index 000000000..068adcfb9 --- /dev/null +++ b/install/rhel/7/templates/web/webalizer/webalizer.tpl @@ -0,0 +1,110 @@ +HostName %domain_idn% +LogFile /var/log/%web_system%/domains/%domain%.log +OutputDir %home%/%user%/web/%domain%/stats +HistoryName %home%/%user%/web/%domain%/stats/%domain%.hist +Incremental yes +IncrementalName %home%/%user%/web/%domain%/stats/%domain%.current +PageType htm* +PageType cgi +PageType php +PageType shtml +DNSCache /var/lib/webalizer/dns_cache.db +DNSChildren 10 +Quiet yes +FoldSeqErr yes +IndexAlias index.php +HideURL *.gif +HideURL *.GIF +HideURL *.jpg +HideURL *.JPG +HideURL *.png +HideURL *.PNG +HideURL *.ra +SearchEngine abcsearch. terms= +SearchEngine alexa. q= +SearchEngine alltheweb. q= +SearchEngine alltheweb. query= +SearchEngine alot. q= +SearchEngine altavista. q= +SearchEngine aolsearch. query= +SearchEngine aport.ru r= +SearchEngine ask. q= +SearchEngine atlas.cz q= +SearchEngine bbc. q= +SearchEngine bing. q= +SearchEngine blingo. q= +SearchEngine blogs.yandex.ru text= +SearchEngine btopenworld query= +SearchEngine buscador.ya.com q= +SearchEngine busca. q= +SearchEngine business. query= +SearchEngine centrum.cz q= +SearchEngine chiff. q= +SearchEngine clusty. query= +SearchEngine comcast. q= +SearchEngine crawler. q= +SearchEngine cuil. q= +SearchEngine dmoz. search= +SearchEngine dogpile.com q= +SearchEngine dpxml qkw= +SearchEngine eureka. searchword= +SearchEngine euroseek. string= +SearchEngine exalead. q= +SearchEngine excite search= +SearchEngine ezilon. q= +SearchEngine fastbrowsersearch. q= +SearchEngine feedster.com q= +SearchEngine fireball.de q= +SearchEngine fireball. keyword= +SearchEngine freeserve. q= +SearchEngine gigablast. q= +SearchEngine gogo.ru q= +SearchEngine go.mail.ru q= +SearchEngine google. q= +SearchEngine hakia. q= +SearchEngine hotbot. query= +SearchEngine infoseek. qt= +SearchEngine iwon searchfor= +SearchEngine ixquick.com query= +SearchEngine joeant. keywords= +SearchEngine jyxo.cz s= +SearchEngine looksmart. key= +SearchEngine lycos. query= +SearchEngine mamma. q= +SearchEngine metacrawler q= +SearchEngine msn. MT= +SearchEngine msxml qkw= +SearchEngine mysearch. searchfor= +SearchEngine mywebsearch. searchfor= +SearchEngine netscape. q= +SearchEngine nigma.ru q= +SearchEngine northernlight. qr= +SearchEngine ntlworld. q= +SearchEngine orange. q= +SearchEngine overture. Keywords= +SearchEngine punto.ru text= +SearchEngine rambler. keyword= +SearchEngine search.aol. q= +SearchEngine search.babylon. q= +SearchEngine search.centrum. phrase= +SearchEngine search.conduit. q= +SearchEngine search.earthlink q= +SearchEngine search.icq. q= +SearchEngine search.live.com q= +SearchEngine search.rambler.ru words= +SearchEngine search.winamp. q= +SearchEngine searchy. q= +SearchEngine seznam.cz w= +SearchEngine snap. query= +SearchEngine teoma. q= +SearchEngine teradex.com q= +SearchEngine ukplus key= +SearchEngine verizon. q= +SearchEngine virginmedia. q= +SearchEngine voila. rdata= +SearchEngine webcrawler searchText= +SearchEngine web.search.naver. query= +SearchEngine wisenut q= +SearchEngine yahoo. p= +SearchEngine yandex. text= +SearchEngine yodao. q= diff --git a/install/rhel/7/vsftpd/vsftpd.conf b/install/rhel/7/vsftpd/vsftpd.conf new file mode 100644 index 000000000..4673c838d --- /dev/null +++ b/install/rhel/7/vsftpd/vsftpd.conf @@ -0,0 +1,22 @@ +anonymous_enable=NO +local_enable=YES +write_enable=YES +local_umask=002 +anon_upload_enable=NO +dirmessage_enable=YES +xferlog_enable=YES +dual_log_enable=YES +connect_from_port_20=YES +xferlog_std_format=YES +chroot_local_user=YES +allow_writeable_chroot=YES +listen=YES +pam_service_name=vsftpd +userlist_enable=YES +tcp_wrappers=YES +force_dot_files=YES +ascii_upload_enable=YES +ascii_download_enable=YES +pasv_enable=YES +pasv_max_port=12100 +pasv_min_port=12000 diff --git a/install/rhel/7/wsgi/httpd.tar.gz b/install/rhel/7/wsgi/httpd.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..b25acd68e8a2a11305b57b3f2f79f7bbf0cb4995 GIT binary patch literal 1311 zcmV+)1>pK0iwFSs4QNsT1MOGqZ`(Kw?`QuNS{9?*uC-&QNr9p%kW14vcWKil>Gold zK(&=vt1TIl(kvMIzaM2guRd{)bU4fe@~}kyNRc#21xm%fy|qy)0qs{R>2G!YH=`}b zb<1w4RNb%aZlV1r9vi+%>#2vu7*;E!JxE8#5s-# zGJPIl%7)ZuX0m7EkYYKMN>Da7SJ>;?WymDJ9;WNZ+?zy%sUGK`P5Rsu@Gq0`1dUZ) zVk|Y-9#JBBpIlBoU?!rrDW(bHS5HXL2_XO(mZcOF34Bh!9*nDdT5$4-?i* zx<4V`iFXOyEx{)-N(GTQ)=%k~8jxK)>hLjGhJ_vSv7NeiCKZV^uEv)OMb_0!5s8xT ze+B>?$m0?Ch4=|VQ(OEu0Fo1Gm_+*Um>t3Gfn!#_UMfJ6IhS9KNJ({yOy^+W)C(AIGc^=c)55<{TB5f zN`_=RNfn83jJ<$lewnK|x}%k<>s5VqDe0K$d}|*+g#S2@Ha{uxD`+44t@be{5oZ^I zdqirRzVAZ7Fw)SqOhJM_e~42~B5Mv(fgsqIwF>g7j6*!zWl$Yz=8smddwFq-;+YCK z+l{dbYEPt2Ea(k{!1ljkHs;H9!fx!4UfC&(YgKJY6#+Q!8jrJ=V}6Y60O?yeKgAkH zJ&r>iYRXymuKs9sy1&;uxA#1EFYOmq>ahgZnbT$?zS!=@T9HIeC=ZQR8?~7am11f0 z*(6l-hLWi~!^#WLDQ131guDmv+X>g2`m?A*+4ai4@QFZJ@9p@6&DIS=Bf%rRd;hgd zR@%%9Ct&w_RCFFEp^>Zg!CKS>z5mWI4(*kO0f0Zdf93S=Xm$PzHl*X3`Om4kWtjh* zea9_TOM81T|G9hBy?p+A33~m?)-%)NgkC={K7kyZlu z?-mRi!*97@=n^vYspi-t&?FQwKt)#Xkj}bYnT&nN z(hr8wBU1r&KAQ`=Y_Zbd44UeX)4||kc-rj`Zqe82bZQmd&z6{cE}~E8jW2WFp6+>H z-&pV7!iG-p1KTdT_UEF5KJ{wllC#tKau>MQe1F;O4~8f0PV>Be*1Scpc1I5aX00kQ zIK_P5ukTz8G-v@Gp $docroot/.htaccess +chown $user:$user $docroot/.htaccess + + +echo "import os, sys +sys.path.insert(0, '$home_dir/$user/web/$domain/private/django/$domain/env/lib/python2.6/site-packages') +sys.path.insert(0, '$home_dir/$user/web/$domain/private/django/$domain/project/src/shared/') +sys.path.insert(0, '$home_dir/$user/web/$domain/private/django/$domain/project/src/') + +os.environ['DJANGO_SETTINGS_MODULE'] = 'main.settings' +import django.core.handlers.wsgi +application = django.core.handlers.wsgi.WSGIHandler()" > $docroot/django.wsgi +chown $user:$user $docroot/django.wsgi + +exit 0 diff --git a/install/rhel/7/wsgi/httpd/wsgi.stpl b/install/rhel/7/wsgi/httpd/wsgi.stpl new file mode 100755 index 000000000..e2fdd3f40 --- /dev/null +++ b/install/rhel/7/wsgi/httpd/wsgi.stpl @@ -0,0 +1,49 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %sdocroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + AllowOverride All + + SSLEngine on + SSLVerifyClient none + SSLCertificateFile %ssl_crt% + SSLCertificateKeyFile %ssl_key% + %ssl_ca_str%SSLCertificateChainFile %ssl_ca% + + + RMode config + RUidGid %user% %group% + RGroups apache + + + AssignUserID %user% %group% + + + WSGIDaemonProcess apx-idea user=%user% group=%user% processes=1 threads=5 display-name=%{GROUP} python-path=%home%/%user%/web/%domain%/private/django/%domain%/env/lib/python2.6/site-packages + WSGIProcessGroup apx-idea + WSGIApplicationGroup %{GLOBAL} + + + + AllowOverride FileInfo + Options ExecCGI Indexes + MultiviewsMatch Handlers + Options +FollowSymLinks + Order allow,deny + Allow from all + + + Include %home%/%user%/conf/web/s%web_system%.%domain%.conf* + + + diff --git a/install/rhel/7/wsgi/httpd/wsgi.tpl b/install/rhel/7/wsgi/httpd/wsgi.tpl new file mode 100644 index 000000000..ad5d8a076 --- /dev/null +++ b/install/rhel/7/wsgi/httpd/wsgi.tpl @@ -0,0 +1,44 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %docroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + AllowOverride All + + + + RMode config + RUidGid %user% %group% + RGroups apache + + + AssignUserID %user% %group% + + + WSGIDaemonProcess apx-idea user=%user% group=%user% processes=1 threads=5 display-name=%{GROUP} python-path=%home%/%user%/web/%domain%/private/django/%domain%/env/lib/python2.6/site-packages + WSGIProcessGroup apx-idea + WSGIApplicationGroup %{GLOBAL} + + + + AllowOverride FileInfo + Options ExecCGI Indexes + MultiviewsMatch Handlers + Options +FollowSymLinks + Order allow,deny + Allow from all + + + Include %home%/%user%/conf/web/%web_system%.%domain%.conf* + + + diff --git a/install/rhel/apc.ini b/install/rhel/apc.ini deleted file mode 100644 index b4e2d3493..000000000 --- a/install/rhel/apc.ini +++ /dev/null @@ -1,70 +0,0 @@ -; Enable apc extension module -extension = apc.so - -; Options for the APC module version >= 3.1.3 -; See http://www.php.net/manual/en/apc.configuration.php - -; This can be set to 0 to disable APC. -apc.enabled=1 -; The number of shared memory segments to allocate for the compiler cache. -apc.shm_segments=1 -; The size of each shared memory segment, with M/G suffix -apc.shm_size=128M -; A "hint" about the number of distinct source files that will be included or -; requested on your web server. Set to zero or omit if you are not sure; -apc.num_files_hint=1024 -; Just like num_files_hint, a "hint" about the number of distinct user cache -; variables to store. Set to zero or omit if you are not sure; -apc.user_entries_hint=4096 -; The number of seconds a cache entry is allowed to idle in a slot in case this -; cache entry slot is needed by another entry. -apc.ttl=0 -; use the SAPI request start time for TTL -apc.use_request_time=1 -; The number of seconds a user cache entry is allowed to idle in a slot in case -; this cache entry slot is needed by another entry. -apc.user_ttl=7200 -; The number of seconds that a cache entry may remain on the garbage-collection list. -apc.gc_ttl=3600 -; On by default, but can be set to off and used in conjunction with positive -; apc.filters so that files are only cached if matched by a positive filter. -apc.cache_by_default=1 -; A comma-separated list of POSIX extended regular expressions. -apc.filters -; The mktemp-style file_mask to pass to the mmap module -apc.mmap_file_mask=/tmp/apc.XXXXXX -; This file_update_protection setting puts a delay on caching brand new files. -apc.file_update_protection=2 -; Setting this enables APC for the CLI version of PHP (Mostly for testing and debugging). -apc.enable_cli=0 -; Prevents large files from being cached -apc.max_file_size=1M -; Whether to stat the main script file and the fullpath includes. -apc.stat=1 -; Vertification with ctime will avoid problems caused by programs such as svn or rsync by making -; sure inodes have not changed since the last stat. APC will normally only check mtime. -apc.stat_ctime=0 -; Whether to canonicalize paths in stat=0 mode or fall back to stat behaviour -apc.canonicalize=0 -; With write_lock enabled, only one process at a time will try to compile an -; uncached script while the other processes will run uncached -apc.write_lock=1 -; Logs any scripts that were automatically excluded from being cached due to early/late binding issues. -apc.report_autofilter=0 -; RFC1867 File Upload Progress hook handler -apc.rfc1867=0 -apc.rfc1867_prefix =upload_ -apc.rfc1867_name=APC_UPLOAD_PROGRESS -apc.rfc1867_freq=0 -apc.rfc1867_ttl=3600 -; Optimize include_once and require_once calls and avoid the expensive system calls used. -apc.include_once_override=0 -apc.lazy_classes=0 -apc.lazy_functions=0 -; Enables APC handling of signals, such as SIGSEGV, that write core files when signaled. -; APC will attempt to unmap the shared memory segment in order to exclude it from the core file -apc.coredump_unmap=0 -; Records a md5 hash of files. -apc.file_md5=0 -; not documented -apc.preload_path diff --git a/install/rhel/dovecot/conf.d/10-ssl.conf b/install/rhel/dovecot/conf.d/10-ssl.conf deleted file mode 100644 index aaf63255b..000000000 --- a/install/rhel/dovecot/conf.d/10-ssl.conf +++ /dev/null @@ -1,3 +0,0 @@ -ssl = yes -ssl_cert = ", because it will show the password in clear. -# You have to run "ssh -t hostname sudo ". -# -#Defaults requiretty - -Defaults env_reset -Defaults env_keep = "COLORS DISPLAY HOSTNAME HISTSIZE INPUTRC KDEDIR \ - LS_COLORS MAIL PS1 PS2 QTDIR USERNAME \ - LANG LC_ADDRESS LC_CTYPE LC_COLLATE LC_IDENTIFICATION \ - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC \ - LC_PAPER LC_TELEPHONE LC_TIME LC_ALL LANGUAGE LINGUAS \ - _XKB_CHARSET XAUTHORITY VESTA" - - -# Disable syslog loggging -Defaults !syslog - -## Next comes the main part: which users can run what software on -## which machines (the sudoers file can be shared between multiple -## systems). -## Syntax: -## -## user MACHINE=COMMANDS -## -## The COMMANDS section may have other options added to it. -## -## Allow root to run any commands anywhere -root ALL=(ALL) ALL - -## Allows members of the 'sys' group to run networking, software, -## service management apps and more. -# %sys ALL = NETWORKING, SOFTWARE, SERVICES, STORAGE, DELEGATING, PROCESSES, LOCATE, DRIVERS - -## Allows people in group wheel to run all commands -# %wheel ALL=(ALL) ALL - -## Same thing without a password -# %wheel ALL=(ALL) NOPASSWD: ALL - -## Allows members of the users group to mount and unmount the -## cdrom as root -# %users ALL=/sbin/mount /mnt/cdrom, /sbin/umount /mnt/cdrom - -## Allows members of the users group to shutdown this system -# %users localhost=/sbin/shutdown -h now - -#includedir /etc/sudoers.d diff --git a/install/rhel/vesta.conf b/install/rhel/vesta.conf deleted file mode 100644 index eb2ae13fa..000000000 --- a/install/rhel/vesta.conf +++ /dev/null @@ -1,24 +0,0 @@ -WEB_SYSTEM='httpd' -WEB_RGROUPS='apache' -WEB_PORT='8080' -WEB_SSL='mod_ssl' -WEB_SSL_PORT='8443' -PROXY_SYSTEM='nginx' -PROXY_PORT='80' -PROXY_SSL_PORT='443' -FTP_SYSTEM='vsftpd' -MAIL_SYSTEM='exim' -IMAP_SYSTEM='dovecot' -ANTIVIRUS_SYSTEM='clamav' -ANTISPAM_SYSTEM='spamassassin' -DB_SYSTEM='mysql' -DNS_SYSTEM='named' -STATS_SYSTEM='webalizer,awstats' -BACKUP_SYSTEM='local' -CRON_SYSTEM='crond' -DISK_QUOTA='no' -FIREWALL_SYSTEM='iptables' -FIREWALL_EXTENSION='fail2ban' -REPOSITORY='cmmnt' -VERSION='0.9.8' -LANGUAGE='en' diff --git a/install/rhel/whmcs-module.php b/install/rhel/whmcs-module.php deleted file mode 100644 index 1cb250611..000000000 --- a/install/rhel/whmcs-module.php +++ /dev/null @@ -1,359 +0,0 @@ - array( "Type" => "text", "Default" => "default"), - "SSH Access" => array( "Type" => "yesno", "Description" => "Tick to grant access", ), - "IP Address (optional)" => array( "Type" => "text" ), - ); - return $configarray; - -} - -function vesta_CreateAccount($params) { - - // Execute only if there is assigned server - if ($params["server"] == 1) { - - // Prepare variables - $postvars = array( - 'user' => $params["serverusername"], - 'password' => $params["serverpassword"], - 'hash' => $params["serveraccesshash"], - 'cmd' => 'v-add-user', - 'arg1' => $params["username"], - 'arg2' => $params["password"], - 'arg3' => $params["clientsdetails"]["email"], - 'arg4' => $params["configoption1"], - 'arg5' => $params["clientsdetails"]["firstname"], - 'arg6' => $params["clientsdetails"]["lastname"], - ); - $postdata = http_build_query($postvars); - - // Create user account - $curl = curl_init(); - curl_setopt($curl, CURLOPT_URL, 'https://' . $params["serverhostname"] . ':8083/api/'); - curl_setopt($curl, CURLOPT_RETURNTRANSFER,true); - curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false); - curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, false); - curl_setopt($curl, CURLOPT_POST, true); - curl_setopt($curl, CURLOPT_POSTFIELDS, $postdata); - $answer = curl_exec($curl); - - logModuleCall('vesta','CreateAccount_UserAccount','https://'.$params["serverhostname"].':8083/api/'.$postdata,$answer); - - // Enable ssh access - if(($answer == 'OK') && ($params["configoption2"] == 'on')) { - $postvars = array( - 'user' => $params["serverusername"], - 'password' => $params["serverpassword"], - 'hash' => $params["serveraccesshash"], - 'cmd' => 'v-change-user-shell', - 'arg1' => $params["username"], - 'arg2' => 'bash' - ); - $postdata = http_build_query($postvars); - $curl = curl_init(); - curl_setopt($curl, CURLOPT_URL, 'https://' . $params["serverhostname"] . ':8083/api/'); - curl_setopt($curl, CURLOPT_RETURNTRANSFER,true); - curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false); - curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, false); - curl_setopt($curl, CURLOPT_POST, true); - curl_setopt($curl, CURLOPT_POSTFIELDS, $postdata); - $answer = curl_exec($curl); - - logModuleCall('vesta','CreateAccount_EnableSSH','https://'.$params["serverhostname"].':8083/api/'.$postdata,$answer); - } - - // Add domain - if(($answer == 'OK') && (!empty($params["domain"]))) { - $postvars = array( - 'user' => $params["serverusername"], - 'password' => $params["serverpassword"], - 'hash' => $params["serveraccesshash"], - 'cmd' => 'v-add-domain', - 'arg1' => $params["username"], - 'arg2' => $params["domain"], - 'arg3' => $params["configoption3"], - ); - $postdata = http_build_query($postvars); - $curl = curl_init(); - curl_setopt($curl, CURLOPT_URL, 'https://' . $params["serverhostname"] . ':8083/api/'); - curl_setopt($curl, CURLOPT_RETURNTRANSFER,true); - curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false); - curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, false); - curl_setopt($curl, CURLOPT_POST, true); - curl_setopt($curl, CURLOPT_POSTFIELDS, $postdata); - $answer = curl_exec($curl); - - logModuleCall('vesta','CreateAccount_AddDomain','https://'.$params["serverhostname"].':8083/api/'.$postdata,$answer); - } - } - - if($answer == 'OK') { - $result = "success"; - } else { - $result = $answer; - } - - return $result; -} - -function vesta_TerminateAccount($params) { - - // Execute only if there is assigned server - if ($params["server"] == 1) { - - // Prepare variables - $postvars = array( - 'user' => $params["serverusername"], - 'password' => $params["serverpassword"], - 'hash' => $params["serveraccesshash"], - 'cmd' => 'v-delete-user', - 'arg1' => $params["username"] - ); - $postdata = http_build_query($postvars); - - // Delete user account - $curl = curl_init(); - curl_setopt($curl, CURLOPT_URL, 'https://' . $params["serverhostname"] . ':8083/api/'); - curl_setopt($curl, CURLOPT_RETURNTRANSFER,true); - curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false); - curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, false); - curl_setopt($curl, CURLOPT_POST, true); - curl_setopt($curl, CURLOPT_POSTFIELDS, $postdata); - $answer = curl_exec($curl); - } - - logModuleCall('vesta','TerminateAccount','https://'.$params["serverhostname"].':8083/api/'.$postdata,$answer); - - if($answer == 'OK') { - $result = "success"; - } else { - $result = $answer; - } - - return $result; -} - -function vesta_SuspendAccount($params) { - - // Execute only if there is assigned server - if ($params["server"] == 1) { - - // Prepare variables - $postvars = array( - 'user' => $params["serverusername"], - 'password' => $params["serverpassword"], - 'hash' => $params["serveraccesshash"], - 'cmd' => 'v-suspend-user', - 'arg1' => $params["username"] - ); - $postdata = http_build_query($postvars); - - // Susupend user account - $curl = curl_init(); - curl_setopt($curl, CURLOPT_URL, 'https://' . $params["serverhostname"] . ':8083/api/'); - curl_setopt($curl, CURLOPT_RETURNTRANSFER,true); - curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false); - curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, false); - curl_setopt($curl, CURLOPT_POST, true); - curl_setopt($curl, CURLOPT_POSTFIELDS, $postdata); - $answer = curl_exec($curl); - } - - logModuleCall('vesta','SuspendAccount','https://'.$params["serverhostname"].':8083/api/'.$postdata,$answer); - - if($answer == 'OK') { - $result = "success"; - } else { - $result = $answer; - } - - return $result; -} - -function vesta_UnsuspendAccount($params) { - - // Execute only if there is assigned server - if ($params["server"] == 1) { - - // Prepare variables - $postvars = array( - 'user' => $params["serverusername"], - 'password' => $params["serverpassword"], - 'hash' => $params["serveraccesshash"], - 'cmd' => 'v-unsuspend-user', - 'arg1' => $params["username"] - ); - $postdata = http_build_query($postvars); - - // Unsusupend user account - $curl = curl_init(); - curl_setopt($curl, CURLOPT_URL, 'https://' . $params["serverhostname"] . ':8083/api/'); - curl_setopt($curl, CURLOPT_RETURNTRANSFER,true); - curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false); - curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, false); - curl_setopt($curl, CURLOPT_POST, true); - curl_setopt($curl, CURLOPT_POSTFIELDS, $postdata); - $answer = curl_exec($curl); - } - - logModuleCall('vesta','UnsuspendAccount','https://'.$params["serverhostname"].':8083/api/'.$postdata,$answer); - - if($answer == 'OK') { - $result = "success"; - } else { - $result = $answer; - } - - return $result; -} - -function vesta_ChangePassword($params) { - - // Execute only if there is assigned server - if ($params["server"] == 1) { - - // Prepare variables - $postvars = array( - 'user' => $params["serverusername"], - 'password' => $params["serverpassword"], - 'hash' => $params["serveraccesshash"], - 'cmd' => 'v-change-user-password', - 'arg1' => $params["username"], - 'arg2' => $params["password"] - ); - $postdata = http_build_query($postvars); - - // Change user package - $curl = curl_init(); - curl_setopt($curl, CURLOPT_URL, 'https://' . $params["serverhostname"] . ':8083/api/'); - curl_setopt($curl, CURLOPT_RETURNTRANSFER,true); - curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false); - curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, false); - curl_setopt($curl, CURLOPT_POST, true); - curl_setopt($curl, CURLOPT_POSTFIELDS, $postdata); - $answer = curl_exec($curl); - } - - logModuleCall('vesta','ChangePassword','https://'.$params["serverhostname"].':8083/api/'.$postdata,$answer); - - if($answer == 'OK') { - $result = "success"; - } else { - $result = $answer; - } - - return $result; -} - -function vesta_ChangePackage($params) { - - // Execute only if there is assigned server - if ($params["server"] == 1) { - - // Prepare variables - $postvars = array( - 'user' => $params["serverusername"], - 'password' => $params["serverpassword"], - 'hash' => $params["serveraccesshash"], - 'cmd' => 'v-change-user-package', - 'arg1' => $params["username"], - 'arg2' => $params["configoption1"] - ); - $postdata = http_build_query($postvars); - - // Change user package - $curl = curl_init(); - curl_setopt($curl, CURLOPT_URL, 'https://' . $params["serverhostname"] . ':8083/api/'); - curl_setopt($curl, CURLOPT_RETURNTRANSFER,true); - curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false); - curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, false); - curl_setopt($curl, CURLOPT_POST, true); - curl_setopt($curl, CURLOPT_POSTFIELDS, $postdata); - $answer = curl_exec($curl); - } - - logModuleCall('vesta','ChangePackage','https://'.$params["serverhostname"].':8083/api/'.$postdata,$answer); - - if($answer == 'OK') { - $result = "success"; - } else { - $result = $answer; - } - - return $result; -} - -function vesta_ClientArea($params) { - - $code = '
        - - - - -
        '; - return $code; - -} - -function vesta_AdminLink($params) { - - $code = '
        - - - -
        '; - return $code; - -} - -function vesta_LoginLink($params) { - - echo "control panel"; - -} - -function vesta_UsageUpdate($params) { - - // Prepare variables - $postvars = array( - 'user' => $params["serverusername"], - 'password' => $params["serverpassword"], - 'hash' => $params["serveraccesshash"], - 'cmd' => 'v-list-users', - 'arg1' => 'json' - ); - $postdata = http_build_query($postvars); - - // Get user stats - $curl = curl_init(); - curl_setopt($curl, CURLOPT_URL, 'https://' . $params["serverhostname"] . ':8083/api/'); - curl_setopt($curl, CURLOPT_RETURNTRANSFER,true); - curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false); - curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, false); - curl_setopt($curl, CURLOPT_POST, true); - curl_setopt($curl, CURLOPT_POSTFIELDS, $postdata); - $answer = curl_exec($curl); - - // Decode json data - $results = json_decode($answer, true); - - // Loop through results and update DB - foreach ($results AS $user=>$values) { - update_query("tblhosting",array( - "diskusage"=>$values['U_DISK'], - "disklimit"=>$values['DISK_QUOTA'], - "bwusage"=>$values['U_BANDWIDTH'], - "bwlimit"=>$values['BANDWIDTH'], - "lastupdate"=>"now()", - ),array("server"=>$params['serverid'], "username"=>$user)); - } - -} - -?> diff --git a/install/ubuntu/12.04/apache2/apache2.conf b/install/ubuntu/12.04/apache2/apache2.conf new file mode 100644 index 000000000..221780117 --- /dev/null +++ b/install/ubuntu/12.04/apache2/apache2.conf @@ -0,0 +1,86 @@ +# It is split into several files forming the configuration hierarchy outlined +# below, all located in the /etc/apache2/ directory: +# +# /etc/apache2/ +# |-- apache2.conf +# | `-- ports.conf +# |-- mods-enabled +# | |-- *.load +# | `-- *.conf +# |-- conf.d +# | `-- * + +# Global configuration +PidFile ${APACHE_PID_FILE} +Timeout 30 +KeepAlive Off +MaxKeepAliveRequests 100 +KeepAliveTimeout 10 + + + StartServers 8 + MinSpareServers 5 + MaxSpareServers 20 + ServerLimit 256 + MaxClients 200 + MaxRequestsPerChild 4000 + + + + StartServers 2 + MinSpareThreads 25 + MaxSpareThreads 75 + ThreadLimit 64 + ThreadsPerChild 25 + MaxClients 200 + MaxRequestsPerChild 4000 + + + + StartServers 2 + MinSpareThreads 25 + MaxSpareThreads 75 + ThreadLimit 64 + ThreadsPerChild 25 + MaxClients 200 + MaxRequestsPerChild 4000 + + +# These need to be set in /etc/apache2/envvars +User ${APACHE_RUN_USER} +Group ${APACHE_RUN_GROUP} +#User www-data +#Group www-data + +AccessFileName .htaccess + + + Order allow,deny + Deny from all + Satisfy all + + +DefaultType None +HostnameLookups Off + +ErrorLog ${APACHE_LOG_DIR}/error.log +LogLevel warn + +# Include module configuration: +Include mods-enabled/*.load +Include mods-enabled/*.conf + +# Include list of ports to listen on and which to use for name based vhosts +Include ports.conf + +LogFormat "%v:%p %h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" vhost_combined +LogFormat "%h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" combined +LogFormat "%h %l %u %t \"%r\" %>s %O" common +LogFormat "%{Referer}i -> %U" referer +LogFormat "%{User-agent}i" agent +LogFormat "%b" bytes + +Include conf.d/ + +# Include the virtual host configurations: +#Include sites-enabled/ diff --git a/install/ubuntu/12.04/apache2/status.conf b/install/ubuntu/12.04/apache2/status.conf new file mode 100644 index 000000000..da9d96333 --- /dev/null +++ b/install/ubuntu/12.04/apache2/status.conf @@ -0,0 +1,8 @@ +Listen 127.0.0.1:8081 + + SetHandler server-status + Order deny,allow + Deny from all + Allow from 127.0.0.1 + Allow from all + diff --git a/install/ubuntu/12.04/bind/named.conf b/install/ubuntu/12.04/bind/named.conf new file mode 100644 index 000000000..ed6ece885 --- /dev/null +++ b/install/ubuntu/12.04/bind/named.conf @@ -0,0 +1,12 @@ +// This is the primary configuration file for the BIND DNS server named. +// +// Please read /usr/share/doc/bind9/README.Debian.gz for information on the +// structure of BIND configuration files in Debian, *BEFORE* you customize +// this configuration file. +// +// If you are just adding zones, please do that in /etc/bind/named.conf.local + +include "/etc/bind/named.conf.options"; +include "/etc/bind/named.conf.local"; +include "/etc/bind/named.conf.default-zones"; + diff --git a/install/ubuntu/12.04/clamav/clamd.conf b/install/ubuntu/12.04/clamav/clamd.conf new file mode 100644 index 000000000..ea982697a --- /dev/null +++ b/install/ubuntu/12.04/clamav/clamd.conf @@ -0,0 +1,61 @@ +#Automatically Generated by clamav-base postinst +#To reconfigure clamd run #dpkg-reconfigure clamav-base +#Please read /usr/share/doc/clamav-base/README.Debian.gz for details +LocalSocket /var/run/clamav/clamd.ctl +FixStaleSocket true +LocalSocketGroup clamav +LocalSocketMode 666 +# TemporaryDirectory is not set to its default /tmp here to make overriding +# the default with environment variables TMPDIR/TMP/TEMP possible +User clamav +AllowSupplementaryGroups true +ScanMail true +ScanArchive true +ArchiveBlockEncrypted false +MaxDirectoryRecursion 15 +FollowDirectorySymlinks false +FollowFileSymlinks false +ReadTimeout 180 +MaxThreads 12 +MaxConnectionQueueLength 15 +LogSyslog false +LogFacility LOG_LOCAL6 +LogClean false +LogVerbose true +PidFile /var/run/clamav/clamd.pid +DatabaseDirectory /var/lib/clamav +SelfCheck 3600 +Foreground false +Debug false +ScanPE true +ScanOLE2 true +ScanHTML true +DetectBrokenExecutables false +ExitOnOOM false +LeaveTemporaryFiles false +AlgorithmicDetection true +ScanELF true +IdleTimeout 30 +PhishingSignatures true +PhishingScanURLs true +PhishingAlwaysBlockSSLMismatch false +PhishingAlwaysBlockCloak false +DetectPUA false +ScanPartialMessages false +HeuristicScanPrecedence false +StructuredDataDetection false +CommandReadTimeout 5 +SendBufTimeout 200 +MaxQueue 100 +ExtendedDetectionInfo true +OLE2BlockMacros false +StreamMaxLength 25M +LogFile /var/log/clamav/clamav.log +LogTime true +LogFileUnlock false +LogFileMaxSize 0 +Bytecode true +BytecodeSecurity TrustSigned +BytecodeTimeout 60000 +OfficialDatabaseOnly false +CrossFilesystems true diff --git a/install/ubuntu/12.04/deb_signing.key b/install/ubuntu/12.04/deb_signing.key new file mode 100644 index 000000000..2ad2db8bc --- /dev/null +++ b/install/ubuntu/12.04/deb_signing.key @@ -0,0 +1,30 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.12 (GNU/Linux) + +mQENBFJIGbEBCAC8SHOOFo7iDTbnC2GhNZ+uBGCh226Dn1QPoFZNFM/DNakHZ6rD +G3wzr8++eKz4fJual/VLllE2N9XDPuxbozb3LLkcyY1WzJqtIXbXhFGQ/SuIeT+x +QY90XU6t2Ckze2c+zUniAWmJ8GSyVmXOoc9JxAQ1u47wvGXLzrjWXc8u8PNRYXuf +fZplTL+dFu9P0d6lP8FGsV+r9wXvvazpRTz3+H8PKrGCYT55ZQIEdG9Jgamylto2 +oVPFXkwGML+TLw6oeCIBuz2y2vtivphW4MJ3ifQjDj7k3n+DTIxfDFs8lB6VRhhY +2nMHCrcZC6U2mhmXmr6O4s1fu6irBVx05ejPABEBAAG0IFNlcmdoZXkgUm9kaW4g +PHNraWRAdmVzdGFjcC5jb20+iQE4BBMBAgAiBQJSSBmxAhsDBgsJCAcDAgYVCAIJ +CgsEFgIDAQIeAQIXgAAKCRBCxbITCh93FPdqB/93GjV9g+wBfeZYLHQK9MDU2wBb +VloYOJJae6IvYKYQVAJayD3PbHdpxrF8s9e23vdnmb9jKu6jX6oV54EIyqP2HPiN +QYc8wcea+eSHerznBixCtoQh8mtdWGFeN71zU/ig7L5qlOVF/EmxDVZTFUeivFxh +IV6qyBnktQKktE45585yKZyyLtfGoXA54DGK69OtJFh+wdkKEMmUXocMl7wUrxW6 +Cx2CuKeEXEgvwu8mRHQi3S3T9XP456qWEn5dWyMVcP660IzEuZfSJApZusNK7zG3 +WMy0/EuX7xHNY3mcNxTOUN1LsO7iHnhHD9+iKWJo9parGkMZzc92MpjDK/g7uQEN +BFJIGbEBCAC7k5QEA9WQM7E3ceNaeLMrA9lXfuzaNCcySq7ONdVAa5PxzbSKdHvz +QFoL1VFqBTYQ038lbil1XqnoM0zvIfAI3LcpS8sq92El/vPxp6jZh2Ari9Uw7x95 +k2cZMgI67g+zQMGdjVRA155nFQRCgg000xU4F7JA6+WsuLlVUmccsDv7YWJExMtC +YPxiuz5DFu8RALnw4Ckts+dbwsrcvUHhkm9b6RAsdCKjjRpUZjLgdltjH83gUVvt +i1YmdjjsVpt95dtsaG+ad852g/Rk8EdxNMkjPF6HLA67CLADP9wYaj80yPcPtylS +ycvPtcclVeHkFBRVM8xZpQd4iD19MWI1ABEBAAGJAR8EGAECAAkFAlJIGbECGwwA +CgkQQsWyEwofdxQ7tQgAhB0FwTs7L8Qr63DHC2yAnXVxgtTAY1/36CccNXVculyR ++EkLcwahms9AKhz7eQb+Mud+5vH0GRohLp2npgO38CjVUfIP5d+Y6dsthmrkF6p8 +XdV1dVK9vWX+i/YZSw/Mded30Cq4P2Yhq9EaemMT0rtli8lz2NnkZ9dFJZk1lzJC +CZmRpbjSNWqRU4f7qyh21lYk/OC/0XE8fh8CaO23TZ+6gBionoCztwb7NyC9OArN +qYlNnbmh9iNqdblykPS3bkjf34n2xyMgnIehNrM89tk8PY4UfNPhgT1TMD9W3Svq +ynNZvLuF/FIDwDeC1qcfjGbfDn9fXO/lMIIRooQYKQ== +=J2HJ +-----END PGP PUBLIC KEY BLOCK----- diff --git a/install/ubuntu/12.04/dovecot.tar.gz b/install/ubuntu/12.04/dovecot.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..bfabaa030981d087ea4ccd8c7b86cc4d7ab1b7c6 GIT binary patch literal 3487 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 N{0}P55eWcL004dY&`|&Y literal 0 HcmV?d00001 diff --git a/install/ubuntu/12.04/dovecot/conf.d/10-auth.conf b/install/ubuntu/12.04/dovecot/conf.d/10-auth.conf new file mode 100644 index 000000000..dfcc83110 --- /dev/null +++ b/install/ubuntu/12.04/dovecot/conf.d/10-auth.conf @@ -0,0 +1,4 @@ +disable_plaintext_auth = no +auth_verbose = yes +auth_mechanisms = plain login +!include auth-passwdfile.conf.ext diff --git a/install/ubuntu/12.04/dovecot/conf.d/10-logging.conf b/install/ubuntu/12.04/dovecot/conf.d/10-logging.conf new file mode 100644 index 000000000..a5f207d51 --- /dev/null +++ b/install/ubuntu/12.04/dovecot/conf.d/10-logging.conf @@ -0,0 +1 @@ +log_path = /var/log/dovecot.log diff --git a/install/ubuntu/12.04/dovecot/conf.d/10-mail.conf b/install/ubuntu/12.04/dovecot/conf.d/10-mail.conf new file mode 100644 index 000000000..55313419e --- /dev/null +++ b/install/ubuntu/12.04/dovecot/conf.d/10-mail.conf @@ -0,0 +1,4 @@ +mail_privileged_group = mail +mail_access_groups = mail +mail_location = maildir:%h/mail/%d/%n +pop3_uidl_format = %08Xu%08Xv diff --git a/install/ubuntu/12.04/dovecot/conf.d/10-master.conf b/install/ubuntu/12.04/dovecot/conf.d/10-master.conf new file mode 100644 index 000000000..a75a9aaa4 --- /dev/null +++ b/install/ubuntu/12.04/dovecot/conf.d/10-master.conf @@ -0,0 +1,29 @@ +service imap-login { + inet_listener imap { + } + inet_listener imaps { + } +} + +service pop3-login { + inet_listener pop3 { + } + inet_listener pop3s { + } +} + + +service imap { +} + +service pop3 { +} + +service auth { + unix_listener auth-client { + group = mail + mode = 0660 + user = dovecot + } + user = dovecot +} diff --git a/install/ubuntu/12.04/dovecot/conf.d/10-ssl.conf b/install/ubuntu/12.04/dovecot/conf.d/10-ssl.conf new file mode 100644 index 000000000..3aaff6eec --- /dev/null +++ b/install/ubuntu/12.04/dovecot/conf.d/10-ssl.conf @@ -0,0 +1,3 @@ +ssl = yes +ssl_cert = = 2.1.4) : %v.%u + # Dovecot v0.99.x : %v.%u + # tpop3d : %Mf + # + # Note that Outlook 2003 seems to have problems with %v.%u format which was + # Dovecot's default, so if you're building a new server it would be a good + # idea to change this. %08Xu%08Xv should be pretty fail-safe. + # + #pop3_uidl_format = %08Xu%08Xv + + # Permanently save UIDLs sent to POP3 clients, so pop3_uidl_format changes + # won't change those UIDLs. Currently this works only with Maildir. + #pop3_save_uidl = no + + # What to do about duplicate UIDLs if they exist? + # allow: Show duplicates to clients. + # rename: Append a temporary -2, -3, etc. counter after the UIDL. + #pop3_uidl_duplicates = allow + + # POP3 logout format string: + # %i - total number of bytes read from client + # %o - total number of bytes sent to client + # %t - number of TOP commands + # %p - number of bytes sent to client as a result of TOP command + # %r - number of RETR commands + # %b - number of bytes sent to client as a result of RETR command + # %d - number of deleted messages + # %m - number of messages (before deletion) + # %s - mailbox size in bytes (before deletion) + # %u - old/new UIDL hash. may help finding out if UIDLs changed unexpectedly + #pop3_logout_format = top=%t/%p, retr=%r/%b, del=%d/%m, size=%s + + # Maximum number of POP3 connections allowed for a user from each IP address. + # NOTE: The username is compared case-sensitively. + #mail_max_userip_connections = 10 + + # Space separated list of plugins to load (default is global mail_plugins). + #mail_plugins = $mail_plugins + + # Workarounds for various client bugs: + # outlook-no-nuls: + # Outlook and Outlook Express hang if mails contain NUL characters. + # This setting replaces them with 0x80 character. + # oe-ns-eoh: + # Outlook Express and Netscape Mail breaks if end of headers-line is + # missing. This option simply sends it if it's missing. + # The list is space-separated. + #pop3_client_workarounds = +} diff --git a/install/ubuntu/12.04/dovecot/conf.d/auth-passwdfile.conf.ext b/install/ubuntu/12.04/dovecot/conf.d/auth-passwdfile.conf.ext new file mode 100644 index 000000000..75e6e1152 --- /dev/null +++ b/install/ubuntu/12.04/dovecot/conf.d/auth-passwdfile.conf.ext @@ -0,0 +1,9 @@ +passdb { + driver = passwd-file + args = scheme=MD5-CRYPT username_format=%n /etc/exim4/domains/%d/passwd +} + +userdb { + driver = passwd-file + args = username_format=%n /etc/exim4/domains/%d/passwd +} diff --git a/install/ubuntu/12.04/dovecot/dovecot.conf b/install/ubuntu/12.04/dovecot/dovecot.conf new file mode 100644 index 000000000..0a8553510 --- /dev/null +++ b/install/ubuntu/12.04/dovecot/dovecot.conf @@ -0,0 +1,4 @@ +protocols = imap pop3 +listen = *, :: +base_dir = /var/run/dovecot/ +!include conf.d/*.conf diff --git a/install/ubuntu/12.04/exim/dnsbl.conf b/install/ubuntu/12.04/exim/dnsbl.conf new file mode 100644 index 000000000..5166b255e --- /dev/null +++ b/install/ubuntu/12.04/exim/dnsbl.conf @@ -0,0 +1,2 @@ +bl.spamcop.net +zen.spamhaus.org diff --git a/install/ubuntu/12.04/exim/exim4.conf.template b/install/ubuntu/12.04/exim/exim4.conf.template new file mode 100644 index 000000000..742f0409e --- /dev/null +++ b/install/ubuntu/12.04/exim/exim4.conf.template @@ -0,0 +1,377 @@ +###################################################################### +# # +# Exim configuration file for Vesta Control Panel # +# # +###################################################################### + +#SPAMASSASSIN = yes +#SPAM_SCORE = 50 +#CLAMD = yes + +domainlist local_domains = dsearch;/etc/exim4/domains/ +domainlist relay_to_domains = dsearch;/etc/exim4/domains/ +hostlist relay_from_hosts = 127.0.0.1 +hostlist whitelist = net-iplsearch;/etc/exim4/white-blocks.conf +hostlist spammers = net-iplsearch;/etc/exim4/spam-blocks.conf +no_local_from_check +untrusted_set_sender = * +acl_smtp_connect = acl_check_spammers +acl_smtp_mail = acl_check_mail +acl_smtp_rcpt = acl_check_rcpt +acl_smtp_data = acl_check_data +acl_smtp_mime = acl_check_mime + +.ifdef SPAMASSASSIN +spamd_address = 127.0.0.1 783 +.endif + +.ifdef CLAMD +av_scanner = clamd: /var/run/clamav/clamd.ctl +.endif + +tls_advertise_hosts = * +tls_certificate = /usr/local/vesta/ssl/certificate.crt +tls_privatekey = /usr/local/vesta/ssl/certificate.key + +daemon_smtp_ports = 25 : 465 : 587 : 2525 +tls_on_connect_ports = 465 +never_users = root +host_lookup = * +rfc1413_hosts = * +rfc1413_query_timeout = 5s +ignore_bounce_errors_after = 2d +timeout_frozen_after = 7d + +DKIM_DOMAIN = ${lc:${domain:$h_from:}} +DKIM_FILE = /etc/exim4/domains/${lc:${domain:$h_from:}}/dkim.pem +DKIM_PRIVATE_KEY = ${if exists{DKIM_FILE}{DKIM_FILE}{0}} + + + +###################################################################### +# ACL CONFIGURATION # +# Specifies access control lists for incoming SMTP mail # +###################################################################### +begin acl + +acl_check_spammers: + accept hosts = +whitelist + + drop message = Your host in blacklist on this server. + log_message = Host in blacklist + hosts = +spammers + + accept + + +acl_check_mail: + deny condition = ${if eq{$sender_helo_name}{}} + message = HELO required before MAIL + + drop message = Helo name contains a ip address (HELO was $sender_helo_name) and not is valid + condition = ${if match{$sender_helo_name}{\N((\d{1,3}[.-]\d{1,3}[.-]\d{1,3}[.-]\d{1,3})|([0-9a-f]{8})|([0-9A-F]{8}))\N}{yes}{no}} + condition = ${if match {${lookup dnsdb{>: defer_never,ptr=$sender_host_address}}\}{$sender_helo_name}{no}{yes}} + delay = 45s + + drop condition = ${if isip{$sender_helo_name}} + message = Access denied - Invalid HELO name (See RFC2821 4.1.3) + + drop condition = ${if eq{[$interface_address]}{$sender_helo_name}} + message = $interface_address is _my_ address + + accept + + +acl_check_rcpt: + accept hosts = : + + deny message = Restricted characters in address + domains = +local_domains + local_parts = ^[.] : ^.*[@%!/|] + + deny message = Restricted characters in address + domains = !+local_domains + local_parts = ^[./|] : ^.*[@%!] : ^.*/\\.\\./ + + require verify = sender + + accept hosts = +relay_from_hosts + control = submission + + accept authenticated = * + control = submission/domain= + + deny message = Rejected because $sender_host_address is in a black list at $dnslist_domain\n$dnslist_text + hosts = !+whitelist + dnslists = ${readfile {/etc/exim4/dnsbl.conf}{:}} + + require message = relay not permitted + domains = +local_domains : +relay_to_domains + + deny message = smtp auth requried + sender_domains = +local_domains + !authenticated = * + + require verify = recipient + +.ifdef CLAMD + warn set acl_m0 = no + + warn condition = ${if exists {/etc/exim4/domains/$domain/antivirus}{yes}{no}} + set acl_m0 = yes +.endif + +.ifdef SPAMASSASSIN + warn set acl_m1 = no + + warn condition = ${if exists {/etc/exim4/domains/$domain/antispam}{yes}{no}} + set acl_m1 = yes +.endif + + accept + + +acl_check_data: +.ifdef CLAMD + deny message = Message contains a virus ($malware_name) and has been rejected + malware = * + condition = ${if eq{$acl_m0}{yes}{yes}{no}} +.endif + +.ifdef SPAMASSASSIN + warn !authenticated = * + hosts = !+relay_from_hosts + condition = ${if < {$message_size}{100K}} + condition = ${if eq{$acl_m1}{yes}{yes}{no}} + spam = nobody:true/defer_ok + add_header = X-Spam-Score: $spam_score_int + add_header = X-Spam-Bar: $spam_bar + add_header = X-Spam-Report: $spam_report + set acl_m2 = $spam_score_int + + warn condition = ${if !eq{$acl_m2}{} {yes}{no}} + condition = ${if >{$acl_m2}{SPAM_SCORE} {yes}{no}} + add_header = X-Spam-Status: Yes + message = SpamAssassin detected spam (from $sender_address to $recipients). +.endif + + accept + + +acl_check_mime: + deny message = Blacklisted file extension detected + condition = ${if match {${lc:$mime_filename}}{\N(\.ade|\.adp|\.bat|\.chm|\.cmd|\.com|\.cpl|\.exe|\.hta|\.ins|\.isp|\.jse|\.lib|\.lnk|\.mde|\.msc|\.msp|\.mst|\.pif|\.scr|\.sct|\.shb|\.sys|\.vb|\.vbe|\.vbs|\.vxd|\.wsc|\.wsf|\.wsh)$\N}{1}{0}} + + accept + + + +###################################################################### +# AUTHENTICATION CONFIGURATION # +###################################################################### +begin authenticators + +dovecot_plain: + driver = dovecot + public_name = PLAIN + server_socket = /var/run/dovecot/auth-client + server_set_id = $auth1 + +dovecot_login: + driver = dovecot + public_name = LOGIN + server_socket = /var/run/dovecot/auth-client + server_set_id = $auth1 + + + +###################################################################### +# ROUTERS CONFIGURATION # +# Specifies how addresses are handled # +###################################################################### +begin routers + +#smarthost: +# driver = manualroute +# domains = ! +local_domains +# transport = remote_smtp +# route_list = * smartrelay.vestacp.com +# no_more +# no_verify + +dnslookup: + driver = dnslookup + domains = !+local_domains + transport = remote_smtp + no_more + +userforward: + driver = redirect + check_local_user + file = $home/.forward + allow_filter + no_verify + no_expn + check_ancestor + file_transport = address_file + pipe_transport = address_pipe + reply_transport = address_reply + +procmail: + driver = accept + check_local_user + require_files = ${local_part}:+${home}/.procmailrc:/usr/bin/procmail + transport = procmail + no_verify + +autoreplay: + driver = accept + require_files = /etc/exim4/domains/$domain/autoreply.${local_part}.msg + condition = ${if exists{/etc/exim4/domains/$domain/autoreply.${local_part}.msg}}{yes}{no}} + retry_use_local_part + transport = userautoreply + unseen + +aliases: + driver = redirect + headers_add = X-redirected: yes + data = ${extract{1}{:}{${lookup{$local_part@$domain}lsearch{/etc/exim4/domains/$domain/aliases}}}} + require_files = /etc/exim4/domains/$domain/aliases + redirect_router = dnslookup + pipe_transport = address_pipe + unseen + +localuser_fwd_only: + driver = accept + transport = devnull + condition = ${if exists{/etc/exim/domains/$domain/fwd_only}{${lookup{$local_part}lsearch{/etc/exim/domains/$domain/fwd_only}{true}{false}}}} + +localuser_spam: + driver = accept + transport = local_spam_delivery + condition = ${if eq {${if match{$h_X-Spam-Status:}{\N^Yes\N}{yes}{no}}} {${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}{yes}{no_such_user}}}} + +localuser: + driver = accept + transport = local_delivery + condition = ${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}{true}{false}} + +catchall: + driver = redirect + headers_add = X-redirected: yes + require_files = /etc/exim4/domains/$domain/aliases + data = ${extract{1}{:}{${lookup{*@$domain}lsearch{/etc/exim4/domains/$domain/aliases}}}} + file_transport = local_delivery + redirect_router = dnslookup + +terminate_alias: + driver = accept + transport = devnull + condition = ${lookup{$local_part@$domain}lsearch{/etc/exim4/domains/$domain/aliases}{true}{false}} + + + +###################################################################### +# TRANSPORTS CONFIGURATION # +###################################################################### +begin transports + +remote_smtp: + driver = smtp + #helo_data = $sender_address_domain + dkim_domain = DKIM_DOMAIN + dkim_selector = mail + dkim_private_key = DKIM_PRIVATE_KEY + dkim_canon = relaxed + dkim_strict = 0 + +procmail: + driver = pipe + command = "/usr/bin/procmail -d $local_part" + return_path_add + delivery_date_add + envelope_to_add + user = $local_part + initgroups + return_output + +local_delivery: + driver = appendfile + maildir_format + maildir_use_size_file + user = ${extract{2}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}} + group = mail + create_directory + directory_mode = 770 + mode = 660 + use_lockfile = no + delivery_date_add + envelope_to_add + return_path_add + directory = "${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}}/mail/$domain/$local_part" + quota = ${extract{6}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}}M + quota_warn_threshold = 75% + +local_spam_delivery: + driver = appendfile + maildir_format + maildir_use_size_file + user = ${extract{2}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}} + group = mail + create_directory + directory_mode = 770 + mode = 660 + use_lockfile = no + delivery_date_add + envelope_to_add + return_path_add + directory = "${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}}/mail/$domain/$local_part/.Spam" + quota = ${extract{6}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}}M + quota_directory = "${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}}/mail/$domain/$local_part" + quota_warn_threshold = 75% + +address_pipe: + driver = pipe + return_output + +address_file: + driver = appendfile + delivery_date_add + envelope_to_add + return_path_add + +address_reply: + driver = autoreply + +userautoreply: + driver = autoreply + file = /etc/exim4/domains/$domain/autoreply.${local_part}.msg + from = "${local_part}@${domain}" + subject = "${if def:h_Subject: {Autoreply: ${quote:${escape:$h_Subject:}}} {Autoreply Message}}" + to = "${sender_address}" + +devnull: + driver = appendfile + file = /dev/null + + + +###################################################################### +# RETRY CONFIGURATION # +###################################################################### +begin retry + +# Address or Domain Error Retries +# ----------------- ----- ------- +* * F,2h,15m; G,16h,1h,1.5; F,4d,6h + + + +###################################################################### +# REWRITE CONFIGURATION # +###################################################################### +begin rewrite + + + +###################################################################### diff --git a/install/ubuntu/12.04/exim/spam-blocks.conf b/install/ubuntu/12.04/exim/spam-blocks.conf new file mode 100644 index 000000000..e69de29bb diff --git a/install/ubuntu/12.04/fail2ban.tar.gz b/install/ubuntu/12.04/fail2ban.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..628545b6b12d83a4dfcf4529b41f62792c228c85 GIT binary patch literal 721 zcmV;?0xta@iwFR?P)1Y$1MQbhZ{jczhB^CJjMPJ=l>#Ira4D7AZL1=&Z6#&~ zz`KruB3xbg09_DCMo>VRAaZ-;y)^U@ z_5_W1em^5}=Uk3M(j5%0M~Fp}7>lVIYRqubkoOIoiK#qP6BOckLPYW;2OWgmSsIAg zuZ|mFmaYUYjJJfo8s1fhF1)IOlQ|75La(j33(9U0btUMJvtIut>QYeUVmCrexr&Qi zKbjFQ61zkzP2U-?^r{!(!l(3+?Yga{u}aaFy}dZE-rC%=GOfyYm&N9W)k}T291PDY z*P0t`IZ}uIjJ_-j{V$SH_dlT#cu)PeEcx8DI+m&H|328vfBu=(y@&@N72}Qi-)t}U ze|i14JEpGxd*KMK)CoAp98}8bBuj9v%2KQe1W{6IHF7UVKsi-oBUDPa+B%^mI!l#A z%iggR=`rPvnSp)Z2xvn7V8#q@Dyt%#D2+c|xJU7JZ=WzC$g2~0Q{w%WGdx!uFgO@} z=-u4i58*FN5)y;)2*=Nd+$g+V_$fxmCp11?eTVGz8P->^KFOi;zxe)( z;(T!ZH#>H&|F+iuy|9`8{p-KwZ0f&dYyIB`OZs27=SuT4o@Sm$(ja3D9@K#V)prvv zs8^H+ECdN-k)k768hSV1`}Y@@gAp1N=}x2^dQlk4c0wJawc4RhTtX&fF0G*c4Nk6a z2g6fPkL6zl5rJ&(DMxg| +actionstop = /usr/local/vesta/bin/v-delete-firewall-chain +actioncheck = iptables -n -L INPUT | grep -q 'fail2ban-[ \t]' +actionban = /usr/local/vesta/bin/v-add-firewall-ban +actionunban = /usr/local/vesta/bin/v-delete-firewall-ban diff --git a/install/ubuntu/12.04/fail2ban/filter.d/vesta.conf b/install/ubuntu/12.04/fail2ban/filter.d/vesta.conf new file mode 100644 index 000000000..69670a56e --- /dev/null +++ b/install/ubuntu/12.04/fail2ban/filter.d/vesta.conf @@ -0,0 +1,10 @@ +# Fail2Ban filter for unsuccesfull Vesta authentication attempts +# + +[INCLUDES] +before = common.conf + +[Definition] +failregex = .* failed to login +ignoreregex = + diff --git a/install/ubuntu/12.04/fail2ban/jail.local b/install/ubuntu/12.04/fail2ban/jail.local new file mode 100644 index 000000000..eccea0685 --- /dev/null +++ b/install/ubuntu/12.04/fail2ban/jail.local @@ -0,0 +1,39 @@ +[ssh-iptables] +enabled = true +filter = sshd +action = vesta[name=SSH] +logpath = /var/log/auth.log +maxretry = 5 + +[vsftpd-iptables] +enabled = false +filter = vsftpd +action = vesta[name=FTP] +logpath = /var/log/vsftpd.log +maxretry = 5 + +[exim-iptables] +enabled = true +filter = exim +action = vesta[name=MAIL] +logpath = /var/log/exim4/mainlog + +[dovecot-iptables] +enabled = true +filter = dovecot +action = vesta[name=MAIL] +logpath = /var/log/dovecot.log + +[mysqld-iptables] +enabled = false +filter = mysqld-auth +action = vesta[name=DB] +logpath = /var/log/mysql.log +maxretry = 5 + +[vesta-iptables] +enabled = true +filter = vesta +action = vesta[name=VESTA] +logpath = /var/log/vesta/auth.log +maxretry = 5 diff --git a/install/ubuntu/12.04/firewall.tar.gz b/install/ubuntu/12.04/firewall.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..e8556008077364323d7d6b6934e7a2cf7a734983 GIT binary patch literal 540 zcmV+%0^|K3iwFQ5XyQ}=1MQVdkJ>O4Mzij(@XnhsKo&*MSlh#7(1g=&0&FEG%?Me6ampuO4>y-_`!)kpP&FT0Pj|*j)GSV93 zG0u%P9?@5H>Ue&9TJ8w(mS4U;YbU>kw!5dto6pc!`1H`piz?!Qs? zZ2zTY(j)A}O)l`C?|(Hfn=&r%X0(YbN~&_+%&1`W&E*1z3IZzVUki(*D`*Kk5kQkG z1wFz!17_g@d9ch)G0;wCGL8I9sNtr~X-yEB=^d3PuoC0XT$oBik3eT~aJ zPYYM7vf@1@^`frQB1w}O-E1jovb=r04Y>?eKuHocY1?18ny~4FyPO>aM4!NUUOmFePy(-1M3SddTi>v8NVjB&*t=IgAYbgkDfmmx*FWy-yM^~-2uA1 z`-8QZ4$iCJUfZClsXi!k+gGp^gsj(jT}WJxQ(W4?Rswg^FKlTCd%;5d=XH e1VIo4K@bE%5ClOG1VIqwGCu%8Tmj4gC;$K)2?m1z literal 0 HcmV?d00001 diff --git a/install/ubuntu/12.04/firewall/ports.conf b/install/ubuntu/12.04/firewall/ports.conf new file mode 100644 index 000000000..a6ef4dae5 --- /dev/null +++ b/install/ubuntu/12.04/firewall/ports.conf @@ -0,0 +1,16 @@ +PROTOCOL='TCP' PORT='20' +PROTOCOL='TCP' PORT='21' +PROTOCOL='TCP' PORT='22' +PROTOCOL='TCP' PORT='25' +PROTOCOL='UDP' PORT='53' +PROTOCOL='TCP' PORT='80' +PROTOCOL='TCP' PORT='443' +PROTOCOL='TCP' PORT='110' +PROTOCOL='UDP' PORT='123' +PROTOCOL='TCP' PORT='143' +PROTOCOL='TCP' PORT='3306' +PROTOCOL='TCP' PORT='5432' +PROTOCOL='TCP' PORT='8080' +PROTOCOL='TCP' PORT='8433' +PROTOCOL='TCP' PORT='8083' +PROTOCOL='TCP' PORT='12000:12100' diff --git a/install/ubuntu/12.04/firewall/rules.conf b/install/ubuntu/12.04/firewall/rules.conf new file mode 100644 index 000000000..956c2e1d9 --- /dev/null +++ b/install/ubuntu/12.04/firewall/rules.conf @@ -0,0 +1,10 @@ +RULE='1' ACTION='ACCEPT' PROTOCOL='ICMP' PORT='0' IP='0.0.0.0/0' COMMENT='PING' SUSPENDED='no' TIME='17:13:48' DATE='2014-09-16' +RULE='2' ACTION='ACCEPT' PROTOCOL='TCP' PORT='8083' IP='0.0.0.0/0' COMMENT='VESTA' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' +RULE='3' ACTION='ACCEPT' PROTOCOL='TCP' PORT='3306,5432' IP='0.0.0.0/0' COMMENT='DB' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' +RULE='4' ACTION='ACCEPT' PROTOCOL='TCP' PORT='143,993' IP='0.0.0.0/0' COMMENT='IMAP' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' +RULE='5' ACTION='ACCEPT' PROTOCOL='TCP' PORT='110,995' IP='0.0.0.0/0' COMMENT='POP3' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' +RULE='6' ACTION='ACCEPT' PROTOCOL='TCP' PORT='25,465,587,2525' IP='0.0.0.0/0' COMMENT='SMTP' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' +RULE='7' ACTION='ACCEPT' PROTOCOL='UDP' PORT='53' IP='0.0.0.0/0' COMMENT='DNS' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' +RULE='8' ACTION='ACCEPT' PROTOCOL='TCP' PORT='21,12000-12100' IP='0.0.0.0/0' COMMENT='FTP' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' +RULE='9' ACTION='ACCEPT' PROTOCOL='TCP' PORT='80,443' IP='0.0.0.0/0' COMMENT='WEB' SUSPENDED='no' TIME='17:04:27' DATE='2014-09-24' +RULE='10' ACTION='ACCEPT' PROTOCOL='TCP' PORT='22' IP='0.0.0.0/0' COMMENT='SSH' SUSPENDED='no' TIME='17:14:41' DATE='2014-09-16' diff --git a/install/ubuntu/12.04/logrotate/apache2 b/install/ubuntu/12.04/logrotate/apache2 new file mode 100644 index 000000000..27629d0dd --- /dev/null +++ b/install/ubuntu/12.04/logrotate/apache2 @@ -0,0 +1,19 @@ +/var/log/apache2/*.log /var/log/apache2/domains/*log { + weekly + missingok + rotate 52 + compress + delaycompress + notifempty + create 640 root adm + sharedscripts + postrotate + /etc/init.d/apache2 reload > /dev/null || true + [ ! -f /var/run/nginx.pid ] || kill -USR1 `cat /var/run/nginx.pid` + endscript + prerotate + if [ -d /etc/logrotate.d/httpd-prerotate ]; then \ + run-parts /etc/logrotate.d/httpd-prerotate; \ + fi; \ + endscript +} diff --git a/install/ubuntu/12.04/logrotate/nginx b/install/ubuntu/12.04/logrotate/nginx new file mode 100644 index 000000000..d667f2135 --- /dev/null +++ b/install/ubuntu/12.04/logrotate/nginx @@ -0,0 +1,13 @@ +/var/log/nginx/*log /var/log/nginx/domains/*log { + daily + missingok + rotate 52 + compress + delaycompress + notifempty + create 640 nginx adm + sharedscripts + postrotate + [ -f /var/run/nginx.pid ] && kill -USR1 `cat /var/run/nginx.pid` + endscript +} diff --git a/install/ubuntu/12.04/logrotate/vesta b/install/ubuntu/12.04/logrotate/vesta new file mode 100644 index 000000000..027a34396 --- /dev/null +++ b/install/ubuntu/12.04/logrotate/vesta @@ -0,0 +1,7 @@ +/usr/local/vesta/log/*.log { + missingok + notifempty + size 30k + yearly + create 0600 root root +} diff --git a/install/ubuntu/12.04/mysql/my-large.cnf b/install/ubuntu/12.04/mysql/my-large.cnf new file mode 100644 index 000000000..d0bab3907 --- /dev/null +++ b/install/ubuntu/12.04/mysql/my-large.cnf @@ -0,0 +1,42 @@ +[client] +port=3306 +socket=/var/run/mysqld/mysqld.sock + +[mysqld_safe] +socket=/var/run/mysqld/mysqld.sock + +[mysqld] +user=mysql +pid-file=/var/run/mysqld/mysqld.pid +socket=/var/run/mysqld/mysqld.sock +port=3306 +basedir=/usr +datadir=/var/lib/mysql +tmpdir=/tmp +lc-messages-dir=/usr/share/mysql +log_error=/var/log/mysql/error.log + +symbolic-links=0 + +skip-external-locking +key_buffer_size = 256M +max_allowed_packet = 32M +table_open_cache = 256 +sort_buffer_size = 1M +read_buffer_size = 1M +read_rnd_buffer_size = 4M +myisam_sort_buffer_size = 64M +thread_cache_size = 8 +query_cache_size= 16M +thread_concurrency = 8 + +#innodb_use_native_aio = 0 +innodb_file_per_table + +max_connections=200 +max_user_connections=50 +wait_timeout=10 +interactive_timeout=50 +long_query_time=5 + +!includedir /etc/mysql/conf.d/ diff --git a/install/ubuntu/12.04/mysql/my-medium.cnf b/install/ubuntu/12.04/mysql/my-medium.cnf new file mode 100644 index 000000000..1c10ab9a6 --- /dev/null +++ b/install/ubuntu/12.04/mysql/my-medium.cnf @@ -0,0 +1,40 @@ +[client] +port=3306 +socket=/var/run/mysqld/mysqld.sock + +[mysqld_safe] +socket=/var/run/mysqld/mysqld.sock + +[mysqld] +user=mysql +pid-file=/var/run/mysqld/mysqld.pid +socket=/var/run/mysqld/mysqld.sock +port=3306 +basedir=/usr +datadir=/var/lib/mysql +tmpdir=/tmp +lc-messages-dir=/usr/share/mysql +log_error=/var/log/mysql/error.log + +symbolic-links=0 + +skip-external-locking +key_buffer_size = 16M +max_allowed_packet = 16M +table_open_cache = 64 +sort_buffer_size = 512K +net_buffer_length = 8K +read_buffer_size = 256K +read_rnd_buffer_size = 512K +myisam_sort_buffer_size = 8M + +#innodb_use_native_aio = 0 +innodb_file_per_table + +max_connections=70 +max_user_connections=30 +wait_timeout=10 +interactive_timeout=50 +long_query_time=5 + +!includedir /etc/mysql/conf.d/ diff --git a/install/ubuntu/12.04/mysql/my-small.cnf b/install/ubuntu/12.04/mysql/my-small.cnf new file mode 100644 index 000000000..26a804781 --- /dev/null +++ b/install/ubuntu/12.04/mysql/my-small.cnf @@ -0,0 +1,40 @@ +[client] +port=3306 +socket=/var/run/mysqld/mysqld.sock + +[mysqld_safe] +socket=/var/run/mysqld/mysqld.sock + +[mysqld] +user=mysql +pid-file=/var/run/mysqld/mysqld.pid +socket=/var/run/mysqld/mysqld.sock +port=3306 +basedir=/usr +datadir=/var/lib/mysql +tmpdir=/tmp +lc-messages-dir=/usr/share/mysql +log_error=/var/log/mysql/error.log + +symbolic-links=0 + +skip-external-locking +key_buffer_size = 16K +max_allowed_packet = 1M +table_open_cache = 4 +sort_buffer_size = 64K +read_buffer_size = 256K +read_rnd_buffer_size = 256K +net_buffer_length = 2K +thread_stack = 240K + +#innodb_use_native_aio = 0 +innodb_file_per_table + +max_connections=30 +max_user_connections=20 +wait_timeout=10 +interactive_timeout=50 +long_query_time=5 + +!includedir /etc/mysql/conf.d/ diff --git a/install/ubuntu/nginx.conf b/install/ubuntu/12.04/nginx/nginx.conf similarity index 99% rename from install/ubuntu/nginx.conf rename to install/ubuntu/12.04/nginx/nginx.conf index 1e0d321b2..7937301c1 100644 --- a/install/ubuntu/nginx.conf +++ b/install/ubuntu/12.04/nginx/nginx.conf @@ -1,5 +1,5 @@ # Server globals -user nginx; +user www-data; worker_processes 2; error_log /var/log/nginx/error.log; pid /var/run/nginx.pid; diff --git a/install/ubuntu/12.04/nginx/phpmyadmin.inc b/install/ubuntu/12.04/nginx/phpmyadmin.inc new file mode 100644 index 000000000..d70ca3e3c --- /dev/null +++ b/install/ubuntu/12.04/nginx/phpmyadmin.inc @@ -0,0 +1,15 @@ +location /phpmyadmin { + alias /usr/share/phpmyadmin/; + + location ~ /(libraries|setup) { + return 404; + } + + location ~ ^/phpmyadmin/(.*\.php)$ { + alias /usr/share/phpmyadmin/$1; + fastcgi_pass 127.0.0.1:9000; + fastcgi_index index.php; + include fastcgi_params; + fastcgi_param SCRIPT_FILENAME $request_filename; + } +} diff --git a/install/ubuntu/12.04/nginx/phppgadmin.inc b/install/ubuntu/12.04/nginx/phppgadmin.inc new file mode 100644 index 000000000..cd1e5806b --- /dev/null +++ b/install/ubuntu/12.04/nginx/phppgadmin.inc @@ -0,0 +1,11 @@ +location /phppgadmin { + alias /usr/share/phppgadmin/; + + location ~ ^/phppgadmin/(.*\.php)$ { + alias /usr/share/phppgadmin/$1; + fastcgi_pass 127.0.0.1:9000; + fastcgi_index index.php; + include fastcgi_params; + fastcgi_param SCRIPT_FILENAME $request_filename; + } +} diff --git a/install/ubuntu/12.04/nginx/status.conf b/install/ubuntu/12.04/nginx/status.conf new file mode 100644 index 000000000..c0bcd0691 --- /dev/null +++ b/install/ubuntu/12.04/nginx/status.conf @@ -0,0 +1,9 @@ +server { + listen 127.0.0.1:8084 default; + server_name _; + server_name_in_redirect off; + location / { + stub_status on; + access_log off; + } +} diff --git a/install/ubuntu/12.04/nginx/webmail.inc b/install/ubuntu/12.04/nginx/webmail.inc new file mode 100644 index 000000000..ad66895bc --- /dev/null +++ b/install/ubuntu/12.04/nginx/webmail.inc @@ -0,0 +1,15 @@ +location /webmail { + alias /var/lib/roundcube/; + + location ~ /(config|temp|logs) { + return 404; + } + + location ~ ^/webmail/(.*\.php)$ { + alias /var/lib/roundcube/$1; + fastcgi_pass 127.0.0.1:9000; + fastcgi_index index.php; + include fastcgi_params; + fastcgi_param SCRIPT_FILENAME $request_filename; + } +} diff --git a/install/ubuntu/12.04/packages.tar.gz b/install/ubuntu/12.04/packages.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..4b778dadce20a61f03a8ca920ec81c55a8730fee GIT binary patch literal 562 zcmV-20?qv&iwFRHoJ3Lp1MQYgkD5>vhFSY7+_9e37(#VaFxE7E(hXh3fdi2rFJZkFya3gX^b)n zVXSCG>M9q!r;?X63%1>^6fD25GP?9(Zs8i zm#eSAOO(kSvCYUG8}`JzlNGcp7>;dtR#6ZOYcoV)W|{76R22A_Q=gJo4AXSy6Mw(T z@QvYNS99i079ZTgdF&uH#Hm!H2Tkno>k1^mATb^lABoBo#r=lG9NGXU~REdk0(83B2vo&kr_ zAp~{{4=IqJS7Kl{UdaJ`lmmICl^~$|AizYY10B;!5Re`k^vG)ug3|w@mF?UAH~v$N z5%B*SfdB3Ik9DT%#Rp2&fAy{S9|r3<{gP~x+kO96-v30?!2fG-8UK&;KeGQw{$uw~ zsNXQZA^ut3x1l|*XixdCp}qF{wFdwI0000000000000000RC})0(q@EkpL(F05 diff --git a/install/ubuntu/12.04/pga/phppgadmin.conf b/install/ubuntu/12.04/pga/phppgadmin.conf new file mode 100644 index 000000000..f39247d6f --- /dev/null +++ b/install/ubuntu/12.04/pga/phppgadmin.conf @@ -0,0 +1,31 @@ +Alias /phppgadmin /usr/share/phppgadmin + + + +DirectoryIndex index.php +AllowOverride None + +order deny,allow +deny from all +allow from 127.0.0.0/255.0.0.0 ::1/128 +allow from all + + + php_flag magic_quotes_gpc Off + php_flag track_vars On + php_value include_path . + + + + + AddType application/x-httpd-php .php + Action application/x-httpd-php /cgi-bin/php + + + AddType application/x-httpd-php .php + Action application/x-httpd-php /cgi-bin/php + + + + + diff --git a/install/ubuntu/12.04/php5-fpm/www.conf b/install/ubuntu/12.04/php5-fpm/www.conf new file mode 100644 index 000000000..d046bceef --- /dev/null +++ b/install/ubuntu/12.04/php5-fpm/www.conf @@ -0,0 +1,10 @@ +[www] +listen = 127.0.0.1:9000 +listen.allowed_clients = 127.0.0.1 +user = www-data +group = www-data +pm = dynamic +pm.max_children = 50 +pm.start_servers = 5 +pm.min_spare_servers = 3 +pm.max_spare_servers = 35 diff --git a/install/ubuntu/12.04/pma/apache.conf b/install/ubuntu/12.04/pma/apache.conf new file mode 100644 index 000000000..2a8f69e25 --- /dev/null +++ b/install/ubuntu/12.04/pma/apache.conf @@ -0,0 +1,42 @@ +# phpMyAdmin default Apache configuration + +Alias /phpmyadmin /usr/share/phpmyadmin + + + Options FollowSymLinks + DirectoryIndex index.php + + + AddType application/x-httpd-php .php + + php_flag magic_quotes_gpc Off + php_flag track_vars On + php_flag register_globals Off + php_admin_flag allow_url_fopen Off + php_value include_path . + php_admin_value upload_tmp_dir /var/lib/phpmyadmin/tmp + php_admin_value open_basedir /usr/share/phpmyadmin/:/etc/phpmyadmin/:/var/lib/phpmyadmin/:/usr/share/php/php-gettext + + + + +# Authorize for setup + + + AuthType Basic + AuthName "phpMyAdmin Setup" + AuthUserFile /etc/phpmyadmin/htpasswd.setup + + Require valid-user + + +# Disallow web access to directories that don't need it + + Order Deny,Allow + Deny from All + + + Order Deny,Allow + Deny from All + + diff --git a/install/ubuntu/12.04/pma/config.inc.php b/install/ubuntu/12.04/pma/config.inc.php new file mode 100644 index 000000000..a643a065b --- /dev/null +++ b/install/ubuntu/12.04/pma/config.inc.php @@ -0,0 +1,146 @@ + + VRootEngine on + VRootAlias /etc/security/pam_env.conf etc/security/pam_env.conf +         + +AuthPAMConfig proftpd +AuthOrder mod_auth_pam.c* mod_auth_unix.c +UseReverseDNS off +User proftpd +Group nogroup +MaxInstances 20 +UseSendfile off +LogFormat default "%h %l %u %t \"%r\" %s %b" +LogFormat auth "%v [%P] %h %t \"%r\" %s" +ListOptions -a +RequireValidShell off +PassivePorts 12000 12100 + + + Umask 002 + IdentLookups off + AllowOverwrite yes + + AllowAll + + diff --git a/install/ubuntu/12.04/roundcube/apache.conf b/install/ubuntu/12.04/roundcube/apache.conf new file mode 100644 index 000000000..a0c87bcc6 --- /dev/null +++ b/install/ubuntu/12.04/roundcube/apache.conf @@ -0,0 +1,40 @@ +Alias /roundcube/program/js/tiny_mce/ /usr/share/tinymce/www/ +Alias /roundcube /var/lib/roundcube +Alias /webmail /var/lib/roundcube + +# Access to tinymce files + + Options Indexes MultiViews FollowSymLinks + AllowOverride None + Order allow,deny + allow from all + + + + Options +FollowSymLinks + # This is needed to parse /var/lib/roundcube/.htaccess. See its + # content before setting AllowOverride to None. + AllowOverride All + order allow,deny + allow from all + + +# Protecting basic directories: + + Options -FollowSymLinks + AllowOverride None + + + + Options -FollowSymLinks + AllowOverride None + Order allow,deny + Deny from all + + + + Options -FollowSymLinks + AllowOverride None + Order allow,deny + Deny from all + diff --git a/install/ubuntu/12.04/roundcube/config.inc.php b/install/ubuntu/12.04/roundcube/config.inc.php new file mode 100644 index 000000000..0c82b1bc1 --- /dev/null +++ b/install/ubuntu/12.04/roundcube/config.inc.php @@ -0,0 +1,33 @@ + diff --git a/install/ubuntu/roundcube-main.conf b/install/ubuntu/12.04/roundcube/main.inc.php similarity index 99% rename from install/ubuntu/roundcube-main.conf rename to install/ubuntu/12.04/roundcube/main.inc.php index a6e1fc2ee..97cdbf2df 100644 --- a/install/ubuntu/roundcube-main.conf +++ b/install/ubuntu/12.04/roundcube/main.inc.php @@ -175,6 +175,8 @@ $rcmail_config['smtp_timeout'] = 0; // ---------------------------------- // SYSTEM // ---------------------------------- +include_once("/etc/roundcube/debian-db-roundcube.php"); + // THIS OPTION WILL ALLOW THE INSTALLER TO RUN AND CAN EXPOSE SENSITIVE CONFIG DATA. // ONLY ENABLE IT IF YOU'RE REALLY SURE WHAT YOU'RE DOING! @@ -437,6 +439,7 @@ $rcmail_config['trash_mbox'] = 'Trash'; // these folders will also be displayed with localized names // NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP) $rcmail_config['default_folders'] = array('INBOX', 'Drafts', 'Sent', 'Spam', 'Trash'); +$rcmail_config['default_imap_folders'] = array('INBOX', 'Drafts', 'Sent', 'Spam', 'Trash'); // automatically create the above listed default folders on first login $rcmail_config['create_default_folders'] = true; diff --git a/install/ubuntu/12.04/roundcube/vesta.php b/install/ubuntu/12.04/roundcube/vesta.php new file mode 100644 index 000000000..8fb202a44 --- /dev/null +++ b/install/ubuntu/12.04/roundcube/vesta.php @@ -0,0 +1,62 @@ + + */ + + function password_save($curpass, $passwd) + { + $rcmail = rcmail::get_instance(); + $vesta_host = $rcmail->config->get('password_vesta_host'); + + if (empty($vesta_host)) + { + $vesta_host = 'localhost'; + } + + $vesta_port = $rcmail->config->get('password_vesta_port'); + if (empty($vesta_port)) + { + $vesta_port = '8083'; + } + + $postvars = array( + 'email' => $_SESSION['username'], + 'password' => $curpass, + 'new' => $passwd + ); + + $postdata = http_build_query($postvars); + + $send = 'POST /reset/mail/ HTTP/1.1' . PHP_EOL; + $send .= 'Host: ' . $vesta_host . PHP_EOL; + $send .= 'User-Agent: PHP Script' . PHP_EOL; + $send .= 'Content-length: ' . strlen($postdata) . PHP_EOL; + $send .= 'Content-type: application/x-www-form-urlencoded' . PHP_EOL; + $send .= 'Connection: close' . PHP_EOL; + $send .= PHP_EOL; + $send .= $postdata . PHP_EOL . PHP_EOL; + + $fp = fsockopen('ssl://' . $vesta_host, $vesta_port); + fputs($fp, $send); + $result = fread($fp, 2048); + fclose($fp); + + $fp = fopen("/tmp/roundcube.log", 'w'); + fwrite($fp, "test ok"); + fwrite($fp, "\n"); + fclose($fp); + + + if(strpos($result, 'ok') && !strpos($result, 'error')) + { + return PASSWORD_SUCCESS; + } + else { + return PASSWORD_ERROR; + } + + } diff --git a/install/ubuntu/12.04/sudo/admin b/install/ubuntu/12.04/sudo/admin new file mode 100644 index 000000000..47e16098c --- /dev/null +++ b/install/ubuntu/12.04/sudo/admin @@ -0,0 +1,7 @@ +# Created by vesta installer +Defaults env_keep="VESTA" +Defaults:admin !syslog +Defaults:admin !requiretty + +admin ALL=(ALL) ALL +admin ALL=NOPASSWD:/usr/local/vesta/bin/* diff --git a/install/ubuntu/12.04/templates.tar.gz b/install/ubuntu/12.04/templates.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..ce385d269736561780cb42d07b447572cebc7831 GIT binary patch literal 12935 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 + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %sdocroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + #SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + AllowOverride All + SSLRequireSSL + Options +Includes -Indexes +ExecCGI + php_admin_value open_basedir %docroot% + + + AllowOverride All + + SSLEngine on + SSLVerifyClient none + SSLCertificateFile %ssl_crt% + SSLCertificateKeyFile %ssl_key% + %ssl_ca_str%SSLCertificateChainFile %ssl_ca% + + + RMode config + RUidGid %user% %group% + RGroups www-data + + + AssignUserID %user% %group% + + + IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* + + + diff --git a/install/ubuntu/12.04/templates/web/apache2/basedir.tpl b/install/ubuntu/12.04/templates/web/apache2/basedir.tpl new file mode 100755 index 000000000..75daf0e10 --- /dev/null +++ b/install/ubuntu/12.04/templates/web/apache2/basedir.tpl @@ -0,0 +1,35 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %docroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + #SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + AllowOverride All + Options +Includes -Indexes +ExecCGI + php_admin_value open_basedir %docroot% + + + AllowOverride All + + + + RMode config + RUidGid %user% %group% + RGroups www-data + + + AssignUserID %user% %group% + + + IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + + + diff --git a/install/ubuntu/12.04/templates/web/apache2/default.stpl b/install/ubuntu/12.04/templates/web/apache2/default.stpl new file mode 100755 index 000000000..e884a95b9 --- /dev/null +++ b/install/ubuntu/12.04/templates/web/apache2/default.stpl @@ -0,0 +1,40 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %sdocroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + #SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + AllowOverride All + SSLRequireSSL + Options +Includes -Indexes +ExecCGI + + + AllowOverride All + + SSLEngine on + SSLVerifyClient none + SSLCertificateFile %ssl_crt% + SSLCertificateKeyFile %ssl_key% + %ssl_ca_str%SSLCertificateChainFile %ssl_ca% + + + RMode config + RUidGid %user% %group% + RGroups www-data + + + AssignUserID %user% %group% + + + IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* + + + diff --git a/install/ubuntu/12.04/templates/web/apache2/default.tpl b/install/ubuntu/12.04/templates/web/apache2/default.tpl new file mode 100755 index 000000000..073724ce0 --- /dev/null +++ b/install/ubuntu/12.04/templates/web/apache2/default.tpl @@ -0,0 +1,34 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %docroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + #SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + AllowOverride All + Options +Includes -Indexes +ExecCGI + + + AllowOverride All + + + + RMode config + RUidGid %user% %group% + RGroups www-data + + + AssignUserID %user% %group% + + + IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + + + diff --git a/install/ubuntu/12.04/templates/web/apache2/hosting.stpl b/install/ubuntu/12.04/templates/web/apache2/hosting.stpl new file mode 100755 index 000000000..7a5d7787f --- /dev/null +++ b/install/ubuntu/12.04/templates/web/apache2/hosting.stpl @@ -0,0 +1,49 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %sdocroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + #SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + AllowOverride All + SSLRequireSSL + Options +Includes -Indexes +ExecCGI + php_admin_value upload_tmp_dir %home%/%user%/tmp + php_admin_value upload_max_filesize 10M + php_admin_value max_execution_time 20 + php_admin_value post_max_size 8M + php_admin_value memory_limit 32M + php_admin_flag mysql.allow_persistent off + php_admin_flag safe_mode off + php_admin_value session.save_path %home%/%user%/tmp + php_admin_value sendmail_path '/usr/sbin/sendmail -t -i -f %email%' + + + AllowOverride All + + php_admin_value open_basedir %home%/%user%/web:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpMyAdmin:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcubemail:/etc/roundcube:/var/lib/roundcube + SSLEngine on + SSLVerifyClient none + SSLCertificateFile %ssl_crt% + SSLCertificateKeyFile %ssl_key% + %ssl_ca_str%SSLCertificateChainFile %ssl_ca% + + RMode config + RUidGid %user% %group% + RGroups www-data + + + AssignUserID %user% %group% + + + IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* + + + diff --git a/install/ubuntu/12.04/templates/web/apache2/hosting.tpl b/install/ubuntu/12.04/templates/web/apache2/hosting.tpl new file mode 100755 index 000000000..ab844dc74 --- /dev/null +++ b/install/ubuntu/12.04/templates/web/apache2/hosting.tpl @@ -0,0 +1,43 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %docroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + #SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + AllowOverride All + Options +Includes -Indexes +ExecCGI + php_admin_value upload_tmp_dir %home%/%user%/tmp + php_admin_value upload_max_filesize 10M + php_admin_value max_execution_time 20 + php_admin_value post_max_size 8M + php_admin_value memory_limit 32M + php_admin_flag mysql.allow_persistent off + php_admin_flag safe_mode off + php_admin_value session.save_path %home%/%user%/tmp + php_admin_value sendmail_path '/usr/sbin/sendmail -t -i -f %email%' + + + AllowOverride All + + php_admin_value open_basedir %home%/%user%/web:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpMyAdmin:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcubemail:/etc/roundcube:/var/lib/roundcube + + RMode config + RUidGid %user% %group% + RGroups www-data + + + AssignUserID %user% %group% + + + IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + + + diff --git a/install/ubuntu/12.04/templates/web/apache2/phpcgi.sh b/install/ubuntu/12.04/templates/web/apache2/phpcgi.sh new file mode 100755 index 000000000..6565e103d --- /dev/null +++ b/install/ubuntu/12.04/templates/web/apache2/phpcgi.sh @@ -0,0 +1,16 @@ +#!/bin/bash +# Adding php wrapper +user="$1" +domain="$2" +ip="$3" +home_dir="$4" +docroot="$5" + +wrapper_script='#!/usr/bin/php-cgi -cphp5-cgi.ini' +wrapper_file="$home_dir/$user/web/$domain/cgi-bin/php" + +echo "$wrapper_script" > $wrapper_file +chown $user:$user $wrapper_file +chmod -f 751 $wrapper_file + +exit 0 diff --git a/install/ubuntu/12.04/templates/web/apache2/phpcgi.stpl b/install/ubuntu/12.04/templates/web/apache2/phpcgi.stpl new file mode 100755 index 000000000..aa5137308 --- /dev/null +++ b/install/ubuntu/12.04/templates/web/apache2/phpcgi.stpl @@ -0,0 +1,35 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %sdocroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + SSLRequireSSL + AllowOverride All + Options +Includes -Indexes +ExecCGI + Action phpcgi-script /cgi-bin/php + + SetHandler phpcgi-script + + + + AllowOverride All + + SSLEngine on + SSLVerifyClient none + SSLCertificateFile %ssl_crt% + SSLCertificateKeyFile %ssl_key% + %ssl_ca_str%SSLCertificateChainFile %ssl_ca% + + IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* + + + diff --git a/install/ubuntu/12.04/templates/web/apache2/phpcgi.tpl b/install/ubuntu/12.04/templates/web/apache2/phpcgi.tpl new file mode 100755 index 000000000..a05ff252d --- /dev/null +++ b/install/ubuntu/12.04/templates/web/apache2/phpcgi.tpl @@ -0,0 +1,28 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %docroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + AllowOverride All + Options +Includes -Indexes +ExecCGI + Action phpcgi-script /cgi-bin/php + + SetHandler phpcgi-script + + + + AllowOverride All + + IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + + + diff --git a/install/ubuntu/12.04/templates/web/apache2/phpfcgid.sh b/install/ubuntu/12.04/templates/web/apache2/phpfcgid.sh new file mode 100755 index 000000000..e80582492 --- /dev/null +++ b/install/ubuntu/12.04/templates/web/apache2/phpfcgid.sh @@ -0,0 +1,22 @@ +#!/bin/bash +# Adding php wrapper +user="$1" +domain="$2" +ip="$3" +home_dir="$4" +docroot="$5" + +wrapper_script="#!/bin/sh +PHPRC=/usr/local/lib +export PHPRC +export PHP_FCGI_MAX_REQUESTS=1000 +export PHP_FCGI_CHILDREN=20 +exec /usr/bin/php-cgi +" +wrapper_file="$home_dir/$user/web/$domain/cgi-bin/fcgi-starter" + +echo "$wrapper_script" > $wrapper_file +chown $user:$user $wrapper_file +chmod -f 751 $wrapper_file + +exit 0 diff --git a/install/ubuntu/12.04/templates/web/apache2/phpfcgid.stpl b/install/ubuntu/12.04/templates/web/apache2/phpfcgid.stpl new file mode 100755 index 000000000..622495756 --- /dev/null +++ b/install/ubuntu/12.04/templates/web/apache2/phpfcgid.stpl @@ -0,0 +1,36 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %sdocroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + SSLRequireSSL + AllowOverride All + Options +Includes -Indexes +ExecCGI + + SetHandler fcgid-script + + FCGIWrapper %home%/%user%/web/%domain%/cgi-bin/fcgi-starter .php + + + AllowOverride All + + php_admin_value open_basedir none + SSLEngine on + SSLVerifyClient none + SSLCertificateFile %ssl_crt% + SSLCertificateKeyFile %ssl_key% + %ssl_ca_str%SSLCertificateChainFile %ssl_ca% + + IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* + + + diff --git a/install/ubuntu/12.04/templates/web/apache2/phpfcgid.tpl b/install/ubuntu/12.04/templates/web/apache2/phpfcgid.tpl new file mode 100755 index 000000000..5c1f16e20 --- /dev/null +++ b/install/ubuntu/12.04/templates/web/apache2/phpfcgid.tpl @@ -0,0 +1,28 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %docroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + AllowOverride All + Options +Includes -Indexes +ExecCGI + + SetHandler fcgid-script + + FCGIWrapper %home%/%user%/web/%domain%/cgi-bin/fcgi-starter .php + + + AllowOverride All + + IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + + + diff --git a/install/ubuntu/12.04/templates/web/awstats/awstats.tpl b/install/ubuntu/12.04/templates/web/awstats/awstats.tpl new file mode 100755 index 000000000..9a92e0fd4 --- /dev/null +++ b/install/ubuntu/12.04/templates/web/awstats/awstats.tpl @@ -0,0 +1,133 @@ +LogFile="/var/log/%web_system%/domains/%domain%.log" +LogType=W +LogFormat=1 +LogSeparator=" " +SiteDomain="%domain_idn%" +HostAliases="%alias_idn%" +DirData="%home%/%user%/web/%domain%/stats" +DirCgi="/vstats" +DirIcons="/vstats/icon" +AllowToUpdateStatsFromBrowser=0 +AllowFullYearView=2 +EnableLockForUpdate=1 +DNSStaticCacheFile="dnscache.txt" +DNSLastUpdateCacheFile="dnscachelastupdate.txt" +SkipDNSLookupFor="" +AllowAccessFromWebToAuthenticatedUsersOnly=0 +AllowAccessFromWebToFollowingAuthenticatedUsers="" +AllowAccessFromWebToFollowingIPAddresses="" +CreateDirDataIfNotExists=0 +BuildHistoryFormat=text +BuildReportFormat=html +SaveDatabaseFilesWithPermissionsForEveryone=0 +PurgeLogFile=0 +ArchiveLogRecords=0 +KeepBackupOfHistoricFiles=1 +DefaultFile="index.php index.html" +SkipHosts="127.0.0.1 +SkipUserAgents="" +SkipFiles="" +SkipReferrersBlackList="" +OnlyHosts="" +OnlyUserAgents="" +OnlyUsers="" +OnlyFiles="" +NotPageList="css js class gif jpg jpeg png bmp ico rss xml swf" +ValidHTTPCodes="200 304" +ValidSMTPCodes="1 250" +AuthenticatedUsersNotCaseSensitive=0 +URLNotCaseSensitive=0 +URLWithAnchor=0 +URLQuerySeparators="?;" +URLWithQuery=0 +URLWithQueryWithOnlyFollowingParameters="" +URLWithQueryWithoutFollowingParameters="" +URLReferrerWithQuery=0 +WarningMessages=1 +ErrorMessages="" +DebugMessages=0 +NbOfLinesForCorruptedLog=50 +WrapperScript="" +DecodeUA=0 +MiscTrackerUrl="/js/awstats_misc_tracker.js" +UseFramesWhenCGI=1 +DetailedReportsOnNewWindows=1 +Expires=3600 +MaxRowsInHTMLOutput=1000 +Lang="auto" +DirLang="./lang" +ShowMenu=1 +ShowSummary=UVPHB +ShowMonthStats=UVPHB +ShowDaysOfMonthStats=VPHB +ShowDaysOfWeekStats=PHB +ShowHoursStats=PHB +ShowDomainsStats=PHB +ShowHostsStats=PHBL +ShowAuthenticatedUsers=0 +ShowRobotsStats=HBL +ShowWormsStats=0 +ShowEMailSenders=0 +ShowEMailReceivers=0 +ShowSessionsStats=1 +ShowPagesStats=PBEX +ShowFileTypesStats=HB +ShowFileSizesStats=0 +ShowDownloadsStats=HB +ShowOSStats=1 +ShowBrowsersStats=1 +ShowScreenSizeStats=0 +ShowOriginStats=PH +ShowKeyphrasesStats=1 +ShowKeywordsStats=1 +ShowMiscStats=a +ShowHTTPErrorsStats=1 +ShowSMTPErrorsStats=0 +ShowClusterStats=0 +AddDataArrayMonthStats=1 +AddDataArrayShowDaysOfMonthStats=1 +AddDataArrayShowDaysOfWeekStats=1 +AddDataArrayShowHoursStats=1 +IncludeInternalLinksInOriginSection=0 +MaxNbOfDomain = 10 +MinHitDomain = 1 +MaxNbOfHostsShown = 10 +MinHitHost = 1 +MaxNbOfLoginShown = 10 +MinHitLogin = 1 +MaxNbOfRobotShown = 10 +MinHitRobot = 1 +MaxNbOfDownloadsShown = 10 +MinHitDownloads = 1 +MaxNbOfPageShown = 10 +MinHitFile = 1 +MaxNbOfOsShown = 10 +MinHitOs = 1 +MaxNbOfBrowsersShown = 10 +MinHitBrowser = 1 +MaxNbOfScreenSizesShown = 5 +MinHitScreenSize = 1 +MaxNbOfWindowSizesShown = 5 +MinHitWindowSize = 1 +MaxNbOfRefererShown = 10 +MinHitRefer = 1 +MaxNbOfKeyphrasesShown = 10 +MinHitKeyphrase = 1 +MaxNbOfKeywordsShown = 10 +MinHitKeyword = 1 +MaxNbOfEMailsShown = 20 +MinHitEMail = 1 +FirstDayOfWeek=0 +ShowFlagLinks="" +ShowLinksOnUrl=1 +UseHTTPSLinkForUrl="" +MaxLengthOfShownURL=64 +HTMLHeadSection="" +HTMLEndSection="" +MetaRobot=0 +Logo="awstats_logo6.png" +LogoLink="http://awstats.sourceforge.net" +BarWidth = 260 +BarHeight = 90 +StyleSheet="" +ExtraTrackedRowsLimit=500 diff --git a/install/ubuntu/12.04/templates/web/awstats/index.tpl b/install/ubuntu/12.04/templates/web/awstats/index.tpl new file mode 100755 index 000000000..9df9bb5cb --- /dev/null +++ b/install/ubuntu/12.04/templates/web/awstats/index.tpl @@ -0,0 +1,10 @@ + + + + Awstats log analyzer + + + + + + diff --git a/install/ubuntu/12.04/templates/web/awstats/nav.tpl b/install/ubuntu/12.04/templates/web/awstats/nav.tpl new file mode 100755 index 000000000..f29bed68b --- /dev/null +++ b/install/ubuntu/12.04/templates/web/awstats/nav.tpl @@ -0,0 +1,23 @@ + + + Awstats navigation + + + + + + + + +
        vesta
        + +
        +
        + + diff --git a/install/ubuntu/12.04/templates/web/nginx/caching.sh b/install/ubuntu/12.04/templates/web/nginx/caching.sh new file mode 100755 index 000000000..6eb9126db --- /dev/null +++ b/install/ubuntu/12.04/templates/web/nginx/caching.sh @@ -0,0 +1,12 @@ +#!/bin/bash + +user=$1 +domain=$2 +ip=$3 +home=$4 +docroot=$5 + +str="proxy_cache_path /var/cache/nginx/$domain levels=2" +str="$str keys_zone=$domain:10m inactive=60m max_size=512m;" +echo "$str" >> /etc/nginx/conf.d/01_caching_pool.conf + diff --git a/install/ubuntu/templates/web/nginx/caching.stpl b/install/ubuntu/12.04/templates/web/nginx/caching.stpl similarity index 100% rename from install/ubuntu/templates/web/nginx/caching.stpl rename to install/ubuntu/12.04/templates/web/nginx/caching.stpl diff --git a/install/ubuntu/templates/web/nginx/caching.tpl b/install/ubuntu/12.04/templates/web/nginx/caching.tpl similarity index 95% rename from install/ubuntu/templates/web/nginx/caching.tpl rename to install/ubuntu/12.04/templates/web/nginx/caching.tpl index 1462f9e1f..36761b65c 100755 --- a/install/ubuntu/templates/web/nginx/caching.tpl +++ b/install/ubuntu/12.04/templates/web/nginx/caching.tpl @@ -37,5 +37,5 @@ server { location ~ /\.hg/ {return 404;} location ~ /\.bzr/ {return 404;} - include %home%/%user%/web/conf/nginx.%domain%.conf*; + include %home%/%user%/conf/web/nginx.%domain%.conf*; } diff --git a/install/ubuntu/12.04/templates/web/nginx/default.stpl b/install/ubuntu/12.04/templates/web/nginx/default.stpl new file mode 100755 index 000000000..fa5380606 --- /dev/null +++ b/install/ubuntu/12.04/templates/web/nginx/default.stpl @@ -0,0 +1,36 @@ +server { + listen %ip%:%proxy_ssl_port%; + server_name %domain_idn% %alias_idn%; + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + error_log /var/log/%web_system%/domains/%domain%.error.log error; + + location / { + proxy_pass https://%ip%:%web_ssl_port%; + location ~* ^.+\.(%proxy_extentions%)$ { + root %sdocroot%; + access_log /var/log/%web_system%/domains/%domain%.log combined; + access_log /var/log/%web_system%/domains/%domain%.bytes bytes; + expires max; + try_files $uri @fallback; + } + } + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location @fallback { + proxy_pass https://%ip%:%web_ssl_port%; + } + + location ~ /\.ht {return 404;} + location ~ /\.svn/ {return 404;} + location ~ /\.git/ {return 404;} + location ~ /\.hg/ {return 404;} + location ~ /\.bzr/ {return 404;} + + include %home%/%user%/conf/web/snginx.%domain%.conf*; +} + diff --git a/install/ubuntu/12.04/templates/web/nginx/default.tpl b/install/ubuntu/12.04/templates/web/nginx/default.tpl new file mode 100755 index 000000000..4d5c774bc --- /dev/null +++ b/install/ubuntu/12.04/templates/web/nginx/default.tpl @@ -0,0 +1,33 @@ +server { + listen %ip%:%proxy_port%; + server_name %domain_idn% %alias_idn%; + error_log /var/log/%web_system%/domains/%domain%.error.log error; + + location / { + proxy_pass http://%ip%:%web_port%; + location ~* ^.+\.(%proxy_extentions%)$ { + root %docroot%; + access_log /var/log/%web_system%/domains/%domain%.log combined; + access_log /var/log/%web_system%/domains/%domain%.bytes bytes; + expires max; + try_files $uri @fallback; + } + } + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location @fallback { + proxy_pass http://%ip%:%web_port%; + } + + location ~ /\.ht {return 404;} + location ~ /\.svn/ {return 404;} + location ~ /\.git/ {return 404;} + location ~ /\.hg/ {return 404;} + location ~ /\.bzr/ {return 404;} + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} + diff --git a/install/ubuntu/12.04/templates/web/nginx/hosting.sh b/install/ubuntu/12.04/templates/web/nginx/hosting.sh new file mode 100755 index 000000000..eeed37ef9 --- /dev/null +++ b/install/ubuntu/12.04/templates/web/nginx/hosting.sh @@ -0,0 +1,11 @@ +#!/bin/bash +# Changing public_html permission +user="$1" +domain="$2" +ip="$3" +home_dir="$4" +docroot="$5" + +chmod 755 $docroot + +exit 0 diff --git a/install/ubuntu/12.04/templates/web/nginx/hosting.stpl b/install/ubuntu/12.04/templates/web/nginx/hosting.stpl new file mode 100755 index 000000000..d778d6333 --- /dev/null +++ b/install/ubuntu/12.04/templates/web/nginx/hosting.stpl @@ -0,0 +1,38 @@ +server { + listen %ip%:%proxy_ssl_port%; + server_name %domain_idn% %alias_idn%; + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + error_log /var/log/%web_system%/domains/%domain%.error.log error; + + location / { + proxy_pass https://%ip%:%web_ssl_port%; + location ~* ^.+\.(%proxy_extentions%)$ { + root %sdocroot%; + access_log /var/log/%web_system%/domains/%domain%.log combined; + access_log /var/log/%web_system%/domains/%domain%.bytes bytes; + expires max; + try_files $uri @fallback; + } + } + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location @fallback { + proxy_pass https://%ip%:%web_ssl_port%; + } + + location ~ /\.ht {return 404;} + location ~ /\.svn/ {return 404;} + location ~ /\.git/ {return 404;} + location ~ /\.hg/ {return 404;} + location ~ /\.bzr/ {return 404;} + + disable_symlinks if_not_owner from=%docroot%; + + include %home%/%user%/conf/web/snginx.%domain%.conf*; +} + diff --git a/install/ubuntu/12.04/templates/web/nginx/hosting.tpl b/install/ubuntu/12.04/templates/web/nginx/hosting.tpl new file mode 100755 index 000000000..15961c95c --- /dev/null +++ b/install/ubuntu/12.04/templates/web/nginx/hosting.tpl @@ -0,0 +1,35 @@ +server { + listen %ip%:%proxy_port%; + server_name %domain_idn% %alias_idn%; + error_log /var/log/%web_system%/domains/%domain%.error.log error; + + location / { + proxy_pass http://%ip%:%web_port%; + location ~* ^.+\.(%proxy_extentions%)$ { + root %docroot%; + access_log /var/log/%web_system%/domains/%domain%.log combined; + access_log /var/log/%web_system%/domains/%domain%.bytes bytes; + expires max; + try_files $uri @fallback; + } + } + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location @fallback { + proxy_pass http://%ip%:%web_port%; + } + + location ~ /\.ht {return 404;} + location ~ /\.svn/ {return 404;} + location ~ /\.git/ {return 404;} + location ~ /\.hg/ {return 404;} + location ~ /\.bzr/ {return 404;} + + disable_symlinks if_not_owner from=%docroot%; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} + diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/cms_made_simple.stpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/cms_made_simple.stpl new file mode 100644 index 000000000..01d82b603 --- /dev/null +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/cms_made_simple.stpl @@ -0,0 +1,51 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + try_files $uri $uri/ /index.php?page=$request_uri; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/cms_made_simple.tpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/cms_made_simple.tpl new file mode 100644 index 000000000..af452d19f --- /dev/null +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/cms_made_simple.tpl @@ -0,0 +1,47 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + try_files $uri $uri/ /index.php?page=$request_uri; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/codeigniter2.stpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/codeigniter2.stpl new file mode 100644 index 000000000..a592a652d --- /dev/null +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/codeigniter2.stpl @@ -0,0 +1,56 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + try_files $uri $uri/ /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location = /index.php { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME /var/www/html/ci$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + location ~ \.php$ { + return 444; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/codeigniter2.tpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/codeigniter2.tpl new file mode 100644 index 000000000..9b955aa6a --- /dev/null +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/codeigniter2.tpl @@ -0,0 +1,52 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + try_files $uri $uri/ /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location = /index.php { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME /var/www/html/ci$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + location ~ \.php$ { + return 444; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/codeigniter3.stpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/codeigniter3.stpl new file mode 100644 index 000000000..4d330d34f --- /dev/null +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/codeigniter3.stpl @@ -0,0 +1,51 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + try_files $uri $uri/ /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/codeigniter3.tpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/codeigniter3.tpl new file mode 100644 index 000000000..1f446e5d3 --- /dev/null +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/codeigniter3.tpl @@ -0,0 +1,47 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + try_files $uri $uri/ /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/datalife_engine.stpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/datalife_engine.stpl new file mode 100644 index 000000000..d1b5bcd24 --- /dev/null +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/datalife_engine.stpl @@ -0,0 +1,122 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + rewrite "^/page/([0-9]+)(/?)$" /index.php?cstart=$1 last; + + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page,([0-9]+),([0-9]+),(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&cstart=$5&news_name=$6&seourl=$6 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page,([0-9]+),(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&news_name=$5&seourl=$5 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/print:page,([0-9]+),(.*).html(/?)+$" /engine/print.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&news_name=$5&seourl=$5 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_name=$4&seourl=$4 last; + + rewrite "^/([^.]+)/page,([0-9]+),([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$4&news_page=$2&cstart=$3&seourl=$5&seocat=$1 last; + rewrite "^/([^.]+)/page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$3&news_page=$2&seourl=$4&seocat=$1 last; + rewrite "^/([^.]+)/print:page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /engine/print.php?news_page=$2&newsid=$3&seourl=$4&seocat=$1 last; + rewrite "^/([^.]+)/([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$2&seourl=$3&seocat=$1 last; + + rewrite "^/page,([0-9]+),([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$3&news_page=$1&cstart=$2&seourl=$4 last; + rewrite "^/page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$2&news_page=$1&seourl=$3 last; + rewrite "^/print:page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /engine/print.php?news_page=$1&newsid=$2&seourl=$3 last; + rewrite "^/([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$1&seourl=$2 last; + + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})(/?)+$" /index.php?year=$1&month=$2&day=$3 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page/([0-9]+)(/?)+$" /index.php?year=$1&month=$2&day=$3&cstart=$4 last; + + rewrite "^/([0-9]{4})/([0-9]{2})(/?)+$" /index.php?year=$1&month=$2 last; + rewrite "^/([0-9]{4})/([0-9]{2})/page/([0-9]+)(/?)+$" /index.php?year=$1&month=$2&cstart=$3 last; + + rewrite "^/([0-9]{4})(/?)+$" /index.php?year=$1 last; + rewrite "^/([0-9]{4})/page/([0-9]+)(/?)+$" /index.php?year=$1&cstart=$2 last; + + rewrite "^/tags/([^/]*)(/?)+$" /index.php?do=tags&tag=$1 last; + rewrite "^/tags/([^/]*)/page/([0-9]+)(/?)+$" /index.php?do=tags&tag=$1&cstart=$2 last; + + rewrite "^/xfsearch/([^/]*)(/?)+$" /index.php?do=xfsearch&xf=$1 last; + rewrite "^/xfsearch/([^/]*)/page/([0-9]+)(/?)+$" /index.php?do=xfsearch&xf=$1&cstart=$2 last; + + rewrite "^/user/([^/]*)/rss.xml$" /engine/rss.php?subaction=allnews&user=$1 last; + rewrite "^/user/([^/]*)(/?)+$" /index.php?subaction=userinfo&user=$1 last; + rewrite "^/user/([^/]*)/page/([0-9]+)(/?)+$" /index.php?subaction=userinfo&user=$1&cstart=$2 last; + rewrite "^/user/([^/]*)/news(/?)+$" /index.php?subaction=allnews&user=$1 last; + rewrite "^/user/([^/]*)/news/page/([0-9]+)(/?)+$" /index.php?subaction=allnews&user=$1&cstart=$2 last; + rewrite "^/user/([^/]*)/news/rss.xml(/?)+$" /engine/rss.php?subaction=allnews&user=$1 last; + + rewrite "^/lastnews(/?)+$" /index.php?do=lastnews last; + rewrite "^/lastnews/page/([0-9]+)(/?)+$" /index.php?do=lastnews&cstart=$1 last; + + rewrite "^/catalog/([^/]*)/rss.xml$" /engine/rss.php?catalog=$1 last; + rewrite "^/catalog/([^/]*)(/?)+$" /index.php?catalog=$1 last; + rewrite "^/catalog/([^/]*)/page/([0-9]+)(/?)+$" /index.php?catalog=$1&cstart=$2 last; + + rewrite "^/newposts(/?)+$" /index.php?subaction=newposts last; + rewrite "^/newposts/page/([0-9]+)(/?)+$" /index.php?subaction=newposts&cstart=$1 last; + + rewrite "^/favorites(/?)+$" /index.php?do=favorites last; + rewrite "^/favorites/page/([0-9]+)(/?)+$" /index.php?do=favorites&cstart=$1 last; + + rewrite "^/rules.html$" /index.php?do=rules last; + rewrite "^/statistics.html$" /index.php?do=stats last; + rewrite "^/addnews.html$" /index.php?do=addnews last; + rewrite "^/rss.xml$" /engine/rss.php last; + rewrite "^/sitemap.xml$" /uploads/sitemap.xml last; + + if (!-d $request_filename) { + rewrite "^/([^.]+)/page/([0-9]+)(/?)+$" /index.php?do=cat&category=$1&cstart=$2 last; + rewrite "^/([^.]+)/?$" /index.php?do=cat&category=$1 last; + } + + if (!-f $request_filename) { + rewrite "^/([^.]+)/rss.xml$" /engine/rss.php?do=cat&category=$1 last; + rewrite "^/page,([0-9]+),([^/]+).html$" /index.php?do=static&page=$2&news_page=$1 last; + rewrite "^/print:([^/]+).html$" /engine/print.php?do=static&page=$1 last; + } + + if (!-f $request_filename) { + rewrite "^/([^/]+).html$" /index.php?do=static&page=$1 last; + } + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/datalife_engine.tpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/datalife_engine.tpl new file mode 100644 index 000000000..ff33c2325 --- /dev/null +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/datalife_engine.tpl @@ -0,0 +1,118 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + rewrite "^/page/([0-9]+)(/?)$" /index.php?cstart=$1 last; + + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page,([0-9]+),([0-9]+),(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&cstart=$5&news_name=$6&seourl=$6 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page,([0-9]+),(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&news_name=$5&seourl=$5 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/print:page,([0-9]+),(.*).html(/?)+$" /engine/print.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&news_name=$5&seourl=$5 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_name=$4&seourl=$4 last; + + rewrite "^/([^.]+)/page,([0-9]+),([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$4&news_page=$2&cstart=$3&seourl=$5&seocat=$1 last; + rewrite "^/([^.]+)/page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$3&news_page=$2&seourl=$4&seocat=$1 last; + rewrite "^/([^.]+)/print:page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /engine/print.php?news_page=$2&newsid=$3&seourl=$4&seocat=$1 last; + rewrite "^/([^.]+)/([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$2&seourl=$3&seocat=$1 last; + + rewrite "^/page,([0-9]+),([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$3&news_page=$1&cstart=$2&seourl=$4 last; + rewrite "^/page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$2&news_page=$1&seourl=$3 last; + rewrite "^/print:page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /engine/print.php?news_page=$1&newsid=$2&seourl=$3 last; + rewrite "^/([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$1&seourl=$2 last; + + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})(/?)+$" /index.php?year=$1&month=$2&day=$3 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page/([0-9]+)(/?)+$" /index.php?year=$1&month=$2&day=$3&cstart=$4 last; + + rewrite "^/([0-9]{4})/([0-9]{2})(/?)+$" /index.php?year=$1&month=$2 last; + rewrite "^/([0-9]{4})/([0-9]{2})/page/([0-9]+)(/?)+$" /index.php?year=$1&month=$2&cstart=$3 last; + + rewrite "^/([0-9]{4})(/?)+$" /index.php?year=$1 last; + rewrite "^/([0-9]{4})/page/([0-9]+)(/?)+$" /index.php?year=$1&cstart=$2 last; + + rewrite "^/tags/([^/]*)(/?)+$" /index.php?do=tags&tag=$1 last; + rewrite "^/tags/([^/]*)/page/([0-9]+)(/?)+$" /index.php?do=tags&tag=$1&cstart=$2 last; + + rewrite "^/xfsearch/([^/]*)(/?)+$" /index.php?do=xfsearch&xf=$1 last; + rewrite "^/xfsearch/([^/]*)/page/([0-9]+)(/?)+$" /index.php?do=xfsearch&xf=$1&cstart=$2 last; + + rewrite "^/user/([^/]*)/rss.xml$" /engine/rss.php?subaction=allnews&user=$1 last; + rewrite "^/user/([^/]*)(/?)+$" /index.php?subaction=userinfo&user=$1 last; + rewrite "^/user/([^/]*)/page/([0-9]+)(/?)+$" /index.php?subaction=userinfo&user=$1&cstart=$2 last; + rewrite "^/user/([^/]*)/news(/?)+$" /index.php?subaction=allnews&user=$1 last; + rewrite "^/user/([^/]*)/news/page/([0-9]+)(/?)+$" /index.php?subaction=allnews&user=$1&cstart=$2 last; + rewrite "^/user/([^/]*)/news/rss.xml(/?)+$" /engine/rss.php?subaction=allnews&user=$1 last; + + rewrite "^/lastnews(/?)+$" /index.php?do=lastnews last; + rewrite "^/lastnews/page/([0-9]+)(/?)+$" /index.php?do=lastnews&cstart=$1 last; + + rewrite "^/catalog/([^/]*)/rss.xml$" /engine/rss.php?catalog=$1 last; + rewrite "^/catalog/([^/]*)(/?)+$" /index.php?catalog=$1 last; + rewrite "^/catalog/([^/]*)/page/([0-9]+)(/?)+$" /index.php?catalog=$1&cstart=$2 last; + + rewrite "^/newposts(/?)+$" /index.php?subaction=newposts last; + rewrite "^/newposts/page/([0-9]+)(/?)+$" /index.php?subaction=newposts&cstart=$1 last; + + rewrite "^/favorites(/?)+$" /index.php?do=favorites last; + rewrite "^/favorites/page/([0-9]+)(/?)+$" /index.php?do=favorites&cstart=$1 last; + + rewrite "^/rules.html$" /index.php?do=rules last; + rewrite "^/statistics.html$" /index.php?do=stats last; + rewrite "^/addnews.html$" /index.php?do=addnews last; + rewrite "^/rss.xml$" /engine/rss.php last; + rewrite "^/sitemap.xml$" /uploads/sitemap.xml last; + + if (!-d $request_filename) { + rewrite "^/([^.]+)/page/([0-9]+)(/?)+$" /index.php?do=cat&category=$1&cstart=$2 last; + rewrite "^/([^.]+)/?$" /index.php?do=cat&category=$1 last; + } + + if (!-f $request_filename) { + rewrite "^/([^.]+)/rss.xml$" /engine/rss.php?do=cat&category=$1 last; + rewrite "^/page,([0-9]+),([^/]+).html$" /index.php?do=static&page=$2&news_page=$1 last; + rewrite "^/print:([^/]+).html$" /engine/print.php?do=static&page=$1 last; + } + + if (!-f $request_filename) { + rewrite "^/([^/]+).html$" /index.php?do=static&page=$1 last; + } + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/default.stpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/default.stpl new file mode 100644 index 000000000..a68c99861 --- /dev/null +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/default.stpl @@ -0,0 +1,50 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %sdocroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/snginx.%domain%.conf*; +} diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/default.tpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/default.tpl new file mode 100644 index 000000000..b143e53ba --- /dev/null +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/default.tpl @@ -0,0 +1,46 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/dokuwiki.stpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/dokuwiki.stpl new file mode 100644 index 000000000..27483cd8c --- /dev/null +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/dokuwiki.stpl @@ -0,0 +1,67 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + index doku.php; + try_files $uri $uri/ @dokuwiki; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + location ^~ /lib/ { + expires 30d; + } + + location ^~ /conf/ { return 403; } + location ^~ /data/ { return 403; } + + location @dokuwiki { + rewrite ^/_media/(.*) /lib/exe/fetch.php?media=$1 last; + rewrite ^/_detail/(.*) /lib/exe/detail.php?media=$1 last; + rewrite ^/_export/([^/]+)/(.*) /doku.php?do=export_$1&id=$2 last; + rewrite ^/(.*) /doku.php?id=$1 last; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/dokuwiki.tpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/dokuwiki.tpl new file mode 100644 index 000000000..31647c9ff --- /dev/null +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/dokuwiki.tpl @@ -0,0 +1,62 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + index doku.php; + try_files $uri $uri/ @dokuwiki; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + location ^~ /lib/ { + expires 30d; + } + + location ^~ /conf/ { return 403; } + location ^~ /data/ { return 403; } + location @dokuwiki { + rewrite ^/_media/(.*) /lib/exe/fetch.php?media=$1 last; + rewrite ^/_detail/(.*) /lib/exe/detail.php?media=$1 last; + rewrite ^/_export/([^/]+)/(.*) /doku.php?do=export_$1&id=$2 last; + rewrite ^/(.*) /doku.php?id=$1 last; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/drupal.stpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/drupal.stpl new file mode 100644 index 000000000..9a5484396 --- /dev/null +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/drupal.stpl @@ -0,0 +1,101 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + + location / { + try_files $uri @rewrite; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # You have 2 options here + # For D7 and above: + # Clean URLs are handled in drupal_environment_initialize(). + rewrite ^ /index.php; + + # For Drupal 6 and bwlow: + # Some modules enforce no slash (/) at the end of the URL + # Else this rewrite block wouldn't be needed (GlobalRedirect) + #rewrite ^/(.*)$ /index.php?q=$1; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/drupal.tpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/drupal.tpl new file mode 100644 index 000000000..417762c18 --- /dev/null +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/drupal.tpl @@ -0,0 +1,98 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + # Very rarely should these ever be accessed outside of your lan + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + + location / { + try_files $uri @rewrite; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # You have 2 options here + # For D7 and above: + # Clean URLs are handled in drupal_environment_initialize(). + rewrite ^ /index.php; + + # For Drupal 6 and bwlow: + # Some modules enforce no slash (/) at the end of the URL + # Else this rewrite block wouldn't be needed (GlobalRedirect) + #rewrite ^/(.*)$ /index.php?q=$1; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/joomla.stpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/joomla.stpl new file mode 100644 index 000000000..235a01216 --- /dev/null +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/joomla.stpl @@ -0,0 +1,58 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + try_files $uri $uri/ /index.php?$args; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + # deny running scripts inside writable directories + location ~* /(images|cache|media|logs|tmp)/.*\.(php|pl|py|jsp|asp|sh|cgi)$ { + return 403; + error_page 403 /403_error.html; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/joomla.tpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/joomla.tpl new file mode 100644 index 000000000..997c268de --- /dev/null +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/joomla.tpl @@ -0,0 +1,54 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + try_files $uri $uri/ /index.php?$args; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + # deny running scripts inside writable directories + location ~* /(images|cache|media|logs|tmp)/.*\.(php|pl|py|jsp|asp|sh|cgi)$ { + return 403; + error_page 403 /403_error.html; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/owncloud.stpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/owncloud.stpl new file mode 100644 index 000000000..8311ca43f --- /dev/null +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/owncloud.stpl @@ -0,0 +1,80 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + rewrite ^/caldav(.*)$ /remote.php/caldav$1 redirect; + rewrite ^/carddav(.*)$ /remote.php/carddav$1 redirect; + rewrite ^/webdav(.*)$ /remote.php/webdav$1 redirect; + + error_page 403 = /core/templates/403.php; + error_page 404 = /core/templates/404.php; + + location ~ ^/(?:\.htaccess|data|config|db_structure\.xml|README){ + deny all; + } + + location / { + # The following 2 rules are only needed with webfinger + rewrite ^/.well-known/host-meta /public.php?service=host-meta last; + rewrite ^/.well-known/host-meta.json /public.php?service=host-meta-json last; + rewrite ^/.well-known/carddav /remote.php/carddav/ redirect; + rewrite ^/.well-known/caldav /remote.php/caldav/ redirect; + rewrite ^(/core/doc/[^\/]+/)$ $1/index.html; + try_files $uri $uri/ /index.php; + + location ~ \.php(?:$|/) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param PATH_INFO $fastcgi_path_info; + #fastcgi_param HTTPS on; + fastcgi_pass %backend_lsnr%; + } + } + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + # Some basic cache-control for static files to be sent to the browser + add_header Pragma public; + add_header Cache-Control "public, must-revalidate, proxy-revalidate"; + } + + #error_page 403 /error/404.html; + #error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/owncloud.tpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/owncloud.tpl new file mode 100644 index 000000000..57cac2f85 --- /dev/null +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/owncloud.tpl @@ -0,0 +1,76 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + rewrite ^/caldav(.*)$ /remote.php/caldav$1 redirect; + rewrite ^/carddav(.*)$ /remote.php/carddav$1 redirect; + rewrite ^/webdav(.*)$ /remote.php/webdav$1 redirect; + + error_page 403 = /core/templates/403.php; + error_page 404 = /core/templates/404.php; + + location ~ ^/(?:\.htaccess|data|config|db_structure\.xml|README){ + deny all; + } + + location / { + # The following 2 rules are only needed with webfinger + rewrite ^/.well-known/host-meta /public.php?service=host-meta last; + rewrite ^/.well-known/host-meta.json /public.php?service=host-meta-json last; + rewrite ^/.well-known/carddav /remote.php/carddav/ redirect; + rewrite ^/.well-known/caldav /remote.php/caldav/ redirect; + rewrite ^(/core/doc/[^\/]+/)$ $1/index.html; + try_files $uri $uri/ /index.php; + + location ~ \.php(?:$|/) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param PATH_INFO $fastcgi_path_info; + #fastcgi_param HTTPS on; + fastcgi_pass %backend_lsnr%; + } + } + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + # Some basic cache-control for static files to be sent to the browser + add_header Pragma public; + add_header Cache-Control "public, must-revalidate, proxy-revalidate"; + } + + #error_page 403 /error/404.html; + #error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/piwik.stpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/piwik.stpl new file mode 100644 index 000000000..c53af4011 --- /dev/null +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/piwik.stpl @@ -0,0 +1,68 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location = /favicon.ico { + try_files /favicon.ico =204; + } + + location / { + try_files $uri /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + valid_referers none blocked %domain_idn% %alias_idn%; + if ($invalid_referer) { + return 444; + } + expires max; + } + + location ~* ^/(?:index|piwik)\.php$ { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + include /etc/nginx/fastcgi_params; + } + } + + # Any other attempt to access PHP files returns a 404. + location ~* ^.+\.php$ { + return 404; + } + + # Return a 404 for all text files. + location ~* ^/(?:README|LICENSE[^.]*|LEGALNOTICE)(?:\.txt)*$ { + return 404; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/piwik.tpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/piwik.tpl new file mode 100644 index 000000000..6b4a94a68 --- /dev/null +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/piwik.tpl @@ -0,0 +1,64 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location = /favicon.ico { + try_files /favicon.ico =204; + } + + location / { + try_files $uri /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + valid_referers none blocked %domain_idn% %alias_idn%; + if ($invalid_referer) { + return 444; + } + expires max; + } + + location ~* ^/(?:index|piwik)\.php$ { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + include /etc/nginx/fastcgi_params; + } + } + + # Any other attempt to access PHP files returns a 404. + location ~* ^.+\.php$ { + return 404; + } + + # Return a 404 for all text files. + location ~* ^/(?:README|LICENSE[^.]*|LEGALNOTICE)(?:\.txt)*$ { + return 404; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/pyrocms.stpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/pyrocms.stpl new file mode 100644 index 000000000..a6fc67556 --- /dev/null +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/pyrocms.stpl @@ -0,0 +1,61 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location /installer { + try_files $uri $uri/ /installer/index.php; + } + + location / { + try_files $uri $uri/ /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + location = /robots.txt { access_log off; log_not_found off; } + location = /favicon.ico { access_log off; log_not_found off; } + location ~ /\. { access_log off; log_not_found off; deny all; } + location ~ ~$ { access_log off; log_not_found off; deny all; } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/pyrocms.tpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/pyrocms.tpl new file mode 100644 index 000000000..68b378efd --- /dev/null +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/pyrocms.tpl @@ -0,0 +1,57 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location /installer { + try_files $uri $uri/ /installer/index.php; + } + + location / { + try_files $uri $uri/ /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + location = /robots.txt { access_log off; log_not_found off; } + location = /favicon.ico { access_log off; log_not_found off; } + location ~ /\. { access_log off; log_not_found off; deny all; } + location ~ ~$ { access_log off; log_not_found off; deny all; } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/wordpress.stpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/wordpress.stpl new file mode 100644 index 000000000..910c28b69 --- /dev/null +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/wordpress.stpl @@ -0,0 +1,50 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/wordpress.tpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/wordpress.tpl new file mode 100644 index 000000000..b143e53ba --- /dev/null +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/wordpress.tpl @@ -0,0 +1,46 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/wordpress2.stpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/wordpress2.stpl new file mode 100644 index 000000000..2822f8754 --- /dev/null +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/wordpress2.stpl @@ -0,0 +1,62 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + location / { + try_files $uri $uri/ /index.php?$args; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/wordpress2.tpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/wordpress2.tpl new file mode 100644 index 000000000..37b8be305 --- /dev/null +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/wordpress2.tpl @@ -0,0 +1,58 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + location / { + try_files $uri $uri/ /index.php?$args; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/12.04/templates/web/nginx/proxy_ip.tpl b/install/ubuntu/12.04/templates/web/nginx/proxy_ip.tpl new file mode 100755 index 000000000..ae1956173 --- /dev/null +++ b/install/ubuntu/12.04/templates/web/nginx/proxy_ip.tpl @@ -0,0 +1,9 @@ +server { + listen %ip%:%proxy_port% default; + server_name _; + #access_log /var/log/nginx/%ip%.log main; + location / { + proxy_pass http://%ip%:%web_port%; + } +} + diff --git a/install/ubuntu/12.04/templates/web/php5-fpm/default.tpl b/install/ubuntu/12.04/templates/web/php5-fpm/default.tpl new file mode 100644 index 000000000..44ccf7a42 --- /dev/null +++ b/install/ubuntu/12.04/templates/web/php5-fpm/default.tpl @@ -0,0 +1,18 @@ +[%backend%] +listen = 127.0.0.1:%backend_port% +listen.allowed_clients = 127.0.0.1 + +user = %user% +group = %user% + +pm = dynamic +pm.max_children = 50 +pm.start_servers = 3 +pm.min_spare_servers = 2 +pm.max_spare_servers = 10 + +env[HOSTNAME] = $HOSTNAME +env[PATH] = /usr/local/bin:/usr/bin:/bin +env[TMP] = /tmp +env[TMPDIR] = /tmp +env[TEMP] = /tmp diff --git a/install/ubuntu/12.04/templates/web/php5-fpm/no-php.tpl b/install/ubuntu/12.04/templates/web/php5-fpm/no-php.tpl new file mode 100644 index 000000000..89487d5f5 --- /dev/null +++ b/install/ubuntu/12.04/templates/web/php5-fpm/no-php.tpl @@ -0,0 +1,13 @@ +#[%backend%] +#user = %user% +#group = %user% +#listen = /dev/null + +#listen.owner = %user% +#listen.group = nginx + +#pm = dynamic +#pm.max_children = 50 +#pm.start_servers = 3 +#pm.min_spare_servers = 2 +#pm.max_spare_servers = 10 diff --git a/install/ubuntu/12.04/templates/web/php5-fpm/socket.tpl b/install/ubuntu/12.04/templates/web/php5-fpm/socket.tpl new file mode 100644 index 000000000..f0513da3e --- /dev/null +++ b/install/ubuntu/12.04/templates/web/php5-fpm/socket.tpl @@ -0,0 +1,21 @@ +[%backend%] +listen = /var/run/php5-%backend%.sock +listen.allowed_clients = 127.0.0.1 + +user = %user% +group = %user% + +listen.owner = %user% +listen.group = nginx + +pm = dynamic +pm.max_children = 50 +pm.start_servers = 3 +pm.min_spare_servers = 2 +pm.max_spare_servers = 10 + +env[HOSTNAME] = $HOSTNAME +env[PATH] = /usr/local/bin:/usr/bin:/bin +env[TMP] = /tmp +env[TMPDIR] = /tmp +env[TEMP] = /tmp diff --git a/install/ubuntu/12.04/templates/web/skel/document_errors/403.html b/install/ubuntu/12.04/templates/web/skel/document_errors/403.html new file mode 100755 index 000000000..9c3f6baab --- /dev/null +++ b/install/ubuntu/12.04/templates/web/skel/document_errors/403.html @@ -0,0 +1,29 @@ + + + 403 — Forbidden + + + + + + +

        %domain%

        + +

        403

        +

        Forbidden

        +
        + Unfortunately, you do not have permission to view this +
        + + + diff --git a/install/ubuntu/12.04/templates/web/skel/document_errors/404.html b/install/ubuntu/12.04/templates/web/skel/document_errors/404.html new file mode 100755 index 000000000..2cee77084 --- /dev/null +++ b/install/ubuntu/12.04/templates/web/skel/document_errors/404.html @@ -0,0 +1,28 @@ + + + 404 — Not Found + + + + + + +

        %domain%

        +

        404

        +

        Page Not Found

        +
        + It seems that the page you were trying to reach does not exist anymore, or maybe it has just moved. + You can start again from the home or go back to previous page. +
        + + diff --git a/install/ubuntu/12.04/templates/web/skel/document_errors/50x.html b/install/ubuntu/12.04/templates/web/skel/document_errors/50x.html new file mode 100755 index 000000000..85ba648b7 --- /dev/null +++ b/install/ubuntu/12.04/templates/web/skel/document_errors/50x.html @@ -0,0 +1,29 @@ + + + 500 — Internal Sever Error + + + + + + +

        %domain%

        + +

        500

        +

        Internal Server Error

        +
        + Sorry, something went wrong :( +
        + + + diff --git a/install/ubuntu/12.04/templates/web/skel/public_html/index.html b/install/ubuntu/12.04/templates/web/skel/public_html/index.html new file mode 100755 index 000000000..4f5bb7244 --- /dev/null +++ b/install/ubuntu/12.04/templates/web/skel/public_html/index.html @@ -0,0 +1,26 @@ + + + %domain% — Coming Soon + + + + + + +

        %domain%

        + + + + + diff --git a/install/ubuntu/12.04/templates/web/skel/public_html/robots.txt b/install/ubuntu/12.04/templates/web/skel/public_html/robots.txt new file mode 100755 index 000000000..00ee83dcf --- /dev/null +++ b/install/ubuntu/12.04/templates/web/skel/public_html/robots.txt @@ -0,0 +1,3 @@ +# vestacp autogenerated robots.txt +User-agent: * +Crawl-delay: 10 diff --git a/install/ubuntu/12.04/templates/web/skel/public_shtml/index.html b/install/ubuntu/12.04/templates/web/skel/public_shtml/index.html new file mode 100755 index 000000000..4f5bb7244 --- /dev/null +++ b/install/ubuntu/12.04/templates/web/skel/public_shtml/index.html @@ -0,0 +1,26 @@ + + + %domain% — Coming Soon + + + + + + +

        %domain%

        + + + + + diff --git a/install/ubuntu/12.04/templates/web/skel/public_shtml/robots.txt b/install/ubuntu/12.04/templates/web/skel/public_shtml/robots.txt new file mode 100755 index 000000000..00ee83dcf --- /dev/null +++ b/install/ubuntu/12.04/templates/web/skel/public_shtml/robots.txt @@ -0,0 +1,3 @@ +# vestacp autogenerated robots.txt +User-agent: * +Crawl-delay: 10 diff --git a/install/ubuntu/12.04/templates/web/suspend/.htaccess b/install/ubuntu/12.04/templates/web/suspend/.htaccess new file mode 100755 index 000000000..5a6df83fb --- /dev/null +++ b/install/ubuntu/12.04/templates/web/suspend/.htaccess @@ -0,0 +1,2 @@ +ErrorDocument 403 /index.html +ErrorDocument 404 /index.html diff --git a/install/ubuntu/12.04/templates/web/suspend/index.html b/install/ubuntu/12.04/templates/web/suspend/index.html new file mode 100755 index 000000000..9d4fa67b3 --- /dev/null +++ b/install/ubuntu/12.04/templates/web/suspend/index.html @@ -0,0 +1,27 @@ + + + SUSPEND + + + + + + +

        SUSPEND

        +

        This site has been suspended

        +
        + Please contact technical support departament. +
        + + + diff --git a/install/ubuntu/12.04/templates/web/webalizer/webalizer.tpl b/install/ubuntu/12.04/templates/web/webalizer/webalizer.tpl new file mode 100755 index 000000000..068adcfb9 --- /dev/null +++ b/install/ubuntu/12.04/templates/web/webalizer/webalizer.tpl @@ -0,0 +1,110 @@ +HostName %domain_idn% +LogFile /var/log/%web_system%/domains/%domain%.log +OutputDir %home%/%user%/web/%domain%/stats +HistoryName %home%/%user%/web/%domain%/stats/%domain%.hist +Incremental yes +IncrementalName %home%/%user%/web/%domain%/stats/%domain%.current +PageType htm* +PageType cgi +PageType php +PageType shtml +DNSCache /var/lib/webalizer/dns_cache.db +DNSChildren 10 +Quiet yes +FoldSeqErr yes +IndexAlias index.php +HideURL *.gif +HideURL *.GIF +HideURL *.jpg +HideURL *.JPG +HideURL *.png +HideURL *.PNG +HideURL *.ra +SearchEngine abcsearch. terms= +SearchEngine alexa. q= +SearchEngine alltheweb. q= +SearchEngine alltheweb. query= +SearchEngine alot. q= +SearchEngine altavista. q= +SearchEngine aolsearch. query= +SearchEngine aport.ru r= +SearchEngine ask. q= +SearchEngine atlas.cz q= +SearchEngine bbc. q= +SearchEngine bing. q= +SearchEngine blingo. q= +SearchEngine blogs.yandex.ru text= +SearchEngine btopenworld query= +SearchEngine buscador.ya.com q= +SearchEngine busca. q= +SearchEngine business. query= +SearchEngine centrum.cz q= +SearchEngine chiff. q= +SearchEngine clusty. query= +SearchEngine comcast. q= +SearchEngine crawler. q= +SearchEngine cuil. q= +SearchEngine dmoz. search= +SearchEngine dogpile.com q= +SearchEngine dpxml qkw= +SearchEngine eureka. searchword= +SearchEngine euroseek. string= +SearchEngine exalead. q= +SearchEngine excite search= +SearchEngine ezilon. q= +SearchEngine fastbrowsersearch. q= +SearchEngine feedster.com q= +SearchEngine fireball.de q= +SearchEngine fireball. keyword= +SearchEngine freeserve. q= +SearchEngine gigablast. q= +SearchEngine gogo.ru q= +SearchEngine go.mail.ru q= +SearchEngine google. q= +SearchEngine hakia. q= +SearchEngine hotbot. query= +SearchEngine infoseek. qt= +SearchEngine iwon searchfor= +SearchEngine ixquick.com query= +SearchEngine joeant. keywords= +SearchEngine jyxo.cz s= +SearchEngine looksmart. key= +SearchEngine lycos. query= +SearchEngine mamma. q= +SearchEngine metacrawler q= +SearchEngine msn. MT= +SearchEngine msxml qkw= +SearchEngine mysearch. searchfor= +SearchEngine mywebsearch. searchfor= +SearchEngine netscape. q= +SearchEngine nigma.ru q= +SearchEngine northernlight. qr= +SearchEngine ntlworld. q= +SearchEngine orange. q= +SearchEngine overture. Keywords= +SearchEngine punto.ru text= +SearchEngine rambler. keyword= +SearchEngine search.aol. q= +SearchEngine search.babylon. q= +SearchEngine search.centrum. phrase= +SearchEngine search.conduit. q= +SearchEngine search.earthlink q= +SearchEngine search.icq. q= +SearchEngine search.live.com q= +SearchEngine search.rambler.ru words= +SearchEngine search.winamp. q= +SearchEngine searchy. q= +SearchEngine seznam.cz w= +SearchEngine snap. query= +SearchEngine teoma. q= +SearchEngine teradex.com q= +SearchEngine ukplus key= +SearchEngine verizon. q= +SearchEngine virginmedia. q= +SearchEngine voila. rdata= +SearchEngine webcrawler searchText= +SearchEngine web.search.naver. query= +SearchEngine wisenut q= +SearchEngine yahoo. p= +SearchEngine yandex. text= +SearchEngine yodao. q= diff --git a/install/ubuntu/12.04/vsftpd/vsftpd.conf b/install/ubuntu/12.04/vsftpd/vsftpd.conf new file mode 100644 index 000000000..0902899e7 --- /dev/null +++ b/install/ubuntu/12.04/vsftpd/vsftpd.conf @@ -0,0 +1,24 @@ +anonymous_enable=NO +local_enable=YES +write_enable=YES +local_umask=002 +anon_upload_enable=NO +dirmessage_enable=YES +xferlog_enable=YES +connect_from_port_20=YES +xferlog_std_format=YES +dual_log_enable=YES +chroot_local_user=YES +listen=YES +pam_service_name=vsftpd +userlist_enable=NO +tcp_wrappers=YES +force_dot_files=YES +ascii_upload_enable=YES +ascii_download_enable=YES +#allow_writable_chroot=YES +allow_writeable_chroot=YES +seccomp_sandbox=NO +pasv_enable=YES +pasv_max_port=12100 +pasv_min_port=12000 diff --git a/install/ubuntu/12.10/apache2/apache2.conf b/install/ubuntu/12.10/apache2/apache2.conf new file mode 100644 index 000000000..221780117 --- /dev/null +++ b/install/ubuntu/12.10/apache2/apache2.conf @@ -0,0 +1,86 @@ +# It is split into several files forming the configuration hierarchy outlined +# below, all located in the /etc/apache2/ directory: +# +# /etc/apache2/ +# |-- apache2.conf +# | `-- ports.conf +# |-- mods-enabled +# | |-- *.load +# | `-- *.conf +# |-- conf.d +# | `-- * + +# Global configuration +PidFile ${APACHE_PID_FILE} +Timeout 30 +KeepAlive Off +MaxKeepAliveRequests 100 +KeepAliveTimeout 10 + + + StartServers 8 + MinSpareServers 5 + MaxSpareServers 20 + ServerLimit 256 + MaxClients 200 + MaxRequestsPerChild 4000 + + + + StartServers 2 + MinSpareThreads 25 + MaxSpareThreads 75 + ThreadLimit 64 + ThreadsPerChild 25 + MaxClients 200 + MaxRequestsPerChild 4000 + + + + StartServers 2 + MinSpareThreads 25 + MaxSpareThreads 75 + ThreadLimit 64 + ThreadsPerChild 25 + MaxClients 200 + MaxRequestsPerChild 4000 + + +# These need to be set in /etc/apache2/envvars +User ${APACHE_RUN_USER} +Group ${APACHE_RUN_GROUP} +#User www-data +#Group www-data + +AccessFileName .htaccess + + + Order allow,deny + Deny from all + Satisfy all + + +DefaultType None +HostnameLookups Off + +ErrorLog ${APACHE_LOG_DIR}/error.log +LogLevel warn + +# Include module configuration: +Include mods-enabled/*.load +Include mods-enabled/*.conf + +# Include list of ports to listen on and which to use for name based vhosts +Include ports.conf + +LogFormat "%v:%p %h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" vhost_combined +LogFormat "%h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" combined +LogFormat "%h %l %u %t \"%r\" %>s %O" common +LogFormat "%{Referer}i -> %U" referer +LogFormat "%{User-agent}i" agent +LogFormat "%b" bytes + +Include conf.d/ + +# Include the virtual host configurations: +#Include sites-enabled/ diff --git a/install/ubuntu/12.10/apache2/status.conf b/install/ubuntu/12.10/apache2/status.conf new file mode 100644 index 000000000..da9d96333 --- /dev/null +++ b/install/ubuntu/12.10/apache2/status.conf @@ -0,0 +1,8 @@ +Listen 127.0.0.1:8081 + + SetHandler server-status + Order deny,allow + Deny from all + Allow from 127.0.0.1 + Allow from all + diff --git a/install/ubuntu/12.10/bind/named.conf b/install/ubuntu/12.10/bind/named.conf new file mode 100644 index 000000000..ed6ece885 --- /dev/null +++ b/install/ubuntu/12.10/bind/named.conf @@ -0,0 +1,12 @@ +// This is the primary configuration file for the BIND DNS server named. +// +// Please read /usr/share/doc/bind9/README.Debian.gz for information on the +// structure of BIND configuration files in Debian, *BEFORE* you customize +// this configuration file. +// +// If you are just adding zones, please do that in /etc/bind/named.conf.local + +include "/etc/bind/named.conf.options"; +include "/etc/bind/named.conf.local"; +include "/etc/bind/named.conf.default-zones"; + diff --git a/install/ubuntu/12.10/clamav/clamd.conf b/install/ubuntu/12.10/clamav/clamd.conf new file mode 100644 index 000000000..ea982697a --- /dev/null +++ b/install/ubuntu/12.10/clamav/clamd.conf @@ -0,0 +1,61 @@ +#Automatically Generated by clamav-base postinst +#To reconfigure clamd run #dpkg-reconfigure clamav-base +#Please read /usr/share/doc/clamav-base/README.Debian.gz for details +LocalSocket /var/run/clamav/clamd.ctl +FixStaleSocket true +LocalSocketGroup clamav +LocalSocketMode 666 +# TemporaryDirectory is not set to its default /tmp here to make overriding +# the default with environment variables TMPDIR/TMP/TEMP possible +User clamav +AllowSupplementaryGroups true +ScanMail true +ScanArchive true +ArchiveBlockEncrypted false +MaxDirectoryRecursion 15 +FollowDirectorySymlinks false +FollowFileSymlinks false +ReadTimeout 180 +MaxThreads 12 +MaxConnectionQueueLength 15 +LogSyslog false +LogFacility LOG_LOCAL6 +LogClean false +LogVerbose true +PidFile /var/run/clamav/clamd.pid +DatabaseDirectory /var/lib/clamav +SelfCheck 3600 +Foreground false +Debug false +ScanPE true +ScanOLE2 true +ScanHTML true +DetectBrokenExecutables false +ExitOnOOM false +LeaveTemporaryFiles false +AlgorithmicDetection true +ScanELF true +IdleTimeout 30 +PhishingSignatures true +PhishingScanURLs true +PhishingAlwaysBlockSSLMismatch false +PhishingAlwaysBlockCloak false +DetectPUA false +ScanPartialMessages false +HeuristicScanPrecedence false +StructuredDataDetection false +CommandReadTimeout 5 +SendBufTimeout 200 +MaxQueue 100 +ExtendedDetectionInfo true +OLE2BlockMacros false +StreamMaxLength 25M +LogFile /var/log/clamav/clamav.log +LogTime true +LogFileUnlock false +LogFileMaxSize 0 +Bytecode true +BytecodeSecurity TrustSigned +BytecodeTimeout 60000 +OfficialDatabaseOnly false +CrossFilesystems true diff --git a/install/ubuntu/12.10/deb_signing.key b/install/ubuntu/12.10/deb_signing.key new file mode 100644 index 000000000..2ad2db8bc --- /dev/null +++ b/install/ubuntu/12.10/deb_signing.key @@ -0,0 +1,30 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.12 (GNU/Linux) + +mQENBFJIGbEBCAC8SHOOFo7iDTbnC2GhNZ+uBGCh226Dn1QPoFZNFM/DNakHZ6rD +G3wzr8++eKz4fJual/VLllE2N9XDPuxbozb3LLkcyY1WzJqtIXbXhFGQ/SuIeT+x +QY90XU6t2Ckze2c+zUniAWmJ8GSyVmXOoc9JxAQ1u47wvGXLzrjWXc8u8PNRYXuf +fZplTL+dFu9P0d6lP8FGsV+r9wXvvazpRTz3+H8PKrGCYT55ZQIEdG9Jgamylto2 +oVPFXkwGML+TLw6oeCIBuz2y2vtivphW4MJ3ifQjDj7k3n+DTIxfDFs8lB6VRhhY +2nMHCrcZC6U2mhmXmr6O4s1fu6irBVx05ejPABEBAAG0IFNlcmdoZXkgUm9kaW4g +PHNraWRAdmVzdGFjcC5jb20+iQE4BBMBAgAiBQJSSBmxAhsDBgsJCAcDAgYVCAIJ +CgsEFgIDAQIeAQIXgAAKCRBCxbITCh93FPdqB/93GjV9g+wBfeZYLHQK9MDU2wBb +VloYOJJae6IvYKYQVAJayD3PbHdpxrF8s9e23vdnmb9jKu6jX6oV54EIyqP2HPiN +QYc8wcea+eSHerznBixCtoQh8mtdWGFeN71zU/ig7L5qlOVF/EmxDVZTFUeivFxh +IV6qyBnktQKktE45585yKZyyLtfGoXA54DGK69OtJFh+wdkKEMmUXocMl7wUrxW6 +Cx2CuKeEXEgvwu8mRHQi3S3T9XP456qWEn5dWyMVcP660IzEuZfSJApZusNK7zG3 +WMy0/EuX7xHNY3mcNxTOUN1LsO7iHnhHD9+iKWJo9parGkMZzc92MpjDK/g7uQEN +BFJIGbEBCAC7k5QEA9WQM7E3ceNaeLMrA9lXfuzaNCcySq7ONdVAa5PxzbSKdHvz +QFoL1VFqBTYQ038lbil1XqnoM0zvIfAI3LcpS8sq92El/vPxp6jZh2Ari9Uw7x95 +k2cZMgI67g+zQMGdjVRA155nFQRCgg000xU4F7JA6+WsuLlVUmccsDv7YWJExMtC +YPxiuz5DFu8RALnw4Ckts+dbwsrcvUHhkm9b6RAsdCKjjRpUZjLgdltjH83gUVvt +i1YmdjjsVpt95dtsaG+ad852g/Rk8EdxNMkjPF6HLA67CLADP9wYaj80yPcPtylS +ycvPtcclVeHkFBRVM8xZpQd4iD19MWI1ABEBAAGJAR8EGAECAAkFAlJIGbECGwwA +CgkQQsWyEwofdxQ7tQgAhB0FwTs7L8Qr63DHC2yAnXVxgtTAY1/36CccNXVculyR ++EkLcwahms9AKhz7eQb+Mud+5vH0GRohLp2npgO38CjVUfIP5d+Y6dsthmrkF6p8 +XdV1dVK9vWX+i/YZSw/Mded30Cq4P2Yhq9EaemMT0rtli8lz2NnkZ9dFJZk1lzJC +CZmRpbjSNWqRU4f7qyh21lYk/OC/0XE8fh8CaO23TZ+6gBionoCztwb7NyC9OArN +qYlNnbmh9iNqdblykPS3bkjf34n2xyMgnIehNrM89tk8PY4UfNPhgT1TMD9W3Svq +ynNZvLuF/FIDwDeC1qcfjGbfDn9fXO/lMIIRooQYKQ== +=J2HJ +-----END PGP PUBLIC KEY BLOCK----- diff --git a/install/ubuntu/12.10/dovecot.tar.gz b/install/ubuntu/12.10/dovecot.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..bfabaa030981d087ea4ccd8c7b86cc4d7ab1b7c6 GIT binary patch literal 3487 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 N{0}P55eWcL004dY&`|&Y literal 0 HcmV?d00001 diff --git a/install/ubuntu/12.10/dovecot/conf.d/10-auth.conf b/install/ubuntu/12.10/dovecot/conf.d/10-auth.conf new file mode 100644 index 000000000..dfcc83110 --- /dev/null +++ b/install/ubuntu/12.10/dovecot/conf.d/10-auth.conf @@ -0,0 +1,4 @@ +disable_plaintext_auth = no +auth_verbose = yes +auth_mechanisms = plain login +!include auth-passwdfile.conf.ext diff --git a/install/ubuntu/12.10/dovecot/conf.d/10-logging.conf b/install/ubuntu/12.10/dovecot/conf.d/10-logging.conf new file mode 100644 index 000000000..a5f207d51 --- /dev/null +++ b/install/ubuntu/12.10/dovecot/conf.d/10-logging.conf @@ -0,0 +1 @@ +log_path = /var/log/dovecot.log diff --git a/install/ubuntu/12.10/dovecot/conf.d/10-mail.conf b/install/ubuntu/12.10/dovecot/conf.d/10-mail.conf new file mode 100644 index 000000000..55313419e --- /dev/null +++ b/install/ubuntu/12.10/dovecot/conf.d/10-mail.conf @@ -0,0 +1,4 @@ +mail_privileged_group = mail +mail_access_groups = mail +mail_location = maildir:%h/mail/%d/%n +pop3_uidl_format = %08Xu%08Xv diff --git a/install/ubuntu/12.10/dovecot/conf.d/10-master.conf b/install/ubuntu/12.10/dovecot/conf.d/10-master.conf new file mode 100644 index 000000000..a75a9aaa4 --- /dev/null +++ b/install/ubuntu/12.10/dovecot/conf.d/10-master.conf @@ -0,0 +1,29 @@ +service imap-login { + inet_listener imap { + } + inet_listener imaps { + } +} + +service pop3-login { + inet_listener pop3 { + } + inet_listener pop3s { + } +} + + +service imap { +} + +service pop3 { +} + +service auth { + unix_listener auth-client { + group = mail + mode = 0660 + user = dovecot + } + user = dovecot +} diff --git a/install/ubuntu/12.10/dovecot/conf.d/10-ssl.conf b/install/ubuntu/12.10/dovecot/conf.d/10-ssl.conf new file mode 100644 index 000000000..3aaff6eec --- /dev/null +++ b/install/ubuntu/12.10/dovecot/conf.d/10-ssl.conf @@ -0,0 +1,3 @@ +ssl = yes +ssl_cert = = 2.1.4) : %v.%u + # Dovecot v0.99.x : %v.%u + # tpop3d : %Mf + # + # Note that Outlook 2003 seems to have problems with %v.%u format which was + # Dovecot's default, so if you're building a new server it would be a good + # idea to change this. %08Xu%08Xv should be pretty fail-safe. + # + #pop3_uidl_format = %08Xu%08Xv + + # Permanently save UIDLs sent to POP3 clients, so pop3_uidl_format changes + # won't change those UIDLs. Currently this works only with Maildir. + #pop3_save_uidl = no + + # What to do about duplicate UIDLs if they exist? + # allow: Show duplicates to clients. + # rename: Append a temporary -2, -3, etc. counter after the UIDL. + #pop3_uidl_duplicates = allow + + # POP3 logout format string: + # %i - total number of bytes read from client + # %o - total number of bytes sent to client + # %t - number of TOP commands + # %p - number of bytes sent to client as a result of TOP command + # %r - number of RETR commands + # %b - number of bytes sent to client as a result of RETR command + # %d - number of deleted messages + # %m - number of messages (before deletion) + # %s - mailbox size in bytes (before deletion) + # %u - old/new UIDL hash. may help finding out if UIDLs changed unexpectedly + #pop3_logout_format = top=%t/%p, retr=%r/%b, del=%d/%m, size=%s + + # Maximum number of POP3 connections allowed for a user from each IP address. + # NOTE: The username is compared case-sensitively. + #mail_max_userip_connections = 10 + + # Space separated list of plugins to load (default is global mail_plugins). + #mail_plugins = $mail_plugins + + # Workarounds for various client bugs: + # outlook-no-nuls: + # Outlook and Outlook Express hang if mails contain NUL characters. + # This setting replaces them with 0x80 character. + # oe-ns-eoh: + # Outlook Express and Netscape Mail breaks if end of headers-line is + # missing. This option simply sends it if it's missing. + # The list is space-separated. + #pop3_client_workarounds = +} diff --git a/install/ubuntu/12.10/dovecot/conf.d/auth-passwdfile.conf.ext b/install/ubuntu/12.10/dovecot/conf.d/auth-passwdfile.conf.ext new file mode 100644 index 000000000..75e6e1152 --- /dev/null +++ b/install/ubuntu/12.10/dovecot/conf.d/auth-passwdfile.conf.ext @@ -0,0 +1,9 @@ +passdb { + driver = passwd-file + args = scheme=MD5-CRYPT username_format=%n /etc/exim4/domains/%d/passwd +} + +userdb { + driver = passwd-file + args = username_format=%n /etc/exim4/domains/%d/passwd +} diff --git a/install/ubuntu/12.10/dovecot/dovecot.conf b/install/ubuntu/12.10/dovecot/dovecot.conf new file mode 100644 index 000000000..0a8553510 --- /dev/null +++ b/install/ubuntu/12.10/dovecot/dovecot.conf @@ -0,0 +1,4 @@ +protocols = imap pop3 +listen = *, :: +base_dir = /var/run/dovecot/ +!include conf.d/*.conf diff --git a/install/ubuntu/12.10/exim/dnsbl.conf b/install/ubuntu/12.10/exim/dnsbl.conf new file mode 100644 index 000000000..5166b255e --- /dev/null +++ b/install/ubuntu/12.10/exim/dnsbl.conf @@ -0,0 +1,2 @@ +bl.spamcop.net +zen.spamhaus.org diff --git a/install/ubuntu/12.10/exim/exim4.conf.template b/install/ubuntu/12.10/exim/exim4.conf.template new file mode 100644 index 000000000..742f0409e --- /dev/null +++ b/install/ubuntu/12.10/exim/exim4.conf.template @@ -0,0 +1,377 @@ +###################################################################### +# # +# Exim configuration file for Vesta Control Panel # +# # +###################################################################### + +#SPAMASSASSIN = yes +#SPAM_SCORE = 50 +#CLAMD = yes + +domainlist local_domains = dsearch;/etc/exim4/domains/ +domainlist relay_to_domains = dsearch;/etc/exim4/domains/ +hostlist relay_from_hosts = 127.0.0.1 +hostlist whitelist = net-iplsearch;/etc/exim4/white-blocks.conf +hostlist spammers = net-iplsearch;/etc/exim4/spam-blocks.conf +no_local_from_check +untrusted_set_sender = * +acl_smtp_connect = acl_check_spammers +acl_smtp_mail = acl_check_mail +acl_smtp_rcpt = acl_check_rcpt +acl_smtp_data = acl_check_data +acl_smtp_mime = acl_check_mime + +.ifdef SPAMASSASSIN +spamd_address = 127.0.0.1 783 +.endif + +.ifdef CLAMD +av_scanner = clamd: /var/run/clamav/clamd.ctl +.endif + +tls_advertise_hosts = * +tls_certificate = /usr/local/vesta/ssl/certificate.crt +tls_privatekey = /usr/local/vesta/ssl/certificate.key + +daemon_smtp_ports = 25 : 465 : 587 : 2525 +tls_on_connect_ports = 465 +never_users = root +host_lookup = * +rfc1413_hosts = * +rfc1413_query_timeout = 5s +ignore_bounce_errors_after = 2d +timeout_frozen_after = 7d + +DKIM_DOMAIN = ${lc:${domain:$h_from:}} +DKIM_FILE = /etc/exim4/domains/${lc:${domain:$h_from:}}/dkim.pem +DKIM_PRIVATE_KEY = ${if exists{DKIM_FILE}{DKIM_FILE}{0}} + + + +###################################################################### +# ACL CONFIGURATION # +# Specifies access control lists for incoming SMTP mail # +###################################################################### +begin acl + +acl_check_spammers: + accept hosts = +whitelist + + drop message = Your host in blacklist on this server. + log_message = Host in blacklist + hosts = +spammers + + accept + + +acl_check_mail: + deny condition = ${if eq{$sender_helo_name}{}} + message = HELO required before MAIL + + drop message = Helo name contains a ip address (HELO was $sender_helo_name) and not is valid + condition = ${if match{$sender_helo_name}{\N((\d{1,3}[.-]\d{1,3}[.-]\d{1,3}[.-]\d{1,3})|([0-9a-f]{8})|([0-9A-F]{8}))\N}{yes}{no}} + condition = ${if match {${lookup dnsdb{>: defer_never,ptr=$sender_host_address}}\}{$sender_helo_name}{no}{yes}} + delay = 45s + + drop condition = ${if isip{$sender_helo_name}} + message = Access denied - Invalid HELO name (See RFC2821 4.1.3) + + drop condition = ${if eq{[$interface_address]}{$sender_helo_name}} + message = $interface_address is _my_ address + + accept + + +acl_check_rcpt: + accept hosts = : + + deny message = Restricted characters in address + domains = +local_domains + local_parts = ^[.] : ^.*[@%!/|] + + deny message = Restricted characters in address + domains = !+local_domains + local_parts = ^[./|] : ^.*[@%!] : ^.*/\\.\\./ + + require verify = sender + + accept hosts = +relay_from_hosts + control = submission + + accept authenticated = * + control = submission/domain= + + deny message = Rejected because $sender_host_address is in a black list at $dnslist_domain\n$dnslist_text + hosts = !+whitelist + dnslists = ${readfile {/etc/exim4/dnsbl.conf}{:}} + + require message = relay not permitted + domains = +local_domains : +relay_to_domains + + deny message = smtp auth requried + sender_domains = +local_domains + !authenticated = * + + require verify = recipient + +.ifdef CLAMD + warn set acl_m0 = no + + warn condition = ${if exists {/etc/exim4/domains/$domain/antivirus}{yes}{no}} + set acl_m0 = yes +.endif + +.ifdef SPAMASSASSIN + warn set acl_m1 = no + + warn condition = ${if exists {/etc/exim4/domains/$domain/antispam}{yes}{no}} + set acl_m1 = yes +.endif + + accept + + +acl_check_data: +.ifdef CLAMD + deny message = Message contains a virus ($malware_name) and has been rejected + malware = * + condition = ${if eq{$acl_m0}{yes}{yes}{no}} +.endif + +.ifdef SPAMASSASSIN + warn !authenticated = * + hosts = !+relay_from_hosts + condition = ${if < {$message_size}{100K}} + condition = ${if eq{$acl_m1}{yes}{yes}{no}} + spam = nobody:true/defer_ok + add_header = X-Spam-Score: $spam_score_int + add_header = X-Spam-Bar: $spam_bar + add_header = X-Spam-Report: $spam_report + set acl_m2 = $spam_score_int + + warn condition = ${if !eq{$acl_m2}{} {yes}{no}} + condition = ${if >{$acl_m2}{SPAM_SCORE} {yes}{no}} + add_header = X-Spam-Status: Yes + message = SpamAssassin detected spam (from $sender_address to $recipients). +.endif + + accept + + +acl_check_mime: + deny message = Blacklisted file extension detected + condition = ${if match {${lc:$mime_filename}}{\N(\.ade|\.adp|\.bat|\.chm|\.cmd|\.com|\.cpl|\.exe|\.hta|\.ins|\.isp|\.jse|\.lib|\.lnk|\.mde|\.msc|\.msp|\.mst|\.pif|\.scr|\.sct|\.shb|\.sys|\.vb|\.vbe|\.vbs|\.vxd|\.wsc|\.wsf|\.wsh)$\N}{1}{0}} + + accept + + + +###################################################################### +# AUTHENTICATION CONFIGURATION # +###################################################################### +begin authenticators + +dovecot_plain: + driver = dovecot + public_name = PLAIN + server_socket = /var/run/dovecot/auth-client + server_set_id = $auth1 + +dovecot_login: + driver = dovecot + public_name = LOGIN + server_socket = /var/run/dovecot/auth-client + server_set_id = $auth1 + + + +###################################################################### +# ROUTERS CONFIGURATION # +# Specifies how addresses are handled # +###################################################################### +begin routers + +#smarthost: +# driver = manualroute +# domains = ! +local_domains +# transport = remote_smtp +# route_list = * smartrelay.vestacp.com +# no_more +# no_verify + +dnslookup: + driver = dnslookup + domains = !+local_domains + transport = remote_smtp + no_more + +userforward: + driver = redirect + check_local_user + file = $home/.forward + allow_filter + no_verify + no_expn + check_ancestor + file_transport = address_file + pipe_transport = address_pipe + reply_transport = address_reply + +procmail: + driver = accept + check_local_user + require_files = ${local_part}:+${home}/.procmailrc:/usr/bin/procmail + transport = procmail + no_verify + +autoreplay: + driver = accept + require_files = /etc/exim4/domains/$domain/autoreply.${local_part}.msg + condition = ${if exists{/etc/exim4/domains/$domain/autoreply.${local_part}.msg}}{yes}{no}} + retry_use_local_part + transport = userautoreply + unseen + +aliases: + driver = redirect + headers_add = X-redirected: yes + data = ${extract{1}{:}{${lookup{$local_part@$domain}lsearch{/etc/exim4/domains/$domain/aliases}}}} + require_files = /etc/exim4/domains/$domain/aliases + redirect_router = dnslookup + pipe_transport = address_pipe + unseen + +localuser_fwd_only: + driver = accept + transport = devnull + condition = ${if exists{/etc/exim/domains/$domain/fwd_only}{${lookup{$local_part}lsearch{/etc/exim/domains/$domain/fwd_only}{true}{false}}}} + +localuser_spam: + driver = accept + transport = local_spam_delivery + condition = ${if eq {${if match{$h_X-Spam-Status:}{\N^Yes\N}{yes}{no}}} {${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}{yes}{no_such_user}}}} + +localuser: + driver = accept + transport = local_delivery + condition = ${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}{true}{false}} + +catchall: + driver = redirect + headers_add = X-redirected: yes + require_files = /etc/exim4/domains/$domain/aliases + data = ${extract{1}{:}{${lookup{*@$domain}lsearch{/etc/exim4/domains/$domain/aliases}}}} + file_transport = local_delivery + redirect_router = dnslookup + +terminate_alias: + driver = accept + transport = devnull + condition = ${lookup{$local_part@$domain}lsearch{/etc/exim4/domains/$domain/aliases}{true}{false}} + + + +###################################################################### +# TRANSPORTS CONFIGURATION # +###################################################################### +begin transports + +remote_smtp: + driver = smtp + #helo_data = $sender_address_domain + dkim_domain = DKIM_DOMAIN + dkim_selector = mail + dkim_private_key = DKIM_PRIVATE_KEY + dkim_canon = relaxed + dkim_strict = 0 + +procmail: + driver = pipe + command = "/usr/bin/procmail -d $local_part" + return_path_add + delivery_date_add + envelope_to_add + user = $local_part + initgroups + return_output + +local_delivery: + driver = appendfile + maildir_format + maildir_use_size_file + user = ${extract{2}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}} + group = mail + create_directory + directory_mode = 770 + mode = 660 + use_lockfile = no + delivery_date_add + envelope_to_add + return_path_add + directory = "${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}}/mail/$domain/$local_part" + quota = ${extract{6}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}}M + quota_warn_threshold = 75% + +local_spam_delivery: + driver = appendfile + maildir_format + maildir_use_size_file + user = ${extract{2}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}} + group = mail + create_directory + directory_mode = 770 + mode = 660 + use_lockfile = no + delivery_date_add + envelope_to_add + return_path_add + directory = "${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}}/mail/$domain/$local_part/.Spam" + quota = ${extract{6}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}}M + quota_directory = "${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}}/mail/$domain/$local_part" + quota_warn_threshold = 75% + +address_pipe: + driver = pipe + return_output + +address_file: + driver = appendfile + delivery_date_add + envelope_to_add + return_path_add + +address_reply: + driver = autoreply + +userautoreply: + driver = autoreply + file = /etc/exim4/domains/$domain/autoreply.${local_part}.msg + from = "${local_part}@${domain}" + subject = "${if def:h_Subject: {Autoreply: ${quote:${escape:$h_Subject:}}} {Autoreply Message}}" + to = "${sender_address}" + +devnull: + driver = appendfile + file = /dev/null + + + +###################################################################### +# RETRY CONFIGURATION # +###################################################################### +begin retry + +# Address or Domain Error Retries +# ----------------- ----- ------- +* * F,2h,15m; G,16h,1h,1.5; F,4d,6h + + + +###################################################################### +# REWRITE CONFIGURATION # +###################################################################### +begin rewrite + + + +###################################################################### diff --git a/install/ubuntu/12.10/exim/spam-blocks.conf b/install/ubuntu/12.10/exim/spam-blocks.conf new file mode 100644 index 000000000..e69de29bb diff --git a/install/ubuntu/12.10/fail2ban.tar.gz b/install/ubuntu/12.10/fail2ban.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..628545b6b12d83a4dfcf4529b41f62792c228c85 GIT binary patch literal 721 zcmV;?0xta@iwFR?P)1Y$1MQbhZ{jczhB^CJjMPJ=l>#Ira4D7AZL1=&Z6#&~ zz`KruB3xbg09_DCMo>VRAaZ-;y)^U@ z_5_W1em^5}=Uk3M(j5%0M~Fp}7>lVIYRqubkoOIoiK#qP6BOckLPYW;2OWgmSsIAg zuZ|mFmaYUYjJJfo8s1fhF1)IOlQ|75La(j33(9U0btUMJvtIut>QYeUVmCrexr&Qi zKbjFQ61zkzP2U-?^r{!(!l(3+?Yga{u}aaFy}dZE-rC%=GOfyYm&N9W)k}T291PDY z*P0t`IZ}uIjJ_-j{V$SH_dlT#cu)PeEcx8DI+m&H|328vfBu=(y@&@N72}Qi-)t}U ze|i14JEpGxd*KMK)CoAp98}8bBuj9v%2KQe1W{6IHF7UVKsi-oBUDPa+B%^mI!l#A z%iggR=`rPvnSp)Z2xvn7V8#q@Dyt%#D2+c|xJU7JZ=WzC$g2~0Q{w%WGdx!uFgO@} z=-u4i58*FN5)y;)2*=Nd+$g+V_$fxmCp11?eTVGz8P->^KFOi;zxe)( z;(T!ZH#>H&|F+iuy|9`8{p-KwZ0f&dYyIB`OZs27=SuT4o@Sm$(ja3D9@K#V)prvv zs8^H+ECdN-k)k768hSV1`}Y@@gAp1N=}x2^dQlk4c0wJawc4RhTtX&fF0G*c4Nk6a z2g6fPkL6zl5rJ&(DMxg| +actionstop = /usr/local/vesta/bin/v-delete-firewall-chain +actioncheck = iptables -n -L INPUT | grep -q 'fail2ban-[ \t]' +actionban = /usr/local/vesta/bin/v-add-firewall-ban +actionunban = /usr/local/vesta/bin/v-delete-firewall-ban diff --git a/install/ubuntu/12.10/fail2ban/filter.d/vesta.conf b/install/ubuntu/12.10/fail2ban/filter.d/vesta.conf new file mode 100644 index 000000000..69670a56e --- /dev/null +++ b/install/ubuntu/12.10/fail2ban/filter.d/vesta.conf @@ -0,0 +1,10 @@ +# Fail2Ban filter for unsuccesfull Vesta authentication attempts +# + +[INCLUDES] +before = common.conf + +[Definition] +failregex = .* failed to login +ignoreregex = + diff --git a/install/ubuntu/12.10/fail2ban/jail.local b/install/ubuntu/12.10/fail2ban/jail.local new file mode 100644 index 000000000..eccea0685 --- /dev/null +++ b/install/ubuntu/12.10/fail2ban/jail.local @@ -0,0 +1,39 @@ +[ssh-iptables] +enabled = true +filter = sshd +action = vesta[name=SSH] +logpath = /var/log/auth.log +maxretry = 5 + +[vsftpd-iptables] +enabled = false +filter = vsftpd +action = vesta[name=FTP] +logpath = /var/log/vsftpd.log +maxretry = 5 + +[exim-iptables] +enabled = true +filter = exim +action = vesta[name=MAIL] +logpath = /var/log/exim4/mainlog + +[dovecot-iptables] +enabled = true +filter = dovecot +action = vesta[name=MAIL] +logpath = /var/log/dovecot.log + +[mysqld-iptables] +enabled = false +filter = mysqld-auth +action = vesta[name=DB] +logpath = /var/log/mysql.log +maxretry = 5 + +[vesta-iptables] +enabled = true +filter = vesta +action = vesta[name=VESTA] +logpath = /var/log/vesta/auth.log +maxretry = 5 diff --git a/install/ubuntu/12.10/firewall.tar.gz b/install/ubuntu/12.10/firewall.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..e8556008077364323d7d6b6934e7a2cf7a734983 GIT binary patch literal 540 zcmV+%0^|K3iwFQ5XyQ}=1MQVdkJ>O4Mzij(@XnhsKo&*MSlh#7(1g=&0&FEG%?Me6ampuO4>y-_`!)kpP&FT0Pj|*j)GSV93 zG0u%P9?@5H>Ue&9TJ8w(mS4U;YbU>kw!5dto6pc!`1H`piz?!Qs? zZ2zTY(j)A}O)l`C?|(Hfn=&r%X0(YbN~&_+%&1`W&E*1z3IZzVUki(*D`*Kk5kQkG z1wFz!17_g@d9ch)G0;wCGL8I9sNtr~X-yEB=^d3PuoC0XT$oBik3eT~aJ zPYYM7vf@1@^`frQB1w}O-E1jovb=r04Y>?eKuHocY1?18ny~4FyPO>aM4!NUUOmFePy(-1M3SddTi>v8NVjB&*t=IgAYbgkDfmmx*FWy-yM^~-2uA1 z`-8QZ4$iCJUfZClsXi!k+gGp^gsj(jT}WJxQ(W4?Rswg^FKlTCd%;5d=XH e1VIo4K@bE%5ClOG1VIqwGCu%8Tmj4gC;$K)2?m1z literal 0 HcmV?d00001 diff --git a/install/ubuntu/12.10/firewall/ports.conf b/install/ubuntu/12.10/firewall/ports.conf new file mode 100644 index 000000000..a6ef4dae5 --- /dev/null +++ b/install/ubuntu/12.10/firewall/ports.conf @@ -0,0 +1,16 @@ +PROTOCOL='TCP' PORT='20' +PROTOCOL='TCP' PORT='21' +PROTOCOL='TCP' PORT='22' +PROTOCOL='TCP' PORT='25' +PROTOCOL='UDP' PORT='53' +PROTOCOL='TCP' PORT='80' +PROTOCOL='TCP' PORT='443' +PROTOCOL='TCP' PORT='110' +PROTOCOL='UDP' PORT='123' +PROTOCOL='TCP' PORT='143' +PROTOCOL='TCP' PORT='3306' +PROTOCOL='TCP' PORT='5432' +PROTOCOL='TCP' PORT='8080' +PROTOCOL='TCP' PORT='8433' +PROTOCOL='TCP' PORT='8083' +PROTOCOL='TCP' PORT='12000:12100' diff --git a/install/ubuntu/12.10/firewall/rules.conf b/install/ubuntu/12.10/firewall/rules.conf new file mode 100644 index 000000000..956c2e1d9 --- /dev/null +++ b/install/ubuntu/12.10/firewall/rules.conf @@ -0,0 +1,10 @@ +RULE='1' ACTION='ACCEPT' PROTOCOL='ICMP' PORT='0' IP='0.0.0.0/0' COMMENT='PING' SUSPENDED='no' TIME='17:13:48' DATE='2014-09-16' +RULE='2' ACTION='ACCEPT' PROTOCOL='TCP' PORT='8083' IP='0.0.0.0/0' COMMENT='VESTA' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' +RULE='3' ACTION='ACCEPT' PROTOCOL='TCP' PORT='3306,5432' IP='0.0.0.0/0' COMMENT='DB' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' +RULE='4' ACTION='ACCEPT' PROTOCOL='TCP' PORT='143,993' IP='0.0.0.0/0' COMMENT='IMAP' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' +RULE='5' ACTION='ACCEPT' PROTOCOL='TCP' PORT='110,995' IP='0.0.0.0/0' COMMENT='POP3' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' +RULE='6' ACTION='ACCEPT' PROTOCOL='TCP' PORT='25,465,587,2525' IP='0.0.0.0/0' COMMENT='SMTP' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' +RULE='7' ACTION='ACCEPT' PROTOCOL='UDP' PORT='53' IP='0.0.0.0/0' COMMENT='DNS' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' +RULE='8' ACTION='ACCEPT' PROTOCOL='TCP' PORT='21,12000-12100' IP='0.0.0.0/0' COMMENT='FTP' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' +RULE='9' ACTION='ACCEPT' PROTOCOL='TCP' PORT='80,443' IP='0.0.0.0/0' COMMENT='WEB' SUSPENDED='no' TIME='17:04:27' DATE='2014-09-24' +RULE='10' ACTION='ACCEPT' PROTOCOL='TCP' PORT='22' IP='0.0.0.0/0' COMMENT='SSH' SUSPENDED='no' TIME='17:14:41' DATE='2014-09-16' diff --git a/install/ubuntu/12.10/logrotate/apache2 b/install/ubuntu/12.10/logrotate/apache2 new file mode 100644 index 000000000..27629d0dd --- /dev/null +++ b/install/ubuntu/12.10/logrotate/apache2 @@ -0,0 +1,19 @@ +/var/log/apache2/*.log /var/log/apache2/domains/*log { + weekly + missingok + rotate 52 + compress + delaycompress + notifempty + create 640 root adm + sharedscripts + postrotate + /etc/init.d/apache2 reload > /dev/null || true + [ ! -f /var/run/nginx.pid ] || kill -USR1 `cat /var/run/nginx.pid` + endscript + prerotate + if [ -d /etc/logrotate.d/httpd-prerotate ]; then \ + run-parts /etc/logrotate.d/httpd-prerotate; \ + fi; \ + endscript +} diff --git a/install/ubuntu/12.10/logrotate/nginx b/install/ubuntu/12.10/logrotate/nginx new file mode 100644 index 000000000..d667f2135 --- /dev/null +++ b/install/ubuntu/12.10/logrotate/nginx @@ -0,0 +1,13 @@ +/var/log/nginx/*log /var/log/nginx/domains/*log { + daily + missingok + rotate 52 + compress + delaycompress + notifempty + create 640 nginx adm + sharedscripts + postrotate + [ -f /var/run/nginx.pid ] && kill -USR1 `cat /var/run/nginx.pid` + endscript +} diff --git a/install/ubuntu/12.10/logrotate/vesta b/install/ubuntu/12.10/logrotate/vesta new file mode 100644 index 000000000..027a34396 --- /dev/null +++ b/install/ubuntu/12.10/logrotate/vesta @@ -0,0 +1,7 @@ +/usr/local/vesta/log/*.log { + missingok + notifempty + size 30k + yearly + create 0600 root root +} diff --git a/install/ubuntu/12.10/mysql/my-large.cnf b/install/ubuntu/12.10/mysql/my-large.cnf new file mode 100644 index 000000000..d0bab3907 --- /dev/null +++ b/install/ubuntu/12.10/mysql/my-large.cnf @@ -0,0 +1,42 @@ +[client] +port=3306 +socket=/var/run/mysqld/mysqld.sock + +[mysqld_safe] +socket=/var/run/mysqld/mysqld.sock + +[mysqld] +user=mysql +pid-file=/var/run/mysqld/mysqld.pid +socket=/var/run/mysqld/mysqld.sock +port=3306 +basedir=/usr +datadir=/var/lib/mysql +tmpdir=/tmp +lc-messages-dir=/usr/share/mysql +log_error=/var/log/mysql/error.log + +symbolic-links=0 + +skip-external-locking +key_buffer_size = 256M +max_allowed_packet = 32M +table_open_cache = 256 +sort_buffer_size = 1M +read_buffer_size = 1M +read_rnd_buffer_size = 4M +myisam_sort_buffer_size = 64M +thread_cache_size = 8 +query_cache_size= 16M +thread_concurrency = 8 + +#innodb_use_native_aio = 0 +innodb_file_per_table + +max_connections=200 +max_user_connections=50 +wait_timeout=10 +interactive_timeout=50 +long_query_time=5 + +!includedir /etc/mysql/conf.d/ diff --git a/install/ubuntu/12.10/mysql/my-medium.cnf b/install/ubuntu/12.10/mysql/my-medium.cnf new file mode 100644 index 000000000..1c10ab9a6 --- /dev/null +++ b/install/ubuntu/12.10/mysql/my-medium.cnf @@ -0,0 +1,40 @@ +[client] +port=3306 +socket=/var/run/mysqld/mysqld.sock + +[mysqld_safe] +socket=/var/run/mysqld/mysqld.sock + +[mysqld] +user=mysql +pid-file=/var/run/mysqld/mysqld.pid +socket=/var/run/mysqld/mysqld.sock +port=3306 +basedir=/usr +datadir=/var/lib/mysql +tmpdir=/tmp +lc-messages-dir=/usr/share/mysql +log_error=/var/log/mysql/error.log + +symbolic-links=0 + +skip-external-locking +key_buffer_size = 16M +max_allowed_packet = 16M +table_open_cache = 64 +sort_buffer_size = 512K +net_buffer_length = 8K +read_buffer_size = 256K +read_rnd_buffer_size = 512K +myisam_sort_buffer_size = 8M + +#innodb_use_native_aio = 0 +innodb_file_per_table + +max_connections=70 +max_user_connections=30 +wait_timeout=10 +interactive_timeout=50 +long_query_time=5 + +!includedir /etc/mysql/conf.d/ diff --git a/install/ubuntu/12.10/mysql/my-small.cnf b/install/ubuntu/12.10/mysql/my-small.cnf new file mode 100644 index 000000000..26a804781 --- /dev/null +++ b/install/ubuntu/12.10/mysql/my-small.cnf @@ -0,0 +1,40 @@ +[client] +port=3306 +socket=/var/run/mysqld/mysqld.sock + +[mysqld_safe] +socket=/var/run/mysqld/mysqld.sock + +[mysqld] +user=mysql +pid-file=/var/run/mysqld/mysqld.pid +socket=/var/run/mysqld/mysqld.sock +port=3306 +basedir=/usr +datadir=/var/lib/mysql +tmpdir=/tmp +lc-messages-dir=/usr/share/mysql +log_error=/var/log/mysql/error.log + +symbolic-links=0 + +skip-external-locking +key_buffer_size = 16K +max_allowed_packet = 1M +table_open_cache = 4 +sort_buffer_size = 64K +read_buffer_size = 256K +read_rnd_buffer_size = 256K +net_buffer_length = 2K +thread_stack = 240K + +#innodb_use_native_aio = 0 +innodb_file_per_table + +max_connections=30 +max_user_connections=20 +wait_timeout=10 +interactive_timeout=50 +long_query_time=5 + +!includedir /etc/mysql/conf.d/ diff --git a/install/ubuntu/12.10/nginx/nginx.conf b/install/ubuntu/12.10/nginx/nginx.conf new file mode 100644 index 000000000..7937301c1 --- /dev/null +++ b/install/ubuntu/12.10/nginx/nginx.conf @@ -0,0 +1,124 @@ +# Server globals +user www-data; +worker_processes 2; +error_log /var/log/nginx/error.log; +pid /var/run/nginx.pid; + + +# Worker config +events { + worker_connections 1024; + use epoll; +} + + +http { + # Main settings + sendfile on; + tcp_nopush on; + tcp_nodelay on; + client_header_timeout 1m; + client_body_timeout 1m; + client_header_buffer_size 2k; + client_body_buffer_size 256k; + client_max_body_size 100m; + large_client_header_buffers 4 8k; + send_timeout 30; + keepalive_timeout 60 60; + reset_timedout_connection on; + server_tokens off; + server_name_in_redirect off; + server_names_hash_max_size 512; + server_names_hash_bucket_size 512; + + + # Log format + log_format main '$remote_addr - $remote_user [$time_local] $request ' + '"$status" $body_bytes_sent "$http_referer" ' + '"$http_user_agent" "$http_x_forwarded_for"'; + log_format bytes '$body_bytes_sent'; + #access_log /var/log/nginx/access.log main; + access_log off; + + + # Mime settings + include /etc/nginx/mime.types; + default_type application/octet-stream; + + + # Compression + gzip on; + gzip_comp_level 9; + gzip_min_length 512; + gzip_buffers 8 64k; + gzip_types text/plain text/css text/javascript + application/x-javascript; + gzip_proxied any; + + + # Proxy settings + proxy_redirect off; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_pass_header Set-Cookie; + proxy_connect_timeout 90; + proxy_send_timeout 90; + proxy_read_timeout 90; + proxy_buffers 32 4k; + + + # Cloudflare https://www.cloudflare.com/ips + set_real_ip_from 199.27.128.0/21; + set_real_ip_from 173.245.48.0/20; + set_real_ip_from 103.21.244.0/22; + set_real_ip_from 103.22.200.0/22; + set_real_ip_from 103.31.4.0/22; + set_real_ip_from 141.101.64.0/18; + set_real_ip_from 108.162.192.0/18; + set_real_ip_from 190.93.240.0/20; + set_real_ip_from 188.114.96.0/20; + set_real_ip_from 197.234.240.0/22; + set_real_ip_from 198.41.128.0/17; + set_real_ip_from 162.158.0.0/15; + set_real_ip_from 104.16.0.0/12; + set_real_ip_from 172.64.0.0/13; + #set_real_ip_from 2400:cb00::/32; + #set_real_ip_from 2606:4700::/32; + #set_real_ip_from 2803:f800::/32; + #set_real_ip_from 2405:b500::/32; + #set_real_ip_from 2405:8100::/32; + real_ip_header CF-Connecting-IP; + + + # SSL PCI Compliance + ssl_session_cache shared:SSL:10m; + ssl_protocols TLSv1 TLSv1.1 TLSv1.2; + ssl_prefer_server_ciphers on; + ssl_ciphers "ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA:ECDHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES128-SHA256:DHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES256-GCM-SHA384:AES128-GCM-SHA256:AES256-SHA256:AES128-SHA256:AES256-SHA:AES128-SHA:DES-CBC3-SHA:HIGH:!aNULL:!eNULL:!EXPORT:!DES:!MD5:!PSK:!RC4"; + + + # Error pages + error_page 403 /error/403.html; + error_page 404 /error/404.html; + error_page 502 503 504 /error/50x.html; + + + # Cache + proxy_cache_path /var/cache/nginx levels=2 keys_zone=cache:10m inactive=60m max_size=512m; + proxy_cache_key "$host$request_uri $cookie_user"; + proxy_temp_path /var/cache/nginx/temp; + proxy_ignore_headers Expires Cache-Control; + proxy_cache_use_stale error timeout invalid_header http_502; + proxy_cache_valid any 3d; + + map $http_cookie $no_cache { + default 0; + ~SESS 1; + ~wordpress_logged_in 1; + } + + + # Wildcard include + include /etc/nginx/conf.d/*.conf; +} diff --git a/install/ubuntu/12.10/nginx/phpmyadmin.inc b/install/ubuntu/12.10/nginx/phpmyadmin.inc new file mode 100644 index 000000000..d70ca3e3c --- /dev/null +++ b/install/ubuntu/12.10/nginx/phpmyadmin.inc @@ -0,0 +1,15 @@ +location /phpmyadmin { + alias /usr/share/phpmyadmin/; + + location ~ /(libraries|setup) { + return 404; + } + + location ~ ^/phpmyadmin/(.*\.php)$ { + alias /usr/share/phpmyadmin/$1; + fastcgi_pass 127.0.0.1:9000; + fastcgi_index index.php; + include fastcgi_params; + fastcgi_param SCRIPT_FILENAME $request_filename; + } +} diff --git a/install/ubuntu/12.10/nginx/phppgadmin.inc b/install/ubuntu/12.10/nginx/phppgadmin.inc new file mode 100644 index 000000000..cd1e5806b --- /dev/null +++ b/install/ubuntu/12.10/nginx/phppgadmin.inc @@ -0,0 +1,11 @@ +location /phppgadmin { + alias /usr/share/phppgadmin/; + + location ~ ^/phppgadmin/(.*\.php)$ { + alias /usr/share/phppgadmin/$1; + fastcgi_pass 127.0.0.1:9000; + fastcgi_index index.php; + include fastcgi_params; + fastcgi_param SCRIPT_FILENAME $request_filename; + } +} diff --git a/install/ubuntu/12.10/nginx/status.conf b/install/ubuntu/12.10/nginx/status.conf new file mode 100644 index 000000000..c0bcd0691 --- /dev/null +++ b/install/ubuntu/12.10/nginx/status.conf @@ -0,0 +1,9 @@ +server { + listen 127.0.0.1:8084 default; + server_name _; + server_name_in_redirect off; + location / { + stub_status on; + access_log off; + } +} diff --git a/install/ubuntu/12.10/nginx/webmail.inc b/install/ubuntu/12.10/nginx/webmail.inc new file mode 100644 index 000000000..ad66895bc --- /dev/null +++ b/install/ubuntu/12.10/nginx/webmail.inc @@ -0,0 +1,15 @@ +location /webmail { + alias /var/lib/roundcube/; + + location ~ /(config|temp|logs) { + return 404; + } + + location ~ ^/webmail/(.*\.php)$ { + alias /var/lib/roundcube/$1; + fastcgi_pass 127.0.0.1:9000; + fastcgi_index index.php; + include fastcgi_params; + fastcgi_param SCRIPT_FILENAME $request_filename; + } +} diff --git a/install/ubuntu/12.10/packages.tar.gz b/install/ubuntu/12.10/packages.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..4b778dadce20a61f03a8ca920ec81c55a8730fee GIT binary patch literal 562 zcmV-20?qv&iwFRHoJ3Lp1MQYgkD5>vhFSY7+_9e37(#VaFxE7E(hXh3fdi2rFJZkFya3gX^b)n zVXSCG>M9q!r;?X63%1>^6fD25GP?9(Zs8i zm#eSAOO(kSvCYUG8}`JzlNGcp7>;dtR#6ZOYcoV)W|{76R22A_Q=gJo4AXSy6Mw(T z@QvYNS99i079ZTgdF&uH#Hm!H2Tkno>k1^mATb^lABoBo#r=lG9NGXU~REdk0(83B2vo&kr_ zAp~{{4=IqJS7Kl{UdaJ`lmmICl^~$|AizYY10B;!5Re`k^vG)ug3|w@mF?UAH~v$N z5%B*SfdB3Ik9DT%#Rp2&fAy{S9|r3<{gP~x+kO96-v30?!2fG-8UK&;KeGQw{$uw~ zsNXQZA^ut3x1l|*XixdCp}qF{wFdwI0000000000000000RC})0(q@EkpL(F05 diff --git a/install/ubuntu/12.10/pga/phppgadmin.conf b/install/ubuntu/12.10/pga/phppgadmin.conf new file mode 100644 index 000000000..f39247d6f --- /dev/null +++ b/install/ubuntu/12.10/pga/phppgadmin.conf @@ -0,0 +1,31 @@ +Alias /phppgadmin /usr/share/phppgadmin + + + +DirectoryIndex index.php +AllowOverride None + +order deny,allow +deny from all +allow from 127.0.0.0/255.0.0.0 ::1/128 +allow from all + + + php_flag magic_quotes_gpc Off + php_flag track_vars On + php_value include_path . + + + + + AddType application/x-httpd-php .php + Action application/x-httpd-php /cgi-bin/php + + + AddType application/x-httpd-php .php + Action application/x-httpd-php /cgi-bin/php + + + + + diff --git a/install/ubuntu/12.10/php5-fpm/www.conf b/install/ubuntu/12.10/php5-fpm/www.conf new file mode 100644 index 000000000..d046bceef --- /dev/null +++ b/install/ubuntu/12.10/php5-fpm/www.conf @@ -0,0 +1,10 @@ +[www] +listen = 127.0.0.1:9000 +listen.allowed_clients = 127.0.0.1 +user = www-data +group = www-data +pm = dynamic +pm.max_children = 50 +pm.start_servers = 5 +pm.min_spare_servers = 3 +pm.max_spare_servers = 35 diff --git a/install/ubuntu/12.10/pma/apache.conf b/install/ubuntu/12.10/pma/apache.conf new file mode 100644 index 000000000..2a8f69e25 --- /dev/null +++ b/install/ubuntu/12.10/pma/apache.conf @@ -0,0 +1,42 @@ +# phpMyAdmin default Apache configuration + +Alias /phpmyadmin /usr/share/phpmyadmin + + + Options FollowSymLinks + DirectoryIndex index.php + + + AddType application/x-httpd-php .php + + php_flag magic_quotes_gpc Off + php_flag track_vars On + php_flag register_globals Off + php_admin_flag allow_url_fopen Off + php_value include_path . + php_admin_value upload_tmp_dir /var/lib/phpmyadmin/tmp + php_admin_value open_basedir /usr/share/phpmyadmin/:/etc/phpmyadmin/:/var/lib/phpmyadmin/:/usr/share/php/php-gettext + + + + +# Authorize for setup + + + AuthType Basic + AuthName "phpMyAdmin Setup" + AuthUserFile /etc/phpmyadmin/htpasswd.setup + + Require valid-user + + +# Disallow web access to directories that don't need it + + Order Deny,Allow + Deny from All + + + Order Deny,Allow + Deny from All + + diff --git a/install/ubuntu/12.10/pma/config.inc.php b/install/ubuntu/12.10/pma/config.inc.php new file mode 100644 index 000000000..a643a065b --- /dev/null +++ b/install/ubuntu/12.10/pma/config.inc.php @@ -0,0 +1,146 @@ + + VRootEngine on + VRootAlias /etc/security/pam_env.conf etc/security/pam_env.conf +         + +AuthPAMConfig proftpd +AuthOrder mod_auth_pam.c* mod_auth_unix.c +UseReverseDNS off +User proftpd +Group nogroup +MaxInstances 20 +UseSendfile off +LogFormat default "%h %l %u %t \"%r\" %s %b" +LogFormat auth "%v [%P] %h %t \"%r\" %s" +ListOptions -a +RequireValidShell off +PassivePorts 12000 12100 + + + Umask 002 + IdentLookups off + AllowOverwrite yes + + AllowAll + + diff --git a/install/ubuntu/12.10/roundcube/apache.conf b/install/ubuntu/12.10/roundcube/apache.conf new file mode 100644 index 000000000..a0c87bcc6 --- /dev/null +++ b/install/ubuntu/12.10/roundcube/apache.conf @@ -0,0 +1,40 @@ +Alias /roundcube/program/js/tiny_mce/ /usr/share/tinymce/www/ +Alias /roundcube /var/lib/roundcube +Alias /webmail /var/lib/roundcube + +# Access to tinymce files + + Options Indexes MultiViews FollowSymLinks + AllowOverride None + Order allow,deny + allow from all + + + + Options +FollowSymLinks + # This is needed to parse /var/lib/roundcube/.htaccess. See its + # content before setting AllowOverride to None. + AllowOverride All + order allow,deny + allow from all + + +# Protecting basic directories: + + Options -FollowSymLinks + AllowOverride None + + + + Options -FollowSymLinks + AllowOverride None + Order allow,deny + Deny from all + + + + Options -FollowSymLinks + AllowOverride None + Order allow,deny + Deny from all + diff --git a/install/ubuntu/12.10/roundcube/config.inc.php b/install/ubuntu/12.10/roundcube/config.inc.php new file mode 100644 index 000000000..0c82b1bc1 --- /dev/null +++ b/install/ubuntu/12.10/roundcube/config.inc.php @@ -0,0 +1,33 @@ + diff --git a/install/ubuntu/12.10/roundcube/main.inc.php b/install/ubuntu/12.10/roundcube/main.inc.php new file mode 100644 index 000000000..97cdbf2df --- /dev/null +++ b/install/ubuntu/12.10/roundcube/main.inc.php @@ -0,0 +1,850 @@ +/sendmail or to syslog +$rcmail_config['smtp_log'] = true; + +// Log successful logins to /userlogins or to syslog +$rcmail_config['log_logins'] = false; + +// Log session authentication errors to /session or to syslog +$rcmail_config['log_session'] = false; + +// Log SQL queries to /sql or to syslog +$rcmail_config['sql_debug'] = false; + +// Log IMAP conversation to /imap or to syslog +$rcmail_config['imap_debug'] = false; + +// Log LDAP conversation to /ldap or to syslog +$rcmail_config['ldap_debug'] = false; + +// Log SMTP conversation to /smtp or to syslog +$rcmail_config['smtp_debug'] = false; + +// ---------------------------------- +// IMAP +// ---------------------------------- + +// the mail host chosen to perform the log-in +// leave blank to show a textbox at login, give a list of hosts +// to display a pulldown menu or set one host as string. +// To use SSL/TLS connection, enter hostname with prefix ssl:// or tls:// +// Supported replacement variables: +// %n - http hostname ($_SERVER['SERVER_NAME']) +// %d - domain (http hostname without the first part) +// %s - domain name after the '@' from e-mail address provided at login screen +// For example %n = mail.domain.tld, %d = domain.tld +$rcmail_config['default_host'] = 'localhost'; + +// TCP port used for IMAP connections +$rcmail_config['default_port'] = 143; + +// IMAP AUTH type (DIGEST-MD5, CRAM-MD5, LOGIN, PLAIN or empty to use +// best server supported one) +$rcmail_config['imap_auth_type'] = null; + +// If you know your imap's folder delimiter, you can specify it here. +// Otherwise it will be determined automatically +$rcmail_config['imap_delimiter'] = null; + +// If IMAP server doesn't support NAMESPACE extension, but you're +// using shared folders or personal root folder is non-empty, you'll need to +// set these options. All can be strings or arrays of strings. +// Folders need to be ended with directory separator, e.g. "INBOX." +// (special directory "~" is an exception to this rule) +// These can be used also to overwrite server's namespaces +$rcmail_config['imap_ns_personal'] = null; +$rcmail_config['imap_ns_other'] = null; +$rcmail_config['imap_ns_shared'] = null; + +// By default IMAP capabilities are readed after connection to IMAP server +// In some cases, e.g. when using IMAP proxy, there's a need to refresh the list +// after login. Set to True if you've got this case. +$rcmail_config['imap_force_caps'] = false; + +// By default list of subscribed folders is determined using LIST-EXTENDED +// extension if available. Some servers (dovecot 1.x) returns wrong results +// for shared namespaces in this case. http://trac.roundcube.net/ticket/1486225 +// Enable this option to force LSUB command usage instead. +$rcmail_config['imap_force_lsub'] = false; + +// Some server configurations (e.g. Courier) doesn't list folders in all namespaces +// Enable this option to force listing of folders in all namespaces +$rcmail_config['imap_force_ns'] = false; + +// IMAP connection timeout, in seconds. Default: 0 (no limit) +$rcmail_config['imap_timeout'] = 0; + +// Optional IMAP authentication identifier to be used as authorization proxy +$rcmail_config['imap_auth_cid'] = null; + +// Optional IMAP authentication password to be used for imap_auth_cid +$rcmail_config['imap_auth_pw'] = null; + +// Type of IMAP indexes cache. Supported values: 'db', 'apc' and 'memcache'. +$rcmail_config['imap_cache'] = null; + +// Enables messages cache. Only 'db' cache is supported. +$rcmail_config['messages_cache'] = false; + + +// ---------------------------------- +// SMTP +// ---------------------------------- + +// SMTP server host (for sending mails). +// To use SSL/TLS connection, enter hostname with prefix ssl:// or tls:// +// If left blank, the PHP mail() function is used +// Supported replacement variables: +// %h - user's IMAP hostname +// %n - http hostname ($_SERVER['SERVER_NAME']) +// %d - domain (http hostname without the first part) +// %z - IMAP domain (IMAP hostname without the first part) +// For example %n = mail.domain.tld, %d = domain.tld +$rcmail_config['smtp_server'] = ''; + +// SMTP port (default is 25; use 587 for STARTTLS or 465 for the +// deprecated SSL over SMTP (aka SMTPS)) +$rcmail_config['smtp_port'] = 25; + +// SMTP username (if required) if you use %u as the username Roundcube +// will use the current username for login +$rcmail_config['smtp_user'] = ''; + +// SMTP password (if required) if you use %p as the password Roundcube +// will use the current user's password for login +$rcmail_config['smtp_pass'] = ''; + +// SMTP AUTH type (DIGEST-MD5, CRAM-MD5, LOGIN, PLAIN or empty to use +// best server supported one) +$rcmail_config['smtp_auth_type'] = ''; + +// Optional SMTP authentication identifier to be used as authorization proxy +$rcmail_config['smtp_auth_cid'] = null; + +// Optional SMTP authentication password to be used for smtp_auth_cid +$rcmail_config['smtp_auth_pw'] = null; + +// SMTP HELO host +// Hostname to give to the remote server for SMTP 'HELO' or 'EHLO' messages +// Leave this blank and you will get the server variable 'server_name' or +// localhost if that isn't defined. +$rcmail_config['smtp_helo_host'] = ''; + +// SMTP connection timeout, in seconds. Default: 0 (no limit) +$rcmail_config['smtp_timeout'] = 0; + +// ---------------------------------- +// SYSTEM +// ---------------------------------- +include_once("/etc/roundcube/debian-db-roundcube.php"); + + +// THIS OPTION WILL ALLOW THE INSTALLER TO RUN AND CAN EXPOSE SENSITIVE CONFIG DATA. +// ONLY ENABLE IT IF YOU'RE REALLY SURE WHAT YOU'RE DOING! +$rcmail_config['enable_installer'] = false; + +// provide an URL where a user can get support for this Roundcube installation +// PLEASE DO NOT LINK TO THE ROUNDCUBE.NET WEBSITE HERE! +$rcmail_config['support_url'] = ''; + +// replace Roundcube logo with this image +// specify an URL relative to the document root of this Roundcube installation +$rcmail_config['skin_logo'] = null; + +// automatically create a new Roundcube user when log-in the first time. +// a new user will be created once the IMAP login succeeds. +// set to false if only registered users can use this service +$rcmail_config['auto_create_user'] = true; + +// use this folder to store log files (must be writeable for apache user) +// This is used by the 'file' log driver. +$rcmail_config['log_dir'] = '/var/log/roundcubemail/'; + +// use this folder to store temp files (must be writeable for apache user) +$rcmail_config['temp_dir'] = '/tmp'; + +// lifetime of message cache +// possible units: s, m, h, d, w +$rcmail_config['message_cache_lifetime'] = '10d'; + +// enforce connections over https +// with this option enabled, all non-secure connections will be redirected. +// set the port for the ssl connection as value of this option if it differs from the default 443 +$rcmail_config['force_https'] = false; + +// tell PHP that it should work as under secure connection +// even if it doesn't recognize it as secure ($_SERVER['HTTPS'] is not set) +// e.g. when you're running Roundcube behind a https proxy +// this option is mutually exclusive to 'force_https' and only either one of them should be set to true. +$rcmail_config['use_https'] = false; + +// Allow browser-autocompletion on login form. +// 0 - disabled, 1 - username and host only, 2 - username, host, password +$rcmail_config['login_autocomplete'] = 0; + +// Forces conversion of logins to lower case. +// 0 - disabled, 1 - only domain part, 2 - domain and local part. +// If users authentication is not case-sensitive this must be enabled. +// After enabling it all user records need to be updated, e.g. with query: +// UPDATE users SET username = LOWER(username); +$rcmail_config['login_lc'] = 0; + +// Includes should be interpreted as PHP files +$rcmail_config['skin_include_php'] = false; + +// display software version on login screen +$rcmail_config['display_version'] = false; + +// Session lifetime in minutes +// must be greater than 'keep_alive'/60 +$rcmail_config['session_lifetime'] = 10; + +// session domain: .example.org +$rcmail_config['session_domain'] = ''; + +// session name. Default: 'roundcube_sessid' +$rcmail_config['session_name'] = null; + +// Backend to use for session storage. Can either be 'db' (default) or 'memcache' +// If set to memcache, a list of servers need to be specified in 'memcache_hosts' +// Make sure the Memcache extension (http://pecl.php.net/package/memcache) version >= 2.0.0 is installed +$rcmail_config['session_storage'] = 'db'; + +// Use these hosts for accessing memcached +// Define any number of hosts in the form of hostname:port or unix:///path/to/sock.file +$rcmail_config['memcache_hosts'] = null; // e.g. array( 'localhost:11211', '192.168.1.12:11211', 'unix:///var/tmp/memcached.sock' ); + +// check client IP in session athorization +$rcmail_config['ip_check'] = false; + +// check referer of incoming requests +$rcmail_config['referer_check'] = false; + +// X-Frame-Options HTTP header value sent to prevent from Clickjacking. +// Possible values: sameorigin|deny. Set to false in order to disable sending them +$rcmail_config['x_frame_options'] = 'sameorigin'; + +// this key is used to encrypt the users imap password which is stored +// in the session record (and the client cookie if remember password is enabled). +// please provide a string of exactly 24 chars. +$rcmail_config['des_key'] = 'vtIOjLZo9kffJoqzpSbm5r1r'; + +// Automatically add this domain to user names for login +// Only for IMAP servers that require full e-mail addresses for login +// Specify an array with 'host' => 'domain' values to support multiple hosts +// Supported replacement variables: +// %h - user's IMAP hostname +// %n - http hostname ($_SERVER['SERVER_NAME']) +// %d - domain (http hostname without the first part) +// %z - IMAP domain (IMAP hostname without the first part) +// For example %n = mail.domain.tld, %d = domain.tld +$rcmail_config['username_domain'] = ''; + +// This domain will be used to form e-mail addresses of new users +// Specify an array with 'host' => 'domain' values to support multiple hosts +// Supported replacement variables: +// %h - user's IMAP hostname +// %n - http hostname ($_SERVER['SERVER_NAME']) +// %d - domain (http hostname without the first part) +// %z - IMAP domain (IMAP hostname without the first part) +// For example %n = mail.domain.tld, %d = domain.tld +$rcmail_config['mail_domain'] = ''; + +// Password charset. +// Use it if your authentication backend doesn't support UTF-8. +// Defaults to ISO-8859-1 for backward compatibility +$rcmail_config['password_charset'] = 'ISO-8859-1'; + +// How many seconds must pass between emails sent by a user +$rcmail_config['sendmail_delay'] = 0; + +// Maximum number of recipients per message. Default: 0 (no limit) +$rcmail_config['max_recipients'] = 0; + +// Maximum allowednumber of members of an address group. Default: 0 (no limit) +// If 'max_recipients' is set this value should be less or equal +$rcmail_config['max_group_members'] = 0; + +// add this user-agent to message headers when sending +$rcmail_config['useragent'] = 'Roundcube Webmail/'.RCMAIL_VERSION; + +// use this name to compose page titles +$rcmail_config['product_name'] = 'Roundcube Webmail'; + +// try to load host-specific configuration +// see http://trac.roundcube.net/wiki/Howto_Config for more details +$rcmail_config['include_host_config'] = false; + +// path to a text file which will be added to each sent message +// paths are relative to the Roundcube root folder +$rcmail_config['generic_message_footer'] = ''; + +// path to a text file which will be added to each sent HTML message +// paths are relative to the Roundcube root folder +$rcmail_config['generic_message_footer_html'] = ''; + +// add a received header to outgoing mails containing the creators IP and hostname +$rcmail_config['http_received_header'] = false; + +// Whether or not to encrypt the IP address and the host name +// these could, in some circles, be considered as sensitive information; +// however, for the administrator, these could be invaluable help +// when tracking down issues. +$rcmail_config['http_received_header_encrypt'] = false; + +// This string is used as a delimiter for message headers when sending +// a message via mail() function. Leave empty for auto-detection +$rcmail_config['mail_header_delimiter'] = NULL; + +// number of chars allowed for line when wrapping text. +// text wrapping is done when composing/sending messages +$rcmail_config['line_length'] = 72; + +// send plaintext messages as format=flowed +$rcmail_config['send_format_flowed'] = true; + +// don't allow these settings to be overriden by the user +$rcmail_config['dont_override'] = array(); + +// Set identities access level: +// 0 - many identities with possibility to edit all params +// 1 - many identities with possibility to edit all params but not email address +// 2 - one identity with possibility to edit all params +// 3 - one identity with possibility to edit all params but not email address +$rcmail_config['identities_level'] = 0; + +// Mimetypes supported by the browser. +// attachments of these types will open in a preview window +// either a comma-separated list or an array: 'text/plain,text/html,text/xml,image/jpeg,image/gif,image/png,application/pdf' +$rcmail_config['client_mimetypes'] = null; # null == default + +// mime magic database +$rcmail_config['mime_magic'] = null; + +// path to imagemagick identify binary +$rcmail_config['im_identify_path'] = null; + +// path to imagemagick convert binary +$rcmail_config['im_convert_path'] = null; + +// maximum size of uploaded contact photos in pixel +$rcmail_config['contact_photo_size'] = 160; + +// Enable DNS checking for e-mail address validation +$rcmail_config['email_dns_check'] = false; + +// ---------------------------------- +// PLUGINS +// ---------------------------------- + +// List of active plugins (in plugins/ directory) +$rcmail_config['plugins'] = array('password'); + +// ---------------------------------- +// USER INTERFACE +// ---------------------------------- + +// default messages sort column. Use empty value for default server's sorting, +// or 'arrival', 'date', 'subject', 'from', 'to', 'fromto', 'size', 'cc' +$rcmail_config['message_sort_col'] = ''; + +// default messages sort order +$rcmail_config['message_sort_order'] = 'DESC'; + +// These cols are shown in the message list. Available cols are: +// subject, from, to, fromto, cc, replyto, date, size, status, flag, attachment, 'priority' +$rcmail_config['list_cols'] = array('subject', 'status', 'fromto', 'date', 'size', 'flag', 'attachment'); + +// the default locale setting (leave empty for auto-detection) +// RFC1766 formatted language name like en_US, de_DE, de_CH, fr_FR, pt_BR +$rcmail_config['language'] = null; + +// use this format for date display (date or strftime format) +$rcmail_config['date_format'] = 'Y-m-d'; + +// give this choice of date formats to the user to select from +$rcmail_config['date_formats'] = array('Y-m-d', 'd-m-Y', 'Y/m/d', 'm/d/Y', 'd/m/Y', 'd.m.Y', 'j.n.Y'); + +// use this format for time display (date or strftime format) +$rcmail_config['time_format'] = 'H:i'; + +// give this choice of time formats to the user to select from +$rcmail_config['time_formats'] = array('G:i', 'H:i', 'g:i a', 'h:i A'); + +// use this format for short date display (derived from date_format and time_format) +$rcmail_config['date_short'] = 'D H:i'; + +// use this format for detailed date/time formatting (derived from date_format and time_format) +$rcmail_config['date_long'] = 'Y-m-d H:i'; + +// store draft message is this mailbox +// leave blank if draft messages should not be stored +// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP) +$rcmail_config['drafts_mbox'] = 'Drafts'; + +// store spam messages in this mailbox +// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP) +$rcmail_config['junk_mbox'] = 'Spam'; + +// store sent message is this mailbox +// leave blank if sent messages should not be stored +// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP) +$rcmail_config['sent_mbox'] = 'Sent'; + +// move messages to this folder when deleting them +// leave blank if they should be deleted directly +// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP) +$rcmail_config['trash_mbox'] = 'Trash'; + +// display these folders separately in the mailbox list. +// these folders will also be displayed with localized names +// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP) +$rcmail_config['default_folders'] = array('INBOX', 'Drafts', 'Sent', 'Spam', 'Trash'); +$rcmail_config['default_imap_folders'] = array('INBOX', 'Drafts', 'Sent', 'Spam', 'Trash'); + +// automatically create the above listed default folders on first login +$rcmail_config['create_default_folders'] = true; + +// protect the default folders from renames, deletes, and subscription changes +$rcmail_config['protect_default_folders'] = true; + +// if in your system 0 quota means no limit set this option to true +$rcmail_config['quota_zero_as_unlimited'] = false; + +// Make use of the built-in spell checker. It is based on GoogieSpell. +// Since Google only accepts connections over https your PHP installatation +// requires to be compiled with Open SSL support +$rcmail_config['enable_spellcheck'] = true; + +// Enables spellchecker exceptions dictionary. +// Setting it to 'shared' will make the dictionary shared by all users. +$rcmail_config['spellcheck_dictionary'] = false; + +// Set the spell checking engine. 'googie' is the default. 'pspell' is also available, +// but requires the Pspell extensions. When using Nox Spell Server, also set 'googie' here. +$rcmail_config['spellcheck_engine'] = 'googie'; + +// For a locally installed Nox Spell Server, please specify the URI to call it. +// Get Nox Spell Server from http://orangoo.com/labs/?page_id=72 +// Leave empty to use the Google spell checking service, what means +// that the message content will be sent to Google in order to check spelling +$rcmail_config['spellcheck_uri'] = ''; + +// These languages can be selected for spell checking. +// Configure as a PHP style hash array: array('en'=>'English', 'de'=>'Deutsch'); +// Leave empty for default set of available language. +$rcmail_config['spellcheck_languages'] = NULL; + +// Makes that words with all letters capitalized will be ignored (e.g. GOOGLE) +$rcmail_config['spellcheck_ignore_caps'] = false; + +// Makes that words with numbers will be ignored (e.g. g00gle) +$rcmail_config['spellcheck_ignore_nums'] = false; + +// Makes that words with symbols will be ignored (e.g. g@@gle) +$rcmail_config['spellcheck_ignore_syms'] = false; + +// Use this char/string to separate recipients when composing a new message +$rcmail_config['recipients_separator'] = ','; + +// don't let users set pagesize to more than this value if set +$rcmail_config['max_pagesize'] = 200; + +// Minimal value of user's 'keep_alive' setting (in seconds) +// Must be less than 'session_lifetime' +$rcmail_config['min_keep_alive'] = 60; + +// Enables files upload indicator. Requires APC installed and enabled apc.rfc1867 option. +// By default refresh time is set to 1 second. You can set this value to true +// or any integer value indicating number of seconds. +$rcmail_config['upload_progress'] = false; + +// Specifies for how many seconds the Undo button will be available +// after object delete action. Currently used with supporting address book sources. +// Setting it to 0, disables the feature. +$rcmail_config['undo_timeout'] = 0; + +// ---------------------------------- +// ADDRESSBOOK SETTINGS +// ---------------------------------- + +// This indicates which type of address book to use. Possible choises: +// 'sql' (default) and 'ldap'. +// If set to 'ldap' then it will look at using the first writable LDAP +// address book as the primary address book and it will not display the +// SQL address book in the 'Address Book' view. +$rcmail_config['address_book_type'] = 'sql'; + +// In order to enable public ldap search, configure an array like the Verisign +// example further below. if you would like to test, simply uncomment the example. +// Array key must contain only safe characters, ie. a-zA-Z0-9_ +$rcmail_config['ldap_public'] = array(); + +// If you are going to use LDAP for individual address books, you will need to +// set 'user_specific' to true and use the variables to generate the appropriate DNs to access it. +// +// The recommended directory structure for LDAP is to store all the address book entries +// under the users main entry, e.g.: +// +// o=root +// ou=people +// uid=user@domain +// mail=contact@contactdomain +// +// So the base_dn would be uid=%fu,ou=people,o=root +// The bind_dn would be the same as based_dn or some super user login. +/* + * example config for Verisign directory + * +$rcmail_config['ldap_public']['Verisign'] = array( + 'name' => 'Verisign.com', + // Replacement variables supported in host names: + // %h - user's IMAP hostname + // %n - http hostname ($_SERVER['SERVER_NAME']) + // %d - domain (http hostname without the first part) + // %z - IMAP domain (IMAP hostname without the first part) + // For example %n = mail.domain.tld, %d = domain.tld + 'hosts' => array('directory.verisign.com'), + 'port' => 389, + 'use_tls' => false, + 'ldap_version' => 3, // using LDAPv3 + 'user_specific' => false, // If true the base_dn, bind_dn and bind_pass default to the user's IMAP login. + // %fu - The full username provided, assumes the username is an email + // address, uses the username_domain value if not an email address. + // %u - The username prior to the '@'. + // %d - The domain name after the '@'. + // %dc - The domain name hierarchal string e.g. "dc=test,dc=domain,dc=com" + // %dn - DN found by ldap search when search_filter/search_base_dn are used + 'base_dn' => '', + 'bind_dn' => '', + 'bind_pass' => '', + // It's possible to bind for an individual address book + // The login name is used to search for the DN to bind with + 'search_base_dn' => '', + 'search_filter' => '', // e.g. '(&(objectClass=posixAccount)(uid=%u))' + // DN and password to bind as before searching for bind DN, if anonymous search is not allowed + 'search_bind_dn' => '', + 'search_bind_pw' => '', + // Default for %dn variable if search doesn't return DN value + 'search_dn_default' => '', + // Optional authentication identifier to be used as SASL authorization proxy + // bind_dn need to be empty + 'auth_cid' => '', + // SASL authentication method (for proxy auth), e.g. DIGEST-MD5 + 'auth_method' => '', + // Indicates if the addressbook shall be hidden from the list. + // With this option enabled you can still search/view contacts. + 'hidden' => false, + // Indicates if the addressbook shall not list contacts but only allows searching. + 'searchonly' => false, + // Indicates if we can write to the LDAP directory or not. + // If writable is true then these fields need to be populated: + // LDAP_Object_Classes, required_fields, LDAP_rdn + 'writable' => false, + // To create a new contact these are the object classes to specify + // (or any other classes you wish to use). + 'LDAP_Object_Classes' => array('top', 'inetOrgPerson'), + // The RDN field that is used for new entries, this field needs + // to be one of the search_fields, the base of base_dn is appended + // to the RDN to insert into the LDAP directory. + 'LDAP_rdn' => 'cn', + // The required fields needed to build a new contact as required by + // the object classes (can include additional fields not required by the object classes). + 'required_fields' => array('cn', 'sn', 'mail'), + 'search_fields' => array('mail', 'cn'), // fields to search in + // mapping of contact fields to directory attributes + // for every attribute one can specify the number of values (limit) allowed. + // default is 1, a wildcard * means unlimited + 'fieldmap' => array( + // Roundcube => LDAP:limit + 'name' => 'cn', + 'surname' => 'sn', + 'firstname' => 'givenName', + 'title' => 'title', + 'email' => 'mail:*', + 'phone:home' => 'homePhone', + 'phone:work' => 'telephoneNumber', + 'phone:mobile' => 'mobile', + 'phone:pager' => 'pager', + 'street' => 'street', + 'zipcode' => 'postalCode', + 'region' => 'st', + 'locality' => 'l', +// if you uncomment country, you need to modify 'sub_fields' above +// 'country' => 'c', + 'department' => 'departmentNumber', + 'notes' => 'description', +// these currently don't work: +// 'phone:workfax' => 'facsimileTelephoneNumber', +// 'photo' => 'jpegPhoto', +// 'organization' => 'o', +// 'manager' => 'manager', +// 'assistant' => 'secretary', + ), + // Map of contact sub-objects (attribute name => objectClass(es)), e.g. 'c' => 'country' + 'sub_fields' => array(), + 'sort' => 'cn', // The field to sort the listing by. + 'scope' => 'sub', // search mode: sub|base|list + 'filter' => '(objectClass=inetOrgPerson)', // used for basic listing (if not empty) and will be &'d with search queries. example: status=act + 'fuzzy_search' => true, // server allows wildcard search + 'vlv' => false, // Enable Virtual List View to more efficiently fetch paginated data (if server supports it) + 'numsub_filter' => '(objectClass=organizationalUnit)', // with VLV, we also use numSubOrdinates to query the total number of records. Set this filter to get all numSubOrdinates attributes for counting + 'sizelimit' => '0', // Enables you to limit the count of entries fetched. Setting this to 0 means no limit. + 'timelimit' => '0', // Sets the number of seconds how long is spend on the search. Setting this to 0 means no limit. + 'referrals' => true|false, // Sets the LDAP_OPT_REFERRALS option. Mostly used in multi-domain Active Directory setups + + // definition for contact groups (uncomment if no groups are supported) + // for the groups base_dn, the user replacements %fu, %u, $d and %dc work as for base_dn (see above) + // if the groups base_dn is empty, the contact base_dn is used for the groups as well + // -> in this case, assure that groups and contacts are separated due to the concernig filters! + 'groups' => array( + 'base_dn' => '', + 'scope' => 'sub', // search mode: sub|base|list + 'filter' => '(objectClass=groupOfNames)', + 'object_classes' => array("top", "groupOfNames"), + 'member_attr' => 'member', // name of the member attribute, e.g. uniqueMember + 'name_attr' => 'cn', // attribute to be used as group name + ), +); +*/ + +// An ordered array of the ids of the addressbooks that should be searched +// when populating address autocomplete fields server-side. ex: array('sql','Verisign'); +$rcmail_config['autocomplete_addressbooks'] = array('sql'); + +// The minimum number of characters required to be typed in an autocomplete field +// before address books will be searched. Most useful for LDAP directories that +// may need to do lengthy results building given overly-broad searches +$rcmail_config['autocomplete_min_length'] = 1; + +// Number of parallel autocomplete requests. +// If there's more than one address book, n parallel (async) requests will be created, +// where each request will search in one address book. By default (0), all address +// books are searched in one request. +$rcmail_config['autocomplete_threads'] = 0; + +// Max. numer of entries in autocomplete popup. Default: 15. +$rcmail_config['autocomplete_max'] = 15; + +// show address fields in this order +// available placeholders: {street}, {locality}, {zipcode}, {country}, {region} +$rcmail_config['address_template'] = '{street}
        {locality} {zipcode}
        {country} {region}'; + +// Matching mode for addressbook search (including autocompletion) +// 0 - partial (*abc*), default +// 1 - strict (abc) +// 2 - prefix (abc*) +// Note: For LDAP sources fuzzy_search must be enabled to use 'partial' or 'prefix' mode +$rcmail_config['addressbook_search_mode'] = 0; + +// ---------------------------------- +// USER PREFERENCES +// ---------------------------------- + +// Use this charset as fallback for message decoding +//$rcmail_config['default_charset'] = 'ISO-8859-1'; +$rcmail_config['default_charset'] = 'UTF-8'; + +// skin name: folder from skins/ +$rcmail_config['skin'] = 'larry'; + +// show up to X items in messages list view +$rcmail_config['mail_pagesize'] = 50; + +// show up to X items in contacts list view +$rcmail_config['addressbook_pagesize'] = 50; + +// sort contacts by this col (preferably either one of name, firstname, surname) +$rcmail_config['addressbook_sort_col'] = 'surname'; + +// the way how contact names are displayed in the list +// 0: display name +// 1: (prefix) firstname middlename surname (suffix) +// 2: (prefix) surname firstname middlename (suffix) +// 3: (prefix) surname, firstname middlename (suffix) +$rcmail_config['addressbook_name_listing'] = 0; + +// use this timezone to display date/time +// valid timezone identifers are listed here: php.net/manual/en/timezones.php +// 'auto' will use the browser's timezone settings +$rcmail_config['timezone'] = 'auto'; + +// prefer displaying HTML messages +$rcmail_config['prefer_html'] = true; + +// display remote inline images +// 0 - Never, always ask +// 1 - Ask if sender is not in address book +// 2 - Always show inline images +$rcmail_config['show_images'] = 0; + +// compose html formatted messages by default +// 0 - never, 1 - always, 2 - on reply to HTML message only +$rcmail_config['htmleditor'] = 0; + +// show pretty dates as standard +$rcmail_config['prettydate'] = true; + +// save compose message every 300 seconds (5min) +$rcmail_config['draft_autosave'] = 300; + +// default setting if preview pane is enabled +$rcmail_config['preview_pane'] = false; + +// Mark as read when viewed in preview pane (delay in seconds) +// Set to -1 if messages in preview pane should not be marked as read +$rcmail_config['preview_pane_mark_read'] = 0; + +// Clear Trash on logout +$rcmail_config['logout_purge'] = false; + +// Compact INBOX on logout +$rcmail_config['logout_expunge'] = false; + +// Display attached images below the message body +$rcmail_config['inline_images'] = true; + +// Encoding of long/non-ascii attachment names: +// 0 - Full RFC 2231 compatible +// 1 - RFC 2047 for 'name' and RFC 2231 for 'filename' parameter (Thunderbird's default) +// 2 - Full 2047 compatible +$rcmail_config['mime_param_folding'] = 1; + +// Set true if deleted messages should not be displayed +// This will make the application run slower +$rcmail_config['skip_deleted'] = false; + +// Set true to Mark deleted messages as read as well as deleted +// False means that a message's read status is not affected by marking it as deleted +$rcmail_config['read_when_deleted'] = true; + +// Set to true to never delete messages immediately +// Use 'Purge' to remove messages marked as deleted +$rcmail_config['flag_for_deletion'] = false; + +// Default interval for keep-alive/check-recent requests (in seconds) +// Must be greater than or equal to 'min_keep_alive' and less than 'session_lifetime' +$rcmail_config['keep_alive'] = 60; + +// If true all folders will be checked for recent messages +$rcmail_config['check_all_folders'] = false; + +// If true, after message delete/move, the next message will be displayed +$rcmail_config['display_next'] = false; + +// 0 - Do not expand threads +// 1 - Expand all threads automatically +// 2 - Expand only threads with unread messages +$rcmail_config['autoexpand_threads'] = 0; + +// When replying place cursor above original message (top posting) +$rcmail_config['top_posting'] = false; + +// When replying strip original signature from message +$rcmail_config['strip_existing_sig'] = true; + +// Show signature: +// 0 - Never +// 1 - Always +// 2 - New messages only +// 3 - Forwards and Replies only +$rcmail_config['show_sig'] = 1; + +// When replying or forwarding place sender's signature above existing message +$rcmail_config['sig_above'] = false; + +// Use MIME encoding (quoted-printable) for 8bit characters in message body +$rcmail_config['force_7bit'] = false; + +// Defaults of the search field configuration. +// The array can contain a per-folder list of header fields which should be considered when searching +// The entry with key '*' stands for all folders which do not have a specific list set. +// Please note that folder names should to be in sync with $rcmail_config['default_folders'] +$rcmail_config['search_mods'] = null; // Example: array('*' => array('subject'=>1, 'from'=>1), 'Sent' => array('subject'=>1, 'to'=>1)); + +// Defaults of the addressbook search field configuration. +$rcmail_config['addressbook_search_mods'] = null; // Example: array('name'=>1, 'firstname'=>1, 'surname'=>1, 'email'=>1, '*'=>1); + +// 'Delete always' +// This setting reflects if mail should be always deleted +// when moving to Trash fails. This is necessary in some setups +// when user is over quota and Trash is included in the quota. +$rcmail_config['delete_always'] = false; + +// Directly delete messages in Junk instead of moving to Trash +$rcmail_config['delete_junk'] = true; + +// Behavior if a received message requests a message delivery notification (read receipt) +// 0 = ask the user, 1 = send automatically, 2 = ignore (never send or ask) +// 3 = send automatically if sender is in addressbook, otherwise ask the user +// 4 = send automatically if sender is in addressbook, otherwise ignore +$rcmail_config['mdn_requests'] = 0; + +// Return receipt checkbox default state +$rcmail_config['mdn_default'] = 0; + +// Delivery Status Notification checkbox default state +$rcmail_config['dsn_default'] = 0; + +// Place replies in the folder of the message being replied to +$rcmail_config['reply_same_folder'] = false; + +// Sets default mode of Forward feature to "forward as attachment" +$rcmail_config['forward_attachment'] = false; + +// Defines address book (internal index) to which new contacts will be added +// By default it is the first writeable addressbook. +// Note: Use '0' for built-in address book. +$rcmail_config['default_addressbook'] = null; + +// Enables spell checking before sending a message. +$rcmail_config['spellcheck_before_send'] = false; + +// Skip alternative email addresses in autocompletion (show one address per contact) +$rcmail_config['autocomplete_single'] = false; + +// Default font for composed HTML message. +// Supported values: Andale Mono, Arial, Arial Black, Book Antiqua, Courier New, +// Georgia, Helvetica, Impact, Tahoma, Terminal, Times New Roman, Trebuchet MS, Verdana +$rcmail_config['default_font'] = ''; + +// end of config file diff --git a/install/ubuntu/12.10/roundcube/vesta.php b/install/ubuntu/12.10/roundcube/vesta.php new file mode 100644 index 000000000..8fb202a44 --- /dev/null +++ b/install/ubuntu/12.10/roundcube/vesta.php @@ -0,0 +1,62 @@ + + */ + + function password_save($curpass, $passwd) + { + $rcmail = rcmail::get_instance(); + $vesta_host = $rcmail->config->get('password_vesta_host'); + + if (empty($vesta_host)) + { + $vesta_host = 'localhost'; + } + + $vesta_port = $rcmail->config->get('password_vesta_port'); + if (empty($vesta_port)) + { + $vesta_port = '8083'; + } + + $postvars = array( + 'email' => $_SESSION['username'], + 'password' => $curpass, + 'new' => $passwd + ); + + $postdata = http_build_query($postvars); + + $send = 'POST /reset/mail/ HTTP/1.1' . PHP_EOL; + $send .= 'Host: ' . $vesta_host . PHP_EOL; + $send .= 'User-Agent: PHP Script' . PHP_EOL; + $send .= 'Content-length: ' . strlen($postdata) . PHP_EOL; + $send .= 'Content-type: application/x-www-form-urlencoded' . PHP_EOL; + $send .= 'Connection: close' . PHP_EOL; + $send .= PHP_EOL; + $send .= $postdata . PHP_EOL . PHP_EOL; + + $fp = fsockopen('ssl://' . $vesta_host, $vesta_port); + fputs($fp, $send); + $result = fread($fp, 2048); + fclose($fp); + + $fp = fopen("/tmp/roundcube.log", 'w'); + fwrite($fp, "test ok"); + fwrite($fp, "\n"); + fclose($fp); + + + if(strpos($result, 'ok') && !strpos($result, 'error')) + { + return PASSWORD_SUCCESS; + } + else { + return PASSWORD_ERROR; + } + + } diff --git a/install/ubuntu/12.10/sudo/admin b/install/ubuntu/12.10/sudo/admin new file mode 100644 index 000000000..47e16098c --- /dev/null +++ b/install/ubuntu/12.10/sudo/admin @@ -0,0 +1,7 @@ +# Created by vesta installer +Defaults env_keep="VESTA" +Defaults:admin !syslog +Defaults:admin !requiretty + +admin ALL=(ALL) ALL +admin ALL=NOPASSWD:/usr/local/vesta/bin/* diff --git a/install/ubuntu/12.10/templates.tar.gz b/install/ubuntu/12.10/templates.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..ce385d269736561780cb42d07b447572cebc7831 GIT binary patch literal 12935 zcmb8URZyHw7p{#YxCM6!?iL`pyF0-l1b6qr-ARz(?ruQ`4^D7`y9DZuAm^Lf{USGsP}RK+Ga`Vs-jJz6Gn9?|BB0`1J6{51&0u1-A(wAoe9`E z6vFFF9$veAdvSRue)_)Gm@QM;@XM>>0=l8*YwY(9{W9)%`RepE;+hLbGq^pv&)ZB8 z+UJ~^_R)U-TTXk!Dy_wd_uoOXH4L}g?^PzZPuwP_giL3A>ZWfDXn-)&+Nm*ctt9Ro zzkcM%b@(K34skWxW)xsdtReG-76iG!9zTrl!oGPF7;opAZ02sl{ChtK1-k6$74E0VejNdmSy38^P3J)Cf1-Zx6e}P#H|JTn7qDvR7!;<+EIe1bS^)*sfD>N50hnQeUnWn zFzTjnL@U1lj|+WjgiikibRW$cPRdAL&8qe8hhbL;eScs!{aa2e*ND-B@$C?!=FCH< z^~s6$i*H`*kGD%$(}!nN!-i^SK>feAX?tMl#;i>zYY8Z`ECzfKVqt*R8<=8~zX--| zp;5yq0um(a)tI)s77x-MFxzhqcEg>lUcYlUq3I%=BpHOc@9K0o`I|be`;KOZlPvIB zYPgu1K~sfidwaY51A@~Wj7>yn42>vAGk#;tx;$*i{Tj6kqc=v+*(I%@AYAhrX~N;| zsVvA7PqoV(G?;0HJg6vh&eRaE17Z&1XD^^m<9eM*0(N776F=<%FzIiF?uy&r%&Ith z($#hX`j!7uj9H2R{rU{N=PLxlanOBhsI7S?)T^%aha@c0@_qh;CBcDNWES-e-~)fv zKigBvPb(cGbwntTr}EF(Q@xXKhVB`e-a8%S*l`ESQcI($yR@DW58K>x`0eP=t{3FKGSRo{uR6e(#H$&Qk ziC(*DUd~E%L)b3adpbv^tUcfN-g!`|C&cJ1X1#Uf_)CxL)Nh*j`pF^P*h863`SqXQ zg13_gtU|4xc-=An4!LsgqoX7@RS6zE)~IG#7NVepDyvEys@ z*$PQ2+eaoBb0@g~!FfY{w&eW}2otfFH4Awx?+i4UTqKU9Msn|(jpkA`XF_p8f*;Gn z9L1&GhDc|*yuCLG-|=WcA)WpAU9RB1w;Ngfulms@WDka*s@ijS2qmv<#;))b^5lUU z=HFlCf<5Rae4^TxH~n=d+@}UT>ttwW+H7C9wHUk!zS2}Jn0%FsMP>-nm`%?Dvs3yy z??763L80Q*Rh#*37V&&Ki%&c8iRi;i0)q|h~vc@%bYbL1kN>=-s0)-cON^Yodi1Kp3KXZ?pJLJKh-(zS?3;W z_;?d?YEg^fIWXfiX5v%K>gFrBUWMWDt8$u757-_T*qr;5k05jG{9I(tE=SDl>LwbTE`79%21I)E>;jq#e6Zxg-5dBfX*LMqh0umSQ2o-uO{D#!-7F0 zt~unv(iXbV2M^9c5n7c7K$B>N6pd^P*}&%wtiwWZ{bfP9OHXMTl08vcbFrD z(tHawlPyRE$*!c`0m7l-Pvp5Q_Pat{0~Dh_4gZd`l}u@}M4~mv&SmMuS7^r%Wn~uq zDqKZF+?smlPthH3MLeow@zTVFU>x21VNhNwDk8cvhNkl@+9BPK*!M5L&+R0kee~yQ zPn}B|<6e{AKH)Dhip&S|Jk~lF8B&Q#0*H@e3Bvustg<_4jnw0wH|&nuh)5ZYv$8&$ ze0Ps<)-;-cSR$PHPBrE|Ixj&aUhNGLjt0Aq!;`_w4)LBhBGJL`c_AgtI_u458364a zyI=%x%|FrU9>hVO4BemNuI-QD|F$&GD+1kr=U;d8=%_LxVT@ayQ(F-=;QMZ8{vPKJ z?ukakSmd&E-!Ni-8iY&<_rjv>IVyWs?P&0iTHJnl&X`v}Ay>DqpoHQQ|s!d4G~E&r^`Y6YC@j@?kZMe1n5pC=`GcHJkG3W z5(?_>(qygL-S8?#O53fJl>}U2-MV%B57eWX!ymAeW%H;a+XqP)dTi2skTBzi%<~2v zxlZq}1SFPfDBdt;T&1y&x9|sD9Jxk2ZNhDT*5KkF`&pBM=fd07G|I9UGqc361TVIe zu~^RmxsUz2H)gt=vuhw!&|Iu^iP00M8eu^so#6dZ{g0D)KGogXh?!@MOR(*FPJ zm7qA-wlYTl3Ry^A)jHQYopA;vvH^9bKuyLG6wq>q zff!S2f&Z?Ll@N}|C=^mQKx9K!T-|pb*-AC)O|Kl<9aVNL&i@srzYQ29#R6!tZ`<$b z9>u@B3(S56Z9o4_A-eLUV|bMh@qMMb;JdPZ>nQxe>hUNZ3-}<8zqsJOi0>oq%%^iK zgwuWD2!@{=K@GIQaRF`~C42HM7$3pJ9%%tn3G; z?H;2Ge(>) z(=BPRn!e6)!2SX0KT1|(*)tWB!xgAc7>gIa=nR)oEH}?x#mJ+v?r^)}N2K4KAUbp| zUIj@q`cHAY4MrV4-i0#WQO>kjAdSD!O)9qY=Kg){Hv9bLl4r)fX1c8}BbsnYXI&2a z-^AuMfeo6ktzS=Z4dGsm^NHrTz26bpuX|5!jTfhTXKY)DSkHh152l+0`{(ixt-1}< zbcxD|X}Cn6+$4PvCs#n;9KHU?Soz__!yta#1Fk=gL{xHKT-`$@o%Z&QZUo=_fucBO zX%X!4T*$@URhRLQU5g(O5n}p!`F-s6VLJ~3jNC$DE>%Av|CPUCKphIW{HM!N>214K zPLRXxw<5aqh{A0-l&*iU2347mnmw?Rn==6ZFB&hAyorD^TD|_0m(2&&eOIaOu&{7A zbPBcNTLx1@-!|#9Vwn8d(ZN%9`jOL}MzkbP^qjAccW|JGyPrY7h&2umnN#_^dJHF{ zOB{p}ar*T6YLnODjtbtG58(3x8uaFBaL_YcVMA1+oq!J!4lPK))@Z}FDp|+LiYu@a zDhcT0{)c>eSVllD2-xGI$zn3BGz3RAl6R;i~4yG{UyOwT+XbQ(0Z@>8mFH@g7 ziUCEdW5>xZ$>UU4&YUx``3njQnH$%4&*_t&6rTdA_NWq~-QO(L#++e~3_y&ICmW%t zwWuzG&5QL5lUHGu$Xdoe#VF1nGjK3PhBB?zbg|kK*L3bD5>X0@dtyFXo9$yU$eDCS z4m8s#jO;GzQ$(VviZ;qIHPv1O1oDF@%(3Mc&y8!AGYYcw8C!53XW|V?A4U1i89d8a zfHX$Tg~$=r)@Hu7S=n8B1i5`Uo<;K?)DR|%utBHffOjx;Mb95{kT%i1c@A0%8k!-C zAlzjUf#S1gL==<2N>v@yp}YBg>T>oe_~#l#mF8co8Vh_+AF7$yXdD7`-@C+2Tx#SP zg_Hism7-12$uPu$Te@bYRq1;Mf0)h}Q*6@uS!kel9kq%N=F+6qHJAUSr3YeA_;t`A zCh%rjXP`mw(}pN@%&>NU#darNKr?JOc`Slin%wLcpOy^eS1bn5DoQf9tf97<>@%w) z%U{-vi4mnBwB68v4Vxn^a(f6glwJ08*T;d-oc!R&u!ZHpkVT%51c`h}QAP47|G}9i z%l(M240*qAMlJ786>N;f?A<*Zh1=5-hdCQu!#|WMPdkDu*teb#WqH{{YASc>N3Jz9 ztB{}ldKN$4GK<**IgiC()Q_7cfCavw85koN*v33hRrrRZlVWnjrKowDc$hyZ+rqZW z{<|U7ObZjrp|Na5NU?a0*gCrz@~#if@(4J$UeUkvm4fQC6Qx63h#I4y%7&+B2>5l{GtlExn3}7CZBn4L9P1oLF4yf;MU@j$x@+RDoSE?Yh-W@>dTTdZsAU+bF zzF?DvW%XkO5hs?eGlJ29$s5HoO|krX#8?(?YpFpTRr>qvxV}QWjOQqWspz$DqM4*P zMJoz=^20Q*j+#xJeNn@7T^rt>rZV}yks>B8wU868$B)DYg`^b0F5;7PpUeM6PO{D;%#AZ<&uCMl$~8h4S#zweCGPL%EW-cEa; zlJyhIO{&-**NGLL_jSk*xb7)uabTMVK#i(1P1N;+Z?%O20}+uOHsZyx-Yc!a5G=E; z!5Gf;8xS8kXbja?dj$C)Y=^#aI;@Ss3W}OX_eoWw{5A7}0<87>5!?2jG`b&d%+<`$ zDspmaE6JBW-QeMh?~*;?$t597P1woPcn@>l5@k$LXuZD9^PL|rS8fy55&%RUj)0dF z2aJ>c6)YTj)ejqjkpBg=Y1TJB{cUlAT3%bA5p>-%omgcm=G17f5G#wgE=O}k1jLr9 zv%Ni8o?5_Ejb36EiCs3Ya+6YmcS1Is`X{iLb9iHywh`F2fX&q#aK$-bTV@5=Fg8lT zaz4YJzTbhAV6i|)5CjVfK7g9J!>+pTf2ZAnP#wwiRsmIVAYkHI+(h{i9*AcrL{8$n>IJ~)+8beVHq_}#Sf=o6$M zUrU@c`ulZr#P=?13#d>j^~(&M-ghCH(RFr8ZRV9I8xOc9LV+FnXrek|QRi%}rPf-D zVxiN8+r_?*%cYfEoeQ_dEPrL>EEFvH5i!2R31S1mK1)5lwPv|cPHVbE8l2xRmV4eaqLbfa*X>9N==^WH#klhCO(?7%3)y!SA;LlZO zH+!?ky9K;)R31}&5GIu{@oegzO?w2lbAAE=O=#wvdWh%jI`9GUUi}_Vmy^-iuLUo= z7cn`9O{P#}2AOE9MLZl}_pLw?+7T3!3A*r#(R-EukMCjIVf;RKH zS=q_{rnO-f2yOXXUG6Yo<|R6EF;;q=P&hh-XpJZ%f`QVEzez-Z)K}ef)vbJ=1QO*? zW;gt~BA+TFW}umxS0kGy_%6TOKrZIBUvwlX{-2Qm#!*#Vu=$0NCN`83vi5IA7Ej-* zm-RO(2CH~@APZNj@aD5t{7G_LuE~mO<48WPs?bsj#)O=f;F&QR@D7x^4}WZi*tm8z zSTGy;J45gM?BS~GwtOZ=W-w83IKI-2-etNX?+s`1#3T#EPi z96E!g_>x)Ghe3mq?-l#7sorYH0SZm7eaE_9rS*EQZvrzQ+hTNd%#nDPq@KW_kkAGdp z8bvYu*BrDYc#Jg!zlx)U#Nmm7(JJjKD;^!%;>PPD=6O#d=-t7cf} zA(nJ*jXv5scRMt-A+MqOXRg8^=nBy@c>f}sv{)=s5@#AeYbLW6fJb7orLTP~nY19J z4AXq4cYlMFHcKuN>qY=^-igkn&ae6U;g`o9aQ@$s*7=*a!LQ7X?R#r#>~V_@0`+U< zRqOW~J!-j|y-%MKvDl?>$>J8%z7upPiNEH-Ll|V|GE~KdK6h7PU{Ssc&EAF!CmDD< zC{TT0M{nM&mUpP^%vs0}_3O%-_9QL^y}eG~T^&mQeyj+iV&DP&;p|!2A1;|n2V7yA zVkmb7!ssi?Hj4FE-%ic_WWI39n8JtK$0ECoJg1jp#R7;MbYp2UjGPwlETTx=1XJIO zgykH&9aY^2kbnO%6dKQQKK;Z9u->|A7MsVfCAzCmZ~IlBQb}w}Hq6`2uT+dPAfTq( z6PDv1^Xp~SUbH!c1>+|rj=fL?a~E_m(WH;i_{5%bW=G>`!s;g7kgTb#gSvJzPmTXx z^P*p4t6Wo~8;CcbRMgj)(Uph%^w;>Tyqr3`K(C&f_4yxBD0uTa1EqE>nQJ#ZbeFcZ zfh6Wf$eHd8XVrf1r;FoqssnR91-j#$>)~u_{G`h-aX5s+t*P|*opw^(%pMUR1yqS= zli1wu=@gSZxaFC1St@FR@*1w%7%?Srb>>)UiC4XM zV)x?=sGjGOtx=3A>1)@A{14O+9$C--P~87@&8zZ#+rKtl`M3QGrfYDO{jhz}reg?r zm4-bOn09axOvNT$(>W<~)@?;vzz}vE=0%kTErWU*-?vI)S*Sx`@UOJ~QR6;Gs;DN{ zD0(5(gj?dyVMk6vatr%}J0;}_C%0KaRe^rwOCPc|APbgmtH`y7;b8T;WB8rf7A zjl2?3#Pfykp^-*!#?}5_+cvH^M@Ln*@C{8Q>#WitdID9bOl)S zjPVW{R>8JMiFqiXuU9)}`q21&_vp=ejcVqyXYl8;-bXkbf(!BPO;hl?HeUkp=PCsN z47KK-eutxdc)Rf*1Uo}v7fA^~Wpz;7<|+E~Hsfoup%xD;IpJYJV@N?96LTN>Y3<|0 zY~ft&-s`6>v%uYFYU$(pyHiUhtadBo&u(!{Fsvgj9QEig&|Ji<6>qBnBzQ>J9R=P5MMb`t=J4Y`%7#a zaeXIwq=m^aGw9WB5tU}+3j4mw`weN5OK{n$ej2bzMziC>p^2BqRU+NZL-CRQTSl8R z(foTpQnu2Ui@qpl>?wbryH=q{Jb_8VnTtFdA?%L(=E`l37DL&NROMo3g0e)~h)>=^ zSn?t9THlSrhNyU*ph_<3Zce5~@YJOwlv4=$={o~j>{Gnl>8$i)(K95-Lp+NNig$^$ zd%9KXy3&bDIRMkEm)RGLg(|i8PxW8j69~9f)bNcU>NEIgV zF7`+8Wj7Jec`dZ1$yN1n)1ZT`wR_6GxuC^^Cq|V#xyHcqv%yjc0Tq!R#ltSzLSJQ{ zc=m0dAi?$>cIGSk%4jUPv8S50-*J0$w!P&GL1j5!nN++DxVy9KT{d$v#Y*H8J_0x1 z@*O0878_Xue;im_3q`$hxZJ;Qho>apEraSXu(CSVw?Ou_yNcN z-LG5GmSC4fu&PlAej>$%Twi*N{(7Gm#bS?qy@KZrTz&_tt2?|02uFZwM%{U!q4YI9 zSnWmd^tiMjJvca1I~5AnJH`gBI|2)txBtzqmI$9g4fLX}&s6hfiXv$c+8ZD75i_r6 z{a=8`wCN7Z8sNE@U+(>h;J+H=3sZg+7bs8y11?FtE%$Y9A-@j5TY$3BS=HQACd}-` zNeF0QbV>n8$_-6k7{A%bxhkoz@(`FzCxMh+(o{##EFXBvJfuE_TJRJ0z4MR#R*%yG zNgn)e%hu;~ayiVZdwHV<`PcDm#n-`D6Dw$%H+{tFaZuZHH*SC6SF_zio~!sV6dwaZ z-qAXV;cUj`W3kU?&oEsr3i+6is%3lnbG~pbBu>tEH$NaUPv>!(WUIj>wl{JqfvmhQ ztmsA$<``V~3451dM^@j%fe#$gH={2E-Oj0(!{fyslB!yrp(eX=i;(xifRAvirYps1 zsl0x`)q2Xro@lsoYkm5mOY4v!wk%53#WNgm!R!5UelhE^g$aT_kDzv8<1rfG4(!xA zM-00+4(}=WERwgpfvFN%zfV5W-n<|Xlu|Nmv2NO+CVyOU%CPAsnIfH!Qs(~YKVr4= z2?IU@ReR8vb19_*$%~<{1G%&ME_ojn_|pl zMUaLcGJk*HiO|~OkyC{aOi!0RyS+LUszMqT&PE{($q;aZ*9lCYJ@(p672?t_F_Bjy zUCr=v&5RJv92S~kaj2V8nuc?*l0Z2!xAN!57C9Gx_w?WFNaw*sOl=w!lyK7Wyy}yX zI(d;iHLPnopc=tOyP^IZ^eU4ut90Fl7z%4{@Iy}B_Cf$Vaj$X&pq&ieRP^(DQbk55 zbH5yX{OXbqws7a4sQ(J3l`$2}r7gD@IAPq%D$5CCEr@xsf}@|rl?<^8f3Lc892{_a zADziqLnJOP?C0fwI~je{5M4vWC@vaw^Y1};Oc*Zh=_LAMr?HeVLJ~Dx%mBkM4)_y0 zLmmY0>_cFS2wU*)HH`q)6e`-*tN
        JXql@HLvN@Zghx7di_zx{Jl{l=j8>Rd0iuIDly5)|igW-~8Wh{82vJVRya(Gh28$Tg zNYvQTi%N?bCT;d~G|V4#+1?=$n)3*Hxd;vcbUYEFUd2Vb0A2Nu&?ll{P)8UPg|y7h zt|X>^>LNVb{#blXPfp^$?bprv6EHIeJC+ep4Snj{tkXIm5nFTt8ER^2OuVN!m)S0X zvQb6&n|xqJy&%>~Sa#2_Yw!4`{PZWwbk?(I*2wCsAP|b1st=@4l>#FI_0_}g{H+*3$S0l%u3ywW7$1|v! zaSpbH0u!@>L3X&jg3KQY$hH&phHZrY?~(zKk;K(>(uzNUH- zAZr2aY7}3oR5yTsUaxfjflMoKr|}3vF~{kr4v~c0PlCr#@)7#+3hHvro10o+MqFfo zt~mW?mKeRX>@k4lKg0BMFm;nxaf$PA{1_x*m9s`ei8?E;LBeQjPh;<^BC`vhy=8L5 z7V&1ruJ_U4bC3GCMbrm^YMib4{f-))$Pn`w@a>Pczvf0da-TC@FN1z}mO*A+i99yD z?0_qiI--5?Hby9TD1ip5FaHrL{|FqiUo?X}p29l2ChO3TRP!Rgae*d8XFjXt@lt+2 z(l{O@3MS9x?sg^QXz>(gRF%k(P@nrEjix>Us|FT-+Fwyk>$Q|s_U^a(#+sJf>R0Nk`o%iVEFD>Xu zX43CaBLt7SlSZr>sgwQU=RQ?pa1EU9vC%~c0OR;rBBGUX^6$}2?3>@PSr6go;#A(uRDeJ?r@yt7-{CNjWf$})#`?+ zFPi}mLdWU?k8*Asj=i8JW*@(>J$VC6@%xc~i?g{NFuI%b>=Cb=x3dd$gWg89atW(} zpW$UJH1jFz$K_|Mdo@4XPjjfTLC3Gi)5C_Tc`q8ZDaaS`YX<7~dyc5&+<)V>LrNWw zh|!H@H;_j8_QnQ8l%L8S%>>Q6l5&oGx5~mB7`a#+TWdF^-blaz8YHi*1i^s*##_FvY061=ALqeLd@J$ksHKP z6_vt~i+S&GRR-uk{ed{m2-yA_H6$NcWKeg!b{27o$qN>%+`hm|M zjQrW{eCJpuGlA6OeZNfM*=pe}a)<^~85he}>OE)56_#oGj@puBeg(|;|IxYaXiy&W z-AMMgq<11R%N9ux>R`07CGmPg{W}5dS5v*+RO%`%2QJ-e;6wr@WSo`q^vbpL23}{-71LD?wbSfJb|su5Qg-`CAXhJ6+on33>{I+|^K- zwa7vH3&QmHz2^_T7v2|u1D=jPRs7J?tysxYHt}Nodch%A_&)zMU(j;!`Bbyj0TGQZ zgoKK6jAUQ9a@LP44T9G;z`OFrKX#;sY}9qa3lXQEOut~tlYwZ(?ZXJ~+*(Uv8-?OC zK@NPFkb5V}86w*SD@mDPYD@YSWld@SMH-SkDS26r`r#wM>+(6gP5fS^a8F+sQQ$AA z4fhEU3Tg%Pg)azCL0)w80A(D^hvW*Ci3fRZR8*wwYt}`wMO=4aP7;2-&-EBPV(4cC zH*B^a>!6#azD6inJFwDaC@>201+*`Gm|-5GvFBj>dq9HttUjkJrGq6*7Q}3zGXi^! z+6TPWFZ3J%%rLWIfEKuFqgw;~m|n%79-+Vtadf%`#ET?~C{b#zg9h=&%IS%aFFo`# zNz8vjOOT+`_?p3T0XSE|Ij;d14@Pq^7o$@=1#quf2em$bvWY{l25Q3mFo194!B^Wsg34TJo+;u3;H zh)L68Y8_|n67v>dYp`@xip(ip-0eD;*)jEGuvc-g zmy*qWG(*DDS}Ym#Gs_tjzdh+(;~4jRG3r_pG74zmV*LXIOvP)OSizs4Wc%`@)hbqp5NwjpbcWEw62}W!p z*6|8cobtEeznxZ0F6#XOvo1E@jd zVB@0*+6D6lQ4$(WvC9keSb2MA9kh3)cKl`9lI2`X<_~1cx(V?8$?dig&%>`jKhcrH zGOhC<_!_p)3f}RjY-u8T-)7A%ex2|e`Rq7Da7~%Th32T?PtqT*=7(eaSVvv~-XwzU zrcyVdjp8A8p^dJmXd|m`kJnSJW01feAbrsqaPu~szeWfXH#`8EGGv~_Dbt?S*;r3P z+}1k^|A$;`Hk=Q!Cmfl|LH)`E&U7(tYJ?`&ZzQ9ySb(Eg9}x1|R_ir(zeM42xB=w)0Si$1$NjQTY`AjI?K{SLxzowsX7ZMHi$ zLFA$2ZD*1Z4Y)}Z#W9$I5IUBjLTV9>dp?^gk?KBz@EG=l>nNr+5t2=F1r$$z^twyC zNq{ZCUfd`A7U@Z{&xR!>o4_Fi9-f2LSp%6b(gEM6f_|W}=o0nyXB*!)CA5X?cic3J zQfWU@t(aj(LiOCyeCJL?@YViMMpdULAq2o{4EXP50tIP88CBjjggq-9$J2RU%|1>q zpK9HJ|NC{fQ9kR~e+8N762QdQ|MQ{p$7c{aOq^LnAo95Hae$Uw>hrTlC*Tu)^?A$3rSL#CItz$MK1{#+IIg(P~= zJ>=DZL*G&lxs#hoNz(_dN*L8V2j_f`aP`%iuGN*yF>+%qw-)11PM{Ar!r$TT66xe0 zJsjRCsn&DIEa4m7=bPVKn!*bfTNzcp&L<~ax@$1iqFZ}7yN0u?f+oy$MkR(f!+NWZ z(u|hpY)YTt9dFxTw(*2$}hHhUwJ08-EcnsmZ)-)(-JHS9zNH zKz3TfERImV)15?rnW04WX@E~}+rox?xSHL$^QCcO*4XBhp0L50c!+rg6KCGVIEZH< z+t~QG?0*37FdMe)O?Rm8h(vuncDQHxsj;!;~aoa;ky5pJO-1#@P4%gP=#nVflB&Rn9tL>xE=c2rAyI*><1|WYKK{@dlzKc(0vzK>Hzj6;_pI3=EkI&^?r z%~mU;QU1%QT{_gI%1{qhL;4q3N@E!ZSjS;&haPdV+Yz=5OS2lGrd+ev_TcPdT71{*QLSCls~=|+ynm} z-o9y$nn?iQ;7Um&Bp>mzL+}%Dk*DeLQvxUCHP@_(zF`DUGd5J*c*7E^@Y?4B`~c9eHy;l}b<2I*SECD}i)|-wJLnUGN}~_Ce$cmPWlvGO{qt{5 zuU{^}k9m*)tlyx`v5H1FHee|FjReBJAikh=v)yb9Tgln!p#qUigH#v`%S}~@s9fsh z3r`b*c;yokkH11-cCcrp1UWqGkLaQUs|R|BbzRST__8HjWQy%pcMXo=h8P>QhKn9; zszXG5{30ITQ>UfzkHZns5=6fz1B`yd(`Ds2SKN|eYsdXXIlQ%YPN~{AvNMq^gQkvMwNdVoXleSVR zlX;$}T{H>n{;XpA{b=84d{AQVR+*RIQs%f3!|w}zgK1AhRp`0PcGzz%%9-EkmzBK1 zmk2syi~NO4GPKo&JG(qM?Hes)SJK0go@%q&E9t+dkv1g;81K5OrgB8T7_6)BHlYN4 zShcQtoDHhOKluPAYVXEX1hb5NchbG3qfJ{x!h33I--$j;U#;Zp;%Cr#aN}L4XbE^$ zF{juQPJh$?b}jnX0amS$Qkf%&Oix~}CO{HVi&4ajtls!f2O~i!>A+ogm2@VY3;7-s zA=_=+jZ%6^(bY_;okh{_&%ZlwQa6EP7OB$N+iO2ba(^C_TirN2UWkYn@9th + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %sdocroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + #SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + AllowOverride All + SSLRequireSSL + Options +Includes -Indexes +ExecCGI + php_admin_value open_basedir %docroot% + + + AllowOverride All + + SSLEngine on + SSLVerifyClient none + SSLCertificateFile %ssl_crt% + SSLCertificateKeyFile %ssl_key% + %ssl_ca_str%SSLCertificateChainFile %ssl_ca% + + + RMode config + RUidGid %user% %group% + RGroups www-data + + + AssignUserID %user% %group% + + + IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* + + + diff --git a/install/ubuntu/12.10/templates/web/apache2/basedir.tpl b/install/ubuntu/12.10/templates/web/apache2/basedir.tpl new file mode 100755 index 000000000..75daf0e10 --- /dev/null +++ b/install/ubuntu/12.10/templates/web/apache2/basedir.tpl @@ -0,0 +1,35 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %docroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + #SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + AllowOverride All + Options +Includes -Indexes +ExecCGI + php_admin_value open_basedir %docroot% + + + AllowOverride All + + + + RMode config + RUidGid %user% %group% + RGroups www-data + + + AssignUserID %user% %group% + + + IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + + + diff --git a/install/ubuntu/12.10/templates/web/apache2/default.stpl b/install/ubuntu/12.10/templates/web/apache2/default.stpl new file mode 100755 index 000000000..e884a95b9 --- /dev/null +++ b/install/ubuntu/12.10/templates/web/apache2/default.stpl @@ -0,0 +1,40 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %sdocroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + #SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + AllowOverride All + SSLRequireSSL + Options +Includes -Indexes +ExecCGI + + + AllowOverride All + + SSLEngine on + SSLVerifyClient none + SSLCertificateFile %ssl_crt% + SSLCertificateKeyFile %ssl_key% + %ssl_ca_str%SSLCertificateChainFile %ssl_ca% + + + RMode config + RUidGid %user% %group% + RGroups www-data + + + AssignUserID %user% %group% + + + IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* + + + diff --git a/install/ubuntu/12.10/templates/web/apache2/default.tpl b/install/ubuntu/12.10/templates/web/apache2/default.tpl new file mode 100755 index 000000000..073724ce0 --- /dev/null +++ b/install/ubuntu/12.10/templates/web/apache2/default.tpl @@ -0,0 +1,34 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %docroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + #SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + AllowOverride All + Options +Includes -Indexes +ExecCGI + + + AllowOverride All + + + + RMode config + RUidGid %user% %group% + RGroups www-data + + + AssignUserID %user% %group% + + + IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + + + diff --git a/install/ubuntu/12.10/templates/web/apache2/hosting.stpl b/install/ubuntu/12.10/templates/web/apache2/hosting.stpl new file mode 100755 index 000000000..7a5d7787f --- /dev/null +++ b/install/ubuntu/12.10/templates/web/apache2/hosting.stpl @@ -0,0 +1,49 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %sdocroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + #SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + AllowOverride All + SSLRequireSSL + Options +Includes -Indexes +ExecCGI + php_admin_value upload_tmp_dir %home%/%user%/tmp + php_admin_value upload_max_filesize 10M + php_admin_value max_execution_time 20 + php_admin_value post_max_size 8M + php_admin_value memory_limit 32M + php_admin_flag mysql.allow_persistent off + php_admin_flag safe_mode off + php_admin_value session.save_path %home%/%user%/tmp + php_admin_value sendmail_path '/usr/sbin/sendmail -t -i -f %email%' + + + AllowOverride All + + php_admin_value open_basedir %home%/%user%/web:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpMyAdmin:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcubemail:/etc/roundcube:/var/lib/roundcube + SSLEngine on + SSLVerifyClient none + SSLCertificateFile %ssl_crt% + SSLCertificateKeyFile %ssl_key% + %ssl_ca_str%SSLCertificateChainFile %ssl_ca% + + RMode config + RUidGid %user% %group% + RGroups www-data + + + AssignUserID %user% %group% + + + IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* + + + diff --git a/install/ubuntu/12.10/templates/web/apache2/hosting.tpl b/install/ubuntu/12.10/templates/web/apache2/hosting.tpl new file mode 100755 index 000000000..ab844dc74 --- /dev/null +++ b/install/ubuntu/12.10/templates/web/apache2/hosting.tpl @@ -0,0 +1,43 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %docroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + #SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + AllowOverride All + Options +Includes -Indexes +ExecCGI + php_admin_value upload_tmp_dir %home%/%user%/tmp + php_admin_value upload_max_filesize 10M + php_admin_value max_execution_time 20 + php_admin_value post_max_size 8M + php_admin_value memory_limit 32M + php_admin_flag mysql.allow_persistent off + php_admin_flag safe_mode off + php_admin_value session.save_path %home%/%user%/tmp + php_admin_value sendmail_path '/usr/sbin/sendmail -t -i -f %email%' + + + AllowOverride All + + php_admin_value open_basedir %home%/%user%/web:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpMyAdmin:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcubemail:/etc/roundcube:/var/lib/roundcube + + RMode config + RUidGid %user% %group% + RGroups www-data + + + AssignUserID %user% %group% + + + IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + + + diff --git a/install/ubuntu/12.10/templates/web/apache2/phpcgi.sh b/install/ubuntu/12.10/templates/web/apache2/phpcgi.sh new file mode 100755 index 000000000..6565e103d --- /dev/null +++ b/install/ubuntu/12.10/templates/web/apache2/phpcgi.sh @@ -0,0 +1,16 @@ +#!/bin/bash +# Adding php wrapper +user="$1" +domain="$2" +ip="$3" +home_dir="$4" +docroot="$5" + +wrapper_script='#!/usr/bin/php-cgi -cphp5-cgi.ini' +wrapper_file="$home_dir/$user/web/$domain/cgi-bin/php" + +echo "$wrapper_script" > $wrapper_file +chown $user:$user $wrapper_file +chmod -f 751 $wrapper_file + +exit 0 diff --git a/install/ubuntu/12.10/templates/web/apache2/phpcgi.stpl b/install/ubuntu/12.10/templates/web/apache2/phpcgi.stpl new file mode 100755 index 000000000..aa5137308 --- /dev/null +++ b/install/ubuntu/12.10/templates/web/apache2/phpcgi.stpl @@ -0,0 +1,35 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %sdocroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + SSLRequireSSL + AllowOverride All + Options +Includes -Indexes +ExecCGI + Action phpcgi-script /cgi-bin/php + + SetHandler phpcgi-script + + + + AllowOverride All + + SSLEngine on + SSLVerifyClient none + SSLCertificateFile %ssl_crt% + SSLCertificateKeyFile %ssl_key% + %ssl_ca_str%SSLCertificateChainFile %ssl_ca% + + IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* + + + diff --git a/install/ubuntu/12.10/templates/web/apache2/phpcgi.tpl b/install/ubuntu/12.10/templates/web/apache2/phpcgi.tpl new file mode 100755 index 000000000..a05ff252d --- /dev/null +++ b/install/ubuntu/12.10/templates/web/apache2/phpcgi.tpl @@ -0,0 +1,28 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %docroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + AllowOverride All + Options +Includes -Indexes +ExecCGI + Action phpcgi-script /cgi-bin/php + + SetHandler phpcgi-script + + + + AllowOverride All + + IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + + + diff --git a/install/ubuntu/12.10/templates/web/apache2/phpfcgid.sh b/install/ubuntu/12.10/templates/web/apache2/phpfcgid.sh new file mode 100755 index 000000000..e80582492 --- /dev/null +++ b/install/ubuntu/12.10/templates/web/apache2/phpfcgid.sh @@ -0,0 +1,22 @@ +#!/bin/bash +# Adding php wrapper +user="$1" +domain="$2" +ip="$3" +home_dir="$4" +docroot="$5" + +wrapper_script="#!/bin/sh +PHPRC=/usr/local/lib +export PHPRC +export PHP_FCGI_MAX_REQUESTS=1000 +export PHP_FCGI_CHILDREN=20 +exec /usr/bin/php-cgi +" +wrapper_file="$home_dir/$user/web/$domain/cgi-bin/fcgi-starter" + +echo "$wrapper_script" > $wrapper_file +chown $user:$user $wrapper_file +chmod -f 751 $wrapper_file + +exit 0 diff --git a/install/ubuntu/12.10/templates/web/apache2/phpfcgid.stpl b/install/ubuntu/12.10/templates/web/apache2/phpfcgid.stpl new file mode 100755 index 000000000..622495756 --- /dev/null +++ b/install/ubuntu/12.10/templates/web/apache2/phpfcgid.stpl @@ -0,0 +1,36 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %sdocroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + SSLRequireSSL + AllowOverride All + Options +Includes -Indexes +ExecCGI + + SetHandler fcgid-script + + FCGIWrapper %home%/%user%/web/%domain%/cgi-bin/fcgi-starter .php + + + AllowOverride All + + php_admin_value open_basedir none + SSLEngine on + SSLVerifyClient none + SSLCertificateFile %ssl_crt% + SSLCertificateKeyFile %ssl_key% + %ssl_ca_str%SSLCertificateChainFile %ssl_ca% + + IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* + + + diff --git a/install/ubuntu/12.10/templates/web/apache2/phpfcgid.tpl b/install/ubuntu/12.10/templates/web/apache2/phpfcgid.tpl new file mode 100755 index 000000000..5c1f16e20 --- /dev/null +++ b/install/ubuntu/12.10/templates/web/apache2/phpfcgid.tpl @@ -0,0 +1,28 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %docroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + AllowOverride All + Options +Includes -Indexes +ExecCGI + + SetHandler fcgid-script + + FCGIWrapper %home%/%user%/web/%domain%/cgi-bin/fcgi-starter .php + + + AllowOverride All + + IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + + + diff --git a/install/ubuntu/12.10/templates/web/awstats/awstats.tpl b/install/ubuntu/12.10/templates/web/awstats/awstats.tpl new file mode 100755 index 000000000..9a92e0fd4 --- /dev/null +++ b/install/ubuntu/12.10/templates/web/awstats/awstats.tpl @@ -0,0 +1,133 @@ +LogFile="/var/log/%web_system%/domains/%domain%.log" +LogType=W +LogFormat=1 +LogSeparator=" " +SiteDomain="%domain_idn%" +HostAliases="%alias_idn%" +DirData="%home%/%user%/web/%domain%/stats" +DirCgi="/vstats" +DirIcons="/vstats/icon" +AllowToUpdateStatsFromBrowser=0 +AllowFullYearView=2 +EnableLockForUpdate=1 +DNSStaticCacheFile="dnscache.txt" +DNSLastUpdateCacheFile="dnscachelastupdate.txt" +SkipDNSLookupFor="" +AllowAccessFromWebToAuthenticatedUsersOnly=0 +AllowAccessFromWebToFollowingAuthenticatedUsers="" +AllowAccessFromWebToFollowingIPAddresses="" +CreateDirDataIfNotExists=0 +BuildHistoryFormat=text +BuildReportFormat=html +SaveDatabaseFilesWithPermissionsForEveryone=0 +PurgeLogFile=0 +ArchiveLogRecords=0 +KeepBackupOfHistoricFiles=1 +DefaultFile="index.php index.html" +SkipHosts="127.0.0.1 +SkipUserAgents="" +SkipFiles="" +SkipReferrersBlackList="" +OnlyHosts="" +OnlyUserAgents="" +OnlyUsers="" +OnlyFiles="" +NotPageList="css js class gif jpg jpeg png bmp ico rss xml swf" +ValidHTTPCodes="200 304" +ValidSMTPCodes="1 250" +AuthenticatedUsersNotCaseSensitive=0 +URLNotCaseSensitive=0 +URLWithAnchor=0 +URLQuerySeparators="?;" +URLWithQuery=0 +URLWithQueryWithOnlyFollowingParameters="" +URLWithQueryWithoutFollowingParameters="" +URLReferrerWithQuery=0 +WarningMessages=1 +ErrorMessages="" +DebugMessages=0 +NbOfLinesForCorruptedLog=50 +WrapperScript="" +DecodeUA=0 +MiscTrackerUrl="/js/awstats_misc_tracker.js" +UseFramesWhenCGI=1 +DetailedReportsOnNewWindows=1 +Expires=3600 +MaxRowsInHTMLOutput=1000 +Lang="auto" +DirLang="./lang" +ShowMenu=1 +ShowSummary=UVPHB +ShowMonthStats=UVPHB +ShowDaysOfMonthStats=VPHB +ShowDaysOfWeekStats=PHB +ShowHoursStats=PHB +ShowDomainsStats=PHB +ShowHostsStats=PHBL +ShowAuthenticatedUsers=0 +ShowRobotsStats=HBL +ShowWormsStats=0 +ShowEMailSenders=0 +ShowEMailReceivers=0 +ShowSessionsStats=1 +ShowPagesStats=PBEX +ShowFileTypesStats=HB +ShowFileSizesStats=0 +ShowDownloadsStats=HB +ShowOSStats=1 +ShowBrowsersStats=1 +ShowScreenSizeStats=0 +ShowOriginStats=PH +ShowKeyphrasesStats=1 +ShowKeywordsStats=1 +ShowMiscStats=a +ShowHTTPErrorsStats=1 +ShowSMTPErrorsStats=0 +ShowClusterStats=0 +AddDataArrayMonthStats=1 +AddDataArrayShowDaysOfMonthStats=1 +AddDataArrayShowDaysOfWeekStats=1 +AddDataArrayShowHoursStats=1 +IncludeInternalLinksInOriginSection=0 +MaxNbOfDomain = 10 +MinHitDomain = 1 +MaxNbOfHostsShown = 10 +MinHitHost = 1 +MaxNbOfLoginShown = 10 +MinHitLogin = 1 +MaxNbOfRobotShown = 10 +MinHitRobot = 1 +MaxNbOfDownloadsShown = 10 +MinHitDownloads = 1 +MaxNbOfPageShown = 10 +MinHitFile = 1 +MaxNbOfOsShown = 10 +MinHitOs = 1 +MaxNbOfBrowsersShown = 10 +MinHitBrowser = 1 +MaxNbOfScreenSizesShown = 5 +MinHitScreenSize = 1 +MaxNbOfWindowSizesShown = 5 +MinHitWindowSize = 1 +MaxNbOfRefererShown = 10 +MinHitRefer = 1 +MaxNbOfKeyphrasesShown = 10 +MinHitKeyphrase = 1 +MaxNbOfKeywordsShown = 10 +MinHitKeyword = 1 +MaxNbOfEMailsShown = 20 +MinHitEMail = 1 +FirstDayOfWeek=0 +ShowFlagLinks="" +ShowLinksOnUrl=1 +UseHTTPSLinkForUrl="" +MaxLengthOfShownURL=64 +HTMLHeadSection="" +HTMLEndSection="" +MetaRobot=0 +Logo="awstats_logo6.png" +LogoLink="http://awstats.sourceforge.net" +BarWidth = 260 +BarHeight = 90 +StyleSheet="" +ExtraTrackedRowsLimit=500 diff --git a/install/ubuntu/12.10/templates/web/awstats/index.tpl b/install/ubuntu/12.10/templates/web/awstats/index.tpl new file mode 100755 index 000000000..9df9bb5cb --- /dev/null +++ b/install/ubuntu/12.10/templates/web/awstats/index.tpl @@ -0,0 +1,10 @@ + + + + Awstats log analyzer + + + + + + diff --git a/install/ubuntu/12.10/templates/web/awstats/nav.tpl b/install/ubuntu/12.10/templates/web/awstats/nav.tpl new file mode 100755 index 000000000..f29bed68b --- /dev/null +++ b/install/ubuntu/12.10/templates/web/awstats/nav.tpl @@ -0,0 +1,23 @@ + + + Awstats navigation + + + + + + + + +
        vesta
        + +
        +
        + + diff --git a/install/ubuntu/12.10/templates/web/nginx/caching.sh b/install/ubuntu/12.10/templates/web/nginx/caching.sh new file mode 100755 index 000000000..6eb9126db --- /dev/null +++ b/install/ubuntu/12.10/templates/web/nginx/caching.sh @@ -0,0 +1,12 @@ +#!/bin/bash + +user=$1 +domain=$2 +ip=$3 +home=$4 +docroot=$5 + +str="proxy_cache_path /var/cache/nginx/$domain levels=2" +str="$str keys_zone=$domain:10m inactive=60m max_size=512m;" +echo "$str" >> /etc/nginx/conf.d/01_caching_pool.conf + diff --git a/install/ubuntu/12.10/templates/web/nginx/caching.stpl b/install/ubuntu/12.10/templates/web/nginx/caching.stpl new file mode 100755 index 000000000..ca6cffe32 --- /dev/null +++ b/install/ubuntu/12.10/templates/web/nginx/caching.stpl @@ -0,0 +1,44 @@ +server { + listen %ip%:%proxy_ssl_port%; + server_name %domain_idn% %alias_idn%; + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + error_log /var/log/%web_system%/domains/%domain%.error.log error; + + location / { + proxy_pass http://%ip%:%web_port%; + + proxy_cache cache; + proxy_cache_valid 15m; + proxy_cache_valid 404 1m; + proxy_no_cache $no_cache; + proxy_cache_bypass $no_cache; + proxy_cache_bypass $cookie_session $http_x_update; + + location ~* ^.+\.(%proxy_extentions%)$ { + proxy_cache off; + root %docroot%; + access_log /var/log/%web_system%/domains/%domain%.log combined; + access_log /var/log/%web_system%/domains/%domain%.bytes bytes; + expires max; + try_files $uri @fallback; + } + } + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location @fallback { + proxy_pass http://%ip%:%web_port%; + } + + location ~ /\.ht {return 404;} + location ~ /\.svn/ {return 404;} + location ~ /\.git/ {return 404;} + location ~ /\.hg/ {return 404;} + location ~ /\.bzr/ {return 404;} + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/12.10/templates/web/nginx/caching.tpl b/install/ubuntu/12.10/templates/web/nginx/caching.tpl new file mode 100755 index 000000000..36761b65c --- /dev/null +++ b/install/ubuntu/12.10/templates/web/nginx/caching.tpl @@ -0,0 +1,41 @@ +server { + listen %ip%:%proxy_port%; + server_name %domain_idn% %alias_idn%; + error_log /var/log/%web_system%/domains/%domain%.error.log error; + + location / { + proxy_pass http://%ip%:%web_port%; + + proxy_cache cache; + proxy_cache_valid 15m; + proxy_cache_valid 404 1m; + proxy_no_cache $no_cache; + proxy_cache_bypass $no_cache; + proxy_cache_bypass $cookie_session $http_x_update; + + location ~* ^.+\.(%proxy_extentions%)$ { + proxy_cache off; + root %docroot%; + access_log /var/log/%web_system%/domains/%domain%.log combined; + access_log /var/log/%web_system%/domains/%domain%.bytes bytes; + expires max; + try_files $uri @fallback; + } + } + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location @fallback { + proxy_pass http://%ip%:%web_port%; + } + + location ~ /\.ht {return 404;} + location ~ /\.svn/ {return 404;} + location ~ /\.git/ {return 404;} + location ~ /\.hg/ {return 404;} + location ~ /\.bzr/ {return 404;} + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/12.10/templates/web/nginx/default.stpl b/install/ubuntu/12.10/templates/web/nginx/default.stpl new file mode 100755 index 000000000..fa5380606 --- /dev/null +++ b/install/ubuntu/12.10/templates/web/nginx/default.stpl @@ -0,0 +1,36 @@ +server { + listen %ip%:%proxy_ssl_port%; + server_name %domain_idn% %alias_idn%; + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + error_log /var/log/%web_system%/domains/%domain%.error.log error; + + location / { + proxy_pass https://%ip%:%web_ssl_port%; + location ~* ^.+\.(%proxy_extentions%)$ { + root %sdocroot%; + access_log /var/log/%web_system%/domains/%domain%.log combined; + access_log /var/log/%web_system%/domains/%domain%.bytes bytes; + expires max; + try_files $uri @fallback; + } + } + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location @fallback { + proxy_pass https://%ip%:%web_ssl_port%; + } + + location ~ /\.ht {return 404;} + location ~ /\.svn/ {return 404;} + location ~ /\.git/ {return 404;} + location ~ /\.hg/ {return 404;} + location ~ /\.bzr/ {return 404;} + + include %home%/%user%/conf/web/snginx.%domain%.conf*; +} + diff --git a/install/ubuntu/12.10/templates/web/nginx/default.tpl b/install/ubuntu/12.10/templates/web/nginx/default.tpl new file mode 100755 index 000000000..4d5c774bc --- /dev/null +++ b/install/ubuntu/12.10/templates/web/nginx/default.tpl @@ -0,0 +1,33 @@ +server { + listen %ip%:%proxy_port%; + server_name %domain_idn% %alias_idn%; + error_log /var/log/%web_system%/domains/%domain%.error.log error; + + location / { + proxy_pass http://%ip%:%web_port%; + location ~* ^.+\.(%proxy_extentions%)$ { + root %docroot%; + access_log /var/log/%web_system%/domains/%domain%.log combined; + access_log /var/log/%web_system%/domains/%domain%.bytes bytes; + expires max; + try_files $uri @fallback; + } + } + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location @fallback { + proxy_pass http://%ip%:%web_port%; + } + + location ~ /\.ht {return 404;} + location ~ /\.svn/ {return 404;} + location ~ /\.git/ {return 404;} + location ~ /\.hg/ {return 404;} + location ~ /\.bzr/ {return 404;} + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} + diff --git a/install/ubuntu/12.10/templates/web/nginx/hosting.sh b/install/ubuntu/12.10/templates/web/nginx/hosting.sh new file mode 100755 index 000000000..eeed37ef9 --- /dev/null +++ b/install/ubuntu/12.10/templates/web/nginx/hosting.sh @@ -0,0 +1,11 @@ +#!/bin/bash +# Changing public_html permission +user="$1" +domain="$2" +ip="$3" +home_dir="$4" +docroot="$5" + +chmod 755 $docroot + +exit 0 diff --git a/install/ubuntu/12.10/templates/web/nginx/hosting.stpl b/install/ubuntu/12.10/templates/web/nginx/hosting.stpl new file mode 100755 index 000000000..d778d6333 --- /dev/null +++ b/install/ubuntu/12.10/templates/web/nginx/hosting.stpl @@ -0,0 +1,38 @@ +server { + listen %ip%:%proxy_ssl_port%; + server_name %domain_idn% %alias_idn%; + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + error_log /var/log/%web_system%/domains/%domain%.error.log error; + + location / { + proxy_pass https://%ip%:%web_ssl_port%; + location ~* ^.+\.(%proxy_extentions%)$ { + root %sdocroot%; + access_log /var/log/%web_system%/domains/%domain%.log combined; + access_log /var/log/%web_system%/domains/%domain%.bytes bytes; + expires max; + try_files $uri @fallback; + } + } + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location @fallback { + proxy_pass https://%ip%:%web_ssl_port%; + } + + location ~ /\.ht {return 404;} + location ~ /\.svn/ {return 404;} + location ~ /\.git/ {return 404;} + location ~ /\.hg/ {return 404;} + location ~ /\.bzr/ {return 404;} + + disable_symlinks if_not_owner from=%docroot%; + + include %home%/%user%/conf/web/snginx.%domain%.conf*; +} + diff --git a/install/ubuntu/12.10/templates/web/nginx/hosting.tpl b/install/ubuntu/12.10/templates/web/nginx/hosting.tpl new file mode 100755 index 000000000..15961c95c --- /dev/null +++ b/install/ubuntu/12.10/templates/web/nginx/hosting.tpl @@ -0,0 +1,35 @@ +server { + listen %ip%:%proxy_port%; + server_name %domain_idn% %alias_idn%; + error_log /var/log/%web_system%/domains/%domain%.error.log error; + + location / { + proxy_pass http://%ip%:%web_port%; + location ~* ^.+\.(%proxy_extentions%)$ { + root %docroot%; + access_log /var/log/%web_system%/domains/%domain%.log combined; + access_log /var/log/%web_system%/domains/%domain%.bytes bytes; + expires max; + try_files $uri @fallback; + } + } + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location @fallback { + proxy_pass http://%ip%:%web_port%; + } + + location ~ /\.ht {return 404;} + location ~ /\.svn/ {return 404;} + location ~ /\.git/ {return 404;} + location ~ /\.hg/ {return 404;} + location ~ /\.bzr/ {return 404;} + + disable_symlinks if_not_owner from=%docroot%; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} + diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/cms_made_simple.stpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/cms_made_simple.stpl new file mode 100644 index 000000000..01d82b603 --- /dev/null +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/cms_made_simple.stpl @@ -0,0 +1,51 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + try_files $uri $uri/ /index.php?page=$request_uri; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/cms_made_simple.tpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/cms_made_simple.tpl new file mode 100644 index 000000000..af452d19f --- /dev/null +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/cms_made_simple.tpl @@ -0,0 +1,47 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + try_files $uri $uri/ /index.php?page=$request_uri; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/codeigniter2.stpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/codeigniter2.stpl new file mode 100644 index 000000000..a592a652d --- /dev/null +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/codeigniter2.stpl @@ -0,0 +1,56 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + try_files $uri $uri/ /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location = /index.php { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME /var/www/html/ci$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + location ~ \.php$ { + return 444; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/codeigniter2.tpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/codeigniter2.tpl new file mode 100644 index 000000000..9b955aa6a --- /dev/null +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/codeigniter2.tpl @@ -0,0 +1,52 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + try_files $uri $uri/ /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location = /index.php { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME /var/www/html/ci$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + location ~ \.php$ { + return 444; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/codeigniter3.stpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/codeigniter3.stpl new file mode 100644 index 000000000..4d330d34f --- /dev/null +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/codeigniter3.stpl @@ -0,0 +1,51 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + try_files $uri $uri/ /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/codeigniter3.tpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/codeigniter3.tpl new file mode 100644 index 000000000..1f446e5d3 --- /dev/null +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/codeigniter3.tpl @@ -0,0 +1,47 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + try_files $uri $uri/ /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/datalife_engine.stpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/datalife_engine.stpl new file mode 100644 index 000000000..d1b5bcd24 --- /dev/null +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/datalife_engine.stpl @@ -0,0 +1,122 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + rewrite "^/page/([0-9]+)(/?)$" /index.php?cstart=$1 last; + + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page,([0-9]+),([0-9]+),(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&cstart=$5&news_name=$6&seourl=$6 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page,([0-9]+),(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&news_name=$5&seourl=$5 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/print:page,([0-9]+),(.*).html(/?)+$" /engine/print.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&news_name=$5&seourl=$5 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_name=$4&seourl=$4 last; + + rewrite "^/([^.]+)/page,([0-9]+),([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$4&news_page=$2&cstart=$3&seourl=$5&seocat=$1 last; + rewrite "^/([^.]+)/page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$3&news_page=$2&seourl=$4&seocat=$1 last; + rewrite "^/([^.]+)/print:page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /engine/print.php?news_page=$2&newsid=$3&seourl=$4&seocat=$1 last; + rewrite "^/([^.]+)/([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$2&seourl=$3&seocat=$1 last; + + rewrite "^/page,([0-9]+),([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$3&news_page=$1&cstart=$2&seourl=$4 last; + rewrite "^/page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$2&news_page=$1&seourl=$3 last; + rewrite "^/print:page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /engine/print.php?news_page=$1&newsid=$2&seourl=$3 last; + rewrite "^/([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$1&seourl=$2 last; + + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})(/?)+$" /index.php?year=$1&month=$2&day=$3 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page/([0-9]+)(/?)+$" /index.php?year=$1&month=$2&day=$3&cstart=$4 last; + + rewrite "^/([0-9]{4})/([0-9]{2})(/?)+$" /index.php?year=$1&month=$2 last; + rewrite "^/([0-9]{4})/([0-9]{2})/page/([0-9]+)(/?)+$" /index.php?year=$1&month=$2&cstart=$3 last; + + rewrite "^/([0-9]{4})(/?)+$" /index.php?year=$1 last; + rewrite "^/([0-9]{4})/page/([0-9]+)(/?)+$" /index.php?year=$1&cstart=$2 last; + + rewrite "^/tags/([^/]*)(/?)+$" /index.php?do=tags&tag=$1 last; + rewrite "^/tags/([^/]*)/page/([0-9]+)(/?)+$" /index.php?do=tags&tag=$1&cstart=$2 last; + + rewrite "^/xfsearch/([^/]*)(/?)+$" /index.php?do=xfsearch&xf=$1 last; + rewrite "^/xfsearch/([^/]*)/page/([0-9]+)(/?)+$" /index.php?do=xfsearch&xf=$1&cstart=$2 last; + + rewrite "^/user/([^/]*)/rss.xml$" /engine/rss.php?subaction=allnews&user=$1 last; + rewrite "^/user/([^/]*)(/?)+$" /index.php?subaction=userinfo&user=$1 last; + rewrite "^/user/([^/]*)/page/([0-9]+)(/?)+$" /index.php?subaction=userinfo&user=$1&cstart=$2 last; + rewrite "^/user/([^/]*)/news(/?)+$" /index.php?subaction=allnews&user=$1 last; + rewrite "^/user/([^/]*)/news/page/([0-9]+)(/?)+$" /index.php?subaction=allnews&user=$1&cstart=$2 last; + rewrite "^/user/([^/]*)/news/rss.xml(/?)+$" /engine/rss.php?subaction=allnews&user=$1 last; + + rewrite "^/lastnews(/?)+$" /index.php?do=lastnews last; + rewrite "^/lastnews/page/([0-9]+)(/?)+$" /index.php?do=lastnews&cstart=$1 last; + + rewrite "^/catalog/([^/]*)/rss.xml$" /engine/rss.php?catalog=$1 last; + rewrite "^/catalog/([^/]*)(/?)+$" /index.php?catalog=$1 last; + rewrite "^/catalog/([^/]*)/page/([0-9]+)(/?)+$" /index.php?catalog=$1&cstart=$2 last; + + rewrite "^/newposts(/?)+$" /index.php?subaction=newposts last; + rewrite "^/newposts/page/([0-9]+)(/?)+$" /index.php?subaction=newposts&cstart=$1 last; + + rewrite "^/favorites(/?)+$" /index.php?do=favorites last; + rewrite "^/favorites/page/([0-9]+)(/?)+$" /index.php?do=favorites&cstart=$1 last; + + rewrite "^/rules.html$" /index.php?do=rules last; + rewrite "^/statistics.html$" /index.php?do=stats last; + rewrite "^/addnews.html$" /index.php?do=addnews last; + rewrite "^/rss.xml$" /engine/rss.php last; + rewrite "^/sitemap.xml$" /uploads/sitemap.xml last; + + if (!-d $request_filename) { + rewrite "^/([^.]+)/page/([0-9]+)(/?)+$" /index.php?do=cat&category=$1&cstart=$2 last; + rewrite "^/([^.]+)/?$" /index.php?do=cat&category=$1 last; + } + + if (!-f $request_filename) { + rewrite "^/([^.]+)/rss.xml$" /engine/rss.php?do=cat&category=$1 last; + rewrite "^/page,([0-9]+),([^/]+).html$" /index.php?do=static&page=$2&news_page=$1 last; + rewrite "^/print:([^/]+).html$" /engine/print.php?do=static&page=$1 last; + } + + if (!-f $request_filename) { + rewrite "^/([^/]+).html$" /index.php?do=static&page=$1 last; + } + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/datalife_engine.tpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/datalife_engine.tpl new file mode 100644 index 000000000..ff33c2325 --- /dev/null +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/datalife_engine.tpl @@ -0,0 +1,118 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + rewrite "^/page/([0-9]+)(/?)$" /index.php?cstart=$1 last; + + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page,([0-9]+),([0-9]+),(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&cstart=$5&news_name=$6&seourl=$6 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page,([0-9]+),(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&news_name=$5&seourl=$5 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/print:page,([0-9]+),(.*).html(/?)+$" /engine/print.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&news_name=$5&seourl=$5 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_name=$4&seourl=$4 last; + + rewrite "^/([^.]+)/page,([0-9]+),([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$4&news_page=$2&cstart=$3&seourl=$5&seocat=$1 last; + rewrite "^/([^.]+)/page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$3&news_page=$2&seourl=$4&seocat=$1 last; + rewrite "^/([^.]+)/print:page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /engine/print.php?news_page=$2&newsid=$3&seourl=$4&seocat=$1 last; + rewrite "^/([^.]+)/([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$2&seourl=$3&seocat=$1 last; + + rewrite "^/page,([0-9]+),([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$3&news_page=$1&cstart=$2&seourl=$4 last; + rewrite "^/page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$2&news_page=$1&seourl=$3 last; + rewrite "^/print:page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /engine/print.php?news_page=$1&newsid=$2&seourl=$3 last; + rewrite "^/([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$1&seourl=$2 last; + + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})(/?)+$" /index.php?year=$1&month=$2&day=$3 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page/([0-9]+)(/?)+$" /index.php?year=$1&month=$2&day=$3&cstart=$4 last; + + rewrite "^/([0-9]{4})/([0-9]{2})(/?)+$" /index.php?year=$1&month=$2 last; + rewrite "^/([0-9]{4})/([0-9]{2})/page/([0-9]+)(/?)+$" /index.php?year=$1&month=$2&cstart=$3 last; + + rewrite "^/([0-9]{4})(/?)+$" /index.php?year=$1 last; + rewrite "^/([0-9]{4})/page/([0-9]+)(/?)+$" /index.php?year=$1&cstart=$2 last; + + rewrite "^/tags/([^/]*)(/?)+$" /index.php?do=tags&tag=$1 last; + rewrite "^/tags/([^/]*)/page/([0-9]+)(/?)+$" /index.php?do=tags&tag=$1&cstart=$2 last; + + rewrite "^/xfsearch/([^/]*)(/?)+$" /index.php?do=xfsearch&xf=$1 last; + rewrite "^/xfsearch/([^/]*)/page/([0-9]+)(/?)+$" /index.php?do=xfsearch&xf=$1&cstart=$2 last; + + rewrite "^/user/([^/]*)/rss.xml$" /engine/rss.php?subaction=allnews&user=$1 last; + rewrite "^/user/([^/]*)(/?)+$" /index.php?subaction=userinfo&user=$1 last; + rewrite "^/user/([^/]*)/page/([0-9]+)(/?)+$" /index.php?subaction=userinfo&user=$1&cstart=$2 last; + rewrite "^/user/([^/]*)/news(/?)+$" /index.php?subaction=allnews&user=$1 last; + rewrite "^/user/([^/]*)/news/page/([0-9]+)(/?)+$" /index.php?subaction=allnews&user=$1&cstart=$2 last; + rewrite "^/user/([^/]*)/news/rss.xml(/?)+$" /engine/rss.php?subaction=allnews&user=$1 last; + + rewrite "^/lastnews(/?)+$" /index.php?do=lastnews last; + rewrite "^/lastnews/page/([0-9]+)(/?)+$" /index.php?do=lastnews&cstart=$1 last; + + rewrite "^/catalog/([^/]*)/rss.xml$" /engine/rss.php?catalog=$1 last; + rewrite "^/catalog/([^/]*)(/?)+$" /index.php?catalog=$1 last; + rewrite "^/catalog/([^/]*)/page/([0-9]+)(/?)+$" /index.php?catalog=$1&cstart=$2 last; + + rewrite "^/newposts(/?)+$" /index.php?subaction=newposts last; + rewrite "^/newposts/page/([0-9]+)(/?)+$" /index.php?subaction=newposts&cstart=$1 last; + + rewrite "^/favorites(/?)+$" /index.php?do=favorites last; + rewrite "^/favorites/page/([0-9]+)(/?)+$" /index.php?do=favorites&cstart=$1 last; + + rewrite "^/rules.html$" /index.php?do=rules last; + rewrite "^/statistics.html$" /index.php?do=stats last; + rewrite "^/addnews.html$" /index.php?do=addnews last; + rewrite "^/rss.xml$" /engine/rss.php last; + rewrite "^/sitemap.xml$" /uploads/sitemap.xml last; + + if (!-d $request_filename) { + rewrite "^/([^.]+)/page/([0-9]+)(/?)+$" /index.php?do=cat&category=$1&cstart=$2 last; + rewrite "^/([^.]+)/?$" /index.php?do=cat&category=$1 last; + } + + if (!-f $request_filename) { + rewrite "^/([^.]+)/rss.xml$" /engine/rss.php?do=cat&category=$1 last; + rewrite "^/page,([0-9]+),([^/]+).html$" /index.php?do=static&page=$2&news_page=$1 last; + rewrite "^/print:([^/]+).html$" /engine/print.php?do=static&page=$1 last; + } + + if (!-f $request_filename) { + rewrite "^/([^/]+).html$" /index.php?do=static&page=$1 last; + } + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/default.stpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/default.stpl new file mode 100644 index 000000000..a68c99861 --- /dev/null +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/default.stpl @@ -0,0 +1,50 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %sdocroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/snginx.%domain%.conf*; +} diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/default.tpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/default.tpl new file mode 100644 index 000000000..b143e53ba --- /dev/null +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/default.tpl @@ -0,0 +1,46 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/dokuwiki.stpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/dokuwiki.stpl new file mode 100644 index 000000000..27483cd8c --- /dev/null +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/dokuwiki.stpl @@ -0,0 +1,67 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + index doku.php; + try_files $uri $uri/ @dokuwiki; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + location ^~ /lib/ { + expires 30d; + } + + location ^~ /conf/ { return 403; } + location ^~ /data/ { return 403; } + + location @dokuwiki { + rewrite ^/_media/(.*) /lib/exe/fetch.php?media=$1 last; + rewrite ^/_detail/(.*) /lib/exe/detail.php?media=$1 last; + rewrite ^/_export/([^/]+)/(.*) /doku.php?do=export_$1&id=$2 last; + rewrite ^/(.*) /doku.php?id=$1 last; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/dokuwiki.tpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/dokuwiki.tpl new file mode 100644 index 000000000..31647c9ff --- /dev/null +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/dokuwiki.tpl @@ -0,0 +1,62 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + index doku.php; + try_files $uri $uri/ @dokuwiki; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + location ^~ /lib/ { + expires 30d; + } + + location ^~ /conf/ { return 403; } + location ^~ /data/ { return 403; } + location @dokuwiki { + rewrite ^/_media/(.*) /lib/exe/fetch.php?media=$1 last; + rewrite ^/_detail/(.*) /lib/exe/detail.php?media=$1 last; + rewrite ^/_export/([^/]+)/(.*) /doku.php?do=export_$1&id=$2 last; + rewrite ^/(.*) /doku.php?id=$1 last; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/drupal.stpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/drupal.stpl new file mode 100644 index 000000000..9a5484396 --- /dev/null +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/drupal.stpl @@ -0,0 +1,101 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + + location / { + try_files $uri @rewrite; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # You have 2 options here + # For D7 and above: + # Clean URLs are handled in drupal_environment_initialize(). + rewrite ^ /index.php; + + # For Drupal 6 and bwlow: + # Some modules enforce no slash (/) at the end of the URL + # Else this rewrite block wouldn't be needed (GlobalRedirect) + #rewrite ^/(.*)$ /index.php?q=$1; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/drupal.tpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/drupal.tpl new file mode 100644 index 000000000..417762c18 --- /dev/null +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/drupal.tpl @@ -0,0 +1,98 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + # Very rarely should these ever be accessed outside of your lan + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + + location / { + try_files $uri @rewrite; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # You have 2 options here + # For D7 and above: + # Clean URLs are handled in drupal_environment_initialize(). + rewrite ^ /index.php; + + # For Drupal 6 and bwlow: + # Some modules enforce no slash (/) at the end of the URL + # Else this rewrite block wouldn't be needed (GlobalRedirect) + #rewrite ^/(.*)$ /index.php?q=$1; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/joomla.stpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/joomla.stpl new file mode 100644 index 000000000..235a01216 --- /dev/null +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/joomla.stpl @@ -0,0 +1,58 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + try_files $uri $uri/ /index.php?$args; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + # deny running scripts inside writable directories + location ~* /(images|cache|media|logs|tmp)/.*\.(php|pl|py|jsp|asp|sh|cgi)$ { + return 403; + error_page 403 /403_error.html; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/joomla.tpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/joomla.tpl new file mode 100644 index 000000000..997c268de --- /dev/null +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/joomla.tpl @@ -0,0 +1,54 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + try_files $uri $uri/ /index.php?$args; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + # deny running scripts inside writable directories + location ~* /(images|cache|media|logs|tmp)/.*\.(php|pl|py|jsp|asp|sh|cgi)$ { + return 403; + error_page 403 /403_error.html; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/owncloud.stpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/owncloud.stpl new file mode 100644 index 000000000..8311ca43f --- /dev/null +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/owncloud.stpl @@ -0,0 +1,80 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + rewrite ^/caldav(.*)$ /remote.php/caldav$1 redirect; + rewrite ^/carddav(.*)$ /remote.php/carddav$1 redirect; + rewrite ^/webdav(.*)$ /remote.php/webdav$1 redirect; + + error_page 403 = /core/templates/403.php; + error_page 404 = /core/templates/404.php; + + location ~ ^/(?:\.htaccess|data|config|db_structure\.xml|README){ + deny all; + } + + location / { + # The following 2 rules are only needed with webfinger + rewrite ^/.well-known/host-meta /public.php?service=host-meta last; + rewrite ^/.well-known/host-meta.json /public.php?service=host-meta-json last; + rewrite ^/.well-known/carddav /remote.php/carddav/ redirect; + rewrite ^/.well-known/caldav /remote.php/caldav/ redirect; + rewrite ^(/core/doc/[^\/]+/)$ $1/index.html; + try_files $uri $uri/ /index.php; + + location ~ \.php(?:$|/) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param PATH_INFO $fastcgi_path_info; + #fastcgi_param HTTPS on; + fastcgi_pass %backend_lsnr%; + } + } + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + # Some basic cache-control for static files to be sent to the browser + add_header Pragma public; + add_header Cache-Control "public, must-revalidate, proxy-revalidate"; + } + + #error_page 403 /error/404.html; + #error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/owncloud.tpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/owncloud.tpl new file mode 100644 index 000000000..57cac2f85 --- /dev/null +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/owncloud.tpl @@ -0,0 +1,76 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + rewrite ^/caldav(.*)$ /remote.php/caldav$1 redirect; + rewrite ^/carddav(.*)$ /remote.php/carddav$1 redirect; + rewrite ^/webdav(.*)$ /remote.php/webdav$1 redirect; + + error_page 403 = /core/templates/403.php; + error_page 404 = /core/templates/404.php; + + location ~ ^/(?:\.htaccess|data|config|db_structure\.xml|README){ + deny all; + } + + location / { + # The following 2 rules are only needed with webfinger + rewrite ^/.well-known/host-meta /public.php?service=host-meta last; + rewrite ^/.well-known/host-meta.json /public.php?service=host-meta-json last; + rewrite ^/.well-known/carddav /remote.php/carddav/ redirect; + rewrite ^/.well-known/caldav /remote.php/caldav/ redirect; + rewrite ^(/core/doc/[^\/]+/)$ $1/index.html; + try_files $uri $uri/ /index.php; + + location ~ \.php(?:$|/) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param PATH_INFO $fastcgi_path_info; + #fastcgi_param HTTPS on; + fastcgi_pass %backend_lsnr%; + } + } + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + # Some basic cache-control for static files to be sent to the browser + add_header Pragma public; + add_header Cache-Control "public, must-revalidate, proxy-revalidate"; + } + + #error_page 403 /error/404.html; + #error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/piwik.stpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/piwik.stpl new file mode 100644 index 000000000..c53af4011 --- /dev/null +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/piwik.stpl @@ -0,0 +1,68 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location = /favicon.ico { + try_files /favicon.ico =204; + } + + location / { + try_files $uri /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + valid_referers none blocked %domain_idn% %alias_idn%; + if ($invalid_referer) { + return 444; + } + expires max; + } + + location ~* ^/(?:index|piwik)\.php$ { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + include /etc/nginx/fastcgi_params; + } + } + + # Any other attempt to access PHP files returns a 404. + location ~* ^.+\.php$ { + return 404; + } + + # Return a 404 for all text files. + location ~* ^/(?:README|LICENSE[^.]*|LEGALNOTICE)(?:\.txt)*$ { + return 404; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/piwik.tpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/piwik.tpl new file mode 100644 index 000000000..6b4a94a68 --- /dev/null +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/piwik.tpl @@ -0,0 +1,64 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location = /favicon.ico { + try_files /favicon.ico =204; + } + + location / { + try_files $uri /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + valid_referers none blocked %domain_idn% %alias_idn%; + if ($invalid_referer) { + return 444; + } + expires max; + } + + location ~* ^/(?:index|piwik)\.php$ { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + include /etc/nginx/fastcgi_params; + } + } + + # Any other attempt to access PHP files returns a 404. + location ~* ^.+\.php$ { + return 404; + } + + # Return a 404 for all text files. + location ~* ^/(?:README|LICENSE[^.]*|LEGALNOTICE)(?:\.txt)*$ { + return 404; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/pyrocms.stpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/pyrocms.stpl new file mode 100644 index 000000000..a6fc67556 --- /dev/null +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/pyrocms.stpl @@ -0,0 +1,61 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location /installer { + try_files $uri $uri/ /installer/index.php; + } + + location / { + try_files $uri $uri/ /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + location = /robots.txt { access_log off; log_not_found off; } + location = /favicon.ico { access_log off; log_not_found off; } + location ~ /\. { access_log off; log_not_found off; deny all; } + location ~ ~$ { access_log off; log_not_found off; deny all; } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/pyrocms.tpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/pyrocms.tpl new file mode 100644 index 000000000..68b378efd --- /dev/null +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/pyrocms.tpl @@ -0,0 +1,57 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location /installer { + try_files $uri $uri/ /installer/index.php; + } + + location / { + try_files $uri $uri/ /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + location = /robots.txt { access_log off; log_not_found off; } + location = /favicon.ico { access_log off; log_not_found off; } + location ~ /\. { access_log off; log_not_found off; deny all; } + location ~ ~$ { access_log off; log_not_found off; deny all; } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/wordpress.stpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/wordpress.stpl new file mode 100644 index 000000000..910c28b69 --- /dev/null +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/wordpress.stpl @@ -0,0 +1,50 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/wordpress.tpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/wordpress.tpl new file mode 100644 index 000000000..b143e53ba --- /dev/null +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/wordpress.tpl @@ -0,0 +1,46 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/wordpress2.stpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/wordpress2.stpl new file mode 100644 index 000000000..2822f8754 --- /dev/null +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/wordpress2.stpl @@ -0,0 +1,62 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + location / { + try_files $uri $uri/ /index.php?$args; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/wordpress2.tpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/wordpress2.tpl new file mode 100644 index 000000000..37b8be305 --- /dev/null +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/wordpress2.tpl @@ -0,0 +1,58 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + location / { + try_files $uri $uri/ /index.php?$args; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/12.10/templates/web/nginx/proxy_ip.tpl b/install/ubuntu/12.10/templates/web/nginx/proxy_ip.tpl new file mode 100755 index 000000000..ae1956173 --- /dev/null +++ b/install/ubuntu/12.10/templates/web/nginx/proxy_ip.tpl @@ -0,0 +1,9 @@ +server { + listen %ip%:%proxy_port% default; + server_name _; + #access_log /var/log/nginx/%ip%.log main; + location / { + proxy_pass http://%ip%:%web_port%; + } +} + diff --git a/install/ubuntu/12.10/templates/web/php5-fpm/default.tpl b/install/ubuntu/12.10/templates/web/php5-fpm/default.tpl new file mode 100644 index 000000000..44ccf7a42 --- /dev/null +++ b/install/ubuntu/12.10/templates/web/php5-fpm/default.tpl @@ -0,0 +1,18 @@ +[%backend%] +listen = 127.0.0.1:%backend_port% +listen.allowed_clients = 127.0.0.1 + +user = %user% +group = %user% + +pm = dynamic +pm.max_children = 50 +pm.start_servers = 3 +pm.min_spare_servers = 2 +pm.max_spare_servers = 10 + +env[HOSTNAME] = $HOSTNAME +env[PATH] = /usr/local/bin:/usr/bin:/bin +env[TMP] = /tmp +env[TMPDIR] = /tmp +env[TEMP] = /tmp diff --git a/install/ubuntu/12.10/templates/web/php5-fpm/no-php.tpl b/install/ubuntu/12.10/templates/web/php5-fpm/no-php.tpl new file mode 100644 index 000000000..89487d5f5 --- /dev/null +++ b/install/ubuntu/12.10/templates/web/php5-fpm/no-php.tpl @@ -0,0 +1,13 @@ +#[%backend%] +#user = %user% +#group = %user% +#listen = /dev/null + +#listen.owner = %user% +#listen.group = nginx + +#pm = dynamic +#pm.max_children = 50 +#pm.start_servers = 3 +#pm.min_spare_servers = 2 +#pm.max_spare_servers = 10 diff --git a/install/ubuntu/12.10/templates/web/php5-fpm/socket.tpl b/install/ubuntu/12.10/templates/web/php5-fpm/socket.tpl new file mode 100644 index 000000000..f0513da3e --- /dev/null +++ b/install/ubuntu/12.10/templates/web/php5-fpm/socket.tpl @@ -0,0 +1,21 @@ +[%backend%] +listen = /var/run/php5-%backend%.sock +listen.allowed_clients = 127.0.0.1 + +user = %user% +group = %user% + +listen.owner = %user% +listen.group = nginx + +pm = dynamic +pm.max_children = 50 +pm.start_servers = 3 +pm.min_spare_servers = 2 +pm.max_spare_servers = 10 + +env[HOSTNAME] = $HOSTNAME +env[PATH] = /usr/local/bin:/usr/bin:/bin +env[TMP] = /tmp +env[TMPDIR] = /tmp +env[TEMP] = /tmp diff --git a/install/ubuntu/12.10/templates/web/skel/document_errors/403.html b/install/ubuntu/12.10/templates/web/skel/document_errors/403.html new file mode 100755 index 000000000..9c3f6baab --- /dev/null +++ b/install/ubuntu/12.10/templates/web/skel/document_errors/403.html @@ -0,0 +1,29 @@ + + + 403 — Forbidden + + + + + + +

        %domain%

        + +

        403

        +

        Forbidden

        +
        + Unfortunately, you do not have permission to view this +
        + + + diff --git a/install/ubuntu/12.10/templates/web/skel/document_errors/404.html b/install/ubuntu/12.10/templates/web/skel/document_errors/404.html new file mode 100755 index 000000000..2cee77084 --- /dev/null +++ b/install/ubuntu/12.10/templates/web/skel/document_errors/404.html @@ -0,0 +1,28 @@ + + + 404 — Not Found + + + + + + +

        %domain%

        +

        404

        +

        Page Not Found

        +
        + It seems that the page you were trying to reach does not exist anymore, or maybe it has just moved. + You can start again from the home or go back to previous page. +
        + + diff --git a/install/ubuntu/12.10/templates/web/skel/document_errors/50x.html b/install/ubuntu/12.10/templates/web/skel/document_errors/50x.html new file mode 100755 index 000000000..85ba648b7 --- /dev/null +++ b/install/ubuntu/12.10/templates/web/skel/document_errors/50x.html @@ -0,0 +1,29 @@ + + + 500 — Internal Sever Error + + + + + + +

        %domain%

        + +

        500

        +

        Internal Server Error

        +
        + Sorry, something went wrong :( +
        + + + diff --git a/install/ubuntu/12.10/templates/web/skel/public_html/index.html b/install/ubuntu/12.10/templates/web/skel/public_html/index.html new file mode 100755 index 000000000..4f5bb7244 --- /dev/null +++ b/install/ubuntu/12.10/templates/web/skel/public_html/index.html @@ -0,0 +1,26 @@ + + + %domain% — Coming Soon + + + + + + +

        %domain%

        + + + + + diff --git a/install/ubuntu/12.10/templates/web/skel/public_html/robots.txt b/install/ubuntu/12.10/templates/web/skel/public_html/robots.txt new file mode 100755 index 000000000..00ee83dcf --- /dev/null +++ b/install/ubuntu/12.10/templates/web/skel/public_html/robots.txt @@ -0,0 +1,3 @@ +# vestacp autogenerated robots.txt +User-agent: * +Crawl-delay: 10 diff --git a/install/ubuntu/12.10/templates/web/skel/public_shtml/index.html b/install/ubuntu/12.10/templates/web/skel/public_shtml/index.html new file mode 100755 index 000000000..4f5bb7244 --- /dev/null +++ b/install/ubuntu/12.10/templates/web/skel/public_shtml/index.html @@ -0,0 +1,26 @@ + + + %domain% — Coming Soon + + + + + + +

        %domain%

        + + + + + diff --git a/install/ubuntu/12.10/templates/web/skel/public_shtml/robots.txt b/install/ubuntu/12.10/templates/web/skel/public_shtml/robots.txt new file mode 100755 index 000000000..00ee83dcf --- /dev/null +++ b/install/ubuntu/12.10/templates/web/skel/public_shtml/robots.txt @@ -0,0 +1,3 @@ +# vestacp autogenerated robots.txt +User-agent: * +Crawl-delay: 10 diff --git a/install/ubuntu/12.10/templates/web/suspend/.htaccess b/install/ubuntu/12.10/templates/web/suspend/.htaccess new file mode 100755 index 000000000..5a6df83fb --- /dev/null +++ b/install/ubuntu/12.10/templates/web/suspend/.htaccess @@ -0,0 +1,2 @@ +ErrorDocument 403 /index.html +ErrorDocument 404 /index.html diff --git a/install/ubuntu/12.10/templates/web/suspend/index.html b/install/ubuntu/12.10/templates/web/suspend/index.html new file mode 100755 index 000000000..9d4fa67b3 --- /dev/null +++ b/install/ubuntu/12.10/templates/web/suspend/index.html @@ -0,0 +1,27 @@ + + + SUSPEND + + + + + + +

        SUSPEND

        +

        This site has been suspended

        +
        + Please contact technical support departament. +
        + + + diff --git a/install/ubuntu/12.10/templates/web/webalizer/webalizer.tpl b/install/ubuntu/12.10/templates/web/webalizer/webalizer.tpl new file mode 100755 index 000000000..068adcfb9 --- /dev/null +++ b/install/ubuntu/12.10/templates/web/webalizer/webalizer.tpl @@ -0,0 +1,110 @@ +HostName %domain_idn% +LogFile /var/log/%web_system%/domains/%domain%.log +OutputDir %home%/%user%/web/%domain%/stats +HistoryName %home%/%user%/web/%domain%/stats/%domain%.hist +Incremental yes +IncrementalName %home%/%user%/web/%domain%/stats/%domain%.current +PageType htm* +PageType cgi +PageType php +PageType shtml +DNSCache /var/lib/webalizer/dns_cache.db +DNSChildren 10 +Quiet yes +FoldSeqErr yes +IndexAlias index.php +HideURL *.gif +HideURL *.GIF +HideURL *.jpg +HideURL *.JPG +HideURL *.png +HideURL *.PNG +HideURL *.ra +SearchEngine abcsearch. terms= +SearchEngine alexa. q= +SearchEngine alltheweb. q= +SearchEngine alltheweb. query= +SearchEngine alot. q= +SearchEngine altavista. q= +SearchEngine aolsearch. query= +SearchEngine aport.ru r= +SearchEngine ask. q= +SearchEngine atlas.cz q= +SearchEngine bbc. q= +SearchEngine bing. q= +SearchEngine blingo. q= +SearchEngine blogs.yandex.ru text= +SearchEngine btopenworld query= +SearchEngine buscador.ya.com q= +SearchEngine busca. q= +SearchEngine business. query= +SearchEngine centrum.cz q= +SearchEngine chiff. q= +SearchEngine clusty. query= +SearchEngine comcast. q= +SearchEngine crawler. q= +SearchEngine cuil. q= +SearchEngine dmoz. search= +SearchEngine dogpile.com q= +SearchEngine dpxml qkw= +SearchEngine eureka. searchword= +SearchEngine euroseek. string= +SearchEngine exalead. q= +SearchEngine excite search= +SearchEngine ezilon. q= +SearchEngine fastbrowsersearch. q= +SearchEngine feedster.com q= +SearchEngine fireball.de q= +SearchEngine fireball. keyword= +SearchEngine freeserve. q= +SearchEngine gigablast. q= +SearchEngine gogo.ru q= +SearchEngine go.mail.ru q= +SearchEngine google. q= +SearchEngine hakia. q= +SearchEngine hotbot. query= +SearchEngine infoseek. qt= +SearchEngine iwon searchfor= +SearchEngine ixquick.com query= +SearchEngine joeant. keywords= +SearchEngine jyxo.cz s= +SearchEngine looksmart. key= +SearchEngine lycos. query= +SearchEngine mamma. q= +SearchEngine metacrawler q= +SearchEngine msn. MT= +SearchEngine msxml qkw= +SearchEngine mysearch. searchfor= +SearchEngine mywebsearch. searchfor= +SearchEngine netscape. q= +SearchEngine nigma.ru q= +SearchEngine northernlight. qr= +SearchEngine ntlworld. q= +SearchEngine orange. q= +SearchEngine overture. Keywords= +SearchEngine punto.ru text= +SearchEngine rambler. keyword= +SearchEngine search.aol. q= +SearchEngine search.babylon. q= +SearchEngine search.centrum. phrase= +SearchEngine search.conduit. q= +SearchEngine search.earthlink q= +SearchEngine search.icq. q= +SearchEngine search.live.com q= +SearchEngine search.rambler.ru words= +SearchEngine search.winamp. q= +SearchEngine searchy. q= +SearchEngine seznam.cz w= +SearchEngine snap. query= +SearchEngine teoma. q= +SearchEngine teradex.com q= +SearchEngine ukplus key= +SearchEngine verizon. q= +SearchEngine virginmedia. q= +SearchEngine voila. rdata= +SearchEngine webcrawler searchText= +SearchEngine web.search.naver. query= +SearchEngine wisenut q= +SearchEngine yahoo. p= +SearchEngine yandex. text= +SearchEngine yodao. q= diff --git a/install/ubuntu/12.10/vsftpd/vsftpd.conf b/install/ubuntu/12.10/vsftpd/vsftpd.conf new file mode 100644 index 000000000..0902899e7 --- /dev/null +++ b/install/ubuntu/12.10/vsftpd/vsftpd.conf @@ -0,0 +1,24 @@ +anonymous_enable=NO +local_enable=YES +write_enable=YES +local_umask=002 +anon_upload_enable=NO +dirmessage_enable=YES +xferlog_enable=YES +connect_from_port_20=YES +xferlog_std_format=YES +dual_log_enable=YES +chroot_local_user=YES +listen=YES +pam_service_name=vsftpd +userlist_enable=NO +tcp_wrappers=YES +force_dot_files=YES +ascii_upload_enable=YES +ascii_download_enable=YES +#allow_writable_chroot=YES +allow_writeable_chroot=YES +seccomp_sandbox=NO +pasv_enable=YES +pasv_max_port=12100 +pasv_min_port=12000 diff --git a/install/ubuntu/13.04/apache2/apache2.conf b/install/ubuntu/13.04/apache2/apache2.conf new file mode 100644 index 000000000..221780117 --- /dev/null +++ b/install/ubuntu/13.04/apache2/apache2.conf @@ -0,0 +1,86 @@ +# It is split into several files forming the configuration hierarchy outlined +# below, all located in the /etc/apache2/ directory: +# +# /etc/apache2/ +# |-- apache2.conf +# | `-- ports.conf +# |-- mods-enabled +# | |-- *.load +# | `-- *.conf +# |-- conf.d +# | `-- * + +# Global configuration +PidFile ${APACHE_PID_FILE} +Timeout 30 +KeepAlive Off +MaxKeepAliveRequests 100 +KeepAliveTimeout 10 + + + StartServers 8 + MinSpareServers 5 + MaxSpareServers 20 + ServerLimit 256 + MaxClients 200 + MaxRequestsPerChild 4000 + + + + StartServers 2 + MinSpareThreads 25 + MaxSpareThreads 75 + ThreadLimit 64 + ThreadsPerChild 25 + MaxClients 200 + MaxRequestsPerChild 4000 + + + + StartServers 2 + MinSpareThreads 25 + MaxSpareThreads 75 + ThreadLimit 64 + ThreadsPerChild 25 + MaxClients 200 + MaxRequestsPerChild 4000 + + +# These need to be set in /etc/apache2/envvars +User ${APACHE_RUN_USER} +Group ${APACHE_RUN_GROUP} +#User www-data +#Group www-data + +AccessFileName .htaccess + + + Order allow,deny + Deny from all + Satisfy all + + +DefaultType None +HostnameLookups Off + +ErrorLog ${APACHE_LOG_DIR}/error.log +LogLevel warn + +# Include module configuration: +Include mods-enabled/*.load +Include mods-enabled/*.conf + +# Include list of ports to listen on and which to use for name based vhosts +Include ports.conf + +LogFormat "%v:%p %h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" vhost_combined +LogFormat "%h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" combined +LogFormat "%h %l %u %t \"%r\" %>s %O" common +LogFormat "%{Referer}i -> %U" referer +LogFormat "%{User-agent}i" agent +LogFormat "%b" bytes + +Include conf.d/ + +# Include the virtual host configurations: +#Include sites-enabled/ diff --git a/install/ubuntu/13.04/apache2/status.conf b/install/ubuntu/13.04/apache2/status.conf new file mode 100644 index 000000000..da9d96333 --- /dev/null +++ b/install/ubuntu/13.04/apache2/status.conf @@ -0,0 +1,8 @@ +Listen 127.0.0.1:8081 + + SetHandler server-status + Order deny,allow + Deny from all + Allow from 127.0.0.1 + Allow from all + diff --git a/install/ubuntu/13.04/bind/named.conf b/install/ubuntu/13.04/bind/named.conf new file mode 100644 index 000000000..ed6ece885 --- /dev/null +++ b/install/ubuntu/13.04/bind/named.conf @@ -0,0 +1,12 @@ +// This is the primary configuration file for the BIND DNS server named. +// +// Please read /usr/share/doc/bind9/README.Debian.gz for information on the +// structure of BIND configuration files in Debian, *BEFORE* you customize +// this configuration file. +// +// If you are just adding zones, please do that in /etc/bind/named.conf.local + +include "/etc/bind/named.conf.options"; +include "/etc/bind/named.conf.local"; +include "/etc/bind/named.conf.default-zones"; + diff --git a/install/ubuntu/13.04/clamav/clamd.conf b/install/ubuntu/13.04/clamav/clamd.conf new file mode 100644 index 000000000..ea982697a --- /dev/null +++ b/install/ubuntu/13.04/clamav/clamd.conf @@ -0,0 +1,61 @@ +#Automatically Generated by clamav-base postinst +#To reconfigure clamd run #dpkg-reconfigure clamav-base +#Please read /usr/share/doc/clamav-base/README.Debian.gz for details +LocalSocket /var/run/clamav/clamd.ctl +FixStaleSocket true +LocalSocketGroup clamav +LocalSocketMode 666 +# TemporaryDirectory is not set to its default /tmp here to make overriding +# the default with environment variables TMPDIR/TMP/TEMP possible +User clamav +AllowSupplementaryGroups true +ScanMail true +ScanArchive true +ArchiveBlockEncrypted false +MaxDirectoryRecursion 15 +FollowDirectorySymlinks false +FollowFileSymlinks false +ReadTimeout 180 +MaxThreads 12 +MaxConnectionQueueLength 15 +LogSyslog false +LogFacility LOG_LOCAL6 +LogClean false +LogVerbose true +PidFile /var/run/clamav/clamd.pid +DatabaseDirectory /var/lib/clamav +SelfCheck 3600 +Foreground false +Debug false +ScanPE true +ScanOLE2 true +ScanHTML true +DetectBrokenExecutables false +ExitOnOOM false +LeaveTemporaryFiles false +AlgorithmicDetection true +ScanELF true +IdleTimeout 30 +PhishingSignatures true +PhishingScanURLs true +PhishingAlwaysBlockSSLMismatch false +PhishingAlwaysBlockCloak false +DetectPUA false +ScanPartialMessages false +HeuristicScanPrecedence false +StructuredDataDetection false +CommandReadTimeout 5 +SendBufTimeout 200 +MaxQueue 100 +ExtendedDetectionInfo true +OLE2BlockMacros false +StreamMaxLength 25M +LogFile /var/log/clamav/clamav.log +LogTime true +LogFileUnlock false +LogFileMaxSize 0 +Bytecode true +BytecodeSecurity TrustSigned +BytecodeTimeout 60000 +OfficialDatabaseOnly false +CrossFilesystems true diff --git a/install/ubuntu/13.04/deb_signing.key b/install/ubuntu/13.04/deb_signing.key new file mode 100644 index 000000000..2ad2db8bc --- /dev/null +++ b/install/ubuntu/13.04/deb_signing.key @@ -0,0 +1,30 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.12 (GNU/Linux) + +mQENBFJIGbEBCAC8SHOOFo7iDTbnC2GhNZ+uBGCh226Dn1QPoFZNFM/DNakHZ6rD +G3wzr8++eKz4fJual/VLllE2N9XDPuxbozb3LLkcyY1WzJqtIXbXhFGQ/SuIeT+x +QY90XU6t2Ckze2c+zUniAWmJ8GSyVmXOoc9JxAQ1u47wvGXLzrjWXc8u8PNRYXuf +fZplTL+dFu9P0d6lP8FGsV+r9wXvvazpRTz3+H8PKrGCYT55ZQIEdG9Jgamylto2 +oVPFXkwGML+TLw6oeCIBuz2y2vtivphW4MJ3ifQjDj7k3n+DTIxfDFs8lB6VRhhY +2nMHCrcZC6U2mhmXmr6O4s1fu6irBVx05ejPABEBAAG0IFNlcmdoZXkgUm9kaW4g +PHNraWRAdmVzdGFjcC5jb20+iQE4BBMBAgAiBQJSSBmxAhsDBgsJCAcDAgYVCAIJ +CgsEFgIDAQIeAQIXgAAKCRBCxbITCh93FPdqB/93GjV9g+wBfeZYLHQK9MDU2wBb +VloYOJJae6IvYKYQVAJayD3PbHdpxrF8s9e23vdnmb9jKu6jX6oV54EIyqP2HPiN +QYc8wcea+eSHerznBixCtoQh8mtdWGFeN71zU/ig7L5qlOVF/EmxDVZTFUeivFxh +IV6qyBnktQKktE45585yKZyyLtfGoXA54DGK69OtJFh+wdkKEMmUXocMl7wUrxW6 +Cx2CuKeEXEgvwu8mRHQi3S3T9XP456qWEn5dWyMVcP660IzEuZfSJApZusNK7zG3 +WMy0/EuX7xHNY3mcNxTOUN1LsO7iHnhHD9+iKWJo9parGkMZzc92MpjDK/g7uQEN +BFJIGbEBCAC7k5QEA9WQM7E3ceNaeLMrA9lXfuzaNCcySq7ONdVAa5PxzbSKdHvz +QFoL1VFqBTYQ038lbil1XqnoM0zvIfAI3LcpS8sq92El/vPxp6jZh2Ari9Uw7x95 +k2cZMgI67g+zQMGdjVRA155nFQRCgg000xU4F7JA6+WsuLlVUmccsDv7YWJExMtC +YPxiuz5DFu8RALnw4Ckts+dbwsrcvUHhkm9b6RAsdCKjjRpUZjLgdltjH83gUVvt +i1YmdjjsVpt95dtsaG+ad852g/Rk8EdxNMkjPF6HLA67CLADP9wYaj80yPcPtylS +ycvPtcclVeHkFBRVM8xZpQd4iD19MWI1ABEBAAGJAR8EGAECAAkFAlJIGbECGwwA +CgkQQsWyEwofdxQ7tQgAhB0FwTs7L8Qr63DHC2yAnXVxgtTAY1/36CccNXVculyR ++EkLcwahms9AKhz7eQb+Mud+5vH0GRohLp2npgO38CjVUfIP5d+Y6dsthmrkF6p8 +XdV1dVK9vWX+i/YZSw/Mded30Cq4P2Yhq9EaemMT0rtli8lz2NnkZ9dFJZk1lzJC +CZmRpbjSNWqRU4f7qyh21lYk/OC/0XE8fh8CaO23TZ+6gBionoCztwb7NyC9OArN +qYlNnbmh9iNqdblykPS3bkjf34n2xyMgnIehNrM89tk8PY4UfNPhgT1TMD9W3Svq +ynNZvLuF/FIDwDeC1qcfjGbfDn9fXO/lMIIRooQYKQ== +=J2HJ +-----END PGP PUBLIC KEY BLOCK----- diff --git a/install/ubuntu/13.04/dovecot.tar.gz b/install/ubuntu/13.04/dovecot.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..bfabaa030981d087ea4ccd8c7b86cc4d7ab1b7c6 GIT binary patch literal 3487 zcmV;Q4Pf#giwFRAz^+vQ1MM4YZyPrJESWH#l7u_ru?rTWOchsOV;5PJCsTFqMF@1q7J z@8Lu8?+=Fk(NVY80r~evgQH6Rj{$e&-|I9Jo%CDy^^@&^0v-(pACmu3uh#|ncRQo* z(dY>0bqAx~@CoaDG73Hde{=aieOi0^lwDn3^_fjXAZIdQR-~y^a|aq$g|DKQfwbnIX+x!UC0o24+8Ev1e?6`TyF z8`vq$jB@adI3@)oZi~NBA63I*Z>0~uk2KT zaHU4N^Mslf!x4zfNM=3)9v~#FmW9FwMovM>Qqk&A2kn)-mF@3y zG_7=ebDkGV094j@@Vs@0BEc@7@e)9w1lqm6#<#5dEoiE=m z@xRQ?I@Os$l_|q95)Rz0FPp%ZgQ-R*OzH}@2pfc;P;nNeTnTN9qnvI`X4%2lW7cbR zTm3_iDcc$Smm3}Aqsvx4A-9-ir}foWtu?zhA>BPnKH=r8;MprpW)8}EnWd=Ptk>xv zZ$wNMvfvPJARK}+#op!#f3DIl7_7MUF_H+{N8OxpIBtVkjrIw0*#{pt%}|=4)|}#i zlK@)fN@oy7fK{B$wRYhG42V-$TW~dZzNkgA$Vec}F7ibQ_$LtX40NJt`OMjEVY}## zC!XAK34ym>0Rsw56(X|5!=mP(gHmL#q$xf~(P8ePbmY17uP8?-2-eo4Yq8S|{0ePC z{%@rXcpy}2$J3Wi&9@E*NtxUUBtI;i4*_q;ryATy&))c2YhFE=mCZghykWlY>c z$`*4-IYg9zGgoBu+J$PTs?J72mMO7@v=QizHl?Ho^Q6trYBp`MA?apM!Dq&&Fw%;NZ>9uNV(Q;Ji1D zSC=o5I^LcO}XbK_ij~ctOc^?0jNp{bgsnFkh!dQ`x4_i~A(yWFTp;L}~+`2=c6K z3cll({3CicV6e|ZnwY%i*D{1yLZ+?e{=TLY6c|SC1fzpMzDZJI%5L+?v>Mfe#D|AM zu{H~_Ze62e^kh|%!fz>Q2_H!3659BJZVC(0Vjnu9`FU}gzn7>vr-tO$G^OH$ojEgYPB34n)nCN z6_up>=y0fnu2v=w9^ctv_X*FyQ{qy%dak!9@p03;bsS}E4*n(qZ-c&>9>6_P!1vB* z)S>Sb1jo$Vh9~sS!@r29x^Mp=wK=--Pv-z0vj5JYQ`rBokM&>pe^A-~V*p5dl5jAb zF>6B()Q0bEuM;i!{MS(O3O)$;`#>Hz_&+?N{?F*Bvj4{b*Z-lK^uDrs5Xa-jP|B-A`z+-YdcF%DyCW+}{uQ7yN8dB=smp0>#5MR`=XA`_M|@&2rY zZx3;qcSKw<4eRNIXYWR9hn<^w7Q@ziSccrYPi2Y|VUpNm!WeDfdNYG$fi5R_OuDV& z%!xY>ILFc8_Cq&nkN@v}qb4?dwsIDU?QXGzCXef~UH4_fOVB_gLqVlFBKY*=>g4(P z#re%UtS=?NLD9nMx$84TnP5{vXD0pJ|6<>@c0hzQWe!47Af$v-WgUAoa7#{glGpk@ zZ>{epa?OlGyuBkz|5C-&D zX>62B5bhh91xMVx7HNLb_;K4>S8Csx=x_yj>G+sP zYoJHLc3^{Pi~pL%ck9}<&CEpGF9Nl;%!vsdCTDtnY_DI_P0mWP6p-FC77Gq+7U;;R z_qKx!=CJW^E-!^5;+v)tDti>M$qK zMmnu|b$NMJAVUeBetUNMT~T|z0-^}BogfM`fY)aDoF=l zFMF--Ve4Me$(NX7#5m<475cGv?HcmvADsJ6x3wm4@D{7`xTjg;lm*- zO4=y45Y&e@WBcuWP~+K5uALR;b!oED-5MP=oo!)vr2}oHT*3-gpQ8UohXrhNy=W@A zO9iGU!=1fKT!?HoZPJScC9TDy{`g8;5kWx8UpoLTy10Jxob*!`{qijf$TcD#4)2si z-J1<%o&tptmg1?o0}&FNOl~vk2qPa!kx-KhTyrBfzd5u2ed#}{;xeAy8rjP#r?n6>GmN1 zKk8Tc|KkA4I-F8o9~!x&5|@*I6BPg+L!OMPYXh(-F@E`C*gSpx?&_vUSADuQt}E6S zY0wss9}n802Ct!PyB@Y3I;_;;l3%siZ^!+)`S@pr`}IF-qfdMNf6)HB!~UK3e+O6w ztnB|00Hh7}wt@T_K1~8)@ZR)wJF{2{40zOD3Sdwh2HQC3(oTpACZz?pV)Lu!!@SBw z|A=tk{xJo3)cPOT|IxPo-|4&hUuFM~0-?0@@^2DxEC#I83ANGaO)LB~fhax2m$#gg zphvO5S5~BrF;vq+Mye+;{o z{XYh{IxZyRV5V~sPIh|ZG{}QMSnCGt&Iktl)V+-F-%UQQFWUGKQ}ep2ef*u%&wca? zo^0(u@A-b(%-;do|L7z3-|zbT|ESaL;O{>N_>;iO{vQGI_8wX`b@3Y9jdImf(k0Apn?i2sGx!hDyX1>3M#0ef(kxA N{0}P55eWcL004dY&`|&Y literal 0 HcmV?d00001 diff --git a/install/ubuntu/13.04/dovecot/conf.d/10-auth.conf b/install/ubuntu/13.04/dovecot/conf.d/10-auth.conf new file mode 100644 index 000000000..dfcc83110 --- /dev/null +++ b/install/ubuntu/13.04/dovecot/conf.d/10-auth.conf @@ -0,0 +1,4 @@ +disable_plaintext_auth = no +auth_verbose = yes +auth_mechanisms = plain login +!include auth-passwdfile.conf.ext diff --git a/install/ubuntu/13.04/dovecot/conf.d/10-logging.conf b/install/ubuntu/13.04/dovecot/conf.d/10-logging.conf new file mode 100644 index 000000000..a5f207d51 --- /dev/null +++ b/install/ubuntu/13.04/dovecot/conf.d/10-logging.conf @@ -0,0 +1 @@ +log_path = /var/log/dovecot.log diff --git a/install/ubuntu/13.04/dovecot/conf.d/10-mail.conf b/install/ubuntu/13.04/dovecot/conf.d/10-mail.conf new file mode 100644 index 000000000..55313419e --- /dev/null +++ b/install/ubuntu/13.04/dovecot/conf.d/10-mail.conf @@ -0,0 +1,4 @@ +mail_privileged_group = mail +mail_access_groups = mail +mail_location = maildir:%h/mail/%d/%n +pop3_uidl_format = %08Xu%08Xv diff --git a/install/ubuntu/13.04/dovecot/conf.d/10-master.conf b/install/ubuntu/13.04/dovecot/conf.d/10-master.conf new file mode 100644 index 000000000..a75a9aaa4 --- /dev/null +++ b/install/ubuntu/13.04/dovecot/conf.d/10-master.conf @@ -0,0 +1,29 @@ +service imap-login { + inet_listener imap { + } + inet_listener imaps { + } +} + +service pop3-login { + inet_listener pop3 { + } + inet_listener pop3s { + } +} + + +service imap { +} + +service pop3 { +} + +service auth { + unix_listener auth-client { + group = mail + mode = 0660 + user = dovecot + } + user = dovecot +} diff --git a/install/ubuntu/13.04/dovecot/conf.d/10-ssl.conf b/install/ubuntu/13.04/dovecot/conf.d/10-ssl.conf new file mode 100644 index 000000000..3aaff6eec --- /dev/null +++ b/install/ubuntu/13.04/dovecot/conf.d/10-ssl.conf @@ -0,0 +1,3 @@ +ssl = yes +ssl_cert = = 2.1.4) : %v.%u + # Dovecot v0.99.x : %v.%u + # tpop3d : %Mf + # + # Note that Outlook 2003 seems to have problems with %v.%u format which was + # Dovecot's default, so if you're building a new server it would be a good + # idea to change this. %08Xu%08Xv should be pretty fail-safe. + # + #pop3_uidl_format = %08Xu%08Xv + + # Permanently save UIDLs sent to POP3 clients, so pop3_uidl_format changes + # won't change those UIDLs. Currently this works only with Maildir. + #pop3_save_uidl = no + + # What to do about duplicate UIDLs if they exist? + # allow: Show duplicates to clients. + # rename: Append a temporary -2, -3, etc. counter after the UIDL. + #pop3_uidl_duplicates = allow + + # POP3 logout format string: + # %i - total number of bytes read from client + # %o - total number of bytes sent to client + # %t - number of TOP commands + # %p - number of bytes sent to client as a result of TOP command + # %r - number of RETR commands + # %b - number of bytes sent to client as a result of RETR command + # %d - number of deleted messages + # %m - number of messages (before deletion) + # %s - mailbox size in bytes (before deletion) + # %u - old/new UIDL hash. may help finding out if UIDLs changed unexpectedly + #pop3_logout_format = top=%t/%p, retr=%r/%b, del=%d/%m, size=%s + + # Maximum number of POP3 connections allowed for a user from each IP address. + # NOTE: The username is compared case-sensitively. + #mail_max_userip_connections = 10 + + # Space separated list of plugins to load (default is global mail_plugins). + #mail_plugins = $mail_plugins + + # Workarounds for various client bugs: + # outlook-no-nuls: + # Outlook and Outlook Express hang if mails contain NUL characters. + # This setting replaces them with 0x80 character. + # oe-ns-eoh: + # Outlook Express and Netscape Mail breaks if end of headers-line is + # missing. This option simply sends it if it's missing. + # The list is space-separated. + #pop3_client_workarounds = +} diff --git a/install/ubuntu/13.04/dovecot/conf.d/auth-passwdfile.conf.ext b/install/ubuntu/13.04/dovecot/conf.d/auth-passwdfile.conf.ext new file mode 100644 index 000000000..75e6e1152 --- /dev/null +++ b/install/ubuntu/13.04/dovecot/conf.d/auth-passwdfile.conf.ext @@ -0,0 +1,9 @@ +passdb { + driver = passwd-file + args = scheme=MD5-CRYPT username_format=%n /etc/exim4/domains/%d/passwd +} + +userdb { + driver = passwd-file + args = username_format=%n /etc/exim4/domains/%d/passwd +} diff --git a/install/ubuntu/13.04/dovecot/dovecot.conf b/install/ubuntu/13.04/dovecot/dovecot.conf new file mode 100644 index 000000000..0a8553510 --- /dev/null +++ b/install/ubuntu/13.04/dovecot/dovecot.conf @@ -0,0 +1,4 @@ +protocols = imap pop3 +listen = *, :: +base_dir = /var/run/dovecot/ +!include conf.d/*.conf diff --git a/install/ubuntu/13.04/exim/dnsbl.conf b/install/ubuntu/13.04/exim/dnsbl.conf new file mode 100644 index 000000000..5166b255e --- /dev/null +++ b/install/ubuntu/13.04/exim/dnsbl.conf @@ -0,0 +1,2 @@ +bl.spamcop.net +zen.spamhaus.org diff --git a/install/ubuntu/13.04/exim/exim4.conf.template b/install/ubuntu/13.04/exim/exim4.conf.template new file mode 100644 index 000000000..742f0409e --- /dev/null +++ b/install/ubuntu/13.04/exim/exim4.conf.template @@ -0,0 +1,377 @@ +###################################################################### +# # +# Exim configuration file for Vesta Control Panel # +# # +###################################################################### + +#SPAMASSASSIN = yes +#SPAM_SCORE = 50 +#CLAMD = yes + +domainlist local_domains = dsearch;/etc/exim4/domains/ +domainlist relay_to_domains = dsearch;/etc/exim4/domains/ +hostlist relay_from_hosts = 127.0.0.1 +hostlist whitelist = net-iplsearch;/etc/exim4/white-blocks.conf +hostlist spammers = net-iplsearch;/etc/exim4/spam-blocks.conf +no_local_from_check +untrusted_set_sender = * +acl_smtp_connect = acl_check_spammers +acl_smtp_mail = acl_check_mail +acl_smtp_rcpt = acl_check_rcpt +acl_smtp_data = acl_check_data +acl_smtp_mime = acl_check_mime + +.ifdef SPAMASSASSIN +spamd_address = 127.0.0.1 783 +.endif + +.ifdef CLAMD +av_scanner = clamd: /var/run/clamav/clamd.ctl +.endif + +tls_advertise_hosts = * +tls_certificate = /usr/local/vesta/ssl/certificate.crt +tls_privatekey = /usr/local/vesta/ssl/certificate.key + +daemon_smtp_ports = 25 : 465 : 587 : 2525 +tls_on_connect_ports = 465 +never_users = root +host_lookup = * +rfc1413_hosts = * +rfc1413_query_timeout = 5s +ignore_bounce_errors_after = 2d +timeout_frozen_after = 7d + +DKIM_DOMAIN = ${lc:${domain:$h_from:}} +DKIM_FILE = /etc/exim4/domains/${lc:${domain:$h_from:}}/dkim.pem +DKIM_PRIVATE_KEY = ${if exists{DKIM_FILE}{DKIM_FILE}{0}} + + + +###################################################################### +# ACL CONFIGURATION # +# Specifies access control lists for incoming SMTP mail # +###################################################################### +begin acl + +acl_check_spammers: + accept hosts = +whitelist + + drop message = Your host in blacklist on this server. + log_message = Host in blacklist + hosts = +spammers + + accept + + +acl_check_mail: + deny condition = ${if eq{$sender_helo_name}{}} + message = HELO required before MAIL + + drop message = Helo name contains a ip address (HELO was $sender_helo_name) and not is valid + condition = ${if match{$sender_helo_name}{\N((\d{1,3}[.-]\d{1,3}[.-]\d{1,3}[.-]\d{1,3})|([0-9a-f]{8})|([0-9A-F]{8}))\N}{yes}{no}} + condition = ${if match {${lookup dnsdb{>: defer_never,ptr=$sender_host_address}}\}{$sender_helo_name}{no}{yes}} + delay = 45s + + drop condition = ${if isip{$sender_helo_name}} + message = Access denied - Invalid HELO name (See RFC2821 4.1.3) + + drop condition = ${if eq{[$interface_address]}{$sender_helo_name}} + message = $interface_address is _my_ address + + accept + + +acl_check_rcpt: + accept hosts = : + + deny message = Restricted characters in address + domains = +local_domains + local_parts = ^[.] : ^.*[@%!/|] + + deny message = Restricted characters in address + domains = !+local_domains + local_parts = ^[./|] : ^.*[@%!] : ^.*/\\.\\./ + + require verify = sender + + accept hosts = +relay_from_hosts + control = submission + + accept authenticated = * + control = submission/domain= + + deny message = Rejected because $sender_host_address is in a black list at $dnslist_domain\n$dnslist_text + hosts = !+whitelist + dnslists = ${readfile {/etc/exim4/dnsbl.conf}{:}} + + require message = relay not permitted + domains = +local_domains : +relay_to_domains + + deny message = smtp auth requried + sender_domains = +local_domains + !authenticated = * + + require verify = recipient + +.ifdef CLAMD + warn set acl_m0 = no + + warn condition = ${if exists {/etc/exim4/domains/$domain/antivirus}{yes}{no}} + set acl_m0 = yes +.endif + +.ifdef SPAMASSASSIN + warn set acl_m1 = no + + warn condition = ${if exists {/etc/exim4/domains/$domain/antispam}{yes}{no}} + set acl_m1 = yes +.endif + + accept + + +acl_check_data: +.ifdef CLAMD + deny message = Message contains a virus ($malware_name) and has been rejected + malware = * + condition = ${if eq{$acl_m0}{yes}{yes}{no}} +.endif + +.ifdef SPAMASSASSIN + warn !authenticated = * + hosts = !+relay_from_hosts + condition = ${if < {$message_size}{100K}} + condition = ${if eq{$acl_m1}{yes}{yes}{no}} + spam = nobody:true/defer_ok + add_header = X-Spam-Score: $spam_score_int + add_header = X-Spam-Bar: $spam_bar + add_header = X-Spam-Report: $spam_report + set acl_m2 = $spam_score_int + + warn condition = ${if !eq{$acl_m2}{} {yes}{no}} + condition = ${if >{$acl_m2}{SPAM_SCORE} {yes}{no}} + add_header = X-Spam-Status: Yes + message = SpamAssassin detected spam (from $sender_address to $recipients). +.endif + + accept + + +acl_check_mime: + deny message = Blacklisted file extension detected + condition = ${if match {${lc:$mime_filename}}{\N(\.ade|\.adp|\.bat|\.chm|\.cmd|\.com|\.cpl|\.exe|\.hta|\.ins|\.isp|\.jse|\.lib|\.lnk|\.mde|\.msc|\.msp|\.mst|\.pif|\.scr|\.sct|\.shb|\.sys|\.vb|\.vbe|\.vbs|\.vxd|\.wsc|\.wsf|\.wsh)$\N}{1}{0}} + + accept + + + +###################################################################### +# AUTHENTICATION CONFIGURATION # +###################################################################### +begin authenticators + +dovecot_plain: + driver = dovecot + public_name = PLAIN + server_socket = /var/run/dovecot/auth-client + server_set_id = $auth1 + +dovecot_login: + driver = dovecot + public_name = LOGIN + server_socket = /var/run/dovecot/auth-client + server_set_id = $auth1 + + + +###################################################################### +# ROUTERS CONFIGURATION # +# Specifies how addresses are handled # +###################################################################### +begin routers + +#smarthost: +# driver = manualroute +# domains = ! +local_domains +# transport = remote_smtp +# route_list = * smartrelay.vestacp.com +# no_more +# no_verify + +dnslookup: + driver = dnslookup + domains = !+local_domains + transport = remote_smtp + no_more + +userforward: + driver = redirect + check_local_user + file = $home/.forward + allow_filter + no_verify + no_expn + check_ancestor + file_transport = address_file + pipe_transport = address_pipe + reply_transport = address_reply + +procmail: + driver = accept + check_local_user + require_files = ${local_part}:+${home}/.procmailrc:/usr/bin/procmail + transport = procmail + no_verify + +autoreplay: + driver = accept + require_files = /etc/exim4/domains/$domain/autoreply.${local_part}.msg + condition = ${if exists{/etc/exim4/domains/$domain/autoreply.${local_part}.msg}}{yes}{no}} + retry_use_local_part + transport = userautoreply + unseen + +aliases: + driver = redirect + headers_add = X-redirected: yes + data = ${extract{1}{:}{${lookup{$local_part@$domain}lsearch{/etc/exim4/domains/$domain/aliases}}}} + require_files = /etc/exim4/domains/$domain/aliases + redirect_router = dnslookup + pipe_transport = address_pipe + unseen + +localuser_fwd_only: + driver = accept + transport = devnull + condition = ${if exists{/etc/exim/domains/$domain/fwd_only}{${lookup{$local_part}lsearch{/etc/exim/domains/$domain/fwd_only}{true}{false}}}} + +localuser_spam: + driver = accept + transport = local_spam_delivery + condition = ${if eq {${if match{$h_X-Spam-Status:}{\N^Yes\N}{yes}{no}}} {${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}{yes}{no_such_user}}}} + +localuser: + driver = accept + transport = local_delivery + condition = ${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}{true}{false}} + +catchall: + driver = redirect + headers_add = X-redirected: yes + require_files = /etc/exim4/domains/$domain/aliases + data = ${extract{1}{:}{${lookup{*@$domain}lsearch{/etc/exim4/domains/$domain/aliases}}}} + file_transport = local_delivery + redirect_router = dnslookup + +terminate_alias: + driver = accept + transport = devnull + condition = ${lookup{$local_part@$domain}lsearch{/etc/exim4/domains/$domain/aliases}{true}{false}} + + + +###################################################################### +# TRANSPORTS CONFIGURATION # +###################################################################### +begin transports + +remote_smtp: + driver = smtp + #helo_data = $sender_address_domain + dkim_domain = DKIM_DOMAIN + dkim_selector = mail + dkim_private_key = DKIM_PRIVATE_KEY + dkim_canon = relaxed + dkim_strict = 0 + +procmail: + driver = pipe + command = "/usr/bin/procmail -d $local_part" + return_path_add + delivery_date_add + envelope_to_add + user = $local_part + initgroups + return_output + +local_delivery: + driver = appendfile + maildir_format + maildir_use_size_file + user = ${extract{2}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}} + group = mail + create_directory + directory_mode = 770 + mode = 660 + use_lockfile = no + delivery_date_add + envelope_to_add + return_path_add + directory = "${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}}/mail/$domain/$local_part" + quota = ${extract{6}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}}M + quota_warn_threshold = 75% + +local_spam_delivery: + driver = appendfile + maildir_format + maildir_use_size_file + user = ${extract{2}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}} + group = mail + create_directory + directory_mode = 770 + mode = 660 + use_lockfile = no + delivery_date_add + envelope_to_add + return_path_add + directory = "${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}}/mail/$domain/$local_part/.Spam" + quota = ${extract{6}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}}M + quota_directory = "${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}}/mail/$domain/$local_part" + quota_warn_threshold = 75% + +address_pipe: + driver = pipe + return_output + +address_file: + driver = appendfile + delivery_date_add + envelope_to_add + return_path_add + +address_reply: + driver = autoreply + +userautoreply: + driver = autoreply + file = /etc/exim4/domains/$domain/autoreply.${local_part}.msg + from = "${local_part}@${domain}" + subject = "${if def:h_Subject: {Autoreply: ${quote:${escape:$h_Subject:}}} {Autoreply Message}}" + to = "${sender_address}" + +devnull: + driver = appendfile + file = /dev/null + + + +###################################################################### +# RETRY CONFIGURATION # +###################################################################### +begin retry + +# Address or Domain Error Retries +# ----------------- ----- ------- +* * F,2h,15m; G,16h,1h,1.5; F,4d,6h + + + +###################################################################### +# REWRITE CONFIGURATION # +###################################################################### +begin rewrite + + + +###################################################################### diff --git a/install/ubuntu/13.04/exim/spam-blocks.conf b/install/ubuntu/13.04/exim/spam-blocks.conf new file mode 100644 index 000000000..e69de29bb diff --git a/install/ubuntu/13.04/fail2ban.tar.gz b/install/ubuntu/13.04/fail2ban.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..628545b6b12d83a4dfcf4529b41f62792c228c85 GIT binary patch literal 721 zcmV;?0xta@iwFR?P)1Y$1MQbhZ{jczhB^CJjMPJ=l>#Ira4D7AZL1=&Z6#&~ zz`KruB3xbg09_DCMo>VRAaZ-;y)^U@ z_5_W1em^5}=Uk3M(j5%0M~Fp}7>lVIYRqubkoOIoiK#qP6BOckLPYW;2OWgmSsIAg zuZ|mFmaYUYjJJfo8s1fhF1)IOlQ|75La(j33(9U0btUMJvtIut>QYeUVmCrexr&Qi zKbjFQ61zkzP2U-?^r{!(!l(3+?Yga{u}aaFy}dZE-rC%=GOfyYm&N9W)k}T291PDY z*P0t`IZ}uIjJ_-j{V$SH_dlT#cu)PeEcx8DI+m&H|328vfBu=(y@&@N72}Qi-)t}U ze|i14JEpGxd*KMK)CoAp98}8bBuj9v%2KQe1W{6IHF7UVKsi-oBUDPa+B%^mI!l#A z%iggR=`rPvnSp)Z2xvn7V8#q@Dyt%#D2+c|xJU7JZ=WzC$g2~0Q{w%WGdx!uFgO@} z=-u4i58*FN5)y;)2*=Nd+$g+V_$fxmCp11?eTVGz8P->^KFOi;zxe)( z;(T!ZH#>H&|F+iuy|9`8{p-KwZ0f&dYyIB`OZs27=SuT4o@Sm$(ja3D9@K#V)prvv zs8^H+ECdN-k)k768hSV1`}Y@@gAp1N=}x2^dQlk4c0wJawc4RhTtX&fF0G*c4Nk6a z2g6fPkL6zl5rJ&(DMxg| +actionstop = /usr/local/vesta/bin/v-delete-firewall-chain +actioncheck = iptables -n -L INPUT | grep -q 'fail2ban-[ \t]' +actionban = /usr/local/vesta/bin/v-add-firewall-ban +actionunban = /usr/local/vesta/bin/v-delete-firewall-ban diff --git a/install/ubuntu/13.04/fail2ban/filter.d/vesta.conf b/install/ubuntu/13.04/fail2ban/filter.d/vesta.conf new file mode 100644 index 000000000..69670a56e --- /dev/null +++ b/install/ubuntu/13.04/fail2ban/filter.d/vesta.conf @@ -0,0 +1,10 @@ +# Fail2Ban filter for unsuccesfull Vesta authentication attempts +# + +[INCLUDES] +before = common.conf + +[Definition] +failregex = .* failed to login +ignoreregex = + diff --git a/install/ubuntu/13.04/fail2ban/jail.local b/install/ubuntu/13.04/fail2ban/jail.local new file mode 100644 index 000000000..eccea0685 --- /dev/null +++ b/install/ubuntu/13.04/fail2ban/jail.local @@ -0,0 +1,39 @@ +[ssh-iptables] +enabled = true +filter = sshd +action = vesta[name=SSH] +logpath = /var/log/auth.log +maxretry = 5 + +[vsftpd-iptables] +enabled = false +filter = vsftpd +action = vesta[name=FTP] +logpath = /var/log/vsftpd.log +maxretry = 5 + +[exim-iptables] +enabled = true +filter = exim +action = vesta[name=MAIL] +logpath = /var/log/exim4/mainlog + +[dovecot-iptables] +enabled = true +filter = dovecot +action = vesta[name=MAIL] +logpath = /var/log/dovecot.log + +[mysqld-iptables] +enabled = false +filter = mysqld-auth +action = vesta[name=DB] +logpath = /var/log/mysql.log +maxretry = 5 + +[vesta-iptables] +enabled = true +filter = vesta +action = vesta[name=VESTA] +logpath = /var/log/vesta/auth.log +maxretry = 5 diff --git a/install/ubuntu/13.04/firewall.tar.gz b/install/ubuntu/13.04/firewall.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..e8556008077364323d7d6b6934e7a2cf7a734983 GIT binary patch literal 540 zcmV+%0^|K3iwFQ5XyQ}=1MQVdkJ>O4Mzij(@XnhsKo&*MSlh#7(1g=&0&FEG%?Me6ampuO4>y-_`!)kpP&FT0Pj|*j)GSV93 zG0u%P9?@5H>Ue&9TJ8w(mS4U;YbU>kw!5dto6pc!`1H`piz?!Qs? zZ2zTY(j)A}O)l`C?|(Hfn=&r%X0(YbN~&_+%&1`W&E*1z3IZzVUki(*D`*Kk5kQkG z1wFz!17_g@d9ch)G0;wCGL8I9sNtr~X-yEB=^d3PuoC0XT$oBik3eT~aJ zPYYM7vf@1@^`frQB1w}O-E1jovb=r04Y>?eKuHocY1?18ny~4FyPO>aM4!NUUOmFePy(-1M3SddTi>v8NVjB&*t=IgAYbgkDfmmx*FWy-yM^~-2uA1 z`-8QZ4$iCJUfZClsXi!k+gGp^gsj(jT}WJxQ(W4?Rswg^FKlTCd%;5d=XH e1VIo4K@bE%5ClOG1VIqwGCu%8Tmj4gC;$K)2?m1z literal 0 HcmV?d00001 diff --git a/install/ubuntu/13.04/firewall/ports.conf b/install/ubuntu/13.04/firewall/ports.conf new file mode 100644 index 000000000..a6ef4dae5 --- /dev/null +++ b/install/ubuntu/13.04/firewall/ports.conf @@ -0,0 +1,16 @@ +PROTOCOL='TCP' PORT='20' +PROTOCOL='TCP' PORT='21' +PROTOCOL='TCP' PORT='22' +PROTOCOL='TCP' PORT='25' +PROTOCOL='UDP' PORT='53' +PROTOCOL='TCP' PORT='80' +PROTOCOL='TCP' PORT='443' +PROTOCOL='TCP' PORT='110' +PROTOCOL='UDP' PORT='123' +PROTOCOL='TCP' PORT='143' +PROTOCOL='TCP' PORT='3306' +PROTOCOL='TCP' PORT='5432' +PROTOCOL='TCP' PORT='8080' +PROTOCOL='TCP' PORT='8433' +PROTOCOL='TCP' PORT='8083' +PROTOCOL='TCP' PORT='12000:12100' diff --git a/install/ubuntu/13.04/firewall/rules.conf b/install/ubuntu/13.04/firewall/rules.conf new file mode 100644 index 000000000..956c2e1d9 --- /dev/null +++ b/install/ubuntu/13.04/firewall/rules.conf @@ -0,0 +1,10 @@ +RULE='1' ACTION='ACCEPT' PROTOCOL='ICMP' PORT='0' IP='0.0.0.0/0' COMMENT='PING' SUSPENDED='no' TIME='17:13:48' DATE='2014-09-16' +RULE='2' ACTION='ACCEPT' PROTOCOL='TCP' PORT='8083' IP='0.0.0.0/0' COMMENT='VESTA' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' +RULE='3' ACTION='ACCEPT' PROTOCOL='TCP' PORT='3306,5432' IP='0.0.0.0/0' COMMENT='DB' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' +RULE='4' ACTION='ACCEPT' PROTOCOL='TCP' PORT='143,993' IP='0.0.0.0/0' COMMENT='IMAP' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' +RULE='5' ACTION='ACCEPT' PROTOCOL='TCP' PORT='110,995' IP='0.0.0.0/0' COMMENT='POP3' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' +RULE='6' ACTION='ACCEPT' PROTOCOL='TCP' PORT='25,465,587,2525' IP='0.0.0.0/0' COMMENT='SMTP' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' +RULE='7' ACTION='ACCEPT' PROTOCOL='UDP' PORT='53' IP='0.0.0.0/0' COMMENT='DNS' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' +RULE='8' ACTION='ACCEPT' PROTOCOL='TCP' PORT='21,12000-12100' IP='0.0.0.0/0' COMMENT='FTP' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' +RULE='9' ACTION='ACCEPT' PROTOCOL='TCP' PORT='80,443' IP='0.0.0.0/0' COMMENT='WEB' SUSPENDED='no' TIME='17:04:27' DATE='2014-09-24' +RULE='10' ACTION='ACCEPT' PROTOCOL='TCP' PORT='22' IP='0.0.0.0/0' COMMENT='SSH' SUSPENDED='no' TIME='17:14:41' DATE='2014-09-16' diff --git a/install/ubuntu/13.04/logrotate/apache2 b/install/ubuntu/13.04/logrotate/apache2 new file mode 100644 index 000000000..27629d0dd --- /dev/null +++ b/install/ubuntu/13.04/logrotate/apache2 @@ -0,0 +1,19 @@ +/var/log/apache2/*.log /var/log/apache2/domains/*log { + weekly + missingok + rotate 52 + compress + delaycompress + notifempty + create 640 root adm + sharedscripts + postrotate + /etc/init.d/apache2 reload > /dev/null || true + [ ! -f /var/run/nginx.pid ] || kill -USR1 `cat /var/run/nginx.pid` + endscript + prerotate + if [ -d /etc/logrotate.d/httpd-prerotate ]; then \ + run-parts /etc/logrotate.d/httpd-prerotate; \ + fi; \ + endscript +} diff --git a/install/ubuntu/13.04/logrotate/nginx b/install/ubuntu/13.04/logrotate/nginx new file mode 100644 index 000000000..d667f2135 --- /dev/null +++ b/install/ubuntu/13.04/logrotate/nginx @@ -0,0 +1,13 @@ +/var/log/nginx/*log /var/log/nginx/domains/*log { + daily + missingok + rotate 52 + compress + delaycompress + notifempty + create 640 nginx adm + sharedscripts + postrotate + [ -f /var/run/nginx.pid ] && kill -USR1 `cat /var/run/nginx.pid` + endscript +} diff --git a/install/ubuntu/13.04/logrotate/vesta b/install/ubuntu/13.04/logrotate/vesta new file mode 100644 index 000000000..027a34396 --- /dev/null +++ b/install/ubuntu/13.04/logrotate/vesta @@ -0,0 +1,7 @@ +/usr/local/vesta/log/*.log { + missingok + notifempty + size 30k + yearly + create 0600 root root +} diff --git a/install/ubuntu/13.04/mysql/my-large.cnf b/install/ubuntu/13.04/mysql/my-large.cnf new file mode 100644 index 000000000..d0bab3907 --- /dev/null +++ b/install/ubuntu/13.04/mysql/my-large.cnf @@ -0,0 +1,42 @@ +[client] +port=3306 +socket=/var/run/mysqld/mysqld.sock + +[mysqld_safe] +socket=/var/run/mysqld/mysqld.sock + +[mysqld] +user=mysql +pid-file=/var/run/mysqld/mysqld.pid +socket=/var/run/mysqld/mysqld.sock +port=3306 +basedir=/usr +datadir=/var/lib/mysql +tmpdir=/tmp +lc-messages-dir=/usr/share/mysql +log_error=/var/log/mysql/error.log + +symbolic-links=0 + +skip-external-locking +key_buffer_size = 256M +max_allowed_packet = 32M +table_open_cache = 256 +sort_buffer_size = 1M +read_buffer_size = 1M +read_rnd_buffer_size = 4M +myisam_sort_buffer_size = 64M +thread_cache_size = 8 +query_cache_size= 16M +thread_concurrency = 8 + +#innodb_use_native_aio = 0 +innodb_file_per_table + +max_connections=200 +max_user_connections=50 +wait_timeout=10 +interactive_timeout=50 +long_query_time=5 + +!includedir /etc/mysql/conf.d/ diff --git a/install/ubuntu/13.04/mysql/my-medium.cnf b/install/ubuntu/13.04/mysql/my-medium.cnf new file mode 100644 index 000000000..1c10ab9a6 --- /dev/null +++ b/install/ubuntu/13.04/mysql/my-medium.cnf @@ -0,0 +1,40 @@ +[client] +port=3306 +socket=/var/run/mysqld/mysqld.sock + +[mysqld_safe] +socket=/var/run/mysqld/mysqld.sock + +[mysqld] +user=mysql +pid-file=/var/run/mysqld/mysqld.pid +socket=/var/run/mysqld/mysqld.sock +port=3306 +basedir=/usr +datadir=/var/lib/mysql +tmpdir=/tmp +lc-messages-dir=/usr/share/mysql +log_error=/var/log/mysql/error.log + +symbolic-links=0 + +skip-external-locking +key_buffer_size = 16M +max_allowed_packet = 16M +table_open_cache = 64 +sort_buffer_size = 512K +net_buffer_length = 8K +read_buffer_size = 256K +read_rnd_buffer_size = 512K +myisam_sort_buffer_size = 8M + +#innodb_use_native_aio = 0 +innodb_file_per_table + +max_connections=70 +max_user_connections=30 +wait_timeout=10 +interactive_timeout=50 +long_query_time=5 + +!includedir /etc/mysql/conf.d/ diff --git a/install/ubuntu/13.04/mysql/my-small.cnf b/install/ubuntu/13.04/mysql/my-small.cnf new file mode 100644 index 000000000..26a804781 --- /dev/null +++ b/install/ubuntu/13.04/mysql/my-small.cnf @@ -0,0 +1,40 @@ +[client] +port=3306 +socket=/var/run/mysqld/mysqld.sock + +[mysqld_safe] +socket=/var/run/mysqld/mysqld.sock + +[mysqld] +user=mysql +pid-file=/var/run/mysqld/mysqld.pid +socket=/var/run/mysqld/mysqld.sock +port=3306 +basedir=/usr +datadir=/var/lib/mysql +tmpdir=/tmp +lc-messages-dir=/usr/share/mysql +log_error=/var/log/mysql/error.log + +symbolic-links=0 + +skip-external-locking +key_buffer_size = 16K +max_allowed_packet = 1M +table_open_cache = 4 +sort_buffer_size = 64K +read_buffer_size = 256K +read_rnd_buffer_size = 256K +net_buffer_length = 2K +thread_stack = 240K + +#innodb_use_native_aio = 0 +innodb_file_per_table + +max_connections=30 +max_user_connections=20 +wait_timeout=10 +interactive_timeout=50 +long_query_time=5 + +!includedir /etc/mysql/conf.d/ diff --git a/install/ubuntu/13.04/nginx/nginx.conf b/install/ubuntu/13.04/nginx/nginx.conf new file mode 100644 index 000000000..7937301c1 --- /dev/null +++ b/install/ubuntu/13.04/nginx/nginx.conf @@ -0,0 +1,124 @@ +# Server globals +user www-data; +worker_processes 2; +error_log /var/log/nginx/error.log; +pid /var/run/nginx.pid; + + +# Worker config +events { + worker_connections 1024; + use epoll; +} + + +http { + # Main settings + sendfile on; + tcp_nopush on; + tcp_nodelay on; + client_header_timeout 1m; + client_body_timeout 1m; + client_header_buffer_size 2k; + client_body_buffer_size 256k; + client_max_body_size 100m; + large_client_header_buffers 4 8k; + send_timeout 30; + keepalive_timeout 60 60; + reset_timedout_connection on; + server_tokens off; + server_name_in_redirect off; + server_names_hash_max_size 512; + server_names_hash_bucket_size 512; + + + # Log format + log_format main '$remote_addr - $remote_user [$time_local] $request ' + '"$status" $body_bytes_sent "$http_referer" ' + '"$http_user_agent" "$http_x_forwarded_for"'; + log_format bytes '$body_bytes_sent'; + #access_log /var/log/nginx/access.log main; + access_log off; + + + # Mime settings + include /etc/nginx/mime.types; + default_type application/octet-stream; + + + # Compression + gzip on; + gzip_comp_level 9; + gzip_min_length 512; + gzip_buffers 8 64k; + gzip_types text/plain text/css text/javascript + application/x-javascript; + gzip_proxied any; + + + # Proxy settings + proxy_redirect off; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_pass_header Set-Cookie; + proxy_connect_timeout 90; + proxy_send_timeout 90; + proxy_read_timeout 90; + proxy_buffers 32 4k; + + + # Cloudflare https://www.cloudflare.com/ips + set_real_ip_from 199.27.128.0/21; + set_real_ip_from 173.245.48.0/20; + set_real_ip_from 103.21.244.0/22; + set_real_ip_from 103.22.200.0/22; + set_real_ip_from 103.31.4.0/22; + set_real_ip_from 141.101.64.0/18; + set_real_ip_from 108.162.192.0/18; + set_real_ip_from 190.93.240.0/20; + set_real_ip_from 188.114.96.0/20; + set_real_ip_from 197.234.240.0/22; + set_real_ip_from 198.41.128.0/17; + set_real_ip_from 162.158.0.0/15; + set_real_ip_from 104.16.0.0/12; + set_real_ip_from 172.64.0.0/13; + #set_real_ip_from 2400:cb00::/32; + #set_real_ip_from 2606:4700::/32; + #set_real_ip_from 2803:f800::/32; + #set_real_ip_from 2405:b500::/32; + #set_real_ip_from 2405:8100::/32; + real_ip_header CF-Connecting-IP; + + + # SSL PCI Compliance + ssl_session_cache shared:SSL:10m; + ssl_protocols TLSv1 TLSv1.1 TLSv1.2; + ssl_prefer_server_ciphers on; + ssl_ciphers "ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA:ECDHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES128-SHA256:DHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES256-GCM-SHA384:AES128-GCM-SHA256:AES256-SHA256:AES128-SHA256:AES256-SHA:AES128-SHA:DES-CBC3-SHA:HIGH:!aNULL:!eNULL:!EXPORT:!DES:!MD5:!PSK:!RC4"; + + + # Error pages + error_page 403 /error/403.html; + error_page 404 /error/404.html; + error_page 502 503 504 /error/50x.html; + + + # Cache + proxy_cache_path /var/cache/nginx levels=2 keys_zone=cache:10m inactive=60m max_size=512m; + proxy_cache_key "$host$request_uri $cookie_user"; + proxy_temp_path /var/cache/nginx/temp; + proxy_ignore_headers Expires Cache-Control; + proxy_cache_use_stale error timeout invalid_header http_502; + proxy_cache_valid any 3d; + + map $http_cookie $no_cache { + default 0; + ~SESS 1; + ~wordpress_logged_in 1; + } + + + # Wildcard include + include /etc/nginx/conf.d/*.conf; +} diff --git a/install/ubuntu/13.04/nginx/phpmyadmin.inc b/install/ubuntu/13.04/nginx/phpmyadmin.inc new file mode 100644 index 000000000..d70ca3e3c --- /dev/null +++ b/install/ubuntu/13.04/nginx/phpmyadmin.inc @@ -0,0 +1,15 @@ +location /phpmyadmin { + alias /usr/share/phpmyadmin/; + + location ~ /(libraries|setup) { + return 404; + } + + location ~ ^/phpmyadmin/(.*\.php)$ { + alias /usr/share/phpmyadmin/$1; + fastcgi_pass 127.0.0.1:9000; + fastcgi_index index.php; + include fastcgi_params; + fastcgi_param SCRIPT_FILENAME $request_filename; + } +} diff --git a/install/ubuntu/13.04/nginx/phppgadmin.inc b/install/ubuntu/13.04/nginx/phppgadmin.inc new file mode 100644 index 000000000..cd1e5806b --- /dev/null +++ b/install/ubuntu/13.04/nginx/phppgadmin.inc @@ -0,0 +1,11 @@ +location /phppgadmin { + alias /usr/share/phppgadmin/; + + location ~ ^/phppgadmin/(.*\.php)$ { + alias /usr/share/phppgadmin/$1; + fastcgi_pass 127.0.0.1:9000; + fastcgi_index index.php; + include fastcgi_params; + fastcgi_param SCRIPT_FILENAME $request_filename; + } +} diff --git a/install/ubuntu/13.04/nginx/status.conf b/install/ubuntu/13.04/nginx/status.conf new file mode 100644 index 000000000..c0bcd0691 --- /dev/null +++ b/install/ubuntu/13.04/nginx/status.conf @@ -0,0 +1,9 @@ +server { + listen 127.0.0.1:8084 default; + server_name _; + server_name_in_redirect off; + location / { + stub_status on; + access_log off; + } +} diff --git a/install/ubuntu/13.04/nginx/webmail.inc b/install/ubuntu/13.04/nginx/webmail.inc new file mode 100644 index 000000000..ad66895bc --- /dev/null +++ b/install/ubuntu/13.04/nginx/webmail.inc @@ -0,0 +1,15 @@ +location /webmail { + alias /var/lib/roundcube/; + + location ~ /(config|temp|logs) { + return 404; + } + + location ~ ^/webmail/(.*\.php)$ { + alias /var/lib/roundcube/$1; + fastcgi_pass 127.0.0.1:9000; + fastcgi_index index.php; + include fastcgi_params; + fastcgi_param SCRIPT_FILENAME $request_filename; + } +} diff --git a/install/ubuntu/13.04/packages.tar.gz b/install/ubuntu/13.04/packages.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..4b778dadce20a61f03a8ca920ec81c55a8730fee GIT binary patch literal 562 zcmV-20?qv&iwFRHoJ3Lp1MQYgkD5>vhFSY7+_9e37(#VaFxE7E(hXh3fdi2rFJZkFya3gX^b)n zVXSCG>M9q!r;?X63%1>^6fD25GP?9(Zs8i zm#eSAOO(kSvCYUG8}`JzlNGcp7>;dtR#6ZOYcoV)W|{76R22A_Q=gJo4AXSy6Mw(T z@QvYNS99i079ZTgdF&uH#Hm!H2Tkno>k1^mATb^lABoBo#r=lG9NGXU~REdk0(83B2vo&kr_ zAp~{{4=IqJS7Kl{UdaJ`lmmICl^~$|AizYY10B;!5Re`k^vG)ug3|w@mF?UAH~v$N z5%B*SfdB3Ik9DT%#Rp2&fAy{S9|r3<{gP~x+kO96-v30?!2fG-8UK&;KeGQw{$uw~ zsNXQZA^ut3x1l|*XixdCp}qF{wFdwI0000000000000000RC})0(q@EkpL(F05 diff --git a/install/ubuntu/13.04/pga/phppgadmin.conf b/install/ubuntu/13.04/pga/phppgadmin.conf new file mode 100644 index 000000000..f39247d6f --- /dev/null +++ b/install/ubuntu/13.04/pga/phppgadmin.conf @@ -0,0 +1,31 @@ +Alias /phppgadmin /usr/share/phppgadmin + + + +DirectoryIndex index.php +AllowOverride None + +order deny,allow +deny from all +allow from 127.0.0.0/255.0.0.0 ::1/128 +allow from all + + + php_flag magic_quotes_gpc Off + php_flag track_vars On + php_value include_path . + + + + + AddType application/x-httpd-php .php + Action application/x-httpd-php /cgi-bin/php + + + AddType application/x-httpd-php .php + Action application/x-httpd-php /cgi-bin/php + + + + + diff --git a/install/ubuntu/13.04/php5-fpm/www.conf b/install/ubuntu/13.04/php5-fpm/www.conf new file mode 100644 index 000000000..d046bceef --- /dev/null +++ b/install/ubuntu/13.04/php5-fpm/www.conf @@ -0,0 +1,10 @@ +[www] +listen = 127.0.0.1:9000 +listen.allowed_clients = 127.0.0.1 +user = www-data +group = www-data +pm = dynamic +pm.max_children = 50 +pm.start_servers = 5 +pm.min_spare_servers = 3 +pm.max_spare_servers = 35 diff --git a/install/ubuntu/13.04/pma/apache.conf b/install/ubuntu/13.04/pma/apache.conf new file mode 100644 index 000000000..2a8f69e25 --- /dev/null +++ b/install/ubuntu/13.04/pma/apache.conf @@ -0,0 +1,42 @@ +# phpMyAdmin default Apache configuration + +Alias /phpmyadmin /usr/share/phpmyadmin + + + Options FollowSymLinks + DirectoryIndex index.php + + + AddType application/x-httpd-php .php + + php_flag magic_quotes_gpc Off + php_flag track_vars On + php_flag register_globals Off + php_admin_flag allow_url_fopen Off + php_value include_path . + php_admin_value upload_tmp_dir /var/lib/phpmyadmin/tmp + php_admin_value open_basedir /usr/share/phpmyadmin/:/etc/phpmyadmin/:/var/lib/phpmyadmin/:/usr/share/php/php-gettext + + + + +# Authorize for setup + + + AuthType Basic + AuthName "phpMyAdmin Setup" + AuthUserFile /etc/phpmyadmin/htpasswd.setup + + Require valid-user + + +# Disallow web access to directories that don't need it + + Order Deny,Allow + Deny from All + + + Order Deny,Allow + Deny from All + + diff --git a/install/ubuntu/13.04/pma/config.inc.php b/install/ubuntu/13.04/pma/config.inc.php new file mode 100644 index 000000000..a643a065b --- /dev/null +++ b/install/ubuntu/13.04/pma/config.inc.php @@ -0,0 +1,146 @@ + + VRootEngine on + VRootAlias /etc/security/pam_env.conf etc/security/pam_env.conf +         + +AuthPAMConfig proftpd +AuthOrder mod_auth_pam.c* mod_auth_unix.c +UseReverseDNS off +User proftpd +Group nogroup +MaxInstances 20 +UseSendfile off +LogFormat default "%h %l %u %t \"%r\" %s %b" +LogFormat auth "%v [%P] %h %t \"%r\" %s" +ListOptions -a +RequireValidShell off +PassivePorts 12000 12100 + + + Umask 002 + IdentLookups off + AllowOverwrite yes + + AllowAll + + diff --git a/install/ubuntu/13.04/roundcube/apache.conf b/install/ubuntu/13.04/roundcube/apache.conf new file mode 100644 index 000000000..a0c87bcc6 --- /dev/null +++ b/install/ubuntu/13.04/roundcube/apache.conf @@ -0,0 +1,40 @@ +Alias /roundcube/program/js/tiny_mce/ /usr/share/tinymce/www/ +Alias /roundcube /var/lib/roundcube +Alias /webmail /var/lib/roundcube + +# Access to tinymce files + + Options Indexes MultiViews FollowSymLinks + AllowOverride None + Order allow,deny + allow from all + + + + Options +FollowSymLinks + # This is needed to parse /var/lib/roundcube/.htaccess. See its + # content before setting AllowOverride to None. + AllowOverride All + order allow,deny + allow from all + + +# Protecting basic directories: + + Options -FollowSymLinks + AllowOverride None + + + + Options -FollowSymLinks + AllowOverride None + Order allow,deny + Deny from all + + + + Options -FollowSymLinks + AllowOverride None + Order allow,deny + Deny from all + diff --git a/install/ubuntu/13.04/roundcube/config.inc.php b/install/ubuntu/13.04/roundcube/config.inc.php new file mode 100644 index 000000000..0c82b1bc1 --- /dev/null +++ b/install/ubuntu/13.04/roundcube/config.inc.php @@ -0,0 +1,33 @@ + diff --git a/install/ubuntu/13.04/roundcube/main.inc.php b/install/ubuntu/13.04/roundcube/main.inc.php new file mode 100644 index 000000000..97cdbf2df --- /dev/null +++ b/install/ubuntu/13.04/roundcube/main.inc.php @@ -0,0 +1,850 @@ +/sendmail or to syslog +$rcmail_config['smtp_log'] = true; + +// Log successful logins to /userlogins or to syslog +$rcmail_config['log_logins'] = false; + +// Log session authentication errors to /session or to syslog +$rcmail_config['log_session'] = false; + +// Log SQL queries to /sql or to syslog +$rcmail_config['sql_debug'] = false; + +// Log IMAP conversation to /imap or to syslog +$rcmail_config['imap_debug'] = false; + +// Log LDAP conversation to /ldap or to syslog +$rcmail_config['ldap_debug'] = false; + +// Log SMTP conversation to /smtp or to syslog +$rcmail_config['smtp_debug'] = false; + +// ---------------------------------- +// IMAP +// ---------------------------------- + +// the mail host chosen to perform the log-in +// leave blank to show a textbox at login, give a list of hosts +// to display a pulldown menu or set one host as string. +// To use SSL/TLS connection, enter hostname with prefix ssl:// or tls:// +// Supported replacement variables: +// %n - http hostname ($_SERVER['SERVER_NAME']) +// %d - domain (http hostname without the first part) +// %s - domain name after the '@' from e-mail address provided at login screen +// For example %n = mail.domain.tld, %d = domain.tld +$rcmail_config['default_host'] = 'localhost'; + +// TCP port used for IMAP connections +$rcmail_config['default_port'] = 143; + +// IMAP AUTH type (DIGEST-MD5, CRAM-MD5, LOGIN, PLAIN or empty to use +// best server supported one) +$rcmail_config['imap_auth_type'] = null; + +// If you know your imap's folder delimiter, you can specify it here. +// Otherwise it will be determined automatically +$rcmail_config['imap_delimiter'] = null; + +// If IMAP server doesn't support NAMESPACE extension, but you're +// using shared folders or personal root folder is non-empty, you'll need to +// set these options. All can be strings or arrays of strings. +// Folders need to be ended with directory separator, e.g. "INBOX." +// (special directory "~" is an exception to this rule) +// These can be used also to overwrite server's namespaces +$rcmail_config['imap_ns_personal'] = null; +$rcmail_config['imap_ns_other'] = null; +$rcmail_config['imap_ns_shared'] = null; + +// By default IMAP capabilities are readed after connection to IMAP server +// In some cases, e.g. when using IMAP proxy, there's a need to refresh the list +// after login. Set to True if you've got this case. +$rcmail_config['imap_force_caps'] = false; + +// By default list of subscribed folders is determined using LIST-EXTENDED +// extension if available. Some servers (dovecot 1.x) returns wrong results +// for shared namespaces in this case. http://trac.roundcube.net/ticket/1486225 +// Enable this option to force LSUB command usage instead. +$rcmail_config['imap_force_lsub'] = false; + +// Some server configurations (e.g. Courier) doesn't list folders in all namespaces +// Enable this option to force listing of folders in all namespaces +$rcmail_config['imap_force_ns'] = false; + +// IMAP connection timeout, in seconds. Default: 0 (no limit) +$rcmail_config['imap_timeout'] = 0; + +// Optional IMAP authentication identifier to be used as authorization proxy +$rcmail_config['imap_auth_cid'] = null; + +// Optional IMAP authentication password to be used for imap_auth_cid +$rcmail_config['imap_auth_pw'] = null; + +// Type of IMAP indexes cache. Supported values: 'db', 'apc' and 'memcache'. +$rcmail_config['imap_cache'] = null; + +// Enables messages cache. Only 'db' cache is supported. +$rcmail_config['messages_cache'] = false; + + +// ---------------------------------- +// SMTP +// ---------------------------------- + +// SMTP server host (for sending mails). +// To use SSL/TLS connection, enter hostname with prefix ssl:// or tls:// +// If left blank, the PHP mail() function is used +// Supported replacement variables: +// %h - user's IMAP hostname +// %n - http hostname ($_SERVER['SERVER_NAME']) +// %d - domain (http hostname without the first part) +// %z - IMAP domain (IMAP hostname without the first part) +// For example %n = mail.domain.tld, %d = domain.tld +$rcmail_config['smtp_server'] = ''; + +// SMTP port (default is 25; use 587 for STARTTLS or 465 for the +// deprecated SSL over SMTP (aka SMTPS)) +$rcmail_config['smtp_port'] = 25; + +// SMTP username (if required) if you use %u as the username Roundcube +// will use the current username for login +$rcmail_config['smtp_user'] = ''; + +// SMTP password (if required) if you use %p as the password Roundcube +// will use the current user's password for login +$rcmail_config['smtp_pass'] = ''; + +// SMTP AUTH type (DIGEST-MD5, CRAM-MD5, LOGIN, PLAIN or empty to use +// best server supported one) +$rcmail_config['smtp_auth_type'] = ''; + +// Optional SMTP authentication identifier to be used as authorization proxy +$rcmail_config['smtp_auth_cid'] = null; + +// Optional SMTP authentication password to be used for smtp_auth_cid +$rcmail_config['smtp_auth_pw'] = null; + +// SMTP HELO host +// Hostname to give to the remote server for SMTP 'HELO' or 'EHLO' messages +// Leave this blank and you will get the server variable 'server_name' or +// localhost if that isn't defined. +$rcmail_config['smtp_helo_host'] = ''; + +// SMTP connection timeout, in seconds. Default: 0 (no limit) +$rcmail_config['smtp_timeout'] = 0; + +// ---------------------------------- +// SYSTEM +// ---------------------------------- +include_once("/etc/roundcube/debian-db-roundcube.php"); + + +// THIS OPTION WILL ALLOW THE INSTALLER TO RUN AND CAN EXPOSE SENSITIVE CONFIG DATA. +// ONLY ENABLE IT IF YOU'RE REALLY SURE WHAT YOU'RE DOING! +$rcmail_config['enable_installer'] = false; + +// provide an URL where a user can get support for this Roundcube installation +// PLEASE DO NOT LINK TO THE ROUNDCUBE.NET WEBSITE HERE! +$rcmail_config['support_url'] = ''; + +// replace Roundcube logo with this image +// specify an URL relative to the document root of this Roundcube installation +$rcmail_config['skin_logo'] = null; + +// automatically create a new Roundcube user when log-in the first time. +// a new user will be created once the IMAP login succeeds. +// set to false if only registered users can use this service +$rcmail_config['auto_create_user'] = true; + +// use this folder to store log files (must be writeable for apache user) +// This is used by the 'file' log driver. +$rcmail_config['log_dir'] = '/var/log/roundcubemail/'; + +// use this folder to store temp files (must be writeable for apache user) +$rcmail_config['temp_dir'] = '/tmp'; + +// lifetime of message cache +// possible units: s, m, h, d, w +$rcmail_config['message_cache_lifetime'] = '10d'; + +// enforce connections over https +// with this option enabled, all non-secure connections will be redirected. +// set the port for the ssl connection as value of this option if it differs from the default 443 +$rcmail_config['force_https'] = false; + +// tell PHP that it should work as under secure connection +// even if it doesn't recognize it as secure ($_SERVER['HTTPS'] is not set) +// e.g. when you're running Roundcube behind a https proxy +// this option is mutually exclusive to 'force_https' and only either one of them should be set to true. +$rcmail_config['use_https'] = false; + +// Allow browser-autocompletion on login form. +// 0 - disabled, 1 - username and host only, 2 - username, host, password +$rcmail_config['login_autocomplete'] = 0; + +// Forces conversion of logins to lower case. +// 0 - disabled, 1 - only domain part, 2 - domain and local part. +// If users authentication is not case-sensitive this must be enabled. +// After enabling it all user records need to be updated, e.g. with query: +// UPDATE users SET username = LOWER(username); +$rcmail_config['login_lc'] = 0; + +// Includes should be interpreted as PHP files +$rcmail_config['skin_include_php'] = false; + +// display software version on login screen +$rcmail_config['display_version'] = false; + +// Session lifetime in minutes +// must be greater than 'keep_alive'/60 +$rcmail_config['session_lifetime'] = 10; + +// session domain: .example.org +$rcmail_config['session_domain'] = ''; + +// session name. Default: 'roundcube_sessid' +$rcmail_config['session_name'] = null; + +// Backend to use for session storage. Can either be 'db' (default) or 'memcache' +// If set to memcache, a list of servers need to be specified in 'memcache_hosts' +// Make sure the Memcache extension (http://pecl.php.net/package/memcache) version >= 2.0.0 is installed +$rcmail_config['session_storage'] = 'db'; + +// Use these hosts for accessing memcached +// Define any number of hosts in the form of hostname:port or unix:///path/to/sock.file +$rcmail_config['memcache_hosts'] = null; // e.g. array( 'localhost:11211', '192.168.1.12:11211', 'unix:///var/tmp/memcached.sock' ); + +// check client IP in session athorization +$rcmail_config['ip_check'] = false; + +// check referer of incoming requests +$rcmail_config['referer_check'] = false; + +// X-Frame-Options HTTP header value sent to prevent from Clickjacking. +// Possible values: sameorigin|deny. Set to false in order to disable sending them +$rcmail_config['x_frame_options'] = 'sameorigin'; + +// this key is used to encrypt the users imap password which is stored +// in the session record (and the client cookie if remember password is enabled). +// please provide a string of exactly 24 chars. +$rcmail_config['des_key'] = 'vtIOjLZo9kffJoqzpSbm5r1r'; + +// Automatically add this domain to user names for login +// Only for IMAP servers that require full e-mail addresses for login +// Specify an array with 'host' => 'domain' values to support multiple hosts +// Supported replacement variables: +// %h - user's IMAP hostname +// %n - http hostname ($_SERVER['SERVER_NAME']) +// %d - domain (http hostname without the first part) +// %z - IMAP domain (IMAP hostname without the first part) +// For example %n = mail.domain.tld, %d = domain.tld +$rcmail_config['username_domain'] = ''; + +// This domain will be used to form e-mail addresses of new users +// Specify an array with 'host' => 'domain' values to support multiple hosts +// Supported replacement variables: +// %h - user's IMAP hostname +// %n - http hostname ($_SERVER['SERVER_NAME']) +// %d - domain (http hostname without the first part) +// %z - IMAP domain (IMAP hostname without the first part) +// For example %n = mail.domain.tld, %d = domain.tld +$rcmail_config['mail_domain'] = ''; + +// Password charset. +// Use it if your authentication backend doesn't support UTF-8. +// Defaults to ISO-8859-1 for backward compatibility +$rcmail_config['password_charset'] = 'ISO-8859-1'; + +// How many seconds must pass between emails sent by a user +$rcmail_config['sendmail_delay'] = 0; + +// Maximum number of recipients per message. Default: 0 (no limit) +$rcmail_config['max_recipients'] = 0; + +// Maximum allowednumber of members of an address group. Default: 0 (no limit) +// If 'max_recipients' is set this value should be less or equal +$rcmail_config['max_group_members'] = 0; + +// add this user-agent to message headers when sending +$rcmail_config['useragent'] = 'Roundcube Webmail/'.RCMAIL_VERSION; + +// use this name to compose page titles +$rcmail_config['product_name'] = 'Roundcube Webmail'; + +// try to load host-specific configuration +// see http://trac.roundcube.net/wiki/Howto_Config for more details +$rcmail_config['include_host_config'] = false; + +// path to a text file which will be added to each sent message +// paths are relative to the Roundcube root folder +$rcmail_config['generic_message_footer'] = ''; + +// path to a text file which will be added to each sent HTML message +// paths are relative to the Roundcube root folder +$rcmail_config['generic_message_footer_html'] = ''; + +// add a received header to outgoing mails containing the creators IP and hostname +$rcmail_config['http_received_header'] = false; + +// Whether or not to encrypt the IP address and the host name +// these could, in some circles, be considered as sensitive information; +// however, for the administrator, these could be invaluable help +// when tracking down issues. +$rcmail_config['http_received_header_encrypt'] = false; + +// This string is used as a delimiter for message headers when sending +// a message via mail() function. Leave empty for auto-detection +$rcmail_config['mail_header_delimiter'] = NULL; + +// number of chars allowed for line when wrapping text. +// text wrapping is done when composing/sending messages +$rcmail_config['line_length'] = 72; + +// send plaintext messages as format=flowed +$rcmail_config['send_format_flowed'] = true; + +// don't allow these settings to be overriden by the user +$rcmail_config['dont_override'] = array(); + +// Set identities access level: +// 0 - many identities with possibility to edit all params +// 1 - many identities with possibility to edit all params but not email address +// 2 - one identity with possibility to edit all params +// 3 - one identity with possibility to edit all params but not email address +$rcmail_config['identities_level'] = 0; + +// Mimetypes supported by the browser. +// attachments of these types will open in a preview window +// either a comma-separated list or an array: 'text/plain,text/html,text/xml,image/jpeg,image/gif,image/png,application/pdf' +$rcmail_config['client_mimetypes'] = null; # null == default + +// mime magic database +$rcmail_config['mime_magic'] = null; + +// path to imagemagick identify binary +$rcmail_config['im_identify_path'] = null; + +// path to imagemagick convert binary +$rcmail_config['im_convert_path'] = null; + +// maximum size of uploaded contact photos in pixel +$rcmail_config['contact_photo_size'] = 160; + +// Enable DNS checking for e-mail address validation +$rcmail_config['email_dns_check'] = false; + +// ---------------------------------- +// PLUGINS +// ---------------------------------- + +// List of active plugins (in plugins/ directory) +$rcmail_config['plugins'] = array('password'); + +// ---------------------------------- +// USER INTERFACE +// ---------------------------------- + +// default messages sort column. Use empty value for default server's sorting, +// or 'arrival', 'date', 'subject', 'from', 'to', 'fromto', 'size', 'cc' +$rcmail_config['message_sort_col'] = ''; + +// default messages sort order +$rcmail_config['message_sort_order'] = 'DESC'; + +// These cols are shown in the message list. Available cols are: +// subject, from, to, fromto, cc, replyto, date, size, status, flag, attachment, 'priority' +$rcmail_config['list_cols'] = array('subject', 'status', 'fromto', 'date', 'size', 'flag', 'attachment'); + +// the default locale setting (leave empty for auto-detection) +// RFC1766 formatted language name like en_US, de_DE, de_CH, fr_FR, pt_BR +$rcmail_config['language'] = null; + +// use this format for date display (date or strftime format) +$rcmail_config['date_format'] = 'Y-m-d'; + +// give this choice of date formats to the user to select from +$rcmail_config['date_formats'] = array('Y-m-d', 'd-m-Y', 'Y/m/d', 'm/d/Y', 'd/m/Y', 'd.m.Y', 'j.n.Y'); + +// use this format for time display (date or strftime format) +$rcmail_config['time_format'] = 'H:i'; + +// give this choice of time formats to the user to select from +$rcmail_config['time_formats'] = array('G:i', 'H:i', 'g:i a', 'h:i A'); + +// use this format for short date display (derived from date_format and time_format) +$rcmail_config['date_short'] = 'D H:i'; + +// use this format for detailed date/time formatting (derived from date_format and time_format) +$rcmail_config['date_long'] = 'Y-m-d H:i'; + +// store draft message is this mailbox +// leave blank if draft messages should not be stored +// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP) +$rcmail_config['drafts_mbox'] = 'Drafts'; + +// store spam messages in this mailbox +// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP) +$rcmail_config['junk_mbox'] = 'Spam'; + +// store sent message is this mailbox +// leave blank if sent messages should not be stored +// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP) +$rcmail_config['sent_mbox'] = 'Sent'; + +// move messages to this folder when deleting them +// leave blank if they should be deleted directly +// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP) +$rcmail_config['trash_mbox'] = 'Trash'; + +// display these folders separately in the mailbox list. +// these folders will also be displayed with localized names +// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP) +$rcmail_config['default_folders'] = array('INBOX', 'Drafts', 'Sent', 'Spam', 'Trash'); +$rcmail_config['default_imap_folders'] = array('INBOX', 'Drafts', 'Sent', 'Spam', 'Trash'); + +// automatically create the above listed default folders on first login +$rcmail_config['create_default_folders'] = true; + +// protect the default folders from renames, deletes, and subscription changes +$rcmail_config['protect_default_folders'] = true; + +// if in your system 0 quota means no limit set this option to true +$rcmail_config['quota_zero_as_unlimited'] = false; + +// Make use of the built-in spell checker. It is based on GoogieSpell. +// Since Google only accepts connections over https your PHP installatation +// requires to be compiled with Open SSL support +$rcmail_config['enable_spellcheck'] = true; + +// Enables spellchecker exceptions dictionary. +// Setting it to 'shared' will make the dictionary shared by all users. +$rcmail_config['spellcheck_dictionary'] = false; + +// Set the spell checking engine. 'googie' is the default. 'pspell' is also available, +// but requires the Pspell extensions. When using Nox Spell Server, also set 'googie' here. +$rcmail_config['spellcheck_engine'] = 'googie'; + +// For a locally installed Nox Spell Server, please specify the URI to call it. +// Get Nox Spell Server from http://orangoo.com/labs/?page_id=72 +// Leave empty to use the Google spell checking service, what means +// that the message content will be sent to Google in order to check spelling +$rcmail_config['spellcheck_uri'] = ''; + +// These languages can be selected for spell checking. +// Configure as a PHP style hash array: array('en'=>'English', 'de'=>'Deutsch'); +// Leave empty for default set of available language. +$rcmail_config['spellcheck_languages'] = NULL; + +// Makes that words with all letters capitalized will be ignored (e.g. GOOGLE) +$rcmail_config['spellcheck_ignore_caps'] = false; + +// Makes that words with numbers will be ignored (e.g. g00gle) +$rcmail_config['spellcheck_ignore_nums'] = false; + +// Makes that words with symbols will be ignored (e.g. g@@gle) +$rcmail_config['spellcheck_ignore_syms'] = false; + +// Use this char/string to separate recipients when composing a new message +$rcmail_config['recipients_separator'] = ','; + +// don't let users set pagesize to more than this value if set +$rcmail_config['max_pagesize'] = 200; + +// Minimal value of user's 'keep_alive' setting (in seconds) +// Must be less than 'session_lifetime' +$rcmail_config['min_keep_alive'] = 60; + +// Enables files upload indicator. Requires APC installed and enabled apc.rfc1867 option. +// By default refresh time is set to 1 second. You can set this value to true +// or any integer value indicating number of seconds. +$rcmail_config['upload_progress'] = false; + +// Specifies for how many seconds the Undo button will be available +// after object delete action. Currently used with supporting address book sources. +// Setting it to 0, disables the feature. +$rcmail_config['undo_timeout'] = 0; + +// ---------------------------------- +// ADDRESSBOOK SETTINGS +// ---------------------------------- + +// This indicates which type of address book to use. Possible choises: +// 'sql' (default) and 'ldap'. +// If set to 'ldap' then it will look at using the first writable LDAP +// address book as the primary address book and it will not display the +// SQL address book in the 'Address Book' view. +$rcmail_config['address_book_type'] = 'sql'; + +// In order to enable public ldap search, configure an array like the Verisign +// example further below. if you would like to test, simply uncomment the example. +// Array key must contain only safe characters, ie. a-zA-Z0-9_ +$rcmail_config['ldap_public'] = array(); + +// If you are going to use LDAP for individual address books, you will need to +// set 'user_specific' to true and use the variables to generate the appropriate DNs to access it. +// +// The recommended directory structure for LDAP is to store all the address book entries +// under the users main entry, e.g.: +// +// o=root +// ou=people +// uid=user@domain +// mail=contact@contactdomain +// +// So the base_dn would be uid=%fu,ou=people,o=root +// The bind_dn would be the same as based_dn or some super user login. +/* + * example config for Verisign directory + * +$rcmail_config['ldap_public']['Verisign'] = array( + 'name' => 'Verisign.com', + // Replacement variables supported in host names: + // %h - user's IMAP hostname + // %n - http hostname ($_SERVER['SERVER_NAME']) + // %d - domain (http hostname without the first part) + // %z - IMAP domain (IMAP hostname without the first part) + // For example %n = mail.domain.tld, %d = domain.tld + 'hosts' => array('directory.verisign.com'), + 'port' => 389, + 'use_tls' => false, + 'ldap_version' => 3, // using LDAPv3 + 'user_specific' => false, // If true the base_dn, bind_dn and bind_pass default to the user's IMAP login. + // %fu - The full username provided, assumes the username is an email + // address, uses the username_domain value if not an email address. + // %u - The username prior to the '@'. + // %d - The domain name after the '@'. + // %dc - The domain name hierarchal string e.g. "dc=test,dc=domain,dc=com" + // %dn - DN found by ldap search when search_filter/search_base_dn are used + 'base_dn' => '', + 'bind_dn' => '', + 'bind_pass' => '', + // It's possible to bind for an individual address book + // The login name is used to search for the DN to bind with + 'search_base_dn' => '', + 'search_filter' => '', // e.g. '(&(objectClass=posixAccount)(uid=%u))' + // DN and password to bind as before searching for bind DN, if anonymous search is not allowed + 'search_bind_dn' => '', + 'search_bind_pw' => '', + // Default for %dn variable if search doesn't return DN value + 'search_dn_default' => '', + // Optional authentication identifier to be used as SASL authorization proxy + // bind_dn need to be empty + 'auth_cid' => '', + // SASL authentication method (for proxy auth), e.g. DIGEST-MD5 + 'auth_method' => '', + // Indicates if the addressbook shall be hidden from the list. + // With this option enabled you can still search/view contacts. + 'hidden' => false, + // Indicates if the addressbook shall not list contacts but only allows searching. + 'searchonly' => false, + // Indicates if we can write to the LDAP directory or not. + // If writable is true then these fields need to be populated: + // LDAP_Object_Classes, required_fields, LDAP_rdn + 'writable' => false, + // To create a new contact these are the object classes to specify + // (or any other classes you wish to use). + 'LDAP_Object_Classes' => array('top', 'inetOrgPerson'), + // The RDN field that is used for new entries, this field needs + // to be one of the search_fields, the base of base_dn is appended + // to the RDN to insert into the LDAP directory. + 'LDAP_rdn' => 'cn', + // The required fields needed to build a new contact as required by + // the object classes (can include additional fields not required by the object classes). + 'required_fields' => array('cn', 'sn', 'mail'), + 'search_fields' => array('mail', 'cn'), // fields to search in + // mapping of contact fields to directory attributes + // for every attribute one can specify the number of values (limit) allowed. + // default is 1, a wildcard * means unlimited + 'fieldmap' => array( + // Roundcube => LDAP:limit + 'name' => 'cn', + 'surname' => 'sn', + 'firstname' => 'givenName', + 'title' => 'title', + 'email' => 'mail:*', + 'phone:home' => 'homePhone', + 'phone:work' => 'telephoneNumber', + 'phone:mobile' => 'mobile', + 'phone:pager' => 'pager', + 'street' => 'street', + 'zipcode' => 'postalCode', + 'region' => 'st', + 'locality' => 'l', +// if you uncomment country, you need to modify 'sub_fields' above +// 'country' => 'c', + 'department' => 'departmentNumber', + 'notes' => 'description', +// these currently don't work: +// 'phone:workfax' => 'facsimileTelephoneNumber', +// 'photo' => 'jpegPhoto', +// 'organization' => 'o', +// 'manager' => 'manager', +// 'assistant' => 'secretary', + ), + // Map of contact sub-objects (attribute name => objectClass(es)), e.g. 'c' => 'country' + 'sub_fields' => array(), + 'sort' => 'cn', // The field to sort the listing by. + 'scope' => 'sub', // search mode: sub|base|list + 'filter' => '(objectClass=inetOrgPerson)', // used for basic listing (if not empty) and will be &'d with search queries. example: status=act + 'fuzzy_search' => true, // server allows wildcard search + 'vlv' => false, // Enable Virtual List View to more efficiently fetch paginated data (if server supports it) + 'numsub_filter' => '(objectClass=organizationalUnit)', // with VLV, we also use numSubOrdinates to query the total number of records. Set this filter to get all numSubOrdinates attributes for counting + 'sizelimit' => '0', // Enables you to limit the count of entries fetched. Setting this to 0 means no limit. + 'timelimit' => '0', // Sets the number of seconds how long is spend on the search. Setting this to 0 means no limit. + 'referrals' => true|false, // Sets the LDAP_OPT_REFERRALS option. Mostly used in multi-domain Active Directory setups + + // definition for contact groups (uncomment if no groups are supported) + // for the groups base_dn, the user replacements %fu, %u, $d and %dc work as for base_dn (see above) + // if the groups base_dn is empty, the contact base_dn is used for the groups as well + // -> in this case, assure that groups and contacts are separated due to the concernig filters! + 'groups' => array( + 'base_dn' => '', + 'scope' => 'sub', // search mode: sub|base|list + 'filter' => '(objectClass=groupOfNames)', + 'object_classes' => array("top", "groupOfNames"), + 'member_attr' => 'member', // name of the member attribute, e.g. uniqueMember + 'name_attr' => 'cn', // attribute to be used as group name + ), +); +*/ + +// An ordered array of the ids of the addressbooks that should be searched +// when populating address autocomplete fields server-side. ex: array('sql','Verisign'); +$rcmail_config['autocomplete_addressbooks'] = array('sql'); + +// The minimum number of characters required to be typed in an autocomplete field +// before address books will be searched. Most useful for LDAP directories that +// may need to do lengthy results building given overly-broad searches +$rcmail_config['autocomplete_min_length'] = 1; + +// Number of parallel autocomplete requests. +// If there's more than one address book, n parallel (async) requests will be created, +// where each request will search in one address book. By default (0), all address +// books are searched in one request. +$rcmail_config['autocomplete_threads'] = 0; + +// Max. numer of entries in autocomplete popup. Default: 15. +$rcmail_config['autocomplete_max'] = 15; + +// show address fields in this order +// available placeholders: {street}, {locality}, {zipcode}, {country}, {region} +$rcmail_config['address_template'] = '{street}
        {locality} {zipcode}
        {country} {region}'; + +// Matching mode for addressbook search (including autocompletion) +// 0 - partial (*abc*), default +// 1 - strict (abc) +// 2 - prefix (abc*) +// Note: For LDAP sources fuzzy_search must be enabled to use 'partial' or 'prefix' mode +$rcmail_config['addressbook_search_mode'] = 0; + +// ---------------------------------- +// USER PREFERENCES +// ---------------------------------- + +// Use this charset as fallback for message decoding +//$rcmail_config['default_charset'] = 'ISO-8859-1'; +$rcmail_config['default_charset'] = 'UTF-8'; + +// skin name: folder from skins/ +$rcmail_config['skin'] = 'larry'; + +// show up to X items in messages list view +$rcmail_config['mail_pagesize'] = 50; + +// show up to X items in contacts list view +$rcmail_config['addressbook_pagesize'] = 50; + +// sort contacts by this col (preferably either one of name, firstname, surname) +$rcmail_config['addressbook_sort_col'] = 'surname'; + +// the way how contact names are displayed in the list +// 0: display name +// 1: (prefix) firstname middlename surname (suffix) +// 2: (prefix) surname firstname middlename (suffix) +// 3: (prefix) surname, firstname middlename (suffix) +$rcmail_config['addressbook_name_listing'] = 0; + +// use this timezone to display date/time +// valid timezone identifers are listed here: php.net/manual/en/timezones.php +// 'auto' will use the browser's timezone settings +$rcmail_config['timezone'] = 'auto'; + +// prefer displaying HTML messages +$rcmail_config['prefer_html'] = true; + +// display remote inline images +// 0 - Never, always ask +// 1 - Ask if sender is not in address book +// 2 - Always show inline images +$rcmail_config['show_images'] = 0; + +// compose html formatted messages by default +// 0 - never, 1 - always, 2 - on reply to HTML message only +$rcmail_config['htmleditor'] = 0; + +// show pretty dates as standard +$rcmail_config['prettydate'] = true; + +// save compose message every 300 seconds (5min) +$rcmail_config['draft_autosave'] = 300; + +// default setting if preview pane is enabled +$rcmail_config['preview_pane'] = false; + +// Mark as read when viewed in preview pane (delay in seconds) +// Set to -1 if messages in preview pane should not be marked as read +$rcmail_config['preview_pane_mark_read'] = 0; + +// Clear Trash on logout +$rcmail_config['logout_purge'] = false; + +// Compact INBOX on logout +$rcmail_config['logout_expunge'] = false; + +// Display attached images below the message body +$rcmail_config['inline_images'] = true; + +// Encoding of long/non-ascii attachment names: +// 0 - Full RFC 2231 compatible +// 1 - RFC 2047 for 'name' and RFC 2231 for 'filename' parameter (Thunderbird's default) +// 2 - Full 2047 compatible +$rcmail_config['mime_param_folding'] = 1; + +// Set true if deleted messages should not be displayed +// This will make the application run slower +$rcmail_config['skip_deleted'] = false; + +// Set true to Mark deleted messages as read as well as deleted +// False means that a message's read status is not affected by marking it as deleted +$rcmail_config['read_when_deleted'] = true; + +// Set to true to never delete messages immediately +// Use 'Purge' to remove messages marked as deleted +$rcmail_config['flag_for_deletion'] = false; + +// Default interval for keep-alive/check-recent requests (in seconds) +// Must be greater than or equal to 'min_keep_alive' and less than 'session_lifetime' +$rcmail_config['keep_alive'] = 60; + +// If true all folders will be checked for recent messages +$rcmail_config['check_all_folders'] = false; + +// If true, after message delete/move, the next message will be displayed +$rcmail_config['display_next'] = false; + +// 0 - Do not expand threads +// 1 - Expand all threads automatically +// 2 - Expand only threads with unread messages +$rcmail_config['autoexpand_threads'] = 0; + +// When replying place cursor above original message (top posting) +$rcmail_config['top_posting'] = false; + +// When replying strip original signature from message +$rcmail_config['strip_existing_sig'] = true; + +// Show signature: +// 0 - Never +// 1 - Always +// 2 - New messages only +// 3 - Forwards and Replies only +$rcmail_config['show_sig'] = 1; + +// When replying or forwarding place sender's signature above existing message +$rcmail_config['sig_above'] = false; + +// Use MIME encoding (quoted-printable) for 8bit characters in message body +$rcmail_config['force_7bit'] = false; + +// Defaults of the search field configuration. +// The array can contain a per-folder list of header fields which should be considered when searching +// The entry with key '*' stands for all folders which do not have a specific list set. +// Please note that folder names should to be in sync with $rcmail_config['default_folders'] +$rcmail_config['search_mods'] = null; // Example: array('*' => array('subject'=>1, 'from'=>1), 'Sent' => array('subject'=>1, 'to'=>1)); + +// Defaults of the addressbook search field configuration. +$rcmail_config['addressbook_search_mods'] = null; // Example: array('name'=>1, 'firstname'=>1, 'surname'=>1, 'email'=>1, '*'=>1); + +// 'Delete always' +// This setting reflects if mail should be always deleted +// when moving to Trash fails. This is necessary in some setups +// when user is over quota and Trash is included in the quota. +$rcmail_config['delete_always'] = false; + +// Directly delete messages in Junk instead of moving to Trash +$rcmail_config['delete_junk'] = true; + +// Behavior if a received message requests a message delivery notification (read receipt) +// 0 = ask the user, 1 = send automatically, 2 = ignore (never send or ask) +// 3 = send automatically if sender is in addressbook, otherwise ask the user +// 4 = send automatically if sender is in addressbook, otherwise ignore +$rcmail_config['mdn_requests'] = 0; + +// Return receipt checkbox default state +$rcmail_config['mdn_default'] = 0; + +// Delivery Status Notification checkbox default state +$rcmail_config['dsn_default'] = 0; + +// Place replies in the folder of the message being replied to +$rcmail_config['reply_same_folder'] = false; + +// Sets default mode of Forward feature to "forward as attachment" +$rcmail_config['forward_attachment'] = false; + +// Defines address book (internal index) to which new contacts will be added +// By default it is the first writeable addressbook. +// Note: Use '0' for built-in address book. +$rcmail_config['default_addressbook'] = null; + +// Enables spell checking before sending a message. +$rcmail_config['spellcheck_before_send'] = false; + +// Skip alternative email addresses in autocompletion (show one address per contact) +$rcmail_config['autocomplete_single'] = false; + +// Default font for composed HTML message. +// Supported values: Andale Mono, Arial, Arial Black, Book Antiqua, Courier New, +// Georgia, Helvetica, Impact, Tahoma, Terminal, Times New Roman, Trebuchet MS, Verdana +$rcmail_config['default_font'] = ''; + +// end of config file diff --git a/install/ubuntu/13.04/roundcube/vesta.php b/install/ubuntu/13.04/roundcube/vesta.php new file mode 100644 index 000000000..8fb202a44 --- /dev/null +++ b/install/ubuntu/13.04/roundcube/vesta.php @@ -0,0 +1,62 @@ + + */ + + function password_save($curpass, $passwd) + { + $rcmail = rcmail::get_instance(); + $vesta_host = $rcmail->config->get('password_vesta_host'); + + if (empty($vesta_host)) + { + $vesta_host = 'localhost'; + } + + $vesta_port = $rcmail->config->get('password_vesta_port'); + if (empty($vesta_port)) + { + $vesta_port = '8083'; + } + + $postvars = array( + 'email' => $_SESSION['username'], + 'password' => $curpass, + 'new' => $passwd + ); + + $postdata = http_build_query($postvars); + + $send = 'POST /reset/mail/ HTTP/1.1' . PHP_EOL; + $send .= 'Host: ' . $vesta_host . PHP_EOL; + $send .= 'User-Agent: PHP Script' . PHP_EOL; + $send .= 'Content-length: ' . strlen($postdata) . PHP_EOL; + $send .= 'Content-type: application/x-www-form-urlencoded' . PHP_EOL; + $send .= 'Connection: close' . PHP_EOL; + $send .= PHP_EOL; + $send .= $postdata . PHP_EOL . PHP_EOL; + + $fp = fsockopen('ssl://' . $vesta_host, $vesta_port); + fputs($fp, $send); + $result = fread($fp, 2048); + fclose($fp); + + $fp = fopen("/tmp/roundcube.log", 'w'); + fwrite($fp, "test ok"); + fwrite($fp, "\n"); + fclose($fp); + + + if(strpos($result, 'ok') && !strpos($result, 'error')) + { + return PASSWORD_SUCCESS; + } + else { + return PASSWORD_ERROR; + } + + } diff --git a/install/ubuntu/13.04/sudo/admin b/install/ubuntu/13.04/sudo/admin new file mode 100644 index 000000000..47e16098c --- /dev/null +++ b/install/ubuntu/13.04/sudo/admin @@ -0,0 +1,7 @@ +# Created by vesta installer +Defaults env_keep="VESTA" +Defaults:admin !syslog +Defaults:admin !requiretty + +admin ALL=(ALL) ALL +admin ALL=NOPASSWD:/usr/local/vesta/bin/* diff --git a/install/ubuntu/13.04/templates.tar.gz b/install/ubuntu/13.04/templates.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..ce385d269736561780cb42d07b447572cebc7831 GIT binary patch literal 12935 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 + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %sdocroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + #SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + AllowOverride All + SSLRequireSSL + Options +Includes -Indexes +ExecCGI + php_admin_value open_basedir %docroot% + + + AllowOverride All + + SSLEngine on + SSLVerifyClient none + SSLCertificateFile %ssl_crt% + SSLCertificateKeyFile %ssl_key% + %ssl_ca_str%SSLCertificateChainFile %ssl_ca% + + + RMode config + RUidGid %user% %group% + RGroups www-data + + + AssignUserID %user% %group% + + + IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* + + + diff --git a/install/ubuntu/13.04/templates/web/apache2/basedir.tpl b/install/ubuntu/13.04/templates/web/apache2/basedir.tpl new file mode 100755 index 000000000..75daf0e10 --- /dev/null +++ b/install/ubuntu/13.04/templates/web/apache2/basedir.tpl @@ -0,0 +1,35 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %docroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + #SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + AllowOverride All + Options +Includes -Indexes +ExecCGI + php_admin_value open_basedir %docroot% + + + AllowOverride All + + + + RMode config + RUidGid %user% %group% + RGroups www-data + + + AssignUserID %user% %group% + + + IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + + + diff --git a/install/ubuntu/13.04/templates/web/apache2/default.stpl b/install/ubuntu/13.04/templates/web/apache2/default.stpl new file mode 100755 index 000000000..e884a95b9 --- /dev/null +++ b/install/ubuntu/13.04/templates/web/apache2/default.stpl @@ -0,0 +1,40 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %sdocroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + #SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + AllowOverride All + SSLRequireSSL + Options +Includes -Indexes +ExecCGI + + + AllowOverride All + + SSLEngine on + SSLVerifyClient none + SSLCertificateFile %ssl_crt% + SSLCertificateKeyFile %ssl_key% + %ssl_ca_str%SSLCertificateChainFile %ssl_ca% + + + RMode config + RUidGid %user% %group% + RGroups www-data + + + AssignUserID %user% %group% + + + IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* + + + diff --git a/install/ubuntu/13.04/templates/web/apache2/default.tpl b/install/ubuntu/13.04/templates/web/apache2/default.tpl new file mode 100755 index 000000000..073724ce0 --- /dev/null +++ b/install/ubuntu/13.04/templates/web/apache2/default.tpl @@ -0,0 +1,34 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %docroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + #SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + AllowOverride All + Options +Includes -Indexes +ExecCGI + + + AllowOverride All + + + + RMode config + RUidGid %user% %group% + RGroups www-data + + + AssignUserID %user% %group% + + + IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + + + diff --git a/install/ubuntu/13.04/templates/web/apache2/hosting.stpl b/install/ubuntu/13.04/templates/web/apache2/hosting.stpl new file mode 100755 index 000000000..7a5d7787f --- /dev/null +++ b/install/ubuntu/13.04/templates/web/apache2/hosting.stpl @@ -0,0 +1,49 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %sdocroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + #SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + AllowOverride All + SSLRequireSSL + Options +Includes -Indexes +ExecCGI + php_admin_value upload_tmp_dir %home%/%user%/tmp + php_admin_value upload_max_filesize 10M + php_admin_value max_execution_time 20 + php_admin_value post_max_size 8M + php_admin_value memory_limit 32M + php_admin_flag mysql.allow_persistent off + php_admin_flag safe_mode off + php_admin_value session.save_path %home%/%user%/tmp + php_admin_value sendmail_path '/usr/sbin/sendmail -t -i -f %email%' + + + AllowOverride All + + php_admin_value open_basedir %home%/%user%/web:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpMyAdmin:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcubemail:/etc/roundcube:/var/lib/roundcube + SSLEngine on + SSLVerifyClient none + SSLCertificateFile %ssl_crt% + SSLCertificateKeyFile %ssl_key% + %ssl_ca_str%SSLCertificateChainFile %ssl_ca% + + RMode config + RUidGid %user% %group% + RGroups www-data + + + AssignUserID %user% %group% + + + IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* + + + diff --git a/install/ubuntu/13.04/templates/web/apache2/hosting.tpl b/install/ubuntu/13.04/templates/web/apache2/hosting.tpl new file mode 100755 index 000000000..ab844dc74 --- /dev/null +++ b/install/ubuntu/13.04/templates/web/apache2/hosting.tpl @@ -0,0 +1,43 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %docroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + #SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + AllowOverride All + Options +Includes -Indexes +ExecCGI + php_admin_value upload_tmp_dir %home%/%user%/tmp + php_admin_value upload_max_filesize 10M + php_admin_value max_execution_time 20 + php_admin_value post_max_size 8M + php_admin_value memory_limit 32M + php_admin_flag mysql.allow_persistent off + php_admin_flag safe_mode off + php_admin_value session.save_path %home%/%user%/tmp + php_admin_value sendmail_path '/usr/sbin/sendmail -t -i -f %email%' + + + AllowOverride All + + php_admin_value open_basedir %home%/%user%/web:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpMyAdmin:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcubemail:/etc/roundcube:/var/lib/roundcube + + RMode config + RUidGid %user% %group% + RGroups www-data + + + AssignUserID %user% %group% + + + IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + + + diff --git a/install/ubuntu/13.04/templates/web/apache2/phpcgi.sh b/install/ubuntu/13.04/templates/web/apache2/phpcgi.sh new file mode 100755 index 000000000..6565e103d --- /dev/null +++ b/install/ubuntu/13.04/templates/web/apache2/phpcgi.sh @@ -0,0 +1,16 @@ +#!/bin/bash +# Adding php wrapper +user="$1" +domain="$2" +ip="$3" +home_dir="$4" +docroot="$5" + +wrapper_script='#!/usr/bin/php-cgi -cphp5-cgi.ini' +wrapper_file="$home_dir/$user/web/$domain/cgi-bin/php" + +echo "$wrapper_script" > $wrapper_file +chown $user:$user $wrapper_file +chmod -f 751 $wrapper_file + +exit 0 diff --git a/install/ubuntu/13.04/templates/web/apache2/phpcgi.stpl b/install/ubuntu/13.04/templates/web/apache2/phpcgi.stpl new file mode 100755 index 000000000..aa5137308 --- /dev/null +++ b/install/ubuntu/13.04/templates/web/apache2/phpcgi.stpl @@ -0,0 +1,35 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %sdocroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + SSLRequireSSL + AllowOverride All + Options +Includes -Indexes +ExecCGI + Action phpcgi-script /cgi-bin/php + + SetHandler phpcgi-script + + + + AllowOverride All + + SSLEngine on + SSLVerifyClient none + SSLCertificateFile %ssl_crt% + SSLCertificateKeyFile %ssl_key% + %ssl_ca_str%SSLCertificateChainFile %ssl_ca% + + IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* + + + diff --git a/install/ubuntu/13.04/templates/web/apache2/phpcgi.tpl b/install/ubuntu/13.04/templates/web/apache2/phpcgi.tpl new file mode 100755 index 000000000..a05ff252d --- /dev/null +++ b/install/ubuntu/13.04/templates/web/apache2/phpcgi.tpl @@ -0,0 +1,28 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %docroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + AllowOverride All + Options +Includes -Indexes +ExecCGI + Action phpcgi-script /cgi-bin/php + + SetHandler phpcgi-script + + + + AllowOverride All + + IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + + + diff --git a/install/ubuntu/13.04/templates/web/apache2/phpfcgid.sh b/install/ubuntu/13.04/templates/web/apache2/phpfcgid.sh new file mode 100755 index 000000000..e80582492 --- /dev/null +++ b/install/ubuntu/13.04/templates/web/apache2/phpfcgid.sh @@ -0,0 +1,22 @@ +#!/bin/bash +# Adding php wrapper +user="$1" +domain="$2" +ip="$3" +home_dir="$4" +docroot="$5" + +wrapper_script="#!/bin/sh +PHPRC=/usr/local/lib +export PHPRC +export PHP_FCGI_MAX_REQUESTS=1000 +export PHP_FCGI_CHILDREN=20 +exec /usr/bin/php-cgi +" +wrapper_file="$home_dir/$user/web/$domain/cgi-bin/fcgi-starter" + +echo "$wrapper_script" > $wrapper_file +chown $user:$user $wrapper_file +chmod -f 751 $wrapper_file + +exit 0 diff --git a/install/ubuntu/13.04/templates/web/apache2/phpfcgid.stpl b/install/ubuntu/13.04/templates/web/apache2/phpfcgid.stpl new file mode 100755 index 000000000..622495756 --- /dev/null +++ b/install/ubuntu/13.04/templates/web/apache2/phpfcgid.stpl @@ -0,0 +1,36 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %sdocroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + SSLRequireSSL + AllowOverride All + Options +Includes -Indexes +ExecCGI + + SetHandler fcgid-script + + FCGIWrapper %home%/%user%/web/%domain%/cgi-bin/fcgi-starter .php + + + AllowOverride All + + php_admin_value open_basedir none + SSLEngine on + SSLVerifyClient none + SSLCertificateFile %ssl_crt% + SSLCertificateKeyFile %ssl_key% + %ssl_ca_str%SSLCertificateChainFile %ssl_ca% + + IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* + + + diff --git a/install/ubuntu/13.04/templates/web/apache2/phpfcgid.tpl b/install/ubuntu/13.04/templates/web/apache2/phpfcgid.tpl new file mode 100755 index 000000000..5c1f16e20 --- /dev/null +++ b/install/ubuntu/13.04/templates/web/apache2/phpfcgid.tpl @@ -0,0 +1,28 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %docroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + AllowOverride All + Options +Includes -Indexes +ExecCGI + + SetHandler fcgid-script + + FCGIWrapper %home%/%user%/web/%domain%/cgi-bin/fcgi-starter .php + + + AllowOverride All + + IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + + + diff --git a/install/ubuntu/13.04/templates/web/awstats/awstats.tpl b/install/ubuntu/13.04/templates/web/awstats/awstats.tpl new file mode 100755 index 000000000..9a92e0fd4 --- /dev/null +++ b/install/ubuntu/13.04/templates/web/awstats/awstats.tpl @@ -0,0 +1,133 @@ +LogFile="/var/log/%web_system%/domains/%domain%.log" +LogType=W +LogFormat=1 +LogSeparator=" " +SiteDomain="%domain_idn%" +HostAliases="%alias_idn%" +DirData="%home%/%user%/web/%domain%/stats" +DirCgi="/vstats" +DirIcons="/vstats/icon" +AllowToUpdateStatsFromBrowser=0 +AllowFullYearView=2 +EnableLockForUpdate=1 +DNSStaticCacheFile="dnscache.txt" +DNSLastUpdateCacheFile="dnscachelastupdate.txt" +SkipDNSLookupFor="" +AllowAccessFromWebToAuthenticatedUsersOnly=0 +AllowAccessFromWebToFollowingAuthenticatedUsers="" +AllowAccessFromWebToFollowingIPAddresses="" +CreateDirDataIfNotExists=0 +BuildHistoryFormat=text +BuildReportFormat=html +SaveDatabaseFilesWithPermissionsForEveryone=0 +PurgeLogFile=0 +ArchiveLogRecords=0 +KeepBackupOfHistoricFiles=1 +DefaultFile="index.php index.html" +SkipHosts="127.0.0.1 +SkipUserAgents="" +SkipFiles="" +SkipReferrersBlackList="" +OnlyHosts="" +OnlyUserAgents="" +OnlyUsers="" +OnlyFiles="" +NotPageList="css js class gif jpg jpeg png bmp ico rss xml swf" +ValidHTTPCodes="200 304" +ValidSMTPCodes="1 250" +AuthenticatedUsersNotCaseSensitive=0 +URLNotCaseSensitive=0 +URLWithAnchor=0 +URLQuerySeparators="?;" +URLWithQuery=0 +URLWithQueryWithOnlyFollowingParameters="" +URLWithQueryWithoutFollowingParameters="" +URLReferrerWithQuery=0 +WarningMessages=1 +ErrorMessages="" +DebugMessages=0 +NbOfLinesForCorruptedLog=50 +WrapperScript="" +DecodeUA=0 +MiscTrackerUrl="/js/awstats_misc_tracker.js" +UseFramesWhenCGI=1 +DetailedReportsOnNewWindows=1 +Expires=3600 +MaxRowsInHTMLOutput=1000 +Lang="auto" +DirLang="./lang" +ShowMenu=1 +ShowSummary=UVPHB +ShowMonthStats=UVPHB +ShowDaysOfMonthStats=VPHB +ShowDaysOfWeekStats=PHB +ShowHoursStats=PHB +ShowDomainsStats=PHB +ShowHostsStats=PHBL +ShowAuthenticatedUsers=0 +ShowRobotsStats=HBL +ShowWormsStats=0 +ShowEMailSenders=0 +ShowEMailReceivers=0 +ShowSessionsStats=1 +ShowPagesStats=PBEX +ShowFileTypesStats=HB +ShowFileSizesStats=0 +ShowDownloadsStats=HB +ShowOSStats=1 +ShowBrowsersStats=1 +ShowScreenSizeStats=0 +ShowOriginStats=PH +ShowKeyphrasesStats=1 +ShowKeywordsStats=1 +ShowMiscStats=a +ShowHTTPErrorsStats=1 +ShowSMTPErrorsStats=0 +ShowClusterStats=0 +AddDataArrayMonthStats=1 +AddDataArrayShowDaysOfMonthStats=1 +AddDataArrayShowDaysOfWeekStats=1 +AddDataArrayShowHoursStats=1 +IncludeInternalLinksInOriginSection=0 +MaxNbOfDomain = 10 +MinHitDomain = 1 +MaxNbOfHostsShown = 10 +MinHitHost = 1 +MaxNbOfLoginShown = 10 +MinHitLogin = 1 +MaxNbOfRobotShown = 10 +MinHitRobot = 1 +MaxNbOfDownloadsShown = 10 +MinHitDownloads = 1 +MaxNbOfPageShown = 10 +MinHitFile = 1 +MaxNbOfOsShown = 10 +MinHitOs = 1 +MaxNbOfBrowsersShown = 10 +MinHitBrowser = 1 +MaxNbOfScreenSizesShown = 5 +MinHitScreenSize = 1 +MaxNbOfWindowSizesShown = 5 +MinHitWindowSize = 1 +MaxNbOfRefererShown = 10 +MinHitRefer = 1 +MaxNbOfKeyphrasesShown = 10 +MinHitKeyphrase = 1 +MaxNbOfKeywordsShown = 10 +MinHitKeyword = 1 +MaxNbOfEMailsShown = 20 +MinHitEMail = 1 +FirstDayOfWeek=0 +ShowFlagLinks="" +ShowLinksOnUrl=1 +UseHTTPSLinkForUrl="" +MaxLengthOfShownURL=64 +HTMLHeadSection="" +HTMLEndSection="" +MetaRobot=0 +Logo="awstats_logo6.png" +LogoLink="http://awstats.sourceforge.net" +BarWidth = 260 +BarHeight = 90 +StyleSheet="" +ExtraTrackedRowsLimit=500 diff --git a/install/ubuntu/13.04/templates/web/awstats/index.tpl b/install/ubuntu/13.04/templates/web/awstats/index.tpl new file mode 100755 index 000000000..9df9bb5cb --- /dev/null +++ b/install/ubuntu/13.04/templates/web/awstats/index.tpl @@ -0,0 +1,10 @@ + + + + Awstats log analyzer + + + + + + diff --git a/install/ubuntu/13.04/templates/web/awstats/nav.tpl b/install/ubuntu/13.04/templates/web/awstats/nav.tpl new file mode 100755 index 000000000..f29bed68b --- /dev/null +++ b/install/ubuntu/13.04/templates/web/awstats/nav.tpl @@ -0,0 +1,23 @@ + + + Awstats navigation + + + + + + + + +
        vesta
        + +
        +
        + + diff --git a/install/ubuntu/13.04/templates/web/nginx/caching.sh b/install/ubuntu/13.04/templates/web/nginx/caching.sh new file mode 100755 index 000000000..6eb9126db --- /dev/null +++ b/install/ubuntu/13.04/templates/web/nginx/caching.sh @@ -0,0 +1,12 @@ +#!/bin/bash + +user=$1 +domain=$2 +ip=$3 +home=$4 +docroot=$5 + +str="proxy_cache_path /var/cache/nginx/$domain levels=2" +str="$str keys_zone=$domain:10m inactive=60m max_size=512m;" +echo "$str" >> /etc/nginx/conf.d/01_caching_pool.conf + diff --git a/install/ubuntu/13.04/templates/web/nginx/caching.stpl b/install/ubuntu/13.04/templates/web/nginx/caching.stpl new file mode 100755 index 000000000..ca6cffe32 --- /dev/null +++ b/install/ubuntu/13.04/templates/web/nginx/caching.stpl @@ -0,0 +1,44 @@ +server { + listen %ip%:%proxy_ssl_port%; + server_name %domain_idn% %alias_idn%; + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + error_log /var/log/%web_system%/domains/%domain%.error.log error; + + location / { + proxy_pass http://%ip%:%web_port%; + + proxy_cache cache; + proxy_cache_valid 15m; + proxy_cache_valid 404 1m; + proxy_no_cache $no_cache; + proxy_cache_bypass $no_cache; + proxy_cache_bypass $cookie_session $http_x_update; + + location ~* ^.+\.(%proxy_extentions%)$ { + proxy_cache off; + root %docroot%; + access_log /var/log/%web_system%/domains/%domain%.log combined; + access_log /var/log/%web_system%/domains/%domain%.bytes bytes; + expires max; + try_files $uri @fallback; + } + } + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location @fallback { + proxy_pass http://%ip%:%web_port%; + } + + location ~ /\.ht {return 404;} + location ~ /\.svn/ {return 404;} + location ~ /\.git/ {return 404;} + location ~ /\.hg/ {return 404;} + location ~ /\.bzr/ {return 404;} + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/13.04/templates/web/nginx/caching.tpl b/install/ubuntu/13.04/templates/web/nginx/caching.tpl new file mode 100755 index 000000000..36761b65c --- /dev/null +++ b/install/ubuntu/13.04/templates/web/nginx/caching.tpl @@ -0,0 +1,41 @@ +server { + listen %ip%:%proxy_port%; + server_name %domain_idn% %alias_idn%; + error_log /var/log/%web_system%/domains/%domain%.error.log error; + + location / { + proxy_pass http://%ip%:%web_port%; + + proxy_cache cache; + proxy_cache_valid 15m; + proxy_cache_valid 404 1m; + proxy_no_cache $no_cache; + proxy_cache_bypass $no_cache; + proxy_cache_bypass $cookie_session $http_x_update; + + location ~* ^.+\.(%proxy_extentions%)$ { + proxy_cache off; + root %docroot%; + access_log /var/log/%web_system%/domains/%domain%.log combined; + access_log /var/log/%web_system%/domains/%domain%.bytes bytes; + expires max; + try_files $uri @fallback; + } + } + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location @fallback { + proxy_pass http://%ip%:%web_port%; + } + + location ~ /\.ht {return 404;} + location ~ /\.svn/ {return 404;} + location ~ /\.git/ {return 404;} + location ~ /\.hg/ {return 404;} + location ~ /\.bzr/ {return 404;} + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/13.04/templates/web/nginx/default.stpl b/install/ubuntu/13.04/templates/web/nginx/default.stpl new file mode 100755 index 000000000..fa5380606 --- /dev/null +++ b/install/ubuntu/13.04/templates/web/nginx/default.stpl @@ -0,0 +1,36 @@ +server { + listen %ip%:%proxy_ssl_port%; + server_name %domain_idn% %alias_idn%; + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + error_log /var/log/%web_system%/domains/%domain%.error.log error; + + location / { + proxy_pass https://%ip%:%web_ssl_port%; + location ~* ^.+\.(%proxy_extentions%)$ { + root %sdocroot%; + access_log /var/log/%web_system%/domains/%domain%.log combined; + access_log /var/log/%web_system%/domains/%domain%.bytes bytes; + expires max; + try_files $uri @fallback; + } + } + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location @fallback { + proxy_pass https://%ip%:%web_ssl_port%; + } + + location ~ /\.ht {return 404;} + location ~ /\.svn/ {return 404;} + location ~ /\.git/ {return 404;} + location ~ /\.hg/ {return 404;} + location ~ /\.bzr/ {return 404;} + + include %home%/%user%/conf/web/snginx.%domain%.conf*; +} + diff --git a/install/ubuntu/13.04/templates/web/nginx/default.tpl b/install/ubuntu/13.04/templates/web/nginx/default.tpl new file mode 100755 index 000000000..4d5c774bc --- /dev/null +++ b/install/ubuntu/13.04/templates/web/nginx/default.tpl @@ -0,0 +1,33 @@ +server { + listen %ip%:%proxy_port%; + server_name %domain_idn% %alias_idn%; + error_log /var/log/%web_system%/domains/%domain%.error.log error; + + location / { + proxy_pass http://%ip%:%web_port%; + location ~* ^.+\.(%proxy_extentions%)$ { + root %docroot%; + access_log /var/log/%web_system%/domains/%domain%.log combined; + access_log /var/log/%web_system%/domains/%domain%.bytes bytes; + expires max; + try_files $uri @fallback; + } + } + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location @fallback { + proxy_pass http://%ip%:%web_port%; + } + + location ~ /\.ht {return 404;} + location ~ /\.svn/ {return 404;} + location ~ /\.git/ {return 404;} + location ~ /\.hg/ {return 404;} + location ~ /\.bzr/ {return 404;} + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} + diff --git a/install/ubuntu/13.04/templates/web/nginx/hosting.sh b/install/ubuntu/13.04/templates/web/nginx/hosting.sh new file mode 100755 index 000000000..eeed37ef9 --- /dev/null +++ b/install/ubuntu/13.04/templates/web/nginx/hosting.sh @@ -0,0 +1,11 @@ +#!/bin/bash +# Changing public_html permission +user="$1" +domain="$2" +ip="$3" +home_dir="$4" +docroot="$5" + +chmod 755 $docroot + +exit 0 diff --git a/install/ubuntu/13.04/templates/web/nginx/hosting.stpl b/install/ubuntu/13.04/templates/web/nginx/hosting.stpl new file mode 100755 index 000000000..d778d6333 --- /dev/null +++ b/install/ubuntu/13.04/templates/web/nginx/hosting.stpl @@ -0,0 +1,38 @@ +server { + listen %ip%:%proxy_ssl_port%; + server_name %domain_idn% %alias_idn%; + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + error_log /var/log/%web_system%/domains/%domain%.error.log error; + + location / { + proxy_pass https://%ip%:%web_ssl_port%; + location ~* ^.+\.(%proxy_extentions%)$ { + root %sdocroot%; + access_log /var/log/%web_system%/domains/%domain%.log combined; + access_log /var/log/%web_system%/domains/%domain%.bytes bytes; + expires max; + try_files $uri @fallback; + } + } + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location @fallback { + proxy_pass https://%ip%:%web_ssl_port%; + } + + location ~ /\.ht {return 404;} + location ~ /\.svn/ {return 404;} + location ~ /\.git/ {return 404;} + location ~ /\.hg/ {return 404;} + location ~ /\.bzr/ {return 404;} + + disable_symlinks if_not_owner from=%docroot%; + + include %home%/%user%/conf/web/snginx.%domain%.conf*; +} + diff --git a/install/ubuntu/13.04/templates/web/nginx/hosting.tpl b/install/ubuntu/13.04/templates/web/nginx/hosting.tpl new file mode 100755 index 000000000..15961c95c --- /dev/null +++ b/install/ubuntu/13.04/templates/web/nginx/hosting.tpl @@ -0,0 +1,35 @@ +server { + listen %ip%:%proxy_port%; + server_name %domain_idn% %alias_idn%; + error_log /var/log/%web_system%/domains/%domain%.error.log error; + + location / { + proxy_pass http://%ip%:%web_port%; + location ~* ^.+\.(%proxy_extentions%)$ { + root %docroot%; + access_log /var/log/%web_system%/domains/%domain%.log combined; + access_log /var/log/%web_system%/domains/%domain%.bytes bytes; + expires max; + try_files $uri @fallback; + } + } + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location @fallback { + proxy_pass http://%ip%:%web_port%; + } + + location ~ /\.ht {return 404;} + location ~ /\.svn/ {return 404;} + location ~ /\.git/ {return 404;} + location ~ /\.hg/ {return 404;} + location ~ /\.bzr/ {return 404;} + + disable_symlinks if_not_owner from=%docroot%; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} + diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/cms_made_simple.stpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/cms_made_simple.stpl new file mode 100644 index 000000000..01d82b603 --- /dev/null +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/cms_made_simple.stpl @@ -0,0 +1,51 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + try_files $uri $uri/ /index.php?page=$request_uri; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/cms_made_simple.tpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/cms_made_simple.tpl new file mode 100644 index 000000000..af452d19f --- /dev/null +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/cms_made_simple.tpl @@ -0,0 +1,47 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + try_files $uri $uri/ /index.php?page=$request_uri; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/codeigniter2.stpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/codeigniter2.stpl new file mode 100644 index 000000000..a592a652d --- /dev/null +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/codeigniter2.stpl @@ -0,0 +1,56 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + try_files $uri $uri/ /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location = /index.php { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME /var/www/html/ci$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + location ~ \.php$ { + return 444; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/codeigniter2.tpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/codeigniter2.tpl new file mode 100644 index 000000000..9b955aa6a --- /dev/null +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/codeigniter2.tpl @@ -0,0 +1,52 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + try_files $uri $uri/ /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location = /index.php { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME /var/www/html/ci$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + location ~ \.php$ { + return 444; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/codeigniter3.stpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/codeigniter3.stpl new file mode 100644 index 000000000..4d330d34f --- /dev/null +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/codeigniter3.stpl @@ -0,0 +1,51 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + try_files $uri $uri/ /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/codeigniter3.tpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/codeigniter3.tpl new file mode 100644 index 000000000..1f446e5d3 --- /dev/null +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/codeigniter3.tpl @@ -0,0 +1,47 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + try_files $uri $uri/ /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/datalife_engine.stpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/datalife_engine.stpl new file mode 100644 index 000000000..d1b5bcd24 --- /dev/null +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/datalife_engine.stpl @@ -0,0 +1,122 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + rewrite "^/page/([0-9]+)(/?)$" /index.php?cstart=$1 last; + + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page,([0-9]+),([0-9]+),(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&cstart=$5&news_name=$6&seourl=$6 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page,([0-9]+),(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&news_name=$5&seourl=$5 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/print:page,([0-9]+),(.*).html(/?)+$" /engine/print.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&news_name=$5&seourl=$5 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_name=$4&seourl=$4 last; + + rewrite "^/([^.]+)/page,([0-9]+),([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$4&news_page=$2&cstart=$3&seourl=$5&seocat=$1 last; + rewrite "^/([^.]+)/page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$3&news_page=$2&seourl=$4&seocat=$1 last; + rewrite "^/([^.]+)/print:page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /engine/print.php?news_page=$2&newsid=$3&seourl=$4&seocat=$1 last; + rewrite "^/([^.]+)/([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$2&seourl=$3&seocat=$1 last; + + rewrite "^/page,([0-9]+),([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$3&news_page=$1&cstart=$2&seourl=$4 last; + rewrite "^/page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$2&news_page=$1&seourl=$3 last; + rewrite "^/print:page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /engine/print.php?news_page=$1&newsid=$2&seourl=$3 last; + rewrite "^/([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$1&seourl=$2 last; + + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})(/?)+$" /index.php?year=$1&month=$2&day=$3 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page/([0-9]+)(/?)+$" /index.php?year=$1&month=$2&day=$3&cstart=$4 last; + + rewrite "^/([0-9]{4})/([0-9]{2})(/?)+$" /index.php?year=$1&month=$2 last; + rewrite "^/([0-9]{4})/([0-9]{2})/page/([0-9]+)(/?)+$" /index.php?year=$1&month=$2&cstart=$3 last; + + rewrite "^/([0-9]{4})(/?)+$" /index.php?year=$1 last; + rewrite "^/([0-9]{4})/page/([0-9]+)(/?)+$" /index.php?year=$1&cstart=$2 last; + + rewrite "^/tags/([^/]*)(/?)+$" /index.php?do=tags&tag=$1 last; + rewrite "^/tags/([^/]*)/page/([0-9]+)(/?)+$" /index.php?do=tags&tag=$1&cstart=$2 last; + + rewrite "^/xfsearch/([^/]*)(/?)+$" /index.php?do=xfsearch&xf=$1 last; + rewrite "^/xfsearch/([^/]*)/page/([0-9]+)(/?)+$" /index.php?do=xfsearch&xf=$1&cstart=$2 last; + + rewrite "^/user/([^/]*)/rss.xml$" /engine/rss.php?subaction=allnews&user=$1 last; + rewrite "^/user/([^/]*)(/?)+$" /index.php?subaction=userinfo&user=$1 last; + rewrite "^/user/([^/]*)/page/([0-9]+)(/?)+$" /index.php?subaction=userinfo&user=$1&cstart=$2 last; + rewrite "^/user/([^/]*)/news(/?)+$" /index.php?subaction=allnews&user=$1 last; + rewrite "^/user/([^/]*)/news/page/([0-9]+)(/?)+$" /index.php?subaction=allnews&user=$1&cstart=$2 last; + rewrite "^/user/([^/]*)/news/rss.xml(/?)+$" /engine/rss.php?subaction=allnews&user=$1 last; + + rewrite "^/lastnews(/?)+$" /index.php?do=lastnews last; + rewrite "^/lastnews/page/([0-9]+)(/?)+$" /index.php?do=lastnews&cstart=$1 last; + + rewrite "^/catalog/([^/]*)/rss.xml$" /engine/rss.php?catalog=$1 last; + rewrite "^/catalog/([^/]*)(/?)+$" /index.php?catalog=$1 last; + rewrite "^/catalog/([^/]*)/page/([0-9]+)(/?)+$" /index.php?catalog=$1&cstart=$2 last; + + rewrite "^/newposts(/?)+$" /index.php?subaction=newposts last; + rewrite "^/newposts/page/([0-9]+)(/?)+$" /index.php?subaction=newposts&cstart=$1 last; + + rewrite "^/favorites(/?)+$" /index.php?do=favorites last; + rewrite "^/favorites/page/([0-9]+)(/?)+$" /index.php?do=favorites&cstart=$1 last; + + rewrite "^/rules.html$" /index.php?do=rules last; + rewrite "^/statistics.html$" /index.php?do=stats last; + rewrite "^/addnews.html$" /index.php?do=addnews last; + rewrite "^/rss.xml$" /engine/rss.php last; + rewrite "^/sitemap.xml$" /uploads/sitemap.xml last; + + if (!-d $request_filename) { + rewrite "^/([^.]+)/page/([0-9]+)(/?)+$" /index.php?do=cat&category=$1&cstart=$2 last; + rewrite "^/([^.]+)/?$" /index.php?do=cat&category=$1 last; + } + + if (!-f $request_filename) { + rewrite "^/([^.]+)/rss.xml$" /engine/rss.php?do=cat&category=$1 last; + rewrite "^/page,([0-9]+),([^/]+).html$" /index.php?do=static&page=$2&news_page=$1 last; + rewrite "^/print:([^/]+).html$" /engine/print.php?do=static&page=$1 last; + } + + if (!-f $request_filename) { + rewrite "^/([^/]+).html$" /index.php?do=static&page=$1 last; + } + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/datalife_engine.tpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/datalife_engine.tpl new file mode 100644 index 000000000..ff33c2325 --- /dev/null +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/datalife_engine.tpl @@ -0,0 +1,118 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + rewrite "^/page/([0-9]+)(/?)$" /index.php?cstart=$1 last; + + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page,([0-9]+),([0-9]+),(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&cstart=$5&news_name=$6&seourl=$6 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page,([0-9]+),(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&news_name=$5&seourl=$5 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/print:page,([0-9]+),(.*).html(/?)+$" /engine/print.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&news_name=$5&seourl=$5 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_name=$4&seourl=$4 last; + + rewrite "^/([^.]+)/page,([0-9]+),([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$4&news_page=$2&cstart=$3&seourl=$5&seocat=$1 last; + rewrite "^/([^.]+)/page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$3&news_page=$2&seourl=$4&seocat=$1 last; + rewrite "^/([^.]+)/print:page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /engine/print.php?news_page=$2&newsid=$3&seourl=$4&seocat=$1 last; + rewrite "^/([^.]+)/([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$2&seourl=$3&seocat=$1 last; + + rewrite "^/page,([0-9]+),([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$3&news_page=$1&cstart=$2&seourl=$4 last; + rewrite "^/page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$2&news_page=$1&seourl=$3 last; + rewrite "^/print:page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /engine/print.php?news_page=$1&newsid=$2&seourl=$3 last; + rewrite "^/([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$1&seourl=$2 last; + + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})(/?)+$" /index.php?year=$1&month=$2&day=$3 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page/([0-9]+)(/?)+$" /index.php?year=$1&month=$2&day=$3&cstart=$4 last; + + rewrite "^/([0-9]{4})/([0-9]{2})(/?)+$" /index.php?year=$1&month=$2 last; + rewrite "^/([0-9]{4})/([0-9]{2})/page/([0-9]+)(/?)+$" /index.php?year=$1&month=$2&cstart=$3 last; + + rewrite "^/([0-9]{4})(/?)+$" /index.php?year=$1 last; + rewrite "^/([0-9]{4})/page/([0-9]+)(/?)+$" /index.php?year=$1&cstart=$2 last; + + rewrite "^/tags/([^/]*)(/?)+$" /index.php?do=tags&tag=$1 last; + rewrite "^/tags/([^/]*)/page/([0-9]+)(/?)+$" /index.php?do=tags&tag=$1&cstart=$2 last; + + rewrite "^/xfsearch/([^/]*)(/?)+$" /index.php?do=xfsearch&xf=$1 last; + rewrite "^/xfsearch/([^/]*)/page/([0-9]+)(/?)+$" /index.php?do=xfsearch&xf=$1&cstart=$2 last; + + rewrite "^/user/([^/]*)/rss.xml$" /engine/rss.php?subaction=allnews&user=$1 last; + rewrite "^/user/([^/]*)(/?)+$" /index.php?subaction=userinfo&user=$1 last; + rewrite "^/user/([^/]*)/page/([0-9]+)(/?)+$" /index.php?subaction=userinfo&user=$1&cstart=$2 last; + rewrite "^/user/([^/]*)/news(/?)+$" /index.php?subaction=allnews&user=$1 last; + rewrite "^/user/([^/]*)/news/page/([0-9]+)(/?)+$" /index.php?subaction=allnews&user=$1&cstart=$2 last; + rewrite "^/user/([^/]*)/news/rss.xml(/?)+$" /engine/rss.php?subaction=allnews&user=$1 last; + + rewrite "^/lastnews(/?)+$" /index.php?do=lastnews last; + rewrite "^/lastnews/page/([0-9]+)(/?)+$" /index.php?do=lastnews&cstart=$1 last; + + rewrite "^/catalog/([^/]*)/rss.xml$" /engine/rss.php?catalog=$1 last; + rewrite "^/catalog/([^/]*)(/?)+$" /index.php?catalog=$1 last; + rewrite "^/catalog/([^/]*)/page/([0-9]+)(/?)+$" /index.php?catalog=$1&cstart=$2 last; + + rewrite "^/newposts(/?)+$" /index.php?subaction=newposts last; + rewrite "^/newposts/page/([0-9]+)(/?)+$" /index.php?subaction=newposts&cstart=$1 last; + + rewrite "^/favorites(/?)+$" /index.php?do=favorites last; + rewrite "^/favorites/page/([0-9]+)(/?)+$" /index.php?do=favorites&cstart=$1 last; + + rewrite "^/rules.html$" /index.php?do=rules last; + rewrite "^/statistics.html$" /index.php?do=stats last; + rewrite "^/addnews.html$" /index.php?do=addnews last; + rewrite "^/rss.xml$" /engine/rss.php last; + rewrite "^/sitemap.xml$" /uploads/sitemap.xml last; + + if (!-d $request_filename) { + rewrite "^/([^.]+)/page/([0-9]+)(/?)+$" /index.php?do=cat&category=$1&cstart=$2 last; + rewrite "^/([^.]+)/?$" /index.php?do=cat&category=$1 last; + } + + if (!-f $request_filename) { + rewrite "^/([^.]+)/rss.xml$" /engine/rss.php?do=cat&category=$1 last; + rewrite "^/page,([0-9]+),([^/]+).html$" /index.php?do=static&page=$2&news_page=$1 last; + rewrite "^/print:([^/]+).html$" /engine/print.php?do=static&page=$1 last; + } + + if (!-f $request_filename) { + rewrite "^/([^/]+).html$" /index.php?do=static&page=$1 last; + } + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/default.stpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/default.stpl new file mode 100644 index 000000000..a68c99861 --- /dev/null +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/default.stpl @@ -0,0 +1,50 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %sdocroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/snginx.%domain%.conf*; +} diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/default.tpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/default.tpl new file mode 100644 index 000000000..b143e53ba --- /dev/null +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/default.tpl @@ -0,0 +1,46 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/dokuwiki.stpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/dokuwiki.stpl new file mode 100644 index 000000000..27483cd8c --- /dev/null +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/dokuwiki.stpl @@ -0,0 +1,67 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + index doku.php; + try_files $uri $uri/ @dokuwiki; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + location ^~ /lib/ { + expires 30d; + } + + location ^~ /conf/ { return 403; } + location ^~ /data/ { return 403; } + + location @dokuwiki { + rewrite ^/_media/(.*) /lib/exe/fetch.php?media=$1 last; + rewrite ^/_detail/(.*) /lib/exe/detail.php?media=$1 last; + rewrite ^/_export/([^/]+)/(.*) /doku.php?do=export_$1&id=$2 last; + rewrite ^/(.*) /doku.php?id=$1 last; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/dokuwiki.tpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/dokuwiki.tpl new file mode 100644 index 000000000..31647c9ff --- /dev/null +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/dokuwiki.tpl @@ -0,0 +1,62 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + index doku.php; + try_files $uri $uri/ @dokuwiki; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + location ^~ /lib/ { + expires 30d; + } + + location ^~ /conf/ { return 403; } + location ^~ /data/ { return 403; } + location @dokuwiki { + rewrite ^/_media/(.*) /lib/exe/fetch.php?media=$1 last; + rewrite ^/_detail/(.*) /lib/exe/detail.php?media=$1 last; + rewrite ^/_export/([^/]+)/(.*) /doku.php?do=export_$1&id=$2 last; + rewrite ^/(.*) /doku.php?id=$1 last; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/drupal.stpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/drupal.stpl new file mode 100644 index 000000000..9a5484396 --- /dev/null +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/drupal.stpl @@ -0,0 +1,101 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + + location / { + try_files $uri @rewrite; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # You have 2 options here + # For D7 and above: + # Clean URLs are handled in drupal_environment_initialize(). + rewrite ^ /index.php; + + # For Drupal 6 and bwlow: + # Some modules enforce no slash (/) at the end of the URL + # Else this rewrite block wouldn't be needed (GlobalRedirect) + #rewrite ^/(.*)$ /index.php?q=$1; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/drupal.tpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/drupal.tpl new file mode 100644 index 000000000..417762c18 --- /dev/null +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/drupal.tpl @@ -0,0 +1,98 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + # Very rarely should these ever be accessed outside of your lan + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + + location / { + try_files $uri @rewrite; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # You have 2 options here + # For D7 and above: + # Clean URLs are handled in drupal_environment_initialize(). + rewrite ^ /index.php; + + # For Drupal 6 and bwlow: + # Some modules enforce no slash (/) at the end of the URL + # Else this rewrite block wouldn't be needed (GlobalRedirect) + #rewrite ^/(.*)$ /index.php?q=$1; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/joomla.stpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/joomla.stpl new file mode 100644 index 000000000..235a01216 --- /dev/null +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/joomla.stpl @@ -0,0 +1,58 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + try_files $uri $uri/ /index.php?$args; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + # deny running scripts inside writable directories + location ~* /(images|cache|media|logs|tmp)/.*\.(php|pl|py|jsp|asp|sh|cgi)$ { + return 403; + error_page 403 /403_error.html; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/joomla.tpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/joomla.tpl new file mode 100644 index 000000000..997c268de --- /dev/null +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/joomla.tpl @@ -0,0 +1,54 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + try_files $uri $uri/ /index.php?$args; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + # deny running scripts inside writable directories + location ~* /(images|cache|media|logs|tmp)/.*\.(php|pl|py|jsp|asp|sh|cgi)$ { + return 403; + error_page 403 /403_error.html; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/owncloud.stpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/owncloud.stpl new file mode 100644 index 000000000..8311ca43f --- /dev/null +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/owncloud.stpl @@ -0,0 +1,80 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + rewrite ^/caldav(.*)$ /remote.php/caldav$1 redirect; + rewrite ^/carddav(.*)$ /remote.php/carddav$1 redirect; + rewrite ^/webdav(.*)$ /remote.php/webdav$1 redirect; + + error_page 403 = /core/templates/403.php; + error_page 404 = /core/templates/404.php; + + location ~ ^/(?:\.htaccess|data|config|db_structure\.xml|README){ + deny all; + } + + location / { + # The following 2 rules are only needed with webfinger + rewrite ^/.well-known/host-meta /public.php?service=host-meta last; + rewrite ^/.well-known/host-meta.json /public.php?service=host-meta-json last; + rewrite ^/.well-known/carddav /remote.php/carddav/ redirect; + rewrite ^/.well-known/caldav /remote.php/caldav/ redirect; + rewrite ^(/core/doc/[^\/]+/)$ $1/index.html; + try_files $uri $uri/ /index.php; + + location ~ \.php(?:$|/) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param PATH_INFO $fastcgi_path_info; + #fastcgi_param HTTPS on; + fastcgi_pass %backend_lsnr%; + } + } + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + # Some basic cache-control for static files to be sent to the browser + add_header Pragma public; + add_header Cache-Control "public, must-revalidate, proxy-revalidate"; + } + + #error_page 403 /error/404.html; + #error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/owncloud.tpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/owncloud.tpl new file mode 100644 index 000000000..57cac2f85 --- /dev/null +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/owncloud.tpl @@ -0,0 +1,76 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + rewrite ^/caldav(.*)$ /remote.php/caldav$1 redirect; + rewrite ^/carddav(.*)$ /remote.php/carddav$1 redirect; + rewrite ^/webdav(.*)$ /remote.php/webdav$1 redirect; + + error_page 403 = /core/templates/403.php; + error_page 404 = /core/templates/404.php; + + location ~ ^/(?:\.htaccess|data|config|db_structure\.xml|README){ + deny all; + } + + location / { + # The following 2 rules are only needed with webfinger + rewrite ^/.well-known/host-meta /public.php?service=host-meta last; + rewrite ^/.well-known/host-meta.json /public.php?service=host-meta-json last; + rewrite ^/.well-known/carddav /remote.php/carddav/ redirect; + rewrite ^/.well-known/caldav /remote.php/caldav/ redirect; + rewrite ^(/core/doc/[^\/]+/)$ $1/index.html; + try_files $uri $uri/ /index.php; + + location ~ \.php(?:$|/) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param PATH_INFO $fastcgi_path_info; + #fastcgi_param HTTPS on; + fastcgi_pass %backend_lsnr%; + } + } + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + # Some basic cache-control for static files to be sent to the browser + add_header Pragma public; + add_header Cache-Control "public, must-revalidate, proxy-revalidate"; + } + + #error_page 403 /error/404.html; + #error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/piwik.stpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/piwik.stpl new file mode 100644 index 000000000..c53af4011 --- /dev/null +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/piwik.stpl @@ -0,0 +1,68 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location = /favicon.ico { + try_files /favicon.ico =204; + } + + location / { + try_files $uri /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + valid_referers none blocked %domain_idn% %alias_idn%; + if ($invalid_referer) { + return 444; + } + expires max; + } + + location ~* ^/(?:index|piwik)\.php$ { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + include /etc/nginx/fastcgi_params; + } + } + + # Any other attempt to access PHP files returns a 404. + location ~* ^.+\.php$ { + return 404; + } + + # Return a 404 for all text files. + location ~* ^/(?:README|LICENSE[^.]*|LEGALNOTICE)(?:\.txt)*$ { + return 404; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/piwik.tpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/piwik.tpl new file mode 100644 index 000000000..6b4a94a68 --- /dev/null +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/piwik.tpl @@ -0,0 +1,64 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location = /favicon.ico { + try_files /favicon.ico =204; + } + + location / { + try_files $uri /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + valid_referers none blocked %domain_idn% %alias_idn%; + if ($invalid_referer) { + return 444; + } + expires max; + } + + location ~* ^/(?:index|piwik)\.php$ { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + include /etc/nginx/fastcgi_params; + } + } + + # Any other attempt to access PHP files returns a 404. + location ~* ^.+\.php$ { + return 404; + } + + # Return a 404 for all text files. + location ~* ^/(?:README|LICENSE[^.]*|LEGALNOTICE)(?:\.txt)*$ { + return 404; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/pyrocms.stpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/pyrocms.stpl new file mode 100644 index 000000000..a6fc67556 --- /dev/null +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/pyrocms.stpl @@ -0,0 +1,61 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location /installer { + try_files $uri $uri/ /installer/index.php; + } + + location / { + try_files $uri $uri/ /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + location = /robots.txt { access_log off; log_not_found off; } + location = /favicon.ico { access_log off; log_not_found off; } + location ~ /\. { access_log off; log_not_found off; deny all; } + location ~ ~$ { access_log off; log_not_found off; deny all; } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/pyrocms.tpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/pyrocms.tpl new file mode 100644 index 000000000..68b378efd --- /dev/null +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/pyrocms.tpl @@ -0,0 +1,57 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location /installer { + try_files $uri $uri/ /installer/index.php; + } + + location / { + try_files $uri $uri/ /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + location = /robots.txt { access_log off; log_not_found off; } + location = /favicon.ico { access_log off; log_not_found off; } + location ~ /\. { access_log off; log_not_found off; deny all; } + location ~ ~$ { access_log off; log_not_found off; deny all; } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/wordpress.stpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/wordpress.stpl new file mode 100644 index 000000000..910c28b69 --- /dev/null +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/wordpress.stpl @@ -0,0 +1,50 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/wordpress.tpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/wordpress.tpl new file mode 100644 index 000000000..b143e53ba --- /dev/null +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/wordpress.tpl @@ -0,0 +1,46 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/wordpress2.stpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/wordpress2.stpl new file mode 100644 index 000000000..2822f8754 --- /dev/null +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/wordpress2.stpl @@ -0,0 +1,62 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + location / { + try_files $uri $uri/ /index.php?$args; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/wordpress2.tpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/wordpress2.tpl new file mode 100644 index 000000000..37b8be305 --- /dev/null +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/wordpress2.tpl @@ -0,0 +1,58 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + location / { + try_files $uri $uri/ /index.php?$args; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/13.04/templates/web/nginx/proxy_ip.tpl b/install/ubuntu/13.04/templates/web/nginx/proxy_ip.tpl new file mode 100755 index 000000000..ae1956173 --- /dev/null +++ b/install/ubuntu/13.04/templates/web/nginx/proxy_ip.tpl @@ -0,0 +1,9 @@ +server { + listen %ip%:%proxy_port% default; + server_name _; + #access_log /var/log/nginx/%ip%.log main; + location / { + proxy_pass http://%ip%:%web_port%; + } +} + diff --git a/install/ubuntu/13.04/templates/web/php5-fpm/default.tpl b/install/ubuntu/13.04/templates/web/php5-fpm/default.tpl new file mode 100644 index 000000000..44ccf7a42 --- /dev/null +++ b/install/ubuntu/13.04/templates/web/php5-fpm/default.tpl @@ -0,0 +1,18 @@ +[%backend%] +listen = 127.0.0.1:%backend_port% +listen.allowed_clients = 127.0.0.1 + +user = %user% +group = %user% + +pm = dynamic +pm.max_children = 50 +pm.start_servers = 3 +pm.min_spare_servers = 2 +pm.max_spare_servers = 10 + +env[HOSTNAME] = $HOSTNAME +env[PATH] = /usr/local/bin:/usr/bin:/bin +env[TMP] = /tmp +env[TMPDIR] = /tmp +env[TEMP] = /tmp diff --git a/install/ubuntu/13.04/templates/web/php5-fpm/no-php.tpl b/install/ubuntu/13.04/templates/web/php5-fpm/no-php.tpl new file mode 100644 index 000000000..89487d5f5 --- /dev/null +++ b/install/ubuntu/13.04/templates/web/php5-fpm/no-php.tpl @@ -0,0 +1,13 @@ +#[%backend%] +#user = %user% +#group = %user% +#listen = /dev/null + +#listen.owner = %user% +#listen.group = nginx + +#pm = dynamic +#pm.max_children = 50 +#pm.start_servers = 3 +#pm.min_spare_servers = 2 +#pm.max_spare_servers = 10 diff --git a/install/ubuntu/13.04/templates/web/php5-fpm/socket.tpl b/install/ubuntu/13.04/templates/web/php5-fpm/socket.tpl new file mode 100644 index 000000000..f0513da3e --- /dev/null +++ b/install/ubuntu/13.04/templates/web/php5-fpm/socket.tpl @@ -0,0 +1,21 @@ +[%backend%] +listen = /var/run/php5-%backend%.sock +listen.allowed_clients = 127.0.0.1 + +user = %user% +group = %user% + +listen.owner = %user% +listen.group = nginx + +pm = dynamic +pm.max_children = 50 +pm.start_servers = 3 +pm.min_spare_servers = 2 +pm.max_spare_servers = 10 + +env[HOSTNAME] = $HOSTNAME +env[PATH] = /usr/local/bin:/usr/bin:/bin +env[TMP] = /tmp +env[TMPDIR] = /tmp +env[TEMP] = /tmp diff --git a/install/ubuntu/13.04/templates/web/skel/document_errors/403.html b/install/ubuntu/13.04/templates/web/skel/document_errors/403.html new file mode 100755 index 000000000..9c3f6baab --- /dev/null +++ b/install/ubuntu/13.04/templates/web/skel/document_errors/403.html @@ -0,0 +1,29 @@ + + + 403 — Forbidden + + + + + + +

        %domain%

        + +

        403

        +

        Forbidden

        +
        + Unfortunately, you do not have permission to view this +
        + + + diff --git a/install/ubuntu/13.04/templates/web/skel/document_errors/404.html b/install/ubuntu/13.04/templates/web/skel/document_errors/404.html new file mode 100755 index 000000000..2cee77084 --- /dev/null +++ b/install/ubuntu/13.04/templates/web/skel/document_errors/404.html @@ -0,0 +1,28 @@ + + + 404 — Not Found + + + + + + +

        %domain%

        +

        404

        +

        Page Not Found

        +
        + It seems that the page you were trying to reach does not exist anymore, or maybe it has just moved. + You can start again from the home or go back to previous page. +
        + + diff --git a/install/ubuntu/13.04/templates/web/skel/document_errors/50x.html b/install/ubuntu/13.04/templates/web/skel/document_errors/50x.html new file mode 100755 index 000000000..85ba648b7 --- /dev/null +++ b/install/ubuntu/13.04/templates/web/skel/document_errors/50x.html @@ -0,0 +1,29 @@ + + + 500 — Internal Sever Error + + + + + + +

        %domain%

        + +

        500

        +

        Internal Server Error

        +
        + Sorry, something went wrong :( +
        + + + diff --git a/install/ubuntu/13.04/templates/web/skel/public_html/index.html b/install/ubuntu/13.04/templates/web/skel/public_html/index.html new file mode 100755 index 000000000..4f5bb7244 --- /dev/null +++ b/install/ubuntu/13.04/templates/web/skel/public_html/index.html @@ -0,0 +1,26 @@ + + + %domain% — Coming Soon + + + + + + +

        %domain%

        + + + + + diff --git a/install/ubuntu/13.04/templates/web/skel/public_html/robots.txt b/install/ubuntu/13.04/templates/web/skel/public_html/robots.txt new file mode 100755 index 000000000..00ee83dcf --- /dev/null +++ b/install/ubuntu/13.04/templates/web/skel/public_html/robots.txt @@ -0,0 +1,3 @@ +# vestacp autogenerated robots.txt +User-agent: * +Crawl-delay: 10 diff --git a/install/ubuntu/13.04/templates/web/skel/public_shtml/index.html b/install/ubuntu/13.04/templates/web/skel/public_shtml/index.html new file mode 100755 index 000000000..4f5bb7244 --- /dev/null +++ b/install/ubuntu/13.04/templates/web/skel/public_shtml/index.html @@ -0,0 +1,26 @@ + + + %domain% — Coming Soon + + + + + + +

        %domain%

        + + + + + diff --git a/install/ubuntu/13.04/templates/web/skel/public_shtml/robots.txt b/install/ubuntu/13.04/templates/web/skel/public_shtml/robots.txt new file mode 100755 index 000000000..00ee83dcf --- /dev/null +++ b/install/ubuntu/13.04/templates/web/skel/public_shtml/robots.txt @@ -0,0 +1,3 @@ +# vestacp autogenerated robots.txt +User-agent: * +Crawl-delay: 10 diff --git a/install/ubuntu/13.04/templates/web/suspend/.htaccess b/install/ubuntu/13.04/templates/web/suspend/.htaccess new file mode 100755 index 000000000..5a6df83fb --- /dev/null +++ b/install/ubuntu/13.04/templates/web/suspend/.htaccess @@ -0,0 +1,2 @@ +ErrorDocument 403 /index.html +ErrorDocument 404 /index.html diff --git a/install/ubuntu/13.04/templates/web/suspend/index.html b/install/ubuntu/13.04/templates/web/suspend/index.html new file mode 100755 index 000000000..9d4fa67b3 --- /dev/null +++ b/install/ubuntu/13.04/templates/web/suspend/index.html @@ -0,0 +1,27 @@ + + + SUSPEND + + + + + + +

        SUSPEND

        +

        This site has been suspended

        +
        + Please contact technical support departament. +
        + + + diff --git a/install/ubuntu/13.04/templates/web/webalizer/webalizer.tpl b/install/ubuntu/13.04/templates/web/webalizer/webalizer.tpl new file mode 100755 index 000000000..068adcfb9 --- /dev/null +++ b/install/ubuntu/13.04/templates/web/webalizer/webalizer.tpl @@ -0,0 +1,110 @@ +HostName %domain_idn% +LogFile /var/log/%web_system%/domains/%domain%.log +OutputDir %home%/%user%/web/%domain%/stats +HistoryName %home%/%user%/web/%domain%/stats/%domain%.hist +Incremental yes +IncrementalName %home%/%user%/web/%domain%/stats/%domain%.current +PageType htm* +PageType cgi +PageType php +PageType shtml +DNSCache /var/lib/webalizer/dns_cache.db +DNSChildren 10 +Quiet yes +FoldSeqErr yes +IndexAlias index.php +HideURL *.gif +HideURL *.GIF +HideURL *.jpg +HideURL *.JPG +HideURL *.png +HideURL *.PNG +HideURL *.ra +SearchEngine abcsearch. terms= +SearchEngine alexa. q= +SearchEngine alltheweb. q= +SearchEngine alltheweb. query= +SearchEngine alot. q= +SearchEngine altavista. q= +SearchEngine aolsearch. query= +SearchEngine aport.ru r= +SearchEngine ask. q= +SearchEngine atlas.cz q= +SearchEngine bbc. q= +SearchEngine bing. q= +SearchEngine blingo. q= +SearchEngine blogs.yandex.ru text= +SearchEngine btopenworld query= +SearchEngine buscador.ya.com q= +SearchEngine busca. q= +SearchEngine business. query= +SearchEngine centrum.cz q= +SearchEngine chiff. q= +SearchEngine clusty. query= +SearchEngine comcast. q= +SearchEngine crawler. q= +SearchEngine cuil. q= +SearchEngine dmoz. search= +SearchEngine dogpile.com q= +SearchEngine dpxml qkw= +SearchEngine eureka. searchword= +SearchEngine euroseek. string= +SearchEngine exalead. q= +SearchEngine excite search= +SearchEngine ezilon. q= +SearchEngine fastbrowsersearch. q= +SearchEngine feedster.com q= +SearchEngine fireball.de q= +SearchEngine fireball. keyword= +SearchEngine freeserve. q= +SearchEngine gigablast. q= +SearchEngine gogo.ru q= +SearchEngine go.mail.ru q= +SearchEngine google. q= +SearchEngine hakia. q= +SearchEngine hotbot. query= +SearchEngine infoseek. qt= +SearchEngine iwon searchfor= +SearchEngine ixquick.com query= +SearchEngine joeant. keywords= +SearchEngine jyxo.cz s= +SearchEngine looksmart. key= +SearchEngine lycos. query= +SearchEngine mamma. q= +SearchEngine metacrawler q= +SearchEngine msn. MT= +SearchEngine msxml qkw= +SearchEngine mysearch. searchfor= +SearchEngine mywebsearch. searchfor= +SearchEngine netscape. q= +SearchEngine nigma.ru q= +SearchEngine northernlight. qr= +SearchEngine ntlworld. q= +SearchEngine orange. q= +SearchEngine overture. Keywords= +SearchEngine punto.ru text= +SearchEngine rambler. keyword= +SearchEngine search.aol. q= +SearchEngine search.babylon. q= +SearchEngine search.centrum. phrase= +SearchEngine search.conduit. q= +SearchEngine search.earthlink q= +SearchEngine search.icq. q= +SearchEngine search.live.com q= +SearchEngine search.rambler.ru words= +SearchEngine search.winamp. q= +SearchEngine searchy. q= +SearchEngine seznam.cz w= +SearchEngine snap. query= +SearchEngine teoma. q= +SearchEngine teradex.com q= +SearchEngine ukplus key= +SearchEngine verizon. q= +SearchEngine virginmedia. q= +SearchEngine voila. rdata= +SearchEngine webcrawler searchText= +SearchEngine web.search.naver. query= +SearchEngine wisenut q= +SearchEngine yahoo. p= +SearchEngine yandex. text= +SearchEngine yodao. q= diff --git a/install/ubuntu/13.04/vsftpd/vsftpd.conf b/install/ubuntu/13.04/vsftpd/vsftpd.conf new file mode 100644 index 000000000..0902899e7 --- /dev/null +++ b/install/ubuntu/13.04/vsftpd/vsftpd.conf @@ -0,0 +1,24 @@ +anonymous_enable=NO +local_enable=YES +write_enable=YES +local_umask=002 +anon_upload_enable=NO +dirmessage_enable=YES +xferlog_enable=YES +connect_from_port_20=YES +xferlog_std_format=YES +dual_log_enable=YES +chroot_local_user=YES +listen=YES +pam_service_name=vsftpd +userlist_enable=NO +tcp_wrappers=YES +force_dot_files=YES +ascii_upload_enable=YES +ascii_download_enable=YES +#allow_writable_chroot=YES +allow_writeable_chroot=YES +seccomp_sandbox=NO +pasv_enable=YES +pasv_max_port=12100 +pasv_min_port=12000 diff --git a/install/ubuntu/13.10/apache2/apache2.conf b/install/ubuntu/13.10/apache2/apache2.conf new file mode 100644 index 000000000..221780117 --- /dev/null +++ b/install/ubuntu/13.10/apache2/apache2.conf @@ -0,0 +1,86 @@ +# It is split into several files forming the configuration hierarchy outlined +# below, all located in the /etc/apache2/ directory: +# +# /etc/apache2/ +# |-- apache2.conf +# | `-- ports.conf +# |-- mods-enabled +# | |-- *.load +# | `-- *.conf +# |-- conf.d +# | `-- * + +# Global configuration +PidFile ${APACHE_PID_FILE} +Timeout 30 +KeepAlive Off +MaxKeepAliveRequests 100 +KeepAliveTimeout 10 + + + StartServers 8 + MinSpareServers 5 + MaxSpareServers 20 + ServerLimit 256 + MaxClients 200 + MaxRequestsPerChild 4000 + + + + StartServers 2 + MinSpareThreads 25 + MaxSpareThreads 75 + ThreadLimit 64 + ThreadsPerChild 25 + MaxClients 200 + MaxRequestsPerChild 4000 + + + + StartServers 2 + MinSpareThreads 25 + MaxSpareThreads 75 + ThreadLimit 64 + ThreadsPerChild 25 + MaxClients 200 + MaxRequestsPerChild 4000 + + +# These need to be set in /etc/apache2/envvars +User ${APACHE_RUN_USER} +Group ${APACHE_RUN_GROUP} +#User www-data +#Group www-data + +AccessFileName .htaccess + + + Order allow,deny + Deny from all + Satisfy all + + +DefaultType None +HostnameLookups Off + +ErrorLog ${APACHE_LOG_DIR}/error.log +LogLevel warn + +# Include module configuration: +Include mods-enabled/*.load +Include mods-enabled/*.conf + +# Include list of ports to listen on and which to use for name based vhosts +Include ports.conf + +LogFormat "%v:%p %h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" vhost_combined +LogFormat "%h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" combined +LogFormat "%h %l %u %t \"%r\" %>s %O" common +LogFormat "%{Referer}i -> %U" referer +LogFormat "%{User-agent}i" agent +LogFormat "%b" bytes + +Include conf.d/ + +# Include the virtual host configurations: +#Include sites-enabled/ diff --git a/install/ubuntu/13.10/apache2/status.conf b/install/ubuntu/13.10/apache2/status.conf new file mode 100644 index 000000000..da9d96333 --- /dev/null +++ b/install/ubuntu/13.10/apache2/status.conf @@ -0,0 +1,8 @@ +Listen 127.0.0.1:8081 + + SetHandler server-status + Order deny,allow + Deny from all + Allow from 127.0.0.1 + Allow from all + diff --git a/install/ubuntu/13.10/bind/named.conf b/install/ubuntu/13.10/bind/named.conf new file mode 100644 index 000000000..ed6ece885 --- /dev/null +++ b/install/ubuntu/13.10/bind/named.conf @@ -0,0 +1,12 @@ +// This is the primary configuration file for the BIND DNS server named. +// +// Please read /usr/share/doc/bind9/README.Debian.gz for information on the +// structure of BIND configuration files in Debian, *BEFORE* you customize +// this configuration file. +// +// If you are just adding zones, please do that in /etc/bind/named.conf.local + +include "/etc/bind/named.conf.options"; +include "/etc/bind/named.conf.local"; +include "/etc/bind/named.conf.default-zones"; + diff --git a/install/ubuntu/13.10/clamav/clamd.conf b/install/ubuntu/13.10/clamav/clamd.conf new file mode 100644 index 000000000..ea982697a --- /dev/null +++ b/install/ubuntu/13.10/clamav/clamd.conf @@ -0,0 +1,61 @@ +#Automatically Generated by clamav-base postinst +#To reconfigure clamd run #dpkg-reconfigure clamav-base +#Please read /usr/share/doc/clamav-base/README.Debian.gz for details +LocalSocket /var/run/clamav/clamd.ctl +FixStaleSocket true +LocalSocketGroup clamav +LocalSocketMode 666 +# TemporaryDirectory is not set to its default /tmp here to make overriding +# the default with environment variables TMPDIR/TMP/TEMP possible +User clamav +AllowSupplementaryGroups true +ScanMail true +ScanArchive true +ArchiveBlockEncrypted false +MaxDirectoryRecursion 15 +FollowDirectorySymlinks false +FollowFileSymlinks false +ReadTimeout 180 +MaxThreads 12 +MaxConnectionQueueLength 15 +LogSyslog false +LogFacility LOG_LOCAL6 +LogClean false +LogVerbose true +PidFile /var/run/clamav/clamd.pid +DatabaseDirectory /var/lib/clamav +SelfCheck 3600 +Foreground false +Debug false +ScanPE true +ScanOLE2 true +ScanHTML true +DetectBrokenExecutables false +ExitOnOOM false +LeaveTemporaryFiles false +AlgorithmicDetection true +ScanELF true +IdleTimeout 30 +PhishingSignatures true +PhishingScanURLs true +PhishingAlwaysBlockSSLMismatch false +PhishingAlwaysBlockCloak false +DetectPUA false +ScanPartialMessages false +HeuristicScanPrecedence false +StructuredDataDetection false +CommandReadTimeout 5 +SendBufTimeout 200 +MaxQueue 100 +ExtendedDetectionInfo true +OLE2BlockMacros false +StreamMaxLength 25M +LogFile /var/log/clamav/clamav.log +LogTime true +LogFileUnlock false +LogFileMaxSize 0 +Bytecode true +BytecodeSecurity TrustSigned +BytecodeTimeout 60000 +OfficialDatabaseOnly false +CrossFilesystems true diff --git a/install/ubuntu/13.10/deb_signing.key b/install/ubuntu/13.10/deb_signing.key new file mode 100644 index 000000000..2ad2db8bc --- /dev/null +++ b/install/ubuntu/13.10/deb_signing.key @@ -0,0 +1,30 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.12 (GNU/Linux) + +mQENBFJIGbEBCAC8SHOOFo7iDTbnC2GhNZ+uBGCh226Dn1QPoFZNFM/DNakHZ6rD +G3wzr8++eKz4fJual/VLllE2N9XDPuxbozb3LLkcyY1WzJqtIXbXhFGQ/SuIeT+x +QY90XU6t2Ckze2c+zUniAWmJ8GSyVmXOoc9JxAQ1u47wvGXLzrjWXc8u8PNRYXuf +fZplTL+dFu9P0d6lP8FGsV+r9wXvvazpRTz3+H8PKrGCYT55ZQIEdG9Jgamylto2 +oVPFXkwGML+TLw6oeCIBuz2y2vtivphW4MJ3ifQjDj7k3n+DTIxfDFs8lB6VRhhY +2nMHCrcZC6U2mhmXmr6O4s1fu6irBVx05ejPABEBAAG0IFNlcmdoZXkgUm9kaW4g +PHNraWRAdmVzdGFjcC5jb20+iQE4BBMBAgAiBQJSSBmxAhsDBgsJCAcDAgYVCAIJ +CgsEFgIDAQIeAQIXgAAKCRBCxbITCh93FPdqB/93GjV9g+wBfeZYLHQK9MDU2wBb +VloYOJJae6IvYKYQVAJayD3PbHdpxrF8s9e23vdnmb9jKu6jX6oV54EIyqP2HPiN +QYc8wcea+eSHerznBixCtoQh8mtdWGFeN71zU/ig7L5qlOVF/EmxDVZTFUeivFxh +IV6qyBnktQKktE45585yKZyyLtfGoXA54DGK69OtJFh+wdkKEMmUXocMl7wUrxW6 +Cx2CuKeEXEgvwu8mRHQi3S3T9XP456qWEn5dWyMVcP660IzEuZfSJApZusNK7zG3 +WMy0/EuX7xHNY3mcNxTOUN1LsO7iHnhHD9+iKWJo9parGkMZzc92MpjDK/g7uQEN +BFJIGbEBCAC7k5QEA9WQM7E3ceNaeLMrA9lXfuzaNCcySq7ONdVAa5PxzbSKdHvz +QFoL1VFqBTYQ038lbil1XqnoM0zvIfAI3LcpS8sq92El/vPxp6jZh2Ari9Uw7x95 +k2cZMgI67g+zQMGdjVRA155nFQRCgg000xU4F7JA6+WsuLlVUmccsDv7YWJExMtC +YPxiuz5DFu8RALnw4Ckts+dbwsrcvUHhkm9b6RAsdCKjjRpUZjLgdltjH83gUVvt +i1YmdjjsVpt95dtsaG+ad852g/Rk8EdxNMkjPF6HLA67CLADP9wYaj80yPcPtylS +ycvPtcclVeHkFBRVM8xZpQd4iD19MWI1ABEBAAGJAR8EGAECAAkFAlJIGbECGwwA +CgkQQsWyEwofdxQ7tQgAhB0FwTs7L8Qr63DHC2yAnXVxgtTAY1/36CccNXVculyR ++EkLcwahms9AKhz7eQb+Mud+5vH0GRohLp2npgO38CjVUfIP5d+Y6dsthmrkF6p8 +XdV1dVK9vWX+i/YZSw/Mded30Cq4P2Yhq9EaemMT0rtli8lz2NnkZ9dFJZk1lzJC +CZmRpbjSNWqRU4f7qyh21lYk/OC/0XE8fh8CaO23TZ+6gBionoCztwb7NyC9OArN +qYlNnbmh9iNqdblykPS3bkjf34n2xyMgnIehNrM89tk8PY4UfNPhgT1TMD9W3Svq +ynNZvLuF/FIDwDeC1qcfjGbfDn9fXO/lMIIRooQYKQ== +=J2HJ +-----END PGP PUBLIC KEY BLOCK----- diff --git a/install/ubuntu/13.10/dovecot.tar.gz b/install/ubuntu/13.10/dovecot.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..bfabaa030981d087ea4ccd8c7b86cc4d7ab1b7c6 GIT binary patch literal 3487 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 N{0}P55eWcL004dY&`|&Y literal 0 HcmV?d00001 diff --git a/install/ubuntu/13.10/dovecot/conf.d/10-auth.conf b/install/ubuntu/13.10/dovecot/conf.d/10-auth.conf new file mode 100644 index 000000000..dfcc83110 --- /dev/null +++ b/install/ubuntu/13.10/dovecot/conf.d/10-auth.conf @@ -0,0 +1,4 @@ +disable_plaintext_auth = no +auth_verbose = yes +auth_mechanisms = plain login +!include auth-passwdfile.conf.ext diff --git a/install/ubuntu/13.10/dovecot/conf.d/10-logging.conf b/install/ubuntu/13.10/dovecot/conf.d/10-logging.conf new file mode 100644 index 000000000..a5f207d51 --- /dev/null +++ b/install/ubuntu/13.10/dovecot/conf.d/10-logging.conf @@ -0,0 +1 @@ +log_path = /var/log/dovecot.log diff --git a/install/ubuntu/13.10/dovecot/conf.d/10-mail.conf b/install/ubuntu/13.10/dovecot/conf.d/10-mail.conf new file mode 100644 index 000000000..55313419e --- /dev/null +++ b/install/ubuntu/13.10/dovecot/conf.d/10-mail.conf @@ -0,0 +1,4 @@ +mail_privileged_group = mail +mail_access_groups = mail +mail_location = maildir:%h/mail/%d/%n +pop3_uidl_format = %08Xu%08Xv diff --git a/install/ubuntu/13.10/dovecot/conf.d/10-master.conf b/install/ubuntu/13.10/dovecot/conf.d/10-master.conf new file mode 100644 index 000000000..a75a9aaa4 --- /dev/null +++ b/install/ubuntu/13.10/dovecot/conf.d/10-master.conf @@ -0,0 +1,29 @@ +service imap-login { + inet_listener imap { + } + inet_listener imaps { + } +} + +service pop3-login { + inet_listener pop3 { + } + inet_listener pop3s { + } +} + + +service imap { +} + +service pop3 { +} + +service auth { + unix_listener auth-client { + group = mail + mode = 0660 + user = dovecot + } + user = dovecot +} diff --git a/install/ubuntu/13.10/dovecot/conf.d/10-ssl.conf b/install/ubuntu/13.10/dovecot/conf.d/10-ssl.conf new file mode 100644 index 000000000..3aaff6eec --- /dev/null +++ b/install/ubuntu/13.10/dovecot/conf.d/10-ssl.conf @@ -0,0 +1,3 @@ +ssl = yes +ssl_cert = = 2.1.4) : %v.%u + # Dovecot v0.99.x : %v.%u + # tpop3d : %Mf + # + # Note that Outlook 2003 seems to have problems with %v.%u format which was + # Dovecot's default, so if you're building a new server it would be a good + # idea to change this. %08Xu%08Xv should be pretty fail-safe. + # + #pop3_uidl_format = %08Xu%08Xv + + # Permanently save UIDLs sent to POP3 clients, so pop3_uidl_format changes + # won't change those UIDLs. Currently this works only with Maildir. + #pop3_save_uidl = no + + # What to do about duplicate UIDLs if they exist? + # allow: Show duplicates to clients. + # rename: Append a temporary -2, -3, etc. counter after the UIDL. + #pop3_uidl_duplicates = allow + + # POP3 logout format string: + # %i - total number of bytes read from client + # %o - total number of bytes sent to client + # %t - number of TOP commands + # %p - number of bytes sent to client as a result of TOP command + # %r - number of RETR commands + # %b - number of bytes sent to client as a result of RETR command + # %d - number of deleted messages + # %m - number of messages (before deletion) + # %s - mailbox size in bytes (before deletion) + # %u - old/new UIDL hash. may help finding out if UIDLs changed unexpectedly + #pop3_logout_format = top=%t/%p, retr=%r/%b, del=%d/%m, size=%s + + # Maximum number of POP3 connections allowed for a user from each IP address. + # NOTE: The username is compared case-sensitively. + #mail_max_userip_connections = 10 + + # Space separated list of plugins to load (default is global mail_plugins). + #mail_plugins = $mail_plugins + + # Workarounds for various client bugs: + # outlook-no-nuls: + # Outlook and Outlook Express hang if mails contain NUL characters. + # This setting replaces them with 0x80 character. + # oe-ns-eoh: + # Outlook Express and Netscape Mail breaks if end of headers-line is + # missing. This option simply sends it if it's missing. + # The list is space-separated. + #pop3_client_workarounds = +} diff --git a/install/ubuntu/13.10/dovecot/conf.d/auth-passwdfile.conf.ext b/install/ubuntu/13.10/dovecot/conf.d/auth-passwdfile.conf.ext new file mode 100644 index 000000000..75e6e1152 --- /dev/null +++ b/install/ubuntu/13.10/dovecot/conf.d/auth-passwdfile.conf.ext @@ -0,0 +1,9 @@ +passdb { + driver = passwd-file + args = scheme=MD5-CRYPT username_format=%n /etc/exim4/domains/%d/passwd +} + +userdb { + driver = passwd-file + args = username_format=%n /etc/exim4/domains/%d/passwd +} diff --git a/install/ubuntu/13.10/dovecot/dovecot.conf b/install/ubuntu/13.10/dovecot/dovecot.conf new file mode 100644 index 000000000..0a8553510 --- /dev/null +++ b/install/ubuntu/13.10/dovecot/dovecot.conf @@ -0,0 +1,4 @@ +protocols = imap pop3 +listen = *, :: +base_dir = /var/run/dovecot/ +!include conf.d/*.conf diff --git a/install/ubuntu/13.10/exim/dnsbl.conf b/install/ubuntu/13.10/exim/dnsbl.conf new file mode 100644 index 000000000..5166b255e --- /dev/null +++ b/install/ubuntu/13.10/exim/dnsbl.conf @@ -0,0 +1,2 @@ +bl.spamcop.net +zen.spamhaus.org diff --git a/install/ubuntu/13.10/exim/exim4.conf.template b/install/ubuntu/13.10/exim/exim4.conf.template new file mode 100644 index 000000000..742f0409e --- /dev/null +++ b/install/ubuntu/13.10/exim/exim4.conf.template @@ -0,0 +1,377 @@ +###################################################################### +# # +# Exim configuration file for Vesta Control Panel # +# # +###################################################################### + +#SPAMASSASSIN = yes +#SPAM_SCORE = 50 +#CLAMD = yes + +domainlist local_domains = dsearch;/etc/exim4/domains/ +domainlist relay_to_domains = dsearch;/etc/exim4/domains/ +hostlist relay_from_hosts = 127.0.0.1 +hostlist whitelist = net-iplsearch;/etc/exim4/white-blocks.conf +hostlist spammers = net-iplsearch;/etc/exim4/spam-blocks.conf +no_local_from_check +untrusted_set_sender = * +acl_smtp_connect = acl_check_spammers +acl_smtp_mail = acl_check_mail +acl_smtp_rcpt = acl_check_rcpt +acl_smtp_data = acl_check_data +acl_smtp_mime = acl_check_mime + +.ifdef SPAMASSASSIN +spamd_address = 127.0.0.1 783 +.endif + +.ifdef CLAMD +av_scanner = clamd: /var/run/clamav/clamd.ctl +.endif + +tls_advertise_hosts = * +tls_certificate = /usr/local/vesta/ssl/certificate.crt +tls_privatekey = /usr/local/vesta/ssl/certificate.key + +daemon_smtp_ports = 25 : 465 : 587 : 2525 +tls_on_connect_ports = 465 +never_users = root +host_lookup = * +rfc1413_hosts = * +rfc1413_query_timeout = 5s +ignore_bounce_errors_after = 2d +timeout_frozen_after = 7d + +DKIM_DOMAIN = ${lc:${domain:$h_from:}} +DKIM_FILE = /etc/exim4/domains/${lc:${domain:$h_from:}}/dkim.pem +DKIM_PRIVATE_KEY = ${if exists{DKIM_FILE}{DKIM_FILE}{0}} + + + +###################################################################### +# ACL CONFIGURATION # +# Specifies access control lists for incoming SMTP mail # +###################################################################### +begin acl + +acl_check_spammers: + accept hosts = +whitelist + + drop message = Your host in blacklist on this server. + log_message = Host in blacklist + hosts = +spammers + + accept + + +acl_check_mail: + deny condition = ${if eq{$sender_helo_name}{}} + message = HELO required before MAIL + + drop message = Helo name contains a ip address (HELO was $sender_helo_name) and not is valid + condition = ${if match{$sender_helo_name}{\N((\d{1,3}[.-]\d{1,3}[.-]\d{1,3}[.-]\d{1,3})|([0-9a-f]{8})|([0-9A-F]{8}))\N}{yes}{no}} + condition = ${if match {${lookup dnsdb{>: defer_never,ptr=$sender_host_address}}\}{$sender_helo_name}{no}{yes}} + delay = 45s + + drop condition = ${if isip{$sender_helo_name}} + message = Access denied - Invalid HELO name (See RFC2821 4.1.3) + + drop condition = ${if eq{[$interface_address]}{$sender_helo_name}} + message = $interface_address is _my_ address + + accept + + +acl_check_rcpt: + accept hosts = : + + deny message = Restricted characters in address + domains = +local_domains + local_parts = ^[.] : ^.*[@%!/|] + + deny message = Restricted characters in address + domains = !+local_domains + local_parts = ^[./|] : ^.*[@%!] : ^.*/\\.\\./ + + require verify = sender + + accept hosts = +relay_from_hosts + control = submission + + accept authenticated = * + control = submission/domain= + + deny message = Rejected because $sender_host_address is in a black list at $dnslist_domain\n$dnslist_text + hosts = !+whitelist + dnslists = ${readfile {/etc/exim4/dnsbl.conf}{:}} + + require message = relay not permitted + domains = +local_domains : +relay_to_domains + + deny message = smtp auth requried + sender_domains = +local_domains + !authenticated = * + + require verify = recipient + +.ifdef CLAMD + warn set acl_m0 = no + + warn condition = ${if exists {/etc/exim4/domains/$domain/antivirus}{yes}{no}} + set acl_m0 = yes +.endif + +.ifdef SPAMASSASSIN + warn set acl_m1 = no + + warn condition = ${if exists {/etc/exim4/domains/$domain/antispam}{yes}{no}} + set acl_m1 = yes +.endif + + accept + + +acl_check_data: +.ifdef CLAMD + deny message = Message contains a virus ($malware_name) and has been rejected + malware = * + condition = ${if eq{$acl_m0}{yes}{yes}{no}} +.endif + +.ifdef SPAMASSASSIN + warn !authenticated = * + hosts = !+relay_from_hosts + condition = ${if < {$message_size}{100K}} + condition = ${if eq{$acl_m1}{yes}{yes}{no}} + spam = nobody:true/defer_ok + add_header = X-Spam-Score: $spam_score_int + add_header = X-Spam-Bar: $spam_bar + add_header = X-Spam-Report: $spam_report + set acl_m2 = $spam_score_int + + warn condition = ${if !eq{$acl_m2}{} {yes}{no}} + condition = ${if >{$acl_m2}{SPAM_SCORE} {yes}{no}} + add_header = X-Spam-Status: Yes + message = SpamAssassin detected spam (from $sender_address to $recipients). +.endif + + accept + + +acl_check_mime: + deny message = Blacklisted file extension detected + condition = ${if match {${lc:$mime_filename}}{\N(\.ade|\.adp|\.bat|\.chm|\.cmd|\.com|\.cpl|\.exe|\.hta|\.ins|\.isp|\.jse|\.lib|\.lnk|\.mde|\.msc|\.msp|\.mst|\.pif|\.scr|\.sct|\.shb|\.sys|\.vb|\.vbe|\.vbs|\.vxd|\.wsc|\.wsf|\.wsh)$\N}{1}{0}} + + accept + + + +###################################################################### +# AUTHENTICATION CONFIGURATION # +###################################################################### +begin authenticators + +dovecot_plain: + driver = dovecot + public_name = PLAIN + server_socket = /var/run/dovecot/auth-client + server_set_id = $auth1 + +dovecot_login: + driver = dovecot + public_name = LOGIN + server_socket = /var/run/dovecot/auth-client + server_set_id = $auth1 + + + +###################################################################### +# ROUTERS CONFIGURATION # +# Specifies how addresses are handled # +###################################################################### +begin routers + +#smarthost: +# driver = manualroute +# domains = ! +local_domains +# transport = remote_smtp +# route_list = * smartrelay.vestacp.com +# no_more +# no_verify + +dnslookup: + driver = dnslookup + domains = !+local_domains + transport = remote_smtp + no_more + +userforward: + driver = redirect + check_local_user + file = $home/.forward + allow_filter + no_verify + no_expn + check_ancestor + file_transport = address_file + pipe_transport = address_pipe + reply_transport = address_reply + +procmail: + driver = accept + check_local_user + require_files = ${local_part}:+${home}/.procmailrc:/usr/bin/procmail + transport = procmail + no_verify + +autoreplay: + driver = accept + require_files = /etc/exim4/domains/$domain/autoreply.${local_part}.msg + condition = ${if exists{/etc/exim4/domains/$domain/autoreply.${local_part}.msg}}{yes}{no}} + retry_use_local_part + transport = userautoreply + unseen + +aliases: + driver = redirect + headers_add = X-redirected: yes + data = ${extract{1}{:}{${lookup{$local_part@$domain}lsearch{/etc/exim4/domains/$domain/aliases}}}} + require_files = /etc/exim4/domains/$domain/aliases + redirect_router = dnslookup + pipe_transport = address_pipe + unseen + +localuser_fwd_only: + driver = accept + transport = devnull + condition = ${if exists{/etc/exim/domains/$domain/fwd_only}{${lookup{$local_part}lsearch{/etc/exim/domains/$domain/fwd_only}{true}{false}}}} + +localuser_spam: + driver = accept + transport = local_spam_delivery + condition = ${if eq {${if match{$h_X-Spam-Status:}{\N^Yes\N}{yes}{no}}} {${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}{yes}{no_such_user}}}} + +localuser: + driver = accept + transport = local_delivery + condition = ${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}{true}{false}} + +catchall: + driver = redirect + headers_add = X-redirected: yes + require_files = /etc/exim4/domains/$domain/aliases + data = ${extract{1}{:}{${lookup{*@$domain}lsearch{/etc/exim4/domains/$domain/aliases}}}} + file_transport = local_delivery + redirect_router = dnslookup + +terminate_alias: + driver = accept + transport = devnull + condition = ${lookup{$local_part@$domain}lsearch{/etc/exim4/domains/$domain/aliases}{true}{false}} + + + +###################################################################### +# TRANSPORTS CONFIGURATION # +###################################################################### +begin transports + +remote_smtp: + driver = smtp + #helo_data = $sender_address_domain + dkim_domain = DKIM_DOMAIN + dkim_selector = mail + dkim_private_key = DKIM_PRIVATE_KEY + dkim_canon = relaxed + dkim_strict = 0 + +procmail: + driver = pipe + command = "/usr/bin/procmail -d $local_part" + return_path_add + delivery_date_add + envelope_to_add + user = $local_part + initgroups + return_output + +local_delivery: + driver = appendfile + maildir_format + maildir_use_size_file + user = ${extract{2}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}} + group = mail + create_directory + directory_mode = 770 + mode = 660 + use_lockfile = no + delivery_date_add + envelope_to_add + return_path_add + directory = "${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}}/mail/$domain/$local_part" + quota = ${extract{6}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}}M + quota_warn_threshold = 75% + +local_spam_delivery: + driver = appendfile + maildir_format + maildir_use_size_file + user = ${extract{2}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}} + group = mail + create_directory + directory_mode = 770 + mode = 660 + use_lockfile = no + delivery_date_add + envelope_to_add + return_path_add + directory = "${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}}/mail/$domain/$local_part/.Spam" + quota = ${extract{6}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}}M + quota_directory = "${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}}/mail/$domain/$local_part" + quota_warn_threshold = 75% + +address_pipe: + driver = pipe + return_output + +address_file: + driver = appendfile + delivery_date_add + envelope_to_add + return_path_add + +address_reply: + driver = autoreply + +userautoreply: + driver = autoreply + file = /etc/exim4/domains/$domain/autoreply.${local_part}.msg + from = "${local_part}@${domain}" + subject = "${if def:h_Subject: {Autoreply: ${quote:${escape:$h_Subject:}}} {Autoreply Message}}" + to = "${sender_address}" + +devnull: + driver = appendfile + file = /dev/null + + + +###################################################################### +# RETRY CONFIGURATION # +###################################################################### +begin retry + +# Address or Domain Error Retries +# ----------------- ----- ------- +* * F,2h,15m; G,16h,1h,1.5; F,4d,6h + + + +###################################################################### +# REWRITE CONFIGURATION # +###################################################################### +begin rewrite + + + +###################################################################### diff --git a/install/ubuntu/13.10/exim/spam-blocks.conf b/install/ubuntu/13.10/exim/spam-blocks.conf new file mode 100644 index 000000000..e69de29bb diff --git a/install/ubuntu/13.10/fail2ban.tar.gz b/install/ubuntu/13.10/fail2ban.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..628545b6b12d83a4dfcf4529b41f62792c228c85 GIT binary patch literal 721 zcmV;?0xta@iwFR?P)1Y$1MQbhZ{jczhB^CJjMPJ=l>#Ira4D7AZL1=&Z6#&~ zz`KruB3xbg09_DCMo>VRAaZ-;y)^U@ z_5_W1em^5}=Uk3M(j5%0M~Fp}7>lVIYRqubkoOIoiK#qP6BOckLPYW;2OWgmSsIAg zuZ|mFmaYUYjJJfo8s1fhF1)IOlQ|75La(j33(9U0btUMJvtIut>QYeUVmCrexr&Qi zKbjFQ61zkzP2U-?^r{!(!l(3+?Yga{u}aaFy}dZE-rC%=GOfyYm&N9W)k}T291PDY z*P0t`IZ}uIjJ_-j{V$SH_dlT#cu)PeEcx8DI+m&H|328vfBu=(y@&@N72}Qi-)t}U ze|i14JEpGxd*KMK)CoAp98}8bBuj9v%2KQe1W{6IHF7UVKsi-oBUDPa+B%^mI!l#A z%iggR=`rPvnSp)Z2xvn7V8#q@Dyt%#D2+c|xJU7JZ=WzC$g2~0Q{w%WGdx!uFgO@} z=-u4i58*FN5)y;)2*=Nd+$g+V_$fxmCp11?eTVGz8P->^KFOi;zxe)( z;(T!ZH#>H&|F+iuy|9`8{p-KwZ0f&dYyIB`OZs27=SuT4o@Sm$(ja3D9@K#V)prvv zs8^H+ECdN-k)k768hSV1`}Y@@gAp1N=}x2^dQlk4c0wJawc4RhTtX&fF0G*c4Nk6a z2g6fPkL6zl5rJ&(DMxg| +actionstop = /usr/local/vesta/bin/v-delete-firewall-chain +actioncheck = iptables -n -L INPUT | grep -q 'fail2ban-[ \t]' +actionban = /usr/local/vesta/bin/v-add-firewall-ban +actionunban = /usr/local/vesta/bin/v-delete-firewall-ban diff --git a/install/ubuntu/13.10/fail2ban/filter.d/vesta.conf b/install/ubuntu/13.10/fail2ban/filter.d/vesta.conf new file mode 100644 index 000000000..69670a56e --- /dev/null +++ b/install/ubuntu/13.10/fail2ban/filter.d/vesta.conf @@ -0,0 +1,10 @@ +# Fail2Ban filter for unsuccesfull Vesta authentication attempts +# + +[INCLUDES] +before = common.conf + +[Definition] +failregex = .* failed to login +ignoreregex = + diff --git a/install/ubuntu/13.10/fail2ban/jail.local b/install/ubuntu/13.10/fail2ban/jail.local new file mode 100644 index 000000000..eccea0685 --- /dev/null +++ b/install/ubuntu/13.10/fail2ban/jail.local @@ -0,0 +1,39 @@ +[ssh-iptables] +enabled = true +filter = sshd +action = vesta[name=SSH] +logpath = /var/log/auth.log +maxretry = 5 + +[vsftpd-iptables] +enabled = false +filter = vsftpd +action = vesta[name=FTP] +logpath = /var/log/vsftpd.log +maxretry = 5 + +[exim-iptables] +enabled = true +filter = exim +action = vesta[name=MAIL] +logpath = /var/log/exim4/mainlog + +[dovecot-iptables] +enabled = true +filter = dovecot +action = vesta[name=MAIL] +logpath = /var/log/dovecot.log + +[mysqld-iptables] +enabled = false +filter = mysqld-auth +action = vesta[name=DB] +logpath = /var/log/mysql.log +maxretry = 5 + +[vesta-iptables] +enabled = true +filter = vesta +action = vesta[name=VESTA] +logpath = /var/log/vesta/auth.log +maxretry = 5 diff --git a/install/ubuntu/13.10/firewall.tar.gz b/install/ubuntu/13.10/firewall.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..e8556008077364323d7d6b6934e7a2cf7a734983 GIT binary patch literal 540 zcmV+%0^|K3iwFQ5XyQ}=1MQVdkJ>O4Mzij(@XnhsKo&*MSlh#7(1g=&0&FEG%?Me6ampuO4>y-_`!)kpP&FT0Pj|*j)GSV93 zG0u%P9?@5H>Ue&9TJ8w(mS4U;YbU>kw!5dto6pc!`1H`piz?!Qs? zZ2zTY(j)A}O)l`C?|(Hfn=&r%X0(YbN~&_+%&1`W&E*1z3IZzVUki(*D`*Kk5kQkG z1wFz!17_g@d9ch)G0;wCGL8I9sNtr~X-yEB=^d3PuoC0XT$oBik3eT~aJ zPYYM7vf@1@^`frQB1w}O-E1jovb=r04Y>?eKuHocY1?18ny~4FyPO>aM4!NUUOmFePy(-1M3SddTi>v8NVjB&*t=IgAYbgkDfmmx*FWy-yM^~-2uA1 z`-8QZ4$iCJUfZClsXi!k+gGp^gsj(jT}WJxQ(W4?Rswg^FKlTCd%;5d=XH e1VIo4K@bE%5ClOG1VIqwGCu%8Tmj4gC;$K)2?m1z literal 0 HcmV?d00001 diff --git a/install/ubuntu/13.10/firewall/ports.conf b/install/ubuntu/13.10/firewall/ports.conf new file mode 100644 index 000000000..a6ef4dae5 --- /dev/null +++ b/install/ubuntu/13.10/firewall/ports.conf @@ -0,0 +1,16 @@ +PROTOCOL='TCP' PORT='20' +PROTOCOL='TCP' PORT='21' +PROTOCOL='TCP' PORT='22' +PROTOCOL='TCP' PORT='25' +PROTOCOL='UDP' PORT='53' +PROTOCOL='TCP' PORT='80' +PROTOCOL='TCP' PORT='443' +PROTOCOL='TCP' PORT='110' +PROTOCOL='UDP' PORT='123' +PROTOCOL='TCP' PORT='143' +PROTOCOL='TCP' PORT='3306' +PROTOCOL='TCP' PORT='5432' +PROTOCOL='TCP' PORT='8080' +PROTOCOL='TCP' PORT='8433' +PROTOCOL='TCP' PORT='8083' +PROTOCOL='TCP' PORT='12000:12100' diff --git a/install/ubuntu/13.10/firewall/rules.conf b/install/ubuntu/13.10/firewall/rules.conf new file mode 100644 index 000000000..956c2e1d9 --- /dev/null +++ b/install/ubuntu/13.10/firewall/rules.conf @@ -0,0 +1,10 @@ +RULE='1' ACTION='ACCEPT' PROTOCOL='ICMP' PORT='0' IP='0.0.0.0/0' COMMENT='PING' SUSPENDED='no' TIME='17:13:48' DATE='2014-09-16' +RULE='2' ACTION='ACCEPT' PROTOCOL='TCP' PORT='8083' IP='0.0.0.0/0' COMMENT='VESTA' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' +RULE='3' ACTION='ACCEPT' PROTOCOL='TCP' PORT='3306,5432' IP='0.0.0.0/0' COMMENT='DB' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' +RULE='4' ACTION='ACCEPT' PROTOCOL='TCP' PORT='143,993' IP='0.0.0.0/0' COMMENT='IMAP' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' +RULE='5' ACTION='ACCEPT' PROTOCOL='TCP' PORT='110,995' IP='0.0.0.0/0' COMMENT='POP3' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' +RULE='6' ACTION='ACCEPT' PROTOCOL='TCP' PORT='25,465,587,2525' IP='0.0.0.0/0' COMMENT='SMTP' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' +RULE='7' ACTION='ACCEPT' PROTOCOL='UDP' PORT='53' IP='0.0.0.0/0' COMMENT='DNS' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' +RULE='8' ACTION='ACCEPT' PROTOCOL='TCP' PORT='21,12000-12100' IP='0.0.0.0/0' COMMENT='FTP' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' +RULE='9' ACTION='ACCEPT' PROTOCOL='TCP' PORT='80,443' IP='0.0.0.0/0' COMMENT='WEB' SUSPENDED='no' TIME='17:04:27' DATE='2014-09-24' +RULE='10' ACTION='ACCEPT' PROTOCOL='TCP' PORT='22' IP='0.0.0.0/0' COMMENT='SSH' SUSPENDED='no' TIME='17:14:41' DATE='2014-09-16' diff --git a/install/ubuntu/13.10/logrotate/apache2 b/install/ubuntu/13.10/logrotate/apache2 new file mode 100644 index 000000000..27629d0dd --- /dev/null +++ b/install/ubuntu/13.10/logrotate/apache2 @@ -0,0 +1,19 @@ +/var/log/apache2/*.log /var/log/apache2/domains/*log { + weekly + missingok + rotate 52 + compress + delaycompress + notifempty + create 640 root adm + sharedscripts + postrotate + /etc/init.d/apache2 reload > /dev/null || true + [ ! -f /var/run/nginx.pid ] || kill -USR1 `cat /var/run/nginx.pid` + endscript + prerotate + if [ -d /etc/logrotate.d/httpd-prerotate ]; then \ + run-parts /etc/logrotate.d/httpd-prerotate; \ + fi; \ + endscript +} diff --git a/install/ubuntu/13.10/logrotate/nginx b/install/ubuntu/13.10/logrotate/nginx new file mode 100644 index 000000000..d667f2135 --- /dev/null +++ b/install/ubuntu/13.10/logrotate/nginx @@ -0,0 +1,13 @@ +/var/log/nginx/*log /var/log/nginx/domains/*log { + daily + missingok + rotate 52 + compress + delaycompress + notifempty + create 640 nginx adm + sharedscripts + postrotate + [ -f /var/run/nginx.pid ] && kill -USR1 `cat /var/run/nginx.pid` + endscript +} diff --git a/install/ubuntu/13.10/logrotate/vesta b/install/ubuntu/13.10/logrotate/vesta new file mode 100644 index 000000000..027a34396 --- /dev/null +++ b/install/ubuntu/13.10/logrotate/vesta @@ -0,0 +1,7 @@ +/usr/local/vesta/log/*.log { + missingok + notifempty + size 30k + yearly + create 0600 root root +} diff --git a/install/ubuntu/13.10/mysql/my-large.cnf b/install/ubuntu/13.10/mysql/my-large.cnf new file mode 100644 index 000000000..d0bab3907 --- /dev/null +++ b/install/ubuntu/13.10/mysql/my-large.cnf @@ -0,0 +1,42 @@ +[client] +port=3306 +socket=/var/run/mysqld/mysqld.sock + +[mysqld_safe] +socket=/var/run/mysqld/mysqld.sock + +[mysqld] +user=mysql +pid-file=/var/run/mysqld/mysqld.pid +socket=/var/run/mysqld/mysqld.sock +port=3306 +basedir=/usr +datadir=/var/lib/mysql +tmpdir=/tmp +lc-messages-dir=/usr/share/mysql +log_error=/var/log/mysql/error.log + +symbolic-links=0 + +skip-external-locking +key_buffer_size = 256M +max_allowed_packet = 32M +table_open_cache = 256 +sort_buffer_size = 1M +read_buffer_size = 1M +read_rnd_buffer_size = 4M +myisam_sort_buffer_size = 64M +thread_cache_size = 8 +query_cache_size= 16M +thread_concurrency = 8 + +#innodb_use_native_aio = 0 +innodb_file_per_table + +max_connections=200 +max_user_connections=50 +wait_timeout=10 +interactive_timeout=50 +long_query_time=5 + +!includedir /etc/mysql/conf.d/ diff --git a/install/ubuntu/13.10/mysql/my-medium.cnf b/install/ubuntu/13.10/mysql/my-medium.cnf new file mode 100644 index 000000000..1c10ab9a6 --- /dev/null +++ b/install/ubuntu/13.10/mysql/my-medium.cnf @@ -0,0 +1,40 @@ +[client] +port=3306 +socket=/var/run/mysqld/mysqld.sock + +[mysqld_safe] +socket=/var/run/mysqld/mysqld.sock + +[mysqld] +user=mysql +pid-file=/var/run/mysqld/mysqld.pid +socket=/var/run/mysqld/mysqld.sock +port=3306 +basedir=/usr +datadir=/var/lib/mysql +tmpdir=/tmp +lc-messages-dir=/usr/share/mysql +log_error=/var/log/mysql/error.log + +symbolic-links=0 + +skip-external-locking +key_buffer_size = 16M +max_allowed_packet = 16M +table_open_cache = 64 +sort_buffer_size = 512K +net_buffer_length = 8K +read_buffer_size = 256K +read_rnd_buffer_size = 512K +myisam_sort_buffer_size = 8M + +#innodb_use_native_aio = 0 +innodb_file_per_table + +max_connections=70 +max_user_connections=30 +wait_timeout=10 +interactive_timeout=50 +long_query_time=5 + +!includedir /etc/mysql/conf.d/ diff --git a/install/ubuntu/13.10/mysql/my-small.cnf b/install/ubuntu/13.10/mysql/my-small.cnf new file mode 100644 index 000000000..26a804781 --- /dev/null +++ b/install/ubuntu/13.10/mysql/my-small.cnf @@ -0,0 +1,40 @@ +[client] +port=3306 +socket=/var/run/mysqld/mysqld.sock + +[mysqld_safe] +socket=/var/run/mysqld/mysqld.sock + +[mysqld] +user=mysql +pid-file=/var/run/mysqld/mysqld.pid +socket=/var/run/mysqld/mysqld.sock +port=3306 +basedir=/usr +datadir=/var/lib/mysql +tmpdir=/tmp +lc-messages-dir=/usr/share/mysql +log_error=/var/log/mysql/error.log + +symbolic-links=0 + +skip-external-locking +key_buffer_size = 16K +max_allowed_packet = 1M +table_open_cache = 4 +sort_buffer_size = 64K +read_buffer_size = 256K +read_rnd_buffer_size = 256K +net_buffer_length = 2K +thread_stack = 240K + +#innodb_use_native_aio = 0 +innodb_file_per_table + +max_connections=30 +max_user_connections=20 +wait_timeout=10 +interactive_timeout=50 +long_query_time=5 + +!includedir /etc/mysql/conf.d/ diff --git a/install/ubuntu/13.10/nginx/nginx.conf b/install/ubuntu/13.10/nginx/nginx.conf new file mode 100644 index 000000000..7937301c1 --- /dev/null +++ b/install/ubuntu/13.10/nginx/nginx.conf @@ -0,0 +1,124 @@ +# Server globals +user www-data; +worker_processes 2; +error_log /var/log/nginx/error.log; +pid /var/run/nginx.pid; + + +# Worker config +events { + worker_connections 1024; + use epoll; +} + + +http { + # Main settings + sendfile on; + tcp_nopush on; + tcp_nodelay on; + client_header_timeout 1m; + client_body_timeout 1m; + client_header_buffer_size 2k; + client_body_buffer_size 256k; + client_max_body_size 100m; + large_client_header_buffers 4 8k; + send_timeout 30; + keepalive_timeout 60 60; + reset_timedout_connection on; + server_tokens off; + server_name_in_redirect off; + server_names_hash_max_size 512; + server_names_hash_bucket_size 512; + + + # Log format + log_format main '$remote_addr - $remote_user [$time_local] $request ' + '"$status" $body_bytes_sent "$http_referer" ' + '"$http_user_agent" "$http_x_forwarded_for"'; + log_format bytes '$body_bytes_sent'; + #access_log /var/log/nginx/access.log main; + access_log off; + + + # Mime settings + include /etc/nginx/mime.types; + default_type application/octet-stream; + + + # Compression + gzip on; + gzip_comp_level 9; + gzip_min_length 512; + gzip_buffers 8 64k; + gzip_types text/plain text/css text/javascript + application/x-javascript; + gzip_proxied any; + + + # Proxy settings + proxy_redirect off; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_pass_header Set-Cookie; + proxy_connect_timeout 90; + proxy_send_timeout 90; + proxy_read_timeout 90; + proxy_buffers 32 4k; + + + # Cloudflare https://www.cloudflare.com/ips + set_real_ip_from 199.27.128.0/21; + set_real_ip_from 173.245.48.0/20; + set_real_ip_from 103.21.244.0/22; + set_real_ip_from 103.22.200.0/22; + set_real_ip_from 103.31.4.0/22; + set_real_ip_from 141.101.64.0/18; + set_real_ip_from 108.162.192.0/18; + set_real_ip_from 190.93.240.0/20; + set_real_ip_from 188.114.96.0/20; + set_real_ip_from 197.234.240.0/22; + set_real_ip_from 198.41.128.0/17; + set_real_ip_from 162.158.0.0/15; + set_real_ip_from 104.16.0.0/12; + set_real_ip_from 172.64.0.0/13; + #set_real_ip_from 2400:cb00::/32; + #set_real_ip_from 2606:4700::/32; + #set_real_ip_from 2803:f800::/32; + #set_real_ip_from 2405:b500::/32; + #set_real_ip_from 2405:8100::/32; + real_ip_header CF-Connecting-IP; + + + # SSL PCI Compliance + ssl_session_cache shared:SSL:10m; + ssl_protocols TLSv1 TLSv1.1 TLSv1.2; + ssl_prefer_server_ciphers on; + ssl_ciphers "ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA:ECDHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES128-SHA256:DHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES256-GCM-SHA384:AES128-GCM-SHA256:AES256-SHA256:AES128-SHA256:AES256-SHA:AES128-SHA:DES-CBC3-SHA:HIGH:!aNULL:!eNULL:!EXPORT:!DES:!MD5:!PSK:!RC4"; + + + # Error pages + error_page 403 /error/403.html; + error_page 404 /error/404.html; + error_page 502 503 504 /error/50x.html; + + + # Cache + proxy_cache_path /var/cache/nginx levels=2 keys_zone=cache:10m inactive=60m max_size=512m; + proxy_cache_key "$host$request_uri $cookie_user"; + proxy_temp_path /var/cache/nginx/temp; + proxy_ignore_headers Expires Cache-Control; + proxy_cache_use_stale error timeout invalid_header http_502; + proxy_cache_valid any 3d; + + map $http_cookie $no_cache { + default 0; + ~SESS 1; + ~wordpress_logged_in 1; + } + + + # Wildcard include + include /etc/nginx/conf.d/*.conf; +} diff --git a/install/ubuntu/13.10/nginx/phpmyadmin.inc b/install/ubuntu/13.10/nginx/phpmyadmin.inc new file mode 100644 index 000000000..d70ca3e3c --- /dev/null +++ b/install/ubuntu/13.10/nginx/phpmyadmin.inc @@ -0,0 +1,15 @@ +location /phpmyadmin { + alias /usr/share/phpmyadmin/; + + location ~ /(libraries|setup) { + return 404; + } + + location ~ ^/phpmyadmin/(.*\.php)$ { + alias /usr/share/phpmyadmin/$1; + fastcgi_pass 127.0.0.1:9000; + fastcgi_index index.php; + include fastcgi_params; + fastcgi_param SCRIPT_FILENAME $request_filename; + } +} diff --git a/install/ubuntu/13.10/nginx/phppgadmin.inc b/install/ubuntu/13.10/nginx/phppgadmin.inc new file mode 100644 index 000000000..cd1e5806b --- /dev/null +++ b/install/ubuntu/13.10/nginx/phppgadmin.inc @@ -0,0 +1,11 @@ +location /phppgadmin { + alias /usr/share/phppgadmin/; + + location ~ ^/phppgadmin/(.*\.php)$ { + alias /usr/share/phppgadmin/$1; + fastcgi_pass 127.0.0.1:9000; + fastcgi_index index.php; + include fastcgi_params; + fastcgi_param SCRIPT_FILENAME $request_filename; + } +} diff --git a/install/ubuntu/13.10/nginx/status.conf b/install/ubuntu/13.10/nginx/status.conf new file mode 100644 index 000000000..c0bcd0691 --- /dev/null +++ b/install/ubuntu/13.10/nginx/status.conf @@ -0,0 +1,9 @@ +server { + listen 127.0.0.1:8084 default; + server_name _; + server_name_in_redirect off; + location / { + stub_status on; + access_log off; + } +} diff --git a/install/ubuntu/13.10/nginx/webmail.inc b/install/ubuntu/13.10/nginx/webmail.inc new file mode 100644 index 000000000..ad66895bc --- /dev/null +++ b/install/ubuntu/13.10/nginx/webmail.inc @@ -0,0 +1,15 @@ +location /webmail { + alias /var/lib/roundcube/; + + location ~ /(config|temp|logs) { + return 404; + } + + location ~ ^/webmail/(.*\.php)$ { + alias /var/lib/roundcube/$1; + fastcgi_pass 127.0.0.1:9000; + fastcgi_index index.php; + include fastcgi_params; + fastcgi_param SCRIPT_FILENAME $request_filename; + } +} diff --git a/install/ubuntu/13.10/packages.tar.gz b/install/ubuntu/13.10/packages.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..4b778dadce20a61f03a8ca920ec81c55a8730fee GIT binary patch literal 562 zcmV-20?qv&iwFRHoJ3Lp1MQYgkD5>vhFSY7+_9e37(#VaFxE7E(hXh3fdi2rFJZkFya3gX^b)n zVXSCG>M9q!r;?X63%1>^6fD25GP?9(Zs8i zm#eSAOO(kSvCYUG8}`JzlNGcp7>;dtR#6ZOYcoV)W|{76R22A_Q=gJo4AXSy6Mw(T z@QvYNS99i079ZTgdF&uH#Hm!H2Tkno>k1^mATb^lABoBo#r=lG9NGXU~REdk0(83B2vo&kr_ zAp~{{4=IqJS7Kl{UdaJ`lmmICl^~$|AizYY10B;!5Re`k^vG)ug3|w@mF?UAH~v$N z5%B*SfdB3Ik9DT%#Rp2&fAy{S9|r3<{gP~x+kO96-v30?!2fG-8UK&;KeGQw{$uw~ zsNXQZA^ut3x1l|*XixdCp}qF{wFdwI0000000000000000RC})0(q@EkpL(F05 diff --git a/install/ubuntu/13.10/pga/phppgadmin.conf b/install/ubuntu/13.10/pga/phppgadmin.conf new file mode 100644 index 000000000..f39247d6f --- /dev/null +++ b/install/ubuntu/13.10/pga/phppgadmin.conf @@ -0,0 +1,31 @@ +Alias /phppgadmin /usr/share/phppgadmin + + + +DirectoryIndex index.php +AllowOverride None + +order deny,allow +deny from all +allow from 127.0.0.0/255.0.0.0 ::1/128 +allow from all + + + php_flag magic_quotes_gpc Off + php_flag track_vars On + php_value include_path . + + + + + AddType application/x-httpd-php .php + Action application/x-httpd-php /cgi-bin/php + + + AddType application/x-httpd-php .php + Action application/x-httpd-php /cgi-bin/php + + + + + diff --git a/install/ubuntu/13.10/php5-fpm/www.conf b/install/ubuntu/13.10/php5-fpm/www.conf new file mode 100644 index 000000000..d046bceef --- /dev/null +++ b/install/ubuntu/13.10/php5-fpm/www.conf @@ -0,0 +1,10 @@ +[www] +listen = 127.0.0.1:9000 +listen.allowed_clients = 127.0.0.1 +user = www-data +group = www-data +pm = dynamic +pm.max_children = 50 +pm.start_servers = 5 +pm.min_spare_servers = 3 +pm.max_spare_servers = 35 diff --git a/install/ubuntu/13.10/pma/apache.conf b/install/ubuntu/13.10/pma/apache.conf new file mode 100644 index 000000000..2a8f69e25 --- /dev/null +++ b/install/ubuntu/13.10/pma/apache.conf @@ -0,0 +1,42 @@ +# phpMyAdmin default Apache configuration + +Alias /phpmyadmin /usr/share/phpmyadmin + + + Options FollowSymLinks + DirectoryIndex index.php + + + AddType application/x-httpd-php .php + + php_flag magic_quotes_gpc Off + php_flag track_vars On + php_flag register_globals Off + php_admin_flag allow_url_fopen Off + php_value include_path . + php_admin_value upload_tmp_dir /var/lib/phpmyadmin/tmp + php_admin_value open_basedir /usr/share/phpmyadmin/:/etc/phpmyadmin/:/var/lib/phpmyadmin/:/usr/share/php/php-gettext + + + + +# Authorize for setup + + + AuthType Basic + AuthName "phpMyAdmin Setup" + AuthUserFile /etc/phpmyadmin/htpasswd.setup + + Require valid-user + + +# Disallow web access to directories that don't need it + + Order Deny,Allow + Deny from All + + + Order Deny,Allow + Deny from All + + diff --git a/install/ubuntu/13.10/pma/config.inc.php b/install/ubuntu/13.10/pma/config.inc.php new file mode 100644 index 000000000..a643a065b --- /dev/null +++ b/install/ubuntu/13.10/pma/config.inc.php @@ -0,0 +1,146 @@ + + VRootEngine on + VRootAlias /etc/security/pam_env.conf etc/security/pam_env.conf +         + +AuthPAMConfig proftpd +AuthOrder mod_auth_pam.c* mod_auth_unix.c +UseReverseDNS off +User proftpd +Group nogroup +MaxInstances 20 +UseSendfile off +LogFormat default "%h %l %u %t \"%r\" %s %b" +LogFormat auth "%v [%P] %h %t \"%r\" %s" +ListOptions -a +RequireValidShell off +PassivePorts 12000 12100 + + + Umask 002 + IdentLookups off + AllowOverwrite yes + + AllowAll + + diff --git a/install/ubuntu/13.10/roundcube/apache.conf b/install/ubuntu/13.10/roundcube/apache.conf new file mode 100644 index 000000000..a0c87bcc6 --- /dev/null +++ b/install/ubuntu/13.10/roundcube/apache.conf @@ -0,0 +1,40 @@ +Alias /roundcube/program/js/tiny_mce/ /usr/share/tinymce/www/ +Alias /roundcube /var/lib/roundcube +Alias /webmail /var/lib/roundcube + +# Access to tinymce files + + Options Indexes MultiViews FollowSymLinks + AllowOverride None + Order allow,deny + allow from all + + + + Options +FollowSymLinks + # This is needed to parse /var/lib/roundcube/.htaccess. See its + # content before setting AllowOverride to None. + AllowOverride All + order allow,deny + allow from all + + +# Protecting basic directories: + + Options -FollowSymLinks + AllowOverride None + + + + Options -FollowSymLinks + AllowOverride None + Order allow,deny + Deny from all + + + + Options -FollowSymLinks + AllowOverride None + Order allow,deny + Deny from all + diff --git a/install/ubuntu/13.10/roundcube/config.inc.php b/install/ubuntu/13.10/roundcube/config.inc.php new file mode 100644 index 000000000..0c82b1bc1 --- /dev/null +++ b/install/ubuntu/13.10/roundcube/config.inc.php @@ -0,0 +1,33 @@ + diff --git a/install/ubuntu/13.10/roundcube/main.inc.php b/install/ubuntu/13.10/roundcube/main.inc.php new file mode 100644 index 000000000..97cdbf2df --- /dev/null +++ b/install/ubuntu/13.10/roundcube/main.inc.php @@ -0,0 +1,850 @@ +/sendmail or to syslog +$rcmail_config['smtp_log'] = true; + +// Log successful logins to /userlogins or to syslog +$rcmail_config['log_logins'] = false; + +// Log session authentication errors to /session or to syslog +$rcmail_config['log_session'] = false; + +// Log SQL queries to /sql or to syslog +$rcmail_config['sql_debug'] = false; + +// Log IMAP conversation to /imap or to syslog +$rcmail_config['imap_debug'] = false; + +// Log LDAP conversation to /ldap or to syslog +$rcmail_config['ldap_debug'] = false; + +// Log SMTP conversation to /smtp or to syslog +$rcmail_config['smtp_debug'] = false; + +// ---------------------------------- +// IMAP +// ---------------------------------- + +// the mail host chosen to perform the log-in +// leave blank to show a textbox at login, give a list of hosts +// to display a pulldown menu or set one host as string. +// To use SSL/TLS connection, enter hostname with prefix ssl:// or tls:// +// Supported replacement variables: +// %n - http hostname ($_SERVER['SERVER_NAME']) +// %d - domain (http hostname without the first part) +// %s - domain name after the '@' from e-mail address provided at login screen +// For example %n = mail.domain.tld, %d = domain.tld +$rcmail_config['default_host'] = 'localhost'; + +// TCP port used for IMAP connections +$rcmail_config['default_port'] = 143; + +// IMAP AUTH type (DIGEST-MD5, CRAM-MD5, LOGIN, PLAIN or empty to use +// best server supported one) +$rcmail_config['imap_auth_type'] = null; + +// If you know your imap's folder delimiter, you can specify it here. +// Otherwise it will be determined automatically +$rcmail_config['imap_delimiter'] = null; + +// If IMAP server doesn't support NAMESPACE extension, but you're +// using shared folders or personal root folder is non-empty, you'll need to +// set these options. All can be strings or arrays of strings. +// Folders need to be ended with directory separator, e.g. "INBOX." +// (special directory "~" is an exception to this rule) +// These can be used also to overwrite server's namespaces +$rcmail_config['imap_ns_personal'] = null; +$rcmail_config['imap_ns_other'] = null; +$rcmail_config['imap_ns_shared'] = null; + +// By default IMAP capabilities are readed after connection to IMAP server +// In some cases, e.g. when using IMAP proxy, there's a need to refresh the list +// after login. Set to True if you've got this case. +$rcmail_config['imap_force_caps'] = false; + +// By default list of subscribed folders is determined using LIST-EXTENDED +// extension if available. Some servers (dovecot 1.x) returns wrong results +// for shared namespaces in this case. http://trac.roundcube.net/ticket/1486225 +// Enable this option to force LSUB command usage instead. +$rcmail_config['imap_force_lsub'] = false; + +// Some server configurations (e.g. Courier) doesn't list folders in all namespaces +// Enable this option to force listing of folders in all namespaces +$rcmail_config['imap_force_ns'] = false; + +// IMAP connection timeout, in seconds. Default: 0 (no limit) +$rcmail_config['imap_timeout'] = 0; + +// Optional IMAP authentication identifier to be used as authorization proxy +$rcmail_config['imap_auth_cid'] = null; + +// Optional IMAP authentication password to be used for imap_auth_cid +$rcmail_config['imap_auth_pw'] = null; + +// Type of IMAP indexes cache. Supported values: 'db', 'apc' and 'memcache'. +$rcmail_config['imap_cache'] = null; + +// Enables messages cache. Only 'db' cache is supported. +$rcmail_config['messages_cache'] = false; + + +// ---------------------------------- +// SMTP +// ---------------------------------- + +// SMTP server host (for sending mails). +// To use SSL/TLS connection, enter hostname with prefix ssl:// or tls:// +// If left blank, the PHP mail() function is used +// Supported replacement variables: +// %h - user's IMAP hostname +// %n - http hostname ($_SERVER['SERVER_NAME']) +// %d - domain (http hostname without the first part) +// %z - IMAP domain (IMAP hostname without the first part) +// For example %n = mail.domain.tld, %d = domain.tld +$rcmail_config['smtp_server'] = ''; + +// SMTP port (default is 25; use 587 for STARTTLS or 465 for the +// deprecated SSL over SMTP (aka SMTPS)) +$rcmail_config['smtp_port'] = 25; + +// SMTP username (if required) if you use %u as the username Roundcube +// will use the current username for login +$rcmail_config['smtp_user'] = ''; + +// SMTP password (if required) if you use %p as the password Roundcube +// will use the current user's password for login +$rcmail_config['smtp_pass'] = ''; + +// SMTP AUTH type (DIGEST-MD5, CRAM-MD5, LOGIN, PLAIN or empty to use +// best server supported one) +$rcmail_config['smtp_auth_type'] = ''; + +// Optional SMTP authentication identifier to be used as authorization proxy +$rcmail_config['smtp_auth_cid'] = null; + +// Optional SMTP authentication password to be used for smtp_auth_cid +$rcmail_config['smtp_auth_pw'] = null; + +// SMTP HELO host +// Hostname to give to the remote server for SMTP 'HELO' or 'EHLO' messages +// Leave this blank and you will get the server variable 'server_name' or +// localhost if that isn't defined. +$rcmail_config['smtp_helo_host'] = ''; + +// SMTP connection timeout, in seconds. Default: 0 (no limit) +$rcmail_config['smtp_timeout'] = 0; + +// ---------------------------------- +// SYSTEM +// ---------------------------------- +include_once("/etc/roundcube/debian-db-roundcube.php"); + + +// THIS OPTION WILL ALLOW THE INSTALLER TO RUN AND CAN EXPOSE SENSITIVE CONFIG DATA. +// ONLY ENABLE IT IF YOU'RE REALLY SURE WHAT YOU'RE DOING! +$rcmail_config['enable_installer'] = false; + +// provide an URL where a user can get support for this Roundcube installation +// PLEASE DO NOT LINK TO THE ROUNDCUBE.NET WEBSITE HERE! +$rcmail_config['support_url'] = ''; + +// replace Roundcube logo with this image +// specify an URL relative to the document root of this Roundcube installation +$rcmail_config['skin_logo'] = null; + +// automatically create a new Roundcube user when log-in the first time. +// a new user will be created once the IMAP login succeeds. +// set to false if only registered users can use this service +$rcmail_config['auto_create_user'] = true; + +// use this folder to store log files (must be writeable for apache user) +// This is used by the 'file' log driver. +$rcmail_config['log_dir'] = '/var/log/roundcubemail/'; + +// use this folder to store temp files (must be writeable for apache user) +$rcmail_config['temp_dir'] = '/tmp'; + +// lifetime of message cache +// possible units: s, m, h, d, w +$rcmail_config['message_cache_lifetime'] = '10d'; + +// enforce connections over https +// with this option enabled, all non-secure connections will be redirected. +// set the port for the ssl connection as value of this option if it differs from the default 443 +$rcmail_config['force_https'] = false; + +// tell PHP that it should work as under secure connection +// even if it doesn't recognize it as secure ($_SERVER['HTTPS'] is not set) +// e.g. when you're running Roundcube behind a https proxy +// this option is mutually exclusive to 'force_https' and only either one of them should be set to true. +$rcmail_config['use_https'] = false; + +// Allow browser-autocompletion on login form. +// 0 - disabled, 1 - username and host only, 2 - username, host, password +$rcmail_config['login_autocomplete'] = 0; + +// Forces conversion of logins to lower case. +// 0 - disabled, 1 - only domain part, 2 - domain and local part. +// If users authentication is not case-sensitive this must be enabled. +// After enabling it all user records need to be updated, e.g. with query: +// UPDATE users SET username = LOWER(username); +$rcmail_config['login_lc'] = 0; + +// Includes should be interpreted as PHP files +$rcmail_config['skin_include_php'] = false; + +// display software version on login screen +$rcmail_config['display_version'] = false; + +// Session lifetime in minutes +// must be greater than 'keep_alive'/60 +$rcmail_config['session_lifetime'] = 10; + +// session domain: .example.org +$rcmail_config['session_domain'] = ''; + +// session name. Default: 'roundcube_sessid' +$rcmail_config['session_name'] = null; + +// Backend to use for session storage. Can either be 'db' (default) or 'memcache' +// If set to memcache, a list of servers need to be specified in 'memcache_hosts' +// Make sure the Memcache extension (http://pecl.php.net/package/memcache) version >= 2.0.0 is installed +$rcmail_config['session_storage'] = 'db'; + +// Use these hosts for accessing memcached +// Define any number of hosts in the form of hostname:port or unix:///path/to/sock.file +$rcmail_config['memcache_hosts'] = null; // e.g. array( 'localhost:11211', '192.168.1.12:11211', 'unix:///var/tmp/memcached.sock' ); + +// check client IP in session athorization +$rcmail_config['ip_check'] = false; + +// check referer of incoming requests +$rcmail_config['referer_check'] = false; + +// X-Frame-Options HTTP header value sent to prevent from Clickjacking. +// Possible values: sameorigin|deny. Set to false in order to disable sending them +$rcmail_config['x_frame_options'] = 'sameorigin'; + +// this key is used to encrypt the users imap password which is stored +// in the session record (and the client cookie if remember password is enabled). +// please provide a string of exactly 24 chars. +$rcmail_config['des_key'] = 'vtIOjLZo9kffJoqzpSbm5r1r'; + +// Automatically add this domain to user names for login +// Only for IMAP servers that require full e-mail addresses for login +// Specify an array with 'host' => 'domain' values to support multiple hosts +// Supported replacement variables: +// %h - user's IMAP hostname +// %n - http hostname ($_SERVER['SERVER_NAME']) +// %d - domain (http hostname without the first part) +// %z - IMAP domain (IMAP hostname without the first part) +// For example %n = mail.domain.tld, %d = domain.tld +$rcmail_config['username_domain'] = ''; + +// This domain will be used to form e-mail addresses of new users +// Specify an array with 'host' => 'domain' values to support multiple hosts +// Supported replacement variables: +// %h - user's IMAP hostname +// %n - http hostname ($_SERVER['SERVER_NAME']) +// %d - domain (http hostname without the first part) +// %z - IMAP domain (IMAP hostname without the first part) +// For example %n = mail.domain.tld, %d = domain.tld +$rcmail_config['mail_domain'] = ''; + +// Password charset. +// Use it if your authentication backend doesn't support UTF-8. +// Defaults to ISO-8859-1 for backward compatibility +$rcmail_config['password_charset'] = 'ISO-8859-1'; + +// How many seconds must pass between emails sent by a user +$rcmail_config['sendmail_delay'] = 0; + +// Maximum number of recipients per message. Default: 0 (no limit) +$rcmail_config['max_recipients'] = 0; + +// Maximum allowednumber of members of an address group. Default: 0 (no limit) +// If 'max_recipients' is set this value should be less or equal +$rcmail_config['max_group_members'] = 0; + +// add this user-agent to message headers when sending +$rcmail_config['useragent'] = 'Roundcube Webmail/'.RCMAIL_VERSION; + +// use this name to compose page titles +$rcmail_config['product_name'] = 'Roundcube Webmail'; + +// try to load host-specific configuration +// see http://trac.roundcube.net/wiki/Howto_Config for more details +$rcmail_config['include_host_config'] = false; + +// path to a text file which will be added to each sent message +// paths are relative to the Roundcube root folder +$rcmail_config['generic_message_footer'] = ''; + +// path to a text file which will be added to each sent HTML message +// paths are relative to the Roundcube root folder +$rcmail_config['generic_message_footer_html'] = ''; + +// add a received header to outgoing mails containing the creators IP and hostname +$rcmail_config['http_received_header'] = false; + +// Whether or not to encrypt the IP address and the host name +// these could, in some circles, be considered as sensitive information; +// however, for the administrator, these could be invaluable help +// when tracking down issues. +$rcmail_config['http_received_header_encrypt'] = false; + +// This string is used as a delimiter for message headers when sending +// a message via mail() function. Leave empty for auto-detection +$rcmail_config['mail_header_delimiter'] = NULL; + +// number of chars allowed for line when wrapping text. +// text wrapping is done when composing/sending messages +$rcmail_config['line_length'] = 72; + +// send plaintext messages as format=flowed +$rcmail_config['send_format_flowed'] = true; + +// don't allow these settings to be overriden by the user +$rcmail_config['dont_override'] = array(); + +// Set identities access level: +// 0 - many identities with possibility to edit all params +// 1 - many identities with possibility to edit all params but not email address +// 2 - one identity with possibility to edit all params +// 3 - one identity with possibility to edit all params but not email address +$rcmail_config['identities_level'] = 0; + +// Mimetypes supported by the browser. +// attachments of these types will open in a preview window +// either a comma-separated list or an array: 'text/plain,text/html,text/xml,image/jpeg,image/gif,image/png,application/pdf' +$rcmail_config['client_mimetypes'] = null; # null == default + +// mime magic database +$rcmail_config['mime_magic'] = null; + +// path to imagemagick identify binary +$rcmail_config['im_identify_path'] = null; + +// path to imagemagick convert binary +$rcmail_config['im_convert_path'] = null; + +// maximum size of uploaded contact photos in pixel +$rcmail_config['contact_photo_size'] = 160; + +// Enable DNS checking for e-mail address validation +$rcmail_config['email_dns_check'] = false; + +// ---------------------------------- +// PLUGINS +// ---------------------------------- + +// List of active plugins (in plugins/ directory) +$rcmail_config['plugins'] = array('password'); + +// ---------------------------------- +// USER INTERFACE +// ---------------------------------- + +// default messages sort column. Use empty value for default server's sorting, +// or 'arrival', 'date', 'subject', 'from', 'to', 'fromto', 'size', 'cc' +$rcmail_config['message_sort_col'] = ''; + +// default messages sort order +$rcmail_config['message_sort_order'] = 'DESC'; + +// These cols are shown in the message list. Available cols are: +// subject, from, to, fromto, cc, replyto, date, size, status, flag, attachment, 'priority' +$rcmail_config['list_cols'] = array('subject', 'status', 'fromto', 'date', 'size', 'flag', 'attachment'); + +// the default locale setting (leave empty for auto-detection) +// RFC1766 formatted language name like en_US, de_DE, de_CH, fr_FR, pt_BR +$rcmail_config['language'] = null; + +// use this format for date display (date or strftime format) +$rcmail_config['date_format'] = 'Y-m-d'; + +// give this choice of date formats to the user to select from +$rcmail_config['date_formats'] = array('Y-m-d', 'd-m-Y', 'Y/m/d', 'm/d/Y', 'd/m/Y', 'd.m.Y', 'j.n.Y'); + +// use this format for time display (date or strftime format) +$rcmail_config['time_format'] = 'H:i'; + +// give this choice of time formats to the user to select from +$rcmail_config['time_formats'] = array('G:i', 'H:i', 'g:i a', 'h:i A'); + +// use this format for short date display (derived from date_format and time_format) +$rcmail_config['date_short'] = 'D H:i'; + +// use this format for detailed date/time formatting (derived from date_format and time_format) +$rcmail_config['date_long'] = 'Y-m-d H:i'; + +// store draft message is this mailbox +// leave blank if draft messages should not be stored +// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP) +$rcmail_config['drafts_mbox'] = 'Drafts'; + +// store spam messages in this mailbox +// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP) +$rcmail_config['junk_mbox'] = 'Spam'; + +// store sent message is this mailbox +// leave blank if sent messages should not be stored +// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP) +$rcmail_config['sent_mbox'] = 'Sent'; + +// move messages to this folder when deleting them +// leave blank if they should be deleted directly +// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP) +$rcmail_config['trash_mbox'] = 'Trash'; + +// display these folders separately in the mailbox list. +// these folders will also be displayed with localized names +// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP) +$rcmail_config['default_folders'] = array('INBOX', 'Drafts', 'Sent', 'Spam', 'Trash'); +$rcmail_config['default_imap_folders'] = array('INBOX', 'Drafts', 'Sent', 'Spam', 'Trash'); + +// automatically create the above listed default folders on first login +$rcmail_config['create_default_folders'] = true; + +// protect the default folders from renames, deletes, and subscription changes +$rcmail_config['protect_default_folders'] = true; + +// if in your system 0 quota means no limit set this option to true +$rcmail_config['quota_zero_as_unlimited'] = false; + +// Make use of the built-in spell checker. It is based on GoogieSpell. +// Since Google only accepts connections over https your PHP installatation +// requires to be compiled with Open SSL support +$rcmail_config['enable_spellcheck'] = true; + +// Enables spellchecker exceptions dictionary. +// Setting it to 'shared' will make the dictionary shared by all users. +$rcmail_config['spellcheck_dictionary'] = false; + +// Set the spell checking engine. 'googie' is the default. 'pspell' is also available, +// but requires the Pspell extensions. When using Nox Spell Server, also set 'googie' here. +$rcmail_config['spellcheck_engine'] = 'googie'; + +// For a locally installed Nox Spell Server, please specify the URI to call it. +// Get Nox Spell Server from http://orangoo.com/labs/?page_id=72 +// Leave empty to use the Google spell checking service, what means +// that the message content will be sent to Google in order to check spelling +$rcmail_config['spellcheck_uri'] = ''; + +// These languages can be selected for spell checking. +// Configure as a PHP style hash array: array('en'=>'English', 'de'=>'Deutsch'); +// Leave empty for default set of available language. +$rcmail_config['spellcheck_languages'] = NULL; + +// Makes that words with all letters capitalized will be ignored (e.g. GOOGLE) +$rcmail_config['spellcheck_ignore_caps'] = false; + +// Makes that words with numbers will be ignored (e.g. g00gle) +$rcmail_config['spellcheck_ignore_nums'] = false; + +// Makes that words with symbols will be ignored (e.g. g@@gle) +$rcmail_config['spellcheck_ignore_syms'] = false; + +// Use this char/string to separate recipients when composing a new message +$rcmail_config['recipients_separator'] = ','; + +// don't let users set pagesize to more than this value if set +$rcmail_config['max_pagesize'] = 200; + +// Minimal value of user's 'keep_alive' setting (in seconds) +// Must be less than 'session_lifetime' +$rcmail_config['min_keep_alive'] = 60; + +// Enables files upload indicator. Requires APC installed and enabled apc.rfc1867 option. +// By default refresh time is set to 1 second. You can set this value to true +// or any integer value indicating number of seconds. +$rcmail_config['upload_progress'] = false; + +// Specifies for how many seconds the Undo button will be available +// after object delete action. Currently used with supporting address book sources. +// Setting it to 0, disables the feature. +$rcmail_config['undo_timeout'] = 0; + +// ---------------------------------- +// ADDRESSBOOK SETTINGS +// ---------------------------------- + +// This indicates which type of address book to use. Possible choises: +// 'sql' (default) and 'ldap'. +// If set to 'ldap' then it will look at using the first writable LDAP +// address book as the primary address book and it will not display the +// SQL address book in the 'Address Book' view. +$rcmail_config['address_book_type'] = 'sql'; + +// In order to enable public ldap search, configure an array like the Verisign +// example further below. if you would like to test, simply uncomment the example. +// Array key must contain only safe characters, ie. a-zA-Z0-9_ +$rcmail_config['ldap_public'] = array(); + +// If you are going to use LDAP for individual address books, you will need to +// set 'user_specific' to true and use the variables to generate the appropriate DNs to access it. +// +// The recommended directory structure for LDAP is to store all the address book entries +// under the users main entry, e.g.: +// +// o=root +// ou=people +// uid=user@domain +// mail=contact@contactdomain +// +// So the base_dn would be uid=%fu,ou=people,o=root +// The bind_dn would be the same as based_dn or some super user login. +/* + * example config for Verisign directory + * +$rcmail_config['ldap_public']['Verisign'] = array( + 'name' => 'Verisign.com', + // Replacement variables supported in host names: + // %h - user's IMAP hostname + // %n - http hostname ($_SERVER['SERVER_NAME']) + // %d - domain (http hostname without the first part) + // %z - IMAP domain (IMAP hostname without the first part) + // For example %n = mail.domain.tld, %d = domain.tld + 'hosts' => array('directory.verisign.com'), + 'port' => 389, + 'use_tls' => false, + 'ldap_version' => 3, // using LDAPv3 + 'user_specific' => false, // If true the base_dn, bind_dn and bind_pass default to the user's IMAP login. + // %fu - The full username provided, assumes the username is an email + // address, uses the username_domain value if not an email address. + // %u - The username prior to the '@'. + // %d - The domain name after the '@'. + // %dc - The domain name hierarchal string e.g. "dc=test,dc=domain,dc=com" + // %dn - DN found by ldap search when search_filter/search_base_dn are used + 'base_dn' => '', + 'bind_dn' => '', + 'bind_pass' => '', + // It's possible to bind for an individual address book + // The login name is used to search for the DN to bind with + 'search_base_dn' => '', + 'search_filter' => '', // e.g. '(&(objectClass=posixAccount)(uid=%u))' + // DN and password to bind as before searching for bind DN, if anonymous search is not allowed + 'search_bind_dn' => '', + 'search_bind_pw' => '', + // Default for %dn variable if search doesn't return DN value + 'search_dn_default' => '', + // Optional authentication identifier to be used as SASL authorization proxy + // bind_dn need to be empty + 'auth_cid' => '', + // SASL authentication method (for proxy auth), e.g. DIGEST-MD5 + 'auth_method' => '', + // Indicates if the addressbook shall be hidden from the list. + // With this option enabled you can still search/view contacts. + 'hidden' => false, + // Indicates if the addressbook shall not list contacts but only allows searching. + 'searchonly' => false, + // Indicates if we can write to the LDAP directory or not. + // If writable is true then these fields need to be populated: + // LDAP_Object_Classes, required_fields, LDAP_rdn + 'writable' => false, + // To create a new contact these are the object classes to specify + // (or any other classes you wish to use). + 'LDAP_Object_Classes' => array('top', 'inetOrgPerson'), + // The RDN field that is used for new entries, this field needs + // to be one of the search_fields, the base of base_dn is appended + // to the RDN to insert into the LDAP directory. + 'LDAP_rdn' => 'cn', + // The required fields needed to build a new contact as required by + // the object classes (can include additional fields not required by the object classes). + 'required_fields' => array('cn', 'sn', 'mail'), + 'search_fields' => array('mail', 'cn'), // fields to search in + // mapping of contact fields to directory attributes + // for every attribute one can specify the number of values (limit) allowed. + // default is 1, a wildcard * means unlimited + 'fieldmap' => array( + // Roundcube => LDAP:limit + 'name' => 'cn', + 'surname' => 'sn', + 'firstname' => 'givenName', + 'title' => 'title', + 'email' => 'mail:*', + 'phone:home' => 'homePhone', + 'phone:work' => 'telephoneNumber', + 'phone:mobile' => 'mobile', + 'phone:pager' => 'pager', + 'street' => 'street', + 'zipcode' => 'postalCode', + 'region' => 'st', + 'locality' => 'l', +// if you uncomment country, you need to modify 'sub_fields' above +// 'country' => 'c', + 'department' => 'departmentNumber', + 'notes' => 'description', +// these currently don't work: +// 'phone:workfax' => 'facsimileTelephoneNumber', +// 'photo' => 'jpegPhoto', +// 'organization' => 'o', +// 'manager' => 'manager', +// 'assistant' => 'secretary', + ), + // Map of contact sub-objects (attribute name => objectClass(es)), e.g. 'c' => 'country' + 'sub_fields' => array(), + 'sort' => 'cn', // The field to sort the listing by. + 'scope' => 'sub', // search mode: sub|base|list + 'filter' => '(objectClass=inetOrgPerson)', // used for basic listing (if not empty) and will be &'d with search queries. example: status=act + 'fuzzy_search' => true, // server allows wildcard search + 'vlv' => false, // Enable Virtual List View to more efficiently fetch paginated data (if server supports it) + 'numsub_filter' => '(objectClass=organizationalUnit)', // with VLV, we also use numSubOrdinates to query the total number of records. Set this filter to get all numSubOrdinates attributes for counting + 'sizelimit' => '0', // Enables you to limit the count of entries fetched. Setting this to 0 means no limit. + 'timelimit' => '0', // Sets the number of seconds how long is spend on the search. Setting this to 0 means no limit. + 'referrals' => true|false, // Sets the LDAP_OPT_REFERRALS option. Mostly used in multi-domain Active Directory setups + + // definition for contact groups (uncomment if no groups are supported) + // for the groups base_dn, the user replacements %fu, %u, $d and %dc work as for base_dn (see above) + // if the groups base_dn is empty, the contact base_dn is used for the groups as well + // -> in this case, assure that groups and contacts are separated due to the concernig filters! + 'groups' => array( + 'base_dn' => '', + 'scope' => 'sub', // search mode: sub|base|list + 'filter' => '(objectClass=groupOfNames)', + 'object_classes' => array("top", "groupOfNames"), + 'member_attr' => 'member', // name of the member attribute, e.g. uniqueMember + 'name_attr' => 'cn', // attribute to be used as group name + ), +); +*/ + +// An ordered array of the ids of the addressbooks that should be searched +// when populating address autocomplete fields server-side. ex: array('sql','Verisign'); +$rcmail_config['autocomplete_addressbooks'] = array('sql'); + +// The minimum number of characters required to be typed in an autocomplete field +// before address books will be searched. Most useful for LDAP directories that +// may need to do lengthy results building given overly-broad searches +$rcmail_config['autocomplete_min_length'] = 1; + +// Number of parallel autocomplete requests. +// If there's more than one address book, n parallel (async) requests will be created, +// where each request will search in one address book. By default (0), all address +// books are searched in one request. +$rcmail_config['autocomplete_threads'] = 0; + +// Max. numer of entries in autocomplete popup. Default: 15. +$rcmail_config['autocomplete_max'] = 15; + +// show address fields in this order +// available placeholders: {street}, {locality}, {zipcode}, {country}, {region} +$rcmail_config['address_template'] = '{street}
        {locality} {zipcode}
        {country} {region}'; + +// Matching mode for addressbook search (including autocompletion) +// 0 - partial (*abc*), default +// 1 - strict (abc) +// 2 - prefix (abc*) +// Note: For LDAP sources fuzzy_search must be enabled to use 'partial' or 'prefix' mode +$rcmail_config['addressbook_search_mode'] = 0; + +// ---------------------------------- +// USER PREFERENCES +// ---------------------------------- + +// Use this charset as fallback for message decoding +//$rcmail_config['default_charset'] = 'ISO-8859-1'; +$rcmail_config['default_charset'] = 'UTF-8'; + +// skin name: folder from skins/ +$rcmail_config['skin'] = 'larry'; + +// show up to X items in messages list view +$rcmail_config['mail_pagesize'] = 50; + +// show up to X items in contacts list view +$rcmail_config['addressbook_pagesize'] = 50; + +// sort contacts by this col (preferably either one of name, firstname, surname) +$rcmail_config['addressbook_sort_col'] = 'surname'; + +// the way how contact names are displayed in the list +// 0: display name +// 1: (prefix) firstname middlename surname (suffix) +// 2: (prefix) surname firstname middlename (suffix) +// 3: (prefix) surname, firstname middlename (suffix) +$rcmail_config['addressbook_name_listing'] = 0; + +// use this timezone to display date/time +// valid timezone identifers are listed here: php.net/manual/en/timezones.php +// 'auto' will use the browser's timezone settings +$rcmail_config['timezone'] = 'auto'; + +// prefer displaying HTML messages +$rcmail_config['prefer_html'] = true; + +// display remote inline images +// 0 - Never, always ask +// 1 - Ask if sender is not in address book +// 2 - Always show inline images +$rcmail_config['show_images'] = 0; + +// compose html formatted messages by default +// 0 - never, 1 - always, 2 - on reply to HTML message only +$rcmail_config['htmleditor'] = 0; + +// show pretty dates as standard +$rcmail_config['prettydate'] = true; + +// save compose message every 300 seconds (5min) +$rcmail_config['draft_autosave'] = 300; + +// default setting if preview pane is enabled +$rcmail_config['preview_pane'] = false; + +// Mark as read when viewed in preview pane (delay in seconds) +// Set to -1 if messages in preview pane should not be marked as read +$rcmail_config['preview_pane_mark_read'] = 0; + +// Clear Trash on logout +$rcmail_config['logout_purge'] = false; + +// Compact INBOX on logout +$rcmail_config['logout_expunge'] = false; + +// Display attached images below the message body +$rcmail_config['inline_images'] = true; + +// Encoding of long/non-ascii attachment names: +// 0 - Full RFC 2231 compatible +// 1 - RFC 2047 for 'name' and RFC 2231 for 'filename' parameter (Thunderbird's default) +// 2 - Full 2047 compatible +$rcmail_config['mime_param_folding'] = 1; + +// Set true if deleted messages should not be displayed +// This will make the application run slower +$rcmail_config['skip_deleted'] = false; + +// Set true to Mark deleted messages as read as well as deleted +// False means that a message's read status is not affected by marking it as deleted +$rcmail_config['read_when_deleted'] = true; + +// Set to true to never delete messages immediately +// Use 'Purge' to remove messages marked as deleted +$rcmail_config['flag_for_deletion'] = false; + +// Default interval for keep-alive/check-recent requests (in seconds) +// Must be greater than or equal to 'min_keep_alive' and less than 'session_lifetime' +$rcmail_config['keep_alive'] = 60; + +// If true all folders will be checked for recent messages +$rcmail_config['check_all_folders'] = false; + +// If true, after message delete/move, the next message will be displayed +$rcmail_config['display_next'] = false; + +// 0 - Do not expand threads +// 1 - Expand all threads automatically +// 2 - Expand only threads with unread messages +$rcmail_config['autoexpand_threads'] = 0; + +// When replying place cursor above original message (top posting) +$rcmail_config['top_posting'] = false; + +// When replying strip original signature from message +$rcmail_config['strip_existing_sig'] = true; + +// Show signature: +// 0 - Never +// 1 - Always +// 2 - New messages only +// 3 - Forwards and Replies only +$rcmail_config['show_sig'] = 1; + +// When replying or forwarding place sender's signature above existing message +$rcmail_config['sig_above'] = false; + +// Use MIME encoding (quoted-printable) for 8bit characters in message body +$rcmail_config['force_7bit'] = false; + +// Defaults of the search field configuration. +// The array can contain a per-folder list of header fields which should be considered when searching +// The entry with key '*' stands for all folders which do not have a specific list set. +// Please note that folder names should to be in sync with $rcmail_config['default_folders'] +$rcmail_config['search_mods'] = null; // Example: array('*' => array('subject'=>1, 'from'=>1), 'Sent' => array('subject'=>1, 'to'=>1)); + +// Defaults of the addressbook search field configuration. +$rcmail_config['addressbook_search_mods'] = null; // Example: array('name'=>1, 'firstname'=>1, 'surname'=>1, 'email'=>1, '*'=>1); + +// 'Delete always' +// This setting reflects if mail should be always deleted +// when moving to Trash fails. This is necessary in some setups +// when user is over quota and Trash is included in the quota. +$rcmail_config['delete_always'] = false; + +// Directly delete messages in Junk instead of moving to Trash +$rcmail_config['delete_junk'] = true; + +// Behavior if a received message requests a message delivery notification (read receipt) +// 0 = ask the user, 1 = send automatically, 2 = ignore (never send or ask) +// 3 = send automatically if sender is in addressbook, otherwise ask the user +// 4 = send automatically if sender is in addressbook, otherwise ignore +$rcmail_config['mdn_requests'] = 0; + +// Return receipt checkbox default state +$rcmail_config['mdn_default'] = 0; + +// Delivery Status Notification checkbox default state +$rcmail_config['dsn_default'] = 0; + +// Place replies in the folder of the message being replied to +$rcmail_config['reply_same_folder'] = false; + +// Sets default mode of Forward feature to "forward as attachment" +$rcmail_config['forward_attachment'] = false; + +// Defines address book (internal index) to which new contacts will be added +// By default it is the first writeable addressbook. +// Note: Use '0' for built-in address book. +$rcmail_config['default_addressbook'] = null; + +// Enables spell checking before sending a message. +$rcmail_config['spellcheck_before_send'] = false; + +// Skip alternative email addresses in autocompletion (show one address per contact) +$rcmail_config['autocomplete_single'] = false; + +// Default font for composed HTML message. +// Supported values: Andale Mono, Arial, Arial Black, Book Antiqua, Courier New, +// Georgia, Helvetica, Impact, Tahoma, Terminal, Times New Roman, Trebuchet MS, Verdana +$rcmail_config['default_font'] = ''; + +// end of config file diff --git a/install/ubuntu/13.10/roundcube/vesta.php b/install/ubuntu/13.10/roundcube/vesta.php new file mode 100644 index 000000000..8fb202a44 --- /dev/null +++ b/install/ubuntu/13.10/roundcube/vesta.php @@ -0,0 +1,62 @@ + + */ + + function password_save($curpass, $passwd) + { + $rcmail = rcmail::get_instance(); + $vesta_host = $rcmail->config->get('password_vesta_host'); + + if (empty($vesta_host)) + { + $vesta_host = 'localhost'; + } + + $vesta_port = $rcmail->config->get('password_vesta_port'); + if (empty($vesta_port)) + { + $vesta_port = '8083'; + } + + $postvars = array( + 'email' => $_SESSION['username'], + 'password' => $curpass, + 'new' => $passwd + ); + + $postdata = http_build_query($postvars); + + $send = 'POST /reset/mail/ HTTP/1.1' . PHP_EOL; + $send .= 'Host: ' . $vesta_host . PHP_EOL; + $send .= 'User-Agent: PHP Script' . PHP_EOL; + $send .= 'Content-length: ' . strlen($postdata) . PHP_EOL; + $send .= 'Content-type: application/x-www-form-urlencoded' . PHP_EOL; + $send .= 'Connection: close' . PHP_EOL; + $send .= PHP_EOL; + $send .= $postdata . PHP_EOL . PHP_EOL; + + $fp = fsockopen('ssl://' . $vesta_host, $vesta_port); + fputs($fp, $send); + $result = fread($fp, 2048); + fclose($fp); + + $fp = fopen("/tmp/roundcube.log", 'w'); + fwrite($fp, "test ok"); + fwrite($fp, "\n"); + fclose($fp); + + + if(strpos($result, 'ok') && !strpos($result, 'error')) + { + return PASSWORD_SUCCESS; + } + else { + return PASSWORD_ERROR; + } + + } diff --git a/install/ubuntu/13.10/sudo/admin b/install/ubuntu/13.10/sudo/admin new file mode 100644 index 000000000..47e16098c --- /dev/null +++ b/install/ubuntu/13.10/sudo/admin @@ -0,0 +1,7 @@ +# Created by vesta installer +Defaults env_keep="VESTA" +Defaults:admin !syslog +Defaults:admin !requiretty + +admin ALL=(ALL) ALL +admin ALL=NOPASSWD:/usr/local/vesta/bin/* diff --git a/install/ubuntu/13.10/templates.tar.gz b/install/ubuntu/13.10/templates.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..ce385d269736561780cb42d07b447572cebc7831 GIT binary patch literal 12935 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 + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %sdocroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + #SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + AllowOverride All + SSLRequireSSL + Options +Includes -Indexes +ExecCGI + php_admin_value open_basedir %docroot% + + + AllowOverride All + + SSLEngine on + SSLVerifyClient none + SSLCertificateFile %ssl_crt% + SSLCertificateKeyFile %ssl_key% + %ssl_ca_str%SSLCertificateChainFile %ssl_ca% + + + RMode config + RUidGid %user% %group% + RGroups www-data + + + AssignUserID %user% %group% + + + IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* + + + diff --git a/install/ubuntu/13.10/templates/web/apache2/basedir.tpl b/install/ubuntu/13.10/templates/web/apache2/basedir.tpl new file mode 100755 index 000000000..75daf0e10 --- /dev/null +++ b/install/ubuntu/13.10/templates/web/apache2/basedir.tpl @@ -0,0 +1,35 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %docroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + #SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + AllowOverride All + Options +Includes -Indexes +ExecCGI + php_admin_value open_basedir %docroot% + + + AllowOverride All + + + + RMode config + RUidGid %user% %group% + RGroups www-data + + + AssignUserID %user% %group% + + + IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + + + diff --git a/install/ubuntu/13.10/templates/web/apache2/default.stpl b/install/ubuntu/13.10/templates/web/apache2/default.stpl new file mode 100755 index 000000000..e884a95b9 --- /dev/null +++ b/install/ubuntu/13.10/templates/web/apache2/default.stpl @@ -0,0 +1,40 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %sdocroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + #SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + AllowOverride All + SSLRequireSSL + Options +Includes -Indexes +ExecCGI + + + AllowOverride All + + SSLEngine on + SSLVerifyClient none + SSLCertificateFile %ssl_crt% + SSLCertificateKeyFile %ssl_key% + %ssl_ca_str%SSLCertificateChainFile %ssl_ca% + + + RMode config + RUidGid %user% %group% + RGroups www-data + + + AssignUserID %user% %group% + + + IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* + + + diff --git a/install/ubuntu/13.10/templates/web/apache2/default.tpl b/install/ubuntu/13.10/templates/web/apache2/default.tpl new file mode 100755 index 000000000..073724ce0 --- /dev/null +++ b/install/ubuntu/13.10/templates/web/apache2/default.tpl @@ -0,0 +1,34 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %docroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + #SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + AllowOverride All + Options +Includes -Indexes +ExecCGI + + + AllowOverride All + + + + RMode config + RUidGid %user% %group% + RGroups www-data + + + AssignUserID %user% %group% + + + IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + + + diff --git a/install/ubuntu/13.10/templates/web/apache2/hosting.stpl b/install/ubuntu/13.10/templates/web/apache2/hosting.stpl new file mode 100755 index 000000000..7a5d7787f --- /dev/null +++ b/install/ubuntu/13.10/templates/web/apache2/hosting.stpl @@ -0,0 +1,49 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %sdocroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + #SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + AllowOverride All + SSLRequireSSL + Options +Includes -Indexes +ExecCGI + php_admin_value upload_tmp_dir %home%/%user%/tmp + php_admin_value upload_max_filesize 10M + php_admin_value max_execution_time 20 + php_admin_value post_max_size 8M + php_admin_value memory_limit 32M + php_admin_flag mysql.allow_persistent off + php_admin_flag safe_mode off + php_admin_value session.save_path %home%/%user%/tmp + php_admin_value sendmail_path '/usr/sbin/sendmail -t -i -f %email%' + + + AllowOverride All + + php_admin_value open_basedir %home%/%user%/web:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpMyAdmin:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcubemail:/etc/roundcube:/var/lib/roundcube + SSLEngine on + SSLVerifyClient none + SSLCertificateFile %ssl_crt% + SSLCertificateKeyFile %ssl_key% + %ssl_ca_str%SSLCertificateChainFile %ssl_ca% + + RMode config + RUidGid %user% %group% + RGroups www-data + + + AssignUserID %user% %group% + + + IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* + + + diff --git a/install/ubuntu/13.10/templates/web/apache2/hosting.tpl b/install/ubuntu/13.10/templates/web/apache2/hosting.tpl new file mode 100755 index 000000000..ab844dc74 --- /dev/null +++ b/install/ubuntu/13.10/templates/web/apache2/hosting.tpl @@ -0,0 +1,43 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %docroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + #SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + AllowOverride All + Options +Includes -Indexes +ExecCGI + php_admin_value upload_tmp_dir %home%/%user%/tmp + php_admin_value upload_max_filesize 10M + php_admin_value max_execution_time 20 + php_admin_value post_max_size 8M + php_admin_value memory_limit 32M + php_admin_flag mysql.allow_persistent off + php_admin_flag safe_mode off + php_admin_value session.save_path %home%/%user%/tmp + php_admin_value sendmail_path '/usr/sbin/sendmail -t -i -f %email%' + + + AllowOverride All + + php_admin_value open_basedir %home%/%user%/web:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpMyAdmin:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcubemail:/etc/roundcube:/var/lib/roundcube + + RMode config + RUidGid %user% %group% + RGroups www-data + + + AssignUserID %user% %group% + + + IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + + + diff --git a/install/ubuntu/13.10/templates/web/apache2/phpcgi.sh b/install/ubuntu/13.10/templates/web/apache2/phpcgi.sh new file mode 100755 index 000000000..6565e103d --- /dev/null +++ b/install/ubuntu/13.10/templates/web/apache2/phpcgi.sh @@ -0,0 +1,16 @@ +#!/bin/bash +# Adding php wrapper +user="$1" +domain="$2" +ip="$3" +home_dir="$4" +docroot="$5" + +wrapper_script='#!/usr/bin/php-cgi -cphp5-cgi.ini' +wrapper_file="$home_dir/$user/web/$domain/cgi-bin/php" + +echo "$wrapper_script" > $wrapper_file +chown $user:$user $wrapper_file +chmod -f 751 $wrapper_file + +exit 0 diff --git a/install/ubuntu/13.10/templates/web/apache2/phpcgi.stpl b/install/ubuntu/13.10/templates/web/apache2/phpcgi.stpl new file mode 100755 index 000000000..aa5137308 --- /dev/null +++ b/install/ubuntu/13.10/templates/web/apache2/phpcgi.stpl @@ -0,0 +1,35 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %sdocroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + SSLRequireSSL + AllowOverride All + Options +Includes -Indexes +ExecCGI + Action phpcgi-script /cgi-bin/php + + SetHandler phpcgi-script + + + + AllowOverride All + + SSLEngine on + SSLVerifyClient none + SSLCertificateFile %ssl_crt% + SSLCertificateKeyFile %ssl_key% + %ssl_ca_str%SSLCertificateChainFile %ssl_ca% + + IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* + + + diff --git a/install/ubuntu/13.10/templates/web/apache2/phpcgi.tpl b/install/ubuntu/13.10/templates/web/apache2/phpcgi.tpl new file mode 100755 index 000000000..a05ff252d --- /dev/null +++ b/install/ubuntu/13.10/templates/web/apache2/phpcgi.tpl @@ -0,0 +1,28 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %docroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + AllowOverride All + Options +Includes -Indexes +ExecCGI + Action phpcgi-script /cgi-bin/php + + SetHandler phpcgi-script + + + + AllowOverride All + + IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + + + diff --git a/install/ubuntu/13.10/templates/web/apache2/phpfcgid.sh b/install/ubuntu/13.10/templates/web/apache2/phpfcgid.sh new file mode 100755 index 000000000..e80582492 --- /dev/null +++ b/install/ubuntu/13.10/templates/web/apache2/phpfcgid.sh @@ -0,0 +1,22 @@ +#!/bin/bash +# Adding php wrapper +user="$1" +domain="$2" +ip="$3" +home_dir="$4" +docroot="$5" + +wrapper_script="#!/bin/sh +PHPRC=/usr/local/lib +export PHPRC +export PHP_FCGI_MAX_REQUESTS=1000 +export PHP_FCGI_CHILDREN=20 +exec /usr/bin/php-cgi +" +wrapper_file="$home_dir/$user/web/$domain/cgi-bin/fcgi-starter" + +echo "$wrapper_script" > $wrapper_file +chown $user:$user $wrapper_file +chmod -f 751 $wrapper_file + +exit 0 diff --git a/install/ubuntu/13.10/templates/web/apache2/phpfcgid.stpl b/install/ubuntu/13.10/templates/web/apache2/phpfcgid.stpl new file mode 100755 index 000000000..622495756 --- /dev/null +++ b/install/ubuntu/13.10/templates/web/apache2/phpfcgid.stpl @@ -0,0 +1,36 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %sdocroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + SSLRequireSSL + AllowOverride All + Options +Includes -Indexes +ExecCGI + + SetHandler fcgid-script + + FCGIWrapper %home%/%user%/web/%domain%/cgi-bin/fcgi-starter .php + + + AllowOverride All + + php_admin_value open_basedir none + SSLEngine on + SSLVerifyClient none + SSLCertificateFile %ssl_crt% + SSLCertificateKeyFile %ssl_key% + %ssl_ca_str%SSLCertificateChainFile %ssl_ca% + + IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* + + + diff --git a/install/ubuntu/13.10/templates/web/apache2/phpfcgid.tpl b/install/ubuntu/13.10/templates/web/apache2/phpfcgid.tpl new file mode 100755 index 000000000..5c1f16e20 --- /dev/null +++ b/install/ubuntu/13.10/templates/web/apache2/phpfcgid.tpl @@ -0,0 +1,28 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %docroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + AllowOverride All + Options +Includes -Indexes +ExecCGI + + SetHandler fcgid-script + + FCGIWrapper %home%/%user%/web/%domain%/cgi-bin/fcgi-starter .php + + + AllowOverride All + + IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + + + diff --git a/install/ubuntu/13.10/templates/web/awstats/awstats.tpl b/install/ubuntu/13.10/templates/web/awstats/awstats.tpl new file mode 100755 index 000000000..9a92e0fd4 --- /dev/null +++ b/install/ubuntu/13.10/templates/web/awstats/awstats.tpl @@ -0,0 +1,133 @@ +LogFile="/var/log/%web_system%/domains/%domain%.log" +LogType=W +LogFormat=1 +LogSeparator=" " +SiteDomain="%domain_idn%" +HostAliases="%alias_idn%" +DirData="%home%/%user%/web/%domain%/stats" +DirCgi="/vstats" +DirIcons="/vstats/icon" +AllowToUpdateStatsFromBrowser=0 +AllowFullYearView=2 +EnableLockForUpdate=1 +DNSStaticCacheFile="dnscache.txt" +DNSLastUpdateCacheFile="dnscachelastupdate.txt" +SkipDNSLookupFor="" +AllowAccessFromWebToAuthenticatedUsersOnly=0 +AllowAccessFromWebToFollowingAuthenticatedUsers="" +AllowAccessFromWebToFollowingIPAddresses="" +CreateDirDataIfNotExists=0 +BuildHistoryFormat=text +BuildReportFormat=html +SaveDatabaseFilesWithPermissionsForEveryone=0 +PurgeLogFile=0 +ArchiveLogRecords=0 +KeepBackupOfHistoricFiles=1 +DefaultFile="index.php index.html" +SkipHosts="127.0.0.1 +SkipUserAgents="" +SkipFiles="" +SkipReferrersBlackList="" +OnlyHosts="" +OnlyUserAgents="" +OnlyUsers="" +OnlyFiles="" +NotPageList="css js class gif jpg jpeg png bmp ico rss xml swf" +ValidHTTPCodes="200 304" +ValidSMTPCodes="1 250" +AuthenticatedUsersNotCaseSensitive=0 +URLNotCaseSensitive=0 +URLWithAnchor=0 +URLQuerySeparators="?;" +URLWithQuery=0 +URLWithQueryWithOnlyFollowingParameters="" +URLWithQueryWithoutFollowingParameters="" +URLReferrerWithQuery=0 +WarningMessages=1 +ErrorMessages="" +DebugMessages=0 +NbOfLinesForCorruptedLog=50 +WrapperScript="" +DecodeUA=0 +MiscTrackerUrl="/js/awstats_misc_tracker.js" +UseFramesWhenCGI=1 +DetailedReportsOnNewWindows=1 +Expires=3600 +MaxRowsInHTMLOutput=1000 +Lang="auto" +DirLang="./lang" +ShowMenu=1 +ShowSummary=UVPHB +ShowMonthStats=UVPHB +ShowDaysOfMonthStats=VPHB +ShowDaysOfWeekStats=PHB +ShowHoursStats=PHB +ShowDomainsStats=PHB +ShowHostsStats=PHBL +ShowAuthenticatedUsers=0 +ShowRobotsStats=HBL +ShowWormsStats=0 +ShowEMailSenders=0 +ShowEMailReceivers=0 +ShowSessionsStats=1 +ShowPagesStats=PBEX +ShowFileTypesStats=HB +ShowFileSizesStats=0 +ShowDownloadsStats=HB +ShowOSStats=1 +ShowBrowsersStats=1 +ShowScreenSizeStats=0 +ShowOriginStats=PH +ShowKeyphrasesStats=1 +ShowKeywordsStats=1 +ShowMiscStats=a +ShowHTTPErrorsStats=1 +ShowSMTPErrorsStats=0 +ShowClusterStats=0 +AddDataArrayMonthStats=1 +AddDataArrayShowDaysOfMonthStats=1 +AddDataArrayShowDaysOfWeekStats=1 +AddDataArrayShowHoursStats=1 +IncludeInternalLinksInOriginSection=0 +MaxNbOfDomain = 10 +MinHitDomain = 1 +MaxNbOfHostsShown = 10 +MinHitHost = 1 +MaxNbOfLoginShown = 10 +MinHitLogin = 1 +MaxNbOfRobotShown = 10 +MinHitRobot = 1 +MaxNbOfDownloadsShown = 10 +MinHitDownloads = 1 +MaxNbOfPageShown = 10 +MinHitFile = 1 +MaxNbOfOsShown = 10 +MinHitOs = 1 +MaxNbOfBrowsersShown = 10 +MinHitBrowser = 1 +MaxNbOfScreenSizesShown = 5 +MinHitScreenSize = 1 +MaxNbOfWindowSizesShown = 5 +MinHitWindowSize = 1 +MaxNbOfRefererShown = 10 +MinHitRefer = 1 +MaxNbOfKeyphrasesShown = 10 +MinHitKeyphrase = 1 +MaxNbOfKeywordsShown = 10 +MinHitKeyword = 1 +MaxNbOfEMailsShown = 20 +MinHitEMail = 1 +FirstDayOfWeek=0 +ShowFlagLinks="" +ShowLinksOnUrl=1 +UseHTTPSLinkForUrl="" +MaxLengthOfShownURL=64 +HTMLHeadSection="" +HTMLEndSection="" +MetaRobot=0 +Logo="awstats_logo6.png" +LogoLink="http://awstats.sourceforge.net" +BarWidth = 260 +BarHeight = 90 +StyleSheet="" +ExtraTrackedRowsLimit=500 diff --git a/install/ubuntu/13.10/templates/web/awstats/index.tpl b/install/ubuntu/13.10/templates/web/awstats/index.tpl new file mode 100755 index 000000000..9df9bb5cb --- /dev/null +++ b/install/ubuntu/13.10/templates/web/awstats/index.tpl @@ -0,0 +1,10 @@ + + + + Awstats log analyzer + + + + + + diff --git a/install/ubuntu/13.10/templates/web/awstats/nav.tpl b/install/ubuntu/13.10/templates/web/awstats/nav.tpl new file mode 100755 index 000000000..f29bed68b --- /dev/null +++ b/install/ubuntu/13.10/templates/web/awstats/nav.tpl @@ -0,0 +1,23 @@ + + + Awstats navigation + + + + + + + + +
        vesta
        + +
        +
        + + diff --git a/install/ubuntu/13.10/templates/web/nginx/caching.sh b/install/ubuntu/13.10/templates/web/nginx/caching.sh new file mode 100755 index 000000000..6eb9126db --- /dev/null +++ b/install/ubuntu/13.10/templates/web/nginx/caching.sh @@ -0,0 +1,12 @@ +#!/bin/bash + +user=$1 +domain=$2 +ip=$3 +home=$4 +docroot=$5 + +str="proxy_cache_path /var/cache/nginx/$domain levels=2" +str="$str keys_zone=$domain:10m inactive=60m max_size=512m;" +echo "$str" >> /etc/nginx/conf.d/01_caching_pool.conf + diff --git a/install/ubuntu/13.10/templates/web/nginx/caching.stpl b/install/ubuntu/13.10/templates/web/nginx/caching.stpl new file mode 100755 index 000000000..ca6cffe32 --- /dev/null +++ b/install/ubuntu/13.10/templates/web/nginx/caching.stpl @@ -0,0 +1,44 @@ +server { + listen %ip%:%proxy_ssl_port%; + server_name %domain_idn% %alias_idn%; + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + error_log /var/log/%web_system%/domains/%domain%.error.log error; + + location / { + proxy_pass http://%ip%:%web_port%; + + proxy_cache cache; + proxy_cache_valid 15m; + proxy_cache_valid 404 1m; + proxy_no_cache $no_cache; + proxy_cache_bypass $no_cache; + proxy_cache_bypass $cookie_session $http_x_update; + + location ~* ^.+\.(%proxy_extentions%)$ { + proxy_cache off; + root %docroot%; + access_log /var/log/%web_system%/domains/%domain%.log combined; + access_log /var/log/%web_system%/domains/%domain%.bytes bytes; + expires max; + try_files $uri @fallback; + } + } + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location @fallback { + proxy_pass http://%ip%:%web_port%; + } + + location ~ /\.ht {return 404;} + location ~ /\.svn/ {return 404;} + location ~ /\.git/ {return 404;} + location ~ /\.hg/ {return 404;} + location ~ /\.bzr/ {return 404;} + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/13.10/templates/web/nginx/caching.tpl b/install/ubuntu/13.10/templates/web/nginx/caching.tpl new file mode 100755 index 000000000..36761b65c --- /dev/null +++ b/install/ubuntu/13.10/templates/web/nginx/caching.tpl @@ -0,0 +1,41 @@ +server { + listen %ip%:%proxy_port%; + server_name %domain_idn% %alias_idn%; + error_log /var/log/%web_system%/domains/%domain%.error.log error; + + location / { + proxy_pass http://%ip%:%web_port%; + + proxy_cache cache; + proxy_cache_valid 15m; + proxy_cache_valid 404 1m; + proxy_no_cache $no_cache; + proxy_cache_bypass $no_cache; + proxy_cache_bypass $cookie_session $http_x_update; + + location ~* ^.+\.(%proxy_extentions%)$ { + proxy_cache off; + root %docroot%; + access_log /var/log/%web_system%/domains/%domain%.log combined; + access_log /var/log/%web_system%/domains/%domain%.bytes bytes; + expires max; + try_files $uri @fallback; + } + } + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location @fallback { + proxy_pass http://%ip%:%web_port%; + } + + location ~ /\.ht {return 404;} + location ~ /\.svn/ {return 404;} + location ~ /\.git/ {return 404;} + location ~ /\.hg/ {return 404;} + location ~ /\.bzr/ {return 404;} + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/13.10/templates/web/nginx/default.stpl b/install/ubuntu/13.10/templates/web/nginx/default.stpl new file mode 100755 index 000000000..fa5380606 --- /dev/null +++ b/install/ubuntu/13.10/templates/web/nginx/default.stpl @@ -0,0 +1,36 @@ +server { + listen %ip%:%proxy_ssl_port%; + server_name %domain_idn% %alias_idn%; + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + error_log /var/log/%web_system%/domains/%domain%.error.log error; + + location / { + proxy_pass https://%ip%:%web_ssl_port%; + location ~* ^.+\.(%proxy_extentions%)$ { + root %sdocroot%; + access_log /var/log/%web_system%/domains/%domain%.log combined; + access_log /var/log/%web_system%/domains/%domain%.bytes bytes; + expires max; + try_files $uri @fallback; + } + } + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location @fallback { + proxy_pass https://%ip%:%web_ssl_port%; + } + + location ~ /\.ht {return 404;} + location ~ /\.svn/ {return 404;} + location ~ /\.git/ {return 404;} + location ~ /\.hg/ {return 404;} + location ~ /\.bzr/ {return 404;} + + include %home%/%user%/conf/web/snginx.%domain%.conf*; +} + diff --git a/install/ubuntu/13.10/templates/web/nginx/default.tpl b/install/ubuntu/13.10/templates/web/nginx/default.tpl new file mode 100755 index 000000000..4d5c774bc --- /dev/null +++ b/install/ubuntu/13.10/templates/web/nginx/default.tpl @@ -0,0 +1,33 @@ +server { + listen %ip%:%proxy_port%; + server_name %domain_idn% %alias_idn%; + error_log /var/log/%web_system%/domains/%domain%.error.log error; + + location / { + proxy_pass http://%ip%:%web_port%; + location ~* ^.+\.(%proxy_extentions%)$ { + root %docroot%; + access_log /var/log/%web_system%/domains/%domain%.log combined; + access_log /var/log/%web_system%/domains/%domain%.bytes bytes; + expires max; + try_files $uri @fallback; + } + } + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location @fallback { + proxy_pass http://%ip%:%web_port%; + } + + location ~ /\.ht {return 404;} + location ~ /\.svn/ {return 404;} + location ~ /\.git/ {return 404;} + location ~ /\.hg/ {return 404;} + location ~ /\.bzr/ {return 404;} + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} + diff --git a/install/ubuntu/13.10/templates/web/nginx/hosting.sh b/install/ubuntu/13.10/templates/web/nginx/hosting.sh new file mode 100755 index 000000000..eeed37ef9 --- /dev/null +++ b/install/ubuntu/13.10/templates/web/nginx/hosting.sh @@ -0,0 +1,11 @@ +#!/bin/bash +# Changing public_html permission +user="$1" +domain="$2" +ip="$3" +home_dir="$4" +docroot="$5" + +chmod 755 $docroot + +exit 0 diff --git a/install/ubuntu/13.10/templates/web/nginx/hosting.stpl b/install/ubuntu/13.10/templates/web/nginx/hosting.stpl new file mode 100755 index 000000000..d778d6333 --- /dev/null +++ b/install/ubuntu/13.10/templates/web/nginx/hosting.stpl @@ -0,0 +1,38 @@ +server { + listen %ip%:%proxy_ssl_port%; + server_name %domain_idn% %alias_idn%; + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + error_log /var/log/%web_system%/domains/%domain%.error.log error; + + location / { + proxy_pass https://%ip%:%web_ssl_port%; + location ~* ^.+\.(%proxy_extentions%)$ { + root %sdocroot%; + access_log /var/log/%web_system%/domains/%domain%.log combined; + access_log /var/log/%web_system%/domains/%domain%.bytes bytes; + expires max; + try_files $uri @fallback; + } + } + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location @fallback { + proxy_pass https://%ip%:%web_ssl_port%; + } + + location ~ /\.ht {return 404;} + location ~ /\.svn/ {return 404;} + location ~ /\.git/ {return 404;} + location ~ /\.hg/ {return 404;} + location ~ /\.bzr/ {return 404;} + + disable_symlinks if_not_owner from=%docroot%; + + include %home%/%user%/conf/web/snginx.%domain%.conf*; +} + diff --git a/install/ubuntu/13.10/templates/web/nginx/hosting.tpl b/install/ubuntu/13.10/templates/web/nginx/hosting.tpl new file mode 100755 index 000000000..15961c95c --- /dev/null +++ b/install/ubuntu/13.10/templates/web/nginx/hosting.tpl @@ -0,0 +1,35 @@ +server { + listen %ip%:%proxy_port%; + server_name %domain_idn% %alias_idn%; + error_log /var/log/%web_system%/domains/%domain%.error.log error; + + location / { + proxy_pass http://%ip%:%web_port%; + location ~* ^.+\.(%proxy_extentions%)$ { + root %docroot%; + access_log /var/log/%web_system%/domains/%domain%.log combined; + access_log /var/log/%web_system%/domains/%domain%.bytes bytes; + expires max; + try_files $uri @fallback; + } + } + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location @fallback { + proxy_pass http://%ip%:%web_port%; + } + + location ~ /\.ht {return 404;} + location ~ /\.svn/ {return 404;} + location ~ /\.git/ {return 404;} + location ~ /\.hg/ {return 404;} + location ~ /\.bzr/ {return 404;} + + disable_symlinks if_not_owner from=%docroot%; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} + diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/cms_made_simple.stpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/cms_made_simple.stpl new file mode 100644 index 000000000..01d82b603 --- /dev/null +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/cms_made_simple.stpl @@ -0,0 +1,51 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + try_files $uri $uri/ /index.php?page=$request_uri; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/cms_made_simple.tpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/cms_made_simple.tpl new file mode 100644 index 000000000..af452d19f --- /dev/null +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/cms_made_simple.tpl @@ -0,0 +1,47 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + try_files $uri $uri/ /index.php?page=$request_uri; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/codeigniter2.stpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/codeigniter2.stpl new file mode 100644 index 000000000..a592a652d --- /dev/null +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/codeigniter2.stpl @@ -0,0 +1,56 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + try_files $uri $uri/ /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location = /index.php { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME /var/www/html/ci$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + location ~ \.php$ { + return 444; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/codeigniter2.tpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/codeigniter2.tpl new file mode 100644 index 000000000..9b955aa6a --- /dev/null +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/codeigniter2.tpl @@ -0,0 +1,52 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + try_files $uri $uri/ /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location = /index.php { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME /var/www/html/ci$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + location ~ \.php$ { + return 444; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/codeigniter3.stpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/codeigniter3.stpl new file mode 100644 index 000000000..4d330d34f --- /dev/null +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/codeigniter3.stpl @@ -0,0 +1,51 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + try_files $uri $uri/ /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/codeigniter3.tpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/codeigniter3.tpl new file mode 100644 index 000000000..1f446e5d3 --- /dev/null +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/codeigniter3.tpl @@ -0,0 +1,47 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + try_files $uri $uri/ /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/datalife_engine.stpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/datalife_engine.stpl new file mode 100644 index 000000000..d1b5bcd24 --- /dev/null +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/datalife_engine.stpl @@ -0,0 +1,122 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + rewrite "^/page/([0-9]+)(/?)$" /index.php?cstart=$1 last; + + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page,([0-9]+),([0-9]+),(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&cstart=$5&news_name=$6&seourl=$6 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page,([0-9]+),(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&news_name=$5&seourl=$5 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/print:page,([0-9]+),(.*).html(/?)+$" /engine/print.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&news_name=$5&seourl=$5 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_name=$4&seourl=$4 last; + + rewrite "^/([^.]+)/page,([0-9]+),([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$4&news_page=$2&cstart=$3&seourl=$5&seocat=$1 last; + rewrite "^/([^.]+)/page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$3&news_page=$2&seourl=$4&seocat=$1 last; + rewrite "^/([^.]+)/print:page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /engine/print.php?news_page=$2&newsid=$3&seourl=$4&seocat=$1 last; + rewrite "^/([^.]+)/([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$2&seourl=$3&seocat=$1 last; + + rewrite "^/page,([0-9]+),([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$3&news_page=$1&cstart=$2&seourl=$4 last; + rewrite "^/page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$2&news_page=$1&seourl=$3 last; + rewrite "^/print:page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /engine/print.php?news_page=$1&newsid=$2&seourl=$3 last; + rewrite "^/([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$1&seourl=$2 last; + + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})(/?)+$" /index.php?year=$1&month=$2&day=$3 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page/([0-9]+)(/?)+$" /index.php?year=$1&month=$2&day=$3&cstart=$4 last; + + rewrite "^/([0-9]{4})/([0-9]{2})(/?)+$" /index.php?year=$1&month=$2 last; + rewrite "^/([0-9]{4})/([0-9]{2})/page/([0-9]+)(/?)+$" /index.php?year=$1&month=$2&cstart=$3 last; + + rewrite "^/([0-9]{4})(/?)+$" /index.php?year=$1 last; + rewrite "^/([0-9]{4})/page/([0-9]+)(/?)+$" /index.php?year=$1&cstart=$2 last; + + rewrite "^/tags/([^/]*)(/?)+$" /index.php?do=tags&tag=$1 last; + rewrite "^/tags/([^/]*)/page/([0-9]+)(/?)+$" /index.php?do=tags&tag=$1&cstart=$2 last; + + rewrite "^/xfsearch/([^/]*)(/?)+$" /index.php?do=xfsearch&xf=$1 last; + rewrite "^/xfsearch/([^/]*)/page/([0-9]+)(/?)+$" /index.php?do=xfsearch&xf=$1&cstart=$2 last; + + rewrite "^/user/([^/]*)/rss.xml$" /engine/rss.php?subaction=allnews&user=$1 last; + rewrite "^/user/([^/]*)(/?)+$" /index.php?subaction=userinfo&user=$1 last; + rewrite "^/user/([^/]*)/page/([0-9]+)(/?)+$" /index.php?subaction=userinfo&user=$1&cstart=$2 last; + rewrite "^/user/([^/]*)/news(/?)+$" /index.php?subaction=allnews&user=$1 last; + rewrite "^/user/([^/]*)/news/page/([0-9]+)(/?)+$" /index.php?subaction=allnews&user=$1&cstart=$2 last; + rewrite "^/user/([^/]*)/news/rss.xml(/?)+$" /engine/rss.php?subaction=allnews&user=$1 last; + + rewrite "^/lastnews(/?)+$" /index.php?do=lastnews last; + rewrite "^/lastnews/page/([0-9]+)(/?)+$" /index.php?do=lastnews&cstart=$1 last; + + rewrite "^/catalog/([^/]*)/rss.xml$" /engine/rss.php?catalog=$1 last; + rewrite "^/catalog/([^/]*)(/?)+$" /index.php?catalog=$1 last; + rewrite "^/catalog/([^/]*)/page/([0-9]+)(/?)+$" /index.php?catalog=$1&cstart=$2 last; + + rewrite "^/newposts(/?)+$" /index.php?subaction=newposts last; + rewrite "^/newposts/page/([0-9]+)(/?)+$" /index.php?subaction=newposts&cstart=$1 last; + + rewrite "^/favorites(/?)+$" /index.php?do=favorites last; + rewrite "^/favorites/page/([0-9]+)(/?)+$" /index.php?do=favorites&cstart=$1 last; + + rewrite "^/rules.html$" /index.php?do=rules last; + rewrite "^/statistics.html$" /index.php?do=stats last; + rewrite "^/addnews.html$" /index.php?do=addnews last; + rewrite "^/rss.xml$" /engine/rss.php last; + rewrite "^/sitemap.xml$" /uploads/sitemap.xml last; + + if (!-d $request_filename) { + rewrite "^/([^.]+)/page/([0-9]+)(/?)+$" /index.php?do=cat&category=$1&cstart=$2 last; + rewrite "^/([^.]+)/?$" /index.php?do=cat&category=$1 last; + } + + if (!-f $request_filename) { + rewrite "^/([^.]+)/rss.xml$" /engine/rss.php?do=cat&category=$1 last; + rewrite "^/page,([0-9]+),([^/]+).html$" /index.php?do=static&page=$2&news_page=$1 last; + rewrite "^/print:([^/]+).html$" /engine/print.php?do=static&page=$1 last; + } + + if (!-f $request_filename) { + rewrite "^/([^/]+).html$" /index.php?do=static&page=$1 last; + } + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/datalife_engine.tpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/datalife_engine.tpl new file mode 100644 index 000000000..ff33c2325 --- /dev/null +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/datalife_engine.tpl @@ -0,0 +1,118 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + rewrite "^/page/([0-9]+)(/?)$" /index.php?cstart=$1 last; + + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page,([0-9]+),([0-9]+),(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&cstart=$5&news_name=$6&seourl=$6 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page,([0-9]+),(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&news_name=$5&seourl=$5 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/print:page,([0-9]+),(.*).html(/?)+$" /engine/print.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&news_name=$5&seourl=$5 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_name=$4&seourl=$4 last; + + rewrite "^/([^.]+)/page,([0-9]+),([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$4&news_page=$2&cstart=$3&seourl=$5&seocat=$1 last; + rewrite "^/([^.]+)/page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$3&news_page=$2&seourl=$4&seocat=$1 last; + rewrite "^/([^.]+)/print:page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /engine/print.php?news_page=$2&newsid=$3&seourl=$4&seocat=$1 last; + rewrite "^/([^.]+)/([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$2&seourl=$3&seocat=$1 last; + + rewrite "^/page,([0-9]+),([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$3&news_page=$1&cstart=$2&seourl=$4 last; + rewrite "^/page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$2&news_page=$1&seourl=$3 last; + rewrite "^/print:page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /engine/print.php?news_page=$1&newsid=$2&seourl=$3 last; + rewrite "^/([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$1&seourl=$2 last; + + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})(/?)+$" /index.php?year=$1&month=$2&day=$3 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page/([0-9]+)(/?)+$" /index.php?year=$1&month=$2&day=$3&cstart=$4 last; + + rewrite "^/([0-9]{4})/([0-9]{2})(/?)+$" /index.php?year=$1&month=$2 last; + rewrite "^/([0-9]{4})/([0-9]{2})/page/([0-9]+)(/?)+$" /index.php?year=$1&month=$2&cstart=$3 last; + + rewrite "^/([0-9]{4})(/?)+$" /index.php?year=$1 last; + rewrite "^/([0-9]{4})/page/([0-9]+)(/?)+$" /index.php?year=$1&cstart=$2 last; + + rewrite "^/tags/([^/]*)(/?)+$" /index.php?do=tags&tag=$1 last; + rewrite "^/tags/([^/]*)/page/([0-9]+)(/?)+$" /index.php?do=tags&tag=$1&cstart=$2 last; + + rewrite "^/xfsearch/([^/]*)(/?)+$" /index.php?do=xfsearch&xf=$1 last; + rewrite "^/xfsearch/([^/]*)/page/([0-9]+)(/?)+$" /index.php?do=xfsearch&xf=$1&cstart=$2 last; + + rewrite "^/user/([^/]*)/rss.xml$" /engine/rss.php?subaction=allnews&user=$1 last; + rewrite "^/user/([^/]*)(/?)+$" /index.php?subaction=userinfo&user=$1 last; + rewrite "^/user/([^/]*)/page/([0-9]+)(/?)+$" /index.php?subaction=userinfo&user=$1&cstart=$2 last; + rewrite "^/user/([^/]*)/news(/?)+$" /index.php?subaction=allnews&user=$1 last; + rewrite "^/user/([^/]*)/news/page/([0-9]+)(/?)+$" /index.php?subaction=allnews&user=$1&cstart=$2 last; + rewrite "^/user/([^/]*)/news/rss.xml(/?)+$" /engine/rss.php?subaction=allnews&user=$1 last; + + rewrite "^/lastnews(/?)+$" /index.php?do=lastnews last; + rewrite "^/lastnews/page/([0-9]+)(/?)+$" /index.php?do=lastnews&cstart=$1 last; + + rewrite "^/catalog/([^/]*)/rss.xml$" /engine/rss.php?catalog=$1 last; + rewrite "^/catalog/([^/]*)(/?)+$" /index.php?catalog=$1 last; + rewrite "^/catalog/([^/]*)/page/([0-9]+)(/?)+$" /index.php?catalog=$1&cstart=$2 last; + + rewrite "^/newposts(/?)+$" /index.php?subaction=newposts last; + rewrite "^/newposts/page/([0-9]+)(/?)+$" /index.php?subaction=newposts&cstart=$1 last; + + rewrite "^/favorites(/?)+$" /index.php?do=favorites last; + rewrite "^/favorites/page/([0-9]+)(/?)+$" /index.php?do=favorites&cstart=$1 last; + + rewrite "^/rules.html$" /index.php?do=rules last; + rewrite "^/statistics.html$" /index.php?do=stats last; + rewrite "^/addnews.html$" /index.php?do=addnews last; + rewrite "^/rss.xml$" /engine/rss.php last; + rewrite "^/sitemap.xml$" /uploads/sitemap.xml last; + + if (!-d $request_filename) { + rewrite "^/([^.]+)/page/([0-9]+)(/?)+$" /index.php?do=cat&category=$1&cstart=$2 last; + rewrite "^/([^.]+)/?$" /index.php?do=cat&category=$1 last; + } + + if (!-f $request_filename) { + rewrite "^/([^.]+)/rss.xml$" /engine/rss.php?do=cat&category=$1 last; + rewrite "^/page,([0-9]+),([^/]+).html$" /index.php?do=static&page=$2&news_page=$1 last; + rewrite "^/print:([^/]+).html$" /engine/print.php?do=static&page=$1 last; + } + + if (!-f $request_filename) { + rewrite "^/([^/]+).html$" /index.php?do=static&page=$1 last; + } + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/default.stpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/default.stpl new file mode 100644 index 000000000..a68c99861 --- /dev/null +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/default.stpl @@ -0,0 +1,50 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %sdocroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/snginx.%domain%.conf*; +} diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/default.tpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/default.tpl new file mode 100644 index 000000000..b143e53ba --- /dev/null +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/default.tpl @@ -0,0 +1,46 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/dokuwiki.stpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/dokuwiki.stpl new file mode 100644 index 000000000..27483cd8c --- /dev/null +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/dokuwiki.stpl @@ -0,0 +1,67 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + index doku.php; + try_files $uri $uri/ @dokuwiki; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + location ^~ /lib/ { + expires 30d; + } + + location ^~ /conf/ { return 403; } + location ^~ /data/ { return 403; } + + location @dokuwiki { + rewrite ^/_media/(.*) /lib/exe/fetch.php?media=$1 last; + rewrite ^/_detail/(.*) /lib/exe/detail.php?media=$1 last; + rewrite ^/_export/([^/]+)/(.*) /doku.php?do=export_$1&id=$2 last; + rewrite ^/(.*) /doku.php?id=$1 last; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/dokuwiki.tpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/dokuwiki.tpl new file mode 100644 index 000000000..31647c9ff --- /dev/null +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/dokuwiki.tpl @@ -0,0 +1,62 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + index doku.php; + try_files $uri $uri/ @dokuwiki; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + location ^~ /lib/ { + expires 30d; + } + + location ^~ /conf/ { return 403; } + location ^~ /data/ { return 403; } + location @dokuwiki { + rewrite ^/_media/(.*) /lib/exe/fetch.php?media=$1 last; + rewrite ^/_detail/(.*) /lib/exe/detail.php?media=$1 last; + rewrite ^/_export/([^/]+)/(.*) /doku.php?do=export_$1&id=$2 last; + rewrite ^/(.*) /doku.php?id=$1 last; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/drupal.stpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/drupal.stpl new file mode 100644 index 000000000..9a5484396 --- /dev/null +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/drupal.stpl @@ -0,0 +1,101 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + + location / { + try_files $uri @rewrite; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # You have 2 options here + # For D7 and above: + # Clean URLs are handled in drupal_environment_initialize(). + rewrite ^ /index.php; + + # For Drupal 6 and bwlow: + # Some modules enforce no slash (/) at the end of the URL + # Else this rewrite block wouldn't be needed (GlobalRedirect) + #rewrite ^/(.*)$ /index.php?q=$1; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/drupal.tpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/drupal.tpl new file mode 100644 index 000000000..417762c18 --- /dev/null +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/drupal.tpl @@ -0,0 +1,98 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + # Very rarely should these ever be accessed outside of your lan + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + + location / { + try_files $uri @rewrite; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # You have 2 options here + # For D7 and above: + # Clean URLs are handled in drupal_environment_initialize(). + rewrite ^ /index.php; + + # For Drupal 6 and bwlow: + # Some modules enforce no slash (/) at the end of the URL + # Else this rewrite block wouldn't be needed (GlobalRedirect) + #rewrite ^/(.*)$ /index.php?q=$1; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/joomla.stpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/joomla.stpl new file mode 100644 index 000000000..235a01216 --- /dev/null +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/joomla.stpl @@ -0,0 +1,58 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + try_files $uri $uri/ /index.php?$args; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + # deny running scripts inside writable directories + location ~* /(images|cache|media|logs|tmp)/.*\.(php|pl|py|jsp|asp|sh|cgi)$ { + return 403; + error_page 403 /403_error.html; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/joomla.tpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/joomla.tpl new file mode 100644 index 000000000..997c268de --- /dev/null +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/joomla.tpl @@ -0,0 +1,54 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + try_files $uri $uri/ /index.php?$args; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + # deny running scripts inside writable directories + location ~* /(images|cache|media|logs|tmp)/.*\.(php|pl|py|jsp|asp|sh|cgi)$ { + return 403; + error_page 403 /403_error.html; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/owncloud.stpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/owncloud.stpl new file mode 100644 index 000000000..8311ca43f --- /dev/null +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/owncloud.stpl @@ -0,0 +1,80 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + rewrite ^/caldav(.*)$ /remote.php/caldav$1 redirect; + rewrite ^/carddav(.*)$ /remote.php/carddav$1 redirect; + rewrite ^/webdav(.*)$ /remote.php/webdav$1 redirect; + + error_page 403 = /core/templates/403.php; + error_page 404 = /core/templates/404.php; + + location ~ ^/(?:\.htaccess|data|config|db_structure\.xml|README){ + deny all; + } + + location / { + # The following 2 rules are only needed with webfinger + rewrite ^/.well-known/host-meta /public.php?service=host-meta last; + rewrite ^/.well-known/host-meta.json /public.php?service=host-meta-json last; + rewrite ^/.well-known/carddav /remote.php/carddav/ redirect; + rewrite ^/.well-known/caldav /remote.php/caldav/ redirect; + rewrite ^(/core/doc/[^\/]+/)$ $1/index.html; + try_files $uri $uri/ /index.php; + + location ~ \.php(?:$|/) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param PATH_INFO $fastcgi_path_info; + #fastcgi_param HTTPS on; + fastcgi_pass %backend_lsnr%; + } + } + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + # Some basic cache-control for static files to be sent to the browser + add_header Pragma public; + add_header Cache-Control "public, must-revalidate, proxy-revalidate"; + } + + #error_page 403 /error/404.html; + #error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/owncloud.tpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/owncloud.tpl new file mode 100644 index 000000000..57cac2f85 --- /dev/null +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/owncloud.tpl @@ -0,0 +1,76 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + rewrite ^/caldav(.*)$ /remote.php/caldav$1 redirect; + rewrite ^/carddav(.*)$ /remote.php/carddav$1 redirect; + rewrite ^/webdav(.*)$ /remote.php/webdav$1 redirect; + + error_page 403 = /core/templates/403.php; + error_page 404 = /core/templates/404.php; + + location ~ ^/(?:\.htaccess|data|config|db_structure\.xml|README){ + deny all; + } + + location / { + # The following 2 rules are only needed with webfinger + rewrite ^/.well-known/host-meta /public.php?service=host-meta last; + rewrite ^/.well-known/host-meta.json /public.php?service=host-meta-json last; + rewrite ^/.well-known/carddav /remote.php/carddav/ redirect; + rewrite ^/.well-known/caldav /remote.php/caldav/ redirect; + rewrite ^(/core/doc/[^\/]+/)$ $1/index.html; + try_files $uri $uri/ /index.php; + + location ~ \.php(?:$|/) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param PATH_INFO $fastcgi_path_info; + #fastcgi_param HTTPS on; + fastcgi_pass %backend_lsnr%; + } + } + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + # Some basic cache-control for static files to be sent to the browser + add_header Pragma public; + add_header Cache-Control "public, must-revalidate, proxy-revalidate"; + } + + #error_page 403 /error/404.html; + #error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/piwik.stpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/piwik.stpl new file mode 100644 index 000000000..c53af4011 --- /dev/null +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/piwik.stpl @@ -0,0 +1,68 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location = /favicon.ico { + try_files /favicon.ico =204; + } + + location / { + try_files $uri /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + valid_referers none blocked %domain_idn% %alias_idn%; + if ($invalid_referer) { + return 444; + } + expires max; + } + + location ~* ^/(?:index|piwik)\.php$ { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + include /etc/nginx/fastcgi_params; + } + } + + # Any other attempt to access PHP files returns a 404. + location ~* ^.+\.php$ { + return 404; + } + + # Return a 404 for all text files. + location ~* ^/(?:README|LICENSE[^.]*|LEGALNOTICE)(?:\.txt)*$ { + return 404; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/piwik.tpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/piwik.tpl new file mode 100644 index 000000000..6b4a94a68 --- /dev/null +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/piwik.tpl @@ -0,0 +1,64 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location = /favicon.ico { + try_files /favicon.ico =204; + } + + location / { + try_files $uri /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + valid_referers none blocked %domain_idn% %alias_idn%; + if ($invalid_referer) { + return 444; + } + expires max; + } + + location ~* ^/(?:index|piwik)\.php$ { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + include /etc/nginx/fastcgi_params; + } + } + + # Any other attempt to access PHP files returns a 404. + location ~* ^.+\.php$ { + return 404; + } + + # Return a 404 for all text files. + location ~* ^/(?:README|LICENSE[^.]*|LEGALNOTICE)(?:\.txt)*$ { + return 404; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/pyrocms.stpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/pyrocms.stpl new file mode 100644 index 000000000..a6fc67556 --- /dev/null +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/pyrocms.stpl @@ -0,0 +1,61 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location /installer { + try_files $uri $uri/ /installer/index.php; + } + + location / { + try_files $uri $uri/ /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + location = /robots.txt { access_log off; log_not_found off; } + location = /favicon.ico { access_log off; log_not_found off; } + location ~ /\. { access_log off; log_not_found off; deny all; } + location ~ ~$ { access_log off; log_not_found off; deny all; } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/pyrocms.tpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/pyrocms.tpl new file mode 100644 index 000000000..68b378efd --- /dev/null +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/pyrocms.tpl @@ -0,0 +1,57 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location /installer { + try_files $uri $uri/ /installer/index.php; + } + + location / { + try_files $uri $uri/ /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + location = /robots.txt { access_log off; log_not_found off; } + location = /favicon.ico { access_log off; log_not_found off; } + location ~ /\. { access_log off; log_not_found off; deny all; } + location ~ ~$ { access_log off; log_not_found off; deny all; } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/wordpress.stpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/wordpress.stpl new file mode 100644 index 000000000..910c28b69 --- /dev/null +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/wordpress.stpl @@ -0,0 +1,50 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/wordpress.tpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/wordpress.tpl new file mode 100644 index 000000000..b143e53ba --- /dev/null +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/wordpress.tpl @@ -0,0 +1,46 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/wordpress2.stpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/wordpress2.stpl new file mode 100644 index 000000000..2822f8754 --- /dev/null +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/wordpress2.stpl @@ -0,0 +1,62 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + location / { + try_files $uri $uri/ /index.php?$args; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/wordpress2.tpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/wordpress2.tpl new file mode 100644 index 000000000..37b8be305 --- /dev/null +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/wordpress2.tpl @@ -0,0 +1,58 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + location / { + try_files $uri $uri/ /index.php?$args; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/13.10/templates/web/nginx/proxy_ip.tpl b/install/ubuntu/13.10/templates/web/nginx/proxy_ip.tpl new file mode 100755 index 000000000..ae1956173 --- /dev/null +++ b/install/ubuntu/13.10/templates/web/nginx/proxy_ip.tpl @@ -0,0 +1,9 @@ +server { + listen %ip%:%proxy_port% default; + server_name _; + #access_log /var/log/nginx/%ip%.log main; + location / { + proxy_pass http://%ip%:%web_port%; + } +} + diff --git a/install/ubuntu/13.10/templates/web/php5-fpm/default.tpl b/install/ubuntu/13.10/templates/web/php5-fpm/default.tpl new file mode 100644 index 000000000..44ccf7a42 --- /dev/null +++ b/install/ubuntu/13.10/templates/web/php5-fpm/default.tpl @@ -0,0 +1,18 @@ +[%backend%] +listen = 127.0.0.1:%backend_port% +listen.allowed_clients = 127.0.0.1 + +user = %user% +group = %user% + +pm = dynamic +pm.max_children = 50 +pm.start_servers = 3 +pm.min_spare_servers = 2 +pm.max_spare_servers = 10 + +env[HOSTNAME] = $HOSTNAME +env[PATH] = /usr/local/bin:/usr/bin:/bin +env[TMP] = /tmp +env[TMPDIR] = /tmp +env[TEMP] = /tmp diff --git a/install/ubuntu/13.10/templates/web/php5-fpm/no-php.tpl b/install/ubuntu/13.10/templates/web/php5-fpm/no-php.tpl new file mode 100644 index 000000000..89487d5f5 --- /dev/null +++ b/install/ubuntu/13.10/templates/web/php5-fpm/no-php.tpl @@ -0,0 +1,13 @@ +#[%backend%] +#user = %user% +#group = %user% +#listen = /dev/null + +#listen.owner = %user% +#listen.group = nginx + +#pm = dynamic +#pm.max_children = 50 +#pm.start_servers = 3 +#pm.min_spare_servers = 2 +#pm.max_spare_servers = 10 diff --git a/install/ubuntu/13.10/templates/web/php5-fpm/socket.tpl b/install/ubuntu/13.10/templates/web/php5-fpm/socket.tpl new file mode 100644 index 000000000..f0513da3e --- /dev/null +++ b/install/ubuntu/13.10/templates/web/php5-fpm/socket.tpl @@ -0,0 +1,21 @@ +[%backend%] +listen = /var/run/php5-%backend%.sock +listen.allowed_clients = 127.0.0.1 + +user = %user% +group = %user% + +listen.owner = %user% +listen.group = nginx + +pm = dynamic +pm.max_children = 50 +pm.start_servers = 3 +pm.min_spare_servers = 2 +pm.max_spare_servers = 10 + +env[HOSTNAME] = $HOSTNAME +env[PATH] = /usr/local/bin:/usr/bin:/bin +env[TMP] = /tmp +env[TMPDIR] = /tmp +env[TEMP] = /tmp diff --git a/install/ubuntu/13.10/templates/web/skel/document_errors/403.html b/install/ubuntu/13.10/templates/web/skel/document_errors/403.html new file mode 100755 index 000000000..9c3f6baab --- /dev/null +++ b/install/ubuntu/13.10/templates/web/skel/document_errors/403.html @@ -0,0 +1,29 @@ + + + 403 — Forbidden + + + + + + +

        %domain%

        + +

        403

        +

        Forbidden

        +
        + Unfortunately, you do not have permission to view this +
        + + + diff --git a/install/ubuntu/13.10/templates/web/skel/document_errors/404.html b/install/ubuntu/13.10/templates/web/skel/document_errors/404.html new file mode 100755 index 000000000..2cee77084 --- /dev/null +++ b/install/ubuntu/13.10/templates/web/skel/document_errors/404.html @@ -0,0 +1,28 @@ + + + 404 — Not Found + + + + + + +

        %domain%

        +

        404

        +

        Page Not Found

        +
        + It seems that the page you were trying to reach does not exist anymore, or maybe it has just moved. + You can start again from the home or go back to previous page. +
        + + diff --git a/install/ubuntu/13.10/templates/web/skel/document_errors/50x.html b/install/ubuntu/13.10/templates/web/skel/document_errors/50x.html new file mode 100755 index 000000000..85ba648b7 --- /dev/null +++ b/install/ubuntu/13.10/templates/web/skel/document_errors/50x.html @@ -0,0 +1,29 @@ + + + 500 — Internal Sever Error + + + + + + +

        %domain%

        + +

        500

        +

        Internal Server Error

        +
        + Sorry, something went wrong :( +
        + + + diff --git a/install/ubuntu/13.10/templates/web/skel/public_html/index.html b/install/ubuntu/13.10/templates/web/skel/public_html/index.html new file mode 100755 index 000000000..4f5bb7244 --- /dev/null +++ b/install/ubuntu/13.10/templates/web/skel/public_html/index.html @@ -0,0 +1,26 @@ + + + %domain% — Coming Soon + + + + + + +

        %domain%

        + + + + + diff --git a/install/ubuntu/13.10/templates/web/skel/public_html/robots.txt b/install/ubuntu/13.10/templates/web/skel/public_html/robots.txt new file mode 100755 index 000000000..00ee83dcf --- /dev/null +++ b/install/ubuntu/13.10/templates/web/skel/public_html/robots.txt @@ -0,0 +1,3 @@ +# vestacp autogenerated robots.txt +User-agent: * +Crawl-delay: 10 diff --git a/install/ubuntu/13.10/templates/web/skel/public_shtml/index.html b/install/ubuntu/13.10/templates/web/skel/public_shtml/index.html new file mode 100755 index 000000000..4f5bb7244 --- /dev/null +++ b/install/ubuntu/13.10/templates/web/skel/public_shtml/index.html @@ -0,0 +1,26 @@ + + + %domain% — Coming Soon + + + + + + +

        %domain%

        + + + + + diff --git a/install/ubuntu/13.10/templates/web/skel/public_shtml/robots.txt b/install/ubuntu/13.10/templates/web/skel/public_shtml/robots.txt new file mode 100755 index 000000000..00ee83dcf --- /dev/null +++ b/install/ubuntu/13.10/templates/web/skel/public_shtml/robots.txt @@ -0,0 +1,3 @@ +# vestacp autogenerated robots.txt +User-agent: * +Crawl-delay: 10 diff --git a/install/ubuntu/13.10/templates/web/suspend/.htaccess b/install/ubuntu/13.10/templates/web/suspend/.htaccess new file mode 100755 index 000000000..5a6df83fb --- /dev/null +++ b/install/ubuntu/13.10/templates/web/suspend/.htaccess @@ -0,0 +1,2 @@ +ErrorDocument 403 /index.html +ErrorDocument 404 /index.html diff --git a/install/ubuntu/13.10/templates/web/suspend/index.html b/install/ubuntu/13.10/templates/web/suspend/index.html new file mode 100755 index 000000000..9d4fa67b3 --- /dev/null +++ b/install/ubuntu/13.10/templates/web/suspend/index.html @@ -0,0 +1,27 @@ + + + SUSPEND + + + + + + +

        SUSPEND

        +

        This site has been suspended

        +
        + Please contact technical support departament. +
        + + + diff --git a/install/ubuntu/13.10/templates/web/webalizer/webalizer.tpl b/install/ubuntu/13.10/templates/web/webalizer/webalizer.tpl new file mode 100755 index 000000000..068adcfb9 --- /dev/null +++ b/install/ubuntu/13.10/templates/web/webalizer/webalizer.tpl @@ -0,0 +1,110 @@ +HostName %domain_idn% +LogFile /var/log/%web_system%/domains/%domain%.log +OutputDir %home%/%user%/web/%domain%/stats +HistoryName %home%/%user%/web/%domain%/stats/%domain%.hist +Incremental yes +IncrementalName %home%/%user%/web/%domain%/stats/%domain%.current +PageType htm* +PageType cgi +PageType php +PageType shtml +DNSCache /var/lib/webalizer/dns_cache.db +DNSChildren 10 +Quiet yes +FoldSeqErr yes +IndexAlias index.php +HideURL *.gif +HideURL *.GIF +HideURL *.jpg +HideURL *.JPG +HideURL *.png +HideURL *.PNG +HideURL *.ra +SearchEngine abcsearch. terms= +SearchEngine alexa. q= +SearchEngine alltheweb. q= +SearchEngine alltheweb. query= +SearchEngine alot. q= +SearchEngine altavista. q= +SearchEngine aolsearch. query= +SearchEngine aport.ru r= +SearchEngine ask. q= +SearchEngine atlas.cz q= +SearchEngine bbc. q= +SearchEngine bing. q= +SearchEngine blingo. q= +SearchEngine blogs.yandex.ru text= +SearchEngine btopenworld query= +SearchEngine buscador.ya.com q= +SearchEngine busca. q= +SearchEngine business. query= +SearchEngine centrum.cz q= +SearchEngine chiff. q= +SearchEngine clusty. query= +SearchEngine comcast. q= +SearchEngine crawler. q= +SearchEngine cuil. q= +SearchEngine dmoz. search= +SearchEngine dogpile.com q= +SearchEngine dpxml qkw= +SearchEngine eureka. searchword= +SearchEngine euroseek. string= +SearchEngine exalead. q= +SearchEngine excite search= +SearchEngine ezilon. q= +SearchEngine fastbrowsersearch. q= +SearchEngine feedster.com q= +SearchEngine fireball.de q= +SearchEngine fireball. keyword= +SearchEngine freeserve. q= +SearchEngine gigablast. q= +SearchEngine gogo.ru q= +SearchEngine go.mail.ru q= +SearchEngine google. q= +SearchEngine hakia. q= +SearchEngine hotbot. query= +SearchEngine infoseek. qt= +SearchEngine iwon searchfor= +SearchEngine ixquick.com query= +SearchEngine joeant. keywords= +SearchEngine jyxo.cz s= +SearchEngine looksmart. key= +SearchEngine lycos. query= +SearchEngine mamma. q= +SearchEngine metacrawler q= +SearchEngine msn. MT= +SearchEngine msxml qkw= +SearchEngine mysearch. searchfor= +SearchEngine mywebsearch. searchfor= +SearchEngine netscape. q= +SearchEngine nigma.ru q= +SearchEngine northernlight. qr= +SearchEngine ntlworld. q= +SearchEngine orange. q= +SearchEngine overture. Keywords= +SearchEngine punto.ru text= +SearchEngine rambler. keyword= +SearchEngine search.aol. q= +SearchEngine search.babylon. q= +SearchEngine search.centrum. phrase= +SearchEngine search.conduit. q= +SearchEngine search.earthlink q= +SearchEngine search.icq. q= +SearchEngine search.live.com q= +SearchEngine search.rambler.ru words= +SearchEngine search.winamp. q= +SearchEngine searchy. q= +SearchEngine seznam.cz w= +SearchEngine snap. query= +SearchEngine teoma. q= +SearchEngine teradex.com q= +SearchEngine ukplus key= +SearchEngine verizon. q= +SearchEngine virginmedia. q= +SearchEngine voila. rdata= +SearchEngine webcrawler searchText= +SearchEngine web.search.naver. query= +SearchEngine wisenut q= +SearchEngine yahoo. p= +SearchEngine yandex. text= +SearchEngine yodao. q= diff --git a/install/ubuntu/13.10/vsftpd/vsftpd.conf b/install/ubuntu/13.10/vsftpd/vsftpd.conf new file mode 100644 index 000000000..0902899e7 --- /dev/null +++ b/install/ubuntu/13.10/vsftpd/vsftpd.conf @@ -0,0 +1,24 @@ +anonymous_enable=NO +local_enable=YES +write_enable=YES +local_umask=002 +anon_upload_enable=NO +dirmessage_enable=YES +xferlog_enable=YES +connect_from_port_20=YES +xferlog_std_format=YES +dual_log_enable=YES +chroot_local_user=YES +listen=YES +pam_service_name=vsftpd +userlist_enable=NO +tcp_wrappers=YES +force_dot_files=YES +ascii_upload_enable=YES +ascii_download_enable=YES +#allow_writable_chroot=YES +allow_writeable_chroot=YES +seccomp_sandbox=NO +pasv_enable=YES +pasv_max_port=12100 +pasv_min_port=12000 diff --git a/install/ubuntu/14.04/apache2/apache2.conf b/install/ubuntu/14.04/apache2/apache2.conf new file mode 100644 index 000000000..221780117 --- /dev/null +++ b/install/ubuntu/14.04/apache2/apache2.conf @@ -0,0 +1,86 @@ +# It is split into several files forming the configuration hierarchy outlined +# below, all located in the /etc/apache2/ directory: +# +# /etc/apache2/ +# |-- apache2.conf +# | `-- ports.conf +# |-- mods-enabled +# | |-- *.load +# | `-- *.conf +# |-- conf.d +# | `-- * + +# Global configuration +PidFile ${APACHE_PID_FILE} +Timeout 30 +KeepAlive Off +MaxKeepAliveRequests 100 +KeepAliveTimeout 10 + + + StartServers 8 + MinSpareServers 5 + MaxSpareServers 20 + ServerLimit 256 + MaxClients 200 + MaxRequestsPerChild 4000 + + + + StartServers 2 + MinSpareThreads 25 + MaxSpareThreads 75 + ThreadLimit 64 + ThreadsPerChild 25 + MaxClients 200 + MaxRequestsPerChild 4000 + + + + StartServers 2 + MinSpareThreads 25 + MaxSpareThreads 75 + ThreadLimit 64 + ThreadsPerChild 25 + MaxClients 200 + MaxRequestsPerChild 4000 + + +# These need to be set in /etc/apache2/envvars +User ${APACHE_RUN_USER} +Group ${APACHE_RUN_GROUP} +#User www-data +#Group www-data + +AccessFileName .htaccess + + + Order allow,deny + Deny from all + Satisfy all + + +DefaultType None +HostnameLookups Off + +ErrorLog ${APACHE_LOG_DIR}/error.log +LogLevel warn + +# Include module configuration: +Include mods-enabled/*.load +Include mods-enabled/*.conf + +# Include list of ports to listen on and which to use for name based vhosts +Include ports.conf + +LogFormat "%v:%p %h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" vhost_combined +LogFormat "%h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" combined +LogFormat "%h %l %u %t \"%r\" %>s %O" common +LogFormat "%{Referer}i -> %U" referer +LogFormat "%{User-agent}i" agent +LogFormat "%b" bytes + +Include conf.d/ + +# Include the virtual host configurations: +#Include sites-enabled/ diff --git a/install/ubuntu/14.04/apache2/status.conf b/install/ubuntu/14.04/apache2/status.conf new file mode 100644 index 000000000..da9d96333 --- /dev/null +++ b/install/ubuntu/14.04/apache2/status.conf @@ -0,0 +1,8 @@ +Listen 127.0.0.1:8081 + + SetHandler server-status + Order deny,allow + Deny from all + Allow from 127.0.0.1 + Allow from all + diff --git a/install/ubuntu/14.04/bind/named.conf b/install/ubuntu/14.04/bind/named.conf new file mode 100644 index 000000000..ed6ece885 --- /dev/null +++ b/install/ubuntu/14.04/bind/named.conf @@ -0,0 +1,12 @@ +// This is the primary configuration file for the BIND DNS server named. +// +// Please read /usr/share/doc/bind9/README.Debian.gz for information on the +// structure of BIND configuration files in Debian, *BEFORE* you customize +// this configuration file. +// +// If you are just adding zones, please do that in /etc/bind/named.conf.local + +include "/etc/bind/named.conf.options"; +include "/etc/bind/named.conf.local"; +include "/etc/bind/named.conf.default-zones"; + diff --git a/install/ubuntu/14.04/clamav/clamd.conf b/install/ubuntu/14.04/clamav/clamd.conf new file mode 100644 index 000000000..ea982697a --- /dev/null +++ b/install/ubuntu/14.04/clamav/clamd.conf @@ -0,0 +1,61 @@ +#Automatically Generated by clamav-base postinst +#To reconfigure clamd run #dpkg-reconfigure clamav-base +#Please read /usr/share/doc/clamav-base/README.Debian.gz for details +LocalSocket /var/run/clamav/clamd.ctl +FixStaleSocket true +LocalSocketGroup clamav +LocalSocketMode 666 +# TemporaryDirectory is not set to its default /tmp here to make overriding +# the default with environment variables TMPDIR/TMP/TEMP possible +User clamav +AllowSupplementaryGroups true +ScanMail true +ScanArchive true +ArchiveBlockEncrypted false +MaxDirectoryRecursion 15 +FollowDirectorySymlinks false +FollowFileSymlinks false +ReadTimeout 180 +MaxThreads 12 +MaxConnectionQueueLength 15 +LogSyslog false +LogFacility LOG_LOCAL6 +LogClean false +LogVerbose true +PidFile /var/run/clamav/clamd.pid +DatabaseDirectory /var/lib/clamav +SelfCheck 3600 +Foreground false +Debug false +ScanPE true +ScanOLE2 true +ScanHTML true +DetectBrokenExecutables false +ExitOnOOM false +LeaveTemporaryFiles false +AlgorithmicDetection true +ScanELF true +IdleTimeout 30 +PhishingSignatures true +PhishingScanURLs true +PhishingAlwaysBlockSSLMismatch false +PhishingAlwaysBlockCloak false +DetectPUA false +ScanPartialMessages false +HeuristicScanPrecedence false +StructuredDataDetection false +CommandReadTimeout 5 +SendBufTimeout 200 +MaxQueue 100 +ExtendedDetectionInfo true +OLE2BlockMacros false +StreamMaxLength 25M +LogFile /var/log/clamav/clamav.log +LogTime true +LogFileUnlock false +LogFileMaxSize 0 +Bytecode true +BytecodeSecurity TrustSigned +BytecodeTimeout 60000 +OfficialDatabaseOnly false +CrossFilesystems true diff --git a/install/ubuntu/14.04/deb_signing.key b/install/ubuntu/14.04/deb_signing.key new file mode 100644 index 000000000..2ad2db8bc --- /dev/null +++ b/install/ubuntu/14.04/deb_signing.key @@ -0,0 +1,30 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.12 (GNU/Linux) + +mQENBFJIGbEBCAC8SHOOFo7iDTbnC2GhNZ+uBGCh226Dn1QPoFZNFM/DNakHZ6rD +G3wzr8++eKz4fJual/VLllE2N9XDPuxbozb3LLkcyY1WzJqtIXbXhFGQ/SuIeT+x +QY90XU6t2Ckze2c+zUniAWmJ8GSyVmXOoc9JxAQ1u47wvGXLzrjWXc8u8PNRYXuf +fZplTL+dFu9P0d6lP8FGsV+r9wXvvazpRTz3+H8PKrGCYT55ZQIEdG9Jgamylto2 +oVPFXkwGML+TLw6oeCIBuz2y2vtivphW4MJ3ifQjDj7k3n+DTIxfDFs8lB6VRhhY +2nMHCrcZC6U2mhmXmr6O4s1fu6irBVx05ejPABEBAAG0IFNlcmdoZXkgUm9kaW4g +PHNraWRAdmVzdGFjcC5jb20+iQE4BBMBAgAiBQJSSBmxAhsDBgsJCAcDAgYVCAIJ +CgsEFgIDAQIeAQIXgAAKCRBCxbITCh93FPdqB/93GjV9g+wBfeZYLHQK9MDU2wBb +VloYOJJae6IvYKYQVAJayD3PbHdpxrF8s9e23vdnmb9jKu6jX6oV54EIyqP2HPiN +QYc8wcea+eSHerznBixCtoQh8mtdWGFeN71zU/ig7L5qlOVF/EmxDVZTFUeivFxh +IV6qyBnktQKktE45585yKZyyLtfGoXA54DGK69OtJFh+wdkKEMmUXocMl7wUrxW6 +Cx2CuKeEXEgvwu8mRHQi3S3T9XP456qWEn5dWyMVcP660IzEuZfSJApZusNK7zG3 +WMy0/EuX7xHNY3mcNxTOUN1LsO7iHnhHD9+iKWJo9parGkMZzc92MpjDK/g7uQEN +BFJIGbEBCAC7k5QEA9WQM7E3ceNaeLMrA9lXfuzaNCcySq7ONdVAa5PxzbSKdHvz +QFoL1VFqBTYQ038lbil1XqnoM0zvIfAI3LcpS8sq92El/vPxp6jZh2Ari9Uw7x95 +k2cZMgI67g+zQMGdjVRA155nFQRCgg000xU4F7JA6+WsuLlVUmccsDv7YWJExMtC +YPxiuz5DFu8RALnw4Ckts+dbwsrcvUHhkm9b6RAsdCKjjRpUZjLgdltjH83gUVvt +i1YmdjjsVpt95dtsaG+ad852g/Rk8EdxNMkjPF6HLA67CLADP9wYaj80yPcPtylS +ycvPtcclVeHkFBRVM8xZpQd4iD19MWI1ABEBAAGJAR8EGAECAAkFAlJIGbECGwwA +CgkQQsWyEwofdxQ7tQgAhB0FwTs7L8Qr63DHC2yAnXVxgtTAY1/36CccNXVculyR ++EkLcwahms9AKhz7eQb+Mud+5vH0GRohLp2npgO38CjVUfIP5d+Y6dsthmrkF6p8 +XdV1dVK9vWX+i/YZSw/Mded30Cq4P2Yhq9EaemMT0rtli8lz2NnkZ9dFJZk1lzJC +CZmRpbjSNWqRU4f7qyh21lYk/OC/0XE8fh8CaO23TZ+6gBionoCztwb7NyC9OArN +qYlNnbmh9iNqdblykPS3bkjf34n2xyMgnIehNrM89tk8PY4UfNPhgT1TMD9W3Svq +ynNZvLuF/FIDwDeC1qcfjGbfDn9fXO/lMIIRooQYKQ== +=J2HJ +-----END PGP PUBLIC KEY BLOCK----- diff --git a/install/ubuntu/14.04/dovecot.tar.gz b/install/ubuntu/14.04/dovecot.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..bfabaa030981d087ea4ccd8c7b86cc4d7ab1b7c6 GIT binary patch literal 3487 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 N{0}P55eWcL004dY&`|&Y literal 0 HcmV?d00001 diff --git a/install/ubuntu/14.04/dovecot/conf.d/10-auth.conf b/install/ubuntu/14.04/dovecot/conf.d/10-auth.conf new file mode 100644 index 000000000..dfcc83110 --- /dev/null +++ b/install/ubuntu/14.04/dovecot/conf.d/10-auth.conf @@ -0,0 +1,4 @@ +disable_plaintext_auth = no +auth_verbose = yes +auth_mechanisms = plain login +!include auth-passwdfile.conf.ext diff --git a/install/ubuntu/14.04/dovecot/conf.d/10-logging.conf b/install/ubuntu/14.04/dovecot/conf.d/10-logging.conf new file mode 100644 index 000000000..a5f207d51 --- /dev/null +++ b/install/ubuntu/14.04/dovecot/conf.d/10-logging.conf @@ -0,0 +1 @@ +log_path = /var/log/dovecot.log diff --git a/install/ubuntu/14.04/dovecot/conf.d/10-mail.conf b/install/ubuntu/14.04/dovecot/conf.d/10-mail.conf new file mode 100644 index 000000000..55313419e --- /dev/null +++ b/install/ubuntu/14.04/dovecot/conf.d/10-mail.conf @@ -0,0 +1,4 @@ +mail_privileged_group = mail +mail_access_groups = mail +mail_location = maildir:%h/mail/%d/%n +pop3_uidl_format = %08Xu%08Xv diff --git a/install/ubuntu/14.04/dovecot/conf.d/10-master.conf b/install/ubuntu/14.04/dovecot/conf.d/10-master.conf new file mode 100644 index 000000000..a75a9aaa4 --- /dev/null +++ b/install/ubuntu/14.04/dovecot/conf.d/10-master.conf @@ -0,0 +1,29 @@ +service imap-login { + inet_listener imap { + } + inet_listener imaps { + } +} + +service pop3-login { + inet_listener pop3 { + } + inet_listener pop3s { + } +} + + +service imap { +} + +service pop3 { +} + +service auth { + unix_listener auth-client { + group = mail + mode = 0660 + user = dovecot + } + user = dovecot +} diff --git a/install/ubuntu/14.04/dovecot/conf.d/10-ssl.conf b/install/ubuntu/14.04/dovecot/conf.d/10-ssl.conf new file mode 100644 index 000000000..3aaff6eec --- /dev/null +++ b/install/ubuntu/14.04/dovecot/conf.d/10-ssl.conf @@ -0,0 +1,3 @@ +ssl = yes +ssl_cert = = 2.1.4) : %v.%u + # Dovecot v0.99.x : %v.%u + # tpop3d : %Mf + # + # Note that Outlook 2003 seems to have problems with %v.%u format which was + # Dovecot's default, so if you're building a new server it would be a good + # idea to change this. %08Xu%08Xv should be pretty fail-safe. + # + #pop3_uidl_format = %08Xu%08Xv + + # Permanently save UIDLs sent to POP3 clients, so pop3_uidl_format changes + # won't change those UIDLs. Currently this works only with Maildir. + #pop3_save_uidl = no + + # What to do about duplicate UIDLs if they exist? + # allow: Show duplicates to clients. + # rename: Append a temporary -2, -3, etc. counter after the UIDL. + #pop3_uidl_duplicates = allow + + # POP3 logout format string: + # %i - total number of bytes read from client + # %o - total number of bytes sent to client + # %t - number of TOP commands + # %p - number of bytes sent to client as a result of TOP command + # %r - number of RETR commands + # %b - number of bytes sent to client as a result of RETR command + # %d - number of deleted messages + # %m - number of messages (before deletion) + # %s - mailbox size in bytes (before deletion) + # %u - old/new UIDL hash. may help finding out if UIDLs changed unexpectedly + #pop3_logout_format = top=%t/%p, retr=%r/%b, del=%d/%m, size=%s + + # Maximum number of POP3 connections allowed for a user from each IP address. + # NOTE: The username is compared case-sensitively. + #mail_max_userip_connections = 10 + + # Space separated list of plugins to load (default is global mail_plugins). + #mail_plugins = $mail_plugins + + # Workarounds for various client bugs: + # outlook-no-nuls: + # Outlook and Outlook Express hang if mails contain NUL characters. + # This setting replaces them with 0x80 character. + # oe-ns-eoh: + # Outlook Express and Netscape Mail breaks if end of headers-line is + # missing. This option simply sends it if it's missing. + # The list is space-separated. + #pop3_client_workarounds = +} diff --git a/install/ubuntu/14.04/dovecot/conf.d/auth-passwdfile.conf.ext b/install/ubuntu/14.04/dovecot/conf.d/auth-passwdfile.conf.ext new file mode 100644 index 000000000..75e6e1152 --- /dev/null +++ b/install/ubuntu/14.04/dovecot/conf.d/auth-passwdfile.conf.ext @@ -0,0 +1,9 @@ +passdb { + driver = passwd-file + args = scheme=MD5-CRYPT username_format=%n /etc/exim4/domains/%d/passwd +} + +userdb { + driver = passwd-file + args = username_format=%n /etc/exim4/domains/%d/passwd +} diff --git a/install/ubuntu/14.04/dovecot/dovecot.conf b/install/ubuntu/14.04/dovecot/dovecot.conf new file mode 100644 index 000000000..0a8553510 --- /dev/null +++ b/install/ubuntu/14.04/dovecot/dovecot.conf @@ -0,0 +1,4 @@ +protocols = imap pop3 +listen = *, :: +base_dir = /var/run/dovecot/ +!include conf.d/*.conf diff --git a/install/ubuntu/14.04/exim/dnsbl.conf b/install/ubuntu/14.04/exim/dnsbl.conf new file mode 100644 index 000000000..5166b255e --- /dev/null +++ b/install/ubuntu/14.04/exim/dnsbl.conf @@ -0,0 +1,2 @@ +bl.spamcop.net +zen.spamhaus.org diff --git a/install/ubuntu/14.04/exim/exim4.conf.template b/install/ubuntu/14.04/exim/exim4.conf.template new file mode 100644 index 000000000..742f0409e --- /dev/null +++ b/install/ubuntu/14.04/exim/exim4.conf.template @@ -0,0 +1,377 @@ +###################################################################### +# # +# Exim configuration file for Vesta Control Panel # +# # +###################################################################### + +#SPAMASSASSIN = yes +#SPAM_SCORE = 50 +#CLAMD = yes + +domainlist local_domains = dsearch;/etc/exim4/domains/ +domainlist relay_to_domains = dsearch;/etc/exim4/domains/ +hostlist relay_from_hosts = 127.0.0.1 +hostlist whitelist = net-iplsearch;/etc/exim4/white-blocks.conf +hostlist spammers = net-iplsearch;/etc/exim4/spam-blocks.conf +no_local_from_check +untrusted_set_sender = * +acl_smtp_connect = acl_check_spammers +acl_smtp_mail = acl_check_mail +acl_smtp_rcpt = acl_check_rcpt +acl_smtp_data = acl_check_data +acl_smtp_mime = acl_check_mime + +.ifdef SPAMASSASSIN +spamd_address = 127.0.0.1 783 +.endif + +.ifdef CLAMD +av_scanner = clamd: /var/run/clamav/clamd.ctl +.endif + +tls_advertise_hosts = * +tls_certificate = /usr/local/vesta/ssl/certificate.crt +tls_privatekey = /usr/local/vesta/ssl/certificate.key + +daemon_smtp_ports = 25 : 465 : 587 : 2525 +tls_on_connect_ports = 465 +never_users = root +host_lookup = * +rfc1413_hosts = * +rfc1413_query_timeout = 5s +ignore_bounce_errors_after = 2d +timeout_frozen_after = 7d + +DKIM_DOMAIN = ${lc:${domain:$h_from:}} +DKIM_FILE = /etc/exim4/domains/${lc:${domain:$h_from:}}/dkim.pem +DKIM_PRIVATE_KEY = ${if exists{DKIM_FILE}{DKIM_FILE}{0}} + + + +###################################################################### +# ACL CONFIGURATION # +# Specifies access control lists for incoming SMTP mail # +###################################################################### +begin acl + +acl_check_spammers: + accept hosts = +whitelist + + drop message = Your host in blacklist on this server. + log_message = Host in blacklist + hosts = +spammers + + accept + + +acl_check_mail: + deny condition = ${if eq{$sender_helo_name}{}} + message = HELO required before MAIL + + drop message = Helo name contains a ip address (HELO was $sender_helo_name) and not is valid + condition = ${if match{$sender_helo_name}{\N((\d{1,3}[.-]\d{1,3}[.-]\d{1,3}[.-]\d{1,3})|([0-9a-f]{8})|([0-9A-F]{8}))\N}{yes}{no}} + condition = ${if match {${lookup dnsdb{>: defer_never,ptr=$sender_host_address}}\}{$sender_helo_name}{no}{yes}} + delay = 45s + + drop condition = ${if isip{$sender_helo_name}} + message = Access denied - Invalid HELO name (See RFC2821 4.1.3) + + drop condition = ${if eq{[$interface_address]}{$sender_helo_name}} + message = $interface_address is _my_ address + + accept + + +acl_check_rcpt: + accept hosts = : + + deny message = Restricted characters in address + domains = +local_domains + local_parts = ^[.] : ^.*[@%!/|] + + deny message = Restricted characters in address + domains = !+local_domains + local_parts = ^[./|] : ^.*[@%!] : ^.*/\\.\\./ + + require verify = sender + + accept hosts = +relay_from_hosts + control = submission + + accept authenticated = * + control = submission/domain= + + deny message = Rejected because $sender_host_address is in a black list at $dnslist_domain\n$dnslist_text + hosts = !+whitelist + dnslists = ${readfile {/etc/exim4/dnsbl.conf}{:}} + + require message = relay not permitted + domains = +local_domains : +relay_to_domains + + deny message = smtp auth requried + sender_domains = +local_domains + !authenticated = * + + require verify = recipient + +.ifdef CLAMD + warn set acl_m0 = no + + warn condition = ${if exists {/etc/exim4/domains/$domain/antivirus}{yes}{no}} + set acl_m0 = yes +.endif + +.ifdef SPAMASSASSIN + warn set acl_m1 = no + + warn condition = ${if exists {/etc/exim4/domains/$domain/antispam}{yes}{no}} + set acl_m1 = yes +.endif + + accept + + +acl_check_data: +.ifdef CLAMD + deny message = Message contains a virus ($malware_name) and has been rejected + malware = * + condition = ${if eq{$acl_m0}{yes}{yes}{no}} +.endif + +.ifdef SPAMASSASSIN + warn !authenticated = * + hosts = !+relay_from_hosts + condition = ${if < {$message_size}{100K}} + condition = ${if eq{$acl_m1}{yes}{yes}{no}} + spam = nobody:true/defer_ok + add_header = X-Spam-Score: $spam_score_int + add_header = X-Spam-Bar: $spam_bar + add_header = X-Spam-Report: $spam_report + set acl_m2 = $spam_score_int + + warn condition = ${if !eq{$acl_m2}{} {yes}{no}} + condition = ${if >{$acl_m2}{SPAM_SCORE} {yes}{no}} + add_header = X-Spam-Status: Yes + message = SpamAssassin detected spam (from $sender_address to $recipients). +.endif + + accept + + +acl_check_mime: + deny message = Blacklisted file extension detected + condition = ${if match {${lc:$mime_filename}}{\N(\.ade|\.adp|\.bat|\.chm|\.cmd|\.com|\.cpl|\.exe|\.hta|\.ins|\.isp|\.jse|\.lib|\.lnk|\.mde|\.msc|\.msp|\.mst|\.pif|\.scr|\.sct|\.shb|\.sys|\.vb|\.vbe|\.vbs|\.vxd|\.wsc|\.wsf|\.wsh)$\N}{1}{0}} + + accept + + + +###################################################################### +# AUTHENTICATION CONFIGURATION # +###################################################################### +begin authenticators + +dovecot_plain: + driver = dovecot + public_name = PLAIN + server_socket = /var/run/dovecot/auth-client + server_set_id = $auth1 + +dovecot_login: + driver = dovecot + public_name = LOGIN + server_socket = /var/run/dovecot/auth-client + server_set_id = $auth1 + + + +###################################################################### +# ROUTERS CONFIGURATION # +# Specifies how addresses are handled # +###################################################################### +begin routers + +#smarthost: +# driver = manualroute +# domains = ! +local_domains +# transport = remote_smtp +# route_list = * smartrelay.vestacp.com +# no_more +# no_verify + +dnslookup: + driver = dnslookup + domains = !+local_domains + transport = remote_smtp + no_more + +userforward: + driver = redirect + check_local_user + file = $home/.forward + allow_filter + no_verify + no_expn + check_ancestor + file_transport = address_file + pipe_transport = address_pipe + reply_transport = address_reply + +procmail: + driver = accept + check_local_user + require_files = ${local_part}:+${home}/.procmailrc:/usr/bin/procmail + transport = procmail + no_verify + +autoreplay: + driver = accept + require_files = /etc/exim4/domains/$domain/autoreply.${local_part}.msg + condition = ${if exists{/etc/exim4/domains/$domain/autoreply.${local_part}.msg}}{yes}{no}} + retry_use_local_part + transport = userautoreply + unseen + +aliases: + driver = redirect + headers_add = X-redirected: yes + data = ${extract{1}{:}{${lookup{$local_part@$domain}lsearch{/etc/exim4/domains/$domain/aliases}}}} + require_files = /etc/exim4/domains/$domain/aliases + redirect_router = dnslookup + pipe_transport = address_pipe + unseen + +localuser_fwd_only: + driver = accept + transport = devnull + condition = ${if exists{/etc/exim/domains/$domain/fwd_only}{${lookup{$local_part}lsearch{/etc/exim/domains/$domain/fwd_only}{true}{false}}}} + +localuser_spam: + driver = accept + transport = local_spam_delivery + condition = ${if eq {${if match{$h_X-Spam-Status:}{\N^Yes\N}{yes}{no}}} {${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}{yes}{no_such_user}}}} + +localuser: + driver = accept + transport = local_delivery + condition = ${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}{true}{false}} + +catchall: + driver = redirect + headers_add = X-redirected: yes + require_files = /etc/exim4/domains/$domain/aliases + data = ${extract{1}{:}{${lookup{*@$domain}lsearch{/etc/exim4/domains/$domain/aliases}}}} + file_transport = local_delivery + redirect_router = dnslookup + +terminate_alias: + driver = accept + transport = devnull + condition = ${lookup{$local_part@$domain}lsearch{/etc/exim4/domains/$domain/aliases}{true}{false}} + + + +###################################################################### +# TRANSPORTS CONFIGURATION # +###################################################################### +begin transports + +remote_smtp: + driver = smtp + #helo_data = $sender_address_domain + dkim_domain = DKIM_DOMAIN + dkim_selector = mail + dkim_private_key = DKIM_PRIVATE_KEY + dkim_canon = relaxed + dkim_strict = 0 + +procmail: + driver = pipe + command = "/usr/bin/procmail -d $local_part" + return_path_add + delivery_date_add + envelope_to_add + user = $local_part + initgroups + return_output + +local_delivery: + driver = appendfile + maildir_format + maildir_use_size_file + user = ${extract{2}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}} + group = mail + create_directory + directory_mode = 770 + mode = 660 + use_lockfile = no + delivery_date_add + envelope_to_add + return_path_add + directory = "${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}}/mail/$domain/$local_part" + quota = ${extract{6}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}}M + quota_warn_threshold = 75% + +local_spam_delivery: + driver = appendfile + maildir_format + maildir_use_size_file + user = ${extract{2}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}} + group = mail + create_directory + directory_mode = 770 + mode = 660 + use_lockfile = no + delivery_date_add + envelope_to_add + return_path_add + directory = "${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}}/mail/$domain/$local_part/.Spam" + quota = ${extract{6}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}}M + quota_directory = "${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}}/mail/$domain/$local_part" + quota_warn_threshold = 75% + +address_pipe: + driver = pipe + return_output + +address_file: + driver = appendfile + delivery_date_add + envelope_to_add + return_path_add + +address_reply: + driver = autoreply + +userautoreply: + driver = autoreply + file = /etc/exim4/domains/$domain/autoreply.${local_part}.msg + from = "${local_part}@${domain}" + subject = "${if def:h_Subject: {Autoreply: ${quote:${escape:$h_Subject:}}} {Autoreply Message}}" + to = "${sender_address}" + +devnull: + driver = appendfile + file = /dev/null + + + +###################################################################### +# RETRY CONFIGURATION # +###################################################################### +begin retry + +# Address or Domain Error Retries +# ----------------- ----- ------- +* * F,2h,15m; G,16h,1h,1.5; F,4d,6h + + + +###################################################################### +# REWRITE CONFIGURATION # +###################################################################### +begin rewrite + + + +###################################################################### diff --git a/install/ubuntu/14.04/exim/spam-blocks.conf b/install/ubuntu/14.04/exim/spam-blocks.conf new file mode 100644 index 000000000..e69de29bb diff --git a/install/ubuntu/14.04/fail2ban.tar.gz b/install/ubuntu/14.04/fail2ban.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..628545b6b12d83a4dfcf4529b41f62792c228c85 GIT binary patch literal 721 zcmV;?0xta@iwFR?P)1Y$1MQbhZ{jczhB^CJjMPJ=l>#Ira4D7AZL1=&Z6#&~ zz`KruB3xbg09_DCMo>VRAaZ-;y)^U@ z_5_W1em^5}=Uk3M(j5%0M~Fp}7>lVIYRqubkoOIoiK#qP6BOckLPYW;2OWgmSsIAg zuZ|mFmaYUYjJJfo8s1fhF1)IOlQ|75La(j33(9U0btUMJvtIut>QYeUVmCrexr&Qi zKbjFQ61zkzP2U-?^r{!(!l(3+?Yga{u}aaFy}dZE-rC%=GOfyYm&N9W)k}T291PDY z*P0t`IZ}uIjJ_-j{V$SH_dlT#cu)PeEcx8DI+m&H|328vfBu=(y@&@N72}Qi-)t}U ze|i14JEpGxd*KMK)CoAp98}8bBuj9v%2KQe1W{6IHF7UVKsi-oBUDPa+B%^mI!l#A z%iggR=`rPvnSp)Z2xvn7V8#q@Dyt%#D2+c|xJU7JZ=WzC$g2~0Q{w%WGdx!uFgO@} z=-u4i58*FN5)y;)2*=Nd+$g+V_$fxmCp11?eTVGz8P->^KFOi;zxe)( z;(T!ZH#>H&|F+iuy|9`8{p-KwZ0f&dYyIB`OZs27=SuT4o@Sm$(ja3D9@K#V)prvv zs8^H+ECdN-k)k768hSV1`}Y@@gAp1N=}x2^dQlk4c0wJawc4RhTtX&fF0G*c4Nk6a z2g6fPkL6zl5rJ&(DMxg| +actionstop = /usr/local/vesta/bin/v-delete-firewall-chain +actioncheck = iptables -n -L INPUT | grep -q 'fail2ban-[ \t]' +actionban = /usr/local/vesta/bin/v-add-firewall-ban +actionunban = /usr/local/vesta/bin/v-delete-firewall-ban diff --git a/install/ubuntu/14.04/fail2ban/filter.d/vesta.conf b/install/ubuntu/14.04/fail2ban/filter.d/vesta.conf new file mode 100644 index 000000000..69670a56e --- /dev/null +++ b/install/ubuntu/14.04/fail2ban/filter.d/vesta.conf @@ -0,0 +1,10 @@ +# Fail2Ban filter for unsuccesfull Vesta authentication attempts +# + +[INCLUDES] +before = common.conf + +[Definition] +failregex = .* failed to login +ignoreregex = + diff --git a/install/ubuntu/14.04/fail2ban/jail.local b/install/ubuntu/14.04/fail2ban/jail.local new file mode 100644 index 000000000..eccea0685 --- /dev/null +++ b/install/ubuntu/14.04/fail2ban/jail.local @@ -0,0 +1,39 @@ +[ssh-iptables] +enabled = true +filter = sshd +action = vesta[name=SSH] +logpath = /var/log/auth.log +maxretry = 5 + +[vsftpd-iptables] +enabled = false +filter = vsftpd +action = vesta[name=FTP] +logpath = /var/log/vsftpd.log +maxretry = 5 + +[exim-iptables] +enabled = true +filter = exim +action = vesta[name=MAIL] +logpath = /var/log/exim4/mainlog + +[dovecot-iptables] +enabled = true +filter = dovecot +action = vesta[name=MAIL] +logpath = /var/log/dovecot.log + +[mysqld-iptables] +enabled = false +filter = mysqld-auth +action = vesta[name=DB] +logpath = /var/log/mysql.log +maxretry = 5 + +[vesta-iptables] +enabled = true +filter = vesta +action = vesta[name=VESTA] +logpath = /var/log/vesta/auth.log +maxretry = 5 diff --git a/install/ubuntu/14.04/firewall.tar.gz b/install/ubuntu/14.04/firewall.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..e8556008077364323d7d6b6934e7a2cf7a734983 GIT binary patch literal 540 zcmV+%0^|K3iwFQ5XyQ}=1MQVdkJ>O4Mzij(@XnhsKo&*MSlh#7(1g=&0&FEG%?Me6ampuO4>y-_`!)kpP&FT0Pj|*j)GSV93 zG0u%P9?@5H>Ue&9TJ8w(mS4U;YbU>kw!5dto6pc!`1H`piz?!Qs? zZ2zTY(j)A}O)l`C?|(Hfn=&r%X0(YbN~&_+%&1`W&E*1z3IZzVUki(*D`*Kk5kQkG z1wFz!17_g@d9ch)G0;wCGL8I9sNtr~X-yEB=^d3PuoC0XT$oBik3eT~aJ zPYYM7vf@1@^`frQB1w}O-E1jovb=r04Y>?eKuHocY1?18ny~4FyPO>aM4!NUUOmFePy(-1M3SddTi>v8NVjB&*t=IgAYbgkDfmmx*FWy-yM^~-2uA1 z`-8QZ4$iCJUfZClsXi!k+gGp^gsj(jT}WJxQ(W4?Rswg^FKlTCd%;5d=XH e1VIo4K@bE%5ClOG1VIqwGCu%8Tmj4gC;$K)2?m1z literal 0 HcmV?d00001 diff --git a/install/ubuntu/14.04/firewall/ports.conf b/install/ubuntu/14.04/firewall/ports.conf new file mode 100644 index 000000000..a6ef4dae5 --- /dev/null +++ b/install/ubuntu/14.04/firewall/ports.conf @@ -0,0 +1,16 @@ +PROTOCOL='TCP' PORT='20' +PROTOCOL='TCP' PORT='21' +PROTOCOL='TCP' PORT='22' +PROTOCOL='TCP' PORT='25' +PROTOCOL='UDP' PORT='53' +PROTOCOL='TCP' PORT='80' +PROTOCOL='TCP' PORT='443' +PROTOCOL='TCP' PORT='110' +PROTOCOL='UDP' PORT='123' +PROTOCOL='TCP' PORT='143' +PROTOCOL='TCP' PORT='3306' +PROTOCOL='TCP' PORT='5432' +PROTOCOL='TCP' PORT='8080' +PROTOCOL='TCP' PORT='8433' +PROTOCOL='TCP' PORT='8083' +PROTOCOL='TCP' PORT='12000:12100' diff --git a/install/ubuntu/14.04/firewall/rules.conf b/install/ubuntu/14.04/firewall/rules.conf new file mode 100644 index 000000000..956c2e1d9 --- /dev/null +++ b/install/ubuntu/14.04/firewall/rules.conf @@ -0,0 +1,10 @@ +RULE='1' ACTION='ACCEPT' PROTOCOL='ICMP' PORT='0' IP='0.0.0.0/0' COMMENT='PING' SUSPENDED='no' TIME='17:13:48' DATE='2014-09-16' +RULE='2' ACTION='ACCEPT' PROTOCOL='TCP' PORT='8083' IP='0.0.0.0/0' COMMENT='VESTA' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' +RULE='3' ACTION='ACCEPT' PROTOCOL='TCP' PORT='3306,5432' IP='0.0.0.0/0' COMMENT='DB' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' +RULE='4' ACTION='ACCEPT' PROTOCOL='TCP' PORT='143,993' IP='0.0.0.0/0' COMMENT='IMAP' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' +RULE='5' ACTION='ACCEPT' PROTOCOL='TCP' PORT='110,995' IP='0.0.0.0/0' COMMENT='POP3' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' +RULE='6' ACTION='ACCEPT' PROTOCOL='TCP' PORT='25,465,587,2525' IP='0.0.0.0/0' COMMENT='SMTP' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' +RULE='7' ACTION='ACCEPT' PROTOCOL='UDP' PORT='53' IP='0.0.0.0/0' COMMENT='DNS' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' +RULE='8' ACTION='ACCEPT' PROTOCOL='TCP' PORT='21,12000-12100' IP='0.0.0.0/0' COMMENT='FTP' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' +RULE='9' ACTION='ACCEPT' PROTOCOL='TCP' PORT='80,443' IP='0.0.0.0/0' COMMENT='WEB' SUSPENDED='no' TIME='17:04:27' DATE='2014-09-24' +RULE='10' ACTION='ACCEPT' PROTOCOL='TCP' PORT='22' IP='0.0.0.0/0' COMMENT='SSH' SUSPENDED='no' TIME='17:14:41' DATE='2014-09-16' diff --git a/install/ubuntu/14.04/logrotate/apache2 b/install/ubuntu/14.04/logrotate/apache2 new file mode 100644 index 000000000..27629d0dd --- /dev/null +++ b/install/ubuntu/14.04/logrotate/apache2 @@ -0,0 +1,19 @@ +/var/log/apache2/*.log /var/log/apache2/domains/*log { + weekly + missingok + rotate 52 + compress + delaycompress + notifempty + create 640 root adm + sharedscripts + postrotate + /etc/init.d/apache2 reload > /dev/null || true + [ ! -f /var/run/nginx.pid ] || kill -USR1 `cat /var/run/nginx.pid` + endscript + prerotate + if [ -d /etc/logrotate.d/httpd-prerotate ]; then \ + run-parts /etc/logrotate.d/httpd-prerotate; \ + fi; \ + endscript +} diff --git a/install/ubuntu/14.04/logrotate/nginx b/install/ubuntu/14.04/logrotate/nginx new file mode 100644 index 000000000..d667f2135 --- /dev/null +++ b/install/ubuntu/14.04/logrotate/nginx @@ -0,0 +1,13 @@ +/var/log/nginx/*log /var/log/nginx/domains/*log { + daily + missingok + rotate 52 + compress + delaycompress + notifempty + create 640 nginx adm + sharedscripts + postrotate + [ -f /var/run/nginx.pid ] && kill -USR1 `cat /var/run/nginx.pid` + endscript +} diff --git a/install/ubuntu/14.04/logrotate/vesta b/install/ubuntu/14.04/logrotate/vesta new file mode 100644 index 000000000..027a34396 --- /dev/null +++ b/install/ubuntu/14.04/logrotate/vesta @@ -0,0 +1,7 @@ +/usr/local/vesta/log/*.log { + missingok + notifempty + size 30k + yearly + create 0600 root root +} diff --git a/install/ubuntu/14.04/mysql/my-large.cnf b/install/ubuntu/14.04/mysql/my-large.cnf new file mode 100644 index 000000000..d0bab3907 --- /dev/null +++ b/install/ubuntu/14.04/mysql/my-large.cnf @@ -0,0 +1,42 @@ +[client] +port=3306 +socket=/var/run/mysqld/mysqld.sock + +[mysqld_safe] +socket=/var/run/mysqld/mysqld.sock + +[mysqld] +user=mysql +pid-file=/var/run/mysqld/mysqld.pid +socket=/var/run/mysqld/mysqld.sock +port=3306 +basedir=/usr +datadir=/var/lib/mysql +tmpdir=/tmp +lc-messages-dir=/usr/share/mysql +log_error=/var/log/mysql/error.log + +symbolic-links=0 + +skip-external-locking +key_buffer_size = 256M +max_allowed_packet = 32M +table_open_cache = 256 +sort_buffer_size = 1M +read_buffer_size = 1M +read_rnd_buffer_size = 4M +myisam_sort_buffer_size = 64M +thread_cache_size = 8 +query_cache_size= 16M +thread_concurrency = 8 + +#innodb_use_native_aio = 0 +innodb_file_per_table + +max_connections=200 +max_user_connections=50 +wait_timeout=10 +interactive_timeout=50 +long_query_time=5 + +!includedir /etc/mysql/conf.d/ diff --git a/install/ubuntu/14.04/mysql/my-medium.cnf b/install/ubuntu/14.04/mysql/my-medium.cnf new file mode 100644 index 000000000..1c10ab9a6 --- /dev/null +++ b/install/ubuntu/14.04/mysql/my-medium.cnf @@ -0,0 +1,40 @@ +[client] +port=3306 +socket=/var/run/mysqld/mysqld.sock + +[mysqld_safe] +socket=/var/run/mysqld/mysqld.sock + +[mysqld] +user=mysql +pid-file=/var/run/mysqld/mysqld.pid +socket=/var/run/mysqld/mysqld.sock +port=3306 +basedir=/usr +datadir=/var/lib/mysql +tmpdir=/tmp +lc-messages-dir=/usr/share/mysql +log_error=/var/log/mysql/error.log + +symbolic-links=0 + +skip-external-locking +key_buffer_size = 16M +max_allowed_packet = 16M +table_open_cache = 64 +sort_buffer_size = 512K +net_buffer_length = 8K +read_buffer_size = 256K +read_rnd_buffer_size = 512K +myisam_sort_buffer_size = 8M + +#innodb_use_native_aio = 0 +innodb_file_per_table + +max_connections=70 +max_user_connections=30 +wait_timeout=10 +interactive_timeout=50 +long_query_time=5 + +!includedir /etc/mysql/conf.d/ diff --git a/install/ubuntu/14.04/mysql/my-small.cnf b/install/ubuntu/14.04/mysql/my-small.cnf new file mode 100644 index 000000000..26a804781 --- /dev/null +++ b/install/ubuntu/14.04/mysql/my-small.cnf @@ -0,0 +1,40 @@ +[client] +port=3306 +socket=/var/run/mysqld/mysqld.sock + +[mysqld_safe] +socket=/var/run/mysqld/mysqld.sock + +[mysqld] +user=mysql +pid-file=/var/run/mysqld/mysqld.pid +socket=/var/run/mysqld/mysqld.sock +port=3306 +basedir=/usr +datadir=/var/lib/mysql +tmpdir=/tmp +lc-messages-dir=/usr/share/mysql +log_error=/var/log/mysql/error.log + +symbolic-links=0 + +skip-external-locking +key_buffer_size = 16K +max_allowed_packet = 1M +table_open_cache = 4 +sort_buffer_size = 64K +read_buffer_size = 256K +read_rnd_buffer_size = 256K +net_buffer_length = 2K +thread_stack = 240K + +#innodb_use_native_aio = 0 +innodb_file_per_table + +max_connections=30 +max_user_connections=20 +wait_timeout=10 +interactive_timeout=50 +long_query_time=5 + +!includedir /etc/mysql/conf.d/ diff --git a/install/ubuntu/14.04/nginx/nginx.conf b/install/ubuntu/14.04/nginx/nginx.conf new file mode 100644 index 000000000..7937301c1 --- /dev/null +++ b/install/ubuntu/14.04/nginx/nginx.conf @@ -0,0 +1,124 @@ +# Server globals +user www-data; +worker_processes 2; +error_log /var/log/nginx/error.log; +pid /var/run/nginx.pid; + + +# Worker config +events { + worker_connections 1024; + use epoll; +} + + +http { + # Main settings + sendfile on; + tcp_nopush on; + tcp_nodelay on; + client_header_timeout 1m; + client_body_timeout 1m; + client_header_buffer_size 2k; + client_body_buffer_size 256k; + client_max_body_size 100m; + large_client_header_buffers 4 8k; + send_timeout 30; + keepalive_timeout 60 60; + reset_timedout_connection on; + server_tokens off; + server_name_in_redirect off; + server_names_hash_max_size 512; + server_names_hash_bucket_size 512; + + + # Log format + log_format main '$remote_addr - $remote_user [$time_local] $request ' + '"$status" $body_bytes_sent "$http_referer" ' + '"$http_user_agent" "$http_x_forwarded_for"'; + log_format bytes '$body_bytes_sent'; + #access_log /var/log/nginx/access.log main; + access_log off; + + + # Mime settings + include /etc/nginx/mime.types; + default_type application/octet-stream; + + + # Compression + gzip on; + gzip_comp_level 9; + gzip_min_length 512; + gzip_buffers 8 64k; + gzip_types text/plain text/css text/javascript + application/x-javascript; + gzip_proxied any; + + + # Proxy settings + proxy_redirect off; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_pass_header Set-Cookie; + proxy_connect_timeout 90; + proxy_send_timeout 90; + proxy_read_timeout 90; + proxy_buffers 32 4k; + + + # Cloudflare https://www.cloudflare.com/ips + set_real_ip_from 199.27.128.0/21; + set_real_ip_from 173.245.48.0/20; + set_real_ip_from 103.21.244.0/22; + set_real_ip_from 103.22.200.0/22; + set_real_ip_from 103.31.4.0/22; + set_real_ip_from 141.101.64.0/18; + set_real_ip_from 108.162.192.0/18; + set_real_ip_from 190.93.240.0/20; + set_real_ip_from 188.114.96.0/20; + set_real_ip_from 197.234.240.0/22; + set_real_ip_from 198.41.128.0/17; + set_real_ip_from 162.158.0.0/15; + set_real_ip_from 104.16.0.0/12; + set_real_ip_from 172.64.0.0/13; + #set_real_ip_from 2400:cb00::/32; + #set_real_ip_from 2606:4700::/32; + #set_real_ip_from 2803:f800::/32; + #set_real_ip_from 2405:b500::/32; + #set_real_ip_from 2405:8100::/32; + real_ip_header CF-Connecting-IP; + + + # SSL PCI Compliance + ssl_session_cache shared:SSL:10m; + ssl_protocols TLSv1 TLSv1.1 TLSv1.2; + ssl_prefer_server_ciphers on; + ssl_ciphers "ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA:ECDHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES128-SHA256:DHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES256-GCM-SHA384:AES128-GCM-SHA256:AES256-SHA256:AES128-SHA256:AES256-SHA:AES128-SHA:DES-CBC3-SHA:HIGH:!aNULL:!eNULL:!EXPORT:!DES:!MD5:!PSK:!RC4"; + + + # Error pages + error_page 403 /error/403.html; + error_page 404 /error/404.html; + error_page 502 503 504 /error/50x.html; + + + # Cache + proxy_cache_path /var/cache/nginx levels=2 keys_zone=cache:10m inactive=60m max_size=512m; + proxy_cache_key "$host$request_uri $cookie_user"; + proxy_temp_path /var/cache/nginx/temp; + proxy_ignore_headers Expires Cache-Control; + proxy_cache_use_stale error timeout invalid_header http_502; + proxy_cache_valid any 3d; + + map $http_cookie $no_cache { + default 0; + ~SESS 1; + ~wordpress_logged_in 1; + } + + + # Wildcard include + include /etc/nginx/conf.d/*.conf; +} diff --git a/install/ubuntu/14.04/nginx/phpmyadmin.inc b/install/ubuntu/14.04/nginx/phpmyadmin.inc new file mode 100644 index 000000000..d70ca3e3c --- /dev/null +++ b/install/ubuntu/14.04/nginx/phpmyadmin.inc @@ -0,0 +1,15 @@ +location /phpmyadmin { + alias /usr/share/phpmyadmin/; + + location ~ /(libraries|setup) { + return 404; + } + + location ~ ^/phpmyadmin/(.*\.php)$ { + alias /usr/share/phpmyadmin/$1; + fastcgi_pass 127.0.0.1:9000; + fastcgi_index index.php; + include fastcgi_params; + fastcgi_param SCRIPT_FILENAME $request_filename; + } +} diff --git a/install/ubuntu/14.04/nginx/phppgadmin.inc b/install/ubuntu/14.04/nginx/phppgadmin.inc new file mode 100644 index 000000000..cd1e5806b --- /dev/null +++ b/install/ubuntu/14.04/nginx/phppgadmin.inc @@ -0,0 +1,11 @@ +location /phppgadmin { + alias /usr/share/phppgadmin/; + + location ~ ^/phppgadmin/(.*\.php)$ { + alias /usr/share/phppgadmin/$1; + fastcgi_pass 127.0.0.1:9000; + fastcgi_index index.php; + include fastcgi_params; + fastcgi_param SCRIPT_FILENAME $request_filename; + } +} diff --git a/install/ubuntu/14.04/nginx/status.conf b/install/ubuntu/14.04/nginx/status.conf new file mode 100644 index 000000000..c0bcd0691 --- /dev/null +++ b/install/ubuntu/14.04/nginx/status.conf @@ -0,0 +1,9 @@ +server { + listen 127.0.0.1:8084 default; + server_name _; + server_name_in_redirect off; + location / { + stub_status on; + access_log off; + } +} diff --git a/install/ubuntu/14.04/nginx/webmail.inc b/install/ubuntu/14.04/nginx/webmail.inc new file mode 100644 index 000000000..ad66895bc --- /dev/null +++ b/install/ubuntu/14.04/nginx/webmail.inc @@ -0,0 +1,15 @@ +location /webmail { + alias /var/lib/roundcube/; + + location ~ /(config|temp|logs) { + return 404; + } + + location ~ ^/webmail/(.*\.php)$ { + alias /var/lib/roundcube/$1; + fastcgi_pass 127.0.0.1:9000; + fastcgi_index index.php; + include fastcgi_params; + fastcgi_param SCRIPT_FILENAME $request_filename; + } +} diff --git a/install/ubuntu/14.04/packages.tar.gz b/install/ubuntu/14.04/packages.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..4b778dadce20a61f03a8ca920ec81c55a8730fee GIT binary patch literal 562 zcmV-20?qv&iwFRHoJ3Lp1MQYgkD5>vhFSY7+_9e37(#VaFxE7E(hXh3fdi2rFJZkFya3gX^b)n zVXSCG>M9q!r;?X63%1>^6fD25GP?9(Zs8i zm#eSAOO(kSvCYUG8}`JzlNGcp7>;dtR#6ZOYcoV)W|{76R22A_Q=gJo4AXSy6Mw(T z@QvYNS99i079ZTgdF&uH#Hm!H2Tkno>k1^mATb^lABoBo#r=lG9NGXU~REdk0(83B2vo&kr_ zAp~{{4=IqJS7Kl{UdaJ`lmmICl^~$|AizYY10B;!5Re`k^vG)ug3|w@mF?UAH~v$N z5%B*SfdB3Ik9DT%#Rp2&fAy{S9|r3<{gP~x+kO96-v30?!2fG-8UK&;KeGQw{$uw~ zsNXQZA^ut3x1l|*XixdCp}qF{wFdwI0000000000000000RC})0(q@EkpL(F05 diff --git a/install/ubuntu/14.04/pga/phppgadmin.conf b/install/ubuntu/14.04/pga/phppgadmin.conf new file mode 100644 index 000000000..f39247d6f --- /dev/null +++ b/install/ubuntu/14.04/pga/phppgadmin.conf @@ -0,0 +1,31 @@ +Alias /phppgadmin /usr/share/phppgadmin + + + +DirectoryIndex index.php +AllowOverride None + +order deny,allow +deny from all +allow from 127.0.0.0/255.0.0.0 ::1/128 +allow from all + + + php_flag magic_quotes_gpc Off + php_flag track_vars On + php_value include_path . + + + + + AddType application/x-httpd-php .php + Action application/x-httpd-php /cgi-bin/php + + + AddType application/x-httpd-php .php + Action application/x-httpd-php /cgi-bin/php + + + + + diff --git a/install/ubuntu/14.04/php5-fpm/www.conf b/install/ubuntu/14.04/php5-fpm/www.conf new file mode 100644 index 000000000..d046bceef --- /dev/null +++ b/install/ubuntu/14.04/php5-fpm/www.conf @@ -0,0 +1,10 @@ +[www] +listen = 127.0.0.1:9000 +listen.allowed_clients = 127.0.0.1 +user = www-data +group = www-data +pm = dynamic +pm.max_children = 50 +pm.start_servers = 5 +pm.min_spare_servers = 3 +pm.max_spare_servers = 35 diff --git a/install/ubuntu/14.04/pma/apache.conf b/install/ubuntu/14.04/pma/apache.conf new file mode 100644 index 000000000..2a8f69e25 --- /dev/null +++ b/install/ubuntu/14.04/pma/apache.conf @@ -0,0 +1,42 @@ +# phpMyAdmin default Apache configuration + +Alias /phpmyadmin /usr/share/phpmyadmin + + + Options FollowSymLinks + DirectoryIndex index.php + + + AddType application/x-httpd-php .php + + php_flag magic_quotes_gpc Off + php_flag track_vars On + php_flag register_globals Off + php_admin_flag allow_url_fopen Off + php_value include_path . + php_admin_value upload_tmp_dir /var/lib/phpmyadmin/tmp + php_admin_value open_basedir /usr/share/phpmyadmin/:/etc/phpmyadmin/:/var/lib/phpmyadmin/:/usr/share/php/php-gettext + + + + +# Authorize for setup + + + AuthType Basic + AuthName "phpMyAdmin Setup" + AuthUserFile /etc/phpmyadmin/htpasswd.setup + + Require valid-user + + +# Disallow web access to directories that don't need it + + Order Deny,Allow + Deny from All + + + Order Deny,Allow + Deny from All + + diff --git a/install/ubuntu/14.04/pma/config.inc.php b/install/ubuntu/14.04/pma/config.inc.php new file mode 100644 index 000000000..a643a065b --- /dev/null +++ b/install/ubuntu/14.04/pma/config.inc.php @@ -0,0 +1,146 @@ + + VRootEngine on + VRootAlias /etc/security/pam_env.conf etc/security/pam_env.conf + + +AuthPAMConfig proftpd +AuthOrder mod_auth_pam.c* mod_auth_unix.c +UseReverseDNS off +User proftpd +Group nogroup +MaxInstances 20 +UseSendfile off +LogFormat default "%h %l %u %t \"%r\" %s %b" +LogFormat auth "%v [%P] %h %t \"%r\" %s" +ListOptions -a +RequireValidShell off +PassivePorts 12000 12100 + + + Umask 002 + IdentLookups off + AllowOverwrite yes + + AllowAll + + diff --git a/install/ubuntu/14.04/roundcube/apache.conf b/install/ubuntu/14.04/roundcube/apache.conf new file mode 100644 index 000000000..a0c87bcc6 --- /dev/null +++ b/install/ubuntu/14.04/roundcube/apache.conf @@ -0,0 +1,40 @@ +Alias /roundcube/program/js/tiny_mce/ /usr/share/tinymce/www/ +Alias /roundcube /var/lib/roundcube +Alias /webmail /var/lib/roundcube + +# Access to tinymce files + + Options Indexes MultiViews FollowSymLinks + AllowOverride None + Order allow,deny + allow from all + + + + Options +FollowSymLinks + # This is needed to parse /var/lib/roundcube/.htaccess. See its + # content before setting AllowOverride to None. + AllowOverride All + order allow,deny + allow from all + + +# Protecting basic directories: + + Options -FollowSymLinks + AllowOverride None + + + + Options -FollowSymLinks + AllowOverride None + Order allow,deny + Deny from all + + + + Options -FollowSymLinks + AllowOverride None + Order allow,deny + Deny from all + diff --git a/install/ubuntu/14.04/roundcube/config.inc.php b/install/ubuntu/14.04/roundcube/config.inc.php new file mode 100644 index 000000000..0c82b1bc1 --- /dev/null +++ b/install/ubuntu/14.04/roundcube/config.inc.php @@ -0,0 +1,33 @@ + diff --git a/install/ubuntu/14.04/roundcube/main.inc.php b/install/ubuntu/14.04/roundcube/main.inc.php new file mode 100644 index 000000000..97cdbf2df --- /dev/null +++ b/install/ubuntu/14.04/roundcube/main.inc.php @@ -0,0 +1,850 @@ +/sendmail or to syslog +$rcmail_config['smtp_log'] = true; + +// Log successful logins to /userlogins or to syslog +$rcmail_config['log_logins'] = false; + +// Log session authentication errors to /session or to syslog +$rcmail_config['log_session'] = false; + +// Log SQL queries to /sql or to syslog +$rcmail_config['sql_debug'] = false; + +// Log IMAP conversation to /imap or to syslog +$rcmail_config['imap_debug'] = false; + +// Log LDAP conversation to /ldap or to syslog +$rcmail_config['ldap_debug'] = false; + +// Log SMTP conversation to /smtp or to syslog +$rcmail_config['smtp_debug'] = false; + +// ---------------------------------- +// IMAP +// ---------------------------------- + +// the mail host chosen to perform the log-in +// leave blank to show a textbox at login, give a list of hosts +// to display a pulldown menu or set one host as string. +// To use SSL/TLS connection, enter hostname with prefix ssl:// or tls:// +// Supported replacement variables: +// %n - http hostname ($_SERVER['SERVER_NAME']) +// %d - domain (http hostname without the first part) +// %s - domain name after the '@' from e-mail address provided at login screen +// For example %n = mail.domain.tld, %d = domain.tld +$rcmail_config['default_host'] = 'localhost'; + +// TCP port used for IMAP connections +$rcmail_config['default_port'] = 143; + +// IMAP AUTH type (DIGEST-MD5, CRAM-MD5, LOGIN, PLAIN or empty to use +// best server supported one) +$rcmail_config['imap_auth_type'] = null; + +// If you know your imap's folder delimiter, you can specify it here. +// Otherwise it will be determined automatically +$rcmail_config['imap_delimiter'] = null; + +// If IMAP server doesn't support NAMESPACE extension, but you're +// using shared folders or personal root folder is non-empty, you'll need to +// set these options. All can be strings or arrays of strings. +// Folders need to be ended with directory separator, e.g. "INBOX." +// (special directory "~" is an exception to this rule) +// These can be used also to overwrite server's namespaces +$rcmail_config['imap_ns_personal'] = null; +$rcmail_config['imap_ns_other'] = null; +$rcmail_config['imap_ns_shared'] = null; + +// By default IMAP capabilities are readed after connection to IMAP server +// In some cases, e.g. when using IMAP proxy, there's a need to refresh the list +// after login. Set to True if you've got this case. +$rcmail_config['imap_force_caps'] = false; + +// By default list of subscribed folders is determined using LIST-EXTENDED +// extension if available. Some servers (dovecot 1.x) returns wrong results +// for shared namespaces in this case. http://trac.roundcube.net/ticket/1486225 +// Enable this option to force LSUB command usage instead. +$rcmail_config['imap_force_lsub'] = false; + +// Some server configurations (e.g. Courier) doesn't list folders in all namespaces +// Enable this option to force listing of folders in all namespaces +$rcmail_config['imap_force_ns'] = false; + +// IMAP connection timeout, in seconds. Default: 0 (no limit) +$rcmail_config['imap_timeout'] = 0; + +// Optional IMAP authentication identifier to be used as authorization proxy +$rcmail_config['imap_auth_cid'] = null; + +// Optional IMAP authentication password to be used for imap_auth_cid +$rcmail_config['imap_auth_pw'] = null; + +// Type of IMAP indexes cache. Supported values: 'db', 'apc' and 'memcache'. +$rcmail_config['imap_cache'] = null; + +// Enables messages cache. Only 'db' cache is supported. +$rcmail_config['messages_cache'] = false; + + +// ---------------------------------- +// SMTP +// ---------------------------------- + +// SMTP server host (for sending mails). +// To use SSL/TLS connection, enter hostname with prefix ssl:// or tls:// +// If left blank, the PHP mail() function is used +// Supported replacement variables: +// %h - user's IMAP hostname +// %n - http hostname ($_SERVER['SERVER_NAME']) +// %d - domain (http hostname without the first part) +// %z - IMAP domain (IMAP hostname without the first part) +// For example %n = mail.domain.tld, %d = domain.tld +$rcmail_config['smtp_server'] = ''; + +// SMTP port (default is 25; use 587 for STARTTLS or 465 for the +// deprecated SSL over SMTP (aka SMTPS)) +$rcmail_config['smtp_port'] = 25; + +// SMTP username (if required) if you use %u as the username Roundcube +// will use the current username for login +$rcmail_config['smtp_user'] = ''; + +// SMTP password (if required) if you use %p as the password Roundcube +// will use the current user's password for login +$rcmail_config['smtp_pass'] = ''; + +// SMTP AUTH type (DIGEST-MD5, CRAM-MD5, LOGIN, PLAIN or empty to use +// best server supported one) +$rcmail_config['smtp_auth_type'] = ''; + +// Optional SMTP authentication identifier to be used as authorization proxy +$rcmail_config['smtp_auth_cid'] = null; + +// Optional SMTP authentication password to be used for smtp_auth_cid +$rcmail_config['smtp_auth_pw'] = null; + +// SMTP HELO host +// Hostname to give to the remote server for SMTP 'HELO' or 'EHLO' messages +// Leave this blank and you will get the server variable 'server_name' or +// localhost if that isn't defined. +$rcmail_config['smtp_helo_host'] = ''; + +// SMTP connection timeout, in seconds. Default: 0 (no limit) +$rcmail_config['smtp_timeout'] = 0; + +// ---------------------------------- +// SYSTEM +// ---------------------------------- +include_once("/etc/roundcube/debian-db-roundcube.php"); + + +// THIS OPTION WILL ALLOW THE INSTALLER TO RUN AND CAN EXPOSE SENSITIVE CONFIG DATA. +// ONLY ENABLE IT IF YOU'RE REALLY SURE WHAT YOU'RE DOING! +$rcmail_config['enable_installer'] = false; + +// provide an URL where a user can get support for this Roundcube installation +// PLEASE DO NOT LINK TO THE ROUNDCUBE.NET WEBSITE HERE! +$rcmail_config['support_url'] = ''; + +// replace Roundcube logo with this image +// specify an URL relative to the document root of this Roundcube installation +$rcmail_config['skin_logo'] = null; + +// automatically create a new Roundcube user when log-in the first time. +// a new user will be created once the IMAP login succeeds. +// set to false if only registered users can use this service +$rcmail_config['auto_create_user'] = true; + +// use this folder to store log files (must be writeable for apache user) +// This is used by the 'file' log driver. +$rcmail_config['log_dir'] = '/var/log/roundcubemail/'; + +// use this folder to store temp files (must be writeable for apache user) +$rcmail_config['temp_dir'] = '/tmp'; + +// lifetime of message cache +// possible units: s, m, h, d, w +$rcmail_config['message_cache_lifetime'] = '10d'; + +// enforce connections over https +// with this option enabled, all non-secure connections will be redirected. +// set the port for the ssl connection as value of this option if it differs from the default 443 +$rcmail_config['force_https'] = false; + +// tell PHP that it should work as under secure connection +// even if it doesn't recognize it as secure ($_SERVER['HTTPS'] is not set) +// e.g. when you're running Roundcube behind a https proxy +// this option is mutually exclusive to 'force_https' and only either one of them should be set to true. +$rcmail_config['use_https'] = false; + +// Allow browser-autocompletion on login form. +// 0 - disabled, 1 - username and host only, 2 - username, host, password +$rcmail_config['login_autocomplete'] = 0; + +// Forces conversion of logins to lower case. +// 0 - disabled, 1 - only domain part, 2 - domain and local part. +// If users authentication is not case-sensitive this must be enabled. +// After enabling it all user records need to be updated, e.g. with query: +// UPDATE users SET username = LOWER(username); +$rcmail_config['login_lc'] = 0; + +// Includes should be interpreted as PHP files +$rcmail_config['skin_include_php'] = false; + +// display software version on login screen +$rcmail_config['display_version'] = false; + +// Session lifetime in minutes +// must be greater than 'keep_alive'/60 +$rcmail_config['session_lifetime'] = 10; + +// session domain: .example.org +$rcmail_config['session_domain'] = ''; + +// session name. Default: 'roundcube_sessid' +$rcmail_config['session_name'] = null; + +// Backend to use for session storage. Can either be 'db' (default) or 'memcache' +// If set to memcache, a list of servers need to be specified in 'memcache_hosts' +// Make sure the Memcache extension (http://pecl.php.net/package/memcache) version >= 2.0.0 is installed +$rcmail_config['session_storage'] = 'db'; + +// Use these hosts for accessing memcached +// Define any number of hosts in the form of hostname:port or unix:///path/to/sock.file +$rcmail_config['memcache_hosts'] = null; // e.g. array( 'localhost:11211', '192.168.1.12:11211', 'unix:///var/tmp/memcached.sock' ); + +// check client IP in session athorization +$rcmail_config['ip_check'] = false; + +// check referer of incoming requests +$rcmail_config['referer_check'] = false; + +// X-Frame-Options HTTP header value sent to prevent from Clickjacking. +// Possible values: sameorigin|deny. Set to false in order to disable sending them +$rcmail_config['x_frame_options'] = 'sameorigin'; + +// this key is used to encrypt the users imap password which is stored +// in the session record (and the client cookie if remember password is enabled). +// please provide a string of exactly 24 chars. +$rcmail_config['des_key'] = 'vtIOjLZo9kffJoqzpSbm5r1r'; + +// Automatically add this domain to user names for login +// Only for IMAP servers that require full e-mail addresses for login +// Specify an array with 'host' => 'domain' values to support multiple hosts +// Supported replacement variables: +// %h - user's IMAP hostname +// %n - http hostname ($_SERVER['SERVER_NAME']) +// %d - domain (http hostname without the first part) +// %z - IMAP domain (IMAP hostname without the first part) +// For example %n = mail.domain.tld, %d = domain.tld +$rcmail_config['username_domain'] = ''; + +// This domain will be used to form e-mail addresses of new users +// Specify an array with 'host' => 'domain' values to support multiple hosts +// Supported replacement variables: +// %h - user's IMAP hostname +// %n - http hostname ($_SERVER['SERVER_NAME']) +// %d - domain (http hostname without the first part) +// %z - IMAP domain (IMAP hostname without the first part) +// For example %n = mail.domain.tld, %d = domain.tld +$rcmail_config['mail_domain'] = ''; + +// Password charset. +// Use it if your authentication backend doesn't support UTF-8. +// Defaults to ISO-8859-1 for backward compatibility +$rcmail_config['password_charset'] = 'ISO-8859-1'; + +// How many seconds must pass between emails sent by a user +$rcmail_config['sendmail_delay'] = 0; + +// Maximum number of recipients per message. Default: 0 (no limit) +$rcmail_config['max_recipients'] = 0; + +// Maximum allowednumber of members of an address group. Default: 0 (no limit) +// If 'max_recipients' is set this value should be less or equal +$rcmail_config['max_group_members'] = 0; + +// add this user-agent to message headers when sending +$rcmail_config['useragent'] = 'Roundcube Webmail/'.RCMAIL_VERSION; + +// use this name to compose page titles +$rcmail_config['product_name'] = 'Roundcube Webmail'; + +// try to load host-specific configuration +// see http://trac.roundcube.net/wiki/Howto_Config for more details +$rcmail_config['include_host_config'] = false; + +// path to a text file which will be added to each sent message +// paths are relative to the Roundcube root folder +$rcmail_config['generic_message_footer'] = ''; + +// path to a text file which will be added to each sent HTML message +// paths are relative to the Roundcube root folder +$rcmail_config['generic_message_footer_html'] = ''; + +// add a received header to outgoing mails containing the creators IP and hostname +$rcmail_config['http_received_header'] = false; + +// Whether or not to encrypt the IP address and the host name +// these could, in some circles, be considered as sensitive information; +// however, for the administrator, these could be invaluable help +// when tracking down issues. +$rcmail_config['http_received_header_encrypt'] = false; + +// This string is used as a delimiter for message headers when sending +// a message via mail() function. Leave empty for auto-detection +$rcmail_config['mail_header_delimiter'] = NULL; + +// number of chars allowed for line when wrapping text. +// text wrapping is done when composing/sending messages +$rcmail_config['line_length'] = 72; + +// send plaintext messages as format=flowed +$rcmail_config['send_format_flowed'] = true; + +// don't allow these settings to be overriden by the user +$rcmail_config['dont_override'] = array(); + +// Set identities access level: +// 0 - many identities with possibility to edit all params +// 1 - many identities with possibility to edit all params but not email address +// 2 - one identity with possibility to edit all params +// 3 - one identity with possibility to edit all params but not email address +$rcmail_config['identities_level'] = 0; + +// Mimetypes supported by the browser. +// attachments of these types will open in a preview window +// either a comma-separated list or an array: 'text/plain,text/html,text/xml,image/jpeg,image/gif,image/png,application/pdf' +$rcmail_config['client_mimetypes'] = null; # null == default + +// mime magic database +$rcmail_config['mime_magic'] = null; + +// path to imagemagick identify binary +$rcmail_config['im_identify_path'] = null; + +// path to imagemagick convert binary +$rcmail_config['im_convert_path'] = null; + +// maximum size of uploaded contact photos in pixel +$rcmail_config['contact_photo_size'] = 160; + +// Enable DNS checking for e-mail address validation +$rcmail_config['email_dns_check'] = false; + +// ---------------------------------- +// PLUGINS +// ---------------------------------- + +// List of active plugins (in plugins/ directory) +$rcmail_config['plugins'] = array('password'); + +// ---------------------------------- +// USER INTERFACE +// ---------------------------------- + +// default messages sort column. Use empty value for default server's sorting, +// or 'arrival', 'date', 'subject', 'from', 'to', 'fromto', 'size', 'cc' +$rcmail_config['message_sort_col'] = ''; + +// default messages sort order +$rcmail_config['message_sort_order'] = 'DESC'; + +// These cols are shown in the message list. Available cols are: +// subject, from, to, fromto, cc, replyto, date, size, status, flag, attachment, 'priority' +$rcmail_config['list_cols'] = array('subject', 'status', 'fromto', 'date', 'size', 'flag', 'attachment'); + +// the default locale setting (leave empty for auto-detection) +// RFC1766 formatted language name like en_US, de_DE, de_CH, fr_FR, pt_BR +$rcmail_config['language'] = null; + +// use this format for date display (date or strftime format) +$rcmail_config['date_format'] = 'Y-m-d'; + +// give this choice of date formats to the user to select from +$rcmail_config['date_formats'] = array('Y-m-d', 'd-m-Y', 'Y/m/d', 'm/d/Y', 'd/m/Y', 'd.m.Y', 'j.n.Y'); + +// use this format for time display (date or strftime format) +$rcmail_config['time_format'] = 'H:i'; + +// give this choice of time formats to the user to select from +$rcmail_config['time_formats'] = array('G:i', 'H:i', 'g:i a', 'h:i A'); + +// use this format for short date display (derived from date_format and time_format) +$rcmail_config['date_short'] = 'D H:i'; + +// use this format for detailed date/time formatting (derived from date_format and time_format) +$rcmail_config['date_long'] = 'Y-m-d H:i'; + +// store draft message is this mailbox +// leave blank if draft messages should not be stored +// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP) +$rcmail_config['drafts_mbox'] = 'Drafts'; + +// store spam messages in this mailbox +// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP) +$rcmail_config['junk_mbox'] = 'Spam'; + +// store sent message is this mailbox +// leave blank if sent messages should not be stored +// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP) +$rcmail_config['sent_mbox'] = 'Sent'; + +// move messages to this folder when deleting them +// leave blank if they should be deleted directly +// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP) +$rcmail_config['trash_mbox'] = 'Trash'; + +// display these folders separately in the mailbox list. +// these folders will also be displayed with localized names +// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP) +$rcmail_config['default_folders'] = array('INBOX', 'Drafts', 'Sent', 'Spam', 'Trash'); +$rcmail_config['default_imap_folders'] = array('INBOX', 'Drafts', 'Sent', 'Spam', 'Trash'); + +// automatically create the above listed default folders on first login +$rcmail_config['create_default_folders'] = true; + +// protect the default folders from renames, deletes, and subscription changes +$rcmail_config['protect_default_folders'] = true; + +// if in your system 0 quota means no limit set this option to true +$rcmail_config['quota_zero_as_unlimited'] = false; + +// Make use of the built-in spell checker. It is based on GoogieSpell. +// Since Google only accepts connections over https your PHP installatation +// requires to be compiled with Open SSL support +$rcmail_config['enable_spellcheck'] = true; + +// Enables spellchecker exceptions dictionary. +// Setting it to 'shared' will make the dictionary shared by all users. +$rcmail_config['spellcheck_dictionary'] = false; + +// Set the spell checking engine. 'googie' is the default. 'pspell' is also available, +// but requires the Pspell extensions. When using Nox Spell Server, also set 'googie' here. +$rcmail_config['spellcheck_engine'] = 'googie'; + +// For a locally installed Nox Spell Server, please specify the URI to call it. +// Get Nox Spell Server from http://orangoo.com/labs/?page_id=72 +// Leave empty to use the Google spell checking service, what means +// that the message content will be sent to Google in order to check spelling +$rcmail_config['spellcheck_uri'] = ''; + +// These languages can be selected for spell checking. +// Configure as a PHP style hash array: array('en'=>'English', 'de'=>'Deutsch'); +// Leave empty for default set of available language. +$rcmail_config['spellcheck_languages'] = NULL; + +// Makes that words with all letters capitalized will be ignored (e.g. GOOGLE) +$rcmail_config['spellcheck_ignore_caps'] = false; + +// Makes that words with numbers will be ignored (e.g. g00gle) +$rcmail_config['spellcheck_ignore_nums'] = false; + +// Makes that words with symbols will be ignored (e.g. g@@gle) +$rcmail_config['spellcheck_ignore_syms'] = false; + +// Use this char/string to separate recipients when composing a new message +$rcmail_config['recipients_separator'] = ','; + +// don't let users set pagesize to more than this value if set +$rcmail_config['max_pagesize'] = 200; + +// Minimal value of user's 'keep_alive' setting (in seconds) +// Must be less than 'session_lifetime' +$rcmail_config['min_keep_alive'] = 60; + +// Enables files upload indicator. Requires APC installed and enabled apc.rfc1867 option. +// By default refresh time is set to 1 second. You can set this value to true +// or any integer value indicating number of seconds. +$rcmail_config['upload_progress'] = false; + +// Specifies for how many seconds the Undo button will be available +// after object delete action. Currently used with supporting address book sources. +// Setting it to 0, disables the feature. +$rcmail_config['undo_timeout'] = 0; + +// ---------------------------------- +// ADDRESSBOOK SETTINGS +// ---------------------------------- + +// This indicates which type of address book to use. Possible choises: +// 'sql' (default) and 'ldap'. +// If set to 'ldap' then it will look at using the first writable LDAP +// address book as the primary address book and it will not display the +// SQL address book in the 'Address Book' view. +$rcmail_config['address_book_type'] = 'sql'; + +// In order to enable public ldap search, configure an array like the Verisign +// example further below. if you would like to test, simply uncomment the example. +// Array key must contain only safe characters, ie. a-zA-Z0-9_ +$rcmail_config['ldap_public'] = array(); + +// If you are going to use LDAP for individual address books, you will need to +// set 'user_specific' to true and use the variables to generate the appropriate DNs to access it. +// +// The recommended directory structure for LDAP is to store all the address book entries +// under the users main entry, e.g.: +// +// o=root +// ou=people +// uid=user@domain +// mail=contact@contactdomain +// +// So the base_dn would be uid=%fu,ou=people,o=root +// The bind_dn would be the same as based_dn or some super user login. +/* + * example config for Verisign directory + * +$rcmail_config['ldap_public']['Verisign'] = array( + 'name' => 'Verisign.com', + // Replacement variables supported in host names: + // %h - user's IMAP hostname + // %n - http hostname ($_SERVER['SERVER_NAME']) + // %d - domain (http hostname without the first part) + // %z - IMAP domain (IMAP hostname without the first part) + // For example %n = mail.domain.tld, %d = domain.tld + 'hosts' => array('directory.verisign.com'), + 'port' => 389, + 'use_tls' => false, + 'ldap_version' => 3, // using LDAPv3 + 'user_specific' => false, // If true the base_dn, bind_dn and bind_pass default to the user's IMAP login. + // %fu - The full username provided, assumes the username is an email + // address, uses the username_domain value if not an email address. + // %u - The username prior to the '@'. + // %d - The domain name after the '@'. + // %dc - The domain name hierarchal string e.g. "dc=test,dc=domain,dc=com" + // %dn - DN found by ldap search when search_filter/search_base_dn are used + 'base_dn' => '', + 'bind_dn' => '', + 'bind_pass' => '', + // It's possible to bind for an individual address book + // The login name is used to search for the DN to bind with + 'search_base_dn' => '', + 'search_filter' => '', // e.g. '(&(objectClass=posixAccount)(uid=%u))' + // DN and password to bind as before searching for bind DN, if anonymous search is not allowed + 'search_bind_dn' => '', + 'search_bind_pw' => '', + // Default for %dn variable if search doesn't return DN value + 'search_dn_default' => '', + // Optional authentication identifier to be used as SASL authorization proxy + // bind_dn need to be empty + 'auth_cid' => '', + // SASL authentication method (for proxy auth), e.g. DIGEST-MD5 + 'auth_method' => '', + // Indicates if the addressbook shall be hidden from the list. + // With this option enabled you can still search/view contacts. + 'hidden' => false, + // Indicates if the addressbook shall not list contacts but only allows searching. + 'searchonly' => false, + // Indicates if we can write to the LDAP directory or not. + // If writable is true then these fields need to be populated: + // LDAP_Object_Classes, required_fields, LDAP_rdn + 'writable' => false, + // To create a new contact these are the object classes to specify + // (or any other classes you wish to use). + 'LDAP_Object_Classes' => array('top', 'inetOrgPerson'), + // The RDN field that is used for new entries, this field needs + // to be one of the search_fields, the base of base_dn is appended + // to the RDN to insert into the LDAP directory. + 'LDAP_rdn' => 'cn', + // The required fields needed to build a new contact as required by + // the object classes (can include additional fields not required by the object classes). + 'required_fields' => array('cn', 'sn', 'mail'), + 'search_fields' => array('mail', 'cn'), // fields to search in + // mapping of contact fields to directory attributes + // for every attribute one can specify the number of values (limit) allowed. + // default is 1, a wildcard * means unlimited + 'fieldmap' => array( + // Roundcube => LDAP:limit + 'name' => 'cn', + 'surname' => 'sn', + 'firstname' => 'givenName', + 'title' => 'title', + 'email' => 'mail:*', + 'phone:home' => 'homePhone', + 'phone:work' => 'telephoneNumber', + 'phone:mobile' => 'mobile', + 'phone:pager' => 'pager', + 'street' => 'street', + 'zipcode' => 'postalCode', + 'region' => 'st', + 'locality' => 'l', +// if you uncomment country, you need to modify 'sub_fields' above +// 'country' => 'c', + 'department' => 'departmentNumber', + 'notes' => 'description', +// these currently don't work: +// 'phone:workfax' => 'facsimileTelephoneNumber', +// 'photo' => 'jpegPhoto', +// 'organization' => 'o', +// 'manager' => 'manager', +// 'assistant' => 'secretary', + ), + // Map of contact sub-objects (attribute name => objectClass(es)), e.g. 'c' => 'country' + 'sub_fields' => array(), + 'sort' => 'cn', // The field to sort the listing by. + 'scope' => 'sub', // search mode: sub|base|list + 'filter' => '(objectClass=inetOrgPerson)', // used for basic listing (if not empty) and will be &'d with search queries. example: status=act + 'fuzzy_search' => true, // server allows wildcard search + 'vlv' => false, // Enable Virtual List View to more efficiently fetch paginated data (if server supports it) + 'numsub_filter' => '(objectClass=organizationalUnit)', // with VLV, we also use numSubOrdinates to query the total number of records. Set this filter to get all numSubOrdinates attributes for counting + 'sizelimit' => '0', // Enables you to limit the count of entries fetched. Setting this to 0 means no limit. + 'timelimit' => '0', // Sets the number of seconds how long is spend on the search. Setting this to 0 means no limit. + 'referrals' => true|false, // Sets the LDAP_OPT_REFERRALS option. Mostly used in multi-domain Active Directory setups + + // definition for contact groups (uncomment if no groups are supported) + // for the groups base_dn, the user replacements %fu, %u, $d and %dc work as for base_dn (see above) + // if the groups base_dn is empty, the contact base_dn is used for the groups as well + // -> in this case, assure that groups and contacts are separated due to the concernig filters! + 'groups' => array( + 'base_dn' => '', + 'scope' => 'sub', // search mode: sub|base|list + 'filter' => '(objectClass=groupOfNames)', + 'object_classes' => array("top", "groupOfNames"), + 'member_attr' => 'member', // name of the member attribute, e.g. uniqueMember + 'name_attr' => 'cn', // attribute to be used as group name + ), +); +*/ + +// An ordered array of the ids of the addressbooks that should be searched +// when populating address autocomplete fields server-side. ex: array('sql','Verisign'); +$rcmail_config['autocomplete_addressbooks'] = array('sql'); + +// The minimum number of characters required to be typed in an autocomplete field +// before address books will be searched. Most useful for LDAP directories that +// may need to do lengthy results building given overly-broad searches +$rcmail_config['autocomplete_min_length'] = 1; + +// Number of parallel autocomplete requests. +// If there's more than one address book, n parallel (async) requests will be created, +// where each request will search in one address book. By default (0), all address +// books are searched in one request. +$rcmail_config['autocomplete_threads'] = 0; + +// Max. numer of entries in autocomplete popup. Default: 15. +$rcmail_config['autocomplete_max'] = 15; + +// show address fields in this order +// available placeholders: {street}, {locality}, {zipcode}, {country}, {region} +$rcmail_config['address_template'] = '{street}
        {locality} {zipcode}
        {country} {region}'; + +// Matching mode for addressbook search (including autocompletion) +// 0 - partial (*abc*), default +// 1 - strict (abc) +// 2 - prefix (abc*) +// Note: For LDAP sources fuzzy_search must be enabled to use 'partial' or 'prefix' mode +$rcmail_config['addressbook_search_mode'] = 0; + +// ---------------------------------- +// USER PREFERENCES +// ---------------------------------- + +// Use this charset as fallback for message decoding +//$rcmail_config['default_charset'] = 'ISO-8859-1'; +$rcmail_config['default_charset'] = 'UTF-8'; + +// skin name: folder from skins/ +$rcmail_config['skin'] = 'larry'; + +// show up to X items in messages list view +$rcmail_config['mail_pagesize'] = 50; + +// show up to X items in contacts list view +$rcmail_config['addressbook_pagesize'] = 50; + +// sort contacts by this col (preferably either one of name, firstname, surname) +$rcmail_config['addressbook_sort_col'] = 'surname'; + +// the way how contact names are displayed in the list +// 0: display name +// 1: (prefix) firstname middlename surname (suffix) +// 2: (prefix) surname firstname middlename (suffix) +// 3: (prefix) surname, firstname middlename (suffix) +$rcmail_config['addressbook_name_listing'] = 0; + +// use this timezone to display date/time +// valid timezone identifers are listed here: php.net/manual/en/timezones.php +// 'auto' will use the browser's timezone settings +$rcmail_config['timezone'] = 'auto'; + +// prefer displaying HTML messages +$rcmail_config['prefer_html'] = true; + +// display remote inline images +// 0 - Never, always ask +// 1 - Ask if sender is not in address book +// 2 - Always show inline images +$rcmail_config['show_images'] = 0; + +// compose html formatted messages by default +// 0 - never, 1 - always, 2 - on reply to HTML message only +$rcmail_config['htmleditor'] = 0; + +// show pretty dates as standard +$rcmail_config['prettydate'] = true; + +// save compose message every 300 seconds (5min) +$rcmail_config['draft_autosave'] = 300; + +// default setting if preview pane is enabled +$rcmail_config['preview_pane'] = false; + +// Mark as read when viewed in preview pane (delay in seconds) +// Set to -1 if messages in preview pane should not be marked as read +$rcmail_config['preview_pane_mark_read'] = 0; + +// Clear Trash on logout +$rcmail_config['logout_purge'] = false; + +// Compact INBOX on logout +$rcmail_config['logout_expunge'] = false; + +// Display attached images below the message body +$rcmail_config['inline_images'] = true; + +// Encoding of long/non-ascii attachment names: +// 0 - Full RFC 2231 compatible +// 1 - RFC 2047 for 'name' and RFC 2231 for 'filename' parameter (Thunderbird's default) +// 2 - Full 2047 compatible +$rcmail_config['mime_param_folding'] = 1; + +// Set true if deleted messages should not be displayed +// This will make the application run slower +$rcmail_config['skip_deleted'] = false; + +// Set true to Mark deleted messages as read as well as deleted +// False means that a message's read status is not affected by marking it as deleted +$rcmail_config['read_when_deleted'] = true; + +// Set to true to never delete messages immediately +// Use 'Purge' to remove messages marked as deleted +$rcmail_config['flag_for_deletion'] = false; + +// Default interval for keep-alive/check-recent requests (in seconds) +// Must be greater than or equal to 'min_keep_alive' and less than 'session_lifetime' +$rcmail_config['keep_alive'] = 60; + +// If true all folders will be checked for recent messages +$rcmail_config['check_all_folders'] = false; + +// If true, after message delete/move, the next message will be displayed +$rcmail_config['display_next'] = false; + +// 0 - Do not expand threads +// 1 - Expand all threads automatically +// 2 - Expand only threads with unread messages +$rcmail_config['autoexpand_threads'] = 0; + +// When replying place cursor above original message (top posting) +$rcmail_config['top_posting'] = false; + +// When replying strip original signature from message +$rcmail_config['strip_existing_sig'] = true; + +// Show signature: +// 0 - Never +// 1 - Always +// 2 - New messages only +// 3 - Forwards and Replies only +$rcmail_config['show_sig'] = 1; + +// When replying or forwarding place sender's signature above existing message +$rcmail_config['sig_above'] = false; + +// Use MIME encoding (quoted-printable) for 8bit characters in message body +$rcmail_config['force_7bit'] = false; + +// Defaults of the search field configuration. +// The array can contain a per-folder list of header fields which should be considered when searching +// The entry with key '*' stands for all folders which do not have a specific list set. +// Please note that folder names should to be in sync with $rcmail_config['default_folders'] +$rcmail_config['search_mods'] = null; // Example: array('*' => array('subject'=>1, 'from'=>1), 'Sent' => array('subject'=>1, 'to'=>1)); + +// Defaults of the addressbook search field configuration. +$rcmail_config['addressbook_search_mods'] = null; // Example: array('name'=>1, 'firstname'=>1, 'surname'=>1, 'email'=>1, '*'=>1); + +// 'Delete always' +// This setting reflects if mail should be always deleted +// when moving to Trash fails. This is necessary in some setups +// when user is over quota and Trash is included in the quota. +$rcmail_config['delete_always'] = false; + +// Directly delete messages in Junk instead of moving to Trash +$rcmail_config['delete_junk'] = true; + +// Behavior if a received message requests a message delivery notification (read receipt) +// 0 = ask the user, 1 = send automatically, 2 = ignore (never send or ask) +// 3 = send automatically if sender is in addressbook, otherwise ask the user +// 4 = send automatically if sender is in addressbook, otherwise ignore +$rcmail_config['mdn_requests'] = 0; + +// Return receipt checkbox default state +$rcmail_config['mdn_default'] = 0; + +// Delivery Status Notification checkbox default state +$rcmail_config['dsn_default'] = 0; + +// Place replies in the folder of the message being replied to +$rcmail_config['reply_same_folder'] = false; + +// Sets default mode of Forward feature to "forward as attachment" +$rcmail_config['forward_attachment'] = false; + +// Defines address book (internal index) to which new contacts will be added +// By default it is the first writeable addressbook. +// Note: Use '0' for built-in address book. +$rcmail_config['default_addressbook'] = null; + +// Enables spell checking before sending a message. +$rcmail_config['spellcheck_before_send'] = false; + +// Skip alternative email addresses in autocompletion (show one address per contact) +$rcmail_config['autocomplete_single'] = false; + +// Default font for composed HTML message. +// Supported values: Andale Mono, Arial, Arial Black, Book Antiqua, Courier New, +// Georgia, Helvetica, Impact, Tahoma, Terminal, Times New Roman, Trebuchet MS, Verdana +$rcmail_config['default_font'] = ''; + +// end of config file diff --git a/install/ubuntu/14.04/roundcube/vesta.php b/install/ubuntu/14.04/roundcube/vesta.php new file mode 100644 index 000000000..8fb202a44 --- /dev/null +++ b/install/ubuntu/14.04/roundcube/vesta.php @@ -0,0 +1,62 @@ + + */ + + function password_save($curpass, $passwd) + { + $rcmail = rcmail::get_instance(); + $vesta_host = $rcmail->config->get('password_vesta_host'); + + if (empty($vesta_host)) + { + $vesta_host = 'localhost'; + } + + $vesta_port = $rcmail->config->get('password_vesta_port'); + if (empty($vesta_port)) + { + $vesta_port = '8083'; + } + + $postvars = array( + 'email' => $_SESSION['username'], + 'password' => $curpass, + 'new' => $passwd + ); + + $postdata = http_build_query($postvars); + + $send = 'POST /reset/mail/ HTTP/1.1' . PHP_EOL; + $send .= 'Host: ' . $vesta_host . PHP_EOL; + $send .= 'User-Agent: PHP Script' . PHP_EOL; + $send .= 'Content-length: ' . strlen($postdata) . PHP_EOL; + $send .= 'Content-type: application/x-www-form-urlencoded' . PHP_EOL; + $send .= 'Connection: close' . PHP_EOL; + $send .= PHP_EOL; + $send .= $postdata . PHP_EOL . PHP_EOL; + + $fp = fsockopen('ssl://' . $vesta_host, $vesta_port); + fputs($fp, $send); + $result = fread($fp, 2048); + fclose($fp); + + $fp = fopen("/tmp/roundcube.log", 'w'); + fwrite($fp, "test ok"); + fwrite($fp, "\n"); + fclose($fp); + + + if(strpos($result, 'ok') && !strpos($result, 'error')) + { + return PASSWORD_SUCCESS; + } + else { + return PASSWORD_ERROR; + } + + } diff --git a/install/ubuntu/14.04/sudo/admin b/install/ubuntu/14.04/sudo/admin new file mode 100644 index 000000000..47e16098c --- /dev/null +++ b/install/ubuntu/14.04/sudo/admin @@ -0,0 +1,7 @@ +# Created by vesta installer +Defaults env_keep="VESTA" +Defaults:admin !syslog +Defaults:admin !requiretty + +admin ALL=(ALL) ALL +admin ALL=NOPASSWD:/usr/local/vesta/bin/* diff --git a/install/ubuntu/14.04/templates.tar.gz b/install/ubuntu/14.04/templates.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..ce385d269736561780cb42d07b447572cebc7831 GIT binary patch literal 12935 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 + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %sdocroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + #SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + AllowOverride All + SSLRequireSSL + Options +Includes -Indexes +ExecCGI + php_admin_value open_basedir %docroot% + + + AllowOverride All + + SSLEngine on + SSLVerifyClient none + SSLCertificateFile %ssl_crt% + SSLCertificateKeyFile %ssl_key% + %ssl_ca_str%SSLCertificateChainFile %ssl_ca% + + + RMode config + RUidGid %user% %group% + RGroups www-data + + + AssignUserID %user% %group% + + + IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* + + + diff --git a/install/ubuntu/14.04/templates/web/apache2/basedir.tpl b/install/ubuntu/14.04/templates/web/apache2/basedir.tpl new file mode 100755 index 000000000..75daf0e10 --- /dev/null +++ b/install/ubuntu/14.04/templates/web/apache2/basedir.tpl @@ -0,0 +1,35 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %docroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + #SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + AllowOverride All + Options +Includes -Indexes +ExecCGI + php_admin_value open_basedir %docroot% + + + AllowOverride All + + + + RMode config + RUidGid %user% %group% + RGroups www-data + + + AssignUserID %user% %group% + + + IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + + + diff --git a/install/ubuntu/14.04/templates/web/apache2/default.stpl b/install/ubuntu/14.04/templates/web/apache2/default.stpl new file mode 100755 index 000000000..e884a95b9 --- /dev/null +++ b/install/ubuntu/14.04/templates/web/apache2/default.stpl @@ -0,0 +1,40 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %sdocroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + #SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + AllowOverride All + SSLRequireSSL + Options +Includes -Indexes +ExecCGI + + + AllowOverride All + + SSLEngine on + SSLVerifyClient none + SSLCertificateFile %ssl_crt% + SSLCertificateKeyFile %ssl_key% + %ssl_ca_str%SSLCertificateChainFile %ssl_ca% + + + RMode config + RUidGid %user% %group% + RGroups www-data + + + AssignUserID %user% %group% + + + IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* + + + diff --git a/install/ubuntu/14.04/templates/web/apache2/default.tpl b/install/ubuntu/14.04/templates/web/apache2/default.tpl new file mode 100755 index 000000000..073724ce0 --- /dev/null +++ b/install/ubuntu/14.04/templates/web/apache2/default.tpl @@ -0,0 +1,34 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %docroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + #SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + AllowOverride All + Options +Includes -Indexes +ExecCGI + + + AllowOverride All + + + + RMode config + RUidGid %user% %group% + RGroups www-data + + + AssignUserID %user% %group% + + + IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + + + diff --git a/install/ubuntu/14.04/templates/web/apache2/hosting.stpl b/install/ubuntu/14.04/templates/web/apache2/hosting.stpl new file mode 100755 index 000000000..7a5d7787f --- /dev/null +++ b/install/ubuntu/14.04/templates/web/apache2/hosting.stpl @@ -0,0 +1,49 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %sdocroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + #SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + AllowOverride All + SSLRequireSSL + Options +Includes -Indexes +ExecCGI + php_admin_value upload_tmp_dir %home%/%user%/tmp + php_admin_value upload_max_filesize 10M + php_admin_value max_execution_time 20 + php_admin_value post_max_size 8M + php_admin_value memory_limit 32M + php_admin_flag mysql.allow_persistent off + php_admin_flag safe_mode off + php_admin_value session.save_path %home%/%user%/tmp + php_admin_value sendmail_path '/usr/sbin/sendmail -t -i -f %email%' + + + AllowOverride All + + php_admin_value open_basedir %home%/%user%/web:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpMyAdmin:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcubemail:/etc/roundcube:/var/lib/roundcube + SSLEngine on + SSLVerifyClient none + SSLCertificateFile %ssl_crt% + SSLCertificateKeyFile %ssl_key% + %ssl_ca_str%SSLCertificateChainFile %ssl_ca% + + RMode config + RUidGid %user% %group% + RGroups www-data + + + AssignUserID %user% %group% + + + IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* + + + diff --git a/install/ubuntu/14.04/templates/web/apache2/hosting.tpl b/install/ubuntu/14.04/templates/web/apache2/hosting.tpl new file mode 100755 index 000000000..ab844dc74 --- /dev/null +++ b/install/ubuntu/14.04/templates/web/apache2/hosting.tpl @@ -0,0 +1,43 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %docroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + #SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + AllowOverride All + Options +Includes -Indexes +ExecCGI + php_admin_value upload_tmp_dir %home%/%user%/tmp + php_admin_value upload_max_filesize 10M + php_admin_value max_execution_time 20 + php_admin_value post_max_size 8M + php_admin_value memory_limit 32M + php_admin_flag mysql.allow_persistent off + php_admin_flag safe_mode off + php_admin_value session.save_path %home%/%user%/tmp + php_admin_value sendmail_path '/usr/sbin/sendmail -t -i -f %email%' + + + AllowOverride All + + php_admin_value open_basedir %home%/%user%/web:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpMyAdmin:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcubemail:/etc/roundcube:/var/lib/roundcube + + RMode config + RUidGid %user% %group% + RGroups www-data + + + AssignUserID %user% %group% + + + IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + + + diff --git a/install/ubuntu/14.04/templates/web/apache2/phpcgi.sh b/install/ubuntu/14.04/templates/web/apache2/phpcgi.sh new file mode 100755 index 000000000..6565e103d --- /dev/null +++ b/install/ubuntu/14.04/templates/web/apache2/phpcgi.sh @@ -0,0 +1,16 @@ +#!/bin/bash +# Adding php wrapper +user="$1" +domain="$2" +ip="$3" +home_dir="$4" +docroot="$5" + +wrapper_script='#!/usr/bin/php-cgi -cphp5-cgi.ini' +wrapper_file="$home_dir/$user/web/$domain/cgi-bin/php" + +echo "$wrapper_script" > $wrapper_file +chown $user:$user $wrapper_file +chmod -f 751 $wrapper_file + +exit 0 diff --git a/install/ubuntu/14.04/templates/web/apache2/phpcgi.stpl b/install/ubuntu/14.04/templates/web/apache2/phpcgi.stpl new file mode 100755 index 000000000..aa5137308 --- /dev/null +++ b/install/ubuntu/14.04/templates/web/apache2/phpcgi.stpl @@ -0,0 +1,35 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %sdocroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + SSLRequireSSL + AllowOverride All + Options +Includes -Indexes +ExecCGI + Action phpcgi-script /cgi-bin/php + + SetHandler phpcgi-script + + + + AllowOverride All + + SSLEngine on + SSLVerifyClient none + SSLCertificateFile %ssl_crt% + SSLCertificateKeyFile %ssl_key% + %ssl_ca_str%SSLCertificateChainFile %ssl_ca% + + IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* + + + diff --git a/install/ubuntu/14.04/templates/web/apache2/phpcgi.tpl b/install/ubuntu/14.04/templates/web/apache2/phpcgi.tpl new file mode 100755 index 000000000..a05ff252d --- /dev/null +++ b/install/ubuntu/14.04/templates/web/apache2/phpcgi.tpl @@ -0,0 +1,28 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %docroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + AllowOverride All + Options +Includes -Indexes +ExecCGI + Action phpcgi-script /cgi-bin/php + + SetHandler phpcgi-script + + + + AllowOverride All + + IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + + + diff --git a/install/ubuntu/14.04/templates/web/apache2/phpfcgid.sh b/install/ubuntu/14.04/templates/web/apache2/phpfcgid.sh new file mode 100755 index 000000000..e80582492 --- /dev/null +++ b/install/ubuntu/14.04/templates/web/apache2/phpfcgid.sh @@ -0,0 +1,22 @@ +#!/bin/bash +# Adding php wrapper +user="$1" +domain="$2" +ip="$3" +home_dir="$4" +docroot="$5" + +wrapper_script="#!/bin/sh +PHPRC=/usr/local/lib +export PHPRC +export PHP_FCGI_MAX_REQUESTS=1000 +export PHP_FCGI_CHILDREN=20 +exec /usr/bin/php-cgi +" +wrapper_file="$home_dir/$user/web/$domain/cgi-bin/fcgi-starter" + +echo "$wrapper_script" > $wrapper_file +chown $user:$user $wrapper_file +chmod -f 751 $wrapper_file + +exit 0 diff --git a/install/ubuntu/14.04/templates/web/apache2/phpfcgid.stpl b/install/ubuntu/14.04/templates/web/apache2/phpfcgid.stpl new file mode 100755 index 000000000..622495756 --- /dev/null +++ b/install/ubuntu/14.04/templates/web/apache2/phpfcgid.stpl @@ -0,0 +1,36 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %sdocroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + SSLRequireSSL + AllowOverride All + Options +Includes -Indexes +ExecCGI + + SetHandler fcgid-script + + FCGIWrapper %home%/%user%/web/%domain%/cgi-bin/fcgi-starter .php + + + AllowOverride All + + php_admin_value open_basedir none + SSLEngine on + SSLVerifyClient none + SSLCertificateFile %ssl_crt% + SSLCertificateKeyFile %ssl_key% + %ssl_ca_str%SSLCertificateChainFile %ssl_ca% + + IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* + + + diff --git a/install/ubuntu/14.04/templates/web/apache2/phpfcgid.tpl b/install/ubuntu/14.04/templates/web/apache2/phpfcgid.tpl new file mode 100755 index 000000000..5c1f16e20 --- /dev/null +++ b/install/ubuntu/14.04/templates/web/apache2/phpfcgid.tpl @@ -0,0 +1,28 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %docroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + AllowOverride All + Options +Includes -Indexes +ExecCGI + + SetHandler fcgid-script + + FCGIWrapper %home%/%user%/web/%domain%/cgi-bin/fcgi-starter .php + + + AllowOverride All + + IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + + + diff --git a/install/ubuntu/14.04/templates/web/awstats/awstats.tpl b/install/ubuntu/14.04/templates/web/awstats/awstats.tpl new file mode 100755 index 000000000..9a92e0fd4 --- /dev/null +++ b/install/ubuntu/14.04/templates/web/awstats/awstats.tpl @@ -0,0 +1,133 @@ +LogFile="/var/log/%web_system%/domains/%domain%.log" +LogType=W +LogFormat=1 +LogSeparator=" " +SiteDomain="%domain_idn%" +HostAliases="%alias_idn%" +DirData="%home%/%user%/web/%domain%/stats" +DirCgi="/vstats" +DirIcons="/vstats/icon" +AllowToUpdateStatsFromBrowser=0 +AllowFullYearView=2 +EnableLockForUpdate=1 +DNSStaticCacheFile="dnscache.txt" +DNSLastUpdateCacheFile="dnscachelastupdate.txt" +SkipDNSLookupFor="" +AllowAccessFromWebToAuthenticatedUsersOnly=0 +AllowAccessFromWebToFollowingAuthenticatedUsers="" +AllowAccessFromWebToFollowingIPAddresses="" +CreateDirDataIfNotExists=0 +BuildHistoryFormat=text +BuildReportFormat=html +SaveDatabaseFilesWithPermissionsForEveryone=0 +PurgeLogFile=0 +ArchiveLogRecords=0 +KeepBackupOfHistoricFiles=1 +DefaultFile="index.php index.html" +SkipHosts="127.0.0.1 +SkipUserAgents="" +SkipFiles="" +SkipReferrersBlackList="" +OnlyHosts="" +OnlyUserAgents="" +OnlyUsers="" +OnlyFiles="" +NotPageList="css js class gif jpg jpeg png bmp ico rss xml swf" +ValidHTTPCodes="200 304" +ValidSMTPCodes="1 250" +AuthenticatedUsersNotCaseSensitive=0 +URLNotCaseSensitive=0 +URLWithAnchor=0 +URLQuerySeparators="?;" +URLWithQuery=0 +URLWithQueryWithOnlyFollowingParameters="" +URLWithQueryWithoutFollowingParameters="" +URLReferrerWithQuery=0 +WarningMessages=1 +ErrorMessages="" +DebugMessages=0 +NbOfLinesForCorruptedLog=50 +WrapperScript="" +DecodeUA=0 +MiscTrackerUrl="/js/awstats_misc_tracker.js" +UseFramesWhenCGI=1 +DetailedReportsOnNewWindows=1 +Expires=3600 +MaxRowsInHTMLOutput=1000 +Lang="auto" +DirLang="./lang" +ShowMenu=1 +ShowSummary=UVPHB +ShowMonthStats=UVPHB +ShowDaysOfMonthStats=VPHB +ShowDaysOfWeekStats=PHB +ShowHoursStats=PHB +ShowDomainsStats=PHB +ShowHostsStats=PHBL +ShowAuthenticatedUsers=0 +ShowRobotsStats=HBL +ShowWormsStats=0 +ShowEMailSenders=0 +ShowEMailReceivers=0 +ShowSessionsStats=1 +ShowPagesStats=PBEX +ShowFileTypesStats=HB +ShowFileSizesStats=0 +ShowDownloadsStats=HB +ShowOSStats=1 +ShowBrowsersStats=1 +ShowScreenSizeStats=0 +ShowOriginStats=PH +ShowKeyphrasesStats=1 +ShowKeywordsStats=1 +ShowMiscStats=a +ShowHTTPErrorsStats=1 +ShowSMTPErrorsStats=0 +ShowClusterStats=0 +AddDataArrayMonthStats=1 +AddDataArrayShowDaysOfMonthStats=1 +AddDataArrayShowDaysOfWeekStats=1 +AddDataArrayShowHoursStats=1 +IncludeInternalLinksInOriginSection=0 +MaxNbOfDomain = 10 +MinHitDomain = 1 +MaxNbOfHostsShown = 10 +MinHitHost = 1 +MaxNbOfLoginShown = 10 +MinHitLogin = 1 +MaxNbOfRobotShown = 10 +MinHitRobot = 1 +MaxNbOfDownloadsShown = 10 +MinHitDownloads = 1 +MaxNbOfPageShown = 10 +MinHitFile = 1 +MaxNbOfOsShown = 10 +MinHitOs = 1 +MaxNbOfBrowsersShown = 10 +MinHitBrowser = 1 +MaxNbOfScreenSizesShown = 5 +MinHitScreenSize = 1 +MaxNbOfWindowSizesShown = 5 +MinHitWindowSize = 1 +MaxNbOfRefererShown = 10 +MinHitRefer = 1 +MaxNbOfKeyphrasesShown = 10 +MinHitKeyphrase = 1 +MaxNbOfKeywordsShown = 10 +MinHitKeyword = 1 +MaxNbOfEMailsShown = 20 +MinHitEMail = 1 +FirstDayOfWeek=0 +ShowFlagLinks="" +ShowLinksOnUrl=1 +UseHTTPSLinkForUrl="" +MaxLengthOfShownURL=64 +HTMLHeadSection="" +HTMLEndSection="" +MetaRobot=0 +Logo="awstats_logo6.png" +LogoLink="http://awstats.sourceforge.net" +BarWidth = 260 +BarHeight = 90 +StyleSheet="" +ExtraTrackedRowsLimit=500 diff --git a/install/ubuntu/14.04/templates/web/awstats/index.tpl b/install/ubuntu/14.04/templates/web/awstats/index.tpl new file mode 100755 index 000000000..9df9bb5cb --- /dev/null +++ b/install/ubuntu/14.04/templates/web/awstats/index.tpl @@ -0,0 +1,10 @@ + + + + Awstats log analyzer + + + + + + diff --git a/install/ubuntu/14.04/templates/web/awstats/nav.tpl b/install/ubuntu/14.04/templates/web/awstats/nav.tpl new file mode 100755 index 000000000..f29bed68b --- /dev/null +++ b/install/ubuntu/14.04/templates/web/awstats/nav.tpl @@ -0,0 +1,23 @@ + + + Awstats navigation + + + + + + + + +
        vesta
        + +
        +
        + + diff --git a/install/ubuntu/14.04/templates/web/nginx/caching.sh b/install/ubuntu/14.04/templates/web/nginx/caching.sh new file mode 100755 index 000000000..6eb9126db --- /dev/null +++ b/install/ubuntu/14.04/templates/web/nginx/caching.sh @@ -0,0 +1,12 @@ +#!/bin/bash + +user=$1 +domain=$2 +ip=$3 +home=$4 +docroot=$5 + +str="proxy_cache_path /var/cache/nginx/$domain levels=2" +str="$str keys_zone=$domain:10m inactive=60m max_size=512m;" +echo "$str" >> /etc/nginx/conf.d/01_caching_pool.conf + diff --git a/install/ubuntu/14.04/templates/web/nginx/caching.stpl b/install/ubuntu/14.04/templates/web/nginx/caching.stpl new file mode 100755 index 000000000..ca6cffe32 --- /dev/null +++ b/install/ubuntu/14.04/templates/web/nginx/caching.stpl @@ -0,0 +1,44 @@ +server { + listen %ip%:%proxy_ssl_port%; + server_name %domain_idn% %alias_idn%; + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + error_log /var/log/%web_system%/domains/%domain%.error.log error; + + location / { + proxy_pass http://%ip%:%web_port%; + + proxy_cache cache; + proxy_cache_valid 15m; + proxy_cache_valid 404 1m; + proxy_no_cache $no_cache; + proxy_cache_bypass $no_cache; + proxy_cache_bypass $cookie_session $http_x_update; + + location ~* ^.+\.(%proxy_extentions%)$ { + proxy_cache off; + root %docroot%; + access_log /var/log/%web_system%/domains/%domain%.log combined; + access_log /var/log/%web_system%/domains/%domain%.bytes bytes; + expires max; + try_files $uri @fallback; + } + } + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location @fallback { + proxy_pass http://%ip%:%web_port%; + } + + location ~ /\.ht {return 404;} + location ~ /\.svn/ {return 404;} + location ~ /\.git/ {return 404;} + location ~ /\.hg/ {return 404;} + location ~ /\.bzr/ {return 404;} + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/14.04/templates/web/nginx/caching.tpl b/install/ubuntu/14.04/templates/web/nginx/caching.tpl new file mode 100755 index 000000000..36761b65c --- /dev/null +++ b/install/ubuntu/14.04/templates/web/nginx/caching.tpl @@ -0,0 +1,41 @@ +server { + listen %ip%:%proxy_port%; + server_name %domain_idn% %alias_idn%; + error_log /var/log/%web_system%/domains/%domain%.error.log error; + + location / { + proxy_pass http://%ip%:%web_port%; + + proxy_cache cache; + proxy_cache_valid 15m; + proxy_cache_valid 404 1m; + proxy_no_cache $no_cache; + proxy_cache_bypass $no_cache; + proxy_cache_bypass $cookie_session $http_x_update; + + location ~* ^.+\.(%proxy_extentions%)$ { + proxy_cache off; + root %docroot%; + access_log /var/log/%web_system%/domains/%domain%.log combined; + access_log /var/log/%web_system%/domains/%domain%.bytes bytes; + expires max; + try_files $uri @fallback; + } + } + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location @fallback { + proxy_pass http://%ip%:%web_port%; + } + + location ~ /\.ht {return 404;} + location ~ /\.svn/ {return 404;} + location ~ /\.git/ {return 404;} + location ~ /\.hg/ {return 404;} + location ~ /\.bzr/ {return 404;} + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/14.04/templates/web/nginx/default.stpl b/install/ubuntu/14.04/templates/web/nginx/default.stpl new file mode 100755 index 000000000..fa5380606 --- /dev/null +++ b/install/ubuntu/14.04/templates/web/nginx/default.stpl @@ -0,0 +1,36 @@ +server { + listen %ip%:%proxy_ssl_port%; + server_name %domain_idn% %alias_idn%; + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + error_log /var/log/%web_system%/domains/%domain%.error.log error; + + location / { + proxy_pass https://%ip%:%web_ssl_port%; + location ~* ^.+\.(%proxy_extentions%)$ { + root %sdocroot%; + access_log /var/log/%web_system%/domains/%domain%.log combined; + access_log /var/log/%web_system%/domains/%domain%.bytes bytes; + expires max; + try_files $uri @fallback; + } + } + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location @fallback { + proxy_pass https://%ip%:%web_ssl_port%; + } + + location ~ /\.ht {return 404;} + location ~ /\.svn/ {return 404;} + location ~ /\.git/ {return 404;} + location ~ /\.hg/ {return 404;} + location ~ /\.bzr/ {return 404;} + + include %home%/%user%/conf/web/snginx.%domain%.conf*; +} + diff --git a/install/ubuntu/14.04/templates/web/nginx/default.tpl b/install/ubuntu/14.04/templates/web/nginx/default.tpl new file mode 100755 index 000000000..4d5c774bc --- /dev/null +++ b/install/ubuntu/14.04/templates/web/nginx/default.tpl @@ -0,0 +1,33 @@ +server { + listen %ip%:%proxy_port%; + server_name %domain_idn% %alias_idn%; + error_log /var/log/%web_system%/domains/%domain%.error.log error; + + location / { + proxy_pass http://%ip%:%web_port%; + location ~* ^.+\.(%proxy_extentions%)$ { + root %docroot%; + access_log /var/log/%web_system%/domains/%domain%.log combined; + access_log /var/log/%web_system%/domains/%domain%.bytes bytes; + expires max; + try_files $uri @fallback; + } + } + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location @fallback { + proxy_pass http://%ip%:%web_port%; + } + + location ~ /\.ht {return 404;} + location ~ /\.svn/ {return 404;} + location ~ /\.git/ {return 404;} + location ~ /\.hg/ {return 404;} + location ~ /\.bzr/ {return 404;} + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} + diff --git a/install/ubuntu/14.04/templates/web/nginx/hosting.sh b/install/ubuntu/14.04/templates/web/nginx/hosting.sh new file mode 100755 index 000000000..eeed37ef9 --- /dev/null +++ b/install/ubuntu/14.04/templates/web/nginx/hosting.sh @@ -0,0 +1,11 @@ +#!/bin/bash +# Changing public_html permission +user="$1" +domain="$2" +ip="$3" +home_dir="$4" +docroot="$5" + +chmod 755 $docroot + +exit 0 diff --git a/install/ubuntu/14.04/templates/web/nginx/hosting.stpl b/install/ubuntu/14.04/templates/web/nginx/hosting.stpl new file mode 100755 index 000000000..d778d6333 --- /dev/null +++ b/install/ubuntu/14.04/templates/web/nginx/hosting.stpl @@ -0,0 +1,38 @@ +server { + listen %ip%:%proxy_ssl_port%; + server_name %domain_idn% %alias_idn%; + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + error_log /var/log/%web_system%/domains/%domain%.error.log error; + + location / { + proxy_pass https://%ip%:%web_ssl_port%; + location ~* ^.+\.(%proxy_extentions%)$ { + root %sdocroot%; + access_log /var/log/%web_system%/domains/%domain%.log combined; + access_log /var/log/%web_system%/domains/%domain%.bytes bytes; + expires max; + try_files $uri @fallback; + } + } + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location @fallback { + proxy_pass https://%ip%:%web_ssl_port%; + } + + location ~ /\.ht {return 404;} + location ~ /\.svn/ {return 404;} + location ~ /\.git/ {return 404;} + location ~ /\.hg/ {return 404;} + location ~ /\.bzr/ {return 404;} + + disable_symlinks if_not_owner from=%docroot%; + + include %home%/%user%/conf/web/snginx.%domain%.conf*; +} + diff --git a/install/ubuntu/14.04/templates/web/nginx/hosting.tpl b/install/ubuntu/14.04/templates/web/nginx/hosting.tpl new file mode 100755 index 000000000..15961c95c --- /dev/null +++ b/install/ubuntu/14.04/templates/web/nginx/hosting.tpl @@ -0,0 +1,35 @@ +server { + listen %ip%:%proxy_port%; + server_name %domain_idn% %alias_idn%; + error_log /var/log/%web_system%/domains/%domain%.error.log error; + + location / { + proxy_pass http://%ip%:%web_port%; + location ~* ^.+\.(%proxy_extentions%)$ { + root %docroot%; + access_log /var/log/%web_system%/domains/%domain%.log combined; + access_log /var/log/%web_system%/domains/%domain%.bytes bytes; + expires max; + try_files $uri @fallback; + } + } + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location @fallback { + proxy_pass http://%ip%:%web_port%; + } + + location ~ /\.ht {return 404;} + location ~ /\.svn/ {return 404;} + location ~ /\.git/ {return 404;} + location ~ /\.hg/ {return 404;} + location ~ /\.bzr/ {return 404;} + + disable_symlinks if_not_owner from=%docroot%; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} + diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/cms_made_simple.stpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/cms_made_simple.stpl new file mode 100644 index 000000000..01d82b603 --- /dev/null +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/cms_made_simple.stpl @@ -0,0 +1,51 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + try_files $uri $uri/ /index.php?page=$request_uri; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/cms_made_simple.tpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/cms_made_simple.tpl new file mode 100644 index 000000000..af452d19f --- /dev/null +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/cms_made_simple.tpl @@ -0,0 +1,47 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + try_files $uri $uri/ /index.php?page=$request_uri; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/codeigniter2.stpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/codeigniter2.stpl new file mode 100644 index 000000000..a592a652d --- /dev/null +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/codeigniter2.stpl @@ -0,0 +1,56 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + try_files $uri $uri/ /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location = /index.php { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME /var/www/html/ci$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + location ~ \.php$ { + return 444; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/codeigniter2.tpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/codeigniter2.tpl new file mode 100644 index 000000000..9b955aa6a --- /dev/null +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/codeigniter2.tpl @@ -0,0 +1,52 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + try_files $uri $uri/ /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location = /index.php { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME /var/www/html/ci$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + location ~ \.php$ { + return 444; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/codeigniter3.stpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/codeigniter3.stpl new file mode 100644 index 000000000..4d330d34f --- /dev/null +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/codeigniter3.stpl @@ -0,0 +1,51 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + try_files $uri $uri/ /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/codeigniter3.tpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/codeigniter3.tpl new file mode 100644 index 000000000..1f446e5d3 --- /dev/null +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/codeigniter3.tpl @@ -0,0 +1,47 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + try_files $uri $uri/ /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/datalife_engine.stpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/datalife_engine.stpl new file mode 100644 index 000000000..d1b5bcd24 --- /dev/null +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/datalife_engine.stpl @@ -0,0 +1,122 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + rewrite "^/page/([0-9]+)(/?)$" /index.php?cstart=$1 last; + + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page,([0-9]+),([0-9]+),(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&cstart=$5&news_name=$6&seourl=$6 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page,([0-9]+),(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&news_name=$5&seourl=$5 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/print:page,([0-9]+),(.*).html(/?)+$" /engine/print.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&news_name=$5&seourl=$5 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_name=$4&seourl=$4 last; + + rewrite "^/([^.]+)/page,([0-9]+),([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$4&news_page=$2&cstart=$3&seourl=$5&seocat=$1 last; + rewrite "^/([^.]+)/page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$3&news_page=$2&seourl=$4&seocat=$1 last; + rewrite "^/([^.]+)/print:page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /engine/print.php?news_page=$2&newsid=$3&seourl=$4&seocat=$1 last; + rewrite "^/([^.]+)/([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$2&seourl=$3&seocat=$1 last; + + rewrite "^/page,([0-9]+),([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$3&news_page=$1&cstart=$2&seourl=$4 last; + rewrite "^/page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$2&news_page=$1&seourl=$3 last; + rewrite "^/print:page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /engine/print.php?news_page=$1&newsid=$2&seourl=$3 last; + rewrite "^/([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$1&seourl=$2 last; + + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})(/?)+$" /index.php?year=$1&month=$2&day=$3 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page/([0-9]+)(/?)+$" /index.php?year=$1&month=$2&day=$3&cstart=$4 last; + + rewrite "^/([0-9]{4})/([0-9]{2})(/?)+$" /index.php?year=$1&month=$2 last; + rewrite "^/([0-9]{4})/([0-9]{2})/page/([0-9]+)(/?)+$" /index.php?year=$1&month=$2&cstart=$3 last; + + rewrite "^/([0-9]{4})(/?)+$" /index.php?year=$1 last; + rewrite "^/([0-9]{4})/page/([0-9]+)(/?)+$" /index.php?year=$1&cstart=$2 last; + + rewrite "^/tags/([^/]*)(/?)+$" /index.php?do=tags&tag=$1 last; + rewrite "^/tags/([^/]*)/page/([0-9]+)(/?)+$" /index.php?do=tags&tag=$1&cstart=$2 last; + + rewrite "^/xfsearch/([^/]*)(/?)+$" /index.php?do=xfsearch&xf=$1 last; + rewrite "^/xfsearch/([^/]*)/page/([0-9]+)(/?)+$" /index.php?do=xfsearch&xf=$1&cstart=$2 last; + + rewrite "^/user/([^/]*)/rss.xml$" /engine/rss.php?subaction=allnews&user=$1 last; + rewrite "^/user/([^/]*)(/?)+$" /index.php?subaction=userinfo&user=$1 last; + rewrite "^/user/([^/]*)/page/([0-9]+)(/?)+$" /index.php?subaction=userinfo&user=$1&cstart=$2 last; + rewrite "^/user/([^/]*)/news(/?)+$" /index.php?subaction=allnews&user=$1 last; + rewrite "^/user/([^/]*)/news/page/([0-9]+)(/?)+$" /index.php?subaction=allnews&user=$1&cstart=$2 last; + rewrite "^/user/([^/]*)/news/rss.xml(/?)+$" /engine/rss.php?subaction=allnews&user=$1 last; + + rewrite "^/lastnews(/?)+$" /index.php?do=lastnews last; + rewrite "^/lastnews/page/([0-9]+)(/?)+$" /index.php?do=lastnews&cstart=$1 last; + + rewrite "^/catalog/([^/]*)/rss.xml$" /engine/rss.php?catalog=$1 last; + rewrite "^/catalog/([^/]*)(/?)+$" /index.php?catalog=$1 last; + rewrite "^/catalog/([^/]*)/page/([0-9]+)(/?)+$" /index.php?catalog=$1&cstart=$2 last; + + rewrite "^/newposts(/?)+$" /index.php?subaction=newposts last; + rewrite "^/newposts/page/([0-9]+)(/?)+$" /index.php?subaction=newposts&cstart=$1 last; + + rewrite "^/favorites(/?)+$" /index.php?do=favorites last; + rewrite "^/favorites/page/([0-9]+)(/?)+$" /index.php?do=favorites&cstart=$1 last; + + rewrite "^/rules.html$" /index.php?do=rules last; + rewrite "^/statistics.html$" /index.php?do=stats last; + rewrite "^/addnews.html$" /index.php?do=addnews last; + rewrite "^/rss.xml$" /engine/rss.php last; + rewrite "^/sitemap.xml$" /uploads/sitemap.xml last; + + if (!-d $request_filename) { + rewrite "^/([^.]+)/page/([0-9]+)(/?)+$" /index.php?do=cat&category=$1&cstart=$2 last; + rewrite "^/([^.]+)/?$" /index.php?do=cat&category=$1 last; + } + + if (!-f $request_filename) { + rewrite "^/([^.]+)/rss.xml$" /engine/rss.php?do=cat&category=$1 last; + rewrite "^/page,([0-9]+),([^/]+).html$" /index.php?do=static&page=$2&news_page=$1 last; + rewrite "^/print:([^/]+).html$" /engine/print.php?do=static&page=$1 last; + } + + if (!-f $request_filename) { + rewrite "^/([^/]+).html$" /index.php?do=static&page=$1 last; + } + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/datalife_engine.tpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/datalife_engine.tpl new file mode 100644 index 000000000..ff33c2325 --- /dev/null +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/datalife_engine.tpl @@ -0,0 +1,118 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + rewrite "^/page/([0-9]+)(/?)$" /index.php?cstart=$1 last; + + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page,([0-9]+),([0-9]+),(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&cstart=$5&news_name=$6&seourl=$6 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page,([0-9]+),(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&news_name=$5&seourl=$5 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/print:page,([0-9]+),(.*).html(/?)+$" /engine/print.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&news_name=$5&seourl=$5 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_name=$4&seourl=$4 last; + + rewrite "^/([^.]+)/page,([0-9]+),([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$4&news_page=$2&cstart=$3&seourl=$5&seocat=$1 last; + rewrite "^/([^.]+)/page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$3&news_page=$2&seourl=$4&seocat=$1 last; + rewrite "^/([^.]+)/print:page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /engine/print.php?news_page=$2&newsid=$3&seourl=$4&seocat=$1 last; + rewrite "^/([^.]+)/([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$2&seourl=$3&seocat=$1 last; + + rewrite "^/page,([0-9]+),([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$3&news_page=$1&cstart=$2&seourl=$4 last; + rewrite "^/page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$2&news_page=$1&seourl=$3 last; + rewrite "^/print:page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /engine/print.php?news_page=$1&newsid=$2&seourl=$3 last; + rewrite "^/([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$1&seourl=$2 last; + + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})(/?)+$" /index.php?year=$1&month=$2&day=$3 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page/([0-9]+)(/?)+$" /index.php?year=$1&month=$2&day=$3&cstart=$4 last; + + rewrite "^/([0-9]{4})/([0-9]{2})(/?)+$" /index.php?year=$1&month=$2 last; + rewrite "^/([0-9]{4})/([0-9]{2})/page/([0-9]+)(/?)+$" /index.php?year=$1&month=$2&cstart=$3 last; + + rewrite "^/([0-9]{4})(/?)+$" /index.php?year=$1 last; + rewrite "^/([0-9]{4})/page/([0-9]+)(/?)+$" /index.php?year=$1&cstart=$2 last; + + rewrite "^/tags/([^/]*)(/?)+$" /index.php?do=tags&tag=$1 last; + rewrite "^/tags/([^/]*)/page/([0-9]+)(/?)+$" /index.php?do=tags&tag=$1&cstart=$2 last; + + rewrite "^/xfsearch/([^/]*)(/?)+$" /index.php?do=xfsearch&xf=$1 last; + rewrite "^/xfsearch/([^/]*)/page/([0-9]+)(/?)+$" /index.php?do=xfsearch&xf=$1&cstart=$2 last; + + rewrite "^/user/([^/]*)/rss.xml$" /engine/rss.php?subaction=allnews&user=$1 last; + rewrite "^/user/([^/]*)(/?)+$" /index.php?subaction=userinfo&user=$1 last; + rewrite "^/user/([^/]*)/page/([0-9]+)(/?)+$" /index.php?subaction=userinfo&user=$1&cstart=$2 last; + rewrite "^/user/([^/]*)/news(/?)+$" /index.php?subaction=allnews&user=$1 last; + rewrite "^/user/([^/]*)/news/page/([0-9]+)(/?)+$" /index.php?subaction=allnews&user=$1&cstart=$2 last; + rewrite "^/user/([^/]*)/news/rss.xml(/?)+$" /engine/rss.php?subaction=allnews&user=$1 last; + + rewrite "^/lastnews(/?)+$" /index.php?do=lastnews last; + rewrite "^/lastnews/page/([0-9]+)(/?)+$" /index.php?do=lastnews&cstart=$1 last; + + rewrite "^/catalog/([^/]*)/rss.xml$" /engine/rss.php?catalog=$1 last; + rewrite "^/catalog/([^/]*)(/?)+$" /index.php?catalog=$1 last; + rewrite "^/catalog/([^/]*)/page/([0-9]+)(/?)+$" /index.php?catalog=$1&cstart=$2 last; + + rewrite "^/newposts(/?)+$" /index.php?subaction=newposts last; + rewrite "^/newposts/page/([0-9]+)(/?)+$" /index.php?subaction=newposts&cstart=$1 last; + + rewrite "^/favorites(/?)+$" /index.php?do=favorites last; + rewrite "^/favorites/page/([0-9]+)(/?)+$" /index.php?do=favorites&cstart=$1 last; + + rewrite "^/rules.html$" /index.php?do=rules last; + rewrite "^/statistics.html$" /index.php?do=stats last; + rewrite "^/addnews.html$" /index.php?do=addnews last; + rewrite "^/rss.xml$" /engine/rss.php last; + rewrite "^/sitemap.xml$" /uploads/sitemap.xml last; + + if (!-d $request_filename) { + rewrite "^/([^.]+)/page/([0-9]+)(/?)+$" /index.php?do=cat&category=$1&cstart=$2 last; + rewrite "^/([^.]+)/?$" /index.php?do=cat&category=$1 last; + } + + if (!-f $request_filename) { + rewrite "^/([^.]+)/rss.xml$" /engine/rss.php?do=cat&category=$1 last; + rewrite "^/page,([0-9]+),([^/]+).html$" /index.php?do=static&page=$2&news_page=$1 last; + rewrite "^/print:([^/]+).html$" /engine/print.php?do=static&page=$1 last; + } + + if (!-f $request_filename) { + rewrite "^/([^/]+).html$" /index.php?do=static&page=$1 last; + } + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/default.stpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/default.stpl new file mode 100644 index 000000000..a68c99861 --- /dev/null +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/default.stpl @@ -0,0 +1,50 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %sdocroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/snginx.%domain%.conf*; +} diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/default.tpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/default.tpl new file mode 100644 index 000000000..b143e53ba --- /dev/null +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/default.tpl @@ -0,0 +1,46 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/dokuwiki.stpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/dokuwiki.stpl new file mode 100644 index 000000000..27483cd8c --- /dev/null +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/dokuwiki.stpl @@ -0,0 +1,67 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + index doku.php; + try_files $uri $uri/ @dokuwiki; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + location ^~ /lib/ { + expires 30d; + } + + location ^~ /conf/ { return 403; } + location ^~ /data/ { return 403; } + + location @dokuwiki { + rewrite ^/_media/(.*) /lib/exe/fetch.php?media=$1 last; + rewrite ^/_detail/(.*) /lib/exe/detail.php?media=$1 last; + rewrite ^/_export/([^/]+)/(.*) /doku.php?do=export_$1&id=$2 last; + rewrite ^/(.*) /doku.php?id=$1 last; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/dokuwiki.tpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/dokuwiki.tpl new file mode 100644 index 000000000..31647c9ff --- /dev/null +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/dokuwiki.tpl @@ -0,0 +1,62 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + index doku.php; + try_files $uri $uri/ @dokuwiki; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + location ^~ /lib/ { + expires 30d; + } + + location ^~ /conf/ { return 403; } + location ^~ /data/ { return 403; } + location @dokuwiki { + rewrite ^/_media/(.*) /lib/exe/fetch.php?media=$1 last; + rewrite ^/_detail/(.*) /lib/exe/detail.php?media=$1 last; + rewrite ^/_export/([^/]+)/(.*) /doku.php?do=export_$1&id=$2 last; + rewrite ^/(.*) /doku.php?id=$1 last; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/drupal.stpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/drupal.stpl new file mode 100644 index 000000000..9a5484396 --- /dev/null +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/drupal.stpl @@ -0,0 +1,101 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + + location / { + try_files $uri @rewrite; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # You have 2 options here + # For D7 and above: + # Clean URLs are handled in drupal_environment_initialize(). + rewrite ^ /index.php; + + # For Drupal 6 and bwlow: + # Some modules enforce no slash (/) at the end of the URL + # Else this rewrite block wouldn't be needed (GlobalRedirect) + #rewrite ^/(.*)$ /index.php?q=$1; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/drupal.tpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/drupal.tpl new file mode 100644 index 000000000..417762c18 --- /dev/null +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/drupal.tpl @@ -0,0 +1,98 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + # Very rarely should these ever be accessed outside of your lan + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + + location / { + try_files $uri @rewrite; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # You have 2 options here + # For D7 and above: + # Clean URLs are handled in drupal_environment_initialize(). + rewrite ^ /index.php; + + # For Drupal 6 and bwlow: + # Some modules enforce no slash (/) at the end of the URL + # Else this rewrite block wouldn't be needed (GlobalRedirect) + #rewrite ^/(.*)$ /index.php?q=$1; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/joomla.stpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/joomla.stpl new file mode 100644 index 000000000..235a01216 --- /dev/null +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/joomla.stpl @@ -0,0 +1,58 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + try_files $uri $uri/ /index.php?$args; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + # deny running scripts inside writable directories + location ~* /(images|cache|media|logs|tmp)/.*\.(php|pl|py|jsp|asp|sh|cgi)$ { + return 403; + error_page 403 /403_error.html; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/joomla.tpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/joomla.tpl new file mode 100644 index 000000000..997c268de --- /dev/null +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/joomla.tpl @@ -0,0 +1,54 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + try_files $uri $uri/ /index.php?$args; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + # deny running scripts inside writable directories + location ~* /(images|cache|media|logs|tmp)/.*\.(php|pl|py|jsp|asp|sh|cgi)$ { + return 403; + error_page 403 /403_error.html; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/owncloud.stpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/owncloud.stpl new file mode 100644 index 000000000..8311ca43f --- /dev/null +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/owncloud.stpl @@ -0,0 +1,80 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + rewrite ^/caldav(.*)$ /remote.php/caldav$1 redirect; + rewrite ^/carddav(.*)$ /remote.php/carddav$1 redirect; + rewrite ^/webdav(.*)$ /remote.php/webdav$1 redirect; + + error_page 403 = /core/templates/403.php; + error_page 404 = /core/templates/404.php; + + location ~ ^/(?:\.htaccess|data|config|db_structure\.xml|README){ + deny all; + } + + location / { + # The following 2 rules are only needed with webfinger + rewrite ^/.well-known/host-meta /public.php?service=host-meta last; + rewrite ^/.well-known/host-meta.json /public.php?service=host-meta-json last; + rewrite ^/.well-known/carddav /remote.php/carddav/ redirect; + rewrite ^/.well-known/caldav /remote.php/caldav/ redirect; + rewrite ^(/core/doc/[^\/]+/)$ $1/index.html; + try_files $uri $uri/ /index.php; + + location ~ \.php(?:$|/) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param PATH_INFO $fastcgi_path_info; + #fastcgi_param HTTPS on; + fastcgi_pass %backend_lsnr%; + } + } + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + # Some basic cache-control for static files to be sent to the browser + add_header Pragma public; + add_header Cache-Control "public, must-revalidate, proxy-revalidate"; + } + + #error_page 403 /error/404.html; + #error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/owncloud.tpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/owncloud.tpl new file mode 100644 index 000000000..57cac2f85 --- /dev/null +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/owncloud.tpl @@ -0,0 +1,76 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + rewrite ^/caldav(.*)$ /remote.php/caldav$1 redirect; + rewrite ^/carddav(.*)$ /remote.php/carddav$1 redirect; + rewrite ^/webdav(.*)$ /remote.php/webdav$1 redirect; + + error_page 403 = /core/templates/403.php; + error_page 404 = /core/templates/404.php; + + location ~ ^/(?:\.htaccess|data|config|db_structure\.xml|README){ + deny all; + } + + location / { + # The following 2 rules are only needed with webfinger + rewrite ^/.well-known/host-meta /public.php?service=host-meta last; + rewrite ^/.well-known/host-meta.json /public.php?service=host-meta-json last; + rewrite ^/.well-known/carddav /remote.php/carddav/ redirect; + rewrite ^/.well-known/caldav /remote.php/caldav/ redirect; + rewrite ^(/core/doc/[^\/]+/)$ $1/index.html; + try_files $uri $uri/ /index.php; + + location ~ \.php(?:$|/) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param PATH_INFO $fastcgi_path_info; + #fastcgi_param HTTPS on; + fastcgi_pass %backend_lsnr%; + } + } + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + # Some basic cache-control for static files to be sent to the browser + add_header Pragma public; + add_header Cache-Control "public, must-revalidate, proxy-revalidate"; + } + + #error_page 403 /error/404.html; + #error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/piwik.stpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/piwik.stpl new file mode 100644 index 000000000..c53af4011 --- /dev/null +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/piwik.stpl @@ -0,0 +1,68 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location = /favicon.ico { + try_files /favicon.ico =204; + } + + location / { + try_files $uri /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + valid_referers none blocked %domain_idn% %alias_idn%; + if ($invalid_referer) { + return 444; + } + expires max; + } + + location ~* ^/(?:index|piwik)\.php$ { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + include /etc/nginx/fastcgi_params; + } + } + + # Any other attempt to access PHP files returns a 404. + location ~* ^.+\.php$ { + return 404; + } + + # Return a 404 for all text files. + location ~* ^/(?:README|LICENSE[^.]*|LEGALNOTICE)(?:\.txt)*$ { + return 404; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/piwik.tpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/piwik.tpl new file mode 100644 index 000000000..6b4a94a68 --- /dev/null +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/piwik.tpl @@ -0,0 +1,64 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location = /favicon.ico { + try_files /favicon.ico =204; + } + + location / { + try_files $uri /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + valid_referers none blocked %domain_idn% %alias_idn%; + if ($invalid_referer) { + return 444; + } + expires max; + } + + location ~* ^/(?:index|piwik)\.php$ { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + include /etc/nginx/fastcgi_params; + } + } + + # Any other attempt to access PHP files returns a 404. + location ~* ^.+\.php$ { + return 404; + } + + # Return a 404 for all text files. + location ~* ^/(?:README|LICENSE[^.]*|LEGALNOTICE)(?:\.txt)*$ { + return 404; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/pyrocms.stpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/pyrocms.stpl new file mode 100644 index 000000000..a6fc67556 --- /dev/null +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/pyrocms.stpl @@ -0,0 +1,61 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location /installer { + try_files $uri $uri/ /installer/index.php; + } + + location / { + try_files $uri $uri/ /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + location = /robots.txt { access_log off; log_not_found off; } + location = /favicon.ico { access_log off; log_not_found off; } + location ~ /\. { access_log off; log_not_found off; deny all; } + location ~ ~$ { access_log off; log_not_found off; deny all; } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/pyrocms.tpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/pyrocms.tpl new file mode 100644 index 000000000..68b378efd --- /dev/null +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/pyrocms.tpl @@ -0,0 +1,57 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location /installer { + try_files $uri $uri/ /installer/index.php; + } + + location / { + try_files $uri $uri/ /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + location = /robots.txt { access_log off; log_not_found off; } + location = /favicon.ico { access_log off; log_not_found off; } + location ~ /\. { access_log off; log_not_found off; deny all; } + location ~ ~$ { access_log off; log_not_found off; deny all; } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/wordpress.stpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/wordpress.stpl new file mode 100644 index 000000000..910c28b69 --- /dev/null +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/wordpress.stpl @@ -0,0 +1,50 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/wordpress.tpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/wordpress.tpl new file mode 100644 index 000000000..b143e53ba --- /dev/null +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/wordpress.tpl @@ -0,0 +1,46 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/wordpress2.stpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/wordpress2.stpl new file mode 100644 index 000000000..2822f8754 --- /dev/null +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/wordpress2.stpl @@ -0,0 +1,62 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + location / { + try_files $uri $uri/ /index.php?$args; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/wordpress2.tpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/wordpress2.tpl new file mode 100644 index 000000000..37b8be305 --- /dev/null +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/wordpress2.tpl @@ -0,0 +1,58 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + location / { + try_files $uri $uri/ /index.php?$args; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/14.04/templates/web/nginx/proxy_ip.tpl b/install/ubuntu/14.04/templates/web/nginx/proxy_ip.tpl new file mode 100755 index 000000000..ae1956173 --- /dev/null +++ b/install/ubuntu/14.04/templates/web/nginx/proxy_ip.tpl @@ -0,0 +1,9 @@ +server { + listen %ip%:%proxy_port% default; + server_name _; + #access_log /var/log/nginx/%ip%.log main; + location / { + proxy_pass http://%ip%:%web_port%; + } +} + diff --git a/install/ubuntu/14.04/templates/web/php5-fpm/default.tpl b/install/ubuntu/14.04/templates/web/php5-fpm/default.tpl new file mode 100644 index 000000000..44ccf7a42 --- /dev/null +++ b/install/ubuntu/14.04/templates/web/php5-fpm/default.tpl @@ -0,0 +1,18 @@ +[%backend%] +listen = 127.0.0.1:%backend_port% +listen.allowed_clients = 127.0.0.1 + +user = %user% +group = %user% + +pm = dynamic +pm.max_children = 50 +pm.start_servers = 3 +pm.min_spare_servers = 2 +pm.max_spare_servers = 10 + +env[HOSTNAME] = $HOSTNAME +env[PATH] = /usr/local/bin:/usr/bin:/bin +env[TMP] = /tmp +env[TMPDIR] = /tmp +env[TEMP] = /tmp diff --git a/install/ubuntu/14.04/templates/web/php5-fpm/no-php.tpl b/install/ubuntu/14.04/templates/web/php5-fpm/no-php.tpl new file mode 100644 index 000000000..89487d5f5 --- /dev/null +++ b/install/ubuntu/14.04/templates/web/php5-fpm/no-php.tpl @@ -0,0 +1,13 @@ +#[%backend%] +#user = %user% +#group = %user% +#listen = /dev/null + +#listen.owner = %user% +#listen.group = nginx + +#pm = dynamic +#pm.max_children = 50 +#pm.start_servers = 3 +#pm.min_spare_servers = 2 +#pm.max_spare_servers = 10 diff --git a/install/ubuntu/14.04/templates/web/php5-fpm/socket.tpl b/install/ubuntu/14.04/templates/web/php5-fpm/socket.tpl new file mode 100644 index 000000000..f0513da3e --- /dev/null +++ b/install/ubuntu/14.04/templates/web/php5-fpm/socket.tpl @@ -0,0 +1,21 @@ +[%backend%] +listen = /var/run/php5-%backend%.sock +listen.allowed_clients = 127.0.0.1 + +user = %user% +group = %user% + +listen.owner = %user% +listen.group = nginx + +pm = dynamic +pm.max_children = 50 +pm.start_servers = 3 +pm.min_spare_servers = 2 +pm.max_spare_servers = 10 + +env[HOSTNAME] = $HOSTNAME +env[PATH] = /usr/local/bin:/usr/bin:/bin +env[TMP] = /tmp +env[TMPDIR] = /tmp +env[TEMP] = /tmp diff --git a/install/ubuntu/14.04/templates/web/skel/document_errors/403.html b/install/ubuntu/14.04/templates/web/skel/document_errors/403.html new file mode 100755 index 000000000..9c3f6baab --- /dev/null +++ b/install/ubuntu/14.04/templates/web/skel/document_errors/403.html @@ -0,0 +1,29 @@ + + + 403 — Forbidden + + + + + + +

        %domain%

        + +

        403

        +

        Forbidden

        +
        + Unfortunately, you do not have permission to view this +
        + + + diff --git a/install/ubuntu/14.04/templates/web/skel/document_errors/404.html b/install/ubuntu/14.04/templates/web/skel/document_errors/404.html new file mode 100755 index 000000000..2cee77084 --- /dev/null +++ b/install/ubuntu/14.04/templates/web/skel/document_errors/404.html @@ -0,0 +1,28 @@ + + + 404 — Not Found + + + + + + +

        %domain%

        +

        404

        +

        Page Not Found

        +
        + It seems that the page you were trying to reach does not exist anymore, or maybe it has just moved. + You can start again from the home or go back to previous page. +
        + + diff --git a/install/ubuntu/14.04/templates/web/skel/document_errors/50x.html b/install/ubuntu/14.04/templates/web/skel/document_errors/50x.html new file mode 100755 index 000000000..85ba648b7 --- /dev/null +++ b/install/ubuntu/14.04/templates/web/skel/document_errors/50x.html @@ -0,0 +1,29 @@ + + + 500 — Internal Sever Error + + + + + + +

        %domain%

        + +

        500

        +

        Internal Server Error

        +
        + Sorry, something went wrong :( +
        + + + diff --git a/install/ubuntu/14.04/templates/web/skel/public_html/index.html b/install/ubuntu/14.04/templates/web/skel/public_html/index.html new file mode 100755 index 000000000..4f5bb7244 --- /dev/null +++ b/install/ubuntu/14.04/templates/web/skel/public_html/index.html @@ -0,0 +1,26 @@ + + + %domain% — Coming Soon + + + + + + +

        %domain%

        + + + + + diff --git a/install/ubuntu/14.04/templates/web/skel/public_html/robots.txt b/install/ubuntu/14.04/templates/web/skel/public_html/robots.txt new file mode 100755 index 000000000..00ee83dcf --- /dev/null +++ b/install/ubuntu/14.04/templates/web/skel/public_html/robots.txt @@ -0,0 +1,3 @@ +# vestacp autogenerated robots.txt +User-agent: * +Crawl-delay: 10 diff --git a/install/ubuntu/14.04/templates/web/skel/public_shtml/index.html b/install/ubuntu/14.04/templates/web/skel/public_shtml/index.html new file mode 100755 index 000000000..4f5bb7244 --- /dev/null +++ b/install/ubuntu/14.04/templates/web/skel/public_shtml/index.html @@ -0,0 +1,26 @@ + + + %domain% — Coming Soon + + + + + + +

        %domain%

        + + + + + diff --git a/install/ubuntu/14.04/templates/web/skel/public_shtml/robots.txt b/install/ubuntu/14.04/templates/web/skel/public_shtml/robots.txt new file mode 100755 index 000000000..00ee83dcf --- /dev/null +++ b/install/ubuntu/14.04/templates/web/skel/public_shtml/robots.txt @@ -0,0 +1,3 @@ +# vestacp autogenerated robots.txt +User-agent: * +Crawl-delay: 10 diff --git a/install/ubuntu/14.04/templates/web/suspend/.htaccess b/install/ubuntu/14.04/templates/web/suspend/.htaccess new file mode 100755 index 000000000..5a6df83fb --- /dev/null +++ b/install/ubuntu/14.04/templates/web/suspend/.htaccess @@ -0,0 +1,2 @@ +ErrorDocument 403 /index.html +ErrorDocument 404 /index.html diff --git a/install/ubuntu/14.04/templates/web/suspend/index.html b/install/ubuntu/14.04/templates/web/suspend/index.html new file mode 100755 index 000000000..9d4fa67b3 --- /dev/null +++ b/install/ubuntu/14.04/templates/web/suspend/index.html @@ -0,0 +1,27 @@ + + + SUSPEND + + + + + + +

        SUSPEND

        +

        This site has been suspended

        +
        + Please contact technical support departament. +
        + + + diff --git a/install/ubuntu/14.04/templates/web/webalizer/webalizer.tpl b/install/ubuntu/14.04/templates/web/webalizer/webalizer.tpl new file mode 100755 index 000000000..068adcfb9 --- /dev/null +++ b/install/ubuntu/14.04/templates/web/webalizer/webalizer.tpl @@ -0,0 +1,110 @@ +HostName %domain_idn% +LogFile /var/log/%web_system%/domains/%domain%.log +OutputDir %home%/%user%/web/%domain%/stats +HistoryName %home%/%user%/web/%domain%/stats/%domain%.hist +Incremental yes +IncrementalName %home%/%user%/web/%domain%/stats/%domain%.current +PageType htm* +PageType cgi +PageType php +PageType shtml +DNSCache /var/lib/webalizer/dns_cache.db +DNSChildren 10 +Quiet yes +FoldSeqErr yes +IndexAlias index.php +HideURL *.gif +HideURL *.GIF +HideURL *.jpg +HideURL *.JPG +HideURL *.png +HideURL *.PNG +HideURL *.ra +SearchEngine abcsearch. terms= +SearchEngine alexa. q= +SearchEngine alltheweb. q= +SearchEngine alltheweb. query= +SearchEngine alot. q= +SearchEngine altavista. q= +SearchEngine aolsearch. query= +SearchEngine aport.ru r= +SearchEngine ask. q= +SearchEngine atlas.cz q= +SearchEngine bbc. q= +SearchEngine bing. q= +SearchEngine blingo. q= +SearchEngine blogs.yandex.ru text= +SearchEngine btopenworld query= +SearchEngine buscador.ya.com q= +SearchEngine busca. q= +SearchEngine business. query= +SearchEngine centrum.cz q= +SearchEngine chiff. q= +SearchEngine clusty. query= +SearchEngine comcast. q= +SearchEngine crawler. q= +SearchEngine cuil. q= +SearchEngine dmoz. search= +SearchEngine dogpile.com q= +SearchEngine dpxml qkw= +SearchEngine eureka. searchword= +SearchEngine euroseek. string= +SearchEngine exalead. q= +SearchEngine excite search= +SearchEngine ezilon. q= +SearchEngine fastbrowsersearch. q= +SearchEngine feedster.com q= +SearchEngine fireball.de q= +SearchEngine fireball. keyword= +SearchEngine freeserve. q= +SearchEngine gigablast. q= +SearchEngine gogo.ru q= +SearchEngine go.mail.ru q= +SearchEngine google. q= +SearchEngine hakia. q= +SearchEngine hotbot. query= +SearchEngine infoseek. qt= +SearchEngine iwon searchfor= +SearchEngine ixquick.com query= +SearchEngine joeant. keywords= +SearchEngine jyxo.cz s= +SearchEngine looksmart. key= +SearchEngine lycos. query= +SearchEngine mamma. q= +SearchEngine metacrawler q= +SearchEngine msn. MT= +SearchEngine msxml qkw= +SearchEngine mysearch. searchfor= +SearchEngine mywebsearch. searchfor= +SearchEngine netscape. q= +SearchEngine nigma.ru q= +SearchEngine northernlight. qr= +SearchEngine ntlworld. q= +SearchEngine orange. q= +SearchEngine overture. Keywords= +SearchEngine punto.ru text= +SearchEngine rambler. keyword= +SearchEngine search.aol. q= +SearchEngine search.babylon. q= +SearchEngine search.centrum. phrase= +SearchEngine search.conduit. q= +SearchEngine search.earthlink q= +SearchEngine search.icq. q= +SearchEngine search.live.com q= +SearchEngine search.rambler.ru words= +SearchEngine search.winamp. q= +SearchEngine searchy. q= +SearchEngine seznam.cz w= +SearchEngine snap. query= +SearchEngine teoma. q= +SearchEngine teradex.com q= +SearchEngine ukplus key= +SearchEngine verizon. q= +SearchEngine virginmedia. q= +SearchEngine voila. rdata= +SearchEngine webcrawler searchText= +SearchEngine web.search.naver. query= +SearchEngine wisenut q= +SearchEngine yahoo. p= +SearchEngine yandex. text= +SearchEngine yodao. q= diff --git a/install/ubuntu/14.04/vsftpd/vsftpd.conf b/install/ubuntu/14.04/vsftpd/vsftpd.conf new file mode 100644 index 000000000..0902899e7 --- /dev/null +++ b/install/ubuntu/14.04/vsftpd/vsftpd.conf @@ -0,0 +1,24 @@ +anonymous_enable=NO +local_enable=YES +write_enable=YES +local_umask=002 +anon_upload_enable=NO +dirmessage_enable=YES +xferlog_enable=YES +connect_from_port_20=YES +xferlog_std_format=YES +dual_log_enable=YES +chroot_local_user=YES +listen=YES +pam_service_name=vsftpd +userlist_enable=NO +tcp_wrappers=YES +force_dot_files=YES +ascii_upload_enable=YES +ascii_download_enable=YES +#allow_writable_chroot=YES +allow_writeable_chroot=YES +seccomp_sandbox=NO +pasv_enable=YES +pasv_max_port=12100 +pasv_min_port=12000 diff --git a/install/ubuntu/14.10/apache2/apache2.conf b/install/ubuntu/14.10/apache2/apache2.conf new file mode 100644 index 000000000..221780117 --- /dev/null +++ b/install/ubuntu/14.10/apache2/apache2.conf @@ -0,0 +1,86 @@ +# It is split into several files forming the configuration hierarchy outlined +# below, all located in the /etc/apache2/ directory: +# +# /etc/apache2/ +# |-- apache2.conf +# | `-- ports.conf +# |-- mods-enabled +# | |-- *.load +# | `-- *.conf +# |-- conf.d +# | `-- * + +# Global configuration +PidFile ${APACHE_PID_FILE} +Timeout 30 +KeepAlive Off +MaxKeepAliveRequests 100 +KeepAliveTimeout 10 + + + StartServers 8 + MinSpareServers 5 + MaxSpareServers 20 + ServerLimit 256 + MaxClients 200 + MaxRequestsPerChild 4000 + + + + StartServers 2 + MinSpareThreads 25 + MaxSpareThreads 75 + ThreadLimit 64 + ThreadsPerChild 25 + MaxClients 200 + MaxRequestsPerChild 4000 + + + + StartServers 2 + MinSpareThreads 25 + MaxSpareThreads 75 + ThreadLimit 64 + ThreadsPerChild 25 + MaxClients 200 + MaxRequestsPerChild 4000 + + +# These need to be set in /etc/apache2/envvars +User ${APACHE_RUN_USER} +Group ${APACHE_RUN_GROUP} +#User www-data +#Group www-data + +AccessFileName .htaccess + + + Order allow,deny + Deny from all + Satisfy all + + +DefaultType None +HostnameLookups Off + +ErrorLog ${APACHE_LOG_DIR}/error.log +LogLevel warn + +# Include module configuration: +Include mods-enabled/*.load +Include mods-enabled/*.conf + +# Include list of ports to listen on and which to use for name based vhosts +Include ports.conf + +LogFormat "%v:%p %h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" vhost_combined +LogFormat "%h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" combined +LogFormat "%h %l %u %t \"%r\" %>s %O" common +LogFormat "%{Referer}i -> %U" referer +LogFormat "%{User-agent}i" agent +LogFormat "%b" bytes + +Include conf.d/ + +# Include the virtual host configurations: +#Include sites-enabled/ diff --git a/install/ubuntu/14.10/apache2/status.conf b/install/ubuntu/14.10/apache2/status.conf new file mode 100644 index 000000000..da9d96333 --- /dev/null +++ b/install/ubuntu/14.10/apache2/status.conf @@ -0,0 +1,8 @@ +Listen 127.0.0.1:8081 + + SetHandler server-status + Order deny,allow + Deny from all + Allow from 127.0.0.1 + Allow from all + diff --git a/install/ubuntu/14.10/bind/named.conf b/install/ubuntu/14.10/bind/named.conf new file mode 100644 index 000000000..ed6ece885 --- /dev/null +++ b/install/ubuntu/14.10/bind/named.conf @@ -0,0 +1,12 @@ +// This is the primary configuration file for the BIND DNS server named. +// +// Please read /usr/share/doc/bind9/README.Debian.gz for information on the +// structure of BIND configuration files in Debian, *BEFORE* you customize +// this configuration file. +// +// If you are just adding zones, please do that in /etc/bind/named.conf.local + +include "/etc/bind/named.conf.options"; +include "/etc/bind/named.conf.local"; +include "/etc/bind/named.conf.default-zones"; + diff --git a/install/ubuntu/14.10/clamav/clamd.conf b/install/ubuntu/14.10/clamav/clamd.conf new file mode 100644 index 000000000..ea982697a --- /dev/null +++ b/install/ubuntu/14.10/clamav/clamd.conf @@ -0,0 +1,61 @@ +#Automatically Generated by clamav-base postinst +#To reconfigure clamd run #dpkg-reconfigure clamav-base +#Please read /usr/share/doc/clamav-base/README.Debian.gz for details +LocalSocket /var/run/clamav/clamd.ctl +FixStaleSocket true +LocalSocketGroup clamav +LocalSocketMode 666 +# TemporaryDirectory is not set to its default /tmp here to make overriding +# the default with environment variables TMPDIR/TMP/TEMP possible +User clamav +AllowSupplementaryGroups true +ScanMail true +ScanArchive true +ArchiveBlockEncrypted false +MaxDirectoryRecursion 15 +FollowDirectorySymlinks false +FollowFileSymlinks false +ReadTimeout 180 +MaxThreads 12 +MaxConnectionQueueLength 15 +LogSyslog false +LogFacility LOG_LOCAL6 +LogClean false +LogVerbose true +PidFile /var/run/clamav/clamd.pid +DatabaseDirectory /var/lib/clamav +SelfCheck 3600 +Foreground false +Debug false +ScanPE true +ScanOLE2 true +ScanHTML true +DetectBrokenExecutables false +ExitOnOOM false +LeaveTemporaryFiles false +AlgorithmicDetection true +ScanELF true +IdleTimeout 30 +PhishingSignatures true +PhishingScanURLs true +PhishingAlwaysBlockSSLMismatch false +PhishingAlwaysBlockCloak false +DetectPUA false +ScanPartialMessages false +HeuristicScanPrecedence false +StructuredDataDetection false +CommandReadTimeout 5 +SendBufTimeout 200 +MaxQueue 100 +ExtendedDetectionInfo true +OLE2BlockMacros false +StreamMaxLength 25M +LogFile /var/log/clamav/clamav.log +LogTime true +LogFileUnlock false +LogFileMaxSize 0 +Bytecode true +BytecodeSecurity TrustSigned +BytecodeTimeout 60000 +OfficialDatabaseOnly false +CrossFilesystems true diff --git a/install/ubuntu/14.10/deb_signing.key b/install/ubuntu/14.10/deb_signing.key new file mode 100644 index 000000000..2ad2db8bc --- /dev/null +++ b/install/ubuntu/14.10/deb_signing.key @@ -0,0 +1,30 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.12 (GNU/Linux) + +mQENBFJIGbEBCAC8SHOOFo7iDTbnC2GhNZ+uBGCh226Dn1QPoFZNFM/DNakHZ6rD +G3wzr8++eKz4fJual/VLllE2N9XDPuxbozb3LLkcyY1WzJqtIXbXhFGQ/SuIeT+x +QY90XU6t2Ckze2c+zUniAWmJ8GSyVmXOoc9JxAQ1u47wvGXLzrjWXc8u8PNRYXuf +fZplTL+dFu9P0d6lP8FGsV+r9wXvvazpRTz3+H8PKrGCYT55ZQIEdG9Jgamylto2 +oVPFXkwGML+TLw6oeCIBuz2y2vtivphW4MJ3ifQjDj7k3n+DTIxfDFs8lB6VRhhY +2nMHCrcZC6U2mhmXmr6O4s1fu6irBVx05ejPABEBAAG0IFNlcmdoZXkgUm9kaW4g +PHNraWRAdmVzdGFjcC5jb20+iQE4BBMBAgAiBQJSSBmxAhsDBgsJCAcDAgYVCAIJ +CgsEFgIDAQIeAQIXgAAKCRBCxbITCh93FPdqB/93GjV9g+wBfeZYLHQK9MDU2wBb +VloYOJJae6IvYKYQVAJayD3PbHdpxrF8s9e23vdnmb9jKu6jX6oV54EIyqP2HPiN +QYc8wcea+eSHerznBixCtoQh8mtdWGFeN71zU/ig7L5qlOVF/EmxDVZTFUeivFxh +IV6qyBnktQKktE45585yKZyyLtfGoXA54DGK69OtJFh+wdkKEMmUXocMl7wUrxW6 +Cx2CuKeEXEgvwu8mRHQi3S3T9XP456qWEn5dWyMVcP660IzEuZfSJApZusNK7zG3 +WMy0/EuX7xHNY3mcNxTOUN1LsO7iHnhHD9+iKWJo9parGkMZzc92MpjDK/g7uQEN +BFJIGbEBCAC7k5QEA9WQM7E3ceNaeLMrA9lXfuzaNCcySq7ONdVAa5PxzbSKdHvz +QFoL1VFqBTYQ038lbil1XqnoM0zvIfAI3LcpS8sq92El/vPxp6jZh2Ari9Uw7x95 +k2cZMgI67g+zQMGdjVRA155nFQRCgg000xU4F7JA6+WsuLlVUmccsDv7YWJExMtC +YPxiuz5DFu8RALnw4Ckts+dbwsrcvUHhkm9b6RAsdCKjjRpUZjLgdltjH83gUVvt +i1YmdjjsVpt95dtsaG+ad852g/Rk8EdxNMkjPF6HLA67CLADP9wYaj80yPcPtylS +ycvPtcclVeHkFBRVM8xZpQd4iD19MWI1ABEBAAGJAR8EGAECAAkFAlJIGbECGwwA +CgkQQsWyEwofdxQ7tQgAhB0FwTs7L8Qr63DHC2yAnXVxgtTAY1/36CccNXVculyR ++EkLcwahms9AKhz7eQb+Mud+5vH0GRohLp2npgO38CjVUfIP5d+Y6dsthmrkF6p8 +XdV1dVK9vWX+i/YZSw/Mded30Cq4P2Yhq9EaemMT0rtli8lz2NnkZ9dFJZk1lzJC +CZmRpbjSNWqRU4f7qyh21lYk/OC/0XE8fh8CaO23TZ+6gBionoCztwb7NyC9OArN +qYlNnbmh9iNqdblykPS3bkjf34n2xyMgnIehNrM89tk8PY4UfNPhgT1TMD9W3Svq +ynNZvLuF/FIDwDeC1qcfjGbfDn9fXO/lMIIRooQYKQ== +=J2HJ +-----END PGP PUBLIC KEY BLOCK----- diff --git a/install/ubuntu/14.10/dovecot.tar.gz b/install/ubuntu/14.10/dovecot.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..bfabaa030981d087ea4ccd8c7b86cc4d7ab1b7c6 GIT binary patch literal 3487 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 N{0}P55eWcL004dY&`|&Y literal 0 HcmV?d00001 diff --git a/install/ubuntu/14.10/dovecot/conf.d/10-auth.conf b/install/ubuntu/14.10/dovecot/conf.d/10-auth.conf new file mode 100644 index 000000000..dfcc83110 --- /dev/null +++ b/install/ubuntu/14.10/dovecot/conf.d/10-auth.conf @@ -0,0 +1,4 @@ +disable_plaintext_auth = no +auth_verbose = yes +auth_mechanisms = plain login +!include auth-passwdfile.conf.ext diff --git a/install/ubuntu/14.10/dovecot/conf.d/10-logging.conf b/install/ubuntu/14.10/dovecot/conf.d/10-logging.conf new file mode 100644 index 000000000..a5f207d51 --- /dev/null +++ b/install/ubuntu/14.10/dovecot/conf.d/10-logging.conf @@ -0,0 +1 @@ +log_path = /var/log/dovecot.log diff --git a/install/ubuntu/14.10/dovecot/conf.d/10-mail.conf b/install/ubuntu/14.10/dovecot/conf.d/10-mail.conf new file mode 100644 index 000000000..55313419e --- /dev/null +++ b/install/ubuntu/14.10/dovecot/conf.d/10-mail.conf @@ -0,0 +1,4 @@ +mail_privileged_group = mail +mail_access_groups = mail +mail_location = maildir:%h/mail/%d/%n +pop3_uidl_format = %08Xu%08Xv diff --git a/install/ubuntu/14.10/dovecot/conf.d/10-master.conf b/install/ubuntu/14.10/dovecot/conf.d/10-master.conf new file mode 100644 index 000000000..a75a9aaa4 --- /dev/null +++ b/install/ubuntu/14.10/dovecot/conf.d/10-master.conf @@ -0,0 +1,29 @@ +service imap-login { + inet_listener imap { + } + inet_listener imaps { + } +} + +service pop3-login { + inet_listener pop3 { + } + inet_listener pop3s { + } +} + + +service imap { +} + +service pop3 { +} + +service auth { + unix_listener auth-client { + group = mail + mode = 0660 + user = dovecot + } + user = dovecot +} diff --git a/install/ubuntu/14.10/dovecot/conf.d/10-ssl.conf b/install/ubuntu/14.10/dovecot/conf.d/10-ssl.conf new file mode 100644 index 000000000..3aaff6eec --- /dev/null +++ b/install/ubuntu/14.10/dovecot/conf.d/10-ssl.conf @@ -0,0 +1,3 @@ +ssl = yes +ssl_cert = = 2.1.4) : %v.%u + # Dovecot v0.99.x : %v.%u + # tpop3d : %Mf + # + # Note that Outlook 2003 seems to have problems with %v.%u format which was + # Dovecot's default, so if you're building a new server it would be a good + # idea to change this. %08Xu%08Xv should be pretty fail-safe. + # + #pop3_uidl_format = %08Xu%08Xv + + # Permanently save UIDLs sent to POP3 clients, so pop3_uidl_format changes + # won't change those UIDLs. Currently this works only with Maildir. + #pop3_save_uidl = no + + # What to do about duplicate UIDLs if they exist? + # allow: Show duplicates to clients. + # rename: Append a temporary -2, -3, etc. counter after the UIDL. + #pop3_uidl_duplicates = allow + + # POP3 logout format string: + # %i - total number of bytes read from client + # %o - total number of bytes sent to client + # %t - number of TOP commands + # %p - number of bytes sent to client as a result of TOP command + # %r - number of RETR commands + # %b - number of bytes sent to client as a result of RETR command + # %d - number of deleted messages + # %m - number of messages (before deletion) + # %s - mailbox size in bytes (before deletion) + # %u - old/new UIDL hash. may help finding out if UIDLs changed unexpectedly + #pop3_logout_format = top=%t/%p, retr=%r/%b, del=%d/%m, size=%s + + # Maximum number of POP3 connections allowed for a user from each IP address. + # NOTE: The username is compared case-sensitively. + #mail_max_userip_connections = 10 + + # Space separated list of plugins to load (default is global mail_plugins). + #mail_plugins = $mail_plugins + + # Workarounds for various client bugs: + # outlook-no-nuls: + # Outlook and Outlook Express hang if mails contain NUL characters. + # This setting replaces them with 0x80 character. + # oe-ns-eoh: + # Outlook Express and Netscape Mail breaks if end of headers-line is + # missing. This option simply sends it if it's missing. + # The list is space-separated. + #pop3_client_workarounds = +} diff --git a/install/ubuntu/14.10/dovecot/conf.d/auth-passwdfile.conf.ext b/install/ubuntu/14.10/dovecot/conf.d/auth-passwdfile.conf.ext new file mode 100644 index 000000000..75e6e1152 --- /dev/null +++ b/install/ubuntu/14.10/dovecot/conf.d/auth-passwdfile.conf.ext @@ -0,0 +1,9 @@ +passdb { + driver = passwd-file + args = scheme=MD5-CRYPT username_format=%n /etc/exim4/domains/%d/passwd +} + +userdb { + driver = passwd-file + args = username_format=%n /etc/exim4/domains/%d/passwd +} diff --git a/install/ubuntu/14.10/dovecot/dovecot.conf b/install/ubuntu/14.10/dovecot/dovecot.conf new file mode 100644 index 000000000..0a8553510 --- /dev/null +++ b/install/ubuntu/14.10/dovecot/dovecot.conf @@ -0,0 +1,4 @@ +protocols = imap pop3 +listen = *, :: +base_dir = /var/run/dovecot/ +!include conf.d/*.conf diff --git a/install/ubuntu/14.10/exim/dnsbl.conf b/install/ubuntu/14.10/exim/dnsbl.conf new file mode 100644 index 000000000..5166b255e --- /dev/null +++ b/install/ubuntu/14.10/exim/dnsbl.conf @@ -0,0 +1,2 @@ +bl.spamcop.net +zen.spamhaus.org diff --git a/install/ubuntu/14.10/exim/exim4.conf.template b/install/ubuntu/14.10/exim/exim4.conf.template new file mode 100644 index 000000000..742f0409e --- /dev/null +++ b/install/ubuntu/14.10/exim/exim4.conf.template @@ -0,0 +1,377 @@ +###################################################################### +# # +# Exim configuration file for Vesta Control Panel # +# # +###################################################################### + +#SPAMASSASSIN = yes +#SPAM_SCORE = 50 +#CLAMD = yes + +domainlist local_domains = dsearch;/etc/exim4/domains/ +domainlist relay_to_domains = dsearch;/etc/exim4/domains/ +hostlist relay_from_hosts = 127.0.0.1 +hostlist whitelist = net-iplsearch;/etc/exim4/white-blocks.conf +hostlist spammers = net-iplsearch;/etc/exim4/spam-blocks.conf +no_local_from_check +untrusted_set_sender = * +acl_smtp_connect = acl_check_spammers +acl_smtp_mail = acl_check_mail +acl_smtp_rcpt = acl_check_rcpt +acl_smtp_data = acl_check_data +acl_smtp_mime = acl_check_mime + +.ifdef SPAMASSASSIN +spamd_address = 127.0.0.1 783 +.endif + +.ifdef CLAMD +av_scanner = clamd: /var/run/clamav/clamd.ctl +.endif + +tls_advertise_hosts = * +tls_certificate = /usr/local/vesta/ssl/certificate.crt +tls_privatekey = /usr/local/vesta/ssl/certificate.key + +daemon_smtp_ports = 25 : 465 : 587 : 2525 +tls_on_connect_ports = 465 +never_users = root +host_lookup = * +rfc1413_hosts = * +rfc1413_query_timeout = 5s +ignore_bounce_errors_after = 2d +timeout_frozen_after = 7d + +DKIM_DOMAIN = ${lc:${domain:$h_from:}} +DKIM_FILE = /etc/exim4/domains/${lc:${domain:$h_from:}}/dkim.pem +DKIM_PRIVATE_KEY = ${if exists{DKIM_FILE}{DKIM_FILE}{0}} + + + +###################################################################### +# ACL CONFIGURATION # +# Specifies access control lists for incoming SMTP mail # +###################################################################### +begin acl + +acl_check_spammers: + accept hosts = +whitelist + + drop message = Your host in blacklist on this server. + log_message = Host in blacklist + hosts = +spammers + + accept + + +acl_check_mail: + deny condition = ${if eq{$sender_helo_name}{}} + message = HELO required before MAIL + + drop message = Helo name contains a ip address (HELO was $sender_helo_name) and not is valid + condition = ${if match{$sender_helo_name}{\N((\d{1,3}[.-]\d{1,3}[.-]\d{1,3}[.-]\d{1,3})|([0-9a-f]{8})|([0-9A-F]{8}))\N}{yes}{no}} + condition = ${if match {${lookup dnsdb{>: defer_never,ptr=$sender_host_address}}\}{$sender_helo_name}{no}{yes}} + delay = 45s + + drop condition = ${if isip{$sender_helo_name}} + message = Access denied - Invalid HELO name (See RFC2821 4.1.3) + + drop condition = ${if eq{[$interface_address]}{$sender_helo_name}} + message = $interface_address is _my_ address + + accept + + +acl_check_rcpt: + accept hosts = : + + deny message = Restricted characters in address + domains = +local_domains + local_parts = ^[.] : ^.*[@%!/|] + + deny message = Restricted characters in address + domains = !+local_domains + local_parts = ^[./|] : ^.*[@%!] : ^.*/\\.\\./ + + require verify = sender + + accept hosts = +relay_from_hosts + control = submission + + accept authenticated = * + control = submission/domain= + + deny message = Rejected because $sender_host_address is in a black list at $dnslist_domain\n$dnslist_text + hosts = !+whitelist + dnslists = ${readfile {/etc/exim4/dnsbl.conf}{:}} + + require message = relay not permitted + domains = +local_domains : +relay_to_domains + + deny message = smtp auth requried + sender_domains = +local_domains + !authenticated = * + + require verify = recipient + +.ifdef CLAMD + warn set acl_m0 = no + + warn condition = ${if exists {/etc/exim4/domains/$domain/antivirus}{yes}{no}} + set acl_m0 = yes +.endif + +.ifdef SPAMASSASSIN + warn set acl_m1 = no + + warn condition = ${if exists {/etc/exim4/domains/$domain/antispam}{yes}{no}} + set acl_m1 = yes +.endif + + accept + + +acl_check_data: +.ifdef CLAMD + deny message = Message contains a virus ($malware_name) and has been rejected + malware = * + condition = ${if eq{$acl_m0}{yes}{yes}{no}} +.endif + +.ifdef SPAMASSASSIN + warn !authenticated = * + hosts = !+relay_from_hosts + condition = ${if < {$message_size}{100K}} + condition = ${if eq{$acl_m1}{yes}{yes}{no}} + spam = nobody:true/defer_ok + add_header = X-Spam-Score: $spam_score_int + add_header = X-Spam-Bar: $spam_bar + add_header = X-Spam-Report: $spam_report + set acl_m2 = $spam_score_int + + warn condition = ${if !eq{$acl_m2}{} {yes}{no}} + condition = ${if >{$acl_m2}{SPAM_SCORE} {yes}{no}} + add_header = X-Spam-Status: Yes + message = SpamAssassin detected spam (from $sender_address to $recipients). +.endif + + accept + + +acl_check_mime: + deny message = Blacklisted file extension detected + condition = ${if match {${lc:$mime_filename}}{\N(\.ade|\.adp|\.bat|\.chm|\.cmd|\.com|\.cpl|\.exe|\.hta|\.ins|\.isp|\.jse|\.lib|\.lnk|\.mde|\.msc|\.msp|\.mst|\.pif|\.scr|\.sct|\.shb|\.sys|\.vb|\.vbe|\.vbs|\.vxd|\.wsc|\.wsf|\.wsh)$\N}{1}{0}} + + accept + + + +###################################################################### +# AUTHENTICATION CONFIGURATION # +###################################################################### +begin authenticators + +dovecot_plain: + driver = dovecot + public_name = PLAIN + server_socket = /var/run/dovecot/auth-client + server_set_id = $auth1 + +dovecot_login: + driver = dovecot + public_name = LOGIN + server_socket = /var/run/dovecot/auth-client + server_set_id = $auth1 + + + +###################################################################### +# ROUTERS CONFIGURATION # +# Specifies how addresses are handled # +###################################################################### +begin routers + +#smarthost: +# driver = manualroute +# domains = ! +local_domains +# transport = remote_smtp +# route_list = * smartrelay.vestacp.com +# no_more +# no_verify + +dnslookup: + driver = dnslookup + domains = !+local_domains + transport = remote_smtp + no_more + +userforward: + driver = redirect + check_local_user + file = $home/.forward + allow_filter + no_verify + no_expn + check_ancestor + file_transport = address_file + pipe_transport = address_pipe + reply_transport = address_reply + +procmail: + driver = accept + check_local_user + require_files = ${local_part}:+${home}/.procmailrc:/usr/bin/procmail + transport = procmail + no_verify + +autoreplay: + driver = accept + require_files = /etc/exim4/domains/$domain/autoreply.${local_part}.msg + condition = ${if exists{/etc/exim4/domains/$domain/autoreply.${local_part}.msg}}{yes}{no}} + retry_use_local_part + transport = userautoreply + unseen + +aliases: + driver = redirect + headers_add = X-redirected: yes + data = ${extract{1}{:}{${lookup{$local_part@$domain}lsearch{/etc/exim4/domains/$domain/aliases}}}} + require_files = /etc/exim4/domains/$domain/aliases + redirect_router = dnslookup + pipe_transport = address_pipe + unseen + +localuser_fwd_only: + driver = accept + transport = devnull + condition = ${if exists{/etc/exim/domains/$domain/fwd_only}{${lookup{$local_part}lsearch{/etc/exim/domains/$domain/fwd_only}{true}{false}}}} + +localuser_spam: + driver = accept + transport = local_spam_delivery + condition = ${if eq {${if match{$h_X-Spam-Status:}{\N^Yes\N}{yes}{no}}} {${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}{yes}{no_such_user}}}} + +localuser: + driver = accept + transport = local_delivery + condition = ${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}{true}{false}} + +catchall: + driver = redirect + headers_add = X-redirected: yes + require_files = /etc/exim4/domains/$domain/aliases + data = ${extract{1}{:}{${lookup{*@$domain}lsearch{/etc/exim4/domains/$domain/aliases}}}} + file_transport = local_delivery + redirect_router = dnslookup + +terminate_alias: + driver = accept + transport = devnull + condition = ${lookup{$local_part@$domain}lsearch{/etc/exim4/domains/$domain/aliases}{true}{false}} + + + +###################################################################### +# TRANSPORTS CONFIGURATION # +###################################################################### +begin transports + +remote_smtp: + driver = smtp + #helo_data = $sender_address_domain + dkim_domain = DKIM_DOMAIN + dkim_selector = mail + dkim_private_key = DKIM_PRIVATE_KEY + dkim_canon = relaxed + dkim_strict = 0 + +procmail: + driver = pipe + command = "/usr/bin/procmail -d $local_part" + return_path_add + delivery_date_add + envelope_to_add + user = $local_part + initgroups + return_output + +local_delivery: + driver = appendfile + maildir_format + maildir_use_size_file + user = ${extract{2}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}} + group = mail + create_directory + directory_mode = 770 + mode = 660 + use_lockfile = no + delivery_date_add + envelope_to_add + return_path_add + directory = "${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}}/mail/$domain/$local_part" + quota = ${extract{6}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}}M + quota_warn_threshold = 75% + +local_spam_delivery: + driver = appendfile + maildir_format + maildir_use_size_file + user = ${extract{2}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}} + group = mail + create_directory + directory_mode = 770 + mode = 660 + use_lockfile = no + delivery_date_add + envelope_to_add + return_path_add + directory = "${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}}/mail/$domain/$local_part/.Spam" + quota = ${extract{6}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}}M + quota_directory = "${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}}/mail/$domain/$local_part" + quota_warn_threshold = 75% + +address_pipe: + driver = pipe + return_output + +address_file: + driver = appendfile + delivery_date_add + envelope_to_add + return_path_add + +address_reply: + driver = autoreply + +userautoreply: + driver = autoreply + file = /etc/exim4/domains/$domain/autoreply.${local_part}.msg + from = "${local_part}@${domain}" + subject = "${if def:h_Subject: {Autoreply: ${quote:${escape:$h_Subject:}}} {Autoreply Message}}" + to = "${sender_address}" + +devnull: + driver = appendfile + file = /dev/null + + + +###################################################################### +# RETRY CONFIGURATION # +###################################################################### +begin retry + +# Address or Domain Error Retries +# ----------------- ----- ------- +* * F,2h,15m; G,16h,1h,1.5; F,4d,6h + + + +###################################################################### +# REWRITE CONFIGURATION # +###################################################################### +begin rewrite + + + +###################################################################### diff --git a/install/ubuntu/14.10/exim/spam-blocks.conf b/install/ubuntu/14.10/exim/spam-blocks.conf new file mode 100644 index 000000000..e69de29bb diff --git a/install/ubuntu/14.10/fail2ban.tar.gz b/install/ubuntu/14.10/fail2ban.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..628545b6b12d83a4dfcf4529b41f62792c228c85 GIT binary patch literal 721 zcmV;?0xta@iwFR?P)1Y$1MQbhZ{jczhB^CJjMPJ=l>#Ira4D7AZL1=&Z6#&~ zz`KruB3xbg09_DCMo>VRAaZ-;y)^U@ z_5_W1em^5}=Uk3M(j5%0M~Fp}7>lVIYRqubkoOIoiK#qP6BOckLPYW;2OWgmSsIAg zuZ|mFmaYUYjJJfo8s1fhF1)IOlQ|75La(j33(9U0btUMJvtIut>QYeUVmCrexr&Qi zKbjFQ61zkzP2U-?^r{!(!l(3+?Yga{u}aaFy}dZE-rC%=GOfyYm&N9W)k}T291PDY z*P0t`IZ}uIjJ_-j{V$SH_dlT#cu)PeEcx8DI+m&H|328vfBu=(y@&@N72}Qi-)t}U ze|i14JEpGxd*KMK)CoAp98}8bBuj9v%2KQe1W{6IHF7UVKsi-oBUDPa+B%^mI!l#A z%iggR=`rPvnSp)Z2xvn7V8#q@Dyt%#D2+c|xJU7JZ=WzC$g2~0Q{w%WGdx!uFgO@} z=-u4i58*FN5)y;)2*=Nd+$g+V_$fxmCp11?eTVGz8P->^KFOi;zxe)( z;(T!ZH#>H&|F+iuy|9`8{p-KwZ0f&dYyIB`OZs27=SuT4o@Sm$(ja3D9@K#V)prvv zs8^H+ECdN-k)k768hSV1`}Y@@gAp1N=}x2^dQlk4c0wJawc4RhTtX&fF0G*c4Nk6a z2g6fPkL6zl5rJ&(DMxg| +actionstop = /usr/local/vesta/bin/v-delete-firewall-chain +actioncheck = iptables -n -L INPUT | grep -q 'fail2ban-[ \t]' +actionban = /usr/local/vesta/bin/v-add-firewall-ban +actionunban = /usr/local/vesta/bin/v-delete-firewall-ban diff --git a/install/ubuntu/14.10/fail2ban/filter.d/vesta.conf b/install/ubuntu/14.10/fail2ban/filter.d/vesta.conf new file mode 100644 index 000000000..69670a56e --- /dev/null +++ b/install/ubuntu/14.10/fail2ban/filter.d/vesta.conf @@ -0,0 +1,10 @@ +# Fail2Ban filter for unsuccesfull Vesta authentication attempts +# + +[INCLUDES] +before = common.conf + +[Definition] +failregex = .* failed to login +ignoreregex = + diff --git a/install/ubuntu/14.10/fail2ban/jail.local b/install/ubuntu/14.10/fail2ban/jail.local new file mode 100644 index 000000000..eccea0685 --- /dev/null +++ b/install/ubuntu/14.10/fail2ban/jail.local @@ -0,0 +1,39 @@ +[ssh-iptables] +enabled = true +filter = sshd +action = vesta[name=SSH] +logpath = /var/log/auth.log +maxretry = 5 + +[vsftpd-iptables] +enabled = false +filter = vsftpd +action = vesta[name=FTP] +logpath = /var/log/vsftpd.log +maxretry = 5 + +[exim-iptables] +enabled = true +filter = exim +action = vesta[name=MAIL] +logpath = /var/log/exim4/mainlog + +[dovecot-iptables] +enabled = true +filter = dovecot +action = vesta[name=MAIL] +logpath = /var/log/dovecot.log + +[mysqld-iptables] +enabled = false +filter = mysqld-auth +action = vesta[name=DB] +logpath = /var/log/mysql.log +maxretry = 5 + +[vesta-iptables] +enabled = true +filter = vesta +action = vesta[name=VESTA] +logpath = /var/log/vesta/auth.log +maxretry = 5 diff --git a/install/ubuntu/14.10/firewall.tar.gz b/install/ubuntu/14.10/firewall.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..e8556008077364323d7d6b6934e7a2cf7a734983 GIT binary patch literal 540 zcmV+%0^|K3iwFQ5XyQ}=1MQVdkJ>O4Mzij(@XnhsKo&*MSlh#7(1g=&0&FEG%?Me6ampuO4>y-_`!)kpP&FT0Pj|*j)GSV93 zG0u%P9?@5H>Ue&9TJ8w(mS4U;YbU>kw!5dto6pc!`1H`piz?!Qs? zZ2zTY(j)A}O)l`C?|(Hfn=&r%X0(YbN~&_+%&1`W&E*1z3IZzVUki(*D`*Kk5kQkG z1wFz!17_g@d9ch)G0;wCGL8I9sNtr~X-yEB=^d3PuoC0XT$oBik3eT~aJ zPYYM7vf@1@^`frQB1w}O-E1jovb=r04Y>?eKuHocY1?18ny~4FyPO>aM4!NUUOmFePy(-1M3SddTi>v8NVjB&*t=IgAYbgkDfmmx*FWy-yM^~-2uA1 z`-8QZ4$iCJUfZClsXi!k+gGp^gsj(jT}WJxQ(W4?Rswg^FKlTCd%;5d=XH e1VIo4K@bE%5ClOG1VIqwGCu%8Tmj4gC;$K)2?m1z literal 0 HcmV?d00001 diff --git a/install/ubuntu/14.10/firewall/ports.conf b/install/ubuntu/14.10/firewall/ports.conf new file mode 100644 index 000000000..a6ef4dae5 --- /dev/null +++ b/install/ubuntu/14.10/firewall/ports.conf @@ -0,0 +1,16 @@ +PROTOCOL='TCP' PORT='20' +PROTOCOL='TCP' PORT='21' +PROTOCOL='TCP' PORT='22' +PROTOCOL='TCP' PORT='25' +PROTOCOL='UDP' PORT='53' +PROTOCOL='TCP' PORT='80' +PROTOCOL='TCP' PORT='443' +PROTOCOL='TCP' PORT='110' +PROTOCOL='UDP' PORT='123' +PROTOCOL='TCP' PORT='143' +PROTOCOL='TCP' PORT='3306' +PROTOCOL='TCP' PORT='5432' +PROTOCOL='TCP' PORT='8080' +PROTOCOL='TCP' PORT='8433' +PROTOCOL='TCP' PORT='8083' +PROTOCOL='TCP' PORT='12000:12100' diff --git a/install/ubuntu/14.10/firewall/rules.conf b/install/ubuntu/14.10/firewall/rules.conf new file mode 100644 index 000000000..956c2e1d9 --- /dev/null +++ b/install/ubuntu/14.10/firewall/rules.conf @@ -0,0 +1,10 @@ +RULE='1' ACTION='ACCEPT' PROTOCOL='ICMP' PORT='0' IP='0.0.0.0/0' COMMENT='PING' SUSPENDED='no' TIME='17:13:48' DATE='2014-09-16' +RULE='2' ACTION='ACCEPT' PROTOCOL='TCP' PORT='8083' IP='0.0.0.0/0' COMMENT='VESTA' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' +RULE='3' ACTION='ACCEPT' PROTOCOL='TCP' PORT='3306,5432' IP='0.0.0.0/0' COMMENT='DB' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' +RULE='4' ACTION='ACCEPT' PROTOCOL='TCP' PORT='143,993' IP='0.0.0.0/0' COMMENT='IMAP' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' +RULE='5' ACTION='ACCEPT' PROTOCOL='TCP' PORT='110,995' IP='0.0.0.0/0' COMMENT='POP3' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' +RULE='6' ACTION='ACCEPT' PROTOCOL='TCP' PORT='25,465,587,2525' IP='0.0.0.0/0' COMMENT='SMTP' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' +RULE='7' ACTION='ACCEPT' PROTOCOL='UDP' PORT='53' IP='0.0.0.0/0' COMMENT='DNS' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' +RULE='8' ACTION='ACCEPT' PROTOCOL='TCP' PORT='21,12000-12100' IP='0.0.0.0/0' COMMENT='FTP' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' +RULE='9' ACTION='ACCEPT' PROTOCOL='TCP' PORT='80,443' IP='0.0.0.0/0' COMMENT='WEB' SUSPENDED='no' TIME='17:04:27' DATE='2014-09-24' +RULE='10' ACTION='ACCEPT' PROTOCOL='TCP' PORT='22' IP='0.0.0.0/0' COMMENT='SSH' SUSPENDED='no' TIME='17:14:41' DATE='2014-09-16' diff --git a/install/ubuntu/14.10/logrotate/apache2 b/install/ubuntu/14.10/logrotate/apache2 new file mode 100644 index 000000000..27629d0dd --- /dev/null +++ b/install/ubuntu/14.10/logrotate/apache2 @@ -0,0 +1,19 @@ +/var/log/apache2/*.log /var/log/apache2/domains/*log { + weekly + missingok + rotate 52 + compress + delaycompress + notifempty + create 640 root adm + sharedscripts + postrotate + /etc/init.d/apache2 reload > /dev/null || true + [ ! -f /var/run/nginx.pid ] || kill -USR1 `cat /var/run/nginx.pid` + endscript + prerotate + if [ -d /etc/logrotate.d/httpd-prerotate ]; then \ + run-parts /etc/logrotate.d/httpd-prerotate; \ + fi; \ + endscript +} diff --git a/install/ubuntu/14.10/logrotate/nginx b/install/ubuntu/14.10/logrotate/nginx new file mode 100644 index 000000000..d667f2135 --- /dev/null +++ b/install/ubuntu/14.10/logrotate/nginx @@ -0,0 +1,13 @@ +/var/log/nginx/*log /var/log/nginx/domains/*log { + daily + missingok + rotate 52 + compress + delaycompress + notifempty + create 640 nginx adm + sharedscripts + postrotate + [ -f /var/run/nginx.pid ] && kill -USR1 `cat /var/run/nginx.pid` + endscript +} diff --git a/install/ubuntu/14.10/logrotate/vesta b/install/ubuntu/14.10/logrotate/vesta new file mode 100644 index 000000000..027a34396 --- /dev/null +++ b/install/ubuntu/14.10/logrotate/vesta @@ -0,0 +1,7 @@ +/usr/local/vesta/log/*.log { + missingok + notifempty + size 30k + yearly + create 0600 root root +} diff --git a/install/ubuntu/14.10/mysql/my-large.cnf b/install/ubuntu/14.10/mysql/my-large.cnf new file mode 100644 index 000000000..d0bab3907 --- /dev/null +++ b/install/ubuntu/14.10/mysql/my-large.cnf @@ -0,0 +1,42 @@ +[client] +port=3306 +socket=/var/run/mysqld/mysqld.sock + +[mysqld_safe] +socket=/var/run/mysqld/mysqld.sock + +[mysqld] +user=mysql +pid-file=/var/run/mysqld/mysqld.pid +socket=/var/run/mysqld/mysqld.sock +port=3306 +basedir=/usr +datadir=/var/lib/mysql +tmpdir=/tmp +lc-messages-dir=/usr/share/mysql +log_error=/var/log/mysql/error.log + +symbolic-links=0 + +skip-external-locking +key_buffer_size = 256M +max_allowed_packet = 32M +table_open_cache = 256 +sort_buffer_size = 1M +read_buffer_size = 1M +read_rnd_buffer_size = 4M +myisam_sort_buffer_size = 64M +thread_cache_size = 8 +query_cache_size= 16M +thread_concurrency = 8 + +#innodb_use_native_aio = 0 +innodb_file_per_table + +max_connections=200 +max_user_connections=50 +wait_timeout=10 +interactive_timeout=50 +long_query_time=5 + +!includedir /etc/mysql/conf.d/ diff --git a/install/ubuntu/14.10/mysql/my-medium.cnf b/install/ubuntu/14.10/mysql/my-medium.cnf new file mode 100644 index 000000000..1c10ab9a6 --- /dev/null +++ b/install/ubuntu/14.10/mysql/my-medium.cnf @@ -0,0 +1,40 @@ +[client] +port=3306 +socket=/var/run/mysqld/mysqld.sock + +[mysqld_safe] +socket=/var/run/mysqld/mysqld.sock + +[mysqld] +user=mysql +pid-file=/var/run/mysqld/mysqld.pid +socket=/var/run/mysqld/mysqld.sock +port=3306 +basedir=/usr +datadir=/var/lib/mysql +tmpdir=/tmp +lc-messages-dir=/usr/share/mysql +log_error=/var/log/mysql/error.log + +symbolic-links=0 + +skip-external-locking +key_buffer_size = 16M +max_allowed_packet = 16M +table_open_cache = 64 +sort_buffer_size = 512K +net_buffer_length = 8K +read_buffer_size = 256K +read_rnd_buffer_size = 512K +myisam_sort_buffer_size = 8M + +#innodb_use_native_aio = 0 +innodb_file_per_table + +max_connections=70 +max_user_connections=30 +wait_timeout=10 +interactive_timeout=50 +long_query_time=5 + +!includedir /etc/mysql/conf.d/ diff --git a/install/ubuntu/14.10/mysql/my-small.cnf b/install/ubuntu/14.10/mysql/my-small.cnf new file mode 100644 index 000000000..26a804781 --- /dev/null +++ b/install/ubuntu/14.10/mysql/my-small.cnf @@ -0,0 +1,40 @@ +[client] +port=3306 +socket=/var/run/mysqld/mysqld.sock + +[mysqld_safe] +socket=/var/run/mysqld/mysqld.sock + +[mysqld] +user=mysql +pid-file=/var/run/mysqld/mysqld.pid +socket=/var/run/mysqld/mysqld.sock +port=3306 +basedir=/usr +datadir=/var/lib/mysql +tmpdir=/tmp +lc-messages-dir=/usr/share/mysql +log_error=/var/log/mysql/error.log + +symbolic-links=0 + +skip-external-locking +key_buffer_size = 16K +max_allowed_packet = 1M +table_open_cache = 4 +sort_buffer_size = 64K +read_buffer_size = 256K +read_rnd_buffer_size = 256K +net_buffer_length = 2K +thread_stack = 240K + +#innodb_use_native_aio = 0 +innodb_file_per_table + +max_connections=30 +max_user_connections=20 +wait_timeout=10 +interactive_timeout=50 +long_query_time=5 + +!includedir /etc/mysql/conf.d/ diff --git a/install/ubuntu/14.10/nginx/nginx.conf b/install/ubuntu/14.10/nginx/nginx.conf new file mode 100644 index 000000000..7937301c1 --- /dev/null +++ b/install/ubuntu/14.10/nginx/nginx.conf @@ -0,0 +1,124 @@ +# Server globals +user www-data; +worker_processes 2; +error_log /var/log/nginx/error.log; +pid /var/run/nginx.pid; + + +# Worker config +events { + worker_connections 1024; + use epoll; +} + + +http { + # Main settings + sendfile on; + tcp_nopush on; + tcp_nodelay on; + client_header_timeout 1m; + client_body_timeout 1m; + client_header_buffer_size 2k; + client_body_buffer_size 256k; + client_max_body_size 100m; + large_client_header_buffers 4 8k; + send_timeout 30; + keepalive_timeout 60 60; + reset_timedout_connection on; + server_tokens off; + server_name_in_redirect off; + server_names_hash_max_size 512; + server_names_hash_bucket_size 512; + + + # Log format + log_format main '$remote_addr - $remote_user [$time_local] $request ' + '"$status" $body_bytes_sent "$http_referer" ' + '"$http_user_agent" "$http_x_forwarded_for"'; + log_format bytes '$body_bytes_sent'; + #access_log /var/log/nginx/access.log main; + access_log off; + + + # Mime settings + include /etc/nginx/mime.types; + default_type application/octet-stream; + + + # Compression + gzip on; + gzip_comp_level 9; + gzip_min_length 512; + gzip_buffers 8 64k; + gzip_types text/plain text/css text/javascript + application/x-javascript; + gzip_proxied any; + + + # Proxy settings + proxy_redirect off; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_pass_header Set-Cookie; + proxy_connect_timeout 90; + proxy_send_timeout 90; + proxy_read_timeout 90; + proxy_buffers 32 4k; + + + # Cloudflare https://www.cloudflare.com/ips + set_real_ip_from 199.27.128.0/21; + set_real_ip_from 173.245.48.0/20; + set_real_ip_from 103.21.244.0/22; + set_real_ip_from 103.22.200.0/22; + set_real_ip_from 103.31.4.0/22; + set_real_ip_from 141.101.64.0/18; + set_real_ip_from 108.162.192.0/18; + set_real_ip_from 190.93.240.0/20; + set_real_ip_from 188.114.96.0/20; + set_real_ip_from 197.234.240.0/22; + set_real_ip_from 198.41.128.0/17; + set_real_ip_from 162.158.0.0/15; + set_real_ip_from 104.16.0.0/12; + set_real_ip_from 172.64.0.0/13; + #set_real_ip_from 2400:cb00::/32; + #set_real_ip_from 2606:4700::/32; + #set_real_ip_from 2803:f800::/32; + #set_real_ip_from 2405:b500::/32; + #set_real_ip_from 2405:8100::/32; + real_ip_header CF-Connecting-IP; + + + # SSL PCI Compliance + ssl_session_cache shared:SSL:10m; + ssl_protocols TLSv1 TLSv1.1 TLSv1.2; + ssl_prefer_server_ciphers on; + ssl_ciphers "ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA:ECDHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES128-SHA256:DHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES256-GCM-SHA384:AES128-GCM-SHA256:AES256-SHA256:AES128-SHA256:AES256-SHA:AES128-SHA:DES-CBC3-SHA:HIGH:!aNULL:!eNULL:!EXPORT:!DES:!MD5:!PSK:!RC4"; + + + # Error pages + error_page 403 /error/403.html; + error_page 404 /error/404.html; + error_page 502 503 504 /error/50x.html; + + + # Cache + proxy_cache_path /var/cache/nginx levels=2 keys_zone=cache:10m inactive=60m max_size=512m; + proxy_cache_key "$host$request_uri $cookie_user"; + proxy_temp_path /var/cache/nginx/temp; + proxy_ignore_headers Expires Cache-Control; + proxy_cache_use_stale error timeout invalid_header http_502; + proxy_cache_valid any 3d; + + map $http_cookie $no_cache { + default 0; + ~SESS 1; + ~wordpress_logged_in 1; + } + + + # Wildcard include + include /etc/nginx/conf.d/*.conf; +} diff --git a/install/ubuntu/14.10/nginx/phpmyadmin.inc b/install/ubuntu/14.10/nginx/phpmyadmin.inc new file mode 100644 index 000000000..d70ca3e3c --- /dev/null +++ b/install/ubuntu/14.10/nginx/phpmyadmin.inc @@ -0,0 +1,15 @@ +location /phpmyadmin { + alias /usr/share/phpmyadmin/; + + location ~ /(libraries|setup) { + return 404; + } + + location ~ ^/phpmyadmin/(.*\.php)$ { + alias /usr/share/phpmyadmin/$1; + fastcgi_pass 127.0.0.1:9000; + fastcgi_index index.php; + include fastcgi_params; + fastcgi_param SCRIPT_FILENAME $request_filename; + } +} diff --git a/install/ubuntu/14.10/nginx/phppgadmin.inc b/install/ubuntu/14.10/nginx/phppgadmin.inc new file mode 100644 index 000000000..cd1e5806b --- /dev/null +++ b/install/ubuntu/14.10/nginx/phppgadmin.inc @@ -0,0 +1,11 @@ +location /phppgadmin { + alias /usr/share/phppgadmin/; + + location ~ ^/phppgadmin/(.*\.php)$ { + alias /usr/share/phppgadmin/$1; + fastcgi_pass 127.0.0.1:9000; + fastcgi_index index.php; + include fastcgi_params; + fastcgi_param SCRIPT_FILENAME $request_filename; + } +} diff --git a/install/ubuntu/14.10/nginx/status.conf b/install/ubuntu/14.10/nginx/status.conf new file mode 100644 index 000000000..c0bcd0691 --- /dev/null +++ b/install/ubuntu/14.10/nginx/status.conf @@ -0,0 +1,9 @@ +server { + listen 127.0.0.1:8084 default; + server_name _; + server_name_in_redirect off; + location / { + stub_status on; + access_log off; + } +} diff --git a/install/ubuntu/14.10/nginx/webmail.inc b/install/ubuntu/14.10/nginx/webmail.inc new file mode 100644 index 000000000..ad66895bc --- /dev/null +++ b/install/ubuntu/14.10/nginx/webmail.inc @@ -0,0 +1,15 @@ +location /webmail { + alias /var/lib/roundcube/; + + location ~ /(config|temp|logs) { + return 404; + } + + location ~ ^/webmail/(.*\.php)$ { + alias /var/lib/roundcube/$1; + fastcgi_pass 127.0.0.1:9000; + fastcgi_index index.php; + include fastcgi_params; + fastcgi_param SCRIPT_FILENAME $request_filename; + } +} diff --git a/install/ubuntu/14.10/packages.tar.gz b/install/ubuntu/14.10/packages.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..4b778dadce20a61f03a8ca920ec81c55a8730fee GIT binary patch literal 562 zcmV-20?qv&iwFRHoJ3Lp1MQYgkD5>vhFSY7+_9e37(#VaFxE7E(hXh3fdi2rFJZkFya3gX^b)n zVXSCG>M9q!r;?X63%1>^6fD25GP?9(Zs8i zm#eSAOO(kSvCYUG8}`JzlNGcp7>;dtR#6ZOYcoV)W|{76R22A_Q=gJo4AXSy6Mw(T z@QvYNS99i079ZTgdF&uH#Hm!H2Tkno>k1^mATb^lABoBo#r=lG9NGXU~REdk0(83B2vo&kr_ zAp~{{4=IqJS7Kl{UdaJ`lmmICl^~$|AizYY10B;!5Re`k^vG)ug3|w@mF?UAH~v$N z5%B*SfdB3Ik9DT%#Rp2&fAy{S9|r3<{gP~x+kO96-v30?!2fG-8UK&;KeGQw{$uw~ zsNXQZA^ut3x1l|*XixdCp}qF{wFdwI0000000000000000RC})0(q@EkpL(F05 diff --git a/install/ubuntu/14.10/pga/phppgadmin.conf b/install/ubuntu/14.10/pga/phppgadmin.conf new file mode 100644 index 000000000..f39247d6f --- /dev/null +++ b/install/ubuntu/14.10/pga/phppgadmin.conf @@ -0,0 +1,31 @@ +Alias /phppgadmin /usr/share/phppgadmin + + + +DirectoryIndex index.php +AllowOverride None + +order deny,allow +deny from all +allow from 127.0.0.0/255.0.0.0 ::1/128 +allow from all + + + php_flag magic_quotes_gpc Off + php_flag track_vars On + php_value include_path . + + + + + AddType application/x-httpd-php .php + Action application/x-httpd-php /cgi-bin/php + + + AddType application/x-httpd-php .php + Action application/x-httpd-php /cgi-bin/php + + + + + diff --git a/install/ubuntu/14.10/php5-fpm/www.conf b/install/ubuntu/14.10/php5-fpm/www.conf new file mode 100644 index 000000000..d046bceef --- /dev/null +++ b/install/ubuntu/14.10/php5-fpm/www.conf @@ -0,0 +1,10 @@ +[www] +listen = 127.0.0.1:9000 +listen.allowed_clients = 127.0.0.1 +user = www-data +group = www-data +pm = dynamic +pm.max_children = 50 +pm.start_servers = 5 +pm.min_spare_servers = 3 +pm.max_spare_servers = 35 diff --git a/install/ubuntu/14.10/pma/apache.conf b/install/ubuntu/14.10/pma/apache.conf new file mode 100644 index 000000000..2a8f69e25 --- /dev/null +++ b/install/ubuntu/14.10/pma/apache.conf @@ -0,0 +1,42 @@ +# phpMyAdmin default Apache configuration + +Alias /phpmyadmin /usr/share/phpmyadmin + + + Options FollowSymLinks + DirectoryIndex index.php + + + AddType application/x-httpd-php .php + + php_flag magic_quotes_gpc Off + php_flag track_vars On + php_flag register_globals Off + php_admin_flag allow_url_fopen Off + php_value include_path . + php_admin_value upload_tmp_dir /var/lib/phpmyadmin/tmp + php_admin_value open_basedir /usr/share/phpmyadmin/:/etc/phpmyadmin/:/var/lib/phpmyadmin/:/usr/share/php/php-gettext + + + + +# Authorize for setup + + + AuthType Basic + AuthName "phpMyAdmin Setup" + AuthUserFile /etc/phpmyadmin/htpasswd.setup + + Require valid-user + + +# Disallow web access to directories that don't need it + + Order Deny,Allow + Deny from All + + + Order Deny,Allow + Deny from All + + diff --git a/install/ubuntu/14.10/pma/config.inc.php b/install/ubuntu/14.10/pma/config.inc.php new file mode 100644 index 000000000..a643a065b --- /dev/null +++ b/install/ubuntu/14.10/pma/config.inc.php @@ -0,0 +1,146 @@ + + VRootEngine on + VRootAlias /etc/security/pam_env.conf etc/security/pam_env.conf + + +AuthPAMConfig proftpd +AuthOrder mod_auth_pam.c* mod_auth_unix.c +UseReverseDNS off +User proftpd +Group nogroup +MaxInstances 20 +UseSendfile off +LogFormat default "%h %l %u %t \"%r\" %s %b" +LogFormat auth "%v [%P] %h %t \"%r\" %s" +ListOptions -a +RequireValidShell off +PassivePorts 12000 12100 + + + Umask 002 + IdentLookups off + AllowOverwrite yes + + AllowAll + + diff --git a/install/ubuntu/14.10/roundcube/apache.conf b/install/ubuntu/14.10/roundcube/apache.conf new file mode 100644 index 000000000..a0c87bcc6 --- /dev/null +++ b/install/ubuntu/14.10/roundcube/apache.conf @@ -0,0 +1,40 @@ +Alias /roundcube/program/js/tiny_mce/ /usr/share/tinymce/www/ +Alias /roundcube /var/lib/roundcube +Alias /webmail /var/lib/roundcube + +# Access to tinymce files + + Options Indexes MultiViews FollowSymLinks + AllowOverride None + Order allow,deny + allow from all + + + + Options +FollowSymLinks + # This is needed to parse /var/lib/roundcube/.htaccess. See its + # content before setting AllowOverride to None. + AllowOverride All + order allow,deny + allow from all + + +# Protecting basic directories: + + Options -FollowSymLinks + AllowOverride None + + + + Options -FollowSymLinks + AllowOverride None + Order allow,deny + Deny from all + + + + Options -FollowSymLinks + AllowOverride None + Order allow,deny + Deny from all + diff --git a/install/ubuntu/14.10/roundcube/config.inc.php b/install/ubuntu/14.10/roundcube/config.inc.php new file mode 100644 index 000000000..0c82b1bc1 --- /dev/null +++ b/install/ubuntu/14.10/roundcube/config.inc.php @@ -0,0 +1,33 @@ + diff --git a/install/ubuntu/14.10/roundcube/main.inc.php b/install/ubuntu/14.10/roundcube/main.inc.php new file mode 100644 index 000000000..97cdbf2df --- /dev/null +++ b/install/ubuntu/14.10/roundcube/main.inc.php @@ -0,0 +1,850 @@ +/sendmail or to syslog +$rcmail_config['smtp_log'] = true; + +// Log successful logins to /userlogins or to syslog +$rcmail_config['log_logins'] = false; + +// Log session authentication errors to /session or to syslog +$rcmail_config['log_session'] = false; + +// Log SQL queries to /sql or to syslog +$rcmail_config['sql_debug'] = false; + +// Log IMAP conversation to /imap or to syslog +$rcmail_config['imap_debug'] = false; + +// Log LDAP conversation to /ldap or to syslog +$rcmail_config['ldap_debug'] = false; + +// Log SMTP conversation to /smtp or to syslog +$rcmail_config['smtp_debug'] = false; + +// ---------------------------------- +// IMAP +// ---------------------------------- + +// the mail host chosen to perform the log-in +// leave blank to show a textbox at login, give a list of hosts +// to display a pulldown menu or set one host as string. +// To use SSL/TLS connection, enter hostname with prefix ssl:// or tls:// +// Supported replacement variables: +// %n - http hostname ($_SERVER['SERVER_NAME']) +// %d - domain (http hostname without the first part) +// %s - domain name after the '@' from e-mail address provided at login screen +// For example %n = mail.domain.tld, %d = domain.tld +$rcmail_config['default_host'] = 'localhost'; + +// TCP port used for IMAP connections +$rcmail_config['default_port'] = 143; + +// IMAP AUTH type (DIGEST-MD5, CRAM-MD5, LOGIN, PLAIN or empty to use +// best server supported one) +$rcmail_config['imap_auth_type'] = null; + +// If you know your imap's folder delimiter, you can specify it here. +// Otherwise it will be determined automatically +$rcmail_config['imap_delimiter'] = null; + +// If IMAP server doesn't support NAMESPACE extension, but you're +// using shared folders or personal root folder is non-empty, you'll need to +// set these options. All can be strings or arrays of strings. +// Folders need to be ended with directory separator, e.g. "INBOX." +// (special directory "~" is an exception to this rule) +// These can be used also to overwrite server's namespaces +$rcmail_config['imap_ns_personal'] = null; +$rcmail_config['imap_ns_other'] = null; +$rcmail_config['imap_ns_shared'] = null; + +// By default IMAP capabilities are readed after connection to IMAP server +// In some cases, e.g. when using IMAP proxy, there's a need to refresh the list +// after login. Set to True if you've got this case. +$rcmail_config['imap_force_caps'] = false; + +// By default list of subscribed folders is determined using LIST-EXTENDED +// extension if available. Some servers (dovecot 1.x) returns wrong results +// for shared namespaces in this case. http://trac.roundcube.net/ticket/1486225 +// Enable this option to force LSUB command usage instead. +$rcmail_config['imap_force_lsub'] = false; + +// Some server configurations (e.g. Courier) doesn't list folders in all namespaces +// Enable this option to force listing of folders in all namespaces +$rcmail_config['imap_force_ns'] = false; + +// IMAP connection timeout, in seconds. Default: 0 (no limit) +$rcmail_config['imap_timeout'] = 0; + +// Optional IMAP authentication identifier to be used as authorization proxy +$rcmail_config['imap_auth_cid'] = null; + +// Optional IMAP authentication password to be used for imap_auth_cid +$rcmail_config['imap_auth_pw'] = null; + +// Type of IMAP indexes cache. Supported values: 'db', 'apc' and 'memcache'. +$rcmail_config['imap_cache'] = null; + +// Enables messages cache. Only 'db' cache is supported. +$rcmail_config['messages_cache'] = false; + + +// ---------------------------------- +// SMTP +// ---------------------------------- + +// SMTP server host (for sending mails). +// To use SSL/TLS connection, enter hostname with prefix ssl:// or tls:// +// If left blank, the PHP mail() function is used +// Supported replacement variables: +// %h - user's IMAP hostname +// %n - http hostname ($_SERVER['SERVER_NAME']) +// %d - domain (http hostname without the first part) +// %z - IMAP domain (IMAP hostname without the first part) +// For example %n = mail.domain.tld, %d = domain.tld +$rcmail_config['smtp_server'] = ''; + +// SMTP port (default is 25; use 587 for STARTTLS or 465 for the +// deprecated SSL over SMTP (aka SMTPS)) +$rcmail_config['smtp_port'] = 25; + +// SMTP username (if required) if you use %u as the username Roundcube +// will use the current username for login +$rcmail_config['smtp_user'] = ''; + +// SMTP password (if required) if you use %p as the password Roundcube +// will use the current user's password for login +$rcmail_config['smtp_pass'] = ''; + +// SMTP AUTH type (DIGEST-MD5, CRAM-MD5, LOGIN, PLAIN or empty to use +// best server supported one) +$rcmail_config['smtp_auth_type'] = ''; + +// Optional SMTP authentication identifier to be used as authorization proxy +$rcmail_config['smtp_auth_cid'] = null; + +// Optional SMTP authentication password to be used for smtp_auth_cid +$rcmail_config['smtp_auth_pw'] = null; + +// SMTP HELO host +// Hostname to give to the remote server for SMTP 'HELO' or 'EHLO' messages +// Leave this blank and you will get the server variable 'server_name' or +// localhost if that isn't defined. +$rcmail_config['smtp_helo_host'] = ''; + +// SMTP connection timeout, in seconds. Default: 0 (no limit) +$rcmail_config['smtp_timeout'] = 0; + +// ---------------------------------- +// SYSTEM +// ---------------------------------- +include_once("/etc/roundcube/debian-db-roundcube.php"); + + +// THIS OPTION WILL ALLOW THE INSTALLER TO RUN AND CAN EXPOSE SENSITIVE CONFIG DATA. +// ONLY ENABLE IT IF YOU'RE REALLY SURE WHAT YOU'RE DOING! +$rcmail_config['enable_installer'] = false; + +// provide an URL where a user can get support for this Roundcube installation +// PLEASE DO NOT LINK TO THE ROUNDCUBE.NET WEBSITE HERE! +$rcmail_config['support_url'] = ''; + +// replace Roundcube logo with this image +// specify an URL relative to the document root of this Roundcube installation +$rcmail_config['skin_logo'] = null; + +// automatically create a new Roundcube user when log-in the first time. +// a new user will be created once the IMAP login succeeds. +// set to false if only registered users can use this service +$rcmail_config['auto_create_user'] = true; + +// use this folder to store log files (must be writeable for apache user) +// This is used by the 'file' log driver. +$rcmail_config['log_dir'] = '/var/log/roundcubemail/'; + +// use this folder to store temp files (must be writeable for apache user) +$rcmail_config['temp_dir'] = '/tmp'; + +// lifetime of message cache +// possible units: s, m, h, d, w +$rcmail_config['message_cache_lifetime'] = '10d'; + +// enforce connections over https +// with this option enabled, all non-secure connections will be redirected. +// set the port for the ssl connection as value of this option if it differs from the default 443 +$rcmail_config['force_https'] = false; + +// tell PHP that it should work as under secure connection +// even if it doesn't recognize it as secure ($_SERVER['HTTPS'] is not set) +// e.g. when you're running Roundcube behind a https proxy +// this option is mutually exclusive to 'force_https' and only either one of them should be set to true. +$rcmail_config['use_https'] = false; + +// Allow browser-autocompletion on login form. +// 0 - disabled, 1 - username and host only, 2 - username, host, password +$rcmail_config['login_autocomplete'] = 0; + +// Forces conversion of logins to lower case. +// 0 - disabled, 1 - only domain part, 2 - domain and local part. +// If users authentication is not case-sensitive this must be enabled. +// After enabling it all user records need to be updated, e.g. with query: +// UPDATE users SET username = LOWER(username); +$rcmail_config['login_lc'] = 0; + +// Includes should be interpreted as PHP files +$rcmail_config['skin_include_php'] = false; + +// display software version on login screen +$rcmail_config['display_version'] = false; + +// Session lifetime in minutes +// must be greater than 'keep_alive'/60 +$rcmail_config['session_lifetime'] = 10; + +// session domain: .example.org +$rcmail_config['session_domain'] = ''; + +// session name. Default: 'roundcube_sessid' +$rcmail_config['session_name'] = null; + +// Backend to use for session storage. Can either be 'db' (default) or 'memcache' +// If set to memcache, a list of servers need to be specified in 'memcache_hosts' +// Make sure the Memcache extension (http://pecl.php.net/package/memcache) version >= 2.0.0 is installed +$rcmail_config['session_storage'] = 'db'; + +// Use these hosts for accessing memcached +// Define any number of hosts in the form of hostname:port or unix:///path/to/sock.file +$rcmail_config['memcache_hosts'] = null; // e.g. array( 'localhost:11211', '192.168.1.12:11211', 'unix:///var/tmp/memcached.sock' ); + +// check client IP in session athorization +$rcmail_config['ip_check'] = false; + +// check referer of incoming requests +$rcmail_config['referer_check'] = false; + +// X-Frame-Options HTTP header value sent to prevent from Clickjacking. +// Possible values: sameorigin|deny. Set to false in order to disable sending them +$rcmail_config['x_frame_options'] = 'sameorigin'; + +// this key is used to encrypt the users imap password which is stored +// in the session record (and the client cookie if remember password is enabled). +// please provide a string of exactly 24 chars. +$rcmail_config['des_key'] = 'vtIOjLZo9kffJoqzpSbm5r1r'; + +// Automatically add this domain to user names for login +// Only for IMAP servers that require full e-mail addresses for login +// Specify an array with 'host' => 'domain' values to support multiple hosts +// Supported replacement variables: +// %h - user's IMAP hostname +// %n - http hostname ($_SERVER['SERVER_NAME']) +// %d - domain (http hostname without the first part) +// %z - IMAP domain (IMAP hostname without the first part) +// For example %n = mail.domain.tld, %d = domain.tld +$rcmail_config['username_domain'] = ''; + +// This domain will be used to form e-mail addresses of new users +// Specify an array with 'host' => 'domain' values to support multiple hosts +// Supported replacement variables: +// %h - user's IMAP hostname +// %n - http hostname ($_SERVER['SERVER_NAME']) +// %d - domain (http hostname without the first part) +// %z - IMAP domain (IMAP hostname without the first part) +// For example %n = mail.domain.tld, %d = domain.tld +$rcmail_config['mail_domain'] = ''; + +// Password charset. +// Use it if your authentication backend doesn't support UTF-8. +// Defaults to ISO-8859-1 for backward compatibility +$rcmail_config['password_charset'] = 'ISO-8859-1'; + +// How many seconds must pass between emails sent by a user +$rcmail_config['sendmail_delay'] = 0; + +// Maximum number of recipients per message. Default: 0 (no limit) +$rcmail_config['max_recipients'] = 0; + +// Maximum allowednumber of members of an address group. Default: 0 (no limit) +// If 'max_recipients' is set this value should be less or equal +$rcmail_config['max_group_members'] = 0; + +// add this user-agent to message headers when sending +$rcmail_config['useragent'] = 'Roundcube Webmail/'.RCMAIL_VERSION; + +// use this name to compose page titles +$rcmail_config['product_name'] = 'Roundcube Webmail'; + +// try to load host-specific configuration +// see http://trac.roundcube.net/wiki/Howto_Config for more details +$rcmail_config['include_host_config'] = false; + +// path to a text file which will be added to each sent message +// paths are relative to the Roundcube root folder +$rcmail_config['generic_message_footer'] = ''; + +// path to a text file which will be added to each sent HTML message +// paths are relative to the Roundcube root folder +$rcmail_config['generic_message_footer_html'] = ''; + +// add a received header to outgoing mails containing the creators IP and hostname +$rcmail_config['http_received_header'] = false; + +// Whether or not to encrypt the IP address and the host name +// these could, in some circles, be considered as sensitive information; +// however, for the administrator, these could be invaluable help +// when tracking down issues. +$rcmail_config['http_received_header_encrypt'] = false; + +// This string is used as a delimiter for message headers when sending +// a message via mail() function. Leave empty for auto-detection +$rcmail_config['mail_header_delimiter'] = NULL; + +// number of chars allowed for line when wrapping text. +// text wrapping is done when composing/sending messages +$rcmail_config['line_length'] = 72; + +// send plaintext messages as format=flowed +$rcmail_config['send_format_flowed'] = true; + +// don't allow these settings to be overriden by the user +$rcmail_config['dont_override'] = array(); + +// Set identities access level: +// 0 - many identities with possibility to edit all params +// 1 - many identities with possibility to edit all params but not email address +// 2 - one identity with possibility to edit all params +// 3 - one identity with possibility to edit all params but not email address +$rcmail_config['identities_level'] = 0; + +// Mimetypes supported by the browser. +// attachments of these types will open in a preview window +// either a comma-separated list or an array: 'text/plain,text/html,text/xml,image/jpeg,image/gif,image/png,application/pdf' +$rcmail_config['client_mimetypes'] = null; # null == default + +// mime magic database +$rcmail_config['mime_magic'] = null; + +// path to imagemagick identify binary +$rcmail_config['im_identify_path'] = null; + +// path to imagemagick convert binary +$rcmail_config['im_convert_path'] = null; + +// maximum size of uploaded contact photos in pixel +$rcmail_config['contact_photo_size'] = 160; + +// Enable DNS checking for e-mail address validation +$rcmail_config['email_dns_check'] = false; + +// ---------------------------------- +// PLUGINS +// ---------------------------------- + +// List of active plugins (in plugins/ directory) +$rcmail_config['plugins'] = array('password'); + +// ---------------------------------- +// USER INTERFACE +// ---------------------------------- + +// default messages sort column. Use empty value for default server's sorting, +// or 'arrival', 'date', 'subject', 'from', 'to', 'fromto', 'size', 'cc' +$rcmail_config['message_sort_col'] = ''; + +// default messages sort order +$rcmail_config['message_sort_order'] = 'DESC'; + +// These cols are shown in the message list. Available cols are: +// subject, from, to, fromto, cc, replyto, date, size, status, flag, attachment, 'priority' +$rcmail_config['list_cols'] = array('subject', 'status', 'fromto', 'date', 'size', 'flag', 'attachment'); + +// the default locale setting (leave empty for auto-detection) +// RFC1766 formatted language name like en_US, de_DE, de_CH, fr_FR, pt_BR +$rcmail_config['language'] = null; + +// use this format for date display (date or strftime format) +$rcmail_config['date_format'] = 'Y-m-d'; + +// give this choice of date formats to the user to select from +$rcmail_config['date_formats'] = array('Y-m-d', 'd-m-Y', 'Y/m/d', 'm/d/Y', 'd/m/Y', 'd.m.Y', 'j.n.Y'); + +// use this format for time display (date or strftime format) +$rcmail_config['time_format'] = 'H:i'; + +// give this choice of time formats to the user to select from +$rcmail_config['time_formats'] = array('G:i', 'H:i', 'g:i a', 'h:i A'); + +// use this format for short date display (derived from date_format and time_format) +$rcmail_config['date_short'] = 'D H:i'; + +// use this format for detailed date/time formatting (derived from date_format and time_format) +$rcmail_config['date_long'] = 'Y-m-d H:i'; + +// store draft message is this mailbox +// leave blank if draft messages should not be stored +// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP) +$rcmail_config['drafts_mbox'] = 'Drafts'; + +// store spam messages in this mailbox +// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP) +$rcmail_config['junk_mbox'] = 'Spam'; + +// store sent message is this mailbox +// leave blank if sent messages should not be stored +// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP) +$rcmail_config['sent_mbox'] = 'Sent'; + +// move messages to this folder when deleting them +// leave blank if they should be deleted directly +// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP) +$rcmail_config['trash_mbox'] = 'Trash'; + +// display these folders separately in the mailbox list. +// these folders will also be displayed with localized names +// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP) +$rcmail_config['default_folders'] = array('INBOX', 'Drafts', 'Sent', 'Spam', 'Trash'); +$rcmail_config['default_imap_folders'] = array('INBOX', 'Drafts', 'Sent', 'Spam', 'Trash'); + +// automatically create the above listed default folders on first login +$rcmail_config['create_default_folders'] = true; + +// protect the default folders from renames, deletes, and subscription changes +$rcmail_config['protect_default_folders'] = true; + +// if in your system 0 quota means no limit set this option to true +$rcmail_config['quota_zero_as_unlimited'] = false; + +// Make use of the built-in spell checker. It is based on GoogieSpell. +// Since Google only accepts connections over https your PHP installatation +// requires to be compiled with Open SSL support +$rcmail_config['enable_spellcheck'] = true; + +// Enables spellchecker exceptions dictionary. +// Setting it to 'shared' will make the dictionary shared by all users. +$rcmail_config['spellcheck_dictionary'] = false; + +// Set the spell checking engine. 'googie' is the default. 'pspell' is also available, +// but requires the Pspell extensions. When using Nox Spell Server, also set 'googie' here. +$rcmail_config['spellcheck_engine'] = 'googie'; + +// For a locally installed Nox Spell Server, please specify the URI to call it. +// Get Nox Spell Server from http://orangoo.com/labs/?page_id=72 +// Leave empty to use the Google spell checking service, what means +// that the message content will be sent to Google in order to check spelling +$rcmail_config['spellcheck_uri'] = ''; + +// These languages can be selected for spell checking. +// Configure as a PHP style hash array: array('en'=>'English', 'de'=>'Deutsch'); +// Leave empty for default set of available language. +$rcmail_config['spellcheck_languages'] = NULL; + +// Makes that words with all letters capitalized will be ignored (e.g. GOOGLE) +$rcmail_config['spellcheck_ignore_caps'] = false; + +// Makes that words with numbers will be ignored (e.g. g00gle) +$rcmail_config['spellcheck_ignore_nums'] = false; + +// Makes that words with symbols will be ignored (e.g. g@@gle) +$rcmail_config['spellcheck_ignore_syms'] = false; + +// Use this char/string to separate recipients when composing a new message +$rcmail_config['recipients_separator'] = ','; + +// don't let users set pagesize to more than this value if set +$rcmail_config['max_pagesize'] = 200; + +// Minimal value of user's 'keep_alive' setting (in seconds) +// Must be less than 'session_lifetime' +$rcmail_config['min_keep_alive'] = 60; + +// Enables files upload indicator. Requires APC installed and enabled apc.rfc1867 option. +// By default refresh time is set to 1 second. You can set this value to true +// or any integer value indicating number of seconds. +$rcmail_config['upload_progress'] = false; + +// Specifies for how many seconds the Undo button will be available +// after object delete action. Currently used with supporting address book sources. +// Setting it to 0, disables the feature. +$rcmail_config['undo_timeout'] = 0; + +// ---------------------------------- +// ADDRESSBOOK SETTINGS +// ---------------------------------- + +// This indicates which type of address book to use. Possible choises: +// 'sql' (default) and 'ldap'. +// If set to 'ldap' then it will look at using the first writable LDAP +// address book as the primary address book and it will not display the +// SQL address book in the 'Address Book' view. +$rcmail_config['address_book_type'] = 'sql'; + +// In order to enable public ldap search, configure an array like the Verisign +// example further below. if you would like to test, simply uncomment the example. +// Array key must contain only safe characters, ie. a-zA-Z0-9_ +$rcmail_config['ldap_public'] = array(); + +// If you are going to use LDAP for individual address books, you will need to +// set 'user_specific' to true and use the variables to generate the appropriate DNs to access it. +// +// The recommended directory structure for LDAP is to store all the address book entries +// under the users main entry, e.g.: +// +// o=root +// ou=people +// uid=user@domain +// mail=contact@contactdomain +// +// So the base_dn would be uid=%fu,ou=people,o=root +// The bind_dn would be the same as based_dn or some super user login. +/* + * example config for Verisign directory + * +$rcmail_config['ldap_public']['Verisign'] = array( + 'name' => 'Verisign.com', + // Replacement variables supported in host names: + // %h - user's IMAP hostname + // %n - http hostname ($_SERVER['SERVER_NAME']) + // %d - domain (http hostname without the first part) + // %z - IMAP domain (IMAP hostname without the first part) + // For example %n = mail.domain.tld, %d = domain.tld + 'hosts' => array('directory.verisign.com'), + 'port' => 389, + 'use_tls' => false, + 'ldap_version' => 3, // using LDAPv3 + 'user_specific' => false, // If true the base_dn, bind_dn and bind_pass default to the user's IMAP login. + // %fu - The full username provided, assumes the username is an email + // address, uses the username_domain value if not an email address. + // %u - The username prior to the '@'. + // %d - The domain name after the '@'. + // %dc - The domain name hierarchal string e.g. "dc=test,dc=domain,dc=com" + // %dn - DN found by ldap search when search_filter/search_base_dn are used + 'base_dn' => '', + 'bind_dn' => '', + 'bind_pass' => '', + // It's possible to bind for an individual address book + // The login name is used to search for the DN to bind with + 'search_base_dn' => '', + 'search_filter' => '', // e.g. '(&(objectClass=posixAccount)(uid=%u))' + // DN and password to bind as before searching for bind DN, if anonymous search is not allowed + 'search_bind_dn' => '', + 'search_bind_pw' => '', + // Default for %dn variable if search doesn't return DN value + 'search_dn_default' => '', + // Optional authentication identifier to be used as SASL authorization proxy + // bind_dn need to be empty + 'auth_cid' => '', + // SASL authentication method (for proxy auth), e.g. DIGEST-MD5 + 'auth_method' => '', + // Indicates if the addressbook shall be hidden from the list. + // With this option enabled you can still search/view contacts. + 'hidden' => false, + // Indicates if the addressbook shall not list contacts but only allows searching. + 'searchonly' => false, + // Indicates if we can write to the LDAP directory or not. + // If writable is true then these fields need to be populated: + // LDAP_Object_Classes, required_fields, LDAP_rdn + 'writable' => false, + // To create a new contact these are the object classes to specify + // (or any other classes you wish to use). + 'LDAP_Object_Classes' => array('top', 'inetOrgPerson'), + // The RDN field that is used for new entries, this field needs + // to be one of the search_fields, the base of base_dn is appended + // to the RDN to insert into the LDAP directory. + 'LDAP_rdn' => 'cn', + // The required fields needed to build a new contact as required by + // the object classes (can include additional fields not required by the object classes). + 'required_fields' => array('cn', 'sn', 'mail'), + 'search_fields' => array('mail', 'cn'), // fields to search in + // mapping of contact fields to directory attributes + // for every attribute one can specify the number of values (limit) allowed. + // default is 1, a wildcard * means unlimited + 'fieldmap' => array( + // Roundcube => LDAP:limit + 'name' => 'cn', + 'surname' => 'sn', + 'firstname' => 'givenName', + 'title' => 'title', + 'email' => 'mail:*', + 'phone:home' => 'homePhone', + 'phone:work' => 'telephoneNumber', + 'phone:mobile' => 'mobile', + 'phone:pager' => 'pager', + 'street' => 'street', + 'zipcode' => 'postalCode', + 'region' => 'st', + 'locality' => 'l', +// if you uncomment country, you need to modify 'sub_fields' above +// 'country' => 'c', + 'department' => 'departmentNumber', + 'notes' => 'description', +// these currently don't work: +// 'phone:workfax' => 'facsimileTelephoneNumber', +// 'photo' => 'jpegPhoto', +// 'organization' => 'o', +// 'manager' => 'manager', +// 'assistant' => 'secretary', + ), + // Map of contact sub-objects (attribute name => objectClass(es)), e.g. 'c' => 'country' + 'sub_fields' => array(), + 'sort' => 'cn', // The field to sort the listing by. + 'scope' => 'sub', // search mode: sub|base|list + 'filter' => '(objectClass=inetOrgPerson)', // used for basic listing (if not empty) and will be &'d with search queries. example: status=act + 'fuzzy_search' => true, // server allows wildcard search + 'vlv' => false, // Enable Virtual List View to more efficiently fetch paginated data (if server supports it) + 'numsub_filter' => '(objectClass=organizationalUnit)', // with VLV, we also use numSubOrdinates to query the total number of records. Set this filter to get all numSubOrdinates attributes for counting + 'sizelimit' => '0', // Enables you to limit the count of entries fetched. Setting this to 0 means no limit. + 'timelimit' => '0', // Sets the number of seconds how long is spend on the search. Setting this to 0 means no limit. + 'referrals' => true|false, // Sets the LDAP_OPT_REFERRALS option. Mostly used in multi-domain Active Directory setups + + // definition for contact groups (uncomment if no groups are supported) + // for the groups base_dn, the user replacements %fu, %u, $d and %dc work as for base_dn (see above) + // if the groups base_dn is empty, the contact base_dn is used for the groups as well + // -> in this case, assure that groups and contacts are separated due to the concernig filters! + 'groups' => array( + 'base_dn' => '', + 'scope' => 'sub', // search mode: sub|base|list + 'filter' => '(objectClass=groupOfNames)', + 'object_classes' => array("top", "groupOfNames"), + 'member_attr' => 'member', // name of the member attribute, e.g. uniqueMember + 'name_attr' => 'cn', // attribute to be used as group name + ), +); +*/ + +// An ordered array of the ids of the addressbooks that should be searched +// when populating address autocomplete fields server-side. ex: array('sql','Verisign'); +$rcmail_config['autocomplete_addressbooks'] = array('sql'); + +// The minimum number of characters required to be typed in an autocomplete field +// before address books will be searched. Most useful for LDAP directories that +// may need to do lengthy results building given overly-broad searches +$rcmail_config['autocomplete_min_length'] = 1; + +// Number of parallel autocomplete requests. +// If there's more than one address book, n parallel (async) requests will be created, +// where each request will search in one address book. By default (0), all address +// books are searched in one request. +$rcmail_config['autocomplete_threads'] = 0; + +// Max. numer of entries in autocomplete popup. Default: 15. +$rcmail_config['autocomplete_max'] = 15; + +// show address fields in this order +// available placeholders: {street}, {locality}, {zipcode}, {country}, {region} +$rcmail_config['address_template'] = '{street}
        {locality} {zipcode}
        {country} {region}'; + +// Matching mode for addressbook search (including autocompletion) +// 0 - partial (*abc*), default +// 1 - strict (abc) +// 2 - prefix (abc*) +// Note: For LDAP sources fuzzy_search must be enabled to use 'partial' or 'prefix' mode +$rcmail_config['addressbook_search_mode'] = 0; + +// ---------------------------------- +// USER PREFERENCES +// ---------------------------------- + +// Use this charset as fallback for message decoding +//$rcmail_config['default_charset'] = 'ISO-8859-1'; +$rcmail_config['default_charset'] = 'UTF-8'; + +// skin name: folder from skins/ +$rcmail_config['skin'] = 'larry'; + +// show up to X items in messages list view +$rcmail_config['mail_pagesize'] = 50; + +// show up to X items in contacts list view +$rcmail_config['addressbook_pagesize'] = 50; + +// sort contacts by this col (preferably either one of name, firstname, surname) +$rcmail_config['addressbook_sort_col'] = 'surname'; + +// the way how contact names are displayed in the list +// 0: display name +// 1: (prefix) firstname middlename surname (suffix) +// 2: (prefix) surname firstname middlename (suffix) +// 3: (prefix) surname, firstname middlename (suffix) +$rcmail_config['addressbook_name_listing'] = 0; + +// use this timezone to display date/time +// valid timezone identifers are listed here: php.net/manual/en/timezones.php +// 'auto' will use the browser's timezone settings +$rcmail_config['timezone'] = 'auto'; + +// prefer displaying HTML messages +$rcmail_config['prefer_html'] = true; + +// display remote inline images +// 0 - Never, always ask +// 1 - Ask if sender is not in address book +// 2 - Always show inline images +$rcmail_config['show_images'] = 0; + +// compose html formatted messages by default +// 0 - never, 1 - always, 2 - on reply to HTML message only +$rcmail_config['htmleditor'] = 0; + +// show pretty dates as standard +$rcmail_config['prettydate'] = true; + +// save compose message every 300 seconds (5min) +$rcmail_config['draft_autosave'] = 300; + +// default setting if preview pane is enabled +$rcmail_config['preview_pane'] = false; + +// Mark as read when viewed in preview pane (delay in seconds) +// Set to -1 if messages in preview pane should not be marked as read +$rcmail_config['preview_pane_mark_read'] = 0; + +// Clear Trash on logout +$rcmail_config['logout_purge'] = false; + +// Compact INBOX on logout +$rcmail_config['logout_expunge'] = false; + +// Display attached images below the message body +$rcmail_config['inline_images'] = true; + +// Encoding of long/non-ascii attachment names: +// 0 - Full RFC 2231 compatible +// 1 - RFC 2047 for 'name' and RFC 2231 for 'filename' parameter (Thunderbird's default) +// 2 - Full 2047 compatible +$rcmail_config['mime_param_folding'] = 1; + +// Set true if deleted messages should not be displayed +// This will make the application run slower +$rcmail_config['skip_deleted'] = false; + +// Set true to Mark deleted messages as read as well as deleted +// False means that a message's read status is not affected by marking it as deleted +$rcmail_config['read_when_deleted'] = true; + +// Set to true to never delete messages immediately +// Use 'Purge' to remove messages marked as deleted +$rcmail_config['flag_for_deletion'] = false; + +// Default interval for keep-alive/check-recent requests (in seconds) +// Must be greater than or equal to 'min_keep_alive' and less than 'session_lifetime' +$rcmail_config['keep_alive'] = 60; + +// If true all folders will be checked for recent messages +$rcmail_config['check_all_folders'] = false; + +// If true, after message delete/move, the next message will be displayed +$rcmail_config['display_next'] = false; + +// 0 - Do not expand threads +// 1 - Expand all threads automatically +// 2 - Expand only threads with unread messages +$rcmail_config['autoexpand_threads'] = 0; + +// When replying place cursor above original message (top posting) +$rcmail_config['top_posting'] = false; + +// When replying strip original signature from message +$rcmail_config['strip_existing_sig'] = true; + +// Show signature: +// 0 - Never +// 1 - Always +// 2 - New messages only +// 3 - Forwards and Replies only +$rcmail_config['show_sig'] = 1; + +// When replying or forwarding place sender's signature above existing message +$rcmail_config['sig_above'] = false; + +// Use MIME encoding (quoted-printable) for 8bit characters in message body +$rcmail_config['force_7bit'] = false; + +// Defaults of the search field configuration. +// The array can contain a per-folder list of header fields which should be considered when searching +// The entry with key '*' stands for all folders which do not have a specific list set. +// Please note that folder names should to be in sync with $rcmail_config['default_folders'] +$rcmail_config['search_mods'] = null; // Example: array('*' => array('subject'=>1, 'from'=>1), 'Sent' => array('subject'=>1, 'to'=>1)); + +// Defaults of the addressbook search field configuration. +$rcmail_config['addressbook_search_mods'] = null; // Example: array('name'=>1, 'firstname'=>1, 'surname'=>1, 'email'=>1, '*'=>1); + +// 'Delete always' +// This setting reflects if mail should be always deleted +// when moving to Trash fails. This is necessary in some setups +// when user is over quota and Trash is included in the quota. +$rcmail_config['delete_always'] = false; + +// Directly delete messages in Junk instead of moving to Trash +$rcmail_config['delete_junk'] = true; + +// Behavior if a received message requests a message delivery notification (read receipt) +// 0 = ask the user, 1 = send automatically, 2 = ignore (never send or ask) +// 3 = send automatically if sender is in addressbook, otherwise ask the user +// 4 = send automatically if sender is in addressbook, otherwise ignore +$rcmail_config['mdn_requests'] = 0; + +// Return receipt checkbox default state +$rcmail_config['mdn_default'] = 0; + +// Delivery Status Notification checkbox default state +$rcmail_config['dsn_default'] = 0; + +// Place replies in the folder of the message being replied to +$rcmail_config['reply_same_folder'] = false; + +// Sets default mode of Forward feature to "forward as attachment" +$rcmail_config['forward_attachment'] = false; + +// Defines address book (internal index) to which new contacts will be added +// By default it is the first writeable addressbook. +// Note: Use '0' for built-in address book. +$rcmail_config['default_addressbook'] = null; + +// Enables spell checking before sending a message. +$rcmail_config['spellcheck_before_send'] = false; + +// Skip alternative email addresses in autocompletion (show one address per contact) +$rcmail_config['autocomplete_single'] = false; + +// Default font for composed HTML message. +// Supported values: Andale Mono, Arial, Arial Black, Book Antiqua, Courier New, +// Georgia, Helvetica, Impact, Tahoma, Terminal, Times New Roman, Trebuchet MS, Verdana +$rcmail_config['default_font'] = ''; + +// end of config file diff --git a/install/ubuntu/14.10/roundcube/vesta.php b/install/ubuntu/14.10/roundcube/vesta.php new file mode 100644 index 000000000..8fb202a44 --- /dev/null +++ b/install/ubuntu/14.10/roundcube/vesta.php @@ -0,0 +1,62 @@ + + */ + + function password_save($curpass, $passwd) + { + $rcmail = rcmail::get_instance(); + $vesta_host = $rcmail->config->get('password_vesta_host'); + + if (empty($vesta_host)) + { + $vesta_host = 'localhost'; + } + + $vesta_port = $rcmail->config->get('password_vesta_port'); + if (empty($vesta_port)) + { + $vesta_port = '8083'; + } + + $postvars = array( + 'email' => $_SESSION['username'], + 'password' => $curpass, + 'new' => $passwd + ); + + $postdata = http_build_query($postvars); + + $send = 'POST /reset/mail/ HTTP/1.1' . PHP_EOL; + $send .= 'Host: ' . $vesta_host . PHP_EOL; + $send .= 'User-Agent: PHP Script' . PHP_EOL; + $send .= 'Content-length: ' . strlen($postdata) . PHP_EOL; + $send .= 'Content-type: application/x-www-form-urlencoded' . PHP_EOL; + $send .= 'Connection: close' . PHP_EOL; + $send .= PHP_EOL; + $send .= $postdata . PHP_EOL . PHP_EOL; + + $fp = fsockopen('ssl://' . $vesta_host, $vesta_port); + fputs($fp, $send); + $result = fread($fp, 2048); + fclose($fp); + + $fp = fopen("/tmp/roundcube.log", 'w'); + fwrite($fp, "test ok"); + fwrite($fp, "\n"); + fclose($fp); + + + if(strpos($result, 'ok') && !strpos($result, 'error')) + { + return PASSWORD_SUCCESS; + } + else { + return PASSWORD_ERROR; + } + + } diff --git a/install/ubuntu/14.10/sudo/admin b/install/ubuntu/14.10/sudo/admin new file mode 100644 index 000000000..47e16098c --- /dev/null +++ b/install/ubuntu/14.10/sudo/admin @@ -0,0 +1,7 @@ +# Created by vesta installer +Defaults env_keep="VESTA" +Defaults:admin !syslog +Defaults:admin !requiretty + +admin ALL=(ALL) ALL +admin ALL=NOPASSWD:/usr/local/vesta/bin/* diff --git a/install/ubuntu/14.10/templates.tar.gz b/install/ubuntu/14.10/templates.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..ce385d269736561780cb42d07b447572cebc7831 GIT binary patch literal 12935 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 + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %sdocroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + #SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + AllowOverride All + SSLRequireSSL + Options +Includes -Indexes +ExecCGI + php_admin_value open_basedir %docroot% + + + AllowOverride All + + SSLEngine on + SSLVerifyClient none + SSLCertificateFile %ssl_crt% + SSLCertificateKeyFile %ssl_key% + %ssl_ca_str%SSLCertificateChainFile %ssl_ca% + + + RMode config + RUidGid %user% %group% + RGroups www-data + + + AssignUserID %user% %group% + + + IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* + + + diff --git a/install/ubuntu/14.10/templates/web/apache2/basedir.tpl b/install/ubuntu/14.10/templates/web/apache2/basedir.tpl new file mode 100755 index 000000000..75daf0e10 --- /dev/null +++ b/install/ubuntu/14.10/templates/web/apache2/basedir.tpl @@ -0,0 +1,35 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %docroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + #SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + AllowOverride All + Options +Includes -Indexes +ExecCGI + php_admin_value open_basedir %docroot% + + + AllowOverride All + + + + RMode config + RUidGid %user% %group% + RGroups www-data + + + AssignUserID %user% %group% + + + IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + + + diff --git a/install/ubuntu/14.10/templates/web/apache2/default.stpl b/install/ubuntu/14.10/templates/web/apache2/default.stpl new file mode 100755 index 000000000..e884a95b9 --- /dev/null +++ b/install/ubuntu/14.10/templates/web/apache2/default.stpl @@ -0,0 +1,40 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %sdocroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + #SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + AllowOverride All + SSLRequireSSL + Options +Includes -Indexes +ExecCGI + + + AllowOverride All + + SSLEngine on + SSLVerifyClient none + SSLCertificateFile %ssl_crt% + SSLCertificateKeyFile %ssl_key% + %ssl_ca_str%SSLCertificateChainFile %ssl_ca% + + + RMode config + RUidGid %user% %group% + RGroups www-data + + + AssignUserID %user% %group% + + + IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* + + + diff --git a/install/ubuntu/14.10/templates/web/apache2/default.tpl b/install/ubuntu/14.10/templates/web/apache2/default.tpl new file mode 100755 index 000000000..073724ce0 --- /dev/null +++ b/install/ubuntu/14.10/templates/web/apache2/default.tpl @@ -0,0 +1,34 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %docroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + #SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + AllowOverride All + Options +Includes -Indexes +ExecCGI + + + AllowOverride All + + + + RMode config + RUidGid %user% %group% + RGroups www-data + + + AssignUserID %user% %group% + + + IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + + + diff --git a/install/ubuntu/14.10/templates/web/apache2/hosting.stpl b/install/ubuntu/14.10/templates/web/apache2/hosting.stpl new file mode 100755 index 000000000..7a5d7787f --- /dev/null +++ b/install/ubuntu/14.10/templates/web/apache2/hosting.stpl @@ -0,0 +1,49 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %sdocroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + #SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + AllowOverride All + SSLRequireSSL + Options +Includes -Indexes +ExecCGI + php_admin_value upload_tmp_dir %home%/%user%/tmp + php_admin_value upload_max_filesize 10M + php_admin_value max_execution_time 20 + php_admin_value post_max_size 8M + php_admin_value memory_limit 32M + php_admin_flag mysql.allow_persistent off + php_admin_flag safe_mode off + php_admin_value session.save_path %home%/%user%/tmp + php_admin_value sendmail_path '/usr/sbin/sendmail -t -i -f %email%' + + + AllowOverride All + + php_admin_value open_basedir %home%/%user%/web:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpMyAdmin:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcubemail:/etc/roundcube:/var/lib/roundcube + SSLEngine on + SSLVerifyClient none + SSLCertificateFile %ssl_crt% + SSLCertificateKeyFile %ssl_key% + %ssl_ca_str%SSLCertificateChainFile %ssl_ca% + + RMode config + RUidGid %user% %group% + RGroups www-data + + + AssignUserID %user% %group% + + + IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* + + + diff --git a/install/ubuntu/14.10/templates/web/apache2/hosting.tpl b/install/ubuntu/14.10/templates/web/apache2/hosting.tpl new file mode 100755 index 000000000..ab844dc74 --- /dev/null +++ b/install/ubuntu/14.10/templates/web/apache2/hosting.tpl @@ -0,0 +1,43 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %docroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + #SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + AllowOverride All + Options +Includes -Indexes +ExecCGI + php_admin_value upload_tmp_dir %home%/%user%/tmp + php_admin_value upload_max_filesize 10M + php_admin_value max_execution_time 20 + php_admin_value post_max_size 8M + php_admin_value memory_limit 32M + php_admin_flag mysql.allow_persistent off + php_admin_flag safe_mode off + php_admin_value session.save_path %home%/%user%/tmp + php_admin_value sendmail_path '/usr/sbin/sendmail -t -i -f %email%' + + + AllowOverride All + + php_admin_value open_basedir %home%/%user%/web:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpMyAdmin:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcubemail:/etc/roundcube:/var/lib/roundcube + + RMode config + RUidGid %user% %group% + RGroups www-data + + + AssignUserID %user% %group% + + + IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + + + diff --git a/install/ubuntu/14.10/templates/web/apache2/phpcgi.sh b/install/ubuntu/14.10/templates/web/apache2/phpcgi.sh new file mode 100755 index 000000000..6565e103d --- /dev/null +++ b/install/ubuntu/14.10/templates/web/apache2/phpcgi.sh @@ -0,0 +1,16 @@ +#!/bin/bash +# Adding php wrapper +user="$1" +domain="$2" +ip="$3" +home_dir="$4" +docroot="$5" + +wrapper_script='#!/usr/bin/php-cgi -cphp5-cgi.ini' +wrapper_file="$home_dir/$user/web/$domain/cgi-bin/php" + +echo "$wrapper_script" > $wrapper_file +chown $user:$user $wrapper_file +chmod -f 751 $wrapper_file + +exit 0 diff --git a/install/ubuntu/14.10/templates/web/apache2/phpcgi.stpl b/install/ubuntu/14.10/templates/web/apache2/phpcgi.stpl new file mode 100755 index 000000000..aa5137308 --- /dev/null +++ b/install/ubuntu/14.10/templates/web/apache2/phpcgi.stpl @@ -0,0 +1,35 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %sdocroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + SSLRequireSSL + AllowOverride All + Options +Includes -Indexes +ExecCGI + Action phpcgi-script /cgi-bin/php + + SetHandler phpcgi-script + + + + AllowOverride All + + SSLEngine on + SSLVerifyClient none + SSLCertificateFile %ssl_crt% + SSLCertificateKeyFile %ssl_key% + %ssl_ca_str%SSLCertificateChainFile %ssl_ca% + + IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* + + + diff --git a/install/ubuntu/14.10/templates/web/apache2/phpcgi.tpl b/install/ubuntu/14.10/templates/web/apache2/phpcgi.tpl new file mode 100755 index 000000000..a05ff252d --- /dev/null +++ b/install/ubuntu/14.10/templates/web/apache2/phpcgi.tpl @@ -0,0 +1,28 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %docroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + AllowOverride All + Options +Includes -Indexes +ExecCGI + Action phpcgi-script /cgi-bin/php + + SetHandler phpcgi-script + + + + AllowOverride All + + IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + + + diff --git a/install/ubuntu/14.10/templates/web/apache2/phpfcgid.sh b/install/ubuntu/14.10/templates/web/apache2/phpfcgid.sh new file mode 100755 index 000000000..e80582492 --- /dev/null +++ b/install/ubuntu/14.10/templates/web/apache2/phpfcgid.sh @@ -0,0 +1,22 @@ +#!/bin/bash +# Adding php wrapper +user="$1" +domain="$2" +ip="$3" +home_dir="$4" +docroot="$5" + +wrapper_script="#!/bin/sh +PHPRC=/usr/local/lib +export PHPRC +export PHP_FCGI_MAX_REQUESTS=1000 +export PHP_FCGI_CHILDREN=20 +exec /usr/bin/php-cgi +" +wrapper_file="$home_dir/$user/web/$domain/cgi-bin/fcgi-starter" + +echo "$wrapper_script" > $wrapper_file +chown $user:$user $wrapper_file +chmod -f 751 $wrapper_file + +exit 0 diff --git a/install/ubuntu/14.10/templates/web/apache2/phpfcgid.stpl b/install/ubuntu/14.10/templates/web/apache2/phpfcgid.stpl new file mode 100755 index 000000000..622495756 --- /dev/null +++ b/install/ubuntu/14.10/templates/web/apache2/phpfcgid.stpl @@ -0,0 +1,36 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %sdocroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + SSLRequireSSL + AllowOverride All + Options +Includes -Indexes +ExecCGI + + SetHandler fcgid-script + + FCGIWrapper %home%/%user%/web/%domain%/cgi-bin/fcgi-starter .php + + + AllowOverride All + + php_admin_value open_basedir none + SSLEngine on + SSLVerifyClient none + SSLCertificateFile %ssl_crt% + SSLCertificateKeyFile %ssl_key% + %ssl_ca_str%SSLCertificateChainFile %ssl_ca% + + IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* + + + diff --git a/install/ubuntu/14.10/templates/web/apache2/phpfcgid.tpl b/install/ubuntu/14.10/templates/web/apache2/phpfcgid.tpl new file mode 100755 index 000000000..5c1f16e20 --- /dev/null +++ b/install/ubuntu/14.10/templates/web/apache2/phpfcgid.tpl @@ -0,0 +1,28 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %docroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + AllowOverride All + Options +Includes -Indexes +ExecCGI + + SetHandler fcgid-script + + FCGIWrapper %home%/%user%/web/%domain%/cgi-bin/fcgi-starter .php + + + AllowOverride All + + IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + + + diff --git a/install/ubuntu/14.10/templates/web/awstats/awstats.tpl b/install/ubuntu/14.10/templates/web/awstats/awstats.tpl new file mode 100755 index 000000000..9a92e0fd4 --- /dev/null +++ b/install/ubuntu/14.10/templates/web/awstats/awstats.tpl @@ -0,0 +1,133 @@ +LogFile="/var/log/%web_system%/domains/%domain%.log" +LogType=W +LogFormat=1 +LogSeparator=" " +SiteDomain="%domain_idn%" +HostAliases="%alias_idn%" +DirData="%home%/%user%/web/%domain%/stats" +DirCgi="/vstats" +DirIcons="/vstats/icon" +AllowToUpdateStatsFromBrowser=0 +AllowFullYearView=2 +EnableLockForUpdate=1 +DNSStaticCacheFile="dnscache.txt" +DNSLastUpdateCacheFile="dnscachelastupdate.txt" +SkipDNSLookupFor="" +AllowAccessFromWebToAuthenticatedUsersOnly=0 +AllowAccessFromWebToFollowingAuthenticatedUsers="" +AllowAccessFromWebToFollowingIPAddresses="" +CreateDirDataIfNotExists=0 +BuildHistoryFormat=text +BuildReportFormat=html +SaveDatabaseFilesWithPermissionsForEveryone=0 +PurgeLogFile=0 +ArchiveLogRecords=0 +KeepBackupOfHistoricFiles=1 +DefaultFile="index.php index.html" +SkipHosts="127.0.0.1 +SkipUserAgents="" +SkipFiles="" +SkipReferrersBlackList="" +OnlyHosts="" +OnlyUserAgents="" +OnlyUsers="" +OnlyFiles="" +NotPageList="css js class gif jpg jpeg png bmp ico rss xml swf" +ValidHTTPCodes="200 304" +ValidSMTPCodes="1 250" +AuthenticatedUsersNotCaseSensitive=0 +URLNotCaseSensitive=0 +URLWithAnchor=0 +URLQuerySeparators="?;" +URLWithQuery=0 +URLWithQueryWithOnlyFollowingParameters="" +URLWithQueryWithoutFollowingParameters="" +URLReferrerWithQuery=0 +WarningMessages=1 +ErrorMessages="" +DebugMessages=0 +NbOfLinesForCorruptedLog=50 +WrapperScript="" +DecodeUA=0 +MiscTrackerUrl="/js/awstats_misc_tracker.js" +UseFramesWhenCGI=1 +DetailedReportsOnNewWindows=1 +Expires=3600 +MaxRowsInHTMLOutput=1000 +Lang="auto" +DirLang="./lang" +ShowMenu=1 +ShowSummary=UVPHB +ShowMonthStats=UVPHB +ShowDaysOfMonthStats=VPHB +ShowDaysOfWeekStats=PHB +ShowHoursStats=PHB +ShowDomainsStats=PHB +ShowHostsStats=PHBL +ShowAuthenticatedUsers=0 +ShowRobotsStats=HBL +ShowWormsStats=0 +ShowEMailSenders=0 +ShowEMailReceivers=0 +ShowSessionsStats=1 +ShowPagesStats=PBEX +ShowFileTypesStats=HB +ShowFileSizesStats=0 +ShowDownloadsStats=HB +ShowOSStats=1 +ShowBrowsersStats=1 +ShowScreenSizeStats=0 +ShowOriginStats=PH +ShowKeyphrasesStats=1 +ShowKeywordsStats=1 +ShowMiscStats=a +ShowHTTPErrorsStats=1 +ShowSMTPErrorsStats=0 +ShowClusterStats=0 +AddDataArrayMonthStats=1 +AddDataArrayShowDaysOfMonthStats=1 +AddDataArrayShowDaysOfWeekStats=1 +AddDataArrayShowHoursStats=1 +IncludeInternalLinksInOriginSection=0 +MaxNbOfDomain = 10 +MinHitDomain = 1 +MaxNbOfHostsShown = 10 +MinHitHost = 1 +MaxNbOfLoginShown = 10 +MinHitLogin = 1 +MaxNbOfRobotShown = 10 +MinHitRobot = 1 +MaxNbOfDownloadsShown = 10 +MinHitDownloads = 1 +MaxNbOfPageShown = 10 +MinHitFile = 1 +MaxNbOfOsShown = 10 +MinHitOs = 1 +MaxNbOfBrowsersShown = 10 +MinHitBrowser = 1 +MaxNbOfScreenSizesShown = 5 +MinHitScreenSize = 1 +MaxNbOfWindowSizesShown = 5 +MinHitWindowSize = 1 +MaxNbOfRefererShown = 10 +MinHitRefer = 1 +MaxNbOfKeyphrasesShown = 10 +MinHitKeyphrase = 1 +MaxNbOfKeywordsShown = 10 +MinHitKeyword = 1 +MaxNbOfEMailsShown = 20 +MinHitEMail = 1 +FirstDayOfWeek=0 +ShowFlagLinks="" +ShowLinksOnUrl=1 +UseHTTPSLinkForUrl="" +MaxLengthOfShownURL=64 +HTMLHeadSection="" +HTMLEndSection="" +MetaRobot=0 +Logo="awstats_logo6.png" +LogoLink="http://awstats.sourceforge.net" +BarWidth = 260 +BarHeight = 90 +StyleSheet="" +ExtraTrackedRowsLimit=500 diff --git a/install/ubuntu/14.10/templates/web/awstats/index.tpl b/install/ubuntu/14.10/templates/web/awstats/index.tpl new file mode 100755 index 000000000..9df9bb5cb --- /dev/null +++ b/install/ubuntu/14.10/templates/web/awstats/index.tpl @@ -0,0 +1,10 @@ + + + + Awstats log analyzer + + + + + + diff --git a/install/ubuntu/14.10/templates/web/awstats/nav.tpl b/install/ubuntu/14.10/templates/web/awstats/nav.tpl new file mode 100755 index 000000000..f29bed68b --- /dev/null +++ b/install/ubuntu/14.10/templates/web/awstats/nav.tpl @@ -0,0 +1,23 @@ + + + Awstats navigation + + + + + + + + +
        vesta
        + +
        +
        + + diff --git a/install/ubuntu/14.10/templates/web/nginx/caching.sh b/install/ubuntu/14.10/templates/web/nginx/caching.sh new file mode 100755 index 000000000..6eb9126db --- /dev/null +++ b/install/ubuntu/14.10/templates/web/nginx/caching.sh @@ -0,0 +1,12 @@ +#!/bin/bash + +user=$1 +domain=$2 +ip=$3 +home=$4 +docroot=$5 + +str="proxy_cache_path /var/cache/nginx/$domain levels=2" +str="$str keys_zone=$domain:10m inactive=60m max_size=512m;" +echo "$str" >> /etc/nginx/conf.d/01_caching_pool.conf + diff --git a/install/ubuntu/14.10/templates/web/nginx/caching.stpl b/install/ubuntu/14.10/templates/web/nginx/caching.stpl new file mode 100755 index 000000000..ca6cffe32 --- /dev/null +++ b/install/ubuntu/14.10/templates/web/nginx/caching.stpl @@ -0,0 +1,44 @@ +server { + listen %ip%:%proxy_ssl_port%; + server_name %domain_idn% %alias_idn%; + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + error_log /var/log/%web_system%/domains/%domain%.error.log error; + + location / { + proxy_pass http://%ip%:%web_port%; + + proxy_cache cache; + proxy_cache_valid 15m; + proxy_cache_valid 404 1m; + proxy_no_cache $no_cache; + proxy_cache_bypass $no_cache; + proxy_cache_bypass $cookie_session $http_x_update; + + location ~* ^.+\.(%proxy_extentions%)$ { + proxy_cache off; + root %docroot%; + access_log /var/log/%web_system%/domains/%domain%.log combined; + access_log /var/log/%web_system%/domains/%domain%.bytes bytes; + expires max; + try_files $uri @fallback; + } + } + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location @fallback { + proxy_pass http://%ip%:%web_port%; + } + + location ~ /\.ht {return 404;} + location ~ /\.svn/ {return 404;} + location ~ /\.git/ {return 404;} + location ~ /\.hg/ {return 404;} + location ~ /\.bzr/ {return 404;} + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/14.10/templates/web/nginx/caching.tpl b/install/ubuntu/14.10/templates/web/nginx/caching.tpl new file mode 100755 index 000000000..36761b65c --- /dev/null +++ b/install/ubuntu/14.10/templates/web/nginx/caching.tpl @@ -0,0 +1,41 @@ +server { + listen %ip%:%proxy_port%; + server_name %domain_idn% %alias_idn%; + error_log /var/log/%web_system%/domains/%domain%.error.log error; + + location / { + proxy_pass http://%ip%:%web_port%; + + proxy_cache cache; + proxy_cache_valid 15m; + proxy_cache_valid 404 1m; + proxy_no_cache $no_cache; + proxy_cache_bypass $no_cache; + proxy_cache_bypass $cookie_session $http_x_update; + + location ~* ^.+\.(%proxy_extentions%)$ { + proxy_cache off; + root %docroot%; + access_log /var/log/%web_system%/domains/%domain%.log combined; + access_log /var/log/%web_system%/domains/%domain%.bytes bytes; + expires max; + try_files $uri @fallback; + } + } + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location @fallback { + proxy_pass http://%ip%:%web_port%; + } + + location ~ /\.ht {return 404;} + location ~ /\.svn/ {return 404;} + location ~ /\.git/ {return 404;} + location ~ /\.hg/ {return 404;} + location ~ /\.bzr/ {return 404;} + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/14.10/templates/web/nginx/default.stpl b/install/ubuntu/14.10/templates/web/nginx/default.stpl new file mode 100755 index 000000000..fa5380606 --- /dev/null +++ b/install/ubuntu/14.10/templates/web/nginx/default.stpl @@ -0,0 +1,36 @@ +server { + listen %ip%:%proxy_ssl_port%; + server_name %domain_idn% %alias_idn%; + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + error_log /var/log/%web_system%/domains/%domain%.error.log error; + + location / { + proxy_pass https://%ip%:%web_ssl_port%; + location ~* ^.+\.(%proxy_extentions%)$ { + root %sdocroot%; + access_log /var/log/%web_system%/domains/%domain%.log combined; + access_log /var/log/%web_system%/domains/%domain%.bytes bytes; + expires max; + try_files $uri @fallback; + } + } + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location @fallback { + proxy_pass https://%ip%:%web_ssl_port%; + } + + location ~ /\.ht {return 404;} + location ~ /\.svn/ {return 404;} + location ~ /\.git/ {return 404;} + location ~ /\.hg/ {return 404;} + location ~ /\.bzr/ {return 404;} + + include %home%/%user%/conf/web/snginx.%domain%.conf*; +} + diff --git a/install/ubuntu/14.10/templates/web/nginx/default.tpl b/install/ubuntu/14.10/templates/web/nginx/default.tpl new file mode 100755 index 000000000..4d5c774bc --- /dev/null +++ b/install/ubuntu/14.10/templates/web/nginx/default.tpl @@ -0,0 +1,33 @@ +server { + listen %ip%:%proxy_port%; + server_name %domain_idn% %alias_idn%; + error_log /var/log/%web_system%/domains/%domain%.error.log error; + + location / { + proxy_pass http://%ip%:%web_port%; + location ~* ^.+\.(%proxy_extentions%)$ { + root %docroot%; + access_log /var/log/%web_system%/domains/%domain%.log combined; + access_log /var/log/%web_system%/domains/%domain%.bytes bytes; + expires max; + try_files $uri @fallback; + } + } + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location @fallback { + proxy_pass http://%ip%:%web_port%; + } + + location ~ /\.ht {return 404;} + location ~ /\.svn/ {return 404;} + location ~ /\.git/ {return 404;} + location ~ /\.hg/ {return 404;} + location ~ /\.bzr/ {return 404;} + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} + diff --git a/install/ubuntu/14.10/templates/web/nginx/hosting.sh b/install/ubuntu/14.10/templates/web/nginx/hosting.sh new file mode 100755 index 000000000..eeed37ef9 --- /dev/null +++ b/install/ubuntu/14.10/templates/web/nginx/hosting.sh @@ -0,0 +1,11 @@ +#!/bin/bash +# Changing public_html permission +user="$1" +domain="$2" +ip="$3" +home_dir="$4" +docroot="$5" + +chmod 755 $docroot + +exit 0 diff --git a/install/ubuntu/14.10/templates/web/nginx/hosting.stpl b/install/ubuntu/14.10/templates/web/nginx/hosting.stpl new file mode 100755 index 000000000..d778d6333 --- /dev/null +++ b/install/ubuntu/14.10/templates/web/nginx/hosting.stpl @@ -0,0 +1,38 @@ +server { + listen %ip%:%proxy_ssl_port%; + server_name %domain_idn% %alias_idn%; + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + error_log /var/log/%web_system%/domains/%domain%.error.log error; + + location / { + proxy_pass https://%ip%:%web_ssl_port%; + location ~* ^.+\.(%proxy_extentions%)$ { + root %sdocroot%; + access_log /var/log/%web_system%/domains/%domain%.log combined; + access_log /var/log/%web_system%/domains/%domain%.bytes bytes; + expires max; + try_files $uri @fallback; + } + } + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location @fallback { + proxy_pass https://%ip%:%web_ssl_port%; + } + + location ~ /\.ht {return 404;} + location ~ /\.svn/ {return 404;} + location ~ /\.git/ {return 404;} + location ~ /\.hg/ {return 404;} + location ~ /\.bzr/ {return 404;} + + disable_symlinks if_not_owner from=%docroot%; + + include %home%/%user%/conf/web/snginx.%domain%.conf*; +} + diff --git a/install/ubuntu/14.10/templates/web/nginx/hosting.tpl b/install/ubuntu/14.10/templates/web/nginx/hosting.tpl new file mode 100755 index 000000000..15961c95c --- /dev/null +++ b/install/ubuntu/14.10/templates/web/nginx/hosting.tpl @@ -0,0 +1,35 @@ +server { + listen %ip%:%proxy_port%; + server_name %domain_idn% %alias_idn%; + error_log /var/log/%web_system%/domains/%domain%.error.log error; + + location / { + proxy_pass http://%ip%:%web_port%; + location ~* ^.+\.(%proxy_extentions%)$ { + root %docroot%; + access_log /var/log/%web_system%/domains/%domain%.log combined; + access_log /var/log/%web_system%/domains/%domain%.bytes bytes; + expires max; + try_files $uri @fallback; + } + } + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location @fallback { + proxy_pass http://%ip%:%web_port%; + } + + location ~ /\.ht {return 404;} + location ~ /\.svn/ {return 404;} + location ~ /\.git/ {return 404;} + location ~ /\.hg/ {return 404;} + location ~ /\.bzr/ {return 404;} + + disable_symlinks if_not_owner from=%docroot%; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} + diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/cms_made_simple.stpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/cms_made_simple.stpl new file mode 100644 index 000000000..01d82b603 --- /dev/null +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/cms_made_simple.stpl @@ -0,0 +1,51 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + try_files $uri $uri/ /index.php?page=$request_uri; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/cms_made_simple.tpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/cms_made_simple.tpl new file mode 100644 index 000000000..af452d19f --- /dev/null +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/cms_made_simple.tpl @@ -0,0 +1,47 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + try_files $uri $uri/ /index.php?page=$request_uri; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/codeigniter2.stpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/codeigniter2.stpl new file mode 100644 index 000000000..a592a652d --- /dev/null +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/codeigniter2.stpl @@ -0,0 +1,56 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + try_files $uri $uri/ /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location = /index.php { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME /var/www/html/ci$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + location ~ \.php$ { + return 444; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/codeigniter2.tpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/codeigniter2.tpl new file mode 100644 index 000000000..9b955aa6a --- /dev/null +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/codeigniter2.tpl @@ -0,0 +1,52 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + try_files $uri $uri/ /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location = /index.php { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME /var/www/html/ci$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + location ~ \.php$ { + return 444; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/codeigniter3.stpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/codeigniter3.stpl new file mode 100644 index 000000000..4d330d34f --- /dev/null +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/codeigniter3.stpl @@ -0,0 +1,51 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + try_files $uri $uri/ /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/codeigniter3.tpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/codeigniter3.tpl new file mode 100644 index 000000000..1f446e5d3 --- /dev/null +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/codeigniter3.tpl @@ -0,0 +1,47 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + try_files $uri $uri/ /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/datalife_engine.stpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/datalife_engine.stpl new file mode 100644 index 000000000..d1b5bcd24 --- /dev/null +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/datalife_engine.stpl @@ -0,0 +1,122 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + rewrite "^/page/([0-9]+)(/?)$" /index.php?cstart=$1 last; + + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page,([0-9]+),([0-9]+),(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&cstart=$5&news_name=$6&seourl=$6 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page,([0-9]+),(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&news_name=$5&seourl=$5 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/print:page,([0-9]+),(.*).html(/?)+$" /engine/print.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&news_name=$5&seourl=$5 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_name=$4&seourl=$4 last; + + rewrite "^/([^.]+)/page,([0-9]+),([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$4&news_page=$2&cstart=$3&seourl=$5&seocat=$1 last; + rewrite "^/([^.]+)/page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$3&news_page=$2&seourl=$4&seocat=$1 last; + rewrite "^/([^.]+)/print:page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /engine/print.php?news_page=$2&newsid=$3&seourl=$4&seocat=$1 last; + rewrite "^/([^.]+)/([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$2&seourl=$3&seocat=$1 last; + + rewrite "^/page,([0-9]+),([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$3&news_page=$1&cstart=$2&seourl=$4 last; + rewrite "^/page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$2&news_page=$1&seourl=$3 last; + rewrite "^/print:page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /engine/print.php?news_page=$1&newsid=$2&seourl=$3 last; + rewrite "^/([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$1&seourl=$2 last; + + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})(/?)+$" /index.php?year=$1&month=$2&day=$3 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page/([0-9]+)(/?)+$" /index.php?year=$1&month=$2&day=$3&cstart=$4 last; + + rewrite "^/([0-9]{4})/([0-9]{2})(/?)+$" /index.php?year=$1&month=$2 last; + rewrite "^/([0-9]{4})/([0-9]{2})/page/([0-9]+)(/?)+$" /index.php?year=$1&month=$2&cstart=$3 last; + + rewrite "^/([0-9]{4})(/?)+$" /index.php?year=$1 last; + rewrite "^/([0-9]{4})/page/([0-9]+)(/?)+$" /index.php?year=$1&cstart=$2 last; + + rewrite "^/tags/([^/]*)(/?)+$" /index.php?do=tags&tag=$1 last; + rewrite "^/tags/([^/]*)/page/([0-9]+)(/?)+$" /index.php?do=tags&tag=$1&cstart=$2 last; + + rewrite "^/xfsearch/([^/]*)(/?)+$" /index.php?do=xfsearch&xf=$1 last; + rewrite "^/xfsearch/([^/]*)/page/([0-9]+)(/?)+$" /index.php?do=xfsearch&xf=$1&cstart=$2 last; + + rewrite "^/user/([^/]*)/rss.xml$" /engine/rss.php?subaction=allnews&user=$1 last; + rewrite "^/user/([^/]*)(/?)+$" /index.php?subaction=userinfo&user=$1 last; + rewrite "^/user/([^/]*)/page/([0-9]+)(/?)+$" /index.php?subaction=userinfo&user=$1&cstart=$2 last; + rewrite "^/user/([^/]*)/news(/?)+$" /index.php?subaction=allnews&user=$1 last; + rewrite "^/user/([^/]*)/news/page/([0-9]+)(/?)+$" /index.php?subaction=allnews&user=$1&cstart=$2 last; + rewrite "^/user/([^/]*)/news/rss.xml(/?)+$" /engine/rss.php?subaction=allnews&user=$1 last; + + rewrite "^/lastnews(/?)+$" /index.php?do=lastnews last; + rewrite "^/lastnews/page/([0-9]+)(/?)+$" /index.php?do=lastnews&cstart=$1 last; + + rewrite "^/catalog/([^/]*)/rss.xml$" /engine/rss.php?catalog=$1 last; + rewrite "^/catalog/([^/]*)(/?)+$" /index.php?catalog=$1 last; + rewrite "^/catalog/([^/]*)/page/([0-9]+)(/?)+$" /index.php?catalog=$1&cstart=$2 last; + + rewrite "^/newposts(/?)+$" /index.php?subaction=newposts last; + rewrite "^/newposts/page/([0-9]+)(/?)+$" /index.php?subaction=newposts&cstart=$1 last; + + rewrite "^/favorites(/?)+$" /index.php?do=favorites last; + rewrite "^/favorites/page/([0-9]+)(/?)+$" /index.php?do=favorites&cstart=$1 last; + + rewrite "^/rules.html$" /index.php?do=rules last; + rewrite "^/statistics.html$" /index.php?do=stats last; + rewrite "^/addnews.html$" /index.php?do=addnews last; + rewrite "^/rss.xml$" /engine/rss.php last; + rewrite "^/sitemap.xml$" /uploads/sitemap.xml last; + + if (!-d $request_filename) { + rewrite "^/([^.]+)/page/([0-9]+)(/?)+$" /index.php?do=cat&category=$1&cstart=$2 last; + rewrite "^/([^.]+)/?$" /index.php?do=cat&category=$1 last; + } + + if (!-f $request_filename) { + rewrite "^/([^.]+)/rss.xml$" /engine/rss.php?do=cat&category=$1 last; + rewrite "^/page,([0-9]+),([^/]+).html$" /index.php?do=static&page=$2&news_page=$1 last; + rewrite "^/print:([^/]+).html$" /engine/print.php?do=static&page=$1 last; + } + + if (!-f $request_filename) { + rewrite "^/([^/]+).html$" /index.php?do=static&page=$1 last; + } + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/datalife_engine.tpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/datalife_engine.tpl new file mode 100644 index 000000000..ff33c2325 --- /dev/null +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/datalife_engine.tpl @@ -0,0 +1,118 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + rewrite "^/page/([0-9]+)(/?)$" /index.php?cstart=$1 last; + + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page,([0-9]+),([0-9]+),(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&cstart=$5&news_name=$6&seourl=$6 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page,([0-9]+),(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&news_name=$5&seourl=$5 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/print:page,([0-9]+),(.*).html(/?)+$" /engine/print.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&news_name=$5&seourl=$5 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_name=$4&seourl=$4 last; + + rewrite "^/([^.]+)/page,([0-9]+),([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$4&news_page=$2&cstart=$3&seourl=$5&seocat=$1 last; + rewrite "^/([^.]+)/page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$3&news_page=$2&seourl=$4&seocat=$1 last; + rewrite "^/([^.]+)/print:page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /engine/print.php?news_page=$2&newsid=$3&seourl=$4&seocat=$1 last; + rewrite "^/([^.]+)/([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$2&seourl=$3&seocat=$1 last; + + rewrite "^/page,([0-9]+),([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$3&news_page=$1&cstart=$2&seourl=$4 last; + rewrite "^/page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$2&news_page=$1&seourl=$3 last; + rewrite "^/print:page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /engine/print.php?news_page=$1&newsid=$2&seourl=$3 last; + rewrite "^/([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$1&seourl=$2 last; + + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})(/?)+$" /index.php?year=$1&month=$2&day=$3 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page/([0-9]+)(/?)+$" /index.php?year=$1&month=$2&day=$3&cstart=$4 last; + + rewrite "^/([0-9]{4})/([0-9]{2})(/?)+$" /index.php?year=$1&month=$2 last; + rewrite "^/([0-9]{4})/([0-9]{2})/page/([0-9]+)(/?)+$" /index.php?year=$1&month=$2&cstart=$3 last; + + rewrite "^/([0-9]{4})(/?)+$" /index.php?year=$1 last; + rewrite "^/([0-9]{4})/page/([0-9]+)(/?)+$" /index.php?year=$1&cstart=$2 last; + + rewrite "^/tags/([^/]*)(/?)+$" /index.php?do=tags&tag=$1 last; + rewrite "^/tags/([^/]*)/page/([0-9]+)(/?)+$" /index.php?do=tags&tag=$1&cstart=$2 last; + + rewrite "^/xfsearch/([^/]*)(/?)+$" /index.php?do=xfsearch&xf=$1 last; + rewrite "^/xfsearch/([^/]*)/page/([0-9]+)(/?)+$" /index.php?do=xfsearch&xf=$1&cstart=$2 last; + + rewrite "^/user/([^/]*)/rss.xml$" /engine/rss.php?subaction=allnews&user=$1 last; + rewrite "^/user/([^/]*)(/?)+$" /index.php?subaction=userinfo&user=$1 last; + rewrite "^/user/([^/]*)/page/([0-9]+)(/?)+$" /index.php?subaction=userinfo&user=$1&cstart=$2 last; + rewrite "^/user/([^/]*)/news(/?)+$" /index.php?subaction=allnews&user=$1 last; + rewrite "^/user/([^/]*)/news/page/([0-9]+)(/?)+$" /index.php?subaction=allnews&user=$1&cstart=$2 last; + rewrite "^/user/([^/]*)/news/rss.xml(/?)+$" /engine/rss.php?subaction=allnews&user=$1 last; + + rewrite "^/lastnews(/?)+$" /index.php?do=lastnews last; + rewrite "^/lastnews/page/([0-9]+)(/?)+$" /index.php?do=lastnews&cstart=$1 last; + + rewrite "^/catalog/([^/]*)/rss.xml$" /engine/rss.php?catalog=$1 last; + rewrite "^/catalog/([^/]*)(/?)+$" /index.php?catalog=$1 last; + rewrite "^/catalog/([^/]*)/page/([0-9]+)(/?)+$" /index.php?catalog=$1&cstart=$2 last; + + rewrite "^/newposts(/?)+$" /index.php?subaction=newposts last; + rewrite "^/newposts/page/([0-9]+)(/?)+$" /index.php?subaction=newposts&cstart=$1 last; + + rewrite "^/favorites(/?)+$" /index.php?do=favorites last; + rewrite "^/favorites/page/([0-9]+)(/?)+$" /index.php?do=favorites&cstart=$1 last; + + rewrite "^/rules.html$" /index.php?do=rules last; + rewrite "^/statistics.html$" /index.php?do=stats last; + rewrite "^/addnews.html$" /index.php?do=addnews last; + rewrite "^/rss.xml$" /engine/rss.php last; + rewrite "^/sitemap.xml$" /uploads/sitemap.xml last; + + if (!-d $request_filename) { + rewrite "^/([^.]+)/page/([0-9]+)(/?)+$" /index.php?do=cat&category=$1&cstart=$2 last; + rewrite "^/([^.]+)/?$" /index.php?do=cat&category=$1 last; + } + + if (!-f $request_filename) { + rewrite "^/([^.]+)/rss.xml$" /engine/rss.php?do=cat&category=$1 last; + rewrite "^/page,([0-9]+),([^/]+).html$" /index.php?do=static&page=$2&news_page=$1 last; + rewrite "^/print:([^/]+).html$" /engine/print.php?do=static&page=$1 last; + } + + if (!-f $request_filename) { + rewrite "^/([^/]+).html$" /index.php?do=static&page=$1 last; + } + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/default.stpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/default.stpl new file mode 100644 index 000000000..a68c99861 --- /dev/null +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/default.stpl @@ -0,0 +1,50 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %sdocroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/snginx.%domain%.conf*; +} diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/default.tpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/default.tpl new file mode 100644 index 000000000..b143e53ba --- /dev/null +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/default.tpl @@ -0,0 +1,46 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/dokuwiki.stpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/dokuwiki.stpl new file mode 100644 index 000000000..27483cd8c --- /dev/null +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/dokuwiki.stpl @@ -0,0 +1,67 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + index doku.php; + try_files $uri $uri/ @dokuwiki; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + location ^~ /lib/ { + expires 30d; + } + + location ^~ /conf/ { return 403; } + location ^~ /data/ { return 403; } + + location @dokuwiki { + rewrite ^/_media/(.*) /lib/exe/fetch.php?media=$1 last; + rewrite ^/_detail/(.*) /lib/exe/detail.php?media=$1 last; + rewrite ^/_export/([^/]+)/(.*) /doku.php?do=export_$1&id=$2 last; + rewrite ^/(.*) /doku.php?id=$1 last; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/dokuwiki.tpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/dokuwiki.tpl new file mode 100644 index 000000000..31647c9ff --- /dev/null +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/dokuwiki.tpl @@ -0,0 +1,62 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + index doku.php; + try_files $uri $uri/ @dokuwiki; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + location ^~ /lib/ { + expires 30d; + } + + location ^~ /conf/ { return 403; } + location ^~ /data/ { return 403; } + location @dokuwiki { + rewrite ^/_media/(.*) /lib/exe/fetch.php?media=$1 last; + rewrite ^/_detail/(.*) /lib/exe/detail.php?media=$1 last; + rewrite ^/_export/([^/]+)/(.*) /doku.php?do=export_$1&id=$2 last; + rewrite ^/(.*) /doku.php?id=$1 last; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/drupal.stpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/drupal.stpl new file mode 100644 index 000000000..9a5484396 --- /dev/null +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/drupal.stpl @@ -0,0 +1,101 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + + location / { + try_files $uri @rewrite; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # You have 2 options here + # For D7 and above: + # Clean URLs are handled in drupal_environment_initialize(). + rewrite ^ /index.php; + + # For Drupal 6 and bwlow: + # Some modules enforce no slash (/) at the end of the URL + # Else this rewrite block wouldn't be needed (GlobalRedirect) + #rewrite ^/(.*)$ /index.php?q=$1; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/drupal.tpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/drupal.tpl new file mode 100644 index 000000000..417762c18 --- /dev/null +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/drupal.tpl @@ -0,0 +1,98 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + # Very rarely should these ever be accessed outside of your lan + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + + location / { + try_files $uri @rewrite; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # You have 2 options here + # For D7 and above: + # Clean URLs are handled in drupal_environment_initialize(). + rewrite ^ /index.php; + + # For Drupal 6 and bwlow: + # Some modules enforce no slash (/) at the end of the URL + # Else this rewrite block wouldn't be needed (GlobalRedirect) + #rewrite ^/(.*)$ /index.php?q=$1; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/joomla.stpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/joomla.stpl new file mode 100644 index 000000000..235a01216 --- /dev/null +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/joomla.stpl @@ -0,0 +1,58 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + try_files $uri $uri/ /index.php?$args; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + # deny running scripts inside writable directories + location ~* /(images|cache|media|logs|tmp)/.*\.(php|pl|py|jsp|asp|sh|cgi)$ { + return 403; + error_page 403 /403_error.html; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/joomla.tpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/joomla.tpl new file mode 100644 index 000000000..997c268de --- /dev/null +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/joomla.tpl @@ -0,0 +1,54 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + try_files $uri $uri/ /index.php?$args; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + # deny running scripts inside writable directories + location ~* /(images|cache|media|logs|tmp)/.*\.(php|pl|py|jsp|asp|sh|cgi)$ { + return 403; + error_page 403 /403_error.html; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/owncloud.stpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/owncloud.stpl new file mode 100644 index 000000000..8311ca43f --- /dev/null +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/owncloud.stpl @@ -0,0 +1,80 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + rewrite ^/caldav(.*)$ /remote.php/caldav$1 redirect; + rewrite ^/carddav(.*)$ /remote.php/carddav$1 redirect; + rewrite ^/webdav(.*)$ /remote.php/webdav$1 redirect; + + error_page 403 = /core/templates/403.php; + error_page 404 = /core/templates/404.php; + + location ~ ^/(?:\.htaccess|data|config|db_structure\.xml|README){ + deny all; + } + + location / { + # The following 2 rules are only needed with webfinger + rewrite ^/.well-known/host-meta /public.php?service=host-meta last; + rewrite ^/.well-known/host-meta.json /public.php?service=host-meta-json last; + rewrite ^/.well-known/carddav /remote.php/carddav/ redirect; + rewrite ^/.well-known/caldav /remote.php/caldav/ redirect; + rewrite ^(/core/doc/[^\/]+/)$ $1/index.html; + try_files $uri $uri/ /index.php; + + location ~ \.php(?:$|/) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param PATH_INFO $fastcgi_path_info; + #fastcgi_param HTTPS on; + fastcgi_pass %backend_lsnr%; + } + } + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + # Some basic cache-control for static files to be sent to the browser + add_header Pragma public; + add_header Cache-Control "public, must-revalidate, proxy-revalidate"; + } + + #error_page 403 /error/404.html; + #error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/owncloud.tpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/owncloud.tpl new file mode 100644 index 000000000..57cac2f85 --- /dev/null +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/owncloud.tpl @@ -0,0 +1,76 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + rewrite ^/caldav(.*)$ /remote.php/caldav$1 redirect; + rewrite ^/carddav(.*)$ /remote.php/carddav$1 redirect; + rewrite ^/webdav(.*)$ /remote.php/webdav$1 redirect; + + error_page 403 = /core/templates/403.php; + error_page 404 = /core/templates/404.php; + + location ~ ^/(?:\.htaccess|data|config|db_structure\.xml|README){ + deny all; + } + + location / { + # The following 2 rules are only needed with webfinger + rewrite ^/.well-known/host-meta /public.php?service=host-meta last; + rewrite ^/.well-known/host-meta.json /public.php?service=host-meta-json last; + rewrite ^/.well-known/carddav /remote.php/carddav/ redirect; + rewrite ^/.well-known/caldav /remote.php/caldav/ redirect; + rewrite ^(/core/doc/[^\/]+/)$ $1/index.html; + try_files $uri $uri/ /index.php; + + location ~ \.php(?:$|/) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param PATH_INFO $fastcgi_path_info; + #fastcgi_param HTTPS on; + fastcgi_pass %backend_lsnr%; + } + } + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + # Some basic cache-control for static files to be sent to the browser + add_header Pragma public; + add_header Cache-Control "public, must-revalidate, proxy-revalidate"; + } + + #error_page 403 /error/404.html; + #error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/piwik.stpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/piwik.stpl new file mode 100644 index 000000000..c53af4011 --- /dev/null +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/piwik.stpl @@ -0,0 +1,68 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location = /favicon.ico { + try_files /favicon.ico =204; + } + + location / { + try_files $uri /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + valid_referers none blocked %domain_idn% %alias_idn%; + if ($invalid_referer) { + return 444; + } + expires max; + } + + location ~* ^/(?:index|piwik)\.php$ { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + include /etc/nginx/fastcgi_params; + } + } + + # Any other attempt to access PHP files returns a 404. + location ~* ^.+\.php$ { + return 404; + } + + # Return a 404 for all text files. + location ~* ^/(?:README|LICENSE[^.]*|LEGALNOTICE)(?:\.txt)*$ { + return 404; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/piwik.tpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/piwik.tpl new file mode 100644 index 000000000..6b4a94a68 --- /dev/null +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/piwik.tpl @@ -0,0 +1,64 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location = /favicon.ico { + try_files /favicon.ico =204; + } + + location / { + try_files $uri /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + valid_referers none blocked %domain_idn% %alias_idn%; + if ($invalid_referer) { + return 444; + } + expires max; + } + + location ~* ^/(?:index|piwik)\.php$ { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + include /etc/nginx/fastcgi_params; + } + } + + # Any other attempt to access PHP files returns a 404. + location ~* ^.+\.php$ { + return 404; + } + + # Return a 404 for all text files. + location ~* ^/(?:README|LICENSE[^.]*|LEGALNOTICE)(?:\.txt)*$ { + return 404; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/pyrocms.stpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/pyrocms.stpl new file mode 100644 index 000000000..a6fc67556 --- /dev/null +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/pyrocms.stpl @@ -0,0 +1,61 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location /installer { + try_files $uri $uri/ /installer/index.php; + } + + location / { + try_files $uri $uri/ /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + location = /robots.txt { access_log off; log_not_found off; } + location = /favicon.ico { access_log off; log_not_found off; } + location ~ /\. { access_log off; log_not_found off; deny all; } + location ~ ~$ { access_log off; log_not_found off; deny all; } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/pyrocms.tpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/pyrocms.tpl new file mode 100644 index 000000000..68b378efd --- /dev/null +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/pyrocms.tpl @@ -0,0 +1,57 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location /installer { + try_files $uri $uri/ /installer/index.php; + } + + location / { + try_files $uri $uri/ /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + location = /robots.txt { access_log off; log_not_found off; } + location = /favicon.ico { access_log off; log_not_found off; } + location ~ /\. { access_log off; log_not_found off; deny all; } + location ~ ~$ { access_log off; log_not_found off; deny all; } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/wordpress.stpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/wordpress.stpl new file mode 100644 index 000000000..910c28b69 --- /dev/null +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/wordpress.stpl @@ -0,0 +1,50 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/wordpress.tpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/wordpress.tpl new file mode 100644 index 000000000..b143e53ba --- /dev/null +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/wordpress.tpl @@ -0,0 +1,46 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/wordpress2.stpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/wordpress2.stpl new file mode 100644 index 000000000..2822f8754 --- /dev/null +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/wordpress2.stpl @@ -0,0 +1,62 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + location / { + try_files $uri $uri/ /index.php?$args; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/wordpress2.tpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/wordpress2.tpl new file mode 100644 index 000000000..37b8be305 --- /dev/null +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/wordpress2.tpl @@ -0,0 +1,58 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + location / { + try_files $uri $uri/ /index.php?$args; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/14.10/templates/web/nginx/proxy_ip.tpl b/install/ubuntu/14.10/templates/web/nginx/proxy_ip.tpl new file mode 100755 index 000000000..ae1956173 --- /dev/null +++ b/install/ubuntu/14.10/templates/web/nginx/proxy_ip.tpl @@ -0,0 +1,9 @@ +server { + listen %ip%:%proxy_port% default; + server_name _; + #access_log /var/log/nginx/%ip%.log main; + location / { + proxy_pass http://%ip%:%web_port%; + } +} + diff --git a/install/ubuntu/14.10/templates/web/php5-fpm/default.tpl b/install/ubuntu/14.10/templates/web/php5-fpm/default.tpl new file mode 100644 index 000000000..44ccf7a42 --- /dev/null +++ b/install/ubuntu/14.10/templates/web/php5-fpm/default.tpl @@ -0,0 +1,18 @@ +[%backend%] +listen = 127.0.0.1:%backend_port% +listen.allowed_clients = 127.0.0.1 + +user = %user% +group = %user% + +pm = dynamic +pm.max_children = 50 +pm.start_servers = 3 +pm.min_spare_servers = 2 +pm.max_spare_servers = 10 + +env[HOSTNAME] = $HOSTNAME +env[PATH] = /usr/local/bin:/usr/bin:/bin +env[TMP] = /tmp +env[TMPDIR] = /tmp +env[TEMP] = /tmp diff --git a/install/ubuntu/14.10/templates/web/php5-fpm/no-php.tpl b/install/ubuntu/14.10/templates/web/php5-fpm/no-php.tpl new file mode 100644 index 000000000..89487d5f5 --- /dev/null +++ b/install/ubuntu/14.10/templates/web/php5-fpm/no-php.tpl @@ -0,0 +1,13 @@ +#[%backend%] +#user = %user% +#group = %user% +#listen = /dev/null + +#listen.owner = %user% +#listen.group = nginx + +#pm = dynamic +#pm.max_children = 50 +#pm.start_servers = 3 +#pm.min_spare_servers = 2 +#pm.max_spare_servers = 10 diff --git a/install/ubuntu/14.10/templates/web/php5-fpm/socket.tpl b/install/ubuntu/14.10/templates/web/php5-fpm/socket.tpl new file mode 100644 index 000000000..f0513da3e --- /dev/null +++ b/install/ubuntu/14.10/templates/web/php5-fpm/socket.tpl @@ -0,0 +1,21 @@ +[%backend%] +listen = /var/run/php5-%backend%.sock +listen.allowed_clients = 127.0.0.1 + +user = %user% +group = %user% + +listen.owner = %user% +listen.group = nginx + +pm = dynamic +pm.max_children = 50 +pm.start_servers = 3 +pm.min_spare_servers = 2 +pm.max_spare_servers = 10 + +env[HOSTNAME] = $HOSTNAME +env[PATH] = /usr/local/bin:/usr/bin:/bin +env[TMP] = /tmp +env[TMPDIR] = /tmp +env[TEMP] = /tmp diff --git a/install/ubuntu/14.10/templates/web/skel/document_errors/403.html b/install/ubuntu/14.10/templates/web/skel/document_errors/403.html new file mode 100755 index 000000000..9c3f6baab --- /dev/null +++ b/install/ubuntu/14.10/templates/web/skel/document_errors/403.html @@ -0,0 +1,29 @@ + + + 403 — Forbidden + + + + + + +

        %domain%

        + +

        403

        +

        Forbidden

        +
        + Unfortunately, you do not have permission to view this +
        + + + diff --git a/install/ubuntu/14.10/templates/web/skel/document_errors/404.html b/install/ubuntu/14.10/templates/web/skel/document_errors/404.html new file mode 100755 index 000000000..2cee77084 --- /dev/null +++ b/install/ubuntu/14.10/templates/web/skel/document_errors/404.html @@ -0,0 +1,28 @@ + + + 404 — Not Found + + + + + + +

        %domain%

        +

        404

        +

        Page Not Found

        +
        + It seems that the page you were trying to reach does not exist anymore, or maybe it has just moved. + You can start again from the home or go back to previous page. +
        + + diff --git a/install/ubuntu/14.10/templates/web/skel/document_errors/50x.html b/install/ubuntu/14.10/templates/web/skel/document_errors/50x.html new file mode 100755 index 000000000..85ba648b7 --- /dev/null +++ b/install/ubuntu/14.10/templates/web/skel/document_errors/50x.html @@ -0,0 +1,29 @@ + + + 500 — Internal Sever Error + + + + + + +

        %domain%

        + +

        500

        +

        Internal Server Error

        +
        + Sorry, something went wrong :( +
        + + + diff --git a/install/ubuntu/14.10/templates/web/skel/public_html/index.html b/install/ubuntu/14.10/templates/web/skel/public_html/index.html new file mode 100755 index 000000000..4f5bb7244 --- /dev/null +++ b/install/ubuntu/14.10/templates/web/skel/public_html/index.html @@ -0,0 +1,26 @@ + + + %domain% — Coming Soon + + + + + + +

        %domain%

        + + + + + diff --git a/install/ubuntu/14.10/templates/web/skel/public_html/robots.txt b/install/ubuntu/14.10/templates/web/skel/public_html/robots.txt new file mode 100755 index 000000000..00ee83dcf --- /dev/null +++ b/install/ubuntu/14.10/templates/web/skel/public_html/robots.txt @@ -0,0 +1,3 @@ +# vestacp autogenerated robots.txt +User-agent: * +Crawl-delay: 10 diff --git a/install/ubuntu/14.10/templates/web/skel/public_shtml/index.html b/install/ubuntu/14.10/templates/web/skel/public_shtml/index.html new file mode 100755 index 000000000..4f5bb7244 --- /dev/null +++ b/install/ubuntu/14.10/templates/web/skel/public_shtml/index.html @@ -0,0 +1,26 @@ + + + %domain% — Coming Soon + + + + + + +

        %domain%

        + + + + + diff --git a/install/ubuntu/14.10/templates/web/skel/public_shtml/robots.txt b/install/ubuntu/14.10/templates/web/skel/public_shtml/robots.txt new file mode 100755 index 000000000..00ee83dcf --- /dev/null +++ b/install/ubuntu/14.10/templates/web/skel/public_shtml/robots.txt @@ -0,0 +1,3 @@ +# vestacp autogenerated robots.txt +User-agent: * +Crawl-delay: 10 diff --git a/install/ubuntu/14.10/templates/web/suspend/.htaccess b/install/ubuntu/14.10/templates/web/suspend/.htaccess new file mode 100755 index 000000000..5a6df83fb --- /dev/null +++ b/install/ubuntu/14.10/templates/web/suspend/.htaccess @@ -0,0 +1,2 @@ +ErrorDocument 403 /index.html +ErrorDocument 404 /index.html diff --git a/install/ubuntu/14.10/templates/web/suspend/index.html b/install/ubuntu/14.10/templates/web/suspend/index.html new file mode 100755 index 000000000..9d4fa67b3 --- /dev/null +++ b/install/ubuntu/14.10/templates/web/suspend/index.html @@ -0,0 +1,27 @@ + + + SUSPEND + + + + + + +

        SUSPEND

        +

        This site has been suspended

        +
        + Please contact technical support departament. +
        + + + diff --git a/install/ubuntu/14.10/templates/web/webalizer/webalizer.tpl b/install/ubuntu/14.10/templates/web/webalizer/webalizer.tpl new file mode 100755 index 000000000..068adcfb9 --- /dev/null +++ b/install/ubuntu/14.10/templates/web/webalizer/webalizer.tpl @@ -0,0 +1,110 @@ +HostName %domain_idn% +LogFile /var/log/%web_system%/domains/%domain%.log +OutputDir %home%/%user%/web/%domain%/stats +HistoryName %home%/%user%/web/%domain%/stats/%domain%.hist +Incremental yes +IncrementalName %home%/%user%/web/%domain%/stats/%domain%.current +PageType htm* +PageType cgi +PageType php +PageType shtml +DNSCache /var/lib/webalizer/dns_cache.db +DNSChildren 10 +Quiet yes +FoldSeqErr yes +IndexAlias index.php +HideURL *.gif +HideURL *.GIF +HideURL *.jpg +HideURL *.JPG +HideURL *.png +HideURL *.PNG +HideURL *.ra +SearchEngine abcsearch. terms= +SearchEngine alexa. q= +SearchEngine alltheweb. q= +SearchEngine alltheweb. query= +SearchEngine alot. q= +SearchEngine altavista. q= +SearchEngine aolsearch. query= +SearchEngine aport.ru r= +SearchEngine ask. q= +SearchEngine atlas.cz q= +SearchEngine bbc. q= +SearchEngine bing. q= +SearchEngine blingo. q= +SearchEngine blogs.yandex.ru text= +SearchEngine btopenworld query= +SearchEngine buscador.ya.com q= +SearchEngine busca. q= +SearchEngine business. query= +SearchEngine centrum.cz q= +SearchEngine chiff. q= +SearchEngine clusty. query= +SearchEngine comcast. q= +SearchEngine crawler. q= +SearchEngine cuil. q= +SearchEngine dmoz. search= +SearchEngine dogpile.com q= +SearchEngine dpxml qkw= +SearchEngine eureka. searchword= +SearchEngine euroseek. string= +SearchEngine exalead. q= +SearchEngine excite search= +SearchEngine ezilon. q= +SearchEngine fastbrowsersearch. q= +SearchEngine feedster.com q= +SearchEngine fireball.de q= +SearchEngine fireball. keyword= +SearchEngine freeserve. q= +SearchEngine gigablast. q= +SearchEngine gogo.ru q= +SearchEngine go.mail.ru q= +SearchEngine google. q= +SearchEngine hakia. q= +SearchEngine hotbot. query= +SearchEngine infoseek. qt= +SearchEngine iwon searchfor= +SearchEngine ixquick.com query= +SearchEngine joeant. keywords= +SearchEngine jyxo.cz s= +SearchEngine looksmart. key= +SearchEngine lycos. query= +SearchEngine mamma. q= +SearchEngine metacrawler q= +SearchEngine msn. MT= +SearchEngine msxml qkw= +SearchEngine mysearch. searchfor= +SearchEngine mywebsearch. searchfor= +SearchEngine netscape. q= +SearchEngine nigma.ru q= +SearchEngine northernlight. qr= +SearchEngine ntlworld. q= +SearchEngine orange. q= +SearchEngine overture. Keywords= +SearchEngine punto.ru text= +SearchEngine rambler. keyword= +SearchEngine search.aol. q= +SearchEngine search.babylon. q= +SearchEngine search.centrum. phrase= +SearchEngine search.conduit. q= +SearchEngine search.earthlink q= +SearchEngine search.icq. q= +SearchEngine search.live.com q= +SearchEngine search.rambler.ru words= +SearchEngine search.winamp. q= +SearchEngine searchy. q= +SearchEngine seznam.cz w= +SearchEngine snap. query= +SearchEngine teoma. q= +SearchEngine teradex.com q= +SearchEngine ukplus key= +SearchEngine verizon. q= +SearchEngine virginmedia. q= +SearchEngine voila. rdata= +SearchEngine webcrawler searchText= +SearchEngine web.search.naver. query= +SearchEngine wisenut q= +SearchEngine yahoo. p= +SearchEngine yandex. text= +SearchEngine yodao. q= diff --git a/install/ubuntu/14.10/vsftpd/vsftpd.conf b/install/ubuntu/14.10/vsftpd/vsftpd.conf new file mode 100644 index 000000000..0902899e7 --- /dev/null +++ b/install/ubuntu/14.10/vsftpd/vsftpd.conf @@ -0,0 +1,24 @@ +anonymous_enable=NO +local_enable=YES +write_enable=YES +local_umask=002 +anon_upload_enable=NO +dirmessage_enable=YES +xferlog_enable=YES +connect_from_port_20=YES +xferlog_std_format=YES +dual_log_enable=YES +chroot_local_user=YES +listen=YES +pam_service_name=vsftpd +userlist_enable=NO +tcp_wrappers=YES +force_dot_files=YES +ascii_upload_enable=YES +ascii_download_enable=YES +#allow_writable_chroot=YES +allow_writeable_chroot=YES +seccomp_sandbox=NO +pasv_enable=YES +pasv_max_port=12100 +pasv_min_port=12000 diff --git a/install/ubuntu/15.04/apache2/apache2.conf b/install/ubuntu/15.04/apache2/apache2.conf new file mode 100644 index 000000000..221780117 --- /dev/null +++ b/install/ubuntu/15.04/apache2/apache2.conf @@ -0,0 +1,86 @@ +# It is split into several files forming the configuration hierarchy outlined +# below, all located in the /etc/apache2/ directory: +# +# /etc/apache2/ +# |-- apache2.conf +# | `-- ports.conf +# |-- mods-enabled +# | |-- *.load +# | `-- *.conf +# |-- conf.d +# | `-- * + +# Global configuration +PidFile ${APACHE_PID_FILE} +Timeout 30 +KeepAlive Off +MaxKeepAliveRequests 100 +KeepAliveTimeout 10 + + + StartServers 8 + MinSpareServers 5 + MaxSpareServers 20 + ServerLimit 256 + MaxClients 200 + MaxRequestsPerChild 4000 + + + + StartServers 2 + MinSpareThreads 25 + MaxSpareThreads 75 + ThreadLimit 64 + ThreadsPerChild 25 + MaxClients 200 + MaxRequestsPerChild 4000 + + + + StartServers 2 + MinSpareThreads 25 + MaxSpareThreads 75 + ThreadLimit 64 + ThreadsPerChild 25 + MaxClients 200 + MaxRequestsPerChild 4000 + + +# These need to be set in /etc/apache2/envvars +User ${APACHE_RUN_USER} +Group ${APACHE_RUN_GROUP} +#User www-data +#Group www-data + +AccessFileName .htaccess + + + Order allow,deny + Deny from all + Satisfy all + + +DefaultType None +HostnameLookups Off + +ErrorLog ${APACHE_LOG_DIR}/error.log +LogLevel warn + +# Include module configuration: +Include mods-enabled/*.load +Include mods-enabled/*.conf + +# Include list of ports to listen on and which to use for name based vhosts +Include ports.conf + +LogFormat "%v:%p %h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" vhost_combined +LogFormat "%h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" combined +LogFormat "%h %l %u %t \"%r\" %>s %O" common +LogFormat "%{Referer}i -> %U" referer +LogFormat "%{User-agent}i" agent +LogFormat "%b" bytes + +Include conf.d/ + +# Include the virtual host configurations: +#Include sites-enabled/ diff --git a/install/ubuntu/15.04/apache2/status.conf b/install/ubuntu/15.04/apache2/status.conf new file mode 100644 index 000000000..da9d96333 --- /dev/null +++ b/install/ubuntu/15.04/apache2/status.conf @@ -0,0 +1,8 @@ +Listen 127.0.0.1:8081 + + SetHandler server-status + Order deny,allow + Deny from all + Allow from 127.0.0.1 + Allow from all + diff --git a/install/ubuntu/15.04/bind/named.conf b/install/ubuntu/15.04/bind/named.conf new file mode 100644 index 000000000..ed6ece885 --- /dev/null +++ b/install/ubuntu/15.04/bind/named.conf @@ -0,0 +1,12 @@ +// This is the primary configuration file for the BIND DNS server named. +// +// Please read /usr/share/doc/bind9/README.Debian.gz for information on the +// structure of BIND configuration files in Debian, *BEFORE* you customize +// this configuration file. +// +// If you are just adding zones, please do that in /etc/bind/named.conf.local + +include "/etc/bind/named.conf.options"; +include "/etc/bind/named.conf.local"; +include "/etc/bind/named.conf.default-zones"; + diff --git a/install/ubuntu/15.04/clamav/clamd.conf b/install/ubuntu/15.04/clamav/clamd.conf new file mode 100644 index 000000000..ea982697a --- /dev/null +++ b/install/ubuntu/15.04/clamav/clamd.conf @@ -0,0 +1,61 @@ +#Automatically Generated by clamav-base postinst +#To reconfigure clamd run #dpkg-reconfigure clamav-base +#Please read /usr/share/doc/clamav-base/README.Debian.gz for details +LocalSocket /var/run/clamav/clamd.ctl +FixStaleSocket true +LocalSocketGroup clamav +LocalSocketMode 666 +# TemporaryDirectory is not set to its default /tmp here to make overriding +# the default with environment variables TMPDIR/TMP/TEMP possible +User clamav +AllowSupplementaryGroups true +ScanMail true +ScanArchive true +ArchiveBlockEncrypted false +MaxDirectoryRecursion 15 +FollowDirectorySymlinks false +FollowFileSymlinks false +ReadTimeout 180 +MaxThreads 12 +MaxConnectionQueueLength 15 +LogSyslog false +LogFacility LOG_LOCAL6 +LogClean false +LogVerbose true +PidFile /var/run/clamav/clamd.pid +DatabaseDirectory /var/lib/clamav +SelfCheck 3600 +Foreground false +Debug false +ScanPE true +ScanOLE2 true +ScanHTML true +DetectBrokenExecutables false +ExitOnOOM false +LeaveTemporaryFiles false +AlgorithmicDetection true +ScanELF true +IdleTimeout 30 +PhishingSignatures true +PhishingScanURLs true +PhishingAlwaysBlockSSLMismatch false +PhishingAlwaysBlockCloak false +DetectPUA false +ScanPartialMessages false +HeuristicScanPrecedence false +StructuredDataDetection false +CommandReadTimeout 5 +SendBufTimeout 200 +MaxQueue 100 +ExtendedDetectionInfo true +OLE2BlockMacros false +StreamMaxLength 25M +LogFile /var/log/clamav/clamav.log +LogTime true +LogFileUnlock false +LogFileMaxSize 0 +Bytecode true +BytecodeSecurity TrustSigned +BytecodeTimeout 60000 +OfficialDatabaseOnly false +CrossFilesystems true diff --git a/install/ubuntu/15.04/deb_signing.key b/install/ubuntu/15.04/deb_signing.key new file mode 100644 index 000000000..2ad2db8bc --- /dev/null +++ b/install/ubuntu/15.04/deb_signing.key @@ -0,0 +1,30 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.12 (GNU/Linux) + +mQENBFJIGbEBCAC8SHOOFo7iDTbnC2GhNZ+uBGCh226Dn1QPoFZNFM/DNakHZ6rD +G3wzr8++eKz4fJual/VLllE2N9XDPuxbozb3LLkcyY1WzJqtIXbXhFGQ/SuIeT+x +QY90XU6t2Ckze2c+zUniAWmJ8GSyVmXOoc9JxAQ1u47wvGXLzrjWXc8u8PNRYXuf +fZplTL+dFu9P0d6lP8FGsV+r9wXvvazpRTz3+H8PKrGCYT55ZQIEdG9Jgamylto2 +oVPFXkwGML+TLw6oeCIBuz2y2vtivphW4MJ3ifQjDj7k3n+DTIxfDFs8lB6VRhhY +2nMHCrcZC6U2mhmXmr6O4s1fu6irBVx05ejPABEBAAG0IFNlcmdoZXkgUm9kaW4g +PHNraWRAdmVzdGFjcC5jb20+iQE4BBMBAgAiBQJSSBmxAhsDBgsJCAcDAgYVCAIJ +CgsEFgIDAQIeAQIXgAAKCRBCxbITCh93FPdqB/93GjV9g+wBfeZYLHQK9MDU2wBb +VloYOJJae6IvYKYQVAJayD3PbHdpxrF8s9e23vdnmb9jKu6jX6oV54EIyqP2HPiN +QYc8wcea+eSHerznBixCtoQh8mtdWGFeN71zU/ig7L5qlOVF/EmxDVZTFUeivFxh +IV6qyBnktQKktE45585yKZyyLtfGoXA54DGK69OtJFh+wdkKEMmUXocMl7wUrxW6 +Cx2CuKeEXEgvwu8mRHQi3S3T9XP456qWEn5dWyMVcP660IzEuZfSJApZusNK7zG3 +WMy0/EuX7xHNY3mcNxTOUN1LsO7iHnhHD9+iKWJo9parGkMZzc92MpjDK/g7uQEN +BFJIGbEBCAC7k5QEA9WQM7E3ceNaeLMrA9lXfuzaNCcySq7ONdVAa5PxzbSKdHvz +QFoL1VFqBTYQ038lbil1XqnoM0zvIfAI3LcpS8sq92El/vPxp6jZh2Ari9Uw7x95 +k2cZMgI67g+zQMGdjVRA155nFQRCgg000xU4F7JA6+WsuLlVUmccsDv7YWJExMtC +YPxiuz5DFu8RALnw4Ckts+dbwsrcvUHhkm9b6RAsdCKjjRpUZjLgdltjH83gUVvt +i1YmdjjsVpt95dtsaG+ad852g/Rk8EdxNMkjPF6HLA67CLADP9wYaj80yPcPtylS +ycvPtcclVeHkFBRVM8xZpQd4iD19MWI1ABEBAAGJAR8EGAECAAkFAlJIGbECGwwA +CgkQQsWyEwofdxQ7tQgAhB0FwTs7L8Qr63DHC2yAnXVxgtTAY1/36CccNXVculyR ++EkLcwahms9AKhz7eQb+Mud+5vH0GRohLp2npgO38CjVUfIP5d+Y6dsthmrkF6p8 +XdV1dVK9vWX+i/YZSw/Mded30Cq4P2Yhq9EaemMT0rtli8lz2NnkZ9dFJZk1lzJC +CZmRpbjSNWqRU4f7qyh21lYk/OC/0XE8fh8CaO23TZ+6gBionoCztwb7NyC9OArN +qYlNnbmh9iNqdblykPS3bkjf34n2xyMgnIehNrM89tk8PY4UfNPhgT1TMD9W3Svq +ynNZvLuF/FIDwDeC1qcfjGbfDn9fXO/lMIIRooQYKQ== +=J2HJ +-----END PGP PUBLIC KEY BLOCK----- diff --git a/install/ubuntu/15.04/dovecot.tar.gz b/install/ubuntu/15.04/dovecot.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..bfabaa030981d087ea4ccd8c7b86cc4d7ab1b7c6 GIT binary patch literal 3487 zcmV;Q4Pf#giwFRAz^+vQ1MM4YZyPrJESWH#l7u_ru?rTWOchsOV;5PJCsTFqMF@1q7J z@8Lu8?+=Fk(NVY80r~evgQH6Rj{$e&-|I9Jo%CDy^^@&^0v-(pACmu3uh#|ncRQo* z(dY>0bqAx~@CoaDG73Hde{=aieOi0^lwDn3^_fjXAZIdQR-~y^a|aq$g|DKQfwbnIX+x!UC0o24+8Ev1e?6`TyF z8`vq$jB@adI3@)oZi~NBA63I*Z>0~uk2KT zaHU4N^Mslf!x4zfNM=3)9v~#FmW9FwMovM>Qqk&A2kn)-mF@3y zG_7=ebDkGV094j@@Vs@0BEc@7@e)9w1lqm6#<#5dEoiE=m z@xRQ?I@Os$l_|q95)Rz0FPp%ZgQ-R*OzH}@2pfc;P;nNeTnTN9qnvI`X4%2lW7cbR zTm3_iDcc$Smm3}Aqsvx4A-9-ir}foWtu?zhA>BPnKH=r8;MprpW)8}EnWd=Ptk>xv zZ$wNMvfvPJARK}+#op!#f3DIl7_7MUF_H+{N8OxpIBtVkjrIw0*#{pt%}|=4)|}#i zlK@)fN@oy7fK{B$wRYhG42V-$TW~dZzNkgA$Vec}F7ibQ_$LtX40NJt`OMjEVY}## zC!XAK34ym>0Rsw56(X|5!=mP(gHmL#q$xf~(P8ePbmY17uP8?-2-eo4Yq8S|{0ePC z{%@rXcpy}2$J3Wi&9@E*NtxUUBtI;i4*_q;ryATy&))c2YhFE=mCZghykWlY>c z$`*4-IYg9zGgoBu+J$PTs?J72mMO7@v=QizHl?Ho^Q6trYBp`MA?apM!Dq&&Fw%;NZ>9uNV(Q;Ji1D zSC=o5I^LcO}XbK_ij~ctOc^?0jNp{bgsnFkh!dQ`x4_i~A(yWFTp;L}~+`2=c6K z3cll({3CicV6e|ZnwY%i*D{1yLZ+?e{=TLY6c|SC1fzpMzDZJI%5L+?v>Mfe#D|AM zu{H~_Ze62e^kh|%!fz>Q2_H!3659BJZVC(0Vjnu9`FU}gzn7>vr-tO$G^OH$ojEgYPB34n)nCN z6_up>=y0fnu2v=w9^ctv_X*FyQ{qy%dak!9@p03;bsS}E4*n(qZ-c&>9>6_P!1vB* z)S>Sb1jo$Vh9~sS!@r29x^Mp=wK=--Pv-z0vj5JYQ`rBokM&>pe^A-~V*p5dl5jAb zF>6B()Q0bEuM;i!{MS(O3O)$;`#>Hz_&+?N{?F*Bvj4{b*Z-lK^uDrs5Xa-jP|B-A`z+-YdcF%DyCW+}{uQ7yN8dB=smp0>#5MR`=XA`_M|@&2rY zZx3;qcSKw<4eRNIXYWR9hn<^w7Q@ziSccrYPi2Y|VUpNm!WeDfdNYG$fi5R_OuDV& z%!xY>ILFc8_Cq&nkN@v}qb4?dwsIDU?QXGzCXef~UH4_fOVB_gLqVlFBKY*=>g4(P z#re%UtS=?NLD9nMx$84TnP5{vXD0pJ|6<>@c0hzQWe!47Af$v-WgUAoa7#{glGpk@ zZ>{epa?OlGyuBkz|5C-&D zX>62B5bhh91xMVx7HNLb_;K4>S8Csx=x_yj>G+sP zYoJHLc3^{Pi~pL%ck9}<&CEpGF9Nl;%!vsdCTDtnY_DI_P0mWP6p-FC77Gq+7U;;R z_qKx!=CJW^E-!^5;+v)tDti>M$qK zMmnu|b$NMJAVUeBetUNMT~T|z0-^}BogfM`fY)aDoF=l zFMF--Ve4Me$(NX7#5m<475cGv?HcmvADsJ6x3wm4@D{7`xTjg;lm*- zO4=y45Y&e@WBcuWP~+K5uALR;b!oED-5MP=oo!)vr2}oHT*3-gpQ8UohXrhNy=W@A zO9iGU!=1fKT!?HoZPJScC9TDy{`g8;5kWx8UpoLTy10Jxob*!`{qijf$TcD#4)2si z-J1<%o&tptmg1?o0}&FNOl~vk2qPa!kx-KhTyrBfzd5u2ed#}{;xeAy8rjP#r?n6>GmN1 zKk8Tc|KkA4I-F8o9~!x&5|@*I6BPg+L!OMPYXh(-F@E`C*gSpx?&_vUSADuQt}E6S zY0wss9}n802Ct!PyB@Y3I;_;;l3%siZ^!+)`S@pr`}IF-qfdMNf6)HB!~UK3e+O6w ztnB|00Hh7}wt@T_K1~8)@ZR)wJF{2{40zOD3Sdwh2HQC3(oTpACZz?pV)Lu!!@SBw z|A=tk{xJo3)cPOT|IxPo-|4&hUuFM~0-?0@@^2DxEC#I83ANGaO)LB~fhax2m$#gg zphvO5S5~BrF;vq+Mye+;{o z{XYh{IxZyRV5V~sPIh|ZG{}QMSnCGt&Iktl)V+-F-%UQQFWUGKQ}ep2ef*u%&wca? zo^0(u@A-b(%-;do|L7z3-|zbT|ESaL;O{>N_>;iO{vQGI_8wX`b@3Y9jdImf(k0Apn?i2sGx!hDyX1>3M#0ef(kxA N{0}P55eWcL004dY&`|&Y literal 0 HcmV?d00001 diff --git a/install/ubuntu/15.04/dovecot/conf.d/10-auth.conf b/install/ubuntu/15.04/dovecot/conf.d/10-auth.conf new file mode 100644 index 000000000..dfcc83110 --- /dev/null +++ b/install/ubuntu/15.04/dovecot/conf.d/10-auth.conf @@ -0,0 +1,4 @@ +disable_plaintext_auth = no +auth_verbose = yes +auth_mechanisms = plain login +!include auth-passwdfile.conf.ext diff --git a/install/ubuntu/15.04/dovecot/conf.d/10-logging.conf b/install/ubuntu/15.04/dovecot/conf.d/10-logging.conf new file mode 100644 index 000000000..a5f207d51 --- /dev/null +++ b/install/ubuntu/15.04/dovecot/conf.d/10-logging.conf @@ -0,0 +1 @@ +log_path = /var/log/dovecot.log diff --git a/install/ubuntu/15.04/dovecot/conf.d/10-mail.conf b/install/ubuntu/15.04/dovecot/conf.d/10-mail.conf new file mode 100644 index 000000000..55313419e --- /dev/null +++ b/install/ubuntu/15.04/dovecot/conf.d/10-mail.conf @@ -0,0 +1,4 @@ +mail_privileged_group = mail +mail_access_groups = mail +mail_location = maildir:%h/mail/%d/%n +pop3_uidl_format = %08Xu%08Xv diff --git a/install/ubuntu/15.04/dovecot/conf.d/10-master.conf b/install/ubuntu/15.04/dovecot/conf.d/10-master.conf new file mode 100644 index 000000000..a75a9aaa4 --- /dev/null +++ b/install/ubuntu/15.04/dovecot/conf.d/10-master.conf @@ -0,0 +1,29 @@ +service imap-login { + inet_listener imap { + } + inet_listener imaps { + } +} + +service pop3-login { + inet_listener pop3 { + } + inet_listener pop3s { + } +} + + +service imap { +} + +service pop3 { +} + +service auth { + unix_listener auth-client { + group = mail + mode = 0660 + user = dovecot + } + user = dovecot +} diff --git a/install/ubuntu/15.04/dovecot/conf.d/10-ssl.conf b/install/ubuntu/15.04/dovecot/conf.d/10-ssl.conf new file mode 100644 index 000000000..3aaff6eec --- /dev/null +++ b/install/ubuntu/15.04/dovecot/conf.d/10-ssl.conf @@ -0,0 +1,3 @@ +ssl = yes +ssl_cert = = 2.1.4) : %v.%u + # Dovecot v0.99.x : %v.%u + # tpop3d : %Mf + # + # Note that Outlook 2003 seems to have problems with %v.%u format which was + # Dovecot's default, so if you're building a new server it would be a good + # idea to change this. %08Xu%08Xv should be pretty fail-safe. + # + #pop3_uidl_format = %08Xu%08Xv + + # Permanently save UIDLs sent to POP3 clients, so pop3_uidl_format changes + # won't change those UIDLs. Currently this works only with Maildir. + #pop3_save_uidl = no + + # What to do about duplicate UIDLs if they exist? + # allow: Show duplicates to clients. + # rename: Append a temporary -2, -3, etc. counter after the UIDL. + #pop3_uidl_duplicates = allow + + # POP3 logout format string: + # %i - total number of bytes read from client + # %o - total number of bytes sent to client + # %t - number of TOP commands + # %p - number of bytes sent to client as a result of TOP command + # %r - number of RETR commands + # %b - number of bytes sent to client as a result of RETR command + # %d - number of deleted messages + # %m - number of messages (before deletion) + # %s - mailbox size in bytes (before deletion) + # %u - old/new UIDL hash. may help finding out if UIDLs changed unexpectedly + #pop3_logout_format = top=%t/%p, retr=%r/%b, del=%d/%m, size=%s + + # Maximum number of POP3 connections allowed for a user from each IP address. + # NOTE: The username is compared case-sensitively. + #mail_max_userip_connections = 10 + + # Space separated list of plugins to load (default is global mail_plugins). + #mail_plugins = $mail_plugins + + # Workarounds for various client bugs: + # outlook-no-nuls: + # Outlook and Outlook Express hang if mails contain NUL characters. + # This setting replaces them with 0x80 character. + # oe-ns-eoh: + # Outlook Express and Netscape Mail breaks if end of headers-line is + # missing. This option simply sends it if it's missing. + # The list is space-separated. + #pop3_client_workarounds = +} diff --git a/install/ubuntu/15.04/dovecot/conf.d/auth-passwdfile.conf.ext b/install/ubuntu/15.04/dovecot/conf.d/auth-passwdfile.conf.ext new file mode 100644 index 000000000..75e6e1152 --- /dev/null +++ b/install/ubuntu/15.04/dovecot/conf.d/auth-passwdfile.conf.ext @@ -0,0 +1,9 @@ +passdb { + driver = passwd-file + args = scheme=MD5-CRYPT username_format=%n /etc/exim4/domains/%d/passwd +} + +userdb { + driver = passwd-file + args = username_format=%n /etc/exim4/domains/%d/passwd +} diff --git a/install/ubuntu/15.04/dovecot/dovecot.conf b/install/ubuntu/15.04/dovecot/dovecot.conf new file mode 100644 index 000000000..0a8553510 --- /dev/null +++ b/install/ubuntu/15.04/dovecot/dovecot.conf @@ -0,0 +1,4 @@ +protocols = imap pop3 +listen = *, :: +base_dir = /var/run/dovecot/ +!include conf.d/*.conf diff --git a/install/ubuntu/15.04/exim/dnsbl.conf b/install/ubuntu/15.04/exim/dnsbl.conf new file mode 100644 index 000000000..5166b255e --- /dev/null +++ b/install/ubuntu/15.04/exim/dnsbl.conf @@ -0,0 +1,2 @@ +bl.spamcop.net +zen.spamhaus.org diff --git a/install/ubuntu/15.04/exim/exim4.conf.template b/install/ubuntu/15.04/exim/exim4.conf.template new file mode 100644 index 000000000..742f0409e --- /dev/null +++ b/install/ubuntu/15.04/exim/exim4.conf.template @@ -0,0 +1,377 @@ +###################################################################### +# # +# Exim configuration file for Vesta Control Panel # +# # +###################################################################### + +#SPAMASSASSIN = yes +#SPAM_SCORE = 50 +#CLAMD = yes + +domainlist local_domains = dsearch;/etc/exim4/domains/ +domainlist relay_to_domains = dsearch;/etc/exim4/domains/ +hostlist relay_from_hosts = 127.0.0.1 +hostlist whitelist = net-iplsearch;/etc/exim4/white-blocks.conf +hostlist spammers = net-iplsearch;/etc/exim4/spam-blocks.conf +no_local_from_check +untrusted_set_sender = * +acl_smtp_connect = acl_check_spammers +acl_smtp_mail = acl_check_mail +acl_smtp_rcpt = acl_check_rcpt +acl_smtp_data = acl_check_data +acl_smtp_mime = acl_check_mime + +.ifdef SPAMASSASSIN +spamd_address = 127.0.0.1 783 +.endif + +.ifdef CLAMD +av_scanner = clamd: /var/run/clamav/clamd.ctl +.endif + +tls_advertise_hosts = * +tls_certificate = /usr/local/vesta/ssl/certificate.crt +tls_privatekey = /usr/local/vesta/ssl/certificate.key + +daemon_smtp_ports = 25 : 465 : 587 : 2525 +tls_on_connect_ports = 465 +never_users = root +host_lookup = * +rfc1413_hosts = * +rfc1413_query_timeout = 5s +ignore_bounce_errors_after = 2d +timeout_frozen_after = 7d + +DKIM_DOMAIN = ${lc:${domain:$h_from:}} +DKIM_FILE = /etc/exim4/domains/${lc:${domain:$h_from:}}/dkim.pem +DKIM_PRIVATE_KEY = ${if exists{DKIM_FILE}{DKIM_FILE}{0}} + + + +###################################################################### +# ACL CONFIGURATION # +# Specifies access control lists for incoming SMTP mail # +###################################################################### +begin acl + +acl_check_spammers: + accept hosts = +whitelist + + drop message = Your host in blacklist on this server. + log_message = Host in blacklist + hosts = +spammers + + accept + + +acl_check_mail: + deny condition = ${if eq{$sender_helo_name}{}} + message = HELO required before MAIL + + drop message = Helo name contains a ip address (HELO was $sender_helo_name) and not is valid + condition = ${if match{$sender_helo_name}{\N((\d{1,3}[.-]\d{1,3}[.-]\d{1,3}[.-]\d{1,3})|([0-9a-f]{8})|([0-9A-F]{8}))\N}{yes}{no}} + condition = ${if match {${lookup dnsdb{>: defer_never,ptr=$sender_host_address}}\}{$sender_helo_name}{no}{yes}} + delay = 45s + + drop condition = ${if isip{$sender_helo_name}} + message = Access denied - Invalid HELO name (See RFC2821 4.1.3) + + drop condition = ${if eq{[$interface_address]}{$sender_helo_name}} + message = $interface_address is _my_ address + + accept + + +acl_check_rcpt: + accept hosts = : + + deny message = Restricted characters in address + domains = +local_domains + local_parts = ^[.] : ^.*[@%!/|] + + deny message = Restricted characters in address + domains = !+local_domains + local_parts = ^[./|] : ^.*[@%!] : ^.*/\\.\\./ + + require verify = sender + + accept hosts = +relay_from_hosts + control = submission + + accept authenticated = * + control = submission/domain= + + deny message = Rejected because $sender_host_address is in a black list at $dnslist_domain\n$dnslist_text + hosts = !+whitelist + dnslists = ${readfile {/etc/exim4/dnsbl.conf}{:}} + + require message = relay not permitted + domains = +local_domains : +relay_to_domains + + deny message = smtp auth requried + sender_domains = +local_domains + !authenticated = * + + require verify = recipient + +.ifdef CLAMD + warn set acl_m0 = no + + warn condition = ${if exists {/etc/exim4/domains/$domain/antivirus}{yes}{no}} + set acl_m0 = yes +.endif + +.ifdef SPAMASSASSIN + warn set acl_m1 = no + + warn condition = ${if exists {/etc/exim4/domains/$domain/antispam}{yes}{no}} + set acl_m1 = yes +.endif + + accept + + +acl_check_data: +.ifdef CLAMD + deny message = Message contains a virus ($malware_name) and has been rejected + malware = * + condition = ${if eq{$acl_m0}{yes}{yes}{no}} +.endif + +.ifdef SPAMASSASSIN + warn !authenticated = * + hosts = !+relay_from_hosts + condition = ${if < {$message_size}{100K}} + condition = ${if eq{$acl_m1}{yes}{yes}{no}} + spam = nobody:true/defer_ok + add_header = X-Spam-Score: $spam_score_int + add_header = X-Spam-Bar: $spam_bar + add_header = X-Spam-Report: $spam_report + set acl_m2 = $spam_score_int + + warn condition = ${if !eq{$acl_m2}{} {yes}{no}} + condition = ${if >{$acl_m2}{SPAM_SCORE} {yes}{no}} + add_header = X-Spam-Status: Yes + message = SpamAssassin detected spam (from $sender_address to $recipients). +.endif + + accept + + +acl_check_mime: + deny message = Blacklisted file extension detected + condition = ${if match {${lc:$mime_filename}}{\N(\.ade|\.adp|\.bat|\.chm|\.cmd|\.com|\.cpl|\.exe|\.hta|\.ins|\.isp|\.jse|\.lib|\.lnk|\.mde|\.msc|\.msp|\.mst|\.pif|\.scr|\.sct|\.shb|\.sys|\.vb|\.vbe|\.vbs|\.vxd|\.wsc|\.wsf|\.wsh)$\N}{1}{0}} + + accept + + + +###################################################################### +# AUTHENTICATION CONFIGURATION # +###################################################################### +begin authenticators + +dovecot_plain: + driver = dovecot + public_name = PLAIN + server_socket = /var/run/dovecot/auth-client + server_set_id = $auth1 + +dovecot_login: + driver = dovecot + public_name = LOGIN + server_socket = /var/run/dovecot/auth-client + server_set_id = $auth1 + + + +###################################################################### +# ROUTERS CONFIGURATION # +# Specifies how addresses are handled # +###################################################################### +begin routers + +#smarthost: +# driver = manualroute +# domains = ! +local_domains +# transport = remote_smtp +# route_list = * smartrelay.vestacp.com +# no_more +# no_verify + +dnslookup: + driver = dnslookup + domains = !+local_domains + transport = remote_smtp + no_more + +userforward: + driver = redirect + check_local_user + file = $home/.forward + allow_filter + no_verify + no_expn + check_ancestor + file_transport = address_file + pipe_transport = address_pipe + reply_transport = address_reply + +procmail: + driver = accept + check_local_user + require_files = ${local_part}:+${home}/.procmailrc:/usr/bin/procmail + transport = procmail + no_verify + +autoreplay: + driver = accept + require_files = /etc/exim4/domains/$domain/autoreply.${local_part}.msg + condition = ${if exists{/etc/exim4/domains/$domain/autoreply.${local_part}.msg}}{yes}{no}} + retry_use_local_part + transport = userautoreply + unseen + +aliases: + driver = redirect + headers_add = X-redirected: yes + data = ${extract{1}{:}{${lookup{$local_part@$domain}lsearch{/etc/exim4/domains/$domain/aliases}}}} + require_files = /etc/exim4/domains/$domain/aliases + redirect_router = dnslookup + pipe_transport = address_pipe + unseen + +localuser_fwd_only: + driver = accept + transport = devnull + condition = ${if exists{/etc/exim/domains/$domain/fwd_only}{${lookup{$local_part}lsearch{/etc/exim/domains/$domain/fwd_only}{true}{false}}}} + +localuser_spam: + driver = accept + transport = local_spam_delivery + condition = ${if eq {${if match{$h_X-Spam-Status:}{\N^Yes\N}{yes}{no}}} {${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}{yes}{no_such_user}}}} + +localuser: + driver = accept + transport = local_delivery + condition = ${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}{true}{false}} + +catchall: + driver = redirect + headers_add = X-redirected: yes + require_files = /etc/exim4/domains/$domain/aliases + data = ${extract{1}{:}{${lookup{*@$domain}lsearch{/etc/exim4/domains/$domain/aliases}}}} + file_transport = local_delivery + redirect_router = dnslookup + +terminate_alias: + driver = accept + transport = devnull + condition = ${lookup{$local_part@$domain}lsearch{/etc/exim4/domains/$domain/aliases}{true}{false}} + + + +###################################################################### +# TRANSPORTS CONFIGURATION # +###################################################################### +begin transports + +remote_smtp: + driver = smtp + #helo_data = $sender_address_domain + dkim_domain = DKIM_DOMAIN + dkim_selector = mail + dkim_private_key = DKIM_PRIVATE_KEY + dkim_canon = relaxed + dkim_strict = 0 + +procmail: + driver = pipe + command = "/usr/bin/procmail -d $local_part" + return_path_add + delivery_date_add + envelope_to_add + user = $local_part + initgroups + return_output + +local_delivery: + driver = appendfile + maildir_format + maildir_use_size_file + user = ${extract{2}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}} + group = mail + create_directory + directory_mode = 770 + mode = 660 + use_lockfile = no + delivery_date_add + envelope_to_add + return_path_add + directory = "${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}}/mail/$domain/$local_part" + quota = ${extract{6}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}}M + quota_warn_threshold = 75% + +local_spam_delivery: + driver = appendfile + maildir_format + maildir_use_size_file + user = ${extract{2}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}} + group = mail + create_directory + directory_mode = 770 + mode = 660 + use_lockfile = no + delivery_date_add + envelope_to_add + return_path_add + directory = "${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}}/mail/$domain/$local_part/.Spam" + quota = ${extract{6}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}}M + quota_directory = "${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}}/mail/$domain/$local_part" + quota_warn_threshold = 75% + +address_pipe: + driver = pipe + return_output + +address_file: + driver = appendfile + delivery_date_add + envelope_to_add + return_path_add + +address_reply: + driver = autoreply + +userautoreply: + driver = autoreply + file = /etc/exim4/domains/$domain/autoreply.${local_part}.msg + from = "${local_part}@${domain}" + subject = "${if def:h_Subject: {Autoreply: ${quote:${escape:$h_Subject:}}} {Autoreply Message}}" + to = "${sender_address}" + +devnull: + driver = appendfile + file = /dev/null + + + +###################################################################### +# RETRY CONFIGURATION # +###################################################################### +begin retry + +# Address or Domain Error Retries +# ----------------- ----- ------- +* * F,2h,15m; G,16h,1h,1.5; F,4d,6h + + + +###################################################################### +# REWRITE CONFIGURATION # +###################################################################### +begin rewrite + + + +###################################################################### diff --git a/install/ubuntu/15.04/exim/spam-blocks.conf b/install/ubuntu/15.04/exim/spam-blocks.conf new file mode 100644 index 000000000..e69de29bb diff --git a/install/ubuntu/15.04/fail2ban.tar.gz b/install/ubuntu/15.04/fail2ban.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..628545b6b12d83a4dfcf4529b41f62792c228c85 GIT binary patch literal 721 zcmV;?0xta@iwFR?P)1Y$1MQbhZ{jczhB^CJjMPJ=l>#Ira4D7AZL1=&Z6#&~ zz`KruB3xbg09_DCMo>VRAaZ-;y)^U@ z_5_W1em^5}=Uk3M(j5%0M~Fp}7>lVIYRqubkoOIoiK#qP6BOckLPYW;2OWgmSsIAg zuZ|mFmaYUYjJJfo8s1fhF1)IOlQ|75La(j33(9U0btUMJvtIut>QYeUVmCrexr&Qi zKbjFQ61zkzP2U-?^r{!(!l(3+?Yga{u}aaFy}dZE-rC%=GOfyYm&N9W)k}T291PDY z*P0t`IZ}uIjJ_-j{V$SH_dlT#cu)PeEcx8DI+m&H|328vfBu=(y@&@N72}Qi-)t}U ze|i14JEpGxd*KMK)CoAp98}8bBuj9v%2KQe1W{6IHF7UVKsi-oBUDPa+B%^mI!l#A z%iggR=`rPvnSp)Z2xvn7V8#q@Dyt%#D2+c|xJU7JZ=WzC$g2~0Q{w%WGdx!uFgO@} z=-u4i58*FN5)y;)2*=Nd+$g+V_$fxmCp11?eTVGz8P->^KFOi;zxe)( z;(T!ZH#>H&|F+iuy|9`8{p-KwZ0f&dYyIB`OZs27=SuT4o@Sm$(ja3D9@K#V)prvv zs8^H+ECdN-k)k768hSV1`}Y@@gAp1N=}x2^dQlk4c0wJawc4RhTtX&fF0G*c4Nk6a z2g6fPkL6zl5rJ&(DMxg| +actionstop = /usr/local/vesta/bin/v-delete-firewall-chain +actioncheck = iptables -n -L INPUT | grep -q 'fail2ban-[ \t]' +actionban = /usr/local/vesta/bin/v-add-firewall-ban +actionunban = /usr/local/vesta/bin/v-delete-firewall-ban diff --git a/install/ubuntu/15.04/fail2ban/filter.d/vesta.conf b/install/ubuntu/15.04/fail2ban/filter.d/vesta.conf new file mode 100644 index 000000000..69670a56e --- /dev/null +++ b/install/ubuntu/15.04/fail2ban/filter.d/vesta.conf @@ -0,0 +1,10 @@ +# Fail2Ban filter for unsuccesfull Vesta authentication attempts +# + +[INCLUDES] +before = common.conf + +[Definition] +failregex = .* failed to login +ignoreregex = + diff --git a/install/ubuntu/15.04/fail2ban/jail.local b/install/ubuntu/15.04/fail2ban/jail.local new file mode 100644 index 000000000..eccea0685 --- /dev/null +++ b/install/ubuntu/15.04/fail2ban/jail.local @@ -0,0 +1,39 @@ +[ssh-iptables] +enabled = true +filter = sshd +action = vesta[name=SSH] +logpath = /var/log/auth.log +maxretry = 5 + +[vsftpd-iptables] +enabled = false +filter = vsftpd +action = vesta[name=FTP] +logpath = /var/log/vsftpd.log +maxretry = 5 + +[exim-iptables] +enabled = true +filter = exim +action = vesta[name=MAIL] +logpath = /var/log/exim4/mainlog + +[dovecot-iptables] +enabled = true +filter = dovecot +action = vesta[name=MAIL] +logpath = /var/log/dovecot.log + +[mysqld-iptables] +enabled = false +filter = mysqld-auth +action = vesta[name=DB] +logpath = /var/log/mysql.log +maxretry = 5 + +[vesta-iptables] +enabled = true +filter = vesta +action = vesta[name=VESTA] +logpath = /var/log/vesta/auth.log +maxretry = 5 diff --git a/install/ubuntu/15.04/firewall.tar.gz b/install/ubuntu/15.04/firewall.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..e8556008077364323d7d6b6934e7a2cf7a734983 GIT binary patch literal 540 zcmV+%0^|K3iwFQ5XyQ}=1MQVdkJ>O4Mzij(@XnhsKo&*MSlh#7(1g=&0&FEG%?Me6ampuO4>y-_`!)kpP&FT0Pj|*j)GSV93 zG0u%P9?@5H>Ue&9TJ8w(mS4U;YbU>kw!5dto6pc!`1H`piz?!Qs? zZ2zTY(j)A}O)l`C?|(Hfn=&r%X0(YbN~&_+%&1`W&E*1z3IZzVUki(*D`*Kk5kQkG z1wFz!17_g@d9ch)G0;wCGL8I9sNtr~X-yEB=^d3PuoC0XT$oBik3eT~aJ zPYYM7vf@1@^`frQB1w}O-E1jovb=r04Y>?eKuHocY1?18ny~4FyPO>aM4!NUUOmFePy(-1M3SddTi>v8NVjB&*t=IgAYbgkDfmmx*FWy-yM^~-2uA1 z`-8QZ4$iCJUfZClsXi!k+gGp^gsj(jT}WJxQ(W4?Rswg^FKlTCd%;5d=XH e1VIo4K@bE%5ClOG1VIqwGCu%8Tmj4gC;$K)2?m1z literal 0 HcmV?d00001 diff --git a/install/ubuntu/15.04/firewall/ports.conf b/install/ubuntu/15.04/firewall/ports.conf new file mode 100644 index 000000000..a6ef4dae5 --- /dev/null +++ b/install/ubuntu/15.04/firewall/ports.conf @@ -0,0 +1,16 @@ +PROTOCOL='TCP' PORT='20' +PROTOCOL='TCP' PORT='21' +PROTOCOL='TCP' PORT='22' +PROTOCOL='TCP' PORT='25' +PROTOCOL='UDP' PORT='53' +PROTOCOL='TCP' PORT='80' +PROTOCOL='TCP' PORT='443' +PROTOCOL='TCP' PORT='110' +PROTOCOL='UDP' PORT='123' +PROTOCOL='TCP' PORT='143' +PROTOCOL='TCP' PORT='3306' +PROTOCOL='TCP' PORT='5432' +PROTOCOL='TCP' PORT='8080' +PROTOCOL='TCP' PORT='8433' +PROTOCOL='TCP' PORT='8083' +PROTOCOL='TCP' PORT='12000:12100' diff --git a/install/ubuntu/15.04/firewall/rules.conf b/install/ubuntu/15.04/firewall/rules.conf new file mode 100644 index 000000000..956c2e1d9 --- /dev/null +++ b/install/ubuntu/15.04/firewall/rules.conf @@ -0,0 +1,10 @@ +RULE='1' ACTION='ACCEPT' PROTOCOL='ICMP' PORT='0' IP='0.0.0.0/0' COMMENT='PING' SUSPENDED='no' TIME='17:13:48' DATE='2014-09-16' +RULE='2' ACTION='ACCEPT' PROTOCOL='TCP' PORT='8083' IP='0.0.0.0/0' COMMENT='VESTA' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' +RULE='3' ACTION='ACCEPT' PROTOCOL='TCP' PORT='3306,5432' IP='0.0.0.0/0' COMMENT='DB' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' +RULE='4' ACTION='ACCEPT' PROTOCOL='TCP' PORT='143,993' IP='0.0.0.0/0' COMMENT='IMAP' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' +RULE='5' ACTION='ACCEPT' PROTOCOL='TCP' PORT='110,995' IP='0.0.0.0/0' COMMENT='POP3' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' +RULE='6' ACTION='ACCEPT' PROTOCOL='TCP' PORT='25,465,587,2525' IP='0.0.0.0/0' COMMENT='SMTP' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' +RULE='7' ACTION='ACCEPT' PROTOCOL='UDP' PORT='53' IP='0.0.0.0/0' COMMENT='DNS' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' +RULE='8' ACTION='ACCEPT' PROTOCOL='TCP' PORT='21,12000-12100' IP='0.0.0.0/0' COMMENT='FTP' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' +RULE='9' ACTION='ACCEPT' PROTOCOL='TCP' PORT='80,443' IP='0.0.0.0/0' COMMENT='WEB' SUSPENDED='no' TIME='17:04:27' DATE='2014-09-24' +RULE='10' ACTION='ACCEPT' PROTOCOL='TCP' PORT='22' IP='0.0.0.0/0' COMMENT='SSH' SUSPENDED='no' TIME='17:14:41' DATE='2014-09-16' diff --git a/install/ubuntu/15.04/logrotate/apache2 b/install/ubuntu/15.04/logrotate/apache2 new file mode 100644 index 000000000..27629d0dd --- /dev/null +++ b/install/ubuntu/15.04/logrotate/apache2 @@ -0,0 +1,19 @@ +/var/log/apache2/*.log /var/log/apache2/domains/*log { + weekly + missingok + rotate 52 + compress + delaycompress + notifempty + create 640 root adm + sharedscripts + postrotate + /etc/init.d/apache2 reload > /dev/null || true + [ ! -f /var/run/nginx.pid ] || kill -USR1 `cat /var/run/nginx.pid` + endscript + prerotate + if [ -d /etc/logrotate.d/httpd-prerotate ]; then \ + run-parts /etc/logrotate.d/httpd-prerotate; \ + fi; \ + endscript +} diff --git a/install/ubuntu/15.04/logrotate/nginx b/install/ubuntu/15.04/logrotate/nginx new file mode 100644 index 000000000..d667f2135 --- /dev/null +++ b/install/ubuntu/15.04/logrotate/nginx @@ -0,0 +1,13 @@ +/var/log/nginx/*log /var/log/nginx/domains/*log { + daily + missingok + rotate 52 + compress + delaycompress + notifempty + create 640 nginx adm + sharedscripts + postrotate + [ -f /var/run/nginx.pid ] && kill -USR1 `cat /var/run/nginx.pid` + endscript +} diff --git a/install/ubuntu/15.04/logrotate/vesta b/install/ubuntu/15.04/logrotate/vesta new file mode 100644 index 000000000..027a34396 --- /dev/null +++ b/install/ubuntu/15.04/logrotate/vesta @@ -0,0 +1,7 @@ +/usr/local/vesta/log/*.log { + missingok + notifempty + size 30k + yearly + create 0600 root root +} diff --git a/install/ubuntu/15.04/mysql/my-large.cnf b/install/ubuntu/15.04/mysql/my-large.cnf new file mode 100644 index 000000000..d0bab3907 --- /dev/null +++ b/install/ubuntu/15.04/mysql/my-large.cnf @@ -0,0 +1,42 @@ +[client] +port=3306 +socket=/var/run/mysqld/mysqld.sock + +[mysqld_safe] +socket=/var/run/mysqld/mysqld.sock + +[mysqld] +user=mysql +pid-file=/var/run/mysqld/mysqld.pid +socket=/var/run/mysqld/mysqld.sock +port=3306 +basedir=/usr +datadir=/var/lib/mysql +tmpdir=/tmp +lc-messages-dir=/usr/share/mysql +log_error=/var/log/mysql/error.log + +symbolic-links=0 + +skip-external-locking +key_buffer_size = 256M +max_allowed_packet = 32M +table_open_cache = 256 +sort_buffer_size = 1M +read_buffer_size = 1M +read_rnd_buffer_size = 4M +myisam_sort_buffer_size = 64M +thread_cache_size = 8 +query_cache_size= 16M +thread_concurrency = 8 + +#innodb_use_native_aio = 0 +innodb_file_per_table + +max_connections=200 +max_user_connections=50 +wait_timeout=10 +interactive_timeout=50 +long_query_time=5 + +!includedir /etc/mysql/conf.d/ diff --git a/install/ubuntu/15.04/mysql/my-medium.cnf b/install/ubuntu/15.04/mysql/my-medium.cnf new file mode 100644 index 000000000..1c10ab9a6 --- /dev/null +++ b/install/ubuntu/15.04/mysql/my-medium.cnf @@ -0,0 +1,40 @@ +[client] +port=3306 +socket=/var/run/mysqld/mysqld.sock + +[mysqld_safe] +socket=/var/run/mysqld/mysqld.sock + +[mysqld] +user=mysql +pid-file=/var/run/mysqld/mysqld.pid +socket=/var/run/mysqld/mysqld.sock +port=3306 +basedir=/usr +datadir=/var/lib/mysql +tmpdir=/tmp +lc-messages-dir=/usr/share/mysql +log_error=/var/log/mysql/error.log + +symbolic-links=0 + +skip-external-locking +key_buffer_size = 16M +max_allowed_packet = 16M +table_open_cache = 64 +sort_buffer_size = 512K +net_buffer_length = 8K +read_buffer_size = 256K +read_rnd_buffer_size = 512K +myisam_sort_buffer_size = 8M + +#innodb_use_native_aio = 0 +innodb_file_per_table + +max_connections=70 +max_user_connections=30 +wait_timeout=10 +interactive_timeout=50 +long_query_time=5 + +!includedir /etc/mysql/conf.d/ diff --git a/install/ubuntu/15.04/mysql/my-small.cnf b/install/ubuntu/15.04/mysql/my-small.cnf new file mode 100644 index 000000000..26a804781 --- /dev/null +++ b/install/ubuntu/15.04/mysql/my-small.cnf @@ -0,0 +1,40 @@ +[client] +port=3306 +socket=/var/run/mysqld/mysqld.sock + +[mysqld_safe] +socket=/var/run/mysqld/mysqld.sock + +[mysqld] +user=mysql +pid-file=/var/run/mysqld/mysqld.pid +socket=/var/run/mysqld/mysqld.sock +port=3306 +basedir=/usr +datadir=/var/lib/mysql +tmpdir=/tmp +lc-messages-dir=/usr/share/mysql +log_error=/var/log/mysql/error.log + +symbolic-links=0 + +skip-external-locking +key_buffer_size = 16K +max_allowed_packet = 1M +table_open_cache = 4 +sort_buffer_size = 64K +read_buffer_size = 256K +read_rnd_buffer_size = 256K +net_buffer_length = 2K +thread_stack = 240K + +#innodb_use_native_aio = 0 +innodb_file_per_table + +max_connections=30 +max_user_connections=20 +wait_timeout=10 +interactive_timeout=50 +long_query_time=5 + +!includedir /etc/mysql/conf.d/ diff --git a/install/ubuntu/15.04/nginx/nginx.conf b/install/ubuntu/15.04/nginx/nginx.conf new file mode 100644 index 000000000..7937301c1 --- /dev/null +++ b/install/ubuntu/15.04/nginx/nginx.conf @@ -0,0 +1,124 @@ +# Server globals +user www-data; +worker_processes 2; +error_log /var/log/nginx/error.log; +pid /var/run/nginx.pid; + + +# Worker config +events { + worker_connections 1024; + use epoll; +} + + +http { + # Main settings + sendfile on; + tcp_nopush on; + tcp_nodelay on; + client_header_timeout 1m; + client_body_timeout 1m; + client_header_buffer_size 2k; + client_body_buffer_size 256k; + client_max_body_size 100m; + large_client_header_buffers 4 8k; + send_timeout 30; + keepalive_timeout 60 60; + reset_timedout_connection on; + server_tokens off; + server_name_in_redirect off; + server_names_hash_max_size 512; + server_names_hash_bucket_size 512; + + + # Log format + log_format main '$remote_addr - $remote_user [$time_local] $request ' + '"$status" $body_bytes_sent "$http_referer" ' + '"$http_user_agent" "$http_x_forwarded_for"'; + log_format bytes '$body_bytes_sent'; + #access_log /var/log/nginx/access.log main; + access_log off; + + + # Mime settings + include /etc/nginx/mime.types; + default_type application/octet-stream; + + + # Compression + gzip on; + gzip_comp_level 9; + gzip_min_length 512; + gzip_buffers 8 64k; + gzip_types text/plain text/css text/javascript + application/x-javascript; + gzip_proxied any; + + + # Proxy settings + proxy_redirect off; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_pass_header Set-Cookie; + proxy_connect_timeout 90; + proxy_send_timeout 90; + proxy_read_timeout 90; + proxy_buffers 32 4k; + + + # Cloudflare https://www.cloudflare.com/ips + set_real_ip_from 199.27.128.0/21; + set_real_ip_from 173.245.48.0/20; + set_real_ip_from 103.21.244.0/22; + set_real_ip_from 103.22.200.0/22; + set_real_ip_from 103.31.4.0/22; + set_real_ip_from 141.101.64.0/18; + set_real_ip_from 108.162.192.0/18; + set_real_ip_from 190.93.240.0/20; + set_real_ip_from 188.114.96.0/20; + set_real_ip_from 197.234.240.0/22; + set_real_ip_from 198.41.128.0/17; + set_real_ip_from 162.158.0.0/15; + set_real_ip_from 104.16.0.0/12; + set_real_ip_from 172.64.0.0/13; + #set_real_ip_from 2400:cb00::/32; + #set_real_ip_from 2606:4700::/32; + #set_real_ip_from 2803:f800::/32; + #set_real_ip_from 2405:b500::/32; + #set_real_ip_from 2405:8100::/32; + real_ip_header CF-Connecting-IP; + + + # SSL PCI Compliance + ssl_session_cache shared:SSL:10m; + ssl_protocols TLSv1 TLSv1.1 TLSv1.2; + ssl_prefer_server_ciphers on; + ssl_ciphers "ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA:ECDHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES128-SHA256:DHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES256-GCM-SHA384:AES128-GCM-SHA256:AES256-SHA256:AES128-SHA256:AES256-SHA:AES128-SHA:DES-CBC3-SHA:HIGH:!aNULL:!eNULL:!EXPORT:!DES:!MD5:!PSK:!RC4"; + + + # Error pages + error_page 403 /error/403.html; + error_page 404 /error/404.html; + error_page 502 503 504 /error/50x.html; + + + # Cache + proxy_cache_path /var/cache/nginx levels=2 keys_zone=cache:10m inactive=60m max_size=512m; + proxy_cache_key "$host$request_uri $cookie_user"; + proxy_temp_path /var/cache/nginx/temp; + proxy_ignore_headers Expires Cache-Control; + proxy_cache_use_stale error timeout invalid_header http_502; + proxy_cache_valid any 3d; + + map $http_cookie $no_cache { + default 0; + ~SESS 1; + ~wordpress_logged_in 1; + } + + + # Wildcard include + include /etc/nginx/conf.d/*.conf; +} diff --git a/install/ubuntu/15.04/nginx/phpmyadmin.inc b/install/ubuntu/15.04/nginx/phpmyadmin.inc new file mode 100644 index 000000000..d70ca3e3c --- /dev/null +++ b/install/ubuntu/15.04/nginx/phpmyadmin.inc @@ -0,0 +1,15 @@ +location /phpmyadmin { + alias /usr/share/phpmyadmin/; + + location ~ /(libraries|setup) { + return 404; + } + + location ~ ^/phpmyadmin/(.*\.php)$ { + alias /usr/share/phpmyadmin/$1; + fastcgi_pass 127.0.0.1:9000; + fastcgi_index index.php; + include fastcgi_params; + fastcgi_param SCRIPT_FILENAME $request_filename; + } +} diff --git a/install/ubuntu/15.04/nginx/phppgadmin.inc b/install/ubuntu/15.04/nginx/phppgadmin.inc new file mode 100644 index 000000000..cd1e5806b --- /dev/null +++ b/install/ubuntu/15.04/nginx/phppgadmin.inc @@ -0,0 +1,11 @@ +location /phppgadmin { + alias /usr/share/phppgadmin/; + + location ~ ^/phppgadmin/(.*\.php)$ { + alias /usr/share/phppgadmin/$1; + fastcgi_pass 127.0.0.1:9000; + fastcgi_index index.php; + include fastcgi_params; + fastcgi_param SCRIPT_FILENAME $request_filename; + } +} diff --git a/install/ubuntu/15.04/nginx/status.conf b/install/ubuntu/15.04/nginx/status.conf new file mode 100644 index 000000000..c0bcd0691 --- /dev/null +++ b/install/ubuntu/15.04/nginx/status.conf @@ -0,0 +1,9 @@ +server { + listen 127.0.0.1:8084 default; + server_name _; + server_name_in_redirect off; + location / { + stub_status on; + access_log off; + } +} diff --git a/install/ubuntu/15.04/nginx/webmail.inc b/install/ubuntu/15.04/nginx/webmail.inc new file mode 100644 index 000000000..ad66895bc --- /dev/null +++ b/install/ubuntu/15.04/nginx/webmail.inc @@ -0,0 +1,15 @@ +location /webmail { + alias /var/lib/roundcube/; + + location ~ /(config|temp|logs) { + return 404; + } + + location ~ ^/webmail/(.*\.php)$ { + alias /var/lib/roundcube/$1; + fastcgi_pass 127.0.0.1:9000; + fastcgi_index index.php; + include fastcgi_params; + fastcgi_param SCRIPT_FILENAME $request_filename; + } +} diff --git a/install/ubuntu/15.04/packages.tar.gz b/install/ubuntu/15.04/packages.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..4b778dadce20a61f03a8ca920ec81c55a8730fee GIT binary patch literal 562 zcmV-20?qv&iwFRHoJ3Lp1MQYgkD5>vhFSY7+_9e37(#VaFxE7E(hXh3fdi2rFJZkFya3gX^b)n zVXSCG>M9q!r;?X63%1>^6fD25GP?9(Zs8i zm#eSAOO(kSvCYUG8}`JzlNGcp7>;dtR#6ZOYcoV)W|{76R22A_Q=gJo4AXSy6Mw(T z@QvYNS99i079ZTgdF&uH#Hm!H2Tkno>k1^mATb^lABoBo#r=lG9NGXU~REdk0(83B2vo&kr_ zAp~{{4=IqJS7Kl{UdaJ`lmmICl^~$|AizYY10B;!5Re`k^vG)ug3|w@mF?UAH~v$N z5%B*SfdB3Ik9DT%#Rp2&fAy{S9|r3<{gP~x+kO96-v30?!2fG-8UK&;KeGQw{$uw~ zsNXQZA^ut3x1l|*XixdCp}qF{wFdwI0000000000000000RC})0(q@EkpL(F05 diff --git a/install/ubuntu/15.04/pga/phppgadmin.conf b/install/ubuntu/15.04/pga/phppgadmin.conf new file mode 100644 index 000000000..f39247d6f --- /dev/null +++ b/install/ubuntu/15.04/pga/phppgadmin.conf @@ -0,0 +1,31 @@ +Alias /phppgadmin /usr/share/phppgadmin + + + +DirectoryIndex index.php +AllowOverride None + +order deny,allow +deny from all +allow from 127.0.0.0/255.0.0.0 ::1/128 +allow from all + + + php_flag magic_quotes_gpc Off + php_flag track_vars On + php_value include_path . + + + + + AddType application/x-httpd-php .php + Action application/x-httpd-php /cgi-bin/php + + + AddType application/x-httpd-php .php + Action application/x-httpd-php /cgi-bin/php + + + + + diff --git a/install/ubuntu/15.04/php5-fpm/www.conf b/install/ubuntu/15.04/php5-fpm/www.conf new file mode 100644 index 000000000..d046bceef --- /dev/null +++ b/install/ubuntu/15.04/php5-fpm/www.conf @@ -0,0 +1,10 @@ +[www] +listen = 127.0.0.1:9000 +listen.allowed_clients = 127.0.0.1 +user = www-data +group = www-data +pm = dynamic +pm.max_children = 50 +pm.start_servers = 5 +pm.min_spare_servers = 3 +pm.max_spare_servers = 35 diff --git a/install/ubuntu/15.04/pma/apache.conf b/install/ubuntu/15.04/pma/apache.conf new file mode 100644 index 000000000..2a8f69e25 --- /dev/null +++ b/install/ubuntu/15.04/pma/apache.conf @@ -0,0 +1,42 @@ +# phpMyAdmin default Apache configuration + +Alias /phpmyadmin /usr/share/phpmyadmin + + + Options FollowSymLinks + DirectoryIndex index.php + + + AddType application/x-httpd-php .php + + php_flag magic_quotes_gpc Off + php_flag track_vars On + php_flag register_globals Off + php_admin_flag allow_url_fopen Off + php_value include_path . + php_admin_value upload_tmp_dir /var/lib/phpmyadmin/tmp + php_admin_value open_basedir /usr/share/phpmyadmin/:/etc/phpmyadmin/:/var/lib/phpmyadmin/:/usr/share/php/php-gettext + + + + +# Authorize for setup + + + AuthType Basic + AuthName "phpMyAdmin Setup" + AuthUserFile /etc/phpmyadmin/htpasswd.setup + + Require valid-user + + +# Disallow web access to directories that don't need it + + Order Deny,Allow + Deny from All + + + Order Deny,Allow + Deny from All + + diff --git a/install/ubuntu/15.04/pma/config.inc.php b/install/ubuntu/15.04/pma/config.inc.php new file mode 100644 index 000000000..a643a065b --- /dev/null +++ b/install/ubuntu/15.04/pma/config.inc.php @@ -0,0 +1,146 @@ + + VRootEngine on + VRootAlias /etc/security/pam_env.conf etc/security/pam_env.conf + + +AuthPAMConfig proftpd +AuthOrder mod_auth_pam.c* mod_auth_unix.c +UseReverseDNS off +User proftpd +Group nogroup +MaxInstances 20 +UseSendfile off +LogFormat default "%h %l %u %t \"%r\" %s %b" +LogFormat auth "%v [%P] %h %t \"%r\" %s" +ListOptions -a +RequireValidShell off +PassivePorts 12000 12100 + + + Umask 002 + IdentLookups off + AllowOverwrite yes + + AllowAll + + diff --git a/install/ubuntu/15.04/roundcube/apache.conf b/install/ubuntu/15.04/roundcube/apache.conf new file mode 100644 index 000000000..a0c87bcc6 --- /dev/null +++ b/install/ubuntu/15.04/roundcube/apache.conf @@ -0,0 +1,40 @@ +Alias /roundcube/program/js/tiny_mce/ /usr/share/tinymce/www/ +Alias /roundcube /var/lib/roundcube +Alias /webmail /var/lib/roundcube + +# Access to tinymce files + + Options Indexes MultiViews FollowSymLinks + AllowOverride None + Order allow,deny + allow from all + + + + Options +FollowSymLinks + # This is needed to parse /var/lib/roundcube/.htaccess. See its + # content before setting AllowOverride to None. + AllowOverride All + order allow,deny + allow from all + + +# Protecting basic directories: + + Options -FollowSymLinks + AllowOverride None + + + + Options -FollowSymLinks + AllowOverride None + Order allow,deny + Deny from all + + + + Options -FollowSymLinks + AllowOverride None + Order allow,deny + Deny from all + diff --git a/install/ubuntu/15.04/roundcube/config.inc.php b/install/ubuntu/15.04/roundcube/config.inc.php new file mode 100644 index 000000000..0c82b1bc1 --- /dev/null +++ b/install/ubuntu/15.04/roundcube/config.inc.php @@ -0,0 +1,33 @@ + diff --git a/install/ubuntu/15.04/roundcube/main.inc.php b/install/ubuntu/15.04/roundcube/main.inc.php new file mode 100644 index 000000000..97cdbf2df --- /dev/null +++ b/install/ubuntu/15.04/roundcube/main.inc.php @@ -0,0 +1,850 @@ +/sendmail or to syslog +$rcmail_config['smtp_log'] = true; + +// Log successful logins to /userlogins or to syslog +$rcmail_config['log_logins'] = false; + +// Log session authentication errors to /session or to syslog +$rcmail_config['log_session'] = false; + +// Log SQL queries to /sql or to syslog +$rcmail_config['sql_debug'] = false; + +// Log IMAP conversation to /imap or to syslog +$rcmail_config['imap_debug'] = false; + +// Log LDAP conversation to /ldap or to syslog +$rcmail_config['ldap_debug'] = false; + +// Log SMTP conversation to /smtp or to syslog +$rcmail_config['smtp_debug'] = false; + +// ---------------------------------- +// IMAP +// ---------------------------------- + +// the mail host chosen to perform the log-in +// leave blank to show a textbox at login, give a list of hosts +// to display a pulldown menu or set one host as string. +// To use SSL/TLS connection, enter hostname with prefix ssl:// or tls:// +// Supported replacement variables: +// %n - http hostname ($_SERVER['SERVER_NAME']) +// %d - domain (http hostname without the first part) +// %s - domain name after the '@' from e-mail address provided at login screen +// For example %n = mail.domain.tld, %d = domain.tld +$rcmail_config['default_host'] = 'localhost'; + +// TCP port used for IMAP connections +$rcmail_config['default_port'] = 143; + +// IMAP AUTH type (DIGEST-MD5, CRAM-MD5, LOGIN, PLAIN or empty to use +// best server supported one) +$rcmail_config['imap_auth_type'] = null; + +// If you know your imap's folder delimiter, you can specify it here. +// Otherwise it will be determined automatically +$rcmail_config['imap_delimiter'] = null; + +// If IMAP server doesn't support NAMESPACE extension, but you're +// using shared folders or personal root folder is non-empty, you'll need to +// set these options. All can be strings or arrays of strings. +// Folders need to be ended with directory separator, e.g. "INBOX." +// (special directory "~" is an exception to this rule) +// These can be used also to overwrite server's namespaces +$rcmail_config['imap_ns_personal'] = null; +$rcmail_config['imap_ns_other'] = null; +$rcmail_config['imap_ns_shared'] = null; + +// By default IMAP capabilities are readed after connection to IMAP server +// In some cases, e.g. when using IMAP proxy, there's a need to refresh the list +// after login. Set to True if you've got this case. +$rcmail_config['imap_force_caps'] = false; + +// By default list of subscribed folders is determined using LIST-EXTENDED +// extension if available. Some servers (dovecot 1.x) returns wrong results +// for shared namespaces in this case. http://trac.roundcube.net/ticket/1486225 +// Enable this option to force LSUB command usage instead. +$rcmail_config['imap_force_lsub'] = false; + +// Some server configurations (e.g. Courier) doesn't list folders in all namespaces +// Enable this option to force listing of folders in all namespaces +$rcmail_config['imap_force_ns'] = false; + +// IMAP connection timeout, in seconds. Default: 0 (no limit) +$rcmail_config['imap_timeout'] = 0; + +// Optional IMAP authentication identifier to be used as authorization proxy +$rcmail_config['imap_auth_cid'] = null; + +// Optional IMAP authentication password to be used for imap_auth_cid +$rcmail_config['imap_auth_pw'] = null; + +// Type of IMAP indexes cache. Supported values: 'db', 'apc' and 'memcache'. +$rcmail_config['imap_cache'] = null; + +// Enables messages cache. Only 'db' cache is supported. +$rcmail_config['messages_cache'] = false; + + +// ---------------------------------- +// SMTP +// ---------------------------------- + +// SMTP server host (for sending mails). +// To use SSL/TLS connection, enter hostname with prefix ssl:// or tls:// +// If left blank, the PHP mail() function is used +// Supported replacement variables: +// %h - user's IMAP hostname +// %n - http hostname ($_SERVER['SERVER_NAME']) +// %d - domain (http hostname without the first part) +// %z - IMAP domain (IMAP hostname without the first part) +// For example %n = mail.domain.tld, %d = domain.tld +$rcmail_config['smtp_server'] = ''; + +// SMTP port (default is 25; use 587 for STARTTLS or 465 for the +// deprecated SSL over SMTP (aka SMTPS)) +$rcmail_config['smtp_port'] = 25; + +// SMTP username (if required) if you use %u as the username Roundcube +// will use the current username for login +$rcmail_config['smtp_user'] = ''; + +// SMTP password (if required) if you use %p as the password Roundcube +// will use the current user's password for login +$rcmail_config['smtp_pass'] = ''; + +// SMTP AUTH type (DIGEST-MD5, CRAM-MD5, LOGIN, PLAIN or empty to use +// best server supported one) +$rcmail_config['smtp_auth_type'] = ''; + +// Optional SMTP authentication identifier to be used as authorization proxy +$rcmail_config['smtp_auth_cid'] = null; + +// Optional SMTP authentication password to be used for smtp_auth_cid +$rcmail_config['smtp_auth_pw'] = null; + +// SMTP HELO host +// Hostname to give to the remote server for SMTP 'HELO' or 'EHLO' messages +// Leave this blank and you will get the server variable 'server_name' or +// localhost if that isn't defined. +$rcmail_config['smtp_helo_host'] = ''; + +// SMTP connection timeout, in seconds. Default: 0 (no limit) +$rcmail_config['smtp_timeout'] = 0; + +// ---------------------------------- +// SYSTEM +// ---------------------------------- +include_once("/etc/roundcube/debian-db-roundcube.php"); + + +// THIS OPTION WILL ALLOW THE INSTALLER TO RUN AND CAN EXPOSE SENSITIVE CONFIG DATA. +// ONLY ENABLE IT IF YOU'RE REALLY SURE WHAT YOU'RE DOING! +$rcmail_config['enable_installer'] = false; + +// provide an URL where a user can get support for this Roundcube installation +// PLEASE DO NOT LINK TO THE ROUNDCUBE.NET WEBSITE HERE! +$rcmail_config['support_url'] = ''; + +// replace Roundcube logo with this image +// specify an URL relative to the document root of this Roundcube installation +$rcmail_config['skin_logo'] = null; + +// automatically create a new Roundcube user when log-in the first time. +// a new user will be created once the IMAP login succeeds. +// set to false if only registered users can use this service +$rcmail_config['auto_create_user'] = true; + +// use this folder to store log files (must be writeable for apache user) +// This is used by the 'file' log driver. +$rcmail_config['log_dir'] = '/var/log/roundcubemail/'; + +// use this folder to store temp files (must be writeable for apache user) +$rcmail_config['temp_dir'] = '/tmp'; + +// lifetime of message cache +// possible units: s, m, h, d, w +$rcmail_config['message_cache_lifetime'] = '10d'; + +// enforce connections over https +// with this option enabled, all non-secure connections will be redirected. +// set the port for the ssl connection as value of this option if it differs from the default 443 +$rcmail_config['force_https'] = false; + +// tell PHP that it should work as under secure connection +// even if it doesn't recognize it as secure ($_SERVER['HTTPS'] is not set) +// e.g. when you're running Roundcube behind a https proxy +// this option is mutually exclusive to 'force_https' and only either one of them should be set to true. +$rcmail_config['use_https'] = false; + +// Allow browser-autocompletion on login form. +// 0 - disabled, 1 - username and host only, 2 - username, host, password +$rcmail_config['login_autocomplete'] = 0; + +// Forces conversion of logins to lower case. +// 0 - disabled, 1 - only domain part, 2 - domain and local part. +// If users authentication is not case-sensitive this must be enabled. +// After enabling it all user records need to be updated, e.g. with query: +// UPDATE users SET username = LOWER(username); +$rcmail_config['login_lc'] = 0; + +// Includes should be interpreted as PHP files +$rcmail_config['skin_include_php'] = false; + +// display software version on login screen +$rcmail_config['display_version'] = false; + +// Session lifetime in minutes +// must be greater than 'keep_alive'/60 +$rcmail_config['session_lifetime'] = 10; + +// session domain: .example.org +$rcmail_config['session_domain'] = ''; + +// session name. Default: 'roundcube_sessid' +$rcmail_config['session_name'] = null; + +// Backend to use for session storage. Can either be 'db' (default) or 'memcache' +// If set to memcache, a list of servers need to be specified in 'memcache_hosts' +// Make sure the Memcache extension (http://pecl.php.net/package/memcache) version >= 2.0.0 is installed +$rcmail_config['session_storage'] = 'db'; + +// Use these hosts for accessing memcached +// Define any number of hosts in the form of hostname:port or unix:///path/to/sock.file +$rcmail_config['memcache_hosts'] = null; // e.g. array( 'localhost:11211', '192.168.1.12:11211', 'unix:///var/tmp/memcached.sock' ); + +// check client IP in session athorization +$rcmail_config['ip_check'] = false; + +// check referer of incoming requests +$rcmail_config['referer_check'] = false; + +// X-Frame-Options HTTP header value sent to prevent from Clickjacking. +// Possible values: sameorigin|deny. Set to false in order to disable sending them +$rcmail_config['x_frame_options'] = 'sameorigin'; + +// this key is used to encrypt the users imap password which is stored +// in the session record (and the client cookie if remember password is enabled). +// please provide a string of exactly 24 chars. +$rcmail_config['des_key'] = 'vtIOjLZo9kffJoqzpSbm5r1r'; + +// Automatically add this domain to user names for login +// Only for IMAP servers that require full e-mail addresses for login +// Specify an array with 'host' => 'domain' values to support multiple hosts +// Supported replacement variables: +// %h - user's IMAP hostname +// %n - http hostname ($_SERVER['SERVER_NAME']) +// %d - domain (http hostname without the first part) +// %z - IMAP domain (IMAP hostname without the first part) +// For example %n = mail.domain.tld, %d = domain.tld +$rcmail_config['username_domain'] = ''; + +// This domain will be used to form e-mail addresses of new users +// Specify an array with 'host' => 'domain' values to support multiple hosts +// Supported replacement variables: +// %h - user's IMAP hostname +// %n - http hostname ($_SERVER['SERVER_NAME']) +// %d - domain (http hostname without the first part) +// %z - IMAP domain (IMAP hostname without the first part) +// For example %n = mail.domain.tld, %d = domain.tld +$rcmail_config['mail_domain'] = ''; + +// Password charset. +// Use it if your authentication backend doesn't support UTF-8. +// Defaults to ISO-8859-1 for backward compatibility +$rcmail_config['password_charset'] = 'ISO-8859-1'; + +// How many seconds must pass between emails sent by a user +$rcmail_config['sendmail_delay'] = 0; + +// Maximum number of recipients per message. Default: 0 (no limit) +$rcmail_config['max_recipients'] = 0; + +// Maximum allowednumber of members of an address group. Default: 0 (no limit) +// If 'max_recipients' is set this value should be less or equal +$rcmail_config['max_group_members'] = 0; + +// add this user-agent to message headers when sending +$rcmail_config['useragent'] = 'Roundcube Webmail/'.RCMAIL_VERSION; + +// use this name to compose page titles +$rcmail_config['product_name'] = 'Roundcube Webmail'; + +// try to load host-specific configuration +// see http://trac.roundcube.net/wiki/Howto_Config for more details +$rcmail_config['include_host_config'] = false; + +// path to a text file which will be added to each sent message +// paths are relative to the Roundcube root folder +$rcmail_config['generic_message_footer'] = ''; + +// path to a text file which will be added to each sent HTML message +// paths are relative to the Roundcube root folder +$rcmail_config['generic_message_footer_html'] = ''; + +// add a received header to outgoing mails containing the creators IP and hostname +$rcmail_config['http_received_header'] = false; + +// Whether or not to encrypt the IP address and the host name +// these could, in some circles, be considered as sensitive information; +// however, for the administrator, these could be invaluable help +// when tracking down issues. +$rcmail_config['http_received_header_encrypt'] = false; + +// This string is used as a delimiter for message headers when sending +// a message via mail() function. Leave empty for auto-detection +$rcmail_config['mail_header_delimiter'] = NULL; + +// number of chars allowed for line when wrapping text. +// text wrapping is done when composing/sending messages +$rcmail_config['line_length'] = 72; + +// send plaintext messages as format=flowed +$rcmail_config['send_format_flowed'] = true; + +// don't allow these settings to be overriden by the user +$rcmail_config['dont_override'] = array(); + +// Set identities access level: +// 0 - many identities with possibility to edit all params +// 1 - many identities with possibility to edit all params but not email address +// 2 - one identity with possibility to edit all params +// 3 - one identity with possibility to edit all params but not email address +$rcmail_config['identities_level'] = 0; + +// Mimetypes supported by the browser. +// attachments of these types will open in a preview window +// either a comma-separated list or an array: 'text/plain,text/html,text/xml,image/jpeg,image/gif,image/png,application/pdf' +$rcmail_config['client_mimetypes'] = null; # null == default + +// mime magic database +$rcmail_config['mime_magic'] = null; + +// path to imagemagick identify binary +$rcmail_config['im_identify_path'] = null; + +// path to imagemagick convert binary +$rcmail_config['im_convert_path'] = null; + +// maximum size of uploaded contact photos in pixel +$rcmail_config['contact_photo_size'] = 160; + +// Enable DNS checking for e-mail address validation +$rcmail_config['email_dns_check'] = false; + +// ---------------------------------- +// PLUGINS +// ---------------------------------- + +// List of active plugins (in plugins/ directory) +$rcmail_config['plugins'] = array('password'); + +// ---------------------------------- +// USER INTERFACE +// ---------------------------------- + +// default messages sort column. Use empty value for default server's sorting, +// or 'arrival', 'date', 'subject', 'from', 'to', 'fromto', 'size', 'cc' +$rcmail_config['message_sort_col'] = ''; + +// default messages sort order +$rcmail_config['message_sort_order'] = 'DESC'; + +// These cols are shown in the message list. Available cols are: +// subject, from, to, fromto, cc, replyto, date, size, status, flag, attachment, 'priority' +$rcmail_config['list_cols'] = array('subject', 'status', 'fromto', 'date', 'size', 'flag', 'attachment'); + +// the default locale setting (leave empty for auto-detection) +// RFC1766 formatted language name like en_US, de_DE, de_CH, fr_FR, pt_BR +$rcmail_config['language'] = null; + +// use this format for date display (date or strftime format) +$rcmail_config['date_format'] = 'Y-m-d'; + +// give this choice of date formats to the user to select from +$rcmail_config['date_formats'] = array('Y-m-d', 'd-m-Y', 'Y/m/d', 'm/d/Y', 'd/m/Y', 'd.m.Y', 'j.n.Y'); + +// use this format for time display (date or strftime format) +$rcmail_config['time_format'] = 'H:i'; + +// give this choice of time formats to the user to select from +$rcmail_config['time_formats'] = array('G:i', 'H:i', 'g:i a', 'h:i A'); + +// use this format for short date display (derived from date_format and time_format) +$rcmail_config['date_short'] = 'D H:i'; + +// use this format for detailed date/time formatting (derived from date_format and time_format) +$rcmail_config['date_long'] = 'Y-m-d H:i'; + +// store draft message is this mailbox +// leave blank if draft messages should not be stored +// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP) +$rcmail_config['drafts_mbox'] = 'Drafts'; + +// store spam messages in this mailbox +// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP) +$rcmail_config['junk_mbox'] = 'Spam'; + +// store sent message is this mailbox +// leave blank if sent messages should not be stored +// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP) +$rcmail_config['sent_mbox'] = 'Sent'; + +// move messages to this folder when deleting them +// leave blank if they should be deleted directly +// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP) +$rcmail_config['trash_mbox'] = 'Trash'; + +// display these folders separately in the mailbox list. +// these folders will also be displayed with localized names +// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP) +$rcmail_config['default_folders'] = array('INBOX', 'Drafts', 'Sent', 'Spam', 'Trash'); +$rcmail_config['default_imap_folders'] = array('INBOX', 'Drafts', 'Sent', 'Spam', 'Trash'); + +// automatically create the above listed default folders on first login +$rcmail_config['create_default_folders'] = true; + +// protect the default folders from renames, deletes, and subscription changes +$rcmail_config['protect_default_folders'] = true; + +// if in your system 0 quota means no limit set this option to true +$rcmail_config['quota_zero_as_unlimited'] = false; + +// Make use of the built-in spell checker. It is based on GoogieSpell. +// Since Google only accepts connections over https your PHP installatation +// requires to be compiled with Open SSL support +$rcmail_config['enable_spellcheck'] = true; + +// Enables spellchecker exceptions dictionary. +// Setting it to 'shared' will make the dictionary shared by all users. +$rcmail_config['spellcheck_dictionary'] = false; + +// Set the spell checking engine. 'googie' is the default. 'pspell' is also available, +// but requires the Pspell extensions. When using Nox Spell Server, also set 'googie' here. +$rcmail_config['spellcheck_engine'] = 'googie'; + +// For a locally installed Nox Spell Server, please specify the URI to call it. +// Get Nox Spell Server from http://orangoo.com/labs/?page_id=72 +// Leave empty to use the Google spell checking service, what means +// that the message content will be sent to Google in order to check spelling +$rcmail_config['spellcheck_uri'] = ''; + +// These languages can be selected for spell checking. +// Configure as a PHP style hash array: array('en'=>'English', 'de'=>'Deutsch'); +// Leave empty for default set of available language. +$rcmail_config['spellcheck_languages'] = NULL; + +// Makes that words with all letters capitalized will be ignored (e.g. GOOGLE) +$rcmail_config['spellcheck_ignore_caps'] = false; + +// Makes that words with numbers will be ignored (e.g. g00gle) +$rcmail_config['spellcheck_ignore_nums'] = false; + +// Makes that words with symbols will be ignored (e.g. g@@gle) +$rcmail_config['spellcheck_ignore_syms'] = false; + +// Use this char/string to separate recipients when composing a new message +$rcmail_config['recipients_separator'] = ','; + +// don't let users set pagesize to more than this value if set +$rcmail_config['max_pagesize'] = 200; + +// Minimal value of user's 'keep_alive' setting (in seconds) +// Must be less than 'session_lifetime' +$rcmail_config['min_keep_alive'] = 60; + +// Enables files upload indicator. Requires APC installed and enabled apc.rfc1867 option. +// By default refresh time is set to 1 second. You can set this value to true +// or any integer value indicating number of seconds. +$rcmail_config['upload_progress'] = false; + +// Specifies for how many seconds the Undo button will be available +// after object delete action. Currently used with supporting address book sources. +// Setting it to 0, disables the feature. +$rcmail_config['undo_timeout'] = 0; + +// ---------------------------------- +// ADDRESSBOOK SETTINGS +// ---------------------------------- + +// This indicates which type of address book to use. Possible choises: +// 'sql' (default) and 'ldap'. +// If set to 'ldap' then it will look at using the first writable LDAP +// address book as the primary address book and it will not display the +// SQL address book in the 'Address Book' view. +$rcmail_config['address_book_type'] = 'sql'; + +// In order to enable public ldap search, configure an array like the Verisign +// example further below. if you would like to test, simply uncomment the example. +// Array key must contain only safe characters, ie. a-zA-Z0-9_ +$rcmail_config['ldap_public'] = array(); + +// If you are going to use LDAP for individual address books, you will need to +// set 'user_specific' to true and use the variables to generate the appropriate DNs to access it. +// +// The recommended directory structure for LDAP is to store all the address book entries +// under the users main entry, e.g.: +// +// o=root +// ou=people +// uid=user@domain +// mail=contact@contactdomain +// +// So the base_dn would be uid=%fu,ou=people,o=root +// The bind_dn would be the same as based_dn or some super user login. +/* + * example config for Verisign directory + * +$rcmail_config['ldap_public']['Verisign'] = array( + 'name' => 'Verisign.com', + // Replacement variables supported in host names: + // %h - user's IMAP hostname + // %n - http hostname ($_SERVER['SERVER_NAME']) + // %d - domain (http hostname without the first part) + // %z - IMAP domain (IMAP hostname without the first part) + // For example %n = mail.domain.tld, %d = domain.tld + 'hosts' => array('directory.verisign.com'), + 'port' => 389, + 'use_tls' => false, + 'ldap_version' => 3, // using LDAPv3 + 'user_specific' => false, // If true the base_dn, bind_dn and bind_pass default to the user's IMAP login. + // %fu - The full username provided, assumes the username is an email + // address, uses the username_domain value if not an email address. + // %u - The username prior to the '@'. + // %d - The domain name after the '@'. + // %dc - The domain name hierarchal string e.g. "dc=test,dc=domain,dc=com" + // %dn - DN found by ldap search when search_filter/search_base_dn are used + 'base_dn' => '', + 'bind_dn' => '', + 'bind_pass' => '', + // It's possible to bind for an individual address book + // The login name is used to search for the DN to bind with + 'search_base_dn' => '', + 'search_filter' => '', // e.g. '(&(objectClass=posixAccount)(uid=%u))' + // DN and password to bind as before searching for bind DN, if anonymous search is not allowed + 'search_bind_dn' => '', + 'search_bind_pw' => '', + // Default for %dn variable if search doesn't return DN value + 'search_dn_default' => '', + // Optional authentication identifier to be used as SASL authorization proxy + // bind_dn need to be empty + 'auth_cid' => '', + // SASL authentication method (for proxy auth), e.g. DIGEST-MD5 + 'auth_method' => '', + // Indicates if the addressbook shall be hidden from the list. + // With this option enabled you can still search/view contacts. + 'hidden' => false, + // Indicates if the addressbook shall not list contacts but only allows searching. + 'searchonly' => false, + // Indicates if we can write to the LDAP directory or not. + // If writable is true then these fields need to be populated: + // LDAP_Object_Classes, required_fields, LDAP_rdn + 'writable' => false, + // To create a new contact these are the object classes to specify + // (or any other classes you wish to use). + 'LDAP_Object_Classes' => array('top', 'inetOrgPerson'), + // The RDN field that is used for new entries, this field needs + // to be one of the search_fields, the base of base_dn is appended + // to the RDN to insert into the LDAP directory. + 'LDAP_rdn' => 'cn', + // The required fields needed to build a new contact as required by + // the object classes (can include additional fields not required by the object classes). + 'required_fields' => array('cn', 'sn', 'mail'), + 'search_fields' => array('mail', 'cn'), // fields to search in + // mapping of contact fields to directory attributes + // for every attribute one can specify the number of values (limit) allowed. + // default is 1, a wildcard * means unlimited + 'fieldmap' => array( + // Roundcube => LDAP:limit + 'name' => 'cn', + 'surname' => 'sn', + 'firstname' => 'givenName', + 'title' => 'title', + 'email' => 'mail:*', + 'phone:home' => 'homePhone', + 'phone:work' => 'telephoneNumber', + 'phone:mobile' => 'mobile', + 'phone:pager' => 'pager', + 'street' => 'street', + 'zipcode' => 'postalCode', + 'region' => 'st', + 'locality' => 'l', +// if you uncomment country, you need to modify 'sub_fields' above +// 'country' => 'c', + 'department' => 'departmentNumber', + 'notes' => 'description', +// these currently don't work: +// 'phone:workfax' => 'facsimileTelephoneNumber', +// 'photo' => 'jpegPhoto', +// 'organization' => 'o', +// 'manager' => 'manager', +// 'assistant' => 'secretary', + ), + // Map of contact sub-objects (attribute name => objectClass(es)), e.g. 'c' => 'country' + 'sub_fields' => array(), + 'sort' => 'cn', // The field to sort the listing by. + 'scope' => 'sub', // search mode: sub|base|list + 'filter' => '(objectClass=inetOrgPerson)', // used for basic listing (if not empty) and will be &'d with search queries. example: status=act + 'fuzzy_search' => true, // server allows wildcard search + 'vlv' => false, // Enable Virtual List View to more efficiently fetch paginated data (if server supports it) + 'numsub_filter' => '(objectClass=organizationalUnit)', // with VLV, we also use numSubOrdinates to query the total number of records. Set this filter to get all numSubOrdinates attributes for counting + 'sizelimit' => '0', // Enables you to limit the count of entries fetched. Setting this to 0 means no limit. + 'timelimit' => '0', // Sets the number of seconds how long is spend on the search. Setting this to 0 means no limit. + 'referrals' => true|false, // Sets the LDAP_OPT_REFERRALS option. Mostly used in multi-domain Active Directory setups + + // definition for contact groups (uncomment if no groups are supported) + // for the groups base_dn, the user replacements %fu, %u, $d and %dc work as for base_dn (see above) + // if the groups base_dn is empty, the contact base_dn is used for the groups as well + // -> in this case, assure that groups and contacts are separated due to the concernig filters! + 'groups' => array( + 'base_dn' => '', + 'scope' => 'sub', // search mode: sub|base|list + 'filter' => '(objectClass=groupOfNames)', + 'object_classes' => array("top", "groupOfNames"), + 'member_attr' => 'member', // name of the member attribute, e.g. uniqueMember + 'name_attr' => 'cn', // attribute to be used as group name + ), +); +*/ + +// An ordered array of the ids of the addressbooks that should be searched +// when populating address autocomplete fields server-side. ex: array('sql','Verisign'); +$rcmail_config['autocomplete_addressbooks'] = array('sql'); + +// The minimum number of characters required to be typed in an autocomplete field +// before address books will be searched. Most useful for LDAP directories that +// may need to do lengthy results building given overly-broad searches +$rcmail_config['autocomplete_min_length'] = 1; + +// Number of parallel autocomplete requests. +// If there's more than one address book, n parallel (async) requests will be created, +// where each request will search in one address book. By default (0), all address +// books are searched in one request. +$rcmail_config['autocomplete_threads'] = 0; + +// Max. numer of entries in autocomplete popup. Default: 15. +$rcmail_config['autocomplete_max'] = 15; + +// show address fields in this order +// available placeholders: {street}, {locality}, {zipcode}, {country}, {region} +$rcmail_config['address_template'] = '{street}
        {locality} {zipcode}
        {country} {region}'; + +// Matching mode for addressbook search (including autocompletion) +// 0 - partial (*abc*), default +// 1 - strict (abc) +// 2 - prefix (abc*) +// Note: For LDAP sources fuzzy_search must be enabled to use 'partial' or 'prefix' mode +$rcmail_config['addressbook_search_mode'] = 0; + +// ---------------------------------- +// USER PREFERENCES +// ---------------------------------- + +// Use this charset as fallback for message decoding +//$rcmail_config['default_charset'] = 'ISO-8859-1'; +$rcmail_config['default_charset'] = 'UTF-8'; + +// skin name: folder from skins/ +$rcmail_config['skin'] = 'larry'; + +// show up to X items in messages list view +$rcmail_config['mail_pagesize'] = 50; + +// show up to X items in contacts list view +$rcmail_config['addressbook_pagesize'] = 50; + +// sort contacts by this col (preferably either one of name, firstname, surname) +$rcmail_config['addressbook_sort_col'] = 'surname'; + +// the way how contact names are displayed in the list +// 0: display name +// 1: (prefix) firstname middlename surname (suffix) +// 2: (prefix) surname firstname middlename (suffix) +// 3: (prefix) surname, firstname middlename (suffix) +$rcmail_config['addressbook_name_listing'] = 0; + +// use this timezone to display date/time +// valid timezone identifers are listed here: php.net/manual/en/timezones.php +// 'auto' will use the browser's timezone settings +$rcmail_config['timezone'] = 'auto'; + +// prefer displaying HTML messages +$rcmail_config['prefer_html'] = true; + +// display remote inline images +// 0 - Never, always ask +// 1 - Ask if sender is not in address book +// 2 - Always show inline images +$rcmail_config['show_images'] = 0; + +// compose html formatted messages by default +// 0 - never, 1 - always, 2 - on reply to HTML message only +$rcmail_config['htmleditor'] = 0; + +// show pretty dates as standard +$rcmail_config['prettydate'] = true; + +// save compose message every 300 seconds (5min) +$rcmail_config['draft_autosave'] = 300; + +// default setting if preview pane is enabled +$rcmail_config['preview_pane'] = false; + +// Mark as read when viewed in preview pane (delay in seconds) +// Set to -1 if messages in preview pane should not be marked as read +$rcmail_config['preview_pane_mark_read'] = 0; + +// Clear Trash on logout +$rcmail_config['logout_purge'] = false; + +// Compact INBOX on logout +$rcmail_config['logout_expunge'] = false; + +// Display attached images below the message body +$rcmail_config['inline_images'] = true; + +// Encoding of long/non-ascii attachment names: +// 0 - Full RFC 2231 compatible +// 1 - RFC 2047 for 'name' and RFC 2231 for 'filename' parameter (Thunderbird's default) +// 2 - Full 2047 compatible +$rcmail_config['mime_param_folding'] = 1; + +// Set true if deleted messages should not be displayed +// This will make the application run slower +$rcmail_config['skip_deleted'] = false; + +// Set true to Mark deleted messages as read as well as deleted +// False means that a message's read status is not affected by marking it as deleted +$rcmail_config['read_when_deleted'] = true; + +// Set to true to never delete messages immediately +// Use 'Purge' to remove messages marked as deleted +$rcmail_config['flag_for_deletion'] = false; + +// Default interval for keep-alive/check-recent requests (in seconds) +// Must be greater than or equal to 'min_keep_alive' and less than 'session_lifetime' +$rcmail_config['keep_alive'] = 60; + +// If true all folders will be checked for recent messages +$rcmail_config['check_all_folders'] = false; + +// If true, after message delete/move, the next message will be displayed +$rcmail_config['display_next'] = false; + +// 0 - Do not expand threads +// 1 - Expand all threads automatically +// 2 - Expand only threads with unread messages +$rcmail_config['autoexpand_threads'] = 0; + +// When replying place cursor above original message (top posting) +$rcmail_config['top_posting'] = false; + +// When replying strip original signature from message +$rcmail_config['strip_existing_sig'] = true; + +// Show signature: +// 0 - Never +// 1 - Always +// 2 - New messages only +// 3 - Forwards and Replies only +$rcmail_config['show_sig'] = 1; + +// When replying or forwarding place sender's signature above existing message +$rcmail_config['sig_above'] = false; + +// Use MIME encoding (quoted-printable) for 8bit characters in message body +$rcmail_config['force_7bit'] = false; + +// Defaults of the search field configuration. +// The array can contain a per-folder list of header fields which should be considered when searching +// The entry with key '*' stands for all folders which do not have a specific list set. +// Please note that folder names should to be in sync with $rcmail_config['default_folders'] +$rcmail_config['search_mods'] = null; // Example: array('*' => array('subject'=>1, 'from'=>1), 'Sent' => array('subject'=>1, 'to'=>1)); + +// Defaults of the addressbook search field configuration. +$rcmail_config['addressbook_search_mods'] = null; // Example: array('name'=>1, 'firstname'=>1, 'surname'=>1, 'email'=>1, '*'=>1); + +// 'Delete always' +// This setting reflects if mail should be always deleted +// when moving to Trash fails. This is necessary in some setups +// when user is over quota and Trash is included in the quota. +$rcmail_config['delete_always'] = false; + +// Directly delete messages in Junk instead of moving to Trash +$rcmail_config['delete_junk'] = true; + +// Behavior if a received message requests a message delivery notification (read receipt) +// 0 = ask the user, 1 = send automatically, 2 = ignore (never send or ask) +// 3 = send automatically if sender is in addressbook, otherwise ask the user +// 4 = send automatically if sender is in addressbook, otherwise ignore +$rcmail_config['mdn_requests'] = 0; + +// Return receipt checkbox default state +$rcmail_config['mdn_default'] = 0; + +// Delivery Status Notification checkbox default state +$rcmail_config['dsn_default'] = 0; + +// Place replies in the folder of the message being replied to +$rcmail_config['reply_same_folder'] = false; + +// Sets default mode of Forward feature to "forward as attachment" +$rcmail_config['forward_attachment'] = false; + +// Defines address book (internal index) to which new contacts will be added +// By default it is the first writeable addressbook. +// Note: Use '0' for built-in address book. +$rcmail_config['default_addressbook'] = null; + +// Enables spell checking before sending a message. +$rcmail_config['spellcheck_before_send'] = false; + +// Skip alternative email addresses in autocompletion (show one address per contact) +$rcmail_config['autocomplete_single'] = false; + +// Default font for composed HTML message. +// Supported values: Andale Mono, Arial, Arial Black, Book Antiqua, Courier New, +// Georgia, Helvetica, Impact, Tahoma, Terminal, Times New Roman, Trebuchet MS, Verdana +$rcmail_config['default_font'] = ''; + +// end of config file diff --git a/install/ubuntu/15.04/roundcube/vesta.php b/install/ubuntu/15.04/roundcube/vesta.php new file mode 100644 index 000000000..8fb202a44 --- /dev/null +++ b/install/ubuntu/15.04/roundcube/vesta.php @@ -0,0 +1,62 @@ + + */ + + function password_save($curpass, $passwd) + { + $rcmail = rcmail::get_instance(); + $vesta_host = $rcmail->config->get('password_vesta_host'); + + if (empty($vesta_host)) + { + $vesta_host = 'localhost'; + } + + $vesta_port = $rcmail->config->get('password_vesta_port'); + if (empty($vesta_port)) + { + $vesta_port = '8083'; + } + + $postvars = array( + 'email' => $_SESSION['username'], + 'password' => $curpass, + 'new' => $passwd + ); + + $postdata = http_build_query($postvars); + + $send = 'POST /reset/mail/ HTTP/1.1' . PHP_EOL; + $send .= 'Host: ' . $vesta_host . PHP_EOL; + $send .= 'User-Agent: PHP Script' . PHP_EOL; + $send .= 'Content-length: ' . strlen($postdata) . PHP_EOL; + $send .= 'Content-type: application/x-www-form-urlencoded' . PHP_EOL; + $send .= 'Connection: close' . PHP_EOL; + $send .= PHP_EOL; + $send .= $postdata . PHP_EOL . PHP_EOL; + + $fp = fsockopen('ssl://' . $vesta_host, $vesta_port); + fputs($fp, $send); + $result = fread($fp, 2048); + fclose($fp); + + $fp = fopen("/tmp/roundcube.log", 'w'); + fwrite($fp, "test ok"); + fwrite($fp, "\n"); + fclose($fp); + + + if(strpos($result, 'ok') && !strpos($result, 'error')) + { + return PASSWORD_SUCCESS; + } + else { + return PASSWORD_ERROR; + } + + } diff --git a/install/ubuntu/15.04/sudo/admin b/install/ubuntu/15.04/sudo/admin new file mode 100644 index 000000000..47e16098c --- /dev/null +++ b/install/ubuntu/15.04/sudo/admin @@ -0,0 +1,7 @@ +# Created by vesta installer +Defaults env_keep="VESTA" +Defaults:admin !syslog +Defaults:admin !requiretty + +admin ALL=(ALL) ALL +admin ALL=NOPASSWD:/usr/local/vesta/bin/* diff --git a/install/ubuntu/15.04/templates.tar.gz b/install/ubuntu/15.04/templates.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..ce385d269736561780cb42d07b447572cebc7831 GIT binary patch literal 12935 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 + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %sdocroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + #SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + AllowOverride All + SSLRequireSSL + Options +Includes -Indexes +ExecCGI + php_admin_value open_basedir %docroot% + + + AllowOverride All + + SSLEngine on + SSLVerifyClient none + SSLCertificateFile %ssl_crt% + SSLCertificateKeyFile %ssl_key% + %ssl_ca_str%SSLCertificateChainFile %ssl_ca% + + + RMode config + RUidGid %user% %group% + RGroups www-data + + + AssignUserID %user% %group% + + + IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* + + + diff --git a/install/ubuntu/15.04/templates/web/apache2/basedir.tpl b/install/ubuntu/15.04/templates/web/apache2/basedir.tpl new file mode 100755 index 000000000..75daf0e10 --- /dev/null +++ b/install/ubuntu/15.04/templates/web/apache2/basedir.tpl @@ -0,0 +1,35 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %docroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + #SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + AllowOverride All + Options +Includes -Indexes +ExecCGI + php_admin_value open_basedir %docroot% + + + AllowOverride All + + + + RMode config + RUidGid %user% %group% + RGroups www-data + + + AssignUserID %user% %group% + + + IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + + + diff --git a/install/ubuntu/15.04/templates/web/apache2/default.stpl b/install/ubuntu/15.04/templates/web/apache2/default.stpl new file mode 100755 index 000000000..e884a95b9 --- /dev/null +++ b/install/ubuntu/15.04/templates/web/apache2/default.stpl @@ -0,0 +1,40 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %sdocroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + #SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + AllowOverride All + SSLRequireSSL + Options +Includes -Indexes +ExecCGI + + + AllowOverride All + + SSLEngine on + SSLVerifyClient none + SSLCertificateFile %ssl_crt% + SSLCertificateKeyFile %ssl_key% + %ssl_ca_str%SSLCertificateChainFile %ssl_ca% + + + RMode config + RUidGid %user% %group% + RGroups www-data + + + AssignUserID %user% %group% + + + IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* + + + diff --git a/install/ubuntu/15.04/templates/web/apache2/default.tpl b/install/ubuntu/15.04/templates/web/apache2/default.tpl new file mode 100755 index 000000000..073724ce0 --- /dev/null +++ b/install/ubuntu/15.04/templates/web/apache2/default.tpl @@ -0,0 +1,34 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %docroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + #SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + AllowOverride All + Options +Includes -Indexes +ExecCGI + + + AllowOverride All + + + + RMode config + RUidGid %user% %group% + RGroups www-data + + + AssignUserID %user% %group% + + + IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + + + diff --git a/install/ubuntu/15.04/templates/web/apache2/hosting.stpl b/install/ubuntu/15.04/templates/web/apache2/hosting.stpl new file mode 100755 index 000000000..7a5d7787f --- /dev/null +++ b/install/ubuntu/15.04/templates/web/apache2/hosting.stpl @@ -0,0 +1,49 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %sdocroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + #SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + AllowOverride All + SSLRequireSSL + Options +Includes -Indexes +ExecCGI + php_admin_value upload_tmp_dir %home%/%user%/tmp + php_admin_value upload_max_filesize 10M + php_admin_value max_execution_time 20 + php_admin_value post_max_size 8M + php_admin_value memory_limit 32M + php_admin_flag mysql.allow_persistent off + php_admin_flag safe_mode off + php_admin_value session.save_path %home%/%user%/tmp + php_admin_value sendmail_path '/usr/sbin/sendmail -t -i -f %email%' + + + AllowOverride All + + php_admin_value open_basedir %home%/%user%/web:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpMyAdmin:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcubemail:/etc/roundcube:/var/lib/roundcube + SSLEngine on + SSLVerifyClient none + SSLCertificateFile %ssl_crt% + SSLCertificateKeyFile %ssl_key% + %ssl_ca_str%SSLCertificateChainFile %ssl_ca% + + RMode config + RUidGid %user% %group% + RGroups www-data + + + AssignUserID %user% %group% + + + IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* + + + diff --git a/install/ubuntu/15.04/templates/web/apache2/hosting.tpl b/install/ubuntu/15.04/templates/web/apache2/hosting.tpl new file mode 100755 index 000000000..ab844dc74 --- /dev/null +++ b/install/ubuntu/15.04/templates/web/apache2/hosting.tpl @@ -0,0 +1,43 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %docroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + #SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + AllowOverride All + Options +Includes -Indexes +ExecCGI + php_admin_value upload_tmp_dir %home%/%user%/tmp + php_admin_value upload_max_filesize 10M + php_admin_value max_execution_time 20 + php_admin_value post_max_size 8M + php_admin_value memory_limit 32M + php_admin_flag mysql.allow_persistent off + php_admin_flag safe_mode off + php_admin_value session.save_path %home%/%user%/tmp + php_admin_value sendmail_path '/usr/sbin/sendmail -t -i -f %email%' + + + AllowOverride All + + php_admin_value open_basedir %home%/%user%/web:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpMyAdmin:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcubemail:/etc/roundcube:/var/lib/roundcube + + RMode config + RUidGid %user% %group% + RGroups www-data + + + AssignUserID %user% %group% + + + IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + + + diff --git a/install/ubuntu/15.04/templates/web/apache2/phpcgi.sh b/install/ubuntu/15.04/templates/web/apache2/phpcgi.sh new file mode 100755 index 000000000..6565e103d --- /dev/null +++ b/install/ubuntu/15.04/templates/web/apache2/phpcgi.sh @@ -0,0 +1,16 @@ +#!/bin/bash +# Adding php wrapper +user="$1" +domain="$2" +ip="$3" +home_dir="$4" +docroot="$5" + +wrapper_script='#!/usr/bin/php-cgi -cphp5-cgi.ini' +wrapper_file="$home_dir/$user/web/$domain/cgi-bin/php" + +echo "$wrapper_script" > $wrapper_file +chown $user:$user $wrapper_file +chmod -f 751 $wrapper_file + +exit 0 diff --git a/install/ubuntu/15.04/templates/web/apache2/phpcgi.stpl b/install/ubuntu/15.04/templates/web/apache2/phpcgi.stpl new file mode 100755 index 000000000..aa5137308 --- /dev/null +++ b/install/ubuntu/15.04/templates/web/apache2/phpcgi.stpl @@ -0,0 +1,35 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %sdocroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + SSLRequireSSL + AllowOverride All + Options +Includes -Indexes +ExecCGI + Action phpcgi-script /cgi-bin/php + + SetHandler phpcgi-script + + + + AllowOverride All + + SSLEngine on + SSLVerifyClient none + SSLCertificateFile %ssl_crt% + SSLCertificateKeyFile %ssl_key% + %ssl_ca_str%SSLCertificateChainFile %ssl_ca% + + IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* + + + diff --git a/install/ubuntu/15.04/templates/web/apache2/phpcgi.tpl b/install/ubuntu/15.04/templates/web/apache2/phpcgi.tpl new file mode 100755 index 000000000..a05ff252d --- /dev/null +++ b/install/ubuntu/15.04/templates/web/apache2/phpcgi.tpl @@ -0,0 +1,28 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %docroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + AllowOverride All + Options +Includes -Indexes +ExecCGI + Action phpcgi-script /cgi-bin/php + + SetHandler phpcgi-script + + + + AllowOverride All + + IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + + + diff --git a/install/ubuntu/15.04/templates/web/apache2/phpfcgid.sh b/install/ubuntu/15.04/templates/web/apache2/phpfcgid.sh new file mode 100755 index 000000000..e80582492 --- /dev/null +++ b/install/ubuntu/15.04/templates/web/apache2/phpfcgid.sh @@ -0,0 +1,22 @@ +#!/bin/bash +# Adding php wrapper +user="$1" +domain="$2" +ip="$3" +home_dir="$4" +docroot="$5" + +wrapper_script="#!/bin/sh +PHPRC=/usr/local/lib +export PHPRC +export PHP_FCGI_MAX_REQUESTS=1000 +export PHP_FCGI_CHILDREN=20 +exec /usr/bin/php-cgi +" +wrapper_file="$home_dir/$user/web/$domain/cgi-bin/fcgi-starter" + +echo "$wrapper_script" > $wrapper_file +chown $user:$user $wrapper_file +chmod -f 751 $wrapper_file + +exit 0 diff --git a/install/ubuntu/15.04/templates/web/apache2/phpfcgid.stpl b/install/ubuntu/15.04/templates/web/apache2/phpfcgid.stpl new file mode 100755 index 000000000..622495756 --- /dev/null +++ b/install/ubuntu/15.04/templates/web/apache2/phpfcgid.stpl @@ -0,0 +1,36 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %sdocroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + SSLRequireSSL + AllowOverride All + Options +Includes -Indexes +ExecCGI + + SetHandler fcgid-script + + FCGIWrapper %home%/%user%/web/%domain%/cgi-bin/fcgi-starter .php + + + AllowOverride All + + php_admin_value open_basedir none + SSLEngine on + SSLVerifyClient none + SSLCertificateFile %ssl_crt% + SSLCertificateKeyFile %ssl_key% + %ssl_ca_str%SSLCertificateChainFile %ssl_ca% + + IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* + + + diff --git a/install/ubuntu/15.04/templates/web/apache2/phpfcgid.tpl b/install/ubuntu/15.04/templates/web/apache2/phpfcgid.tpl new file mode 100755 index 000000000..5c1f16e20 --- /dev/null +++ b/install/ubuntu/15.04/templates/web/apache2/phpfcgid.tpl @@ -0,0 +1,28 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %docroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + AllowOverride All + Options +Includes -Indexes +ExecCGI + + SetHandler fcgid-script + + FCGIWrapper %home%/%user%/web/%domain%/cgi-bin/fcgi-starter .php + + + AllowOverride All + + IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + + + diff --git a/install/ubuntu/15.04/templates/web/awstats/awstats.tpl b/install/ubuntu/15.04/templates/web/awstats/awstats.tpl new file mode 100755 index 000000000..9a92e0fd4 --- /dev/null +++ b/install/ubuntu/15.04/templates/web/awstats/awstats.tpl @@ -0,0 +1,133 @@ +LogFile="/var/log/%web_system%/domains/%domain%.log" +LogType=W +LogFormat=1 +LogSeparator=" " +SiteDomain="%domain_idn%" +HostAliases="%alias_idn%" +DirData="%home%/%user%/web/%domain%/stats" +DirCgi="/vstats" +DirIcons="/vstats/icon" +AllowToUpdateStatsFromBrowser=0 +AllowFullYearView=2 +EnableLockForUpdate=1 +DNSStaticCacheFile="dnscache.txt" +DNSLastUpdateCacheFile="dnscachelastupdate.txt" +SkipDNSLookupFor="" +AllowAccessFromWebToAuthenticatedUsersOnly=0 +AllowAccessFromWebToFollowingAuthenticatedUsers="" +AllowAccessFromWebToFollowingIPAddresses="" +CreateDirDataIfNotExists=0 +BuildHistoryFormat=text +BuildReportFormat=html +SaveDatabaseFilesWithPermissionsForEveryone=0 +PurgeLogFile=0 +ArchiveLogRecords=0 +KeepBackupOfHistoricFiles=1 +DefaultFile="index.php index.html" +SkipHosts="127.0.0.1 +SkipUserAgents="" +SkipFiles="" +SkipReferrersBlackList="" +OnlyHosts="" +OnlyUserAgents="" +OnlyUsers="" +OnlyFiles="" +NotPageList="css js class gif jpg jpeg png bmp ico rss xml swf" +ValidHTTPCodes="200 304" +ValidSMTPCodes="1 250" +AuthenticatedUsersNotCaseSensitive=0 +URLNotCaseSensitive=0 +URLWithAnchor=0 +URLQuerySeparators="?;" +URLWithQuery=0 +URLWithQueryWithOnlyFollowingParameters="" +URLWithQueryWithoutFollowingParameters="" +URLReferrerWithQuery=0 +WarningMessages=1 +ErrorMessages="" +DebugMessages=0 +NbOfLinesForCorruptedLog=50 +WrapperScript="" +DecodeUA=0 +MiscTrackerUrl="/js/awstats_misc_tracker.js" +UseFramesWhenCGI=1 +DetailedReportsOnNewWindows=1 +Expires=3600 +MaxRowsInHTMLOutput=1000 +Lang="auto" +DirLang="./lang" +ShowMenu=1 +ShowSummary=UVPHB +ShowMonthStats=UVPHB +ShowDaysOfMonthStats=VPHB +ShowDaysOfWeekStats=PHB +ShowHoursStats=PHB +ShowDomainsStats=PHB +ShowHostsStats=PHBL +ShowAuthenticatedUsers=0 +ShowRobotsStats=HBL +ShowWormsStats=0 +ShowEMailSenders=0 +ShowEMailReceivers=0 +ShowSessionsStats=1 +ShowPagesStats=PBEX +ShowFileTypesStats=HB +ShowFileSizesStats=0 +ShowDownloadsStats=HB +ShowOSStats=1 +ShowBrowsersStats=1 +ShowScreenSizeStats=0 +ShowOriginStats=PH +ShowKeyphrasesStats=1 +ShowKeywordsStats=1 +ShowMiscStats=a +ShowHTTPErrorsStats=1 +ShowSMTPErrorsStats=0 +ShowClusterStats=0 +AddDataArrayMonthStats=1 +AddDataArrayShowDaysOfMonthStats=1 +AddDataArrayShowDaysOfWeekStats=1 +AddDataArrayShowHoursStats=1 +IncludeInternalLinksInOriginSection=0 +MaxNbOfDomain = 10 +MinHitDomain = 1 +MaxNbOfHostsShown = 10 +MinHitHost = 1 +MaxNbOfLoginShown = 10 +MinHitLogin = 1 +MaxNbOfRobotShown = 10 +MinHitRobot = 1 +MaxNbOfDownloadsShown = 10 +MinHitDownloads = 1 +MaxNbOfPageShown = 10 +MinHitFile = 1 +MaxNbOfOsShown = 10 +MinHitOs = 1 +MaxNbOfBrowsersShown = 10 +MinHitBrowser = 1 +MaxNbOfScreenSizesShown = 5 +MinHitScreenSize = 1 +MaxNbOfWindowSizesShown = 5 +MinHitWindowSize = 1 +MaxNbOfRefererShown = 10 +MinHitRefer = 1 +MaxNbOfKeyphrasesShown = 10 +MinHitKeyphrase = 1 +MaxNbOfKeywordsShown = 10 +MinHitKeyword = 1 +MaxNbOfEMailsShown = 20 +MinHitEMail = 1 +FirstDayOfWeek=0 +ShowFlagLinks="" +ShowLinksOnUrl=1 +UseHTTPSLinkForUrl="" +MaxLengthOfShownURL=64 +HTMLHeadSection="" +HTMLEndSection="" +MetaRobot=0 +Logo="awstats_logo6.png" +LogoLink="http://awstats.sourceforge.net" +BarWidth = 260 +BarHeight = 90 +StyleSheet="" +ExtraTrackedRowsLimit=500 diff --git a/install/ubuntu/15.04/templates/web/awstats/index.tpl b/install/ubuntu/15.04/templates/web/awstats/index.tpl new file mode 100755 index 000000000..9df9bb5cb --- /dev/null +++ b/install/ubuntu/15.04/templates/web/awstats/index.tpl @@ -0,0 +1,10 @@ + + + + Awstats log analyzer + + + + + + diff --git a/install/ubuntu/15.04/templates/web/awstats/nav.tpl b/install/ubuntu/15.04/templates/web/awstats/nav.tpl new file mode 100755 index 000000000..f29bed68b --- /dev/null +++ b/install/ubuntu/15.04/templates/web/awstats/nav.tpl @@ -0,0 +1,23 @@ + + + Awstats navigation + + + + + + + + +
        vesta
        + +
        +
        + + diff --git a/install/ubuntu/15.04/templates/web/nginx/caching.sh b/install/ubuntu/15.04/templates/web/nginx/caching.sh new file mode 100755 index 000000000..6eb9126db --- /dev/null +++ b/install/ubuntu/15.04/templates/web/nginx/caching.sh @@ -0,0 +1,12 @@ +#!/bin/bash + +user=$1 +domain=$2 +ip=$3 +home=$4 +docroot=$5 + +str="proxy_cache_path /var/cache/nginx/$domain levels=2" +str="$str keys_zone=$domain:10m inactive=60m max_size=512m;" +echo "$str" >> /etc/nginx/conf.d/01_caching_pool.conf + diff --git a/install/ubuntu/15.04/templates/web/nginx/caching.stpl b/install/ubuntu/15.04/templates/web/nginx/caching.stpl new file mode 100755 index 000000000..ca6cffe32 --- /dev/null +++ b/install/ubuntu/15.04/templates/web/nginx/caching.stpl @@ -0,0 +1,44 @@ +server { + listen %ip%:%proxy_ssl_port%; + server_name %domain_idn% %alias_idn%; + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + error_log /var/log/%web_system%/domains/%domain%.error.log error; + + location / { + proxy_pass http://%ip%:%web_port%; + + proxy_cache cache; + proxy_cache_valid 15m; + proxy_cache_valid 404 1m; + proxy_no_cache $no_cache; + proxy_cache_bypass $no_cache; + proxy_cache_bypass $cookie_session $http_x_update; + + location ~* ^.+\.(%proxy_extentions%)$ { + proxy_cache off; + root %docroot%; + access_log /var/log/%web_system%/domains/%domain%.log combined; + access_log /var/log/%web_system%/domains/%domain%.bytes bytes; + expires max; + try_files $uri @fallback; + } + } + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location @fallback { + proxy_pass http://%ip%:%web_port%; + } + + location ~ /\.ht {return 404;} + location ~ /\.svn/ {return 404;} + location ~ /\.git/ {return 404;} + location ~ /\.hg/ {return 404;} + location ~ /\.bzr/ {return 404;} + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/15.04/templates/web/nginx/caching.tpl b/install/ubuntu/15.04/templates/web/nginx/caching.tpl new file mode 100755 index 000000000..36761b65c --- /dev/null +++ b/install/ubuntu/15.04/templates/web/nginx/caching.tpl @@ -0,0 +1,41 @@ +server { + listen %ip%:%proxy_port%; + server_name %domain_idn% %alias_idn%; + error_log /var/log/%web_system%/domains/%domain%.error.log error; + + location / { + proxy_pass http://%ip%:%web_port%; + + proxy_cache cache; + proxy_cache_valid 15m; + proxy_cache_valid 404 1m; + proxy_no_cache $no_cache; + proxy_cache_bypass $no_cache; + proxy_cache_bypass $cookie_session $http_x_update; + + location ~* ^.+\.(%proxy_extentions%)$ { + proxy_cache off; + root %docroot%; + access_log /var/log/%web_system%/domains/%domain%.log combined; + access_log /var/log/%web_system%/domains/%domain%.bytes bytes; + expires max; + try_files $uri @fallback; + } + } + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location @fallback { + proxy_pass http://%ip%:%web_port%; + } + + location ~ /\.ht {return 404;} + location ~ /\.svn/ {return 404;} + location ~ /\.git/ {return 404;} + location ~ /\.hg/ {return 404;} + location ~ /\.bzr/ {return 404;} + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/15.04/templates/web/nginx/default.stpl b/install/ubuntu/15.04/templates/web/nginx/default.stpl new file mode 100755 index 000000000..fa5380606 --- /dev/null +++ b/install/ubuntu/15.04/templates/web/nginx/default.stpl @@ -0,0 +1,36 @@ +server { + listen %ip%:%proxy_ssl_port%; + server_name %domain_idn% %alias_idn%; + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + error_log /var/log/%web_system%/domains/%domain%.error.log error; + + location / { + proxy_pass https://%ip%:%web_ssl_port%; + location ~* ^.+\.(%proxy_extentions%)$ { + root %sdocroot%; + access_log /var/log/%web_system%/domains/%domain%.log combined; + access_log /var/log/%web_system%/domains/%domain%.bytes bytes; + expires max; + try_files $uri @fallback; + } + } + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location @fallback { + proxy_pass https://%ip%:%web_ssl_port%; + } + + location ~ /\.ht {return 404;} + location ~ /\.svn/ {return 404;} + location ~ /\.git/ {return 404;} + location ~ /\.hg/ {return 404;} + location ~ /\.bzr/ {return 404;} + + include %home%/%user%/conf/web/snginx.%domain%.conf*; +} + diff --git a/install/ubuntu/15.04/templates/web/nginx/default.tpl b/install/ubuntu/15.04/templates/web/nginx/default.tpl new file mode 100755 index 000000000..4d5c774bc --- /dev/null +++ b/install/ubuntu/15.04/templates/web/nginx/default.tpl @@ -0,0 +1,33 @@ +server { + listen %ip%:%proxy_port%; + server_name %domain_idn% %alias_idn%; + error_log /var/log/%web_system%/domains/%domain%.error.log error; + + location / { + proxy_pass http://%ip%:%web_port%; + location ~* ^.+\.(%proxy_extentions%)$ { + root %docroot%; + access_log /var/log/%web_system%/domains/%domain%.log combined; + access_log /var/log/%web_system%/domains/%domain%.bytes bytes; + expires max; + try_files $uri @fallback; + } + } + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location @fallback { + proxy_pass http://%ip%:%web_port%; + } + + location ~ /\.ht {return 404;} + location ~ /\.svn/ {return 404;} + location ~ /\.git/ {return 404;} + location ~ /\.hg/ {return 404;} + location ~ /\.bzr/ {return 404;} + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} + diff --git a/install/ubuntu/15.04/templates/web/nginx/hosting.sh b/install/ubuntu/15.04/templates/web/nginx/hosting.sh new file mode 100755 index 000000000..eeed37ef9 --- /dev/null +++ b/install/ubuntu/15.04/templates/web/nginx/hosting.sh @@ -0,0 +1,11 @@ +#!/bin/bash +# Changing public_html permission +user="$1" +domain="$2" +ip="$3" +home_dir="$4" +docroot="$5" + +chmod 755 $docroot + +exit 0 diff --git a/install/ubuntu/15.04/templates/web/nginx/hosting.stpl b/install/ubuntu/15.04/templates/web/nginx/hosting.stpl new file mode 100755 index 000000000..d778d6333 --- /dev/null +++ b/install/ubuntu/15.04/templates/web/nginx/hosting.stpl @@ -0,0 +1,38 @@ +server { + listen %ip%:%proxy_ssl_port%; + server_name %domain_idn% %alias_idn%; + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + error_log /var/log/%web_system%/domains/%domain%.error.log error; + + location / { + proxy_pass https://%ip%:%web_ssl_port%; + location ~* ^.+\.(%proxy_extentions%)$ { + root %sdocroot%; + access_log /var/log/%web_system%/domains/%domain%.log combined; + access_log /var/log/%web_system%/domains/%domain%.bytes bytes; + expires max; + try_files $uri @fallback; + } + } + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location @fallback { + proxy_pass https://%ip%:%web_ssl_port%; + } + + location ~ /\.ht {return 404;} + location ~ /\.svn/ {return 404;} + location ~ /\.git/ {return 404;} + location ~ /\.hg/ {return 404;} + location ~ /\.bzr/ {return 404;} + + disable_symlinks if_not_owner from=%docroot%; + + include %home%/%user%/conf/web/snginx.%domain%.conf*; +} + diff --git a/install/ubuntu/15.04/templates/web/nginx/hosting.tpl b/install/ubuntu/15.04/templates/web/nginx/hosting.tpl new file mode 100755 index 000000000..15961c95c --- /dev/null +++ b/install/ubuntu/15.04/templates/web/nginx/hosting.tpl @@ -0,0 +1,35 @@ +server { + listen %ip%:%proxy_port%; + server_name %domain_idn% %alias_idn%; + error_log /var/log/%web_system%/domains/%domain%.error.log error; + + location / { + proxy_pass http://%ip%:%web_port%; + location ~* ^.+\.(%proxy_extentions%)$ { + root %docroot%; + access_log /var/log/%web_system%/domains/%domain%.log combined; + access_log /var/log/%web_system%/domains/%domain%.bytes bytes; + expires max; + try_files $uri @fallback; + } + } + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location @fallback { + proxy_pass http://%ip%:%web_port%; + } + + location ~ /\.ht {return 404;} + location ~ /\.svn/ {return 404;} + location ~ /\.git/ {return 404;} + location ~ /\.hg/ {return 404;} + location ~ /\.bzr/ {return 404;} + + disable_symlinks if_not_owner from=%docroot%; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} + diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/cms_made_simple.stpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/cms_made_simple.stpl new file mode 100644 index 000000000..01d82b603 --- /dev/null +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/cms_made_simple.stpl @@ -0,0 +1,51 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + try_files $uri $uri/ /index.php?page=$request_uri; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/cms_made_simple.tpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/cms_made_simple.tpl new file mode 100644 index 000000000..af452d19f --- /dev/null +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/cms_made_simple.tpl @@ -0,0 +1,47 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + try_files $uri $uri/ /index.php?page=$request_uri; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/codeigniter2.stpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/codeigniter2.stpl new file mode 100644 index 000000000..a592a652d --- /dev/null +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/codeigniter2.stpl @@ -0,0 +1,56 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + try_files $uri $uri/ /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location = /index.php { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME /var/www/html/ci$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + location ~ \.php$ { + return 444; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/codeigniter2.tpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/codeigniter2.tpl new file mode 100644 index 000000000..9b955aa6a --- /dev/null +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/codeigniter2.tpl @@ -0,0 +1,52 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + try_files $uri $uri/ /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location = /index.php { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME /var/www/html/ci$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + location ~ \.php$ { + return 444; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/codeigniter3.stpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/codeigniter3.stpl new file mode 100644 index 000000000..4d330d34f --- /dev/null +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/codeigniter3.stpl @@ -0,0 +1,51 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + try_files $uri $uri/ /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/codeigniter3.tpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/codeigniter3.tpl new file mode 100644 index 000000000..1f446e5d3 --- /dev/null +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/codeigniter3.tpl @@ -0,0 +1,47 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + try_files $uri $uri/ /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/datalife_engine.stpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/datalife_engine.stpl new file mode 100644 index 000000000..d1b5bcd24 --- /dev/null +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/datalife_engine.stpl @@ -0,0 +1,122 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + rewrite "^/page/([0-9]+)(/?)$" /index.php?cstart=$1 last; + + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page,([0-9]+),([0-9]+),(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&cstart=$5&news_name=$6&seourl=$6 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page,([0-9]+),(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&news_name=$5&seourl=$5 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/print:page,([0-9]+),(.*).html(/?)+$" /engine/print.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&news_name=$5&seourl=$5 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_name=$4&seourl=$4 last; + + rewrite "^/([^.]+)/page,([0-9]+),([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$4&news_page=$2&cstart=$3&seourl=$5&seocat=$1 last; + rewrite "^/([^.]+)/page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$3&news_page=$2&seourl=$4&seocat=$1 last; + rewrite "^/([^.]+)/print:page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /engine/print.php?news_page=$2&newsid=$3&seourl=$4&seocat=$1 last; + rewrite "^/([^.]+)/([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$2&seourl=$3&seocat=$1 last; + + rewrite "^/page,([0-9]+),([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$3&news_page=$1&cstart=$2&seourl=$4 last; + rewrite "^/page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$2&news_page=$1&seourl=$3 last; + rewrite "^/print:page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /engine/print.php?news_page=$1&newsid=$2&seourl=$3 last; + rewrite "^/([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$1&seourl=$2 last; + + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})(/?)+$" /index.php?year=$1&month=$2&day=$3 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page/([0-9]+)(/?)+$" /index.php?year=$1&month=$2&day=$3&cstart=$4 last; + + rewrite "^/([0-9]{4})/([0-9]{2})(/?)+$" /index.php?year=$1&month=$2 last; + rewrite "^/([0-9]{4})/([0-9]{2})/page/([0-9]+)(/?)+$" /index.php?year=$1&month=$2&cstart=$3 last; + + rewrite "^/([0-9]{4})(/?)+$" /index.php?year=$1 last; + rewrite "^/([0-9]{4})/page/([0-9]+)(/?)+$" /index.php?year=$1&cstart=$2 last; + + rewrite "^/tags/([^/]*)(/?)+$" /index.php?do=tags&tag=$1 last; + rewrite "^/tags/([^/]*)/page/([0-9]+)(/?)+$" /index.php?do=tags&tag=$1&cstart=$2 last; + + rewrite "^/xfsearch/([^/]*)(/?)+$" /index.php?do=xfsearch&xf=$1 last; + rewrite "^/xfsearch/([^/]*)/page/([0-9]+)(/?)+$" /index.php?do=xfsearch&xf=$1&cstart=$2 last; + + rewrite "^/user/([^/]*)/rss.xml$" /engine/rss.php?subaction=allnews&user=$1 last; + rewrite "^/user/([^/]*)(/?)+$" /index.php?subaction=userinfo&user=$1 last; + rewrite "^/user/([^/]*)/page/([0-9]+)(/?)+$" /index.php?subaction=userinfo&user=$1&cstart=$2 last; + rewrite "^/user/([^/]*)/news(/?)+$" /index.php?subaction=allnews&user=$1 last; + rewrite "^/user/([^/]*)/news/page/([0-9]+)(/?)+$" /index.php?subaction=allnews&user=$1&cstart=$2 last; + rewrite "^/user/([^/]*)/news/rss.xml(/?)+$" /engine/rss.php?subaction=allnews&user=$1 last; + + rewrite "^/lastnews(/?)+$" /index.php?do=lastnews last; + rewrite "^/lastnews/page/([0-9]+)(/?)+$" /index.php?do=lastnews&cstart=$1 last; + + rewrite "^/catalog/([^/]*)/rss.xml$" /engine/rss.php?catalog=$1 last; + rewrite "^/catalog/([^/]*)(/?)+$" /index.php?catalog=$1 last; + rewrite "^/catalog/([^/]*)/page/([0-9]+)(/?)+$" /index.php?catalog=$1&cstart=$2 last; + + rewrite "^/newposts(/?)+$" /index.php?subaction=newposts last; + rewrite "^/newposts/page/([0-9]+)(/?)+$" /index.php?subaction=newposts&cstart=$1 last; + + rewrite "^/favorites(/?)+$" /index.php?do=favorites last; + rewrite "^/favorites/page/([0-9]+)(/?)+$" /index.php?do=favorites&cstart=$1 last; + + rewrite "^/rules.html$" /index.php?do=rules last; + rewrite "^/statistics.html$" /index.php?do=stats last; + rewrite "^/addnews.html$" /index.php?do=addnews last; + rewrite "^/rss.xml$" /engine/rss.php last; + rewrite "^/sitemap.xml$" /uploads/sitemap.xml last; + + if (!-d $request_filename) { + rewrite "^/([^.]+)/page/([0-9]+)(/?)+$" /index.php?do=cat&category=$1&cstart=$2 last; + rewrite "^/([^.]+)/?$" /index.php?do=cat&category=$1 last; + } + + if (!-f $request_filename) { + rewrite "^/([^.]+)/rss.xml$" /engine/rss.php?do=cat&category=$1 last; + rewrite "^/page,([0-9]+),([^/]+).html$" /index.php?do=static&page=$2&news_page=$1 last; + rewrite "^/print:([^/]+).html$" /engine/print.php?do=static&page=$1 last; + } + + if (!-f $request_filename) { + rewrite "^/([^/]+).html$" /index.php?do=static&page=$1 last; + } + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/datalife_engine.tpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/datalife_engine.tpl new file mode 100644 index 000000000..ff33c2325 --- /dev/null +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/datalife_engine.tpl @@ -0,0 +1,118 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + rewrite "^/page/([0-9]+)(/?)$" /index.php?cstart=$1 last; + + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page,([0-9]+),([0-9]+),(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&cstart=$5&news_name=$6&seourl=$6 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page,([0-9]+),(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&news_name=$5&seourl=$5 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/print:page,([0-9]+),(.*).html(/?)+$" /engine/print.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&news_name=$5&seourl=$5 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_name=$4&seourl=$4 last; + + rewrite "^/([^.]+)/page,([0-9]+),([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$4&news_page=$2&cstart=$3&seourl=$5&seocat=$1 last; + rewrite "^/([^.]+)/page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$3&news_page=$2&seourl=$4&seocat=$1 last; + rewrite "^/([^.]+)/print:page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /engine/print.php?news_page=$2&newsid=$3&seourl=$4&seocat=$1 last; + rewrite "^/([^.]+)/([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$2&seourl=$3&seocat=$1 last; + + rewrite "^/page,([0-9]+),([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$3&news_page=$1&cstart=$2&seourl=$4 last; + rewrite "^/page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$2&news_page=$1&seourl=$3 last; + rewrite "^/print:page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /engine/print.php?news_page=$1&newsid=$2&seourl=$3 last; + rewrite "^/([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$1&seourl=$2 last; + + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})(/?)+$" /index.php?year=$1&month=$2&day=$3 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page/([0-9]+)(/?)+$" /index.php?year=$1&month=$2&day=$3&cstart=$4 last; + + rewrite "^/([0-9]{4})/([0-9]{2})(/?)+$" /index.php?year=$1&month=$2 last; + rewrite "^/([0-9]{4})/([0-9]{2})/page/([0-9]+)(/?)+$" /index.php?year=$1&month=$2&cstart=$3 last; + + rewrite "^/([0-9]{4})(/?)+$" /index.php?year=$1 last; + rewrite "^/([0-9]{4})/page/([0-9]+)(/?)+$" /index.php?year=$1&cstart=$2 last; + + rewrite "^/tags/([^/]*)(/?)+$" /index.php?do=tags&tag=$1 last; + rewrite "^/tags/([^/]*)/page/([0-9]+)(/?)+$" /index.php?do=tags&tag=$1&cstart=$2 last; + + rewrite "^/xfsearch/([^/]*)(/?)+$" /index.php?do=xfsearch&xf=$1 last; + rewrite "^/xfsearch/([^/]*)/page/([0-9]+)(/?)+$" /index.php?do=xfsearch&xf=$1&cstart=$2 last; + + rewrite "^/user/([^/]*)/rss.xml$" /engine/rss.php?subaction=allnews&user=$1 last; + rewrite "^/user/([^/]*)(/?)+$" /index.php?subaction=userinfo&user=$1 last; + rewrite "^/user/([^/]*)/page/([0-9]+)(/?)+$" /index.php?subaction=userinfo&user=$1&cstart=$2 last; + rewrite "^/user/([^/]*)/news(/?)+$" /index.php?subaction=allnews&user=$1 last; + rewrite "^/user/([^/]*)/news/page/([0-9]+)(/?)+$" /index.php?subaction=allnews&user=$1&cstart=$2 last; + rewrite "^/user/([^/]*)/news/rss.xml(/?)+$" /engine/rss.php?subaction=allnews&user=$1 last; + + rewrite "^/lastnews(/?)+$" /index.php?do=lastnews last; + rewrite "^/lastnews/page/([0-9]+)(/?)+$" /index.php?do=lastnews&cstart=$1 last; + + rewrite "^/catalog/([^/]*)/rss.xml$" /engine/rss.php?catalog=$1 last; + rewrite "^/catalog/([^/]*)(/?)+$" /index.php?catalog=$1 last; + rewrite "^/catalog/([^/]*)/page/([0-9]+)(/?)+$" /index.php?catalog=$1&cstart=$2 last; + + rewrite "^/newposts(/?)+$" /index.php?subaction=newposts last; + rewrite "^/newposts/page/([0-9]+)(/?)+$" /index.php?subaction=newposts&cstart=$1 last; + + rewrite "^/favorites(/?)+$" /index.php?do=favorites last; + rewrite "^/favorites/page/([0-9]+)(/?)+$" /index.php?do=favorites&cstart=$1 last; + + rewrite "^/rules.html$" /index.php?do=rules last; + rewrite "^/statistics.html$" /index.php?do=stats last; + rewrite "^/addnews.html$" /index.php?do=addnews last; + rewrite "^/rss.xml$" /engine/rss.php last; + rewrite "^/sitemap.xml$" /uploads/sitemap.xml last; + + if (!-d $request_filename) { + rewrite "^/([^.]+)/page/([0-9]+)(/?)+$" /index.php?do=cat&category=$1&cstart=$2 last; + rewrite "^/([^.]+)/?$" /index.php?do=cat&category=$1 last; + } + + if (!-f $request_filename) { + rewrite "^/([^.]+)/rss.xml$" /engine/rss.php?do=cat&category=$1 last; + rewrite "^/page,([0-9]+),([^/]+).html$" /index.php?do=static&page=$2&news_page=$1 last; + rewrite "^/print:([^/]+).html$" /engine/print.php?do=static&page=$1 last; + } + + if (!-f $request_filename) { + rewrite "^/([^/]+).html$" /index.php?do=static&page=$1 last; + } + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/default.stpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/default.stpl new file mode 100644 index 000000000..a68c99861 --- /dev/null +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/default.stpl @@ -0,0 +1,50 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %sdocroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/snginx.%domain%.conf*; +} diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/default.tpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/default.tpl new file mode 100644 index 000000000..b143e53ba --- /dev/null +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/default.tpl @@ -0,0 +1,46 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/dokuwiki.stpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/dokuwiki.stpl new file mode 100644 index 000000000..27483cd8c --- /dev/null +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/dokuwiki.stpl @@ -0,0 +1,67 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + index doku.php; + try_files $uri $uri/ @dokuwiki; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + location ^~ /lib/ { + expires 30d; + } + + location ^~ /conf/ { return 403; } + location ^~ /data/ { return 403; } + + location @dokuwiki { + rewrite ^/_media/(.*) /lib/exe/fetch.php?media=$1 last; + rewrite ^/_detail/(.*) /lib/exe/detail.php?media=$1 last; + rewrite ^/_export/([^/]+)/(.*) /doku.php?do=export_$1&id=$2 last; + rewrite ^/(.*) /doku.php?id=$1 last; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/dokuwiki.tpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/dokuwiki.tpl new file mode 100644 index 000000000..31647c9ff --- /dev/null +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/dokuwiki.tpl @@ -0,0 +1,62 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + index doku.php; + try_files $uri $uri/ @dokuwiki; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + location ^~ /lib/ { + expires 30d; + } + + location ^~ /conf/ { return 403; } + location ^~ /data/ { return 403; } + location @dokuwiki { + rewrite ^/_media/(.*) /lib/exe/fetch.php?media=$1 last; + rewrite ^/_detail/(.*) /lib/exe/detail.php?media=$1 last; + rewrite ^/_export/([^/]+)/(.*) /doku.php?do=export_$1&id=$2 last; + rewrite ^/(.*) /doku.php?id=$1 last; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/drupal.stpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/drupal.stpl new file mode 100644 index 000000000..9a5484396 --- /dev/null +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/drupal.stpl @@ -0,0 +1,101 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + + location / { + try_files $uri @rewrite; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # You have 2 options here + # For D7 and above: + # Clean URLs are handled in drupal_environment_initialize(). + rewrite ^ /index.php; + + # For Drupal 6 and bwlow: + # Some modules enforce no slash (/) at the end of the URL + # Else this rewrite block wouldn't be needed (GlobalRedirect) + #rewrite ^/(.*)$ /index.php?q=$1; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/drupal.tpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/drupal.tpl new file mode 100644 index 000000000..417762c18 --- /dev/null +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/drupal.tpl @@ -0,0 +1,98 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + # Very rarely should these ever be accessed outside of your lan + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + + location / { + try_files $uri @rewrite; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # You have 2 options here + # For D7 and above: + # Clean URLs are handled in drupal_environment_initialize(). + rewrite ^ /index.php; + + # For Drupal 6 and bwlow: + # Some modules enforce no slash (/) at the end of the URL + # Else this rewrite block wouldn't be needed (GlobalRedirect) + #rewrite ^/(.*)$ /index.php?q=$1; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/joomla.stpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/joomla.stpl new file mode 100644 index 000000000..235a01216 --- /dev/null +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/joomla.stpl @@ -0,0 +1,58 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + try_files $uri $uri/ /index.php?$args; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + # deny running scripts inside writable directories + location ~* /(images|cache|media|logs|tmp)/.*\.(php|pl|py|jsp|asp|sh|cgi)$ { + return 403; + error_page 403 /403_error.html; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/joomla.tpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/joomla.tpl new file mode 100644 index 000000000..997c268de --- /dev/null +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/joomla.tpl @@ -0,0 +1,54 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + try_files $uri $uri/ /index.php?$args; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + # deny running scripts inside writable directories + location ~* /(images|cache|media|logs|tmp)/.*\.(php|pl|py|jsp|asp|sh|cgi)$ { + return 403; + error_page 403 /403_error.html; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/owncloud.stpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/owncloud.stpl new file mode 100644 index 000000000..8311ca43f --- /dev/null +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/owncloud.stpl @@ -0,0 +1,80 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + rewrite ^/caldav(.*)$ /remote.php/caldav$1 redirect; + rewrite ^/carddav(.*)$ /remote.php/carddav$1 redirect; + rewrite ^/webdav(.*)$ /remote.php/webdav$1 redirect; + + error_page 403 = /core/templates/403.php; + error_page 404 = /core/templates/404.php; + + location ~ ^/(?:\.htaccess|data|config|db_structure\.xml|README){ + deny all; + } + + location / { + # The following 2 rules are only needed with webfinger + rewrite ^/.well-known/host-meta /public.php?service=host-meta last; + rewrite ^/.well-known/host-meta.json /public.php?service=host-meta-json last; + rewrite ^/.well-known/carddav /remote.php/carddav/ redirect; + rewrite ^/.well-known/caldav /remote.php/caldav/ redirect; + rewrite ^(/core/doc/[^\/]+/)$ $1/index.html; + try_files $uri $uri/ /index.php; + + location ~ \.php(?:$|/) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param PATH_INFO $fastcgi_path_info; + #fastcgi_param HTTPS on; + fastcgi_pass %backend_lsnr%; + } + } + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + # Some basic cache-control for static files to be sent to the browser + add_header Pragma public; + add_header Cache-Control "public, must-revalidate, proxy-revalidate"; + } + + #error_page 403 /error/404.html; + #error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/owncloud.tpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/owncloud.tpl new file mode 100644 index 000000000..57cac2f85 --- /dev/null +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/owncloud.tpl @@ -0,0 +1,76 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + rewrite ^/caldav(.*)$ /remote.php/caldav$1 redirect; + rewrite ^/carddav(.*)$ /remote.php/carddav$1 redirect; + rewrite ^/webdav(.*)$ /remote.php/webdav$1 redirect; + + error_page 403 = /core/templates/403.php; + error_page 404 = /core/templates/404.php; + + location ~ ^/(?:\.htaccess|data|config|db_structure\.xml|README){ + deny all; + } + + location / { + # The following 2 rules are only needed with webfinger + rewrite ^/.well-known/host-meta /public.php?service=host-meta last; + rewrite ^/.well-known/host-meta.json /public.php?service=host-meta-json last; + rewrite ^/.well-known/carddav /remote.php/carddav/ redirect; + rewrite ^/.well-known/caldav /remote.php/caldav/ redirect; + rewrite ^(/core/doc/[^\/]+/)$ $1/index.html; + try_files $uri $uri/ /index.php; + + location ~ \.php(?:$|/) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param PATH_INFO $fastcgi_path_info; + #fastcgi_param HTTPS on; + fastcgi_pass %backend_lsnr%; + } + } + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + # Some basic cache-control for static files to be sent to the browser + add_header Pragma public; + add_header Cache-Control "public, must-revalidate, proxy-revalidate"; + } + + #error_page 403 /error/404.html; + #error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/piwik.stpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/piwik.stpl new file mode 100644 index 000000000..c53af4011 --- /dev/null +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/piwik.stpl @@ -0,0 +1,68 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location = /favicon.ico { + try_files /favicon.ico =204; + } + + location / { + try_files $uri /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + valid_referers none blocked %domain_idn% %alias_idn%; + if ($invalid_referer) { + return 444; + } + expires max; + } + + location ~* ^/(?:index|piwik)\.php$ { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + include /etc/nginx/fastcgi_params; + } + } + + # Any other attempt to access PHP files returns a 404. + location ~* ^.+\.php$ { + return 404; + } + + # Return a 404 for all text files. + location ~* ^/(?:README|LICENSE[^.]*|LEGALNOTICE)(?:\.txt)*$ { + return 404; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/piwik.tpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/piwik.tpl new file mode 100644 index 000000000..6b4a94a68 --- /dev/null +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/piwik.tpl @@ -0,0 +1,64 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location = /favicon.ico { + try_files /favicon.ico =204; + } + + location / { + try_files $uri /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + valid_referers none blocked %domain_idn% %alias_idn%; + if ($invalid_referer) { + return 444; + } + expires max; + } + + location ~* ^/(?:index|piwik)\.php$ { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + include /etc/nginx/fastcgi_params; + } + } + + # Any other attempt to access PHP files returns a 404. + location ~* ^.+\.php$ { + return 404; + } + + # Return a 404 for all text files. + location ~* ^/(?:README|LICENSE[^.]*|LEGALNOTICE)(?:\.txt)*$ { + return 404; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/pyrocms.stpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/pyrocms.stpl new file mode 100644 index 000000000..a6fc67556 --- /dev/null +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/pyrocms.stpl @@ -0,0 +1,61 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location /installer { + try_files $uri $uri/ /installer/index.php; + } + + location / { + try_files $uri $uri/ /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + location = /robots.txt { access_log off; log_not_found off; } + location = /favicon.ico { access_log off; log_not_found off; } + location ~ /\. { access_log off; log_not_found off; deny all; } + location ~ ~$ { access_log off; log_not_found off; deny all; } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/pyrocms.tpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/pyrocms.tpl new file mode 100644 index 000000000..68b378efd --- /dev/null +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/pyrocms.tpl @@ -0,0 +1,57 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location /installer { + try_files $uri $uri/ /installer/index.php; + } + + location / { + try_files $uri $uri/ /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + location = /robots.txt { access_log off; log_not_found off; } + location = /favicon.ico { access_log off; log_not_found off; } + location ~ /\. { access_log off; log_not_found off; deny all; } + location ~ ~$ { access_log off; log_not_found off; deny all; } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/wordpress.stpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/wordpress.stpl new file mode 100644 index 000000000..910c28b69 --- /dev/null +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/wordpress.stpl @@ -0,0 +1,50 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/wordpress.tpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/wordpress.tpl new file mode 100644 index 000000000..b143e53ba --- /dev/null +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/wordpress.tpl @@ -0,0 +1,46 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/wordpress2.stpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/wordpress2.stpl new file mode 100644 index 000000000..2822f8754 --- /dev/null +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/wordpress2.stpl @@ -0,0 +1,62 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + location / { + try_files $uri $uri/ /index.php?$args; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/wordpress2.tpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/wordpress2.tpl new file mode 100644 index 000000000..37b8be305 --- /dev/null +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/wordpress2.tpl @@ -0,0 +1,58 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + location / { + try_files $uri $uri/ /index.php?$args; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/15.04/templates/web/nginx/proxy_ip.tpl b/install/ubuntu/15.04/templates/web/nginx/proxy_ip.tpl new file mode 100755 index 000000000..ae1956173 --- /dev/null +++ b/install/ubuntu/15.04/templates/web/nginx/proxy_ip.tpl @@ -0,0 +1,9 @@ +server { + listen %ip%:%proxy_port% default; + server_name _; + #access_log /var/log/nginx/%ip%.log main; + location / { + proxy_pass http://%ip%:%web_port%; + } +} + diff --git a/install/ubuntu/15.04/templates/web/php5-fpm/default.tpl b/install/ubuntu/15.04/templates/web/php5-fpm/default.tpl new file mode 100644 index 000000000..44ccf7a42 --- /dev/null +++ b/install/ubuntu/15.04/templates/web/php5-fpm/default.tpl @@ -0,0 +1,18 @@ +[%backend%] +listen = 127.0.0.1:%backend_port% +listen.allowed_clients = 127.0.0.1 + +user = %user% +group = %user% + +pm = dynamic +pm.max_children = 50 +pm.start_servers = 3 +pm.min_spare_servers = 2 +pm.max_spare_servers = 10 + +env[HOSTNAME] = $HOSTNAME +env[PATH] = /usr/local/bin:/usr/bin:/bin +env[TMP] = /tmp +env[TMPDIR] = /tmp +env[TEMP] = /tmp diff --git a/install/ubuntu/15.04/templates/web/php5-fpm/no-php.tpl b/install/ubuntu/15.04/templates/web/php5-fpm/no-php.tpl new file mode 100644 index 000000000..89487d5f5 --- /dev/null +++ b/install/ubuntu/15.04/templates/web/php5-fpm/no-php.tpl @@ -0,0 +1,13 @@ +#[%backend%] +#user = %user% +#group = %user% +#listen = /dev/null + +#listen.owner = %user% +#listen.group = nginx + +#pm = dynamic +#pm.max_children = 50 +#pm.start_servers = 3 +#pm.min_spare_servers = 2 +#pm.max_spare_servers = 10 diff --git a/install/ubuntu/15.04/templates/web/php5-fpm/socket.tpl b/install/ubuntu/15.04/templates/web/php5-fpm/socket.tpl new file mode 100644 index 000000000..f0513da3e --- /dev/null +++ b/install/ubuntu/15.04/templates/web/php5-fpm/socket.tpl @@ -0,0 +1,21 @@ +[%backend%] +listen = /var/run/php5-%backend%.sock +listen.allowed_clients = 127.0.0.1 + +user = %user% +group = %user% + +listen.owner = %user% +listen.group = nginx + +pm = dynamic +pm.max_children = 50 +pm.start_servers = 3 +pm.min_spare_servers = 2 +pm.max_spare_servers = 10 + +env[HOSTNAME] = $HOSTNAME +env[PATH] = /usr/local/bin:/usr/bin:/bin +env[TMP] = /tmp +env[TMPDIR] = /tmp +env[TEMP] = /tmp diff --git a/install/ubuntu/15.04/templates/web/skel/document_errors/403.html b/install/ubuntu/15.04/templates/web/skel/document_errors/403.html new file mode 100755 index 000000000..9c3f6baab --- /dev/null +++ b/install/ubuntu/15.04/templates/web/skel/document_errors/403.html @@ -0,0 +1,29 @@ + + + 403 — Forbidden + + + + + + +

        %domain%

        + +

        403

        +

        Forbidden

        +
        + Unfortunately, you do not have permission to view this +
        + + + diff --git a/install/ubuntu/15.04/templates/web/skel/document_errors/404.html b/install/ubuntu/15.04/templates/web/skel/document_errors/404.html new file mode 100755 index 000000000..2cee77084 --- /dev/null +++ b/install/ubuntu/15.04/templates/web/skel/document_errors/404.html @@ -0,0 +1,28 @@ + + + 404 — Not Found + + + + + + +

        %domain%

        +

        404

        +

        Page Not Found

        +
        + It seems that the page you were trying to reach does not exist anymore, or maybe it has just moved. + You can start again from the home or go back to previous page. +
        + + diff --git a/install/ubuntu/15.04/templates/web/skel/document_errors/50x.html b/install/ubuntu/15.04/templates/web/skel/document_errors/50x.html new file mode 100755 index 000000000..85ba648b7 --- /dev/null +++ b/install/ubuntu/15.04/templates/web/skel/document_errors/50x.html @@ -0,0 +1,29 @@ + + + 500 — Internal Sever Error + + + + + + +

        %domain%

        + +

        500

        +

        Internal Server Error

        +
        + Sorry, something went wrong :( +
        + + + diff --git a/install/ubuntu/15.04/templates/web/skel/public_html/index.html b/install/ubuntu/15.04/templates/web/skel/public_html/index.html new file mode 100755 index 000000000..4f5bb7244 --- /dev/null +++ b/install/ubuntu/15.04/templates/web/skel/public_html/index.html @@ -0,0 +1,26 @@ + + + %domain% — Coming Soon + + + + + + +

        %domain%

        + + + + + diff --git a/install/ubuntu/15.04/templates/web/skel/public_html/robots.txt b/install/ubuntu/15.04/templates/web/skel/public_html/robots.txt new file mode 100755 index 000000000..00ee83dcf --- /dev/null +++ b/install/ubuntu/15.04/templates/web/skel/public_html/robots.txt @@ -0,0 +1,3 @@ +# vestacp autogenerated robots.txt +User-agent: * +Crawl-delay: 10 diff --git a/install/ubuntu/15.04/templates/web/skel/public_shtml/index.html b/install/ubuntu/15.04/templates/web/skel/public_shtml/index.html new file mode 100755 index 000000000..4f5bb7244 --- /dev/null +++ b/install/ubuntu/15.04/templates/web/skel/public_shtml/index.html @@ -0,0 +1,26 @@ + + + %domain% — Coming Soon + + + + + + +

        %domain%

        + + + + + diff --git a/install/ubuntu/15.04/templates/web/skel/public_shtml/robots.txt b/install/ubuntu/15.04/templates/web/skel/public_shtml/robots.txt new file mode 100755 index 000000000..00ee83dcf --- /dev/null +++ b/install/ubuntu/15.04/templates/web/skel/public_shtml/robots.txt @@ -0,0 +1,3 @@ +# vestacp autogenerated robots.txt +User-agent: * +Crawl-delay: 10 diff --git a/install/ubuntu/15.04/templates/web/suspend/.htaccess b/install/ubuntu/15.04/templates/web/suspend/.htaccess new file mode 100755 index 000000000..5a6df83fb --- /dev/null +++ b/install/ubuntu/15.04/templates/web/suspend/.htaccess @@ -0,0 +1,2 @@ +ErrorDocument 403 /index.html +ErrorDocument 404 /index.html diff --git a/install/ubuntu/15.04/templates/web/suspend/index.html b/install/ubuntu/15.04/templates/web/suspend/index.html new file mode 100755 index 000000000..9d4fa67b3 --- /dev/null +++ b/install/ubuntu/15.04/templates/web/suspend/index.html @@ -0,0 +1,27 @@ + + + SUSPEND + + + + + + +

        SUSPEND

        +

        This site has been suspended

        +
        + Please contact technical support departament. +
        + + + diff --git a/install/ubuntu/15.04/templates/web/webalizer/webalizer.tpl b/install/ubuntu/15.04/templates/web/webalizer/webalizer.tpl new file mode 100755 index 000000000..068adcfb9 --- /dev/null +++ b/install/ubuntu/15.04/templates/web/webalizer/webalizer.tpl @@ -0,0 +1,110 @@ +HostName %domain_idn% +LogFile /var/log/%web_system%/domains/%domain%.log +OutputDir %home%/%user%/web/%domain%/stats +HistoryName %home%/%user%/web/%domain%/stats/%domain%.hist +Incremental yes +IncrementalName %home%/%user%/web/%domain%/stats/%domain%.current +PageType htm* +PageType cgi +PageType php +PageType shtml +DNSCache /var/lib/webalizer/dns_cache.db +DNSChildren 10 +Quiet yes +FoldSeqErr yes +IndexAlias index.php +HideURL *.gif +HideURL *.GIF +HideURL *.jpg +HideURL *.JPG +HideURL *.png +HideURL *.PNG +HideURL *.ra +SearchEngine abcsearch. terms= +SearchEngine alexa. q= +SearchEngine alltheweb. q= +SearchEngine alltheweb. query= +SearchEngine alot. q= +SearchEngine altavista. q= +SearchEngine aolsearch. query= +SearchEngine aport.ru r= +SearchEngine ask. q= +SearchEngine atlas.cz q= +SearchEngine bbc. q= +SearchEngine bing. q= +SearchEngine blingo. q= +SearchEngine blogs.yandex.ru text= +SearchEngine btopenworld query= +SearchEngine buscador.ya.com q= +SearchEngine busca. q= +SearchEngine business. query= +SearchEngine centrum.cz q= +SearchEngine chiff. q= +SearchEngine clusty. query= +SearchEngine comcast. q= +SearchEngine crawler. q= +SearchEngine cuil. q= +SearchEngine dmoz. search= +SearchEngine dogpile.com q= +SearchEngine dpxml qkw= +SearchEngine eureka. searchword= +SearchEngine euroseek. string= +SearchEngine exalead. q= +SearchEngine excite search= +SearchEngine ezilon. q= +SearchEngine fastbrowsersearch. q= +SearchEngine feedster.com q= +SearchEngine fireball.de q= +SearchEngine fireball. keyword= +SearchEngine freeserve. q= +SearchEngine gigablast. q= +SearchEngine gogo.ru q= +SearchEngine go.mail.ru q= +SearchEngine google. q= +SearchEngine hakia. q= +SearchEngine hotbot. query= +SearchEngine infoseek. qt= +SearchEngine iwon searchfor= +SearchEngine ixquick.com query= +SearchEngine joeant. keywords= +SearchEngine jyxo.cz s= +SearchEngine looksmart. key= +SearchEngine lycos. query= +SearchEngine mamma. q= +SearchEngine metacrawler q= +SearchEngine msn. MT= +SearchEngine msxml qkw= +SearchEngine mysearch. searchfor= +SearchEngine mywebsearch. searchfor= +SearchEngine netscape. q= +SearchEngine nigma.ru q= +SearchEngine northernlight. qr= +SearchEngine ntlworld. q= +SearchEngine orange. q= +SearchEngine overture. Keywords= +SearchEngine punto.ru text= +SearchEngine rambler. keyword= +SearchEngine search.aol. q= +SearchEngine search.babylon. q= +SearchEngine search.centrum. phrase= +SearchEngine search.conduit. q= +SearchEngine search.earthlink q= +SearchEngine search.icq. q= +SearchEngine search.live.com q= +SearchEngine search.rambler.ru words= +SearchEngine search.winamp. q= +SearchEngine searchy. q= +SearchEngine seznam.cz w= +SearchEngine snap. query= +SearchEngine teoma. q= +SearchEngine teradex.com q= +SearchEngine ukplus key= +SearchEngine verizon. q= +SearchEngine virginmedia. q= +SearchEngine voila. rdata= +SearchEngine webcrawler searchText= +SearchEngine web.search.naver. query= +SearchEngine wisenut q= +SearchEngine yahoo. p= +SearchEngine yandex. text= +SearchEngine yodao. q= diff --git a/install/ubuntu/15.04/vsftpd/vsftpd.conf b/install/ubuntu/15.04/vsftpd/vsftpd.conf new file mode 100644 index 000000000..0902899e7 --- /dev/null +++ b/install/ubuntu/15.04/vsftpd/vsftpd.conf @@ -0,0 +1,24 @@ +anonymous_enable=NO +local_enable=YES +write_enable=YES +local_umask=002 +anon_upload_enable=NO +dirmessage_enable=YES +xferlog_enable=YES +connect_from_port_20=YES +xferlog_std_format=YES +dual_log_enable=YES +chroot_local_user=YES +listen=YES +pam_service_name=vsftpd +userlist_enable=NO +tcp_wrappers=YES +force_dot_files=YES +ascii_upload_enable=YES +ascii_download_enable=YES +#allow_writable_chroot=YES +allow_writeable_chroot=YES +seccomp_sandbox=NO +pasv_enable=YES +pasv_max_port=12100 +pasv_min_port=12000 diff --git a/install/ubuntu/apache2.readme.txt b/install/ubuntu/apache2.readme.txt deleted file mode 100644 index b8d05cbe1..000000000 --- a/install/ubuntu/apache2.readme.txt +++ /dev/null @@ -1,11 +0,0 @@ -# -# _| _| _|_|_|_| _|_|_| _|_|_|_|_| _|_| -# _| _| _| _| _| _| _| -# _| _| _|_|_| _|_| _| _|_|_|_| -# _| _| _| _| _| _| _| -# _| _|_|_|_| _|_|_| _| _| _| -# -# -# Server is manager by Vesta Control Panel. -# See /etc/apache2/conf.d/vesta.conf to get a full list of running vhosts. -# diff --git a/install/ubuntu/certificate.crt b/install/ubuntu/certificate.crt deleted file mode 100644 index 4a3230ac2..000000000 --- a/install/ubuntu/certificate.crt +++ /dev/null @@ -1,22 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDqjCCApICCQCBAQdAxoNnAjANBgkqhkiG9w0BAQUFADCBljELMAkGA1UEBhMC -VVMxFjAUBgNVBAgMDU1hc3NhY2h1c2V0dHMxEzARBgNVBAcMClN3YW1wc2NvdHQx -EDAOBgNVBAoMB1Zlc3RhQ1AxCzAJBgNVBAsMAklUMRowGAYDVQQDDBFwYW5lbC52 -ZXN0YWNwLmNvbTEfMB0GCSqGSIb3DQEJARYQaW5mb0B2ZXN0YWNwLmNvbTAeFw0x -MzA5MjMwNzA0NDVaFw0xNDA5MjMwNzA0NDVaMIGWMQswCQYDVQQGEwJVUzEWMBQG -A1UECAwNTWFzc2FjaHVzZXR0czETMBEGA1UEBwwKU3dhbXBzY290dDEQMA4GA1UE -CgwHVmVzdGFDUDELMAkGA1UECwwCSVQxGjAYBgNVBAMMEXBhbmVsLnZlc3RhY3Au -Y29tMR8wHQYJKoZIhvcNAQkBFhBpbmZvQHZlc3RhY3AuY29tMIIBIjANBgkqhkiG -9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvu84meigHrwPmzEbFpKe/o8FTKwO5w1VL0HU -ILVW5EBGT76VEBqpWC+x0QrChHit14FV7m+hZRvhhkulXrknChTTNA500EVNZ5Wb -UpDWezZDivTKAHzzq0aUwKB230Tz+k3j+duBcbzwFwirnDXb5dE5RqzBOhiIvDw9 -mjP66UyH8RxFF+pTAPlcF18zWak7KnaDreyGknzy7m+Zqs07uLnb0wTgcwIcqREP -eqgw0E8xrEdjz1N9HIvxi+glfnjNgHja3cCYhe9ZCpDDr9ERXrEcULrqRuch6Zfv -QKoscG4dankbq0V4DfpMBYMTvFvFLLp/uWvwLjunzfu37XmBLQIDAQABMA0GCSqG -SIb3DQEBBQUAA4IBAQBl+GF4Ii+7cW0tWVTsDh0Kw+rjc9bEA0eF4p3LBLEsFRkP -Yeqp2t0g8RTAAiq3OyUWYISzOX8xu0i56/3jUFazABBjz0P0w2A0BfRZS5TAEwxJ -TS9zAgobBuLtTh3FDJJIRXLJOKLJZVUmi6D+8QIQVOox0925tMIxGc9CxLK05bIc -HUYdHsn1gDwmTWem/XED559eWV/vGnvf3Ea0EHU76kTQaLPkul2y8BTbbLaHSw96 -1xFc8x9gqxWTT70YmBpZIApmSzvOGVXqTduMY/CeEbmigo1/1i2YMVjePFEDYnmE -/f6rNQrtM9kgtE+glWdA7zHlaigKl3SVof1ETStB ------END CERTIFICATE----- diff --git a/install/ubuntu/certificate.key b/install/ubuntu/certificate.key deleted file mode 100644 index eb913d684..000000000 --- a/install/ubuntu/certificate.key +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEowIBAAKCAQEAvu84meigHrwPmzEbFpKe/o8FTKwO5w1VL0HUILVW5EBGT76V -EBqpWC+x0QrChHit14FV7m+hZRvhhkulXrknChTTNA500EVNZ5WbUpDWezZDivTK -AHzzq0aUwKB230Tz+k3j+duBcbzwFwirnDXb5dE5RqzBOhiIvDw9mjP66UyH8RxF -F+pTAPlcF18zWak7KnaDreyGknzy7m+Zqs07uLnb0wTgcwIcqREPeqgw0E8xrEdj -z1N9HIvxi+glfnjNgHja3cCYhe9ZCpDDr9ERXrEcULrqRuch6ZfvQKoscG4dankb -q0V4DfpMBYMTvFvFLLp/uWvwLjunzfu37XmBLQIDAQABAoIBAF59YsSAJCWxqgOC -dMZh/z85JkVAbQuZRIvjhwg81eiVinZSedCDcUUMLXKnYYZPdrDM9+rM4dF4z843 -R3quJIzPq4n6kYK0mU7m8fwVY5+MRjbRV9qP+8LKZjlB8DIkHJ3FyEnRgKj5+NNd -Xhgra0y7kx3Pxrxqgdit80qJ6OVlN2gsMjUcDBhqQev9Xs8cKYjYc1uPtFw14B2G -5fsNE8cHJA+hH/aym7xTaEQlz/JOKn2GsH/dOhm3RM2QygdyrVOBBj6rKSi03LMb -7QOkDvZ3nBltxQKOqs2PkYyEAdqR4dMZIPNxye/k21iVovLeMVe4lG7BmNOD6XwB -+TOhYh0CgYEA9WyUeSNPP309Br65wg61GdapWmQIaj7HSZE06BWhp82PPwHaF1yY -p9hWgo6fDxwHiTSLeUqEPXJMaPG+RxvYFc7Lc3JjOKU4ezR9fqz01LLtWXHVVT/x -RZuogMyaDhIjhwMyu4mybpUMkBQ/B3DFufrzTv0y8ljAc0nlFsuXaPMCgYEAxymI -btxZFGES6UNG7ldEaihll9MpP22/VghUeAaia0qgnXlYkbngIIhGpGJUkvZ2pduE -tfw2S20k38qvrWXx/NhLxmiVSIvq5TFi/22dfT20kfrdCcnkrp/tRpeR72IrQ6Kx -+6l7QHV5Gjcc4rvNc8mw7itVu+StgCYx+koD9V8CgYA8sThaaLf9XGxOEbaAXgC9 -Pg+tcdV+6L2B3O33gvnyNGx7SWr0ogqCX4atTLXbF7RpYtwnB52CUJTC0x2aGjGq -2vQHPb95z6oTFdz/CaiWPRVjLDp0lZaF/0OBbpeeaS/uAIV4SUod/LAZpVgc7++F -2aB35TfHJNma6ShFJd3wrwKBgBH444DtjXRTVjuKgKodYeUahCBxQ7Wfl7aRxd2W -66027MuJGb78wQbuhUFsRimE6CwLZSxu+A9SaBNx3OyO2Ilyk1PyOBZ12dqY3FAk -eiPFH7hUpQGvIF3JvMW0A81QVIsj8V++aYrljuoYsxiaze128+pqKrBr8GQyDiyB -5V2NAoGBAIPWovM20cbx6LpEuFN5Pmkl500F6sTc8F3DQVRe3JhwVhqHQXv7tUE1 -VHMqpMybUQin8q/RXvJ0vr2sQEe2fVC2a0FWJTqww1eMwu1V9ppUJAfXfaYWY+XJ -4d3myajakr0Eh3ia+IrSBcMRJ2sD3sL5KQC6jbD0R8odex4syiu2 ------END RSA PRIVATE KEY----- diff --git a/install/ubuntu/freshclam.conf b/install/ubuntu/freshclam.conf deleted file mode 100644 index 5e6ca56c1..000000000 --- a/install/ubuntu/freshclam.conf +++ /dev/null @@ -1,27 +0,0 @@ -# Automatically created by the clamav-freshclam postinst -# Comments will get lost when you reconfigure the clamav-freshclam package - -DatabaseOwner clamav -UpdateLogFile /var/log/clamav/freshclam.log -LogVerbose false -LogSyslog false -LogFacility LOG_LOCAL6 -LogFileMaxSize 0 -LogTime true -Foreground false -Debug false -MaxAttempts 5 -DatabaseDirectory /var/lib/clamav -DNSDatabaseInfo current.cvd.clamav.net -AllowSupplementaryGroups false -PidFile /var/run/clamav/freshclam.pid -ConnectTimeout 30 -ReceiveTimeout 30 -TestDatabases yes -ScriptedUpdates yes -CompressLocalDatabase no -Bytecode true -# Check for new database 24 times a day -Checks 24 -DatabaseMirror db.local.clamav.net -DatabaseMirror database.clamav.net diff --git a/install/ubuntu/nginx.readme.txt b/install/ubuntu/nginx.readme.txt deleted file mode 100644 index e5db79e79..000000000 --- a/install/ubuntu/nginx.readme.txt +++ /dev/null @@ -1,11 +0,0 @@ -# -# _| _| _|_|_|_| _|_|_| _|_|_|_|_| _|_| -# _| _| _| _| _| _| _| -# _| _| _|_|_| _|_| _| _|_|_|_| -# _| _| _| _| _| _| _| -# _| _|_|_|_| _|_|_| _| _| _| -# -# -# Server is manager by Vesta Control Panel. -# See /etc/nginx/conf.d/vesta.conf to get a full list of running vhosts. -# diff --git a/install/ubuntu/sudoers.vestacp.conf b/install/ubuntu/sudoers.vestacp.conf deleted file mode 100644 index fc1782282..000000000 --- a/install/ubuntu/sudoers.vestacp.conf +++ /dev/null @@ -1 +0,0 @@ -Defaults env_keep="VESTA" diff --git a/install/ubuntu/vesta.conf b/install/ubuntu/vesta.conf deleted file mode 100644 index 6c148bd17..000000000 --- a/install/ubuntu/vesta.conf +++ /dev/null @@ -1,24 +0,0 @@ -WEB_SYSTEM='apache2' -WEB_RGROUPS='www-data' -WEB_PORT='8080' -WEB_SSL='mod_ssl' -WEB_SSL_PORT='8443' -PROXY_SYSTEM='nginx' -PROXY_PORT='80' -PROXY_SSL_PORT='443' -FTP_SYSTEM='vsftpd' -MAIL_SYSTEM='exim4' -IMAP_SYSTEM='dovecot' -ANTIVIRUS_SYSTEM='clamav-daemon' -ANTISPAM_SYSTEM='spamassassin' -DB_SYSTEM='mysql' -DNS_SYSTEM='bind9' -STATS_SYSTEM='webalizer,awstats' -BACKUP_SYSTEM='local' -CRON_SYSTEM='cron' -DISK_QUOTA='no' -FIREWALL_SYSTEM='iptables' -FIREWALL_EXTENSION='fail2ban' -REPOSITORY='cmmnt' -VERSION='0.9.8' -LANGUAGE='en' diff --git a/install/ubuntu/whmcs-module.php b/install/ubuntu/whmcs-module.php deleted file mode 100644 index 1cb250611..000000000 --- a/install/ubuntu/whmcs-module.php +++ /dev/null @@ -1,359 +0,0 @@ - array( "Type" => "text", "Default" => "default"), - "SSH Access" => array( "Type" => "yesno", "Description" => "Tick to grant access", ), - "IP Address (optional)" => array( "Type" => "text" ), - ); - return $configarray; - -} - -function vesta_CreateAccount($params) { - - // Execute only if there is assigned server - if ($params["server"] == 1) { - - // Prepare variables - $postvars = array( - 'user' => $params["serverusername"], - 'password' => $params["serverpassword"], - 'hash' => $params["serveraccesshash"], - 'cmd' => 'v-add-user', - 'arg1' => $params["username"], - 'arg2' => $params["password"], - 'arg3' => $params["clientsdetails"]["email"], - 'arg4' => $params["configoption1"], - 'arg5' => $params["clientsdetails"]["firstname"], - 'arg6' => $params["clientsdetails"]["lastname"], - ); - $postdata = http_build_query($postvars); - - // Create user account - $curl = curl_init(); - curl_setopt($curl, CURLOPT_URL, 'https://' . $params["serverhostname"] . ':8083/api/'); - curl_setopt($curl, CURLOPT_RETURNTRANSFER,true); - curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false); - curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, false); - curl_setopt($curl, CURLOPT_POST, true); - curl_setopt($curl, CURLOPT_POSTFIELDS, $postdata); - $answer = curl_exec($curl); - - logModuleCall('vesta','CreateAccount_UserAccount','https://'.$params["serverhostname"].':8083/api/'.$postdata,$answer); - - // Enable ssh access - if(($answer == 'OK') && ($params["configoption2"] == 'on')) { - $postvars = array( - 'user' => $params["serverusername"], - 'password' => $params["serverpassword"], - 'hash' => $params["serveraccesshash"], - 'cmd' => 'v-change-user-shell', - 'arg1' => $params["username"], - 'arg2' => 'bash' - ); - $postdata = http_build_query($postvars); - $curl = curl_init(); - curl_setopt($curl, CURLOPT_URL, 'https://' . $params["serverhostname"] . ':8083/api/'); - curl_setopt($curl, CURLOPT_RETURNTRANSFER,true); - curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false); - curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, false); - curl_setopt($curl, CURLOPT_POST, true); - curl_setopt($curl, CURLOPT_POSTFIELDS, $postdata); - $answer = curl_exec($curl); - - logModuleCall('vesta','CreateAccount_EnableSSH','https://'.$params["serverhostname"].':8083/api/'.$postdata,$answer); - } - - // Add domain - if(($answer == 'OK') && (!empty($params["domain"]))) { - $postvars = array( - 'user' => $params["serverusername"], - 'password' => $params["serverpassword"], - 'hash' => $params["serveraccesshash"], - 'cmd' => 'v-add-domain', - 'arg1' => $params["username"], - 'arg2' => $params["domain"], - 'arg3' => $params["configoption3"], - ); - $postdata = http_build_query($postvars); - $curl = curl_init(); - curl_setopt($curl, CURLOPT_URL, 'https://' . $params["serverhostname"] . ':8083/api/'); - curl_setopt($curl, CURLOPT_RETURNTRANSFER,true); - curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false); - curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, false); - curl_setopt($curl, CURLOPT_POST, true); - curl_setopt($curl, CURLOPT_POSTFIELDS, $postdata); - $answer = curl_exec($curl); - - logModuleCall('vesta','CreateAccount_AddDomain','https://'.$params["serverhostname"].':8083/api/'.$postdata,$answer); - } - } - - if($answer == 'OK') { - $result = "success"; - } else { - $result = $answer; - } - - return $result; -} - -function vesta_TerminateAccount($params) { - - // Execute only if there is assigned server - if ($params["server"] == 1) { - - // Prepare variables - $postvars = array( - 'user' => $params["serverusername"], - 'password' => $params["serverpassword"], - 'hash' => $params["serveraccesshash"], - 'cmd' => 'v-delete-user', - 'arg1' => $params["username"] - ); - $postdata = http_build_query($postvars); - - // Delete user account - $curl = curl_init(); - curl_setopt($curl, CURLOPT_URL, 'https://' . $params["serverhostname"] . ':8083/api/'); - curl_setopt($curl, CURLOPT_RETURNTRANSFER,true); - curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false); - curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, false); - curl_setopt($curl, CURLOPT_POST, true); - curl_setopt($curl, CURLOPT_POSTFIELDS, $postdata); - $answer = curl_exec($curl); - } - - logModuleCall('vesta','TerminateAccount','https://'.$params["serverhostname"].':8083/api/'.$postdata,$answer); - - if($answer == 'OK') { - $result = "success"; - } else { - $result = $answer; - } - - return $result; -} - -function vesta_SuspendAccount($params) { - - // Execute only if there is assigned server - if ($params["server"] == 1) { - - // Prepare variables - $postvars = array( - 'user' => $params["serverusername"], - 'password' => $params["serverpassword"], - 'hash' => $params["serveraccesshash"], - 'cmd' => 'v-suspend-user', - 'arg1' => $params["username"] - ); - $postdata = http_build_query($postvars); - - // Susupend user account - $curl = curl_init(); - curl_setopt($curl, CURLOPT_URL, 'https://' . $params["serverhostname"] . ':8083/api/'); - curl_setopt($curl, CURLOPT_RETURNTRANSFER,true); - curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false); - curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, false); - curl_setopt($curl, CURLOPT_POST, true); - curl_setopt($curl, CURLOPT_POSTFIELDS, $postdata); - $answer = curl_exec($curl); - } - - logModuleCall('vesta','SuspendAccount','https://'.$params["serverhostname"].':8083/api/'.$postdata,$answer); - - if($answer == 'OK') { - $result = "success"; - } else { - $result = $answer; - } - - return $result; -} - -function vesta_UnsuspendAccount($params) { - - // Execute only if there is assigned server - if ($params["server"] == 1) { - - // Prepare variables - $postvars = array( - 'user' => $params["serverusername"], - 'password' => $params["serverpassword"], - 'hash' => $params["serveraccesshash"], - 'cmd' => 'v-unsuspend-user', - 'arg1' => $params["username"] - ); - $postdata = http_build_query($postvars); - - // Unsusupend user account - $curl = curl_init(); - curl_setopt($curl, CURLOPT_URL, 'https://' . $params["serverhostname"] . ':8083/api/'); - curl_setopt($curl, CURLOPT_RETURNTRANSFER,true); - curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false); - curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, false); - curl_setopt($curl, CURLOPT_POST, true); - curl_setopt($curl, CURLOPT_POSTFIELDS, $postdata); - $answer = curl_exec($curl); - } - - logModuleCall('vesta','UnsuspendAccount','https://'.$params["serverhostname"].':8083/api/'.$postdata,$answer); - - if($answer == 'OK') { - $result = "success"; - } else { - $result = $answer; - } - - return $result; -} - -function vesta_ChangePassword($params) { - - // Execute only if there is assigned server - if ($params["server"] == 1) { - - // Prepare variables - $postvars = array( - 'user' => $params["serverusername"], - 'password' => $params["serverpassword"], - 'hash' => $params["serveraccesshash"], - 'cmd' => 'v-change-user-password', - 'arg1' => $params["username"], - 'arg2' => $params["password"] - ); - $postdata = http_build_query($postvars); - - // Change user package - $curl = curl_init(); - curl_setopt($curl, CURLOPT_URL, 'https://' . $params["serverhostname"] . ':8083/api/'); - curl_setopt($curl, CURLOPT_RETURNTRANSFER,true); - curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false); - curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, false); - curl_setopt($curl, CURLOPT_POST, true); - curl_setopt($curl, CURLOPT_POSTFIELDS, $postdata); - $answer = curl_exec($curl); - } - - logModuleCall('vesta','ChangePassword','https://'.$params["serverhostname"].':8083/api/'.$postdata,$answer); - - if($answer == 'OK') { - $result = "success"; - } else { - $result = $answer; - } - - return $result; -} - -function vesta_ChangePackage($params) { - - // Execute only if there is assigned server - if ($params["server"] == 1) { - - // Prepare variables - $postvars = array( - 'user' => $params["serverusername"], - 'password' => $params["serverpassword"], - 'hash' => $params["serveraccesshash"], - 'cmd' => 'v-change-user-package', - 'arg1' => $params["username"], - 'arg2' => $params["configoption1"] - ); - $postdata = http_build_query($postvars); - - // Change user package - $curl = curl_init(); - curl_setopt($curl, CURLOPT_URL, 'https://' . $params["serverhostname"] . ':8083/api/'); - curl_setopt($curl, CURLOPT_RETURNTRANSFER,true); - curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false); - curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, false); - curl_setopt($curl, CURLOPT_POST, true); - curl_setopt($curl, CURLOPT_POSTFIELDS, $postdata); - $answer = curl_exec($curl); - } - - logModuleCall('vesta','ChangePackage','https://'.$params["serverhostname"].':8083/api/'.$postdata,$answer); - - if($answer == 'OK') { - $result = "success"; - } else { - $result = $answer; - } - - return $result; -} - -function vesta_ClientArea($params) { - - $code = '
        - - - - -
        '; - return $code; - -} - -function vesta_AdminLink($params) { - - $code = '
        - - - -
        '; - return $code; - -} - -function vesta_LoginLink($params) { - - echo "control panel"; - -} - -function vesta_UsageUpdate($params) { - - // Prepare variables - $postvars = array( - 'user' => $params["serverusername"], - 'password' => $params["serverpassword"], - 'hash' => $params["serveraccesshash"], - 'cmd' => 'v-list-users', - 'arg1' => 'json' - ); - $postdata = http_build_query($postvars); - - // Get user stats - $curl = curl_init(); - curl_setopt($curl, CURLOPT_URL, 'https://' . $params["serverhostname"] . ':8083/api/'); - curl_setopt($curl, CURLOPT_RETURNTRANSFER,true); - curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false); - curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, false); - curl_setopt($curl, CURLOPT_POST, true); - curl_setopt($curl, CURLOPT_POSTFIELDS, $postdata); - $answer = curl_exec($curl); - - // Decode json data - $results = json_decode($answer, true); - - // Loop through results and update DB - foreach ($results AS $user=>$values) { - update_query("tblhosting",array( - "diskusage"=>$values['U_DISK'], - "disklimit"=>$values['DISK_QUOTA'], - "bwusage"=>$values['U_BANDWIDTH'], - "bwlimit"=>$values['BANDWIDTH'], - "lastupdate"=>"now()", - ),array("server"=>$params['serverid'], "username"=>$user)); - } - -} - -?> diff --git a/install/vst-install-debian.sh b/install/vst-install-debian.sh old mode 100644 new mode 100755 index c8afb93ff..103a4cf19 --- a/install/vst-install-debian.sh +++ b/install/vst-install-debian.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Vesta Debian installer v.04 +# Vesta Debian installer v.05 #----------------------------------------------------------# # Variables&Functions # @@ -10,32 +10,72 @@ export DEBIAN_FRONTEND=noninteractive RHOST='apt.vestacp.com' CHOST='c.vestacp.com' VERSION='0.9.8/debian' -software="nginx apache2 apache2-utils apache2.2-common bsdutils e2fsprogs - apache2-suexec-custom libapache2-mod-ruid2 libapache2-mod-rpaf - libapache2-mod-fcgid bind9 idn mysql-server mysql-common - mysql-client php5-common php5-cgi php5-mysql php5-curl - libapache2-mod-php5 vsftpd mc exim4 exim4-daemon-heavy clamav-daemon - flex dovecot-imapd dovecot-pop3d phpMyAdmin awstats webalizer - jwhois rssh git spamassassin roundcube roundcube-mysql - roundcube-plugins sudo bc ftp lsof ntpdate rrdtool quota e2fslibs - fail2ban dnsutils vesta vesta-nginx vesta-php" +memory=$(grep 'MemTotal' /proc/meminfo |tr ' ' '\n' |grep [0-9]) +arch=$(uname -i) +os='debian' +release=$(cat /etc/issue|grep -o [0-9]|head -n1) +codename="$(cat /etc/os-release |grep VERSION= |cut -f 2 -d \(|cut -f 1 -d \))" +vestacp="http://$CHOST/$VERSION/$release" +if [ "$release" -eq 8 ]; then + software="nginx apache2 apache2-utils apache2.2-common + apache2-suexec-custom libapache2-mod-ruid2 libapache2-mod-rpaf + libapache2-mod-fcgid libapache2-mod-php5 php5 php5-common php5-cgi + php5-mysql php5-curl php5-fpm php5-pgsql awstats webalizer vsftpd + proftpd-basic bind9 exim4 exim4-daemon-heavy clamav-daemon + spamassassin dovecot-imapd dovecot-pop3d roundcube-core + roundcube-mysql roundcube-plugins mysql-server mysql-common + mysql-client postgresql postgresql-contrib phppgadmin phpMyAdmin mc + flex whois rssh git idn zip sudo bc ftp lsof ntpdate rrdtool quota + e2fslibs bsdutils e2fsprogs curl imagemagick fail2ban dnsutils + bsdmainutils vesta vesta-nginx vesta-php" +else + software="nginx apache2 apache2-utils apache2.2-common + apache2-suexec-custom libapache2-mod-ruid2 libapache2-mod-rpaf + libapache2-mod-fcgid libapache2-mod-php5 php5 php5-common php5-cgi + php5-mysql php5-curl php5-fpm php5-pgsql awstats webalizer vsftpd + proftpd-basic proftpd-mod-vroot bind9 exim4 exim4-daemon-heavy + clamav-daemon spamassassin dovecot-imapd dovecot-pop3d roundcube-core + roundcube-mysql roundcube-plugins mysql-server mysql-common + mysql-client postgresql postgresql-contrib phppgadmin phpMyAdmin mc + flex whois rssh git idn zip sudo bc ftp lsof ntpdate rrdtool quota + e2fslibs bsdutils e2fsprogs curl imagemagick fail2ban dnsutils + bsdmainutils vesta vesta-nginx vesta-php" +fi + +# Defining help function help() { - echo "usage: $0 [OPTIONS] - -h, --help Print this help and exit - -f, --force Force installation - -i, --disable-iptables Disable iptables support - -b, --disable-fail2ban Disable fail2ban protection - -n, --noupdate Do not run apt-get upgrade command - -s, --hostname Set server hostname - -e, --email Set email address - -p, --password Set admin password instead of generating it - -m, --mysql-password Set MySQL password instead of generating it - -q, --quota Enable File System Quota" + echo "Usage: $0 [OPTIONS] + -a, --apache Install Apache [yes|no] default: yes + -n, --nginx Install Nginx [yes|no] default: yes + -w, --phpfpm Install PHP-FPM [yes|no] default: no + -v, --vsftpd Install Vsftpd [yes|no] default: yes + -j, --proftpd Install ProFTPD [yes|no] default: no + -k, --named Install Bind [yes|no] default: yes + -m, --mysql Install MySQL [yes|no] default: yes + -g, --postgresql Install PostgreSQL [yes|no] default: no + -d, --mongodb Install MongoDB [yes|no] unsupported + -x, --exim Install Exim [yes|no] default: yes + -z, --dovecot Install Dovecot [yes|no] default: yes + -c, --clamav Install ClamAV [yes|no] default: yes + -t, --spamassassin Install SpamAssassin [yes|no] default: yes + -i, --iptables Install Iptables [yes|no] default: yes + -b, --fail2ban Install Fail2ban [yes|no] default: yes + -q, --quota Filesystem Quota [yes|no] default: no + -l, --lang Default language default: en + -y, --interactive Interactive install [yes|no] default: yes + -s, --hostname Set hostname + -e, --email Set admin email + -p, --password Set admin password + -f, --force Force installation + -h, --help Print this help + + Example: bash $0 -e demo@vestacp.com -p p4ssw0rd --apache no --phpfpm yes" exit 1 } -# Password generator + +# Defining password-gen function gen_pass() { MATRIX='0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz' LENGTH=10 @@ -46,111 +86,159 @@ gen_pass() { echo "$PASS" } +# Defning return code check function +check_result() { + if [ $1 -ne 0 ]; then + echo "Error: $2" + exit $1 + fi +} + +# Defining function to set default value +set_default_value() { + eval variable=\$$1 + if [ -z "$variable" ]; then + eval $1=$2 + fi + if [ "$variable" != 'yes' ] && [ "$variable" != 'no' ]; then + eval $1=$2 + fi +} #----------------------------------------------------------# # Verifications # #----------------------------------------------------------# +# Creating temporary file +tmpfile=$(mktemp -p /tmp) + # Translating argument to --gnu-long-options for arg; do delim="" case "$arg" in - --help) args="${args}-h " ;; - --force) args="${args}-f " ;; - --disable-fail2ban) args="${args}-b " ;; - --disable-iptables) args="${args}-i " ;; - --noupdate) args="${args}-n " ;; + --apache) args="${args}-a " ;; + --nginx) args="${args}-n " ;; + --phpfpm) args="${args}-w " ;; + --vsftpd) args="${args}-v " ;; + --proftpd) args="${args}-j " ;; + --named) args="${args}-k " ;; + --mysql) args="${args}-m " ;; + --postgresql) args="${args}-g " ;; + --mongodb) args="${args}-d " ;; + --exim) args="${args}-x " ;; + --dovecot) args="${args}-z " ;; + --clamav) args="${args}-c " ;; + --spamassassin) args="${args}-t " ;; + --iptables) args="${args}-i " ;; + --fail2ban) args="${args}-b " ;; + --quota) args="${args}-q " ;; + --lang) args="${args}-l " ;; + --interactive) args="${args}-y " ;; --hostname) args="${args}-s " ;; --email) args="${args}-e " ;; --password) args="${args}-p " ;; - --mysql-password) args="${args}-m " ;; - --quota) args="${args}-q " ;; - *) [[ "${arg:0:1}" == "-" ]] || delim="\"" - args="${args}${delim}${arg}${delim} ";; + --force) args="${args}-f " ;; + --help) args="${args}-h " ;; + *) [[ "${arg:0:1}" == "-" ]] || delim="\"" + args="${args}${delim}${arg}${delim} ";; esac done eval set -- "$args" -# Getopt -while getopts "hfibdnqe:m:p:s:" Option; do +# Parsing arguments +while getopts "a:n:w:v:j:k:m:g:d:x:z:c:t:i:b:r:q:l:y:s:e:p:fh" Option; do case $Option in - h) help ;; # Help - f) force='yes' ;; # Force install - i) disable_iptables='yes' ;; # Disable iptables - b) disable_fail2ban='yes' ;; # Disable fail2ban - n) noupdate='yes' ;; # Disable apt-get upgrade - s) servername=$OPTARG ;; # Server hostname - e) email=$OPTARG ;; # Set email - p) vpass=$OPTARG ;; # Admin password - m) mpass=$OPTARG ;; # MySQL pasword - q) quota='yes' ;; # Enable quota - *) help ;; # Default + a) apache=$OPTARG ;; # Apache + n) nginx=$OPTARG ;; # Nginx + w) phpfpm=$OPTARG ;; # PHP-FPM + v) vsftpd=$OPTARG ;; # Vsftpd + j) proftpd=$OPTARG ;; # Proftpd + k) named=$OPTARG ;; # Named + m) mysql=$OPTARG ;; # MySQL + g) postgresql=$OPTARG ;; # PostgreSQL + d) mongodb=$OPTARG ;; # MongoDB (unsupported) + x) exim=$OPTARG ;; # Exim + z) dovecot=$OPTARG ;; # Dovecot + c) clamd=$OPTARG ;; # ClamAV + t) spamd=$OPTARG ;; # SpamAssassin + i) iptables=$OPTARG ;; # Iptables + b) fail2ban=$OPTARG ;; # Fail2ban + q) quota=$OPTARG ;; # FS Quota + l) lang=$OPTARG ;; # Language + y) interactive=$OPTARG ;; # Interactive install + s) servername=$OPTARG ;; # Hostname + e) email=$OPTARG ;; # Admin email + p) vpass=$OPTARG ;; # Admin password + f) force='yes' ;; # Force install + h) help ;; # Help + *) help ;; # Print help (default) esac done -# Am I root? -if [ "x$(id -u)" != 'x0' ]; then - echo 'Error: this script can only be executed by root' - exit 1 -fi - -# Check supported version -if [ -e '/etc/redhat-release' ] || [ "$(lsb_release -si)" == "Ubuntu" ]; then - echo 'Error: sorry, this installer works only on Debian 7' - exit 1 -fi - -# Check supported OS -if [ "$(arch)" != 'x86_64' ]; then - arch='i386' +# Defining default software stack +set_default_value 'nginx' 'yes' +set_default_value 'apache' 'yes' +set_default_value 'phpfpm' 'no' +set_default_value 'vsftpd' 'yes' +set_default_value 'proftpd' 'no' +set_default_value 'named' 'yes' +set_default_value 'mysql' 'yes' +set_default_value 'postgresql' 'no' +set_default_value 'mongodb' 'no' +set_default_value 'exim' 'yes' +set_default_value 'dovecot' 'yes' +if [ $memory -lt 1500000 ]; then + set_default_value 'clamd' 'no' + set_default_value 'spamd' 'no' else - arch="amd64" + set_default_value 'clamd' 'yes' + set_default_value 'spamd' 'yes' fi -os=$(head -n1 /etc/issue | cut -f 1 -d ' ') -if [[ "$(cut -f 1 -d . /etc/debian_version)" -eq '7' ]]; then - release="7" - codename="wheezy" +set_default_value 'iptables' 'yes' +set_default_value 'fail2ban' 'yes' +set_default_value 'quota' 'no' +set_default_value 'lang' 'en' +set_default_value 'interactive' 'yes' + +# Checking software conflicts +if [ "$phpfpm" = 'yes' ]; then + apache='no' + nginx='yes' fi -if [ $codename != 'wheezy' ]; then - echo 'Error: only Debian 7 is supported' - exit 1 +if [ "$proftpd" = 'yes' ]; then + vsftpd='no' +fi +if [ "$exim" = 'no' ]; then + clamd='no' + spamd='no' + dovecot='no' +fi +if [ "$iptables" = 'no' ]; then + fail2ban='no' fi -# Check admin user account -if [ ! -z "$(grep ^admin: /etc/passwd)" ] && [ "$force" != 'yes' ]; then - echo "Error: user admin exists" - echo +# Checking root permissions +if [ "x$(id -u)" != 'x0' ]; then + check_error 1 "Script can be run executed only by root" +fi + +# Checking admin user account +if [ ! -z "$(grep ^admin: /etc/passwd /etc/group)" ] && [ -z "$force" ]; then echo 'Please remove admin user account before proceeding.' echo 'If you want to do it automatically run installer with -f option:' - echo "Example: bash $0 --force" - exit 1 + echo -e "Example: bash $0 --force\n" + check_result 1 "User admin exists" fi -# Check admin group -if [ ! -z "$(grep ^admin: /etc/group)" ] && [ "$force" != 'yes' ]; then - echo "Error: group admin exists" - echo - echo 'Please remove admin group before proceeding.' - echo 'If you want to do it automatically run installer with -f option:' - echo "Example: bash $0 --force" - exit 1 -fi - -# Check wget +# Checking wget if [ ! -e '/usr/bin/wget' ]; then apt-get -y install wget - if [ $? -ne 0 ]; then - echo "Error: can't install wget" - exit 1 - fi + check_result $? "Can't install wget" fi -# Check repo availability -wget -q "$CHOST/$VERSION/vesta.conf" -O /dev/null -if [ $? -ne 0 ]; then - echo "Error: no access to repository" - exit 1 -fi +# Checking repository availability +wget -q "$vestacp/deb_signing.key" -O /dev/null +check_result $? "No access to Vesta repository" # Check installed packages tmpfile=$(mktemp -p /tmp) @@ -173,211 +261,306 @@ if [ ! -z "$conflicts" ] && [ -z "$force" ]; then echo echo '!!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!' echo - exit 1 + check_result 1 "Control Panel should be installed on clean server." fi -# Check server type -memory=$(grep 'MemTotal' /proc/meminfo |tr ' ' '\n' |grep [0-9]) -if [ "$memory" -lt '350000' ] && [ -z "$force" ]; then - echo "Error: not enough memory to install Vesta Control Panel." - echo -e "\nMinimum RAM required: 350Mb" - echo 'If you want to force installation run this script with -f option:' - echo "Example: bash $0 --force" - exit 1 -fi -srv_type='micro' -if [ "$memory" -gt '1000000' ]; then - srv_type='small' +#----------------------------------------------------------# +# Brief Info # +#----------------------------------------------------------# + +# Printing nice ascii aslogo +clear +echo +echo ' _| _| _|_|_|_| _|_|_| _|_|_|_|_| _|_|' +echo ' _| _| _| _| _| _| _|' +echo ' _| _| _|_|_| _|_| _| _|_|_|_|' +echo ' _| _| _| _| _| _| _|' +echo ' _| _|_|_|_| _|_|_| _| _| _|' +echo +echo ' Vesta Control Panel' +echo -e "\n\n" + +echo 'Following software will be installed on your system:' + +# Web stack +if [ "$nginx" = 'yes' ]; then + echo ' - Nginx Web Server' +fi +if [ "$apache" = 'yes' ] && [ "$nginx" = 'no' ] ; then + echo ' - Apache Web Server' +fi +if [ "$apache" = 'yes' ] && [ "$nginx" = 'yes' ] ; then + echo ' - Apache Web Server (as backend)' +fi +if [ "$phpfpm" = 'yes' ]; then + echo ' - PHP-FPM Application Server' fi -if [ "$memory" -gt '3000000' ]; then - srv_type='medium' +# DNS stack +if [ "$named" = 'yes' ]; then + echo ' - Bind DNS Server' fi -if [ "$memory" -gt '7000000' ]; then - srv_type='large' -fi - -# Are you sure ? -if [ -z $email ]; then - clear - echo - echo ' _| _| _|_|_|_| _|_|_| _|_|_|_|_| _|_| ' - echo ' _| _| _| _| _| _| _| ' - echo ' _| _| _|_|_| _|_| _| _|_|_|_| ' - echo ' _| _| _| _| _| _| _| ' - echo ' _| _|_|_|_| _|_|_| _| _| _| ' - echo - echo ' Vesta Control Panel' - echo - echo - echo 'Following software will be installed on your system:' - echo ' - Nginx frontend web server' - echo ' - Apache application web server' - echo ' - Bind DNS server' - echo ' - Exim mail server' - echo ' - Dovecot IMAP and POP3 server' - if [ "$srv_type" = 'medium' ] || [ "$srv_type" = 'large' ]; then - echo ' - Clam mail antivirus' - echo ' - SpamAssassin antispam' +# Mail Stack +if [ "$exim" = 'yes' ]; then + echo -n ' - Exim mail server' + if [ "$clamd" = 'yes' ] || [ "$spamd" = 'yes' ] ; then + echo -n ' + ' + if [ "$clamd" = 'yes' ]; then + echo -n 'Antivirus ' + fi + if [ "$spamd" = 'yes' ]; then + echo -n 'Antispam' + fi fi - echo ' - MySQL database server' - echo ' - Vsftpd FTP server' - echo - echo + echo + if [ "$dovecot" = 'yes' ]; then + echo ' - Dovecot POP3/IMAP Server' + fi +fi - read -p 'Do you want to proceed? [y/n]): ' answer +# DB stack +if [ "$mysql" = 'yes' ]; then + echo ' - MySQL Database Server' +fi +if [ "$postgresql" = 'yes' ]; then + echo ' - PostgreSQL Database Server' +fi +if [ "$mongodb" = 'yes' ]; then + echo ' - MongoDB Database Server' +fi + +# FTP stack +if [ "$vsftpd" = 'yes' ]; then + echo ' - Vsftpd FTP Server' +fi +if [ "$proftpd" = 'yes' ]; then + echo ' - ProFTPD FTP Server' +fi + +# Firewall stack +if [ "$iptables" = 'yes' ]; then + echo -n ' - Iptables Firewall' +fi +if [ "$iptables" = 'yes' ] && [ "$fail2ban" = 'yes' ]; then + echo -n ' + Fail2Ban' +fi +echo -e "\n\n" + +# Asking for confirmation to proceed +if [ "$interactive" = 'yes' ]; then + read -p 'Would you like to continue [y/n]: ' answer if [ "$answer" != 'y' ] && [ "$answer" != 'Y' ]; then echo 'Goodbye' exit 1 fi - # Check email - read -p 'Please enter valid email address: ' email + # Asking for contact email + if [ -z "$email" ]; then + read -p 'Please enter admin email address: ' email + fi - # Define server hostname + # Asking to set FQDN hostname if [ -z "$servername" ]; then - read -p "Please enter hostname [$(hostname)]: " servername + read -p "Please enter FQDN hostname [$(hostname)]: " servername fi fi -# Validate email -local_part=$(echo $email | cut -s -f1 -d\@) -remote_host=$(echo $email | cut -s -f2 -d\@) -mx_failed=1 -if [ ! -z "$remote_host" ] && [ ! -z "$local_part" ]; then - /usr/bin/host -t mx "$remote_host" > /dev/null 2>&1 - mx_failed="$?" +# Generating admin password if it wasn't set +if [ -z "$vpass" ]; then + vpass=$(gen_pass) fi -if [ "$mx_failed" -eq 1 ]; then - echo "Error: email $email is not valid" - exit 1 +# Set hostname if it wasn't set +if [ -z "$servername" ]; then + servername=$(hostname -f) +fi + +# Set email if it wasn't set +if [ -z "$email" ]; then + email="admin@$servername" +fi + +# Defining backup directory +vst_backups="/root/vst_install_backups/$(date +%s)" +echo "Installation backup directory: $vst_backups" + +# Printing start message and sleeping for 5 seconds +echo -e "\n\n\n\nInstallation will take about 15 minutes ...\n" +sleep 5 + + +#----------------------------------------------------------# +# Checking swap # +#----------------------------------------------------------# + +# Checking swap on small instances +if [ -z "$(swapon -s)" ] && [ $memory -lt 1000000 ]; then + fallocate -l 1G /swapfile + chmod 600 /swapfile + mkswap /swapfile + swapon /swapfile + echo "/swapfile none swap sw 0 0" >> /etc/fstab fi #----------------------------------------------------------# # Install repository # #----------------------------------------------------------# -# Let's start -echo -e "\n\n\n\nInstallation will take about 15 minutes ...\n" -sleep 5 -# Update system -if [ -z "$noupdate" ]; then - apt-get -y upgrade - if [ $? -ne 0 ]; then - echo 'Error: apt-get upgrade failed' - exit 1 - fi -fi +# Updating system +apt-get -y upgrade +check_result $? 'apt-get upgrade failed' -# Install nginx repo +# Installing nginx repo apt=/etc/apt/sources.list.d echo "deb http://nginx.org/packages/debian/ $codename nginx" > $apt/nginx.list wget http://nginx.org/keys/nginx_signing.key -O /tmp/nginx_signing.key apt-key add /tmp/nginx_signing.key -# Install vesta repo +# Installing vesta repo echo "deb http://$RHOST/$codename/ $codename vesta" > $apt/vesta.list wget $CHOST/deb_signing.key -O deb_signing.key apt-key add deb_signing.key #----------------------------------------------------------# -# Backups # +# Backup # #----------------------------------------------------------# -# Prepare backup tree -vst_backups="/root/vst_install_backups/$(date +%s)" -mkdir -p $vst_backups/nginx -mkdir -p $vst_backups/apache2 -mkdir -p $vst_backups/mysql -mkdir -p $vst_backups/exim4 -mkdir -p $vst_backups/dovecot -mkdir -p $vst_backups/clamav -mkdir -p $vst_backups/spamassassin -mkdir -p $vst_backups/vsftpd -mkdir -p $vst_backups/bind -mkdir -p $vst_backups/vesta -mkdir -p $vst_backups/home +# Creating backup directory tree +mkdir -p $vst_backups +cd $vst_backups +mkdir nginx apache2 php5 php5-fpm vsftpd proftpd bind exim4 dovecot clamd +mkdir spamassassin mysql postgresql mongodb vesta -# Backup sudoers -if [ -e '/etc/sudoers' ]; then - cp /etc/sudoers $vst_backups/ -fi - -# Backup nginx +# Backing up Nginx configuration service nginx stop > /dev/null 2>&1 -if [ -e '/etc/nginx/nginx.conf' ]; then - cp -r /etc/nginx/* $vst_backups/nginx/ -fi +cp -r /etc/nginx/* $vst_backups/nginx >/dev/null 2>&1 -# Backup apache2 +# Backing up Apache configuration service apache2 stop > /dev/null 2>&1 -if [ -e '/etc/apache2/apache2.conf' ]; then - cp -r /etc/apache2/* $vst_backups/apache2/ -fi +cp -r /etc/apache2/* $vst_backups/apache2 > /dev/null 2>&1 +rm -f /etc/apache2/conf.d/* > /dev/null 2>&1 -# Backup bind9 +# Backing up PHP configuration +cp /etc/php.ini $vst_backups/php > /dev/null 2>&1 +cp -r /etc/php.d $vst_backups/php > /dev/null 2>&1 + +# Backing up PHP configuration +service php5-fpm stop >/dev/null 2>&1 +cp /etc/php5/* $vst_backups/php5 > /dev/null 2>&1 +rm -f /etc/php5/fpm/pool.d/* >/dev/null 2>&1 + +# Backing up Bind configuration service bind9 stop > /dev/null 2>&1 -if [ -e '/etc/bind/named.conf' ]; then - cp -r /etc/bind/* $vst_backups/bind/ -fi +cp -r /etc/bind/* $vst_backups/bind > /dev/null 2>&1 -# Backup vsftpd +# Backing up Vsftpd configuration service vsftpd stop > /dev/null 2>&1 -if [ -e '/etc/vsftpd.conf' ]; then - cp /etc/vsftpd.conf $vst_backups/vsftpd/ -fi +cp /etc/vsftpd.conf $vst_backups/vsftpd > /dev/null 2>&1 -# Backup exim4 +# Backing up ProFTPD configuration +service proftpd stop > /dev/null 2>&1 +cp /etc/proftpd.conf $vst_backups/proftpd >/dev/null 2>&1 + +# Backing up Exim configuration service exim4 stop > /dev/null 2>&1 -if [ -e '/etc/exim4/exim4.conf.template' ]; then - cp -r /etc/exim4/* $vst_backups/exim4/ -fi +cp -r /etc/exim4/* $vst_backups/exim4 > /dev/null 2>&1 -# Backup clamav +# Backing up ClamAV configuration service clamav-daemon stop > /dev/null 2>&1 -if [ -e '/etc/clamav/clamd.conf' ]; then - cp -r /etc/clamav/* $vst_backups/clamav/ -fi +cp -r /etc/clamav/* $vst_backups/clamav > /dev/null 2>&1 -# Backup SpamAssassin +# Backing up SpamAssassin configuration service spamassassin stop > /dev/null 2>&1 -if [ -e '/etc/spamassassin/local.cf' ]; then - cp -r /etc/spamassassin/* $vst_backups/spamassassin/ -fi +cp -r /etc/spamassassin/* $vst_backups/spamassassin > /dev/null 2>&1 -# Backup dovecot +# Backing up Dovecot configuration service dovecot stop > /dev/null 2>&1 -if [ -e '/etc/dovecot.conf' ]; then - cp /etc/dovecot.conf $vst_backups/dovecot/ -fi -if [ -e '/etc/dovecot' ]; then - cp -r /etc/dovecot/* $vst_backups/dovecot/ -fi +cp /etc/dovecot.conf $vst_backups/dovecot > /dev/null 2>&1 +cp -r /etc/dovecot/* $vst_backups/dovecot > /dev/null 2>&1 -# Backup MySQL stuff +# Backing up MySQL/MariaDB configuration and data service mysql stop > /dev/null 2>&1 -if [ -e '/var/lib/mysql' ]; then - mv /var/lib/mysql $vst_backups/mysql/mysql_datadir -fi -if [ -e '/etc/mysql/my.cnf' ]; then - cp -r /etc/mysql/* $vst_backups/mysql/ -fi -if [ -e '/root/.my.cnf' ]; then - mv /root/.my.cnf $vst_backups/mysql/ -fi +killall -9 mysqld > /dev/null 2>&1 +mv /var/lib/mysql $vst_backups/mysql/mysql_datadir > /dev/null 2>&1 +cp -r /etc/mysql/* $vst_backups/mysql > /dev/null 2>&1 +mv -f /root/.my.cnf $vst_backups/mysql > /dev/null 2>&1 # Backup vesta service vesta stop > /dev/null 2>&1 -if [ -e '/usr/local/vesta' ]; then - cp -r /usr/local/vesta/* $vst_backups/vesta/ - apt-get -y remove vesta* - apt-get -y purge vesta* - rm -rf /usr/local/vesta +cp -r /usr/local/vesta/* $vst_backups/vesta > /dev/null 2>&1 +apt-get -y remove vesta vesta-nginx vesta-php > /dev/null 2>&1 +apt-get -y purge vesta vesta-nginx vesta-php > /dev/null 2>&1 +rm -rf /usr/local/vesta > /dev/null 2>&1 + + +#----------------------------------------------------------# +# Package Exludes # +#----------------------------------------------------------# + +# Excluding packages +if [ "$nginx" = 'no' ]; then + software=$(echo "$software" | sed -e "s/^nginx//") +fi +if [ "$apache" = 'no' ]; then + software=$(echo "$software" | sed -e "s/apache2 //") + software=$(echo "$software" | sed -e "s/apache2-utils//") + software=$(echo "$software" | sed -e "s/apache2-suexec-custom//") + software=$(echo "$software" | sed -e "s/apache2.2-common//") + software=$(echo "$software" | sed -e "s/libapache2-mod-ruid2//") + software=$(echo "$software" | sed -e "s/libapache2-mod-rpaf//") + software=$(echo "$software" | sed -e "s/libapache2-mod-fcgid//") + software=$(echo "$software" | sed -e "s/libapache2-mod-php5//") +fi +if [ "$phpfpm" = 'no' ]; then + software=$(echo "$software" | sed -e "s/php5-fpm//") +fi +if [ "$vsftpd" = 'no' ]; then + software=$(echo "$software" | sed -e "s/vsftpd//") +fi +if [ "$proftpd" = 'no' ]; then + software=$(echo "$software" | sed -e "s/proftpd-basic//") + software=$(echo "$software" | sed -e "s/proftpd-mod-vroot//") +fi +if [ "$named" = 'no' ]; then + software=$(echo "$software" | sed -e "s/bind9//") +fi +if [ "$exim" = 'no' ]; then + software=$(echo "$software" | sed -e "s/exim4 //") + software=$(echo "$software" | sed -e "s/exim4-daemon-heavy//") + software=$(echo "$software" | sed -e "s/dovecot-imapd//") + software=$(echo "$software" | sed -e "s/dovecot-pop3d//") + software=$(echo "$software" | sed -e "s/clamav-daemon//") + software=$(echo "$software" | sed -e "s/spamassassin//") +fi +if [ "$clamd" = 'no' ]; then + software=$(echo "$software" | sed -e "s/clamav-daemon//") +fi +if [ "$spamd" = 'no' ]; then + software=$(echo "$software" | sed -e "s/spamassassin//") +fi +if [ "$dovecot" = 'no' ]; then + software=$(echo "$software" | sed -e "s/dovecot-imapd//") + software=$(echo "$software" | sed -e "s/dovecot-pop3d//") +fi +if [ "$mysql" = 'no' ]; then + software=$(echo "$software" | sed -e 's/mysql-server//') + software=$(echo "$software" | sed -e 's/mysql-client//') + software=$(echo "$software" | sed -e 's/mysql-common//') + software=$(echo "$software" | sed -e 's/php5-mysql//') + software=$(echo "$software" | sed -e 's/phpMyAdmin//') +fi +if [ "$postgresql" = 'no' ]; then + software=$(echo "$software" | sed -e 's/postgresql-contrib//') + software=$(echo "$software" | sed -e 's/postgresql//') + software=$(echo "$software" | sed -e 's/php5-pgsql//') + software=$(echo "$software" | sed -e 's/phppgadmin//') +fi +if [ "$iptables" = 'no' ] || [ "$fail2ban" = 'no' ]; then + software=$(echo "$software" | sed -e 's/fail2ban//') fi @@ -385,37 +568,16 @@ fi # Install packages # #----------------------------------------------------------# -# Exclude heavy packages -if [ "$srv_type" = 'micro' ]; then - software=$(echo "$software" | sed -e 's/libapache2-mod-fcgid//') - software=$(echo "$software" | sed -e 's/clamav-daemon//') - software=$(echo "$software" | sed -e 's/spamassassin//') -fi - -if [ "$srv_type" = 'small' ]; then - software=$(echo "$software" | sed -e 's/clamav-daemon//') - software=$(echo "$software" | sed -e 's/spamassassin//') -fi - -# Exclude fail2ban -if [ "$disable_fail2ban" = 'yes' ]; then - software=$(echo "$software" | sed -e 's/fail2ban//') -fi - # Update system packages apt-get update -# Disable daemon autostart -# For more details /usr/share/doc/sysv-rc/README.policy-rc.d.gz +# Disable daemon autostart /usr/share/doc/sysv-rc/README.policy-rc.d.gz echo -e '#!/bin/sh \nexit 101' > /usr/sbin/policy-rc.d chmod a+x /usr/sbin/policy-rc.d -# Install Vesta packages +# Install apt packages apt-get -y install $software -if [ $? -ne 0 ]; then - echo 'Error: apt-get install failed' - exit 1 -fi +check_result $? "apt-get install failed" # Restore policy rm -f /usr/sbin/policy-rc.d @@ -425,93 +587,6 @@ rm -f /usr/sbin/policy-rc.d # Configure system # #----------------------------------------------------------# -# Set writable permission on tmp directory -chmod 777 /tmp - -# Vesta configuration -echo "export VESTA='/usr/local/vesta'" > /etc/profile.d/vesta.sh -chmod 755 /etc/profile.d/vesta.sh -source /etc/profile.d/vesta.sh -echo 'PATH=$PATH:/usr/local/vesta/bin' >> /root/.bash_profile -echo 'export PATH' >> /root/.bash_profile -source /root/.bash_profile -wget $CHOST/$VERSION/vesta.log -O /etc/logrotate.d/vesta - -# Directory tree -mkdir -p $VESTA/conf -mkdir -p $VESTA/log -mkdir -p $VESTA/ssl -mkdir -p $VESTA/data -mkdir -p $VESTA/data/ips -mkdir -p $VESTA/data/queue -mkdir -p $VESTA/data/users -mkdir -p $VESTA/data/firewall -touch $VESTA/data/queue/backup.pipe -touch $VESTA/data/queue/disk.pipe -touch $VESTA/data/queue/webstats.pipe -touch $VESTA/data/queue/restart.pipe -touch $VESTA/data/queue/traffic.pipe -chmod 750 $VESTA/conf -chmod 750 $VESTA/data/users -chmod 750 $VESTA/data/ips -chmod -R 750 $VESTA/data/queue -ln -s /usr/local/vesta/log /var/log/vesta -touch /var/log/vesta/system.log -touch /var/log/vesta/nginx-error.log -touch /var/log/vesta/auth.log -chmod 660 /var/log/vesta/* -adduser backup > /dev/null 2>&1 -mkdir -p /home/backup -chown backup:backup /home/backup -ln -s /home/backup /backup -chmod a+x /backup - -# vesta.conf -wget $CHOST/$VERSION/vesta.conf -O $VESTA/conf/vesta.conf -if [ "$srv_type" = 'micro' ] || [ "$srv_type" = 'small' ]; then - sed -i "s/clamav-daemon//g" $VESTA/conf/vesta.conf - sed -i "s/spamassassin//g" $VESTA/conf/vesta.conf -fi - -# Set server hostname -if [ -z "$servername" ]; then - servername=$(hostname) -fi -/usr/local/vesta/bin/v-change-sys-hostname $servername 2>/dev/null - -# Templates -cd /usr/local/vesta/data -wget $CHOST/$VERSION/packages.tar.gz -O packages.tar.gz -tar -xzf packages.tar.gz -rm -f packages.tar.gz -cd /usr/local/vesta/data -wget $CHOST/$VERSION/templates.tar.gz -O templates.tar.gz -tar -xzf templates.tar.gz -rm -f templates.tar.gz -chmod -R 755 /usr/local/vesta/data/templates -cp templates/web/skel/public_html/index.html /var/www/ -sed -i 's/%domain%/It worked!/g' /var/www/index.html -if [ "$srv_type" = 'micro' ]; then - rm -f /usr/local/vesta/data/templates/web/apache2/phpfcgid.* -fi - -# Generating SSL certificate -$VESTA/bin/v-generate-ssl-cert $(hostname) $email 'US' 'California' \ - 'San Francisco' 'Vesta Control Panel' 'IT' > /tmp/vst.pem - -# Parsing merged certificate file -crt_end=$(grep -n "END CERTIFICATE-" /tmp/vst.pem |cut -f 1 -d:) -key_start=$(grep -n "BEGIN RSA" /tmp/vst.pem |cut -f 1 -d:) -key_end=$(grep -n "END RSA" /tmp/vst.pem |cut -f 1 -d:) - -# Adding SSL certificate -cd /usr/local/vesta/ssl -sed -n "1,${crt_end}p" /tmp/vst.pem > certificate.crt -sed -n "$key_start,${key_end}p" /tmp/vst.pem > certificate.key -chown root:mail /usr/local/vesta/ssl/* -chmod 660 /usr/local/vesta/ssl/* -rm /tmp/vst.pem - # Enable SSH password auth sed -i "s/rdAuthentication no/rdAuthentication yes/g" /etc/ssh/sshd_config service ssh restart @@ -528,13 +603,6 @@ echo 'LS_COLORS="$LS_COLORS:di=00;33"' >> /etc/profile # Register /sbin/nologin echo "/sbin/nologin" >> /etc/shells -# Sudo configuration -wget $CHOST/$VERSION/sudoers.conf -O /etc/sudoers -wget $CHOST/$VERSION/sudoers.admin.conf -O /etc/sudoers.d/admin -chmod 440 /etc/sudoers -chmod 440 /etc/sudoers.d/admin -echo 'Defaults:admin !syslog' >>/etc/sudoers.d/admin - # NTP Synchronization echo '#!/bin/sh' > /etc/cron.daily/ntpdate echo "$(which ntpdate) -s pool.ntp.org" >> /etc/cron.daily/ntpdate @@ -550,279 +618,532 @@ sed -i 's/#allowsftp/allowsftp/' /etc/rssh.conf sed -i 's/#allowrsync/allowrsync/' /etc/rssh.conf chmod 755 /usr/bin/rssh -# Nginx configuration -rm -f /etc/nginx/conf.d/*.conf -wget $CHOST/$VERSION/nginx.conf -O /etc/nginx/nginx.conf -wget $CHOST/$VERSION/nginx-status.conf -O /etc/nginx/conf.d/status.conf -touch /etc/nginx/conf.d/vesta.conf -update-rc.d nginx defaults -service nginx stop > /dev/null 2>&1 -service nginx start -if [ "$?" -ne 0 ]; then - echo "Error: nginx start failed" - exit 1 + +#----------------------------------------------------------# +# Configure VESTA # +#----------------------------------------------------------# + +# Downlading sudo configuration +mkdir -p /etc/sudoers.d +wget $vestacp/sudo/admin -O /etc/sudoers.d/admin +chmod 440 /etc/sudoers.d/admin + +# Configuring system env +echo "export VESTA='/usr/local/vesta'" > /etc/profile.d/vesta.sh +chmod 755 /etc/profile.d/vesta.sh +source /etc/profile.d/vesta.sh +echo 'PATH=$PATH:/usr/local/vesta/bin' >> /root/.bash_profile +echo 'export PATH' >> /root/.bash_profile +source /root/.bash_profile + +# Configuring logrotate for vesta logs +wget $vestacp/logrotate/vesta -O /etc/logrotate.d/vesta + +# Buidling directory tree and creating some blank files for vesta +mkdir -p $VESTA/conf $VESTA/log $VESTA/ssl $VESTA/data/ips \ + $VESTA/data/queue $VESTA/data/users $VESTA/data/firewall +touch $VESTA/data/queue/backup.pipe $VESTA/data/queue/disk.pipe \ + $VESTA/data/queue/webstats.pipe $VESTA/data/queue/restart.pipe \ + $VESTA/data/queue/traffic.pipe $VESTA/log/system.log \ + $VESTA/log/nginx-error.log $VESTA/log/auth.log +chmod 750 $VESTA/conf $VESTA/data/users $VESTA/data/ips $VESTA/log +chmod -R 750 $VESTA/data/queue +chmod 660 /var/log/vesta/* +rm -f /var/log/vesta +ln -s /usr/local/vesta/log /var/log/vesta + +# Generating vesta configuration +rm -f $VESTA/conf/vesta.conf 2>/dev/null +touch $VESTA/conf/vesta.conf +chmod 660 $VESTA/conf/vesta.conf + +# WEB stack +if [ "$apache" = 'yes' ] && [ "$nginx" = 'no' ] ; then + echo "WEB_SYSTEM='apache2'" >> $VESTA/conf/vesta.conf + echo "WEB_RGROUPS='www-data'" >> $VESTA/conf/vesta.conf + echo "WEB_PORT='80'" >> $VESTA/conf/vesta.conf + echo "WEB_SSL_PORT='443'" >> $VESTA/conf/vesta.conf + echo "WEB_SSL='mod_ssl'" >> $VESTA/conf/vesta.conf + echo "STATS_SYSTEM='webalizer,awstats'" >> $VESTA/conf/vesta.conf +fi +if [ "$apache" = 'yes' ] && [ "$nginx" = 'yes' ] ; then + echo "WEB_SYSTEM='apache2'" >> $VESTA/conf/vesta.conf + echo "WEB_RGROUPS='www-data'" >> $VESTA/conf/vesta.conf + echo "WEB_PORT='8080'" >> $VESTA/conf/vesta.conf + echo "WEB_SSL_PORT='8443'" >> $VESTA/conf/vesta.conf + echo "WEB_SSL='mod_ssl'" >> $VESTA/conf/vesta.conf + echo "PROXY_SYSTEM='nginx'" >> $VESTA/conf/vesta.conf + echo "PROXY_PORT='80'" >> $VESTA/conf/vesta.conf + echo "PROXY_SSL_PORT='443'" >> $VESTA/conf/vesta.conf + echo "STATS_SYSTEM='webalizer,awstats'" >> $VESTA/conf/vesta.conf +fi +if [ "$apache" = 'no' ] && [ "$nginx" = 'yes' ]; then + echo "WEB_SYSTEM='nginx'" >> $VESTA/conf/vesta.conf + echo "WEB_PORT='80'" >> $VESTA/conf/vesta.conf + echo "WEB_SSL_PORT='443'" >> $VESTA/conf/vesta.conf + echo "WEB_SSL='openssl'" >> $VESTA/conf/vesta.conf + if [ "$phpfpm" = 'yes' ]; then + echo "WEB_BACKEND='php5-fpm'" >> $VESTA/conf/vesta.conf + fi + echo "STATS_SYSTEM='webalizer,awstats'" >> $VESTA/conf/vesta.conf fi -# Apache configuration -wget $CHOST/$VERSION/apache2.conf -O /etc/apache2/apache2.conf -wget $CHOST/$VERSION/apache2-status.conf \ - -O /etc/apache2/mods-enabled/status.conf -wget $CHOST/$VERSION/apache2.log -O /etc/logrotate.d/apache2 -rm -f /etc/apache2/conf.d/vesta.conf -echo > /etc/apache2/conf.d/vesta.conf -echo "# Powered by vesta" > /etc/apache2/sites-available/default -echo "# Powered by vesta" > /etc/apache2/sites-available/default-ssl -echo "# Powered by vesta" > /etc/apache2/ports.conf -touch /var/log/apache2/access.log -touch /var/log/apache2/error.log -mkdir -p /var/log/apache2/domains -chmod a+x /var/log/apache2 -chmod 640 /var/log/apache2/access.log -chmod 640 /var/log/apache2/error.log -chmod 751 /var/log/apache2/domains -a2enmod rewrite -a2enmod suexec -a2enmod ssl -a2enmod actions -a2enmod ruid2 -echo -e "/home\npublic_html/cgi-bin" > /etc/apache2/suexec/www-data -update-rc.d apache2 defaults -service apache2 stop > /dev/null 2>&1 -service apache2 start -if [ "$?" -ne 0 ]; then - echo "Error: apache2 start failed" - exit 1 +# FTP stack +if [ "$vsftpd" = 'yes' ]; then + echo "FTP_SYSTEM='vsftpd'" >> $VESTA/conf/vesta.conf +fi +if [ "$proftpd" = 'yes' ]; then + echo "FTP_SYSTEM='proftpd'" >> $VESTA/conf/vesta.conf fi -# Vsftpd configuration -wget $CHOST/$VERSION/vsftpd.conf -O /etc/vsftpd.conf -update-rc.d vsftpd defaults -service vsftpd stop > /dev/null 2>&1 -service vsftpd start -if [ "$?" -ne 0 ]; then - echo "Error: vsftpd start failed" - exit 1 +# DNS stack +if [ "$named" = 'yes' ]; then + echo "DNS_SYSTEM='bind9'" >> $VESTA/conf/vesta.conf fi -# Generating MySQL password if it wasn't set -if [ -z "$mpass" ]; then - mpass=$(gen_pass) +# Mail stack +if [ "$exim" = 'yes' ]; then + echo "MAIL_SYSTEM='exim4'" >> $VESTA/conf/vesta.conf + if [ "$clamd" = 'yes' ]; then + echo "ANTIVIRUS_SYSTEM='clamav-daemon'" >> $VESTA/conf/vesta.conf + fi + if [ "$spamd" = 'yes' ]; then + echo "ANTISPAM_SYSTEM='spamassassin'" >> $VESTA/conf/vesta.conf + fi + if [ "$dovecot" = 'yes' ]; then + echo "IMAP_SYSTEM='dovecot'" >> $VESTA/conf/vesta.conf + fi fi -# MySQL configuration -wget $CHOST/$VERSION/my.cnf -O /etc/mysql/my.cnf -mysql_install_db -update-rc.d mysql defaults -service mysql stop > /dev/null 2>&1 -service mysql start -if [ "$?" -ne 0 ]; then - echo "Error: mysql start failed" - exit 1 -fi -mysqladmin -u root password $mpass -echo -e "[client]\npassword='$mpass'\n" > /root/.my.cnf -chmod 600 /root/.my.cnf -mysql -e "DELETE FROM mysql.user WHERE User=''" -mysql -e "DROP DATABASE test" > /dev/null 2>&1 -mysql -e "DELETE FROM mysql.db WHERE Db='test' OR Db='test\\_%'" -mysql -e "DELETE FROM mysql.user WHERE user='' or password='';" -mysql -e "FLUSH PRIVILEGES" +# CRON daemon +echo "CRON_SYSTEM='cron'" >> $VESTA/conf/vesta.conf -# Bind configuration -wget $CHOST/$VERSION/named.conf -O /etc/bind/named.conf -sed -i "s%listen-on%//listen%" /etc/bind/named.conf.options -chown root:bind /etc/bind/named.conf -chmod 640 /etc/bind/named.conf -update-rc.d bind9 defaults -service bind9 stop > /dev/null 2>&1 -service bind9 start -if [ "$?" -ne 0 ]; then - echo "Error: bind9 start failed" - exit 1 +# Firewall stack +if [ "$iptables" = 'yes' ]; then + echo "FIREWALL_SYSTEM='iptables'" >> $VESTA/conf/vesta.conf +fi +if [ "$iptables" = 'yes' ] && [ "$fail2ban" = 'yes' ]; then + echo "FIREWALL_EXTENSION='fail2ban'" >> $VESTA/conf/vesta.conf fi -# Exim -wget $CHOST/$VERSION/exim4.conf.template -O /etc/exim4/exim4.conf.template -if [ "$srv_type" != 'micro' ] && [ "$srv_type" != 'small' ]; then - sed -i "s/#SPAM/SPAM/g" /etc/exim4/exim4.conf.template - sed -i "s/#CLAMD/CLAMD/g" /etc/exim4/exim4.conf.template -fi -wget $CHOST/$VERSION/dnsbl.conf -O /etc/exim4/dnsbl.conf -wget $CHOST/$VERSION/spam-blocks.conf -O /etc/exim4/spam-blocks.conf -touch /etc/exim4/white-blocks.conf -rm -rf /etc/exim4/domains -mkdir -p /etc/exim4/domains -chmod 640 /etc/exim4/exim4.conf.template -gpasswd -a Debian-exim mail -if [ -e /etc/init.d/sendmail ]; then - update-rc.d -f sendmail remove - service sendmail stop -fi -if [ -e /etc/init.d/postfix ]; then - update-rc.d -f postfix remove - service postfix stop -fi -rm -f /etc/alternatives/mta -ln -s /usr/sbin/exim4 /etc/alternatives/mta -update-rc.d exim4 defaults -service exim4 stop > /dev/null 2>&1 -service exim4 start -if [ "$?" -ne 0 ]; then - echo "Error: exim start failed" - exit +# Disk quota +if [ "$quota" = 'yes' ]; then + echo "DISK_QUOTA='yes'" >> $VESTA/conf/vesta.conf fi -# Dovecot configuration -wget $CHOST/$VERSION/dovecot.conf -O /etc/dovecot/dovecot.conf -cd /etc/dovecot/ -wget $CHOST/$VERSION/dovecot-conf.d.tar.gz -rm -rf conf.d *.ext README -tar -xzf dovecot-conf.d.tar.gz -rm -f dovecot-conf.d.tar.gz -chown -R root:root /etc/dovecot -gpasswd -a dovecot mail -update-rc.d dovecot defaults -service dovecot stop > /dev/null 2>&1 -service dovecot start -if [ "$?" -ne 0 ]; then - echo "Error: dovecot start failed" - exit 1 +# Backups +echo "BACKUP_SYSTEM='local'" >> $VESTA/conf/vesta.conf + +# Language +echo "LANGUAGE='$lang'" >> $VESTA/conf/vesta.conf + +# Version +echo "VERSION='0.9.8'" >> $VESTA/conf/vesta.conf + +# Downloading hosting packages +cd $VESTA/data +wget $vestacp/packages.tar.gz -O packages.tar.gz +tar -xzf packages.tar.gz +rm -f packages.tar.gz + +# Downloading templates +wget $vestacp/templates.tar.gz -O templates.tar.gz +tar -xzf templates.tar.gz +rm -f templates.tar.gz + +# Copying index.html to default documentroot +cp templates/web/skel/public_html/index.html /var/www/ +sed -i 's/%domain%/It worked!/g' /var/www/index.html + +# Downloading firewall rules +wget $vestacp/firewall.tar.gz -O firewall.tar.gz +tar -xzf firewall.tar.gz +rm -f firewall.tar.gz + +# Configuring server hostname +$VESTA/bin/v-change-sys-hostname $servername 2>/dev/null + +# Generating SSL certificate +$VESTA/bin/v-generate-ssl-cert $(hostname) $email 'US' 'California' \ + 'San Francisco' 'Vesta Control Panel' 'IT' > /tmp/vst.pem + +# Parsing certificate file +crt_end=$(grep -n "END CERTIFICATE-" /tmp/vst.pem |cut -f 1 -d:) +key_start=$(grep -n "BEGIN RSA" /tmp/vst.pem |cut -f 1 -d:) +key_end=$(grep -n "END RSA" /tmp/vst.pem |cut -f 1 -d:) + +# Adding SSL certificate +cd $VESTA/ssl +sed -n "1,${crt_end}p" /tmp/vst.pem > certificate.crt +sed -n "$key_start,${key_end}p" /tmp/vst.pem > certificate.key +chown root:mail $VESTA/ssl/* +chmod 660 $VESTA/ssl/* +rm /tmp/vst.pem + + +#----------------------------------------------------------# +# Configure Nginx # +#----------------------------------------------------------# + +if [ "$nginx" = 'yes' ]; then + rm -f /etc/nginx/conf.d/*.conf + wget $vestacp/nginx/nginx.conf -O /etc/nginx/nginx.conf + wget $vestacp/nginx/status.conf -O /etc/nginx/conf.d/status.conf + wget $vestacp/nginx/phpmyadmin.inc -O /etc/nginx/conf.d/phpmyadmin.inc + wget $vestacp/nginx/phppgadmin.inc -O /etc/nginx/conf.d/phppgadmin.inc + wget $vestacp/nginx/webmail.inc -O /etc/nginx/conf.d/webmail.inc + wget $vestacp/logrotate/nginx -O /etc/logrotate.d/nginx + echo > /etc/nginx/conf.d/vesta.conf + mkdir -p /var/log/nginx/domains + update-rc.d nginx defaults + service nginx start + check_result $? "nginx start failed" fi -# ClamAV configuration -if [ "$srv_type" = 'medium' ] || [ "$srv_type" = 'large' ]; then - wget $CHOST/$VERSION/clamd.conf -O /etc/clamav/clamd.conf + +#----------------------------------------------------------# +# Configure Apache # +#----------------------------------------------------------# + +if [ "$apache" = 'yes' ]; then + wget $vestacp/apache2/apache2.conf -O /etc/apache2/apache2.conf + wget $vestacp/apache2/status.conf -O /etc/apache2/mods-enabled/status.conf + wget $vestacp/logrotate/apache2 -O /etc/logrotate.d/apache2 + a2enmod rewrite + a2enmod suexec + a2enmod ssl + a2enmod actions + a2enmod ruid2 + mkdir -p /etc/apache2/conf.d + echo > /etc/apache2/conf.d/vesta.conf + echo "# Powered by vesta" > /etc/apache2/sites-available/default + echo "# Powered by vesta" > /etc/apache2/sites-available/default-ssl + echo "# Powered by vesta" > /etc/apache2/ports.conf + echo -e "/home\npublic_html/cgi-bin" > /etc/apache2/suexec/www-data + touch /var/log/apache2/access.log /var/log/apache2/error.log + mkdir -p /var/log/apache2/domains + chmod a+x /var/log/apache2 + chmod 640 /var/log/apache2/access.log /var/log/apache2/error.log + chmod 751 /var/log/apache2/domains + update-rc.d apache2 defaults + service apache2 start + check_result $? "apache2 start failed" +fi + + +#----------------------------------------------------------# +# Configure PHP-FPM # +#----------------------------------------------------------# + +if [ "$phpfpm" = 'yes' ]; then + wget $vestacp/php5-fpm/www.conf -O /etc/php5/fpm/pool.d/www.conf + update-rc.d php5-fpm defaults + service php5-fpm start + check_result $? "php-fpm start failed" +fi + + +#----------------------------------------------------------# +# Configure PHP # +#----------------------------------------------------------# + +ZONE=$(timedatectl 2>/dev/null|grep Timezone|awk '{print $2}') +if [ -z "$ZONE" ]; then + ZONE='UTC' +fi +sed -i "s/;date.timezone =/date.timezone = $ZONE/g" /etc/php5/apache2/php.ini +sed -i "s/;date.timezone =/date.timezone = $ZONE/g" /etc/php5/cli/php.ini +sed -i 's%_open_tag = Off%_open_tag = On%g' /etc/php5/apache2/php.ini +sed -i 's%_open_tag = Off%_open_tag = On%g' /etc/php5/cli/php.ini + + +#----------------------------------------------------------# +# Configure VSFTPD # +#----------------------------------------------------------# + +if [ "$vsftpd" = 'yes' ]; then + wget $vestacp/vsftpd/vsftpd.conf -O /etc/vsftpd.conf + update-rc.d vsftpd defaults + service vsftpd start + check_result $? "vsftpd start failed" +fi + + +#----------------------------------------------------------# +# Configure ProFTPD # +#----------------------------------------------------------# + +if [ "$proftpd" = 'yes' ]; then + echo "127.0.0.1 $servername" >> /etc/hosts + wget $vestacp/proftpd/proftpd.conf -O /etc/proftpd/proftpd.conf + update-rc.d proftpd defaults + service proftpd start + check_result $? "proftpd start failed" +fi + + +#----------------------------------------------------------# +# Configure MySQL/MariaDB # +#----------------------------------------------------------# + +if [ "$mysql" = 'yes' ]; then + mycnf="my-small.cnf" + if [ $memory -gt 1200000 ]; then + mycnf="my-medium.cnf" + fi + if [ $memory -gt 3900000 ]; then + mycnf="my-large.cnf" + fi + + # MySQL configuration + wget $vestacp/mysql/$mycnf -O /etc/mysql/my.cnf + mysql_install_db + update-rc.d mysql defaults + service mysql start + check_result $? "mysql start failed" + + # Securing MySQL installation + mysqladmin -u root password $vpass + echo -e "[client]\npassword='$vpass'\n" > /root/.my.cnf + chmod 600 /root/.my.cnf + mysql -e "DELETE FROM mysql.user WHERE User=''" + mysql -e "DROP DATABASE test" >/dev/null 2>&1 + mysql -e "DELETE FROM mysql.db WHERE Db='test' OR Db='test\\_%'" + mysql -e "DELETE FROM mysql.user WHERE user='' or password='';" + mysql -e "FLUSH PRIVILEGES" + + # Configuring phpMyAdmin + if [ "$apache" = 'yes' ]; then + wget $vestacp/pma/apache.conf -O /etc/phpmyadmin/apache.conf + ln -s /etc/phpmyadmin/apache.conf /etc/apache2/conf.d/phpmyadmin.conf + fi + wget $vestacp/pma/config.inc.php -O /etc/phpmyadmin/config.inc.php + chmod 777 /var/lib/phpmyadmin/tmp +fi + +#----------------------------------------------------------# +# Configure PostgreSQL # +#----------------------------------------------------------# + +if [ "$postgresql" = 'yes' ]; then + wget $vestacp/postgresql/pg_hba.conf -O /etc/postgresql/*/main/pg_hba.conf + service postgresql restart + sudo -u postgres psql -c "ALTER USER postgres WITH PASSWORD '$vpass'" 2>/dev/null + + # Configuring phpPgAdmin + if [ "$apache" = 'yes' ]; then + wget $vestacp/pga/phppgadmin.conf -O /etc/apache2/conf.d/phppgadmin.conf + fi + wget $vestacp/pga/config.inc.php -O /etc/phppgadmin/config.inc.php +fi + + +#----------------------------------------------------------# +# Configure Bind # +#----------------------------------------------------------# + +if [ "$named" = 'yes' ]; then + wget $vestacp/bind/named.conf -O /etc/bind/named.conf + sed -i "s%listen-on%//listen%" /etc/bind/named.conf.options + chown root:bind /etc/bind/named.conf + chmod 640 /etc/bind/named.conf + update-rc.d bind9 defaults + service bind9 start + check_result $? "bind9 start failed" +fi + +#----------------------------------------------------------# +# Configure Exim # +#----------------------------------------------------------# + +if [ "$exim" = 'yes' ]; then + gpasswd -a Debian-exim mail + wget $vestacp/exim/exim4.conf.template -O /etc/exim4/exim4.conf.template + wget $vestacp/exim/dnsbl.conf -O /etc/exim4/dnsbl.conf + wget $vestacp/exim/spam-blocks.conf -O /etc/exim4/spam-blocks.conf + touch /etc/exim4/white-blocks.conf + + if [ "$spamd" = 'yes' ]; then + sed -i "s/#SPAM/SPAM/g" /etc/exim4/exim4.conf.template + fi + if [ "$clamd" = 'yes' ]; then + sed -i "s/#CLAMD/CLAMD/g" /etc/exim4/exim4.conf.template + fi + + chmod 640 /etc/exim4/exim4.conf.template + rm -rf /etc/exim4/domains + mkdir -p /etc/exim4/domains + + rm -f /etc/alternatives/mta + ln -s /usr/sbin/exim4 /etc/alternatives/mta + update-rc.d -f sendmail remove > /dev/null 2>&1 + service sendmail stop > /dev/null 2>&1 + update-rc.d -f postfix remove > /dev/null 2>&1 + service postfix stop > /dev/null 2>&1 + + update-rc.d exim4 defaults + service exim4 start + check_result $? "exim4 start failed" +fi + + +#----------------------------------------------------------# +# Configure Dovecot # +#----------------------------------------------------------# + +if [ "$dovecot" = 'yes' ]; then + gpasswd -a dovecot mail + wget $vestacp/dovecot.tar.gz -O /etc/dovecot.tar.gz + cd /etc + rm -rf dovecot dovecot.conf + tar -xzf dovecot.tar.gz + rm -f dovecot.tar.gz + chown -R root:root /etc/dovecot* + update-rc.d dovecot defaults + service dovecot start + check_result $? "dovecot start failed" +fi + + +#----------------------------------------------------------# +# Configure ClamAV # +#----------------------------------------------------------# + +if [ "$clamd" = 'yes' ]; then gpasswd -a clamav mail gpasswd -a clamav Debian-exim + wget $vestacp/clamav/clamd.conf -O /etc/clamav/clamd.conf /usr/bin/freshclam update-rc.d clamav-daemon defaults - service clamav-daemon stop > /dev/null 2>&1 service clamav-daemon start - if [ "$?" -ne 0 ]; then - echo "Error: clamav start failed" - exit 1 - fi + check_result $? "clamav-daeom start failed" fi -# SpamAssassin configuration -if [ "$srv_type" = 'medium' ] || [ "$srv_type" = 'large' ]; then + +#----------------------------------------------------------# +# Configure SpamAssassin # +#----------------------------------------------------------# + +if [ "$spamd" = 'yes' ]; then update-rc.d spamassassin defaults sed -i "s/ENABLED=0/ENABLED=1/" /etc/default/spamassassin - service spamassassin stop > /dev/null 2>&1 service spamassassin start - if [ "$?" -ne 0 ]; then - echo "Error: spamassassin start failed" - exit 1 + check_result $? "spamassassin start failed" +fi + + +#----------------------------------------------------------# +# Configure RoundCube # +#----------------------------------------------------------# + +if [ "$exim" = 'yes' ] && [ "$mysql" = 'yes' ]; then + if [ "$apache" = 'yes' ]; then + wget $vestacp/roundcube/apache.conf -O /etc/roundcube/apache.conf + ln -s /etc/roundcube/apache.conf /etc/apache2/conf.d/roundcube.conf + fi + wget $vestacp/roundcube/main.inc.php -O /etc/roundcube/main.inc.php + wget $vestacp/roundcube/db.inc.php -O /etc/roundcube/db.inc.php + wget $vestacp/roundcube/vesta.php -O \ + /usr/share/roundcube/plugins/password/drivers/vesta.php + wget $vestacp/roundcube/config.inc.php -O \ + /etc/roundcube/plugins/password/config.inc.php + r="$(gen_pass)" + mysql -e "CREATE DATABASE roundcube" + mysql -e "GRANT ALL ON roundcube.* TO roundcube@localhost IDENTIFIED BY '$r'" + sed -i "s/%password%/$r/g" /etc/roundcube/db.inc.php + mysql roundcube < /usr/share/dbconfig-common/data/roundcube/install/mysql + chmod a+r /etc/roundcube/main.inc.php + if [ "$release" -eq 8 ]; then + mv -f /etc/roundcube/main.inc.php /etc/roundcube/config.inc.php + mv -f /etc/roundcube/db.inc.php /etc/roundcube/debian-db-roundcube.php fi fi -# Fail2ban configuration -if [ -z "$disable_fail2ban" ]; then + +#----------------------------------------------------------# +# Configure Fail2Ban # +#----------------------------------------------------------# + +if [ "$fail2ban" = 'yes' ]; then cd /etc - wget $CHOST/$VERSION/fail2ban.tar.gz -O fail2ban.tar.gz + wget $vestacp/fail2ban.tar.gz -O fail2ban.tar.gz tar -xzf fail2ban.tar.gz rm -f fail2ban.tar.gz - chkconfig fail2ban on + if [ "$dovecot" = 'no' ]; then + fline=$(cat /etc/fail2ban/jail.local |grep -n dovecot-iptables -A 2) + fline=$(echo "$fline" |tail -n1 |cut -f 1 -d -) + sed -i "${fline}s/true/false/" /etc/fail2ban/jail.local + fi + if [ "$exim" = 'no' ]; then + fline=$(cat /etc/fail2ban/jail.local |grep -n exim-iptables -A 2) + fline=$(echo "$fline" |tail -n1 |cut -f 1 -d -) + sed -i "${fline}s/true/false/" /etc/fail2ban/jail.local + fi + update-rc.d fail2ban defaults service fail2ban start -else - sed -i "s/fail2ban//" $VESTA/conf/vesta.conf + check_result $? "fail2ban start failed" fi -# php configuration -sed -i "s/;date.timezone =/date.timezone = UTC/g" /etc/php5/apache2/php.ini -sed -i "s/;date.timezone =/date.timezone = UTC/g" /etc/php5/cli/php.ini -# phpMyAdmin configuration -wget $CHOST/$VERSION/apache2-pma.conf -O /etc/phpmyadmin/apache.conf -wget $CHOST/$VERSION/pma.conf -O /etc/phpmyadmin/config.inc.php -ln -s /etc/phpmyadmin/apache.conf /etc/apache2/conf.d/phpmyadmin.conf -mv -f /etc/phpmyadmin/config-db.php /etc/phpmyadmin/config-db.php_ -chmod 777 /var/lib/phpmyadmin/tmp -# Roundcube configuration -wget $CHOST/$VERSION/apache2-webmail.conf -O /etc/roundcube/apache.conf -wget $CHOST/$VERSION/roundcube-main.conf -O /etc/roundcube/main.inc.php -wget $CHOST/$VERSION/roundcube-db.conf -O /etc/roundcube/db.inc.php -wget $CHOST/$VERSION/roundcube-driver.php -O \ - /usr/share/roundcube/plugins/password/drivers/vesta.php -wget $CHOST/$VERSION/roundcube-pw.conf -O \ - /etc/roundcube/plugins/password/config.inc.php -r="$(gen_pass)" -mysql -e "DROP DATABASE roundcube" > /dev/null 2>&1 -mysql -e "CREATE DATABASE roundcube" -mysql -e "GRANT ALL ON roundcube.* TO roundcube@localhost IDENTIFIED BY '$r'" -sed -i "s/%password%/$r/g" /etc/roundcube/db.inc.php -mysql roundcube < /usr/share/dbconfig-common/data/roundcube/install/mysql -mkdir -p /var/log/roundcube/error -chmod -R 777 /var/log/roundcube +#----------------------------------------------------------# +# Configure Admin User # +#----------------------------------------------------------# -# Deleting old admin user account if exists +# Deleting old admin user if [ ! -z "$(grep ^admin: /etc/passwd)" ] && [ "$force" = 'yes' ]; then chattr -i /home/admin/conf > /dev/null 2>&1 - userdel -f admin - chattr -i /home/admin/conf - mv -f /home/admin $vst_backups/home/ - rm -f /tmp/sess_* + userdel -f admin >/dev/null 2>&1 + chattr -i /home/admin/conf >/dev/null 2>&1 + mv -f /home/admin $vst_backups/home/ >/dev/null 2>&1 + rm -f /tmp/sess_* >/dev/null 2>&1 fi -if [ ! -z "$(grep ^admin: /etc/group)" ]; then +if [ ! -z "$(grep ^admin: /etc/group)" ] && [ "$force" = 'yes' ]; then groupdel admin > /dev/null 2>&1 fi -# Generating admin password if it wasn't set -if [ -z "$vpass" ]; then - vpass=$(gen_pass) -fi - -# Adding admin account +# Adding vesta account $VESTA/bin/v-add-user admin $vpass $email default System Administrator -if [ $? -ne 0 ]; then - echo "Error: can't create admin user" - exit 1 -fi +check_result $? "can't create admin user" $VESTA/bin/v-change-user-shell admin bash -$VESTA/bin/v-change-user-language admin en - -# Configure mysql host -$VESTA/bin/v-add-database-host mysql localhost root $mpass -$VESTA/bin/v-add-database admin default default $(gen_pass) mysql +$VESTA/bin/v-change-user-language admin $lang # Configuring system ips $VESTA/bin/v-update-sys-ip -# Firewall configuartion -cd $VESTA/data -wget $CHOST/$VERSION/firewall.tar.gz -O firewall.tar.gz -tar -xzf firewall.tar.gz -rm -f firewall.tar.gz -if [ "$disable_iptables" = 'yes' ]; then - sed -i "s/iptables//" $VESTA/conf/vesta.conf -else - /usr/local/vesta/bin/v-update-firewall -fi - # Get main ip -main_ip=$(ifconfig |grep 'inet addr:' |grep -v 127.0.0.1 |head -n1 | \ - cut -f2 -d: | cut -f1 -d ' ') +ip=$(ip addr|grep 'inet '|grep global|head -n1|awk '{print $2}'|cut -f1 -d/) -# Get remote ip -vst_ip=$(wget vestacp.com/what-is-my-ip/ -O - 2>/dev/null) -if [ ! -z "$vst_ip" ] && [ "$vst_ip" != "$main_ip" ]; then - # Set NAT association - $VESTA/bin/v-change-sys-ip-nat $main_ip $vst_ip +# Get public ip +pub_ip=$(wget vestacp.com/what-is-my-ip/ -O - 2>/dev/null) +if [ ! -z "$pub_ip" ] && [ "$pub_ip" != "$ip" ]; then + $VESTA/bin/v-change-sys-ip-nat $ip $pub_ip fi -if [ -z "$vst_ip" ]; then - vst_ip=$main_ip +if [ -z "$pub_ip" ]; then + ip=$main_ip fi -# Add default web domain -$VESTA/bin/v-add-web-domain admin default.domain $vst_ip +# Firewall configuration +if [ "$iptables" = 'yes' ]; then + $VESTA/bin/v-update-firewall +fi -# Add default dns domain -$VESTA/bin/v-add-dns-domain admin default.domain $vst_ip +# Configuring mysql host +if [ "$mysql" = 'yes' ]; then + $VESTA/bin/v-add-database-host mysql localhost root $vpass + $VESTA/bin/v-add-database admin default default $(gen_pass) mysql +fi -# Add default mail domain -$VESTA/bin/v-add-mail-domain admin default.domain +# Configuring pgsql host +if [ "$postgresql" = 'yes' ]; then + $VESTA/bin/v-add-database-host pgsql localhost postgres $vpass + $VESTA/bin/v-add-database admin db db $(gen_pass) pgsql +fi -# Configuring cron jobs +# Adding default domain +$VESTA/bin/v-add-domain admin $servername +check_result $? "can't create $servername domain" + +# Adding cron jobs command='sudo /usr/local/vesta/bin/v-update-sys-queue disk' $VESTA/bin/v-add-cron-job 'admin' '15' '02' '*' '*' '*' "$command" command='sudo /usr/local/vesta/bin/v-update-sys-queue traffic' @@ -837,35 +1158,42 @@ command='sudo /usr/local/vesta/bin/v-update-user-stats' $VESTA/bin/v-add-cron-job 'admin' '20' '00' '*' '*' '*' "$command" command='sudo /usr/local/vesta/bin/v-update-sys-rrd' $VESTA/bin/v-add-cron-job 'admin' '*/5' '*' '*' '*' '*' "$command" +service cron restart # Building inititall rrd images $VESTA/bin/v-update-sys-rrd -# Enable file system quota +# Enabling file system quota if [ "$quota" = 'yes' ]; then $VESTA/bin/v-add-sys-quota fi -# Start system service +# Starting vesta service update-rc.d vesta defaults -service vesta stop > /dev/null 2>&1 service vesta start -if [ "$?" -ne 0 ]; then - echo "Error: vesta start failed" - exit 1 +check_result $? "vesta start failed" + + +#----------------------------------------------------------# +# Vesta Access Info # +#----------------------------------------------------------# + +# Sending install notification to vestacp.com +wget vestacp.com/notify/?$codename -O /dev/null -q + +# Comparing hostname and ip +host_ip=$(host $servername| head -n 1 | awk '{print $NF}') +if [ "$host_ip" = "$ip" ]; then + ip="$servername" fi -# Send notification to vestacp.com -wget vestacp.com/notify/?$codename -O /dev/null - -# Send notification to admin email +# Sending notification to admin email echo -e "Congratulations, you have just successfully installed \ -the Vesta Control Panel +Vesta Control Panel -You can login in Vesta with following credentials: + https://$ip:8083 username: admin password: $vpass - https://$vst_ip:8083 We hope that you enjoy your installation of Vesta. Please \ feel free to contact us anytime if you have any questions. @@ -878,12 +1206,10 @@ vestacp.com team send_mail="$VESTA/web/inc/mail-wrapper.php" cat $tmpfile | $send_mail -s "Vesta Control Panel" $email -rm -f $tmpfile # Congrats echo '=======================================================' echo -echo echo ' _| _| _|_|_|_| _|_|_| _|_|_|_|_| _|_| ' echo ' _| _| _| _| _| _| _| ' echo ' _| _| _|_|_| _|_| _| _|_|_|_| ' @@ -891,20 +1217,7 @@ echo ' _| _| _| _| _| _| _| ' echo ' _| _|_|_|_| _|_|_| _| _| _| ' echo echo -echo '-------------------------------' -echo " https://$vst_ip:8083" -echo ' username: admin' -echo " password: $vpass" -echo '-------------------------------' -echo -echo -echo 'Congratulations,' -echo 'you have successfully installed Vesta Control Panel.' -echo -echo +cat $tmpfile +rm -f $tmpfile -# Tricky way to get new PATH variable -cd -bash - -#EOF +# EOF diff --git a/install/vst-install-rhel.sh b/install/vst-install-rhel.sh old mode 100644 new mode 100755 index b90320cbd..9aa438570 --- a/install/vst-install-rhel.sh +++ b/install/vst-install-rhel.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Vesta RHEL/CentOS installer v.04 +# Vesta RHEL/CentOS installer v.05 #----------------------------------------------------------# # Variables&Functions # @@ -10,34 +10,68 @@ RHOST='r.vestacp.com' CHOST='c.vestacp.com' REPO='cmmnt' VERSION='0.9.8/rhel' -YUM_REPO='/etc/yum.repos.d/vesta.repo' -software="nginx httpd mod_ssl mod_ruid2 mod_extract_forwarded mod_fcgid - php php-bcmath php-cli php-common php-gd php-imap php-mbstring php-mcrypt - php-mysql php-pdo php-soap php-tidy php-xml php-xmlrpc quota e2fsprogs - phpMyAdmin awstats webalizer vsftpd mysql mysql-server exim dovecot clamd - spamassassin curl roundcubemail bind bind-utils bind-libs mc screen ftp - libpng libjpeg libmcrypt mhash zip unzip openssl flex rssh libxml2 - ImageMagick sqlite pcre sudo bc jwhois mailx lsof tar telnet rrdtool - fail2ban GeoIP freetype ntp openssh-clients vesta vesta-nginx vesta-php" +memory=$(grep 'MemTotal' /proc/meminfo |tr ' ' '\n' |grep [0-9]) +arch=$(uname -i) +os=$(cut -f 1 -d ' ' /etc/redhat-release) +release=$(grep -o "[0-9]" /etc/redhat-release |head -n1) +codename="${os}_$release" +vestacp="http://$CHOST/$VERSION/$release" -# Help +if [ "$release" -eq 7 ]; then + software="nginx httpd mod_ssl mod_ruid2 mod_fcgid php php-common php-cli + php-bcmath php-gd php-imap php-mbstring php-mcrypt php-mysql php-pdo + php-soap php-tidy php-xml php-xmlrpc php-fpm php-pgsql awstats webalizer + vsftpd proftpd bind bind-utils bind-libs exim dovecot clamav-server + clamav-update spamassassin roundcubemail mariadb mariadb-server phpMyAdmin + postgresql postgresql-server postgresql-contrib phpPgAdmin e2fsprogs + openssh-clients ImageMagick curl mc screen ftp zip unzip flex sqlite pcre + sudo bc jwhois mailx lsof tar telnet rrdtool net-tools ntp GeoIP freetype + fail2ban rsyslog iptables-services which vesta vesta-nginx vesta-php" +else + software="nginx httpd mod_ssl mod_ruid2 mod_fcgid mod_extract_forwarded + php php-common php-cli php-bcmath php-gd php-imap php-mbstring php-mcrypt + php-mysql php-pdo php-soap php-tidy php-xml php-xmlrpc php-fpm php-pgsql + awstats webalizer vsftpd proftpd bind bind-utils bind-libs exim dovecot + clamd spamassassin roundcubemail mysql mysql-server phpMyAdmin postgresql + postgresql-server postgresql-contrib phpPgAdmin e2fsprogs openssh-clients + ImageMagick curl mc screen ftp zip unzip flex sqlite pcre sudo bc jwhois + mailx lsof tar telnet rrdtool net-tools ntp GeoIP freetype fail2ban + which vesta vesta-nginx vesta-php" +fi + +# Defining help function help() { - echo "usage: $0 [OPTIONS] - -h, --help Print this help and exit - -f, --force Force installation - -i, --disable-iptables Disable iptables support - -b, --disable-fail2ban Disable fail2ban protection - -d, --disable-remi Disable remi repository - -n, --noupdate Do not run yum update command - -s, --hostname Set server hostname - -e, --email Set email address - -p, --password Set admin password instead of generating it - -m, --mysql-password Set MySQL password instead of generating it - -q, --quota Enable File System Quota" + echo "Usage: $0 [OPTIONS] + -a, --apache Install Apache [yes|no] default: yes + -n, --nginx Install Nginx [yes|no] default: yes + -w, --phpfpm Install PHP-FPM [yes|no] default: no + -v, --vsftpd Install Vsftpd [yes|no] default: yes + -j, --proftpd Install ProFTPD [yes|no] default: no + -k, --named Install Bind [yes|no] default: yes + -m, --mysql Install MySQL [yes|no] default: yes + -g, --postgresql Install PostgreSQL [yes|no] default: no + -d, --mongodb Install MongoDB [yes|no] unsupported + -x, --exim Install Exim [yes|no] default: yes + -z, --dovecot Install Dovecot [yes|no] default: yes + -c, --clamav Install ClamAV [yes|no] default: yes + -t, --spamassassin Install SpamAssassin [yes|no] default: yes + -i, --iptables Install Iptables [yes|no] default: yes + -b, --fail2ban Install Fail2ban [yes|no] default: yes + -r, --remi Install Remi repo [yes|no] default: yes + -q, --quota Filesystem Quota [yes|no] default: no + -l, --lang Default language default: en + -y, --interactive Interactive install [yes|no] default: yes + -s, --hostname Set hostname + -e, --email Set admin email + -p, --password Set admin password + -f, --force Force installation + -h, --help Print this help + + Example: bash $0 -e demo@vestacp.com -p p4ssw0rd --apache no --phpfpm yes" exit 1 } -# Password generator +# Defining password-gen function gen_pass() { MATRIX='0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz' LENGTH=10 @@ -48,117 +82,172 @@ gen_pass() { echo "$PASS" } +# Defning return code check function +check_result() { + if [ $1 -ne 0 ]; then + echo "Error: $2" + exit $1 + fi +} + +# Defining function to set default value +set_default_value() { + eval variable=\$$1 + if [ -z "$variable" ]; then + eval $1=$2 + fi + if [ "$variable" != 'yes' ] && [ "$variable" != 'no' ]; then + eval $1=$2 + fi +} + #----------------------------------------------------------# # Verifications # #----------------------------------------------------------# +# Creating temporary file +tmpfile=$(mktemp -p /tmp) + # Translating argument to --gnu-long-options for arg; do delim="" case "$arg" in - --help) args="${args}-h " ;; - --force) args="${args}-f " ;; - --disable-fail2ban) args="${args}-b " ;; - --disable-remi) args="${args}-d " ;; - --disable-iptables) args="${args}-i " ;; - --noupdate) args="${args}-n " ;; + --apache) args="${args}-a " ;; + --nginx) args="${args}-n " ;; + --phpfpm) args="${args}-w " ;; + --vsftpd) args="${args}-v " ;; + --proftpd) args="${args}-j " ;; + --named) args="${args}-k " ;; + --mysql) args="${args}-m " ;; + --postgresql) args="${args}-g " ;; + --mongodb) args="${args}-d " ;; + --exim) args="${args}-x " ;; + --dovecot) args="${args}-z " ;; + --clamav) args="${args}-c " ;; + --spamassassin) args="${args}-t " ;; + --iptables) args="${args}-i " ;; + --fail2ban) args="${args}-b " ;; + --remi) args="${args}-r " ;; + --quota) args="${args}-q " ;; + --lang) args="${args}-l " ;; + --interactive) args="${args}-y " ;; --hostname) args="${args}-s " ;; --email) args="${args}-e " ;; --password) args="${args}-p " ;; - --mysql-password) args="${args}-m " ;; - --quota) args="${args}-q " ;; - *) [[ "${arg:0:1}" == "-" ]] || delim="\"" - args="${args}${delim}${arg}${delim} ";; + --force) args="${args}-f " ;; + --help) args="${args}-h " ;; + *) [[ "${arg:0:1}" == "-" ]] || delim="\"" + args="${args}${delim}${arg}${delim} ";; esac done eval set -- "$args" -# Getopt -while getopts "hfibdnqe:m:p:s:" Option; do +# Parsing arguments +while getopts "a:n:w:v:j:k:m:g:d:x:z:c:t:i:b:r:q:l:y:s:e:p:fh" Option; do case $Option in - h) help ;; # Help - f) force='yes' ;; # Force install - i) disable_iptables='yes' ;; # Disable iptables - b) disable_fail2ban='yes' ;; # Disable fail2ban - d) disable_remi='yes' ;; # Disable remi repo - n) noupdate='yes' ;; # Disable yum update - s) servername=$OPTARG ;; # Server hostname - e) email=$OPTARG ;; # Set email - p) vpass=$OPTARG ;; # Admin password - m) mpass=$OPTARG ;; # MySQL pasword - q) quota='yes' ;; # Enable quota - *) help ;; # Default + a) apache=$OPTARG ;; # Apache + n) nginx=$OPTARG ;; # Nginx + w) phpfpm=$OPTARG ;; # PHP-FPM + v) vsftpd=$OPTARG ;; # Vsftpd + j) proftpd=$OPTARG ;; # Proftpd + k) named=$OPTARG ;; # Named + m) mysql=$OPTARG ;; # MySQL + g) postgresql=$OPTARG ;; # PostgreSQL + d) mongodb=$OPTARG ;; # MongoDB (unsupported) + x) exim=$OPTARG ;; # Exim + z) dovecot=$OPTARG ;; # Dovecot + c) clamd=$OPTARG ;; # ClamAV + t) spamd=$OPTARG ;; # SpamAssassin + i) iptables=$OPTARG ;; # Iptables + b) fail2ban=$OPTARG ;; # Fail2ban + r) remi=$OPTARG ;; # Remi repo + q) quota=$OPTARG ;; # FS Quota + l) lang=$OPTARG ;; # Language + y) interactive=$OPTARG ;; # Interactive install + s) servername=$OPTARG ;; # Hostname + e) email=$OPTARG ;; # Admin email + p) vpass=$OPTARG ;; # Admin password + f) force='yes' ;; # Force install + h) help ;; # Help + *) help ;; # Print help (default) esac done -# Am I root? +# Defining default software stack +set_default_value 'nginx' 'yes' +set_default_value 'apache' 'yes' +set_default_value 'phpfpm' 'no' +set_default_value 'vsftpd' 'yes' +set_default_value 'proftpd' 'no' +set_default_value 'named' 'yes' +set_default_value 'mysql' 'yes' +set_default_value 'postgresql' 'no' +set_default_value 'mongodb' 'no' +set_default_value 'exim' 'yes' +set_default_value 'dovecot' 'yes' +if [ $memory -lt 1500000 ]; then + set_default_value 'clamd' 'no' + set_default_value 'spamd' 'no' +else + set_default_value 'clamd' 'yes' + set_default_value 'spamd' 'yes' +fi +set_default_value 'iptables' 'yes' +set_default_value 'fail2ban' 'yes' +set_default_value 'remi' 'yes' +set_default_value 'quota' 'no' +set_default_value 'lang' 'en' +set_default_value 'interactive' 'yes' + +# Checking software conflicts +if [ "$phpfpm" = 'yes' ]; then + apache='no' + nginx='yes' +fi +if [ "$proftpd" = 'yes' ]; then + vsftpd='no' +fi +if [ "$exim" = 'no' ]; then + clamd='no' + spamd='no' + dovecot='no' +fi +if [ "$iptables" = 'no' ]; then + fail2ban='no' +fi + + +# Checking root permissions if [ "x$(id -u)" != 'x0' ]; then - echo 'Error: this script can only be executed by root' - exit 1 + check_error 1 "Script can be run executed only by root" fi -# Check supported version -if [ ! -e '/etc/redhat-release' ]; then - echo 'Error: sorry, we currently support RHEL and CentOS only' - exit 1 -fi - -# Check supported OS -arch=$(uname -i) -os=$(cut -f 1 -d ' ' /etc/redhat-release) -release=$(grep -o "[0-9]" /etc/redhat-release |head -n1) -codename="${os}_$release" -if [ $os != 'CentOS' ] && [ $os != 'Red' ]; then - echo 'Error: sorry, we currently support RHEL and CentOS only' - exit -fi - -# Check admin user account -if [ ! -z "$(grep ^admin: /etc/passwd)" ] && [ "$force" != 'yes' ]; then - echo "Error: user admin exists" - echo +# Checking admin user account +if [ ! -z "$(grep ^admin: /etc/passwd /etc/group)" ] && [ -z "$force" ]; then echo 'Please remove admin user account before proceeding.' echo 'If you want to do it automatically run installer with -f option:' - echo "Example: bash $0 --force" - exit 1 + echo -e "Example: bash $0 --force\n" + check_result 1 "User admin exists" fi -# Check admin group -if [ ! -z "$(grep ^admin: /etc/group)" ] && [ "$force" != 'yes' ]; then - echo "Error: group admin exists" - echo - echo 'Please remove admin group before proceeding.' - echo 'If you want to do it automatically run installer with -f option:' - echo "Example: bash $0 --force" - exit 1 -fi - -# Check wget +# Checking wget if [ ! -e '/usr/bin/wget' ]; then yum -y install wget - if [ $? -ne 0 ]; then - echo "Error: can't install wget" - exit 1 - fi + check_result $? "Can't install wget" fi -# Check repo availability -wget -q "$CHOST/$VERSION/vesta.conf" -O /dev/null -if [ $? -ne 0 ]; then - echo "Error: no access to $REPO repository" - exit 1 -fi +# Checking repository availability +wget -q "$vestacp/GPG.txt" -O /dev/null +check_result $? "No access to Vesta repository" -# Check installed packages -tmpfile=$(mktemp -p /tmp) +# Checking installed packages rpm -qa > $tmpfile -for pkg in exim bind-9 mysql-server httpd nginx vesta; do +for pkg in exim mysql-server httpd nginx vesta; do if [ ! -z "$(grep $pkg $tmpfile)" ]; then conflicts="$pkg $conflicts" fi done -rm -f $tmpfile if [ ! -z "$conflicts" ] && [ -z "$force" ]; then echo '!!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!' echo @@ -171,92 +260,357 @@ if [ ! -z "$conflicts" ] && [ -z "$force" ]; then echo echo '!!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!' echo - exit 1 + check_result 1 "Control Panel should be installed on clean server." fi -# Check server type -memory=$(grep 'MemTotal' /proc/meminfo |tr ' ' '\n' |grep [0-9]) -if [ "$memory" -lt '350000' ] && [ -z "$force" ]; then - echo "Error: not enough memory to install Vesta Control Panel." - echo -e "\nMinimum RAM required: 350Mb" - echo 'If you want to force installation run this script with -f option:' - echo "Example: bash $0 --force" - exit 1 -fi -srv_type='micro' -if [ "$memory" -gt '1000000' ]; then - srv_type='small' +#----------------------------------------------------------# +# Brief Info # +#----------------------------------------------------------# + +# Printing nice ascii aslogo +clear +echo +echo ' _| _| _|_|_|_| _|_|_| _|_|_|_|_| _|_|' +echo ' _| _| _| _| _| _| _|' +echo ' _| _| _|_|_| _|_| _| _|_|_|_|' +echo ' _| _| _| _| _| _| _|' +echo ' _| _|_|_|_| _|_|_| _| _| _|' +echo +echo ' Vesta Control Panel' +echo -e "\n\n" + +echo 'Following software will be installed on your system:' + +# Web stack +if [ "$nginx" = 'yes' ]; then + echo ' - Nginx Web Server' +fi +if [ "$apache" = 'yes' ] && [ "$nginx" = 'no' ] ; then + echo ' - Apache Web Server' +fi +if [ "$apache" = 'yes' ] && [ "$nginx" = 'yes' ] ; then + echo ' - Apache Web Server (as backend)' +fi +if [ "$phpfpm" = 'yes' ]; then + echo ' - PHP-FPM Application Server' fi -if [ "$memory" -gt '3000000' ]; then - srv_type='medium' +# DNS stack +if [ "$named" = 'yes' ]; then + echo ' - Bind DNS Server' fi -if [ "$memory" -gt '7000000' ]; then - srv_type='large' -fi - -# Are you sure ? -if [ -z $email ]; then - clear - echo - echo ' _| _| _|_|_|_| _|_|_| _|_|_|_|_| _|_| ' - echo ' _| _| _| _| _| _| _| ' - echo ' _| _| _|_|_| _|_| _| _|_|_|_| ' - echo ' _| _| _| _| _| _| _| ' - echo ' _| _|_|_|_| _|_|_| _| _| _| ' - echo - echo ' Vesta Control Panel' - echo - echo - echo 'Following software will be installed on your system:' - echo ' - Nginx frontend web server' - echo ' - Apache application web server' - echo ' - Bind DNS server' - echo ' - Exim mail server' - echo ' - Dovecot IMAP and POP3 server' - if [ "$srv_type" = 'medium' ] || [ "$srv_type" = 'large' ]; then - echo ' - Clam mail antivirus' - echo ' - SpamAssassin antispam' +# Mail Stack +if [ "$exim" = 'yes' ]; then + echo -n ' - Exim mail server' + if [ "$clamd" = 'yes' ] || [ "$spamd" = 'yes' ] ; then + echo -n ' + ' + if [ "$clamd" = 'yes' ]; then + echo -n 'Antivirus ' + fi + if [ "$spamd" = 'yes' ]; then + echo -n 'Antispam' + fi fi - echo ' - MySQL database server' - echo ' - Vsftpd FTP server' - echo - echo ' * SELinux and Iptables will be disabled' - echo + echo + if [ "$dovecot" = 'yes' ]; then + echo ' - Dovecot POP3/IMAP Server' + fi +fi - read -p 'Do you want to proceed? [y/n]): ' answer +# DB stack +if [ "$mysql" = 'yes' ]; then + if [ $release = 7 ]; then + echo ' - MariaDB Database Server' + else + echo ' - MySQL Database Server' + fi +fi +if [ "$postgresql" = 'yes' ]; then + echo ' - PostgreSQL Database Server' +fi +if [ "$mongodb" = 'yes' ]; then + echo ' - MongoDB Database Server' +fi + +# FTP stack +if [ "$vsftpd" = 'yes' ]; then + echo ' - Vsftpd FTP Server' +fi +if [ "$proftpd" = 'yes' ]; then + echo ' - ProFTPD FTP Server' +fi + +# Firewall stack +if [ "$iptables" = 'yes' ]; then + echo -n ' - Iptables Firewall' +fi +if [ "$iptables" = 'yes' ] && [ "$fail2ban" = 'yes' ]; then + echo -n ' + Fail2Ban' +fi +echo -e "\n\n" + +# Asking for confirmation to proceed +if [ "$interactive" = 'yes' ]; then + read -p 'Would you like to continue [y/n]: ' answer if [ "$answer" != 'y' ] && [ "$answer" != 'Y' ]; then echo 'Goodbye' exit 1 fi - # Define email - read -p 'Please enter valid email address: ' email + # Asking for contact email + if [ -z "$email" ]; then + read -p 'Please enter admin email address: ' email + fi - # Define server hostname + # Asking to set FQDN hostname if [ -z "$servername" ]; then - read -p "Please enter hostname [$(hostname)]: " servername + read -p "Please enter FQDN hostname [$(hostname)]: " servername fi fi -# Validate email -local_part=$(echo $email | cut -s -f1 -d\@) -remote_host=$(echo $email | cut -s -f2 -d\@) -mx_failed=1 -if [ ! -z "$remote_host" ] && [ ! -z "$local_part" ]; then - /usr/bin/host -t mx "$remote_host" > /dev/null 2>&1 - mx_failed="$?" +# Generating admin password if it wasn't set +if [ -z "$vpass" ]; then + vpass=$(gen_pass) fi -if [ "$mx_failed" -eq 1 ]; then - echo "Error: email $email is not valid" - exit 1 +# Set hostname if it wasn't set +if [ -z "$servername" ]; then + servername=$(hostname -f) fi -# Check for ipv6 on loopback interface -check_lo_ipv6=$(/sbin/ifconfig lo| grep 'inet6 addr') +# Set email if it wasn't set +if [ -z "$email" ]; then + email="admin@$servername" +fi + +# Defining backup directory +vst_backups="/root/vst_install_backups/$(date +%s)" +echo "Installation backup directory: $vst_backups" + +# Printing start message and sleeping for 5 seconds +echo -e "\n\n\n\nInstallation will take about 15 minutes ...\n" +sleep 5 + + +#----------------------------------------------------------# +# Checking swap # +#----------------------------------------------------------# + +# Checking swap on small instances +if [ -z "$(swapon -s)" ] && [ $memory -lt 1000000 ]; then + fallocate -l 1G /swapfile + chmod 600 /swapfile + mkswap /swapfile + swapon /swapfile + echo "/swapfile none swap sw 0 0" >> /etc/fstab +fi + + +#----------------------------------------------------------# +# Install repositories # +#----------------------------------------------------------# + +# Updating system packages +yum -y update +check_result $? 'yum update failed' + +# Installing EPEL repository +rpm -Uvh --force $vestacp/epel-release.rpm +check_result $? "Can't install EPEL repository" + +# Installing Remi repository +if [ "$remi" = 'yes' ]; then + rpm -Uvh --force $vestacp/remi-release.rpm + check_result $? "Can't install REMI repository" +fi + +# Installing Nginx repository +nrepo="/etc/yum.repos.d/nginx.repo" +echo "[nginx]" > $nrepo +echo "name=nginx repo" >> $nrepo +echo "baseurl=http://nginx.org/packages/centos/$release/\$basearch/" >> $nrepo +echo "gpgcheck=0" >> $nrepo +echo "enabled=1" >> $nrepo + +# Installing Vesta repository +vrepo='/etc/yum.repos.d/vesta.repo' +echo "[vesta]" > $vrepo +echo "name=Vesta - $REPO" >> $vrepo +echo "baseurl=http://$RHOST/$REPO/$release/\$basearch/" >> $vrepo +echo "enabled=1" >> $vrepo +echo "gpgcheck=1" >> $vrepo +echo "gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-VESTA" >> $vrepo +wget $vestacp/GPG.txt -O /etc/pki/rpm-gpg/RPM-GPG-KEY-VESTA + + +#----------------------------------------------------------# +# Backup # +#----------------------------------------------------------# + +# Creating backup directory tree +mkdir -p $vst_backups +cd $vst_backups +mkdir nginx httpd php php-fpm vsftpd proftpd named exim dovecot clamd \ + spamassassin mysql postgresql mongodb vesta + +# Backing up Nginx configuration +service nginx stop > /dev/null 2>&1 +cp -r /etc/nginx/* $vst_backups/nginx > /dev/null 2>&1 + +# Backing up Apache configuration +service httpd stop > /dev/null 2>&1 +cp -r /etc/httpd/* $vst_backups/httpd > /dev/null 2>&1 + +# Backing up PHP configuration +service php-fpm stop >/dev/null 2>&1 +cp /etc/php.ini $vst_backups/php > /dev/null 2>&1 +cp -r /etc/php.d $vst_backups/php > /dev/null 2>&1 +cp /etc/php-fpm.conf $vst_backups/php-fpm > /dev/null 2>&1 +mv -f /etc/php-fpm.d/* $vst_backups/php-fpm/ > /dev/null 2>&1 + +# Backing up Bind configuration +service named stop > /dev/null 2>&1 +cp /etc/named.conf $vst_backups/named >/dev/null 2>&1 + +# Backing up Vsftpd configuration +service vsftpd stop > /dev/null 2>&1 +cp /etc/vsftpd/vsftpd.conf $vst_backups/vsftpd >/dev/null 2>&1 + +# Backing up ProFTPD configuration +service proftpd stop > /dev/null 2>&1 +cp /etc/proftpd.conf $vst_backups/proftpd >/dev/null 2>&1 + +# Backing up Exim configuration +service exim stop > /dev/null 2>&1 +cp -r /etc/exim/* $vst_backups/exim >/dev/null 2>&1 + +# Backing up ClamAV configuration +service clamd stop > /dev/null 2>&1 +cp /etc/clamd.conf $vst_backups/clamd >/dev/null 2>&1 +cp -r /etc/clamd.d $vst_backups/clamd >/dev/null 2>&1 + +# Backing up SpamAssassin configuration +service spamassassin stop > /dev/null 2>&1 +cp -r /etc/mail/spamassassin/* $vst_backups/spamassassin >/dev/null 2>&1 + +# Backing up Dovecot configuration +service dovecot stop > /dev/null 2>&1 +cp /etc/dovecot.conf $vst_backups/dovecot > /dev/null 2>&1 +cp -r /etc/dovecot/* $vst_backups/dovecot > /dev/null 2>&1 + +# Backing up MySQL/MariaDB configuration and data +service mysql stop > /dev/null 2>&1 +service mysqld stop > /dev/null 2>&1 +service mariadb stop > /dev/null 2>&1 +mv /var/lib/mysql $vst_backups/mysql/mysql_datadir >/dev/null 2>&1 +cp /etc/my.cnf $vst_backups/mysql > /dev/null 2>&1 +cp /etc/my.cnf.d $vst_backups/mysql > /dev/null 2>&1 +mv /root/.my.cnf $vst_backups/mysql > /dev/null 2>&1 + +# Backing up MySQL/MariaDB configuration and data +service postgresql stop > /dev/null 2>&1 +mv /var/lib/pgsql/data $vst_backups/postgresql/ >/dev/null 2>&1 + +# Backing up Vesta configuration and data +service vesta stop > /dev/null 2>&1 +mv /usr/local/vesta/data/* $vst_backups/vesta > /dev/null 2>&1 +mv /usr/local/vesta/conf/* $vst_backups/vesta > /dev/null 2>&1 + + +#----------------------------------------------------------# +# Package Exludes # +#----------------------------------------------------------# + +# Excluding packages +if [ "$nginx" = 'no' ]; then + software=$(echo "$software" | sed -e "s/^nginx//") +fi +if [ "$apache" = 'no' ]; then + software=$(echo "$software" | sed -e "s/httpd//") + software=$(echo "$software" | sed -e "s/mod_ssl//") + software=$(echo "$software" | sed -e "s/mod_fcgid//") + software=$(echo "$software" | sed -e "s/mod_ruid2//") +fi +if [ "$phpfpm" = 'no' ]; then + software=$(echo "$software" | sed -e "s/php-fpm//") +fi +if [ "$vsftpd" = 'no' ]; then + software=$(echo "$software" | sed -e "s/vsftpd//") +fi +if [ "$proftpd" = 'no' ]; then + software=$(echo "$software" | sed -e "s/proftpd//") +fi +if [ "$named" = 'no' ]; then + software=$(echo "$software" | sed -e "s/bind //") +fi +if [ "$exim" = 'no' ]; then + software=$(echo "$software" | sed -e "s/exim//") + software=$(echo "$software" | sed -e "s/dovecot//") + software=$(echo "$software" | sed -e "s/clamd//") + software=$(echo "$software" | sed -e "s/clamav-server//") + software=$(echo "$software" | sed -e "s/clamav-update//") + software=$(echo "$software" | sed -e "s/spamassassin//") + software=$(echo "$software" | sed -e "s/dovecot//") + software=$(echo "$software" | sed -e "s/roundcubemail//") +fi +if [ "$clamd" = 'no' ]; then + software=$(echo "$software" | sed -e "s/clamd//") + software=$(echo "$software" | sed -e "s/clamav-server//") + software=$(echo "$software" | sed -e "s/clamav-update//") +fi +if [ "$spamd" = 'no' ]; then + software=$(echo "$software" | sed -e 's/spamassassin//') +fi +if [ "$dovecot" = 'no' ]; then + software=$(echo "$software" | sed -e "s/dovecot//") +fi +if [ "$mysql" = 'no' ]; then + software=$(echo "$software" | sed -e 's/mysql //') + software=$(echo "$software" | sed -e 's/mysql-server//') + software=$(echo "$software" | sed -e 's/mariadb //') + software=$(echo "$software" | sed -e 's/mariadb-server//') + software=$(echo "$software" | sed -e 's/php-mysql//') + software=$(echo "$software" | sed -e 's/phpMyAdmin//') + software=$(echo "$software" | sed -e 's/roundcubemail//') +fi +if [ "$postgresql" = 'no' ]; then + software=$(echo "$software" | sed -e 's/postgresql //') + software=$(echo "$software" | sed -e 's/postgresql-server//') + software=$(echo "$software" | sed -e 's/postgresql-contrib//') + software=$(echo "$software" | sed -e 's/php-pgsql//') + software=$(echo "$software" | sed -e 's/phpPgAdmin//') +fi +if [ "$iptables" = 'no' ] || [ "$fail2ban" = 'no' ]; then + software=$(echo "$software" | sed -e 's/fail2ban//') +fi + + +#----------------------------------------------------------# +# Install packages # +#----------------------------------------------------------# + +# Installing rpm packages +if [ -z "$disable_remi" ]; then + yum -y --disablerepo=* --enablerepo="base,updates,nginx,epel,vesta,remi" \ + install $software +else + yum -y --disablerepo=* --enablerepo="base,updates,nginx,epel,vesta" \ + install $software +fi +check_result $? "yum install failed" + + +#----------------------------------------------------------# +# Configure system # +#----------------------------------------------------------# + +# Restarting rsyslog +service rsyslog restart > /dev/null 2>&1 + +# Checking ipv6 on loopback interface +check_lo_ipv6=$(/sbin/ip addr | grep 'inet6') check_rc_ipv6=$(grep 'scope global dev lo' /etc/rc.local) if [ ! -z "$check_lo_ipv6)" ] && [ -z "$check_rc_ipv6" ]; then ip addr add ::2/128 scope global dev lo @@ -265,621 +619,601 @@ if [ ! -z "$check_lo_ipv6)" ] && [ -z "$check_rc_ipv6" ]; then chmod a+x /etc/rc.local fi - -#----------------------------------------------------------# -# Install repository # -#----------------------------------------------------------# -# Let's start -echo -e "\n\n\n\nInstallation will take about 15 minutes ...\n" -sleep 5 - -# Update system -if [ -z "$noupdate" ]; then - yum -y update - if [ $? -ne 0 ]; then - echo 'Error: yum update failed' - exit 1 - fi -fi - -# Install EPEL repo -if [ ! -e '/etc/yum.repos.d/epel.repo' ]; then - if [ "$release" -eq '5' ]; then - epel="5/$arch/epel-release-5-4.noarch.rpm" - fi - - if [ "$release" -eq '6' ]; then - epel="6/$arch/epel-release-6-8.noarch.rpm" - fi - - rpm -ivh http://dl.fedoraproject.org/pub/epel/$epel - if [ $? -ne 0 ]; then - echo "Error: can't install EPEL repository" - exit 1 - fi -fi - -# Install remi repo -if [ ! -e '/etc/yum.repos.d/remi.repo' ]; then - if [ "$release" -eq '5' ]; then - remi="remi-release-5.rpm" - fi - - if [ "$release" -eq '6' ]; then - remi="remi-release-6.rpm" - fi - - rpm -ivh http://rpms.famillecollet.com/enterprise/$remi - if [ $? -ne 0 ]; then - echo "Error: can't install remi repository" - exit 1 - fi -fi - -# Install nginx repo -if [ ! -e '/etc/yum.repos.d/nginx.repo' ]; then - echo "[nginx]" > /etc/yum.repos.d/nginx.repo - echo "name=nginx repo" >> /etc/yum.repos.d/nginx.repo - echo "baseurl=http://nginx.org/packages/centos/$release/\$basearch/" \ - >> /etc/yum.repos.d/nginx.repo - echo "gpgcheck=0" >> /etc/yum.repos.d/nginx.repo - echo "enabled=1" >> /etc/yum.repos.d/nginx.repo -fi - -# Install vesta repo -echo "[vesta]" > $YUM_REPO -echo "name=Vesta - $REPO" >> $YUM_REPO -echo "baseurl=http://$RHOST/$REPO/$release/\$basearch/" >> $YUM_REPO -echo "enabled=1" >> $YUM_REPO -echo "gpgcheck=1" >> $YUM_REPO -echo "gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-VESTA" >> $YUM_REPO -wget $CHOST/GPG.txt -O /etc/pki/rpm-gpg/RPM-GPG-KEY-VESTA - - -#----------------------------------------------------------# -# Backups # -#----------------------------------------------------------# - -# Prepare backup tree -vst_backups="/root/vst_install_backups/$(date +%s)" -mkdir -p $vst_backups/nginx -mkdir -p $vst_backups/httpd -mkdir -p $vst_backups/mysql -mkdir -p $vst_backups/exim -mkdir -p $vst_backups/dovecot -mkdir -p $vst_backups/clamd -mkdir -p $vst_backups/spamassassin -mkdir -p $vst_backups/vsftpd -mkdir -p $vst_backups/named -mkdir -p $vst_backups/vesta/admin -mkdir -p $vst_backups/home - -# Backup sudoers -if [ -e '/etc/sudoers' ]; then - cp /etc/sudoers $vst_backups/ -fi - -# Backup nginx -service nginx stop > /dev/null 2>&1 -if [ -e '/etc/nginx/nginx.conf' ]; then - cp -r /etc/nginx/* $vst_backups/nginx/ -fi - -# Backup httpd -service httpd stop > /dev/null 2>&1 -if [ -e '/etc/httpd/conf/httpd.conf' ]; then - cp -r /etc/httpd/* $vst_backups/httpd/ -fi - -# Backup bind -service named stop > /dev/null 2>&1 -if [ -e '/etc/named.conf' ]; then - cp /etc/named.conf $vst_backups/named/ -fi - -# Backup vsftpd -service vsftpd stop > /dev/null 2>&1 -if [ -e '/etc/vsftpd/vsftpd.conf' ]; then - cp /etc/vsftpd/vsftpd.conf $vst_backups/vsftpd/ -fi - -# Backup exim -service exim stop > /dev/null 2>&1 -if [ -e '/etc/exim/exim.conf' ]; then - cp -r /etc/exim/* $vst_backups/exim/ -fi - -# Backup clamav -service clamd stop > /dev/null 2>&1 -if [ -e '/etc/clamd.conf' ]; then - cp /etc/clamd.conf $vst_backups/clamd/ -fi - -# Backup SpamAssassin -service spamassassin stop > /dev/null 2>&1 -if [ -e '/etc/mail/spamassassin' ]; then - cp -r /etc/mail/spamassassin/* $vst_backups/spamassassin/ -fi - -# Backup dovecot -service dovecot stop > /dev/null 2>&1 -if [ -e '/etc/dovecot.conf' ]; then - cp /etc/dovecot.conf $vst_backups/dovecot/ -fi -if [ -e '/etc/dovecot' ]; then - cp -r /etc/dovecot/* $vst_backups/dovecot/ -fi - -# Backup MySQL stuff -service mysqld stop > /dev/null 2>&1 -if [ -e '/var/lib/mysql' ]; then - mv /var/lib/mysql $vst_backups/mysql/mysql_datadir -fi -if [ -e '/etc/my.cnf' ]; then - cp /etc/my.cnf $vst_backups/mysql/ -fi -if [ -e '/root/.my.cnf' ]; then - mv /root/.my.cnf $vst_backups/mysql/ -fi - -# Backup vesta -service vesta stop > /dev/null 2>&1 -if [ -e '/usr/local/vesta/data' ]; then - mv /usr/local/vesta/data $vst_backups/vesta/ -fi - -if [ -e '/usr/local/vesta/conf' ]; then - mv /usr/local/vesta/conf $vst_backups/vesta/ -fi - -if [ -e '/home/admin/conf/' ]; then - mv /home/admin/conf/ $vst_backups/vesta/admin -fi - - -#----------------------------------------------------------# -# Install packages # -#----------------------------------------------------------# - -# Exclude heavy packages -if [ "$srv_type" = 'micro' ]; then - software=$(echo "$software" | sed -e 's/mod_fcgid//') - software=$(echo "$software" | sed -e 's/clamd//') - software=$(echo "$software" | sed -e 's/spamassassin//') -fi - -if [ "$srv_type" = 'small' ]; then - software=$(echo "$software" | sed -e 's/clamd//') - software=$(echo "$software" | sed -e 's/spamassassin//') -fi - -# Exclude fail2ban -if [ "$disable_fail2ban" = 'yes' ]; then - software=$(echo "$software" | sed -e 's/fail2ban//') -fi - -# Install Vesta packages -if [ -z "$disable_remi" ]; then - yum -y --disablerepo=* --enablerepo="base,updates,nginx,epel,vesta,remi" \ - install $software -else - yum -y --disablerepo=* --enablerepo="base,updates,nginx,epel,vesta" \ - install $software -fi -if [ $? -ne 0 ]; then - echo 'Error: yum install failed' - exit 1 -fi - - -#----------------------------------------------------------# -# Configure system # -#----------------------------------------------------------# - -# Set writable permission on tmp directory -chmod 777 /tmp - # Disabling SELinux if [ -e '/etc/sysconfig/selinux' ]; then sed -i 's/SELINUX=enforcing/SELINUX=disabled/g' /etc/sysconfig/selinux - setenforce 0 -fi -if [ -e '/etc/selinux/config' ]; then sed -i 's/SELINUX=enforcing/SELINUX=disabled/g' /etc/selinux/config - setenforce 0 + setenforce 0 2>/dev/null fi -# Vesta configuration +# Disable iptables +service iptables stop + +# Configuring NTP synchronization +echo '#!/bin/sh' > /etc/cron.daily/ntpdate +echo "$(which ntpdate) -s pool.ntp.org" >> /etc/cron.daily/ntpdate +chmod 775 /etc/cron.daily/ntpdate +ntpdate -s pool.ntp.org + +# Disabling webalizer routine +rm -f /etc/cron.daily/00webalizer + +# Adding backup user +adduser backup 2>/dev/null +ln -sf /home/backup /backup +chmod a+x /backup + +# Chaning default directory color +echo 'LS_COLORS="$LS_COLORS:di=00;33"' >> /etc/profile + +# Changing default systemd interval +if [ "$release" -eq '7' ]; then + # Hi Lennart + echo "DefaultStartLimitInterval=1s" >> /etc/systemd/system.conf + echo "DefaultStartLimitBurst=60" >> /etc/systemd/system.conf + systemctl daemon-reexec +fi + + +#----------------------------------------------------------# +# Configure VESTA # +#----------------------------------------------------------# + +# Downlading sudo configuration +mkdir -p /etc/sudoers.d +wget $vestacp/sudo/admin -O /etc/sudoers.d/admin +chmod 440 /etc/sudoers.d/admin + +# Configuring system env echo "export VESTA='/usr/local/vesta'" > /etc/profile.d/vesta.sh chmod 755 /etc/profile.d/vesta.sh source /etc/profile.d/vesta.sh echo 'PATH=$PATH:/usr/local/vesta/bin' >> /root/.bash_profile echo 'export PATH' >> /root/.bash_profile source /root/.bash_profile -wget $CHOST/$VERSION/vesta.log -O /etc/logrotate.d/vesta -# Directory tree -mkdir -p $VESTA/conf -mkdir -p $VESTA/log -mkdir -p $VESTA/ssl -mkdir -p $VESTA/data -mkdir -p $VESTA/data/ips -mkdir -p $VESTA/data/queue -mkdir -p $VESTA/data/users -mkdir -p $VESTA/data/firewall -touch $VESTA/data/queue/backup.pipe -touch $VESTA/data/queue/disk.pipe -touch $VESTA/data/queue/webstats.pipe -touch $VESTA/data/queue/restart.pipe -touch $VESTA/data/queue/traffic.pipe -chmod 750 $VESTA/conf -chmod 750 $VESTA/data/users -chmod 750 $VESTA/data/ips +# Configuring logrotate for vesta logs +wget $vestacp/logrotate/vesta -O /etc/logrotate.d/vesta + +# Buidling directory tree and creating some blank files for vesta +mkdir -p $VESTA/conf $VESTA/log $VESTA/ssl $VESTA/data/ips \ + $VESTA/data/queue $VESTA/data/users $VESTA/data/firewall +touch $VESTA/data/queue/backup.pipe $VESTA/data/queue/disk.pipe \ + $VESTA/data/queue/webstats.pipe $VESTA/data/queue/restart.pipe \ + $VESTA/data/queue/traffic.pipe $VESTA/log/system.log \ + $VESTA/log/nginx-error.log $VESTA/log/auth.log +chmod 750 $VESTA/conf $VESTA/data/users $VESTA/data/ips $VESTA/log chmod -R 750 $VESTA/data/queue -ln -s /usr/local/vesta/log /var/log/vesta -touch /var/log/vesta/system.log -touch /var/log/vesta/nginx-error.log -touch /var/log/vesta/auth.log chmod 660 /var/log/vesta/* -adduser backup -ln -s /home/backup /backup -chmod a+x /backup +rm -f /var/log/vesta +ln -s /usr/local/vesta/log /var/log/vesta -# vesta.conf -wget $CHOST/$VERSION/vesta.conf -O $VESTA/conf/vesta.conf -if [ "$srv_type" = 'micro' ] || [ "$srv_type" = 'small' ]; then - sed -i "s/clamav//g" $VESTA/conf/vesta.conf - sed -i "s/spamassassin//g" $VESTA/conf/vesta.conf +# Generating vesta configuration +rm -f $VESTA/conf/vesta.conf 2>/dev/null +touch $VESTA/conf/vesta.conf +chmod 660 $VESTA/conf/vesta.conf + +# WEB stack +if [ "$apache" = 'yes' ] && [ "$nginx" = 'no' ] ; then + echo "WEB_SYSTEM='httpd'" >> $VESTA/conf/vesta.conf + echo "WEB_RGROUPS='apache'" >> $VESTA/conf/vesta.conf + echo "WEB_PORT='80'" >> $VESTA/conf/vesta.conf + echo "WEB_SSL_PORT='443'" >> $VESTA/conf/vesta.conf + echo "WEB_SSL='mod_ssl'" >> $VESTA/conf/vesta.conf + echo "STATS_SYSTEM='webalizer,awstats'" >> $VESTA/conf/vesta.conf +fi +if [ "$apache" = 'yes' ] && [ "$nginx" = 'yes' ] ; then + echo "WEB_SYSTEM='httpd'" >> $VESTA/conf/vesta.conf + echo "WEB_RGROUPS='apache'" >> $VESTA/conf/vesta.conf + echo "WEB_PORT='8080'" >> $VESTA/conf/vesta.conf + echo "WEB_SSL_PORT='8443'" >> $VESTA/conf/vesta.conf + echo "WEB_SSL='mod_ssl'" >> $VESTA/conf/vesta.conf + echo "PROXY_SYSTEM='nginx'" >> $VESTA/conf/vesta.conf + echo "PROXY_PORT='80'" >> $VESTA/conf/vesta.conf + echo "PROXY_SSL_PORT='443'" >> $VESTA/conf/vesta.conf + echo "STATS_SYSTEM='webalizer,awstats'" >> $VESTA/conf/vesta.conf +fi +if [ "$apache" = 'no' ] && [ "$nginx" = 'yes' ]; then + echo "WEB_SYSTEM='nginx'" >> $VESTA/conf/vesta.conf + echo "WEB_PORT='80'" >> $VESTA/conf/vesta.conf + echo "WEB_SSL_PORT='443'" >> $VESTA/conf/vesta.conf + echo "WEB_SSL='openssl'" >> $VESTA/conf/vesta.conf + if [ "$phpfpm" = 'yes' ]; then + echo "WEB_BACKEND='php-fpm'" >> $VESTA/conf/vesta.conf + fi + echo "STATS_SYSTEM='webalizer,awstats'" >> $VESTA/conf/vesta.conf fi -# Set server hostname -if [ -z "$servername" ]; then - servername=$(hostname) +# FTP stack +if [ "$vsftpd" = 'yes' ]; then + echo "FTP_SYSTEM='vsftpd'" >> $VESTA/conf/vesta.conf +fi +if [ "$proftpd" = 'yes' ]; then + echo "FTP_SYSTEM='proftpd'" >> $VESTA/conf/vesta.conf fi -/usr/local/vesta/bin/v-change-sys-hostname $servername 2>/dev/null -# Templates -cd /usr/local/vesta/data -wget $CHOST/$VERSION/packages.tar.gz -O packages.tar.gz +# DNS stack +if [ "$named" = 'yes' ]; then + echo "DNS_SYSTEM='named'" >> $VESTA/conf/vesta.conf +fi + +# Mail stack +if [ "$exim" = 'yes' ]; then + echo "MAIL_SYSTEM='exim'" >> $VESTA/conf/vesta.conf + if [ "$clamd" = 'yes' ]; then + echo "ANTIVIRUS_SYSTEM='clamav'" >> $VESTA/conf/vesta.conf + fi + if [ "$spamd" = 'yes' ]; then + echo "ANTISPAM_SYSTEM='spamassassin'" >> $VESTA/conf/vesta.conf + fi + if [ "$dovecot" = 'yes' ]; then + echo "IMAP_SYSTEM='dovecot'" >> $VESTA/conf/vesta.conf + fi +fi + +# CRON daemon +echo "CRON_SYSTEM='crond'" >> $VESTA/conf/vesta.conf + +# Firewall stack +if [ "$iptables" = 'yes' ]; then + echo "FIREWALL_SYSTEM='iptables'" >> $VESTA/conf/vesta.conf +fi +if [ "$iptables" = 'yes' ] && [ "$fail2ban" = 'yes' ]; then + echo "FIREWALL_EXTENSION='fail2ban'" >> $VESTA/conf/vesta.conf +fi + +# Disk quota +if [ "$quota" = 'yes' ]; then + echo "DISK_QUOTA='yes'" >> $VESTA/conf/vesta.conf +fi + +# Backups +echo "BACKUP_SYSTEM='local'" >> $VESTA/conf/vesta.conf + +# Language +echo "LANGUAGE='$lang'" >> $VESTA/conf/vesta.conf + +# Version +echo "VERSION='0.9.8'" >> $VESTA/conf/vesta.conf + +# Downloading hosting packages +cd $VESTA/data +wget $vestacp/packages.tar.gz -O packages.tar.gz tar -xzf packages.tar.gz rm -f packages.tar.gz -cd /usr/local/vesta/data -wget $CHOST/$VERSION/templates.tar.gz -O templates.tar.gz + +# Downloading templates +wget $vestacp/templates.tar.gz -O templates.tar.gz tar -xzf templates.tar.gz rm -f templates.tar.gz -chmod -R 755 /usr/local/vesta/data/templates + +# Copying index.html to default documentroot cp templates/web/skel/public_html/index.html /var/www/html/ sed -i 's/%domain%/It worked!/g' /var/www/html/index.html -if [ "$srv_type" = 'micro' ]; then - rm -f /usr/local/vesta/data/templates/web/httpd/phpfcgid.* -fi + +# Downloading firewall rules +wget $vestacp/firewall.tar.gz -O firewall.tar.gz +tar -xzf firewall.tar.gz +rm -f firewall.tar.gz + +# Configuring server hostname +$VESTA/bin/v-change-sys-hostname $servername 2>/dev/null # Generating SSL certificate $VESTA/bin/v-generate-ssl-cert $(hostname) $email 'US' 'California' \ 'San Francisco' 'Vesta Control Panel' 'IT' > /tmp/vst.pem -# Parsing merged certificate file +# Parsing certificate file crt_end=$(grep -n "END CERTIFICATE-" /tmp/vst.pem |cut -f 1 -d:) key_start=$(grep -n "BEGIN RSA" /tmp/vst.pem |cut -f 1 -d:) key_end=$(grep -n "END RSA" /tmp/vst.pem |cut -f 1 -d:) # Adding SSL certificate -cd /usr/local/vesta/ssl +cd $VESTA/ssl sed -n "1,${crt_end}p" /tmp/vst.pem > certificate.crt sed -n "$key_start,${key_end}p" /tmp/vst.pem > certificate.key -chown root:mail /usr/local/vesta/ssl/* -chmod 660 /usr/local/vesta/ssl/* +chown root:mail $VESTA/ssl/* +chmod 660 $VESTA/ssl/* rm /tmp/vst.pem -# Disabling webalizer routine -rm -f /etc/cron.daily/00webalizer -# Set directory color -echo 'LS_COLORS="$LS_COLORS:di=00;33"' >> /etc/profile +#----------------------------------------------------------# +# Configure Nginx # +#----------------------------------------------------------# -# Sudo configuration -wget $CHOST/$VERSION/sudoers.conf -O /etc/sudoers -wget $CHOST/$VERSION/sudoers.admin.conf -O /etc/sudoers.d/admin -chmod 440 /etc/sudoers -chmod 440 /etc/sudoers.d/admin - -# NTP Synchronization -echo '#!/bin/sh' > /etc/cron.daily/ntpdate -echo "$(which ntpdate) -s pool.ntp.org" >> /etc/cron.daily/ntpdate -chmod 775 /etc/cron.daily/ntpdate -ntpdate -s pool.ntp.org - -# Setup rssh -if [ -z "$(grep /usr/bin/rssh /etc/shells)" ]; then - echo /usr/bin/rssh >> /etc/shells -fi -sed -i 's/#allowscp/allowscp/' /etc/rssh.conf -sed -i 's/#allowsftp/allowsftp/' /etc/rssh.conf -sed -i 's/#allowrsync/allowrsync/' /etc/rssh.conf -chmod 755 /usr/bin/rssh - -# Nginx configuration -rm -f /etc/nginx/conf.d/*.conf -wget $CHOST/$VERSION/nginx.conf -O /etc/nginx/nginx.conf -wget $CHOST/$VERSION/nginx-status.conf -O /etc/nginx/conf.d/status.conf -touch /etc/nginx/conf.d/vesta.conf -chkconfig nginx on -service nginx start -if [ "$?" -ne 0 ]; then - echo "Error: nginx start failed" - exit 1 +if [ "$nginx" = 'yes' ]; then + rm -f /etc/nginx/conf.d/*.conf + wget $vestacp/nginx/nginx.conf -O /etc/nginx/nginx.conf + wget $vestacp/nginx/status.conf -O /etc/nginx/conf.d/status.conf + wget $vestacp/nginx/phpmyadmin.inc -O /etc/nginx/conf.d/phpmyadmin.inc + wget $vestacp/nginx/phppgadmin.inc -O /etc/nginx/conf.d/phppgadmin.inc + wget $vestacp/nginx/webmail.inc -O /etc/nginx/conf.d/webmail.inc + wget $vestacp/logrotate/nginx -O /etc/logrotate.d/nginx + echo > /etc/nginx/conf.d/vesta.conf + mkdir -p /var/log/nginx/domains + chkconfig nginx on + service nginx start + check_result $? "nginx start failed" fi -# Apache configuration -wget $CHOST/$VERSION/httpd.conf -O /etc/httpd/conf/httpd.conf -wget $CHOST/$VERSION/httpd-status.conf -O /etc/httpd/conf.d/status.conf -wget $CHOST/$VERSION/httpd-ssl.conf -O /etc/httpd/conf.d/ssl.conf -wget $CHOST/$VERSION/httpd.log -O /etc/logrotate.d/httpd -echo "MEFaccept 127.0.0.1" >> /etc/httpd/conf.d/mod_extract_forwarded.conf -rm -f /etc/httpd/conf.d/proxy_ajp.conf -echo > /etc/httpd/conf.d/proxy_ajp.conf -rm -f /etc/httpd/conf.d/vesta.conf -echo > /etc/httpd/conf.d/vesta.conf -touch /var/log/httpd/access_log -touch /var/log/httpd/error_log -touch /var/log/httpd/suexec.log -mkdir -p /var/log/httpd/domains -chmod a+x /var/log/httpd -chmod 640 /var/log/httpd/access_log -chmod 640 /var/log/httpd/error_log -chmod 640 /var/log/httpd/suexec.log -chmod 751 /var/log/httpd/domains -chkconfig httpd on -service httpd start -if [ "$?" -ne 0 ]; then - echo "Error: httpd start failed" - exit 1 + +#----------------------------------------------------------# +# Configure Apache # +#----------------------------------------------------------# + +if [ "$apache" = 'yes' ]; then + cd /etc/httpd + wget $vestacp/httpd/httpd.conf -O conf/httpd.conf + wget $vestacp/httpd/status.conf -O conf.d/status.conf + wget $vestacp/httpd/ssl.conf -O conf.d/ssl.conf + wget $vestacp/httpd/ruid2.conf -O conf.d/ruid2.conf + wget $vestacp/logrotate/httpd -O /etc/logrotate.d/httpd + if [ $release -ne 7 ]; then + echo "MEFaccept 127.0.0.1" >> conf.d/mod_extract_forwarded.conf + echo > conf.d/proxy_ajp.conf + fi + if [ -e "conf.modules.d/00-dav.conf" ]; then + sed -i "s/^/#/" conf.modules.d/00-dav.conf conf.modules.d/00-lua.conf + sed -i "s/^/#/" conf.modules.d/00-proxy.conf + fi + echo > conf.d/vesta.conf + touch logs/access_log logs/error_log logs/error_log logs/suexec.log + chmod 640 logs/access_log logs/error_log logs/error_log logs/suexec.log + chmod -f 777 /var/lib/php/session + chmod a+x /var/log/httpd + mkdir -p /var/log/httpd/domains + chmod 751 /var/log/httpd/domains + chkconfig httpd on + service httpd start + check_result $? "httpd start failed" fi -# Vsftpd configuration -wget $CHOST/$VERSION/vsftpd.conf -O /etc/vsftpd/vsftpd.conf -chkconfig vsftpd on -service vsftpd start -if [ "$?" -ne 0 ]; then - echo "Error: vsftpd start failed" - exit 1 + +#----------------------------------------------------------# +# Configure PHP-FPM # +#----------------------------------------------------------# + +if [ "$phpfpm" = 'yes' ]; then + wget $vestacp/php-fpm/www.conf -O /etc/php-fpm.d/www.conf + chkconfig nginx on + service php-fpm start + check_result $? "php-fpm start failed" fi -# MySQL configuration -if [ "$srv_type" = 'micro' ]; then - wget $CHOST/$VERSION/mysql-512.cnf -O /etc/my.cnf -else - wget $CHOST/$VERSION/mysql.cnf -O /etc/my.cnf + +#----------------------------------------------------------# +# Configure PHP # +#----------------------------------------------------------# + +ZONE=$(timedatectl 2>/dev/null|grep Timezone|awk '{print $2}') +if [ -e '/etc/sysconfig/clock' ]; then + source /etc/sysconfig/clock fi -chkconfig mysqld on -service mysqld start -if [ "$?" -ne 0 ]; then - # Fix for aio on OpenVZ - if [ -e "/proc/user_beancounters" ]; then - sed -i "s/#innodb_use_native_aio/innodb_use_native_aio/g" /etc/my.cnf +if [ -z "$ZONE" ]; then + ZONE='UTC' +fi +sed -i 's%short_open_tag = Off%short_open_tag = On%g' /etc/php.ini +sed -i "s%;date.timezone =%date.timezone = $ZONE%g" /etc/php.ini + + +#----------------------------------------------------------# +# Configure VSFTPD # +#----------------------------------------------------------# + +if [ "$vsftpd" = 'yes' ]; then + wget $vestacp/vsftpd/vsftpd.conf -O /etc/vsftpd/vsftpd.conf + chkconfig vsftpd on + service vsftpd start + check_result $? "vsftpd start failed" +fi + + +#----------------------------------------------------------# +# Configure ProFTPD # +#----------------------------------------------------------# + +if [ "$proftpd" = 'yes' ]; then + wget $vestacp/proftpd/proftpd.conf -O /etc/proftpd.conf + chkconfig proftpd on + service proftpd start + check_result $? "proftpd start failed" +fi + + +#----------------------------------------------------------# +# Configure MySQL/MariaDB # +#----------------------------------------------------------# + +if [ "$mysql" = 'yes' ]; then + + mycnf="my-small.cnf" + if [ $memory -gt 1200000 ]; then + mycnf="my-medium.cnf" + fi + if [ $memory -gt 3900000 ]; then + mycnf="my-large.cnf" fi - service mysqld start + mkdir -p /var/lib/mysql + chown mysql:mysql /var/lib/mysql + + if [ $release -ne 7 ]; then + service='mysqld' + else + service='mariadb' + fi + + wget $vestacp/$service/$mycnf -O /etc/my.cnf + chkconfig $service on + service $service start if [ "$?" -ne 0 ]; then - echo "Error: mysqld start failed" - exit 1 + if [ -e "/proc/user_beancounters" ]; then + # Fix for aio on OpenVZ + sed -i "s/#innodb_use_native/innodb_use_native/g" /etc/my.cnf + fi + service $service start + check_result $? "$service start failed" fi + + # Securing MySQL installation + mysqladmin -u root password $vpass + echo -e "[client]\npassword='$vpass'\n" > /root/.my.cnf + chmod 600 /root/.my.cnf + mysql -e "DELETE FROM mysql.user WHERE User=''" + mysql -e "DROP DATABASE test" >/dev/null 2>&1 + mysql -e "DELETE FROM mysql.db WHERE Db='test' OR Db='test\\_%'" + mysql -e "DELETE FROM mysql.user WHERE user='' or password='';" + mysql -e "FLUSH PRIVILEGES" + + # Configuring phpMyAdmin + if [ "$apache" = 'yes' ]; then + wget $vestacp/pma/phpMyAdmin.conf -O /etc/httpd/conf.d/phpMyAdmin.conf + fi + wget $vestacp/pma/config.inc.conf -O /etc/phpMyAdmin/config.inc.php + sed -i "s/%blowfish_secret%/$(gen_pass)/g" /etc/phpMyAdmin/config.inc.php fi -# Generating MySQL password if it wasn't set -if [ -z "$mpass" ]; then - mpass=$(gen_pass) + +#----------------------------------------------------------# +# Configure PostgreSQL # +#----------------------------------------------------------# + +if [ "$postgresql" = 'yes' ]; then + if [ $release = 5 ]; then + service postgresql start + sudo -u postgres psql -c "ALTER USER postgres WITH PASSWORD '$vpass'" + service postgresql stop + wget $vestacp/postgresql/pg_hba.conf -O /var/lib/pgsql/data/pg_hba.conf + service postgresql start + else + service postgresql initdb + wget $vestacp/postgresql/pg_hba.conf -O /var/lib/pgsql/data/pg_hba.conf + service postgresql start + sudo -u postgres psql -c "ALTER USER postgres WITH PASSWORD '$vpass'" + fi + # Configuring phpPgAdmin + if [ "$apache" = 'yes' ]; then + wget $vestacp/pga/phpPgAdmin.conf -O /etc/httpd/conf.d/phpPgAdmin.conf + fi + wget $vestacp/pga/config.inc.php -O /etc/phpPgAdmin/config.inc.php fi -mysqladmin -u root password $mpass -echo -e "[client]\npassword='$mpass'\n" > /root/.my.cnf -chmod 600 /root/.my.cnf -mysql -e "DELETE FROM mysql.user WHERE User=''" -mysql -e "DROP DATABASE test" -mysql -e "DELETE FROM mysql.db WHERE Db='test' OR Db='test\\_%'" -mysql -e "DELETE FROM mysql.user WHERE user='' or password='';" -mysql -e "FLUSH PRIVILEGES" -# Bind configuration -wget $CHOST/$VERSION/named.conf -O /etc/named.conf -chown root:named /etc/named.conf -chmod 640 /etc/named.conf -chkconfig named on -service named start -if [ "$?" -ne 0 ]; then - echo "Error: named start failed" - exit 1 +#----------------------------------------------------------# +# Configure Bind # +#----------------------------------------------------------# + +if [ "$named" = 'yes' ]; then + wget $vestacp/named/named.conf -O /etc/named.conf + chown root:named /etc/named.conf + chmod 640 /etc/named.conf + chkconfig named on + service named start + check_result $? "named start failed" fi -# Exim -wget $CHOST/$VERSION/exim.conf -O /etc/exim/exim.conf -if [ "$srv_type" != 'micro' ] && [ "$srv_type" != 'small' ]; then - sed -i "s/#SPAM/SPAM/g" /etc/exim/exim.conf - sed -i "s/#CLAMD/CLAMD/g" /etc/exim/exim.conf -fi -wget $CHOST/$VERSION/dnsbl.conf -O /etc/exim/dnsbl.conf -wget $CHOST/$VERSION/spam-blocks.conf -O /etc/exim/spam-blocks.conf -touch /etc/exim/white-blocks.conf -rm -rf /etc/exim/domains -mkdir -p /etc/exim/domains -chmod 640 /etc/exim/exim.conf -gpasswd -a exim mail -if [ -e /etc/init.d/sendmail ]; then - chkconfig sendmail off - service sendmail stop -fi -if [ -e /etc/init.d/postfix ]; then - chkconfig postfix off - service postfix stop -fi -rm -f /etc/alternatives/mta -ln -s /usr/sbin/sendmail.exim /etc/alternatives/mta -chkconfig exim on -service exim start -if [ "$?" -ne 0 ]; then - echo "Error: exim start failed" - exit 1 + +#----------------------------------------------------------# +# Configure Exim # +#----------------------------------------------------------# + +if [ "$exim" = 'yes' ]; then + gpasswd -a exim mail + wget $vestacp/exim/exim.conf -O /etc/exim/exim.conf + wget $vestacp/exim/dnsbl.conf -O /etc/exim/dnsbl.conf + wget $vestacp/exim/spam-blocks.conf -O /etc/exim/spam-blocks.conf + touch /etc/exim/white-blocks.conf + + if [ "$spamd" = 'yes' ]; then + sed -i "s/#SPAM/SPAM/g" /etc/exim/exim.conf + fi + if [ "$clamd" = 'yes' ]; then + sed -i "s/#CLAMD/CLAMD/g" /etc/exim/exim.conf + fi + + chmod 640 /etc/exim/exim.conf + rm -rf /etc/exim/domains + mkdir -p /etc/exim/domains + + rm -f /etc/alternatives/mta + ln -s /usr/sbin/sendmail.exim /etc/alternatives/mta + chkconfig sendmail off 2>/dev/null + service sendmail stop 2>/dev/null + chkconfig postfix off 2>/dev/null + service postfix stop 2>/dev/null + + chkconfig exim on + service exim start + check_result $? "exim start failed" fi -# Dovecot configuration -if [ "$release" -eq '5' ]; then - wget $CHOST/$VERSION/dovecot.conf -O /etc/dovecot.conf -else - wget $CHOST/$VERSION/$release/dovecot.tar.gz -O /etc/dovecot.tar.gz + +#----------------------------------------------------------# +# Configure Dovecot # +#----------------------------------------------------------# + +if [ "$dovecot" = 'yes' ]; then + gpasswd -a dovecot mail + wget $vestacp/dovecot.tar.gz -O /etc/dovecot.tar.gz cd /etc - if [ -d /etc/dovecot ]; then - rm -rf /etc/dovecot - fi - if [ -f /etc/dovecot.conf ]; then - rm /etc/dovecot.conf - fi + rm -rf dovecot dovecot.conf tar -xzf dovecot.tar.gz rm -f dovecot.tar.gz - if [ -d /etc/dovecot ]; then - chown -R root:root /etc/dovecot - fi -fi -gpasswd -a dovecot mail -chkconfig dovecot on -service dovecot start -if [ "$?" -ne 0 ]; then - echo "Error: dovecot start failed" - exit 1 + chown -R root:root /etc/dovecot* + chkconfig dovecot on + service dovecot start + check_result $? "dovecot start failed" fi -# ClamAV configuration -if [ "$srv_type" = 'medium' ] || [ "$srv_type" = 'large' ]; then - wget $CHOST/$VERSION/clamd.conf -O /etc/clamd.conf - wget $CHOST/$VERSION/freshclam.conf -O /etc/freshclam.conf + +#----------------------------------------------------------# +# Configure ClamAV # +#----------------------------------------------------------# + +if [ "$clamd" = 'yes' ]; then + useradd clam -s /sbin/nologin -d /var/lib/clamav 2>/dev/null gpasswd -a clam exim gpasswd -a clam mail + wget $vestacp/clamav/clamd.conf -O /etc/clamd.conf + wget $vestacp/clamav/freshclam.conf -O /etc/freshclam.conf + mkdir -p /var/log/clamav + mkdir -p /var/run/clamav + chown clam:clam /var/log/clamav + chown -R clam:clam /var/lib/clamav + if [ "$release" -eq '7' ]; then + wget $vestacp/clamav/clamd.service -O \ + /usr/lib/systemd/system/clamd.service + systemctl --system daemon-reload + fi /usr/bin/freshclam chkconfig clamd on service clamd start - if [ "$?" -ne 0 ]; then - echo "Error: clamd start failed" - exit 1 - fi + #check_result $? "clamd start failed" fi -# SpamAssassin configuration -if [ "$srv_type" = 'medium' ] || [ "$srv_type" = 'large' ]; then + +#----------------------------------------------------------# +# Configure SpamAssassin # +#----------------------------------------------------------# + +if [ "$spamd" = 'yes' ]; then chkconfig spamassassin on service spamassassin start - if [ "$?" -ne 0 ]; then - echo "Error: spamassassin start failed" - exit 1 + check_result $? "spamassassin start failed" +fi + + +#----------------------------------------------------------# +# Configure RoundCube # +#----------------------------------------------------------# + +if [ "$exim" = 'yes' ] && [ "$mysql" = 'yes' ]; then + if [ "$apache" = 'yes' ]; then + wget $vestacp/roundcube/roundcubemail.conf \ + -O /etc/httpd/conf.d/roundcubemail.conf + fi + wget $vestacp/roundcube/main.inc.php -O /etc/roundcubemail/config.inc.php + cd /usr/share/roundcubemail/plugins/password + wget $vestacp/roundcube/vesta.php -O drivers/vesta.php + wget $vestacp/roundcube/config.inc.php -O config.inc.php + chmod a+r /etc/roundcubemail/* + chmod -f 777 /var/log/roundcubemail + r="$(gen_pass)" + mysql -e "CREATE DATABASE roundcube" + mysql -e "GRANT ALL ON roundcube.* TO roundcube@localhost IDENTIFIED BY '$r'" + sed -i "s/%password%/$r/g" /etc/roundcubemail/config.inc.php + if [ -e "/usr/share/roundcubemail/SQL/mysql.initial.sql" ]; then + mysql roundcube < /usr/share/roundcubemail/SQL/mysql.initial.sql + else + mysql roundcube < /usr/share/doc/roundcubemail-*/SQL/mysql.initial.sql fi fi -# Fail2ban configuration -if [ -z "$disable_fail2ban" ]; then + +#----------------------------------------------------------# +# Configure Fail2Ban # +#----------------------------------------------------------# + +if [ "$fail2ban" = 'yes' ]; then cd /etc - wget $CHOST/$VERSION/fail2ban.tar.gz -O fail2ban.tar.gz + wget $vestacp/fail2ban.tar.gz -O fail2ban.tar.gz tar -xzf fail2ban.tar.gz rm -f fail2ban.tar.gz + if [ "$dovecot" = 'no' ]; then + fline=$(cat /etc/fail2ban/jail.local |grep -n dovecot-iptables -A 2) + fline=$(echo "$fline" |tail -n1 |cut -f 1 -d -) + sed -i "${fline}s/true/false/" /etc/fail2ban/jail.local + fi + if [ "$exim" = 'no' ]; then + fline=$(cat /etc/fail2ban/jail.local |grep -n exim-iptables -A 2) + fline=$(echo "$fline" |tail -n1 |cut -f 1 -d -) + sed -i "${fline}s/true/false/" /etc/fail2ban/jail.local + fi chkconfig fail2ban on service fail2ban start -else - sed -i "s/fail2ban//" $VESTA/conf/vestac.conf + check_result $? "fail2ban start failed" fi -# php configuration -sed -i 's/short_open_tag = Off/short_open_tag = On/g' /etc/php.ini -sed -i "s/;date.timezone =/date.timezone = UTC/g" /etc/php.ini -# phpMyAdmin configuration -wget $CHOST/$VERSION/httpd-pma.conf -O /etc/httpd/conf.d/phpMyAdmin.conf -wget $CHOST/$VERSION/pma.conf -O /etc/phpMyAdmin/config.inc.php -sed -i "s/%blowfish_secret%/$(gen_pass)/g" /etc/phpMyAdmin/config.inc.php +#----------------------------------------------------------# +# Configure Admin User # +#----------------------------------------------------------# -# Roundcube configuration -wget $CHOST/$VERSION/httpd-webmail.conf -O /etc/httpd/conf.d/roundcubemail.conf -wget $CHOST/$VERSION/roundcube-main.conf -O /etc/roundcubemail/main.inc.php -wget $CHOST/$VERSION/roundcube-db.conf -O /etc/roundcubemail/db.inc.php -wget $CHOST/$VERSION/roundcube-driver.php -O \ - /usr/share/roundcubemail/plugins/password/drivers/vesta.php -wget $CHOST/$VERSION/roundcube-pw.conf -O \ - /usr/share/roundcubemail/plugins/password/config.inc.php -r="$(gen_pass)" -mysql -e "CREATE DATABASE roundcube" -mysql -e "GRANT ALL ON roundcube.* TO roundcube@localhost IDENTIFIED BY '$r'" -sed -i "s/%password%/$r/g" /etc/roundcubemail/db.inc.php -if [ -e "/usr/share/roundcubemail/SQL/mysql.initial.sql" ]; then - mysql roundcube < /usr/share/roundcubemail/SQL/mysql.initial.sql -else - mysql roundcube < /usr/share/doc/roundcubemail-*/SQL/mysql.initial.sql -fi - -# Adding admin user +# Deleting old admin user if [ ! -z "$(grep ^admin: /etc/passwd)" ] && [ "$force" = 'yes' ]; then chattr -i /home/admin/conf > /dev/null 2>&1 - userdel -f admin - chattr -i /home/admin/conf - mv -f /home/admin $vst_backups/home/ - rm -f /tmp/sess_* + userdel -f admin >/dev/null 2>&1 + chattr -i /home/admin/conf >/dev/null 2>&1 + mv -f /home/admin $vst_backups/home/ >/dev/null 2>&1 + rm -f /tmp/sess_* >/dev/null 2>&1 fi if [ ! -z "$(grep ^admin: /etc/group)" ] && [ "$force" = 'yes' ]; then groupdel admin > /dev/null 2>&1 fi -# Generating admin password if it wasn't set -if [ -z "$vpass" ]; then - vpass=$(gen_pass) -fi - # Adding vesta account $VESTA/bin/v-add-user admin $vpass $email default System Administrator -if [ $? -ne 0 ]; then - echo "Error: can't create admin user" - exit 1 -fi +check_result $? "can't create admin user" $VESTA/bin/v-change-user-shell admin bash -$VESTA/bin/v-change-user-language admin en - -# Configuring mysql host -$VESTA/bin/v-add-database-host mysql localhost root $mpass -$VESTA/bin/v-add-database admin default default $(gen_pass) mysql +$VESTA/bin/v-change-user-language admin $lang # Configuring system ips $VESTA/bin/v-update-sys-ip -# Firewall configuration -wget $CHOST/$VERSION/firewall.tar.gz -O firewall.tar.gz -tar -xzf firewall.tar.gz -rm -f firewall.tar.gz -if [ "$disable_iptables" = 'yes' ]; then - sed -i "s/iptables//" $VESTA/conf/vesta.conf - chkconfig iptables off - service iptables stop -else - /usr/local/vesta/bin/v-update-firewall -fi - # Get main ip -main_ip=$(ifconfig |grep 'inet addr:' |grep -v 127.0.0.1 |head -n1 | \ - cut -f2 -d: | cut -f1 -d ' ') +ip=$(ip addr|grep 'inet '|grep global|head -n1|awk '{print $2}'|cut -f1 -d/) -# Get remote ip -vst_ip=$(wget vestacp.com/what-is-my-ip/ -O - 2>/dev/null) -if [ ! -z "$vst_ip" ] && [ "$vst_ip" != "$main_ip" ]; then - # Set NAT association - $VESTA/bin/v-change-sys-ip-nat $main_ip $vst_ip +# Get public ip +pub_ip=$(wget vestacp.com/what-is-my-ip/ -O - 2>/dev/null) +if [ ! -z "$pub_ip" ] && [ "$pub_ip" != "$ip" ]; then + $VESTA/bin/v-change-sys-ip-nat $ip $pub_ip fi -if [ -z "$vst_ip" ]; then - vst_ip=$main_ip +if [ -z "$pub_ip" ]; then + ip=$main_ip fi -# Add default web domain -$VESTA/bin/v-add-web-domain admin default.domain $vst_ip +# Firewall configuration +if [ "$iptables" = 'yes' ]; then + $VESTA/bin/v-update-firewall +fi -# Add default dns domain -$VESTA/bin/v-add-dns-domain admin default.domain $vst_ip +# Configuring mysql host +if [ "$mysql" = 'yes' ]; then + $VESTA/bin/v-add-database-host mysql localhost root $vpass + $VESTA/bin/v-add-database admin default default $(gen_pass) mysql +fi -# Add default mail domain -$VESTA/bin/v-add-mail-domain admin default.domain +# Configuring pgsql host +if [ "$postgresql" = 'yes' ]; then + $VESTA/bin/v-add-database-host pgsql localhost postgres $vpass + $VESTA/bin/v-add-database admin db db $(gen_pass) pgsql +fi -# Configuring crond +# Adding default domain +$VESTA/bin/v-add-domain admin $servername +check_result $? "can't create $servername domain" + +# Adding cron jobs command='sudo /usr/local/vesta/bin/v-update-sys-queue disk' $VESTA/bin/v-add-cron-job 'admin' '15' '02' '*' '*' '*' "$command" command='sudo /usr/local/vesta/bin/v-update-sys-queue traffic' @@ -894,34 +1228,42 @@ command='sudo /usr/local/vesta/bin/v-update-user-stats' $VESTA/bin/v-add-cron-job 'admin' '20' '00' '*' '*' '*' "$command" command='sudo /usr/local/vesta/bin/v-update-sys-rrd' $VESTA/bin/v-add-cron-job 'admin' '*/5' '*' '*' '*' '*' "$command" +service crond restart -# Build inititall rrd images +# Building inititall rrd images $VESTA/bin/v-update-sys-rrd -# Enable file system quota +# Enabling file system quota if [ "$quota" = 'yes' ]; then $VESTA/bin/v-add-sys-quota fi -# Start system service +# Starting vesta service chkconfig vesta on service vesta start -if [ "$?" -ne 0 ]; then - echo "Error: vesta start failed" - exit 1 +check_result $? "vesta start failed" + + +#----------------------------------------------------------# +# Vesta Access Info # +#----------------------------------------------------------# + +# Sending install notification to vestacp.com +wget vestacp.com/notify/?$codename -O /dev/null -q + +# Comparing hostname and ip +host_ip=$(host $servername| head -n 1 | awk '{print $NF}') +if [ "$host_ip" = "$ip" ]; then + ip="$servername" fi -# Send notification to vestacp.com -wget vestacp.com/notify/?$codename -O /dev/null - -# Send notification to admin email +# Sending notification to admin email echo -e "Congratulations, you have just successfully installed \ -the Vesta Control Panel +Vesta Control Panel -You can login in Vesta with following credentials: + https://$ip:8083 username: admin password: $vpass - https://$vst_ip:8083 We hope that you enjoy your installation of Vesta. Please \ feel free to contact us anytime if you have any questions. @@ -934,12 +1276,10 @@ vestacp.com team send_mail="$VESTA/web/inc/mail-wrapper.php" cat $tmpfile | $send_mail -s "Vesta Control Panel" $email -rm -f $tmpfile # Congrats echo '=======================================================' echo -echo echo ' _| _| _|_|_|_| _|_|_| _|_|_|_|_| _|_| ' echo ' _| _| _| _| _| _| _| ' echo ' _| _| _|_|_| _|_| _| _|_|_|_| ' @@ -947,16 +1287,7 @@ echo ' _| _| _| _| _| _| _| ' echo ' _| _|_|_|_| _|_|_| _| _| _| ' echo echo -echo '-------------------------------' -echo " https://$vst_ip:8083" -echo ' username: admin' -echo " password: $vpass" -echo '-------------------------------' -echo -echo -echo 'Congratulations,' -echo 'you have successfully installed Vesta Control Panel.' -echo -echo +cat $tmpfile +rm -f $tmpfile # EOF diff --git a/install/vst-install-ubuntu.sh b/install/vst-install-ubuntu.sh old mode 100644 new mode 100755 index da443348d..5fb068861 --- a/install/vst-install-ubuntu.sh +++ b/install/vst-install-ubuntu.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Vesta Ubuntu installer v.04 +# Vesta Ubuntu installer v.05 #----------------------------------------------------------# # Variables&Functions # @@ -10,31 +10,57 @@ export DEBIAN_FRONTEND=noninteractive RHOST='apt.vestacp.com' CHOST='c.vestacp.com' VERSION='0.9.8/ubuntu' -software="nginx apache2 apache2-utils apache2-suexec-custom bsdutils e2fsprogs - libapache2-mod-ruid2 libapache2-mod-rpaf libapache2-mod-fcgid bind9 idn - mysql-server mysql-common mysql-client php5-common php5-cgi php5-mysql - php5-curl libapache2-mod-php5 vsftpd mc exim4 exim4-daemon-heavy - clamav-daemon flex dovecot-imapd dovecot-pop3d phpMyAdmin awstats e2fslibs - webalizer jwhois rssh git spamassassin roundcube roundcube-mysql quota - roundcube-plugins apparmor-utils sudo bc ftp lsof ntpdate rrdtool - fail2ban dnsutils vesta vesta-nginx vesta-php" +memory=$(grep 'MemTotal' /proc/meminfo |tr ' ' '\n' |grep [0-9]) +arch=$(uname -i) +os='ubuntu' +release="$(lsb_release -r|awk '{print $2}')" +codename="$(lsb_release -c|awk '{print $2}')" +vestacp="http://$CHOST/$VERSION/$release" +software="nginx apache2 apache2-utils apache2.2-common + apache2-suexec-custom libapache2-mod-ruid2 libapache2-mod-rpaf + libapache2-mod-fcgid libapache2-mod-php5 php5 php5-common php5-cgi + php5-mysql php5-curl php5-fpm php5-pgsql awstats webalizer vsftpd + proftpd-basic bind9 exim4 exim4-daemon-heavy clamav-daemon + spamassassin dovecot-imapd dovecot-pop3d roundcube-core + roundcube-mysql roundcube-plugins mysql-server mysql-common + mysql-client postgresql postgresql-contrib phppgadmin phpMyAdmin mc + flex whois rssh git idn zip sudo bc ftp lsof ntpdate rrdtool quota + e2fslibs bsdutils e2fsprogs curl imagemagick fail2ban dnsutils + bsdmainutils vesta vesta-nginx vesta-php" +# Defining help function help() { - echo "usage: $0 [OPTIONS] - -h, --help Print this help and exit - -f, --force Force installation - -i, --disable-iptables Disable iptables support - -b, --disable-fail2ban Disable fail2ban protection - -n, --noupdate Do not run apt-get upgrade command - -s, --hostname Set server hostname - -e, --email Set email address - -p, --password Set admin password instead of generating it - -m, --mysql-password Set MySQL password instead of generating it - -q, --quota Enable File System Quota" + echo "Usage: $0 [OPTIONS] + -a, --apache Install Apache [yes|no] default: yes + -n, --nginx Install Nginx [yes|no] default: yes + -w, --phpfpm Install PHP-FPM [yes|no] default: no + -v, --vsftpd Install Vsftpd [yes|no] default: yes + -j, --proftpd Install ProFTPD [yes|no] default: no + -k, --named Install Bind [yes|no] default: yes + -m, --mysql Install MySQL [yes|no] default: yes + -g, --postgresql Install PostgreSQL [yes|no] default: no + -d, --mongodb Install MongoDB [yes|no] unsupported + -x, --exim Install Exim [yes|no] default: yes + -z, --dovecot Install Dovecot [yes|no] default: yes + -c, --clamav Install ClamAV [yes|no] default: yes + -t, --spamassassin Install SpamAssassin [yes|no] default: yes + -i, --iptables Install Iptables [yes|no] default: yes + -b, --fail2ban Install Fail2ban [yes|no] default: yes + -q, --quota Filesystem Quota [yes|no] default: no + -l, --lang Default language default: en + -y, --interactive Interactive install [yes|no] default: yes + -s, --hostname Set hostname + -e, --email Set admin email + -p, --password Set admin password + -f, --force Force installation + -h, --help Print this help + + Example: bash $0 -e demo@vestacp.com -p p4ssw0rd --apache no --phpfpm yes" exit 1 } -# Password generator + +# Defining password-gen function gen_pass() { MATRIX='0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz' LENGTH=10 @@ -45,109 +71,159 @@ gen_pass() { echo "$PASS" } +# Defning return code check function +check_result() { + if [ $1 -ne 0 ]; then + echo "Error: $2" + exit $1 + fi +} + +# Defining function to set default value +set_default_value() { + eval variable=\$$1 + if [ -z "$variable" ]; then + eval $1=$2 + fi + if [ "$variable" != 'yes' ] && [ "$variable" != 'no' ]; then + eval $1=$2 + fi +} #----------------------------------------------------------# # Verifications # #----------------------------------------------------------# +# Creating temporary file +tmpfile=$(mktemp -p /tmp) + # Translating argument to --gnu-long-options for arg; do delim="" case "$arg" in - --help) args="${args}-h " ;; - --force) args="${args}-f " ;; - --disable-fail2ban) args="${args}-b " ;; - --disable-iptables) args="${args}-i " ;; - --noupdate) args="${args}-n " ;; + --apache) args="${args}-a " ;; + --nginx) args="${args}-n " ;; + --phpfpm) args="${args}-w " ;; + --vsftpd) args="${args}-v " ;; + --proftpd) args="${args}-j " ;; + --named) args="${args}-k " ;; + --mysql) args="${args}-m " ;; + --postgresql) args="${args}-g " ;; + --mongodb) args="${args}-d " ;; + --exim) args="${args}-x " ;; + --dovecot) args="${args}-z " ;; + --clamav) args="${args}-c " ;; + --spamassassin) args="${args}-t " ;; + --iptables) args="${args}-i " ;; + --fail2ban) args="${args}-b " ;; + --quota) args="${args}-q " ;; + --lang) args="${args}-l " ;; + --interactive) args="${args}-y " ;; --hostname) args="${args}-s " ;; --email) args="${args}-e " ;; --password) args="${args}-p " ;; - --mysql-password) args="${args}-m " ;; - --quota) args="${args}-q " ;; - *) [[ "${arg:0:1}" == "-" ]] || delim="\"" - args="${args}${delim}${arg}${delim} ";; + --force) args="${args}-f " ;; + --help) args="${args}-h " ;; + *) [[ "${arg:0:1}" == "-" ]] || delim="\"" + args="${args}${delim}${arg}${delim} ";; esac done eval set -- "$args" -# Getopt -while getopts "hfibdnqe:m:p:s:" Option; do +# Parsing arguments +while getopts "a:n:w:v:j:k:m:g:d:x:z:c:t:i:b:r:q:l:y:s:e:p:fh" Option; do case $Option in - h) help ;; # Help - f) force='yes' ;; # Force install - i) disable_iptables='yes' ;; # Disable iptables - b) disable_fail2ban='yes' ;; # Disable fail2ban - n) noupdate='yes' ;; # Disable apt-get upgrade - s) servername=$OPTARG ;; # Server hostname - e) email=$OPTARG ;; # Set email - p) vpass=$OPTARG ;; # Admin password - m) mpass=$OPTARG ;; # MySQL pasword - q) quota='yes' ;; # Enable quota - *) help ;; # Default + a) apache=$OPTARG ;; # Apache + n) nginx=$OPTARG ;; # Nginx + w) phpfpm=$OPTARG ;; # PHP-FPM + v) vsftpd=$OPTARG ;; # Vsftpd + j) proftpd=$OPTARG ;; # Proftpd + k) named=$OPTARG ;; # Named + m) mysql=$OPTARG ;; # MySQL + g) postgresql=$OPTARG ;; # PostgreSQL + d) mongodb=$OPTARG ;; # MongoDB (unsupported) + x) exim=$OPTARG ;; # Exim + z) dovecot=$OPTARG ;; # Dovecot + c) clamd=$OPTARG ;; # ClamAV + t) spamd=$OPTARG ;; # SpamAssassin + i) iptables=$OPTARG ;; # Iptables + b) fail2ban=$OPTARG ;; # Fail2ban + q) quota=$OPTARG ;; # FS Quota + l) lang=$OPTARG ;; # Language + y) interactive=$OPTARG ;; # Interactive install + s) servername=$OPTARG ;; # Hostname + e) email=$OPTARG ;; # Admin email + p) vpass=$OPTARG ;; # Admin password + f) force='yes' ;; # Force install + h) help ;; # Help + *) help ;; # Print help (default) esac done -# Am I root? -if [ "x$(id -u)" != 'x0' ]; then - echo 'Error: this script can only be executed by root' - exit 1 -fi - -# Check supported version -if [ -e '/etc/redhat-release' ]; then - echo 'Error: sorry, this installer works only on Ubuntu' - exit 1 -fi - -# Check supported OS -if [ "$(arch)" != 'x86_64' ]; then - arch='i386' +# Defining default software stack +set_default_value 'nginx' 'yes' +set_default_value 'apache' 'yes' +set_default_value 'phpfpm' 'no' +set_default_value 'vsftpd' 'yes' +set_default_value 'proftpd' 'no' +set_default_value 'named' 'yes' +set_default_value 'mysql' 'yes' +set_default_value 'postgresql' 'no' +set_default_value 'mongodb' 'no' +set_default_value 'exim' 'yes' +set_default_value 'dovecot' 'yes' +if [ $memory -lt 1500000 ]; then + set_default_value 'clamd' 'no' + set_default_value 'spamd' 'no' else - arch="amd64" + set_default_value 'clamd' 'yes' + set_default_value 'spamd' 'yes' fi -os=$(head -n 1 /etc/issue | cut -f 1 -d ' ') -release=$(head -n 1 /etc/issue | cut -f 2 -d ' ' ) -codename=$(lsb_release -cs | egrep "precise|quantal|raring|saucy|trusty") -if [ -z "$codename" ]; then - echo "Error: Ubuntu $(lsb_release -r|awk '{print $2}') is not supported" - exit 1 +set_default_value 'iptables' 'yes' +set_default_value 'fail2ban' 'yes' +set_default_value 'quota' 'no' +set_default_value 'lang' 'en' +set_default_value 'interactive' 'yes' + +# Checking software conflicts +if [ "$phpfpm" = 'yes' ]; then + apache='no' + nginx='yes' +fi +if [ "$proftpd" = 'yes' ]; then + vsftpd='no' +fi +if [ "$exim" = 'no' ]; then + clamd='no' + spamd='no' + dovecot='no' +fi +if [ "$iptables" = 'no' ]; then + fail2ban='no' fi -# Check admin user account -if [ ! -z "$(grep ^admin: /etc/passwd)" ] && [ "$force" != 'yes' ]; then - echo "Error: user admin exists" - echo +# Checking root permissions +if [ "x$(id -u)" != 'x0' ]; then + check_error 1 "Script can be run executed only by root" +fi + +# Checking admin user account +if [ ! -z "$(grep ^admin: /etc/passwd /etc/group)" ] && [ -z "$force" ]; then echo 'Please remove admin user account before proceeding.' echo 'If you want to do it automatically run installer with -f option:' - echo "Example: bash $0 --force" - exit 1 + echo -e "Example: bash $0 --force\n" + check_result 1 "User admin exists" fi -# Check admin group -if [ ! -z "$(grep ^admin: /etc/group)" ] && [ "$force" != 'yes' ]; then - echo "Error: group admin exists" - echo - echo 'Please remove admin group before proceeding.' - echo 'If you want to do it automatically run installer with -f option:' - echo "Example: bash $0 --force" - exit 1 -fi - -# Check wget +# Checking wget if [ ! -e '/usr/bin/wget' ]; then apt-get -y install wget - if [ $? -ne 0 ]; then - echo "Error: can't install wget" - exit 1 - fi + check_result $? "Can't install wget" fi -# Check repo availability -wget -q "$CHOST/$VERSION/vesta.conf" -O /dev/null -if [ $? -ne 0 ]; then - echo "Error: no access to repository" - exit 1 -fi +# Checking repository availability +wget -q "$vestacp/deb_signing.key" -O /dev/null +check_result $? "No access to Vesta repository" # Check installed packages tmpfile=$(mktemp -p /tmp) @@ -170,206 +246,306 @@ if [ ! -z "$conflicts" ] && [ -z "$force" ]; then echo echo '!!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!' echo - exit 1 + check_result 1 "Control Panel should be installed on clean server." fi -# Check server type -memory=$(grep 'MemTotal' /proc/meminfo |tr ' ' '\n' |grep [0-9]) -if [ "$memory" -lt '350000' ] && [ -z "$force" ]; then - echo "Error: not enough memory to install Vesta Control Panel." - echo -e "\nMinimum RAM required: 350Mb" - echo 'If you want to force installation run this script with -f option:' - echo "Example: bash $0 --force" - exit 1 -fi -srv_type='micro' -if [ "$memory" -gt '1000000' ]; then - srv_type='small' +#----------------------------------------------------------# +# Brief Info # +#----------------------------------------------------------# + +# Printing nice ascii aslogo +clear +echo +echo ' _| _| _|_|_|_| _|_|_| _|_|_|_|_| _|_|' +echo ' _| _| _| _| _| _| _|' +echo ' _| _| _|_|_| _|_| _| _|_|_|_|' +echo ' _| _| _| _| _| _| _|' +echo ' _| _|_|_|_| _|_|_| _| _| _|' +echo +echo ' Vesta Control Panel' +echo -e "\n\n" + +echo 'Following software will be installed on your system:' + +# Web stack +if [ "$nginx" = 'yes' ]; then + echo ' - Nginx Web Server' +fi +if [ "$apache" = 'yes' ] && [ "$nginx" = 'no' ] ; then + echo ' - Apache Web Server' +fi +if [ "$apache" = 'yes' ] && [ "$nginx" = 'yes' ] ; then + echo ' - Apache Web Server (as backend)' +fi +if [ "$phpfpm" = 'yes' ]; then + echo ' - PHP-FPM Application Server' fi -if [ "$memory" -gt '3000000' ]; then - srv_type='medium' +# DNS stack +if [ "$named" = 'yes' ]; then + echo ' - Bind DNS Server' fi -if [ "$memory" -gt '7000000' ]; then - srv_type='large' -fi - -# Are you sure ? -if [ -z $email ]; then - clear - echo - echo ' _| _| _|_|_|_| _|_|_| _|_|_|_|_| _|_| ' - echo ' _| _| _| _| _| _| _| ' - echo ' _| _| _|_|_| _|_| _| _|_|_|_| ' - echo ' _| _| _| _| _| _| _| ' - echo ' _| _|_|_|_| _|_|_| _| _| _| ' - echo - echo ' Vesta Control Panel' - echo - echo - echo 'Following software will be installed on your system:' - echo ' - Nginx frontend web server' - echo ' - Apache application web server' - echo ' - Bind DNS server' - echo ' - Exim mail server' - echo ' - Dovecot IMAP and POP3 server' - if [ "$srv_type" = 'medium' ] || [ "$srv_type" = 'large' ]; then - echo ' - Clam mail antivirus' - echo ' - SpamAssassin antispam' +# Mail Stack +if [ "$exim" = 'yes' ]; then + echo -n ' - Exim mail server' + if [ "$clamd" = 'yes' ] || [ "$spamd" = 'yes' ] ; then + echo -n ' + ' + if [ "$clamd" = 'yes' ]; then + echo -n 'Antivirus ' + fi + if [ "$spamd" = 'yes' ]; then + echo -n 'Antispam' + fi fi - echo ' - MySQL database server' - echo ' - Vsftpd FTP server' - echo - echo + echo + if [ "$dovecot" = 'yes' ]; then + echo ' - Dovecot POP3/IMAP Server' + fi +fi - read -p 'Do you want to proceed? [y/n]): ' answer +# DB stack +if [ "$mysql" = 'yes' ]; then + echo ' - MySQL Database Server' +fi +if [ "$postgresql" = 'yes' ]; then + echo ' - PostgreSQL Database Server' +fi +if [ "$mongodb" = 'yes' ]; then + echo ' - MongoDB Database Server' +fi + +# FTP stack +if [ "$vsftpd" = 'yes' ]; then + echo ' - Vsftpd FTP Server' +fi +if [ "$proftpd" = 'yes' ]; then + echo ' - ProFTPD FTP Server' +fi + +# Firewall stack +if [ "$iptables" = 'yes' ]; then + echo -n ' - Iptables Firewall' +fi +if [ "$iptables" = 'yes' ] && [ "$fail2ban" = 'yes' ]; then + echo -n ' + Fail2Ban' +fi +echo -e "\n\n" + +# Asking for confirmation to proceed +if [ "$interactive" = 'yes' ]; then + read -p 'Would you like to continue [y/n]: ' answer if [ "$answer" != 'y' ] && [ "$answer" != 'Y' ]; then echo 'Goodbye' exit 1 fi - # Check email - read -p 'Please enter valid email address: ' email + # Asking for contact email + if [ -z "$email" ]; then + read -p 'Please enter admin email address: ' email + fi - # Define server hostname + # Asking to set FQDN hostname if [ -z "$servername" ]; then - read -p "Please enter hostname [$(hostname)]: " servername + read -p "Please enter FQDN hostname [$(hostname -f)]: " servername fi fi -# Validate email -local_part=$(echo $email | cut -s -f1 -d\@) -remote_host=$(echo $email | cut -s -f2 -d\@) -mx_failed=1 -if [ ! -z "$remote_host" ] && [ ! -z "$local_part" ]; then - /usr/bin/host -t mx "$remote_host" > /dev/null 2>&1 - mx_failed="$?" +# Generating admin password if it wasn't set +if [ -z "$vpass" ]; then + vpass=$(gen_pass) fi -if [ "$mx_failed" -eq 1 ]; then - echo "Error: email $email is not valid" - exit 1 +# Set hostname if it wasn't set +if [ -z "$servername" ]; then + servername=$(hostname -f) +fi + +# Set email if it wasn't set +if [ -z "$email" ]; then + email="admin@$servername" +fi + +# Defining backup directory +vst_backups="/root/vst_install_backups/$(date +%s)" +echo "Installation backup directory: $vst_backups" + +# Printing start message and sleeping for 5 seconds +echo -e "\n\n\n\nInstallation will take about 15 minutes ...\n" +sleep 5 + + +#----------------------------------------------------------# +# Checking swap # +#----------------------------------------------------------# + +# Checking swap on small instances +if [ -z "$(swapon -s)" ] && [ $memory -lt 1000000 ]; then + fallocate -l 1G /swapfile + chmod 600 /swapfile + mkswap /swapfile + swapon /swapfile + echo "/swapfile none swap sw 0 0" >> /etc/fstab fi #----------------------------------------------------------# # Install repository # #----------------------------------------------------------# -# Let's start -echo -e "\n\n\n\nInstallation will take about 15 minutes ...\n" -sleep 5 -# Update system -if [ -z "$noupdate" ]; then - apt-get -y upgrade - if [ $? -ne 0 ]; then - echo 'Error: apt-get upgrade failed' - exit 1 - fi -fi +# Updating system +apt-get -y upgrade +check_result $? 'apt-get upgrade failed' -# Install nginx repo +# Installing nginx repo apt=/etc/apt/sources.list.d -echo "deb http://nginx.org/packages/ubuntu/ $codename nginx" > $apt/nginx.list +echo "deb http://nginx.org/packages/debian/ $codename nginx" > $apt/nginx.list wget http://nginx.org/keys/nginx_signing.key -O /tmp/nginx_signing.key apt-key add /tmp/nginx_signing.key -# Install vesta repo +# Installing vesta repo echo "deb http://$RHOST/$codename/ $codename vesta" > $apt/vesta.list wget $CHOST/deb_signing.key -O deb_signing.key apt-key add deb_signing.key #----------------------------------------------------------# -# Backups # +# Backup # #----------------------------------------------------------# -# Prepare backup tree -vst_backups="/root/vst_install_backups/$(date +%s)" -mkdir -p $vst_backups/nginx -mkdir -p $vst_backups/apache2 -mkdir -p $vst_backups/mysql -mkdir -p $vst_backups/exim4 -mkdir -p $vst_backups/dovecot -mkdir -p $vst_backups/clamav -mkdir -p $vst_backups/spamassassin -mkdir -p $vst_backups/vsftpd -mkdir -p $vst_backups/bind -mkdir -p $vst_backups/vesta -mkdir -p $vst_backups/home +# Creating backup directory tree +mkdir -p $vst_backups +cd $vst_backups +mkdir nginx apache2 php5 php5-fpm vsftpd proftpd bind exim4 dovecot clamd +mkdir spamassassin mysql postgresql mongodb vesta -# Backup nginx +# Backing up Nginx configuration service nginx stop > /dev/null 2>&1 -if [ -e '/etc/nginx/nginx.conf' ]; then - cp -r /etc/nginx/* $vst_backups/nginx/ -fi +cp -r /etc/nginx/* $vst_backups/nginx >/dev/null 2>&1 -# Backup apache2 +# Backing up Apache configuration service apache2 stop > /dev/null 2>&1 -if [ -e '/etc/apache2/apache2.conf' ]; then - cp -r /etc/apache2/* $vst_backups/apache2/ -fi +cp -r /etc/apache2/* $vst_backups/apache2 > /dev/null 2>&1 +rm -f /etc/apache2/conf.d/* > /dev/null 2>&1 -# Backup bind9 +# Backing up PHP configuration +cp /etc/php.ini $vst_backups/php > /dev/null 2>&1 +cp -r /etc/php.d $vst_backups/php > /dev/null 2>&1 + +# Backing up PHP configuration +service php5-fpm stop >/dev/null 2>&1 +cp /etc/php5/* $vst_backups/php5 > /dev/null 2>&1 +rm -f /etc/php5/fpm/pool.d/* >/dev/null 2>&1 + +# Backing up Bind configuration service bind9 stop > /dev/null 2>&1 -if [ -e '/etc/bind/named.conf' ]; then - cp -r /etc/bind/* $vst_backups/bind/ -fi +cp -r /etc/bind/* $vst_backups/bind > /dev/null 2>&1 -# Backup vsftpd +# Backing up Vsftpd configuration service vsftpd stop > /dev/null 2>&1 -if [ -e '/etc/vsftpd.conf' ]; then - cp /etc/vsftpd.conf $vst_backups/vsftpd/ -fi +cp /etc/vsftpd.conf $vst_backups/vsftpd > /dev/null 2>&1 -# Backup exim4 +# Backing up ProFTPD configuration +service proftpd stop > /dev/null 2>&1 +cp /etc/proftpd.conf $vst_backups/proftpd >/dev/null 2>&1 + +# Backing up Exim configuration service exim4 stop > /dev/null 2>&1 -if [ -e '/etc/exim4/exim4.conf.template' ]; then - cp -r /etc/exim4/* $vst_backups/exim4/ -fi +cp -r /etc/exim4/* $vst_backups/exim4 > /dev/null 2>&1 -# Backup clamav +# Backing up ClamAV configuration service clamav-daemon stop > /dev/null 2>&1 -if [ -e '/etc/clamav/clamd.conf' ]; then - cp -r /etc/clamav/* $vst_backups/clamav/ -fi +cp -r /etc/clamav/* $vst_backups/clamav > /dev/null 2>&1 -# Backup SpamAssassin +# Backing up SpamAssassin configuration service spamassassin stop > /dev/null 2>&1 -if [ -e '/etc/spamassassin/local.cf' ]; then - cp -r /etc/spamassassin/* $vst_backups/spamassassin/ -fi +cp -r /etc/spamassassin/* $vst_backups/spamassassin > /dev/null 2>&1 -# Backup dovecot +# Backing up Dovecot configuration service dovecot stop > /dev/null 2>&1 -if [ -e '/etc/dovecot.conf' ]; then - cp /etc/dovecot.conf $vst_backups/dovecot/ -fi -if [ -e '/etc/dovecot' ]; then - cp -r /etc/dovecot/* $vst_backups/dovecot/ -fi +cp /etc/dovecot.conf $vst_backups/dovecot > /dev/null 2>&1 +cp -r /etc/dovecot/* $vst_backups/dovecot > /dev/null 2>&1 -# Backup MySQL stuff +# Backing up MySQL/MariaDB configuration and data service mysql stop > /dev/null 2>&1 -if [ -e '/var/lib/mysql' ]; then - mv /var/lib/mysql $vst_backups/mysql/mysql_datadir -fi -if [ -e '/etc/mysql/my.cnf' ]; then - cp -r /etc/mysql/* $vst_backups/mysql/ -fi -if [ -e '/root/.my.cnf' ]; then - mv /root/.my.cnf $vst_backups/mysql/ -fi +killall -9 mysqld > /dev/null 2>&1 +mv /var/lib/mysql $vst_backups/mysql/mysql_datadir > /dev/null 2>&1 +cp -r /etc/mysql/* $vst_backups/mysql > /dev/null 2>&1 +mv -f /root/.my.cnf $vst_backups/mysql > /dev/null 2>&1 # Backup vesta service vesta stop > /dev/null 2>&1 -if [ -e '/usr/local/vesta' ]; then - cp -r /usr/local/vesta/* $vst_backups/vesta/ - apt-get -y remove vesta* - apt-get -y purge vesta* - rm -rf /usr/local/vesta +cp -r /usr/local/vesta/* $vst_backups/vesta > /dev/null 2>&1 +apt-get -y remove vesta vesta-nginx vesta-php > /dev/null 2>&1 +apt-get -y purge vesta vesta-nginx vesta-php > /dev/null 2>&1 +rm -rf /usr/local/vesta > /dev/null 2>&1 + + +#----------------------------------------------------------# +# Package Exludes # +#----------------------------------------------------------# + +# Excluding packages +if [ "$nginx" = 'no' ]; then + software=$(echo "$software" | sed -e "s/^nginx//") +fi +if [ "$apache" = 'no' ]; then + software=$(echo "$software" | sed -e "s/apache2 //") + software=$(echo "$software" | sed -e "s/apache2-utils//") + software=$(echo "$software" | sed -e "s/apache2-suexec-custom//") + software=$(echo "$software" | sed -e "s/apache2.2-common//") + software=$(echo "$software" | sed -e "s/libapache2-mod-ruid2//") + software=$(echo "$software" | sed -e "s/libapache2-mod-rpaf//") + software=$(echo "$software" | sed -e "s/libapache2-mod-fcgid//") + software=$(echo "$software" | sed -e "s/libapache2-mod-php5//") +fi +if [ "$phpfpm" = 'no' ]; then + software=$(echo "$software" | sed -e "s/php5-fpm//") +fi +if [ "$vsftpd" = 'no' ]; then + software=$(echo "$software" | sed -e "s/vsftpd//") +fi +if [ "$proftpd" = 'no' ]; then + software=$(echo "$software" | sed -e "s/proftpd-basic//") + software=$(echo "$software" | sed -e "s/proftpd-mod-vroot//") +fi +if [ "$named" = 'no' ]; then + software=$(echo "$software" | sed -e "s/bind9//") +fi +if [ "$exim" = 'no' ]; then + software=$(echo "$software" | sed -e "s/exim4 //") + software=$(echo "$software" | sed -e "s/exim4-daemon-heavy//") + software=$(echo "$software" | sed -e "s/dovecot-imapd//") + software=$(echo "$software" | sed -e "s/dovecot-pop3d//") + software=$(echo "$software" | sed -e "s/clamav-daemon//") + software=$(echo "$software" | sed -e "s/spamassassin//") +fi +if [ "$clamd" = 'no' ]; then + software=$(echo "$software" | sed -e "s/clamav-daemon//") +fi +if [ "$spamd" = 'no' ]; then + software=$(echo "$software" | sed -e "s/spamassassin//") +fi +if [ "$dovecot" = 'no' ]; then + software=$(echo "$software" | sed -e "s/dovecot-imapd//") + software=$(echo "$software" | sed -e "s/dovecot-pop3d//") +fi +if [ "$mysql" = 'no' ]; then + software=$(echo "$software" | sed -e 's/mysql-server//') + software=$(echo "$software" | sed -e 's/mysql-client//') + software=$(echo "$software" | sed -e 's/mysql-common//') + software=$(echo "$software" | sed -e 's/php5-mysql//') + software=$(echo "$software" | sed -e 's/phpMyAdmin//') +fi +if [ "$postgresql" = 'no' ]; then + software=$(echo "$software" | sed -e 's/postgresql-contrib//') + software=$(echo "$software" | sed -e 's/postgresql//') + software=$(echo "$software" | sed -e 's/php5-pgsql//') + software=$(echo "$software" | sed -e 's/phppgadmin//') +fi +if [ "$iptables" = 'no' ] || [ "$fail2ban" = 'no' ]; then + software=$(echo "$software" | sed -e 's/fail2ban//') fi @@ -377,37 +553,16 @@ fi # Install packages # #----------------------------------------------------------# -# Exclude heavy packages -if [ "$srv_type" = 'micro' ]; then - software=$(echo "$software" | sed -e 's/libapache2-mod-fcgid//') - software=$(echo "$software" | sed -e 's/clamav-daemon//') - software=$(echo "$software" | sed -e 's/spamassassin//') -fi - -if [ "$srv_type" = 'small' ]; then - software=$(echo "$software" | sed -e 's/clamav-daemon//') - software=$(echo "$software" | sed -e 's/spamassassin//') -fi - -# Exclude fail2ban -if [ "$disable_fail2ban" = 'yes' ]; then - software=$(echo "$software" | sed -e 's/fail2ban//') -fi - # Update system packages apt-get update -# Disable daemon autostart -# For more details /usr/share/doc/sysv-rc/README.policy-rc.d.gz +# Disable daemon autostart /usr/share/doc/sysv-rc/README.policy-rc.d.gz echo -e '#!/bin/sh \nexit 101' > /usr/sbin/policy-rc.d chmod a+x /usr/sbin/policy-rc.d -# Install Vesta packages +# Install apt packages apt-get -y install $software -if [ $? -ne 0 ]; then - echo 'Error: apt-get install failed' - exit 1 -fi +check_result $? "apt-get install failed" # Restore policy rm -f /usr/sbin/policy-rc.d @@ -417,108 +572,12 @@ rm -f /usr/sbin/policy-rc.d # Configure system # #----------------------------------------------------------# -# Set writable permission on tmp directory -chmod 777 /tmp - -# Vesta configuration -echo "export VESTA='/usr/local/vesta'" > /etc/profile.d/vesta.sh -chmod 755 /etc/profile.d/vesta.sh -source /etc/profile.d/vesta.sh -echo 'PATH=$PATH:/usr/local/vesta/bin' >> /root/.bash_profile -echo 'export PATH' >> /root/.bash_profile -source /root/.bash_profile -wget $CHOST/$VERSION/vesta.log -O /etc/logrotate.d/vesta - -# Directory tree -mkdir -p $VESTA/conf -mkdir -p $VESTA/log -mkdir -p $VESTA/ssl -mkdir -p $VESTA/data -mkdir -p $VESTA/data/ips -mkdir -p $VESTA/data/queue -mkdir -p $VESTA/data/users -mkdir -p $VESTA/data/firewall -touch $VESTA/data/queue/backup.pipe -touch $VESTA/data/queue/disk.pipe -touch $VESTA/data/queue/webstats.pipe -touch $VESTA/data/queue/restart.pipe -touch $VESTA/data/queue/traffic.pipe -chmod 750 $VESTA/conf -chmod 750 $VESTA/data/users -chmod 750 $VESTA/data/ips -chmod -R 750 $VESTA/data/queue -ln -s /usr/local/vesta/log /var/log/vesta -touch /var/log/vesta/system.log -touch /var/log/vesta/nginx-error.log -touch /var/log/vesta/auth.log -chmod 660 /var/log/vesta/* -adduser backup > /dev/null 2>&1 -mkdir -p /home/backup -chown backup:backup /home/backup -ln -s /home/backup /backup -chmod a+x /backup - -# vesta.conf -wget $CHOST/$VERSION/vesta.conf -O $VESTA/conf/vesta.conf -if [ "$srv_type" = 'micro' ] || [ "$srv_type" = 'small' ]; then - sed -i "s/clamav-daemon//g" $VESTA/conf/vesta.conf - sed -i "s/spamassassin//g" $VESTA/conf/vesta.conf -fi - -# Set server hostname -if [ -z "$servername" ]; then - servername=$(hostname) -fi -/usr/local/vesta/bin/v-change-sys-hostname $servername 2>/dev/null - -# Templates, packages -cd /usr/local/vesta/data -wget $CHOST/$VERSION/packages.tar.gz -O packages.tar.gz -tar -xzf packages.tar.gz -rm -f packages.tar.gz -cd /usr/local/vesta/data -wget $CHOST/$VERSION/templates.tar.gz -O templates.tar.gz -tar -xzf templates.tar.gz -rm -f templates.tar.gz -if [ "$codename" = 'saucy' ] || [ "$codename" = 'trusty' ]; then - sed -i "s/Include /IncludeOptional /g" \ - $VESTA/data/templates/web/apache2/*tpl -fi -chmod -R 755 /usr/local/vesta/data/templates -cp templates/web/skel/public_html/index.html /var/www/ -sed -i 's/%domain%/It worked!/g' /var/www/index.html -if [ "$srv_type" = 'micro' ]; then - rm -f /usr/local/vesta/data/templates/web/apache2/phpfcgid.* -fi - -# Removing CGI templates -if [ "$codename" = 'trusty' ]; then - rm -f /usr/local/vesta/data/templates/web/apache2/phpcgi.* -fi - -# Generating SSL certificate -$VESTA/bin/v-generate-ssl-cert $(hostname) $email 'US' 'California' \ - 'San Francisco' 'Vesta Control Panel' 'IT' > /tmp/vst.pem - -# Parsing merged certificate file -crt_end=$(grep -n "END CERTIFICATE-" /tmp/vst.pem |cut -f 1 -d:) -key_start=$(grep -n "BEGIN RSA" /tmp/vst.pem |cut -f 1 -d:) -key_end=$(grep -n "END RSA" /tmp/vst.pem |cut -f 1 -d:) - -# Adding SSL certificate -cd /usr/local/vesta/ssl -sed -n "1,${crt_end}p" /tmp/vst.pem > certificate.crt -sed -n "$key_start,${key_end}p" /tmp/vst.pem > certificate.key -chown root:mail /usr/local/vesta/ssl/* -chmod 660 /usr/local/vesta/ssl/* -rm /tmp/vst.pem - # Enable SSH password auth sed -i "s/rdAuthentication no/rdAuthentication yes/g" /etc/ssh/sshd_config service ssh restart # AppArmor -aa-complain /usr/sbin/named +#aa-complain /usr/sbin/named # Disable awstats cron rm -f /etc/cron.d/awstats @@ -529,13 +588,6 @@ echo 'LS_COLORS="$LS_COLORS:di=00;33"' >> /etc/profile # Register /sbin/nologin echo "/sbin/nologin" >> /etc/shells -# Sudo configuration -wget $CHOST/$VERSION/sudoers.vestacp.conf -O /etc/sudoers.d/vestacp -wget $CHOST/$VERSION/sudoers.admin.conf -O /etc/sudoers.d/admin -chmod 440 /etc/sudoers.d/vestacp -chmod 440 /etc/sudoers.d/admin -echo 'Defaults:admin !syslog' >>/etc/sudoers.d/admin - # NTP Synchronization echo '#!/bin/sh' > /etc/cron.daily/ntpdate echo "$(which ntpdate) -s pool.ntp.org" >> /etc/cron.daily/ntpdate @@ -551,295 +603,536 @@ sed -i 's/#allowsftp/allowsftp/' /etc/rssh.conf sed -i 's/#allowrsync/allowrsync/' /etc/rssh.conf chmod 755 /usr/bin/rssh -# Nginx configuration -rm -f /etc/nginx/conf.d/*.conf -wget $CHOST/$VERSION/nginx.conf -O /etc/nginx/nginx.conf -wget $CHOST/$VERSION/nginx-status.conf -O /etc/nginx/conf.d/status.conf -touch /etc/nginx/conf.d/vesta.conf -update-rc.d nginx defaults -service nginx stop > /dev/null 2>&1 -service nginx start -if [ "$?" -ne 0 ]; then - echo "Error: nginx start failed" - exit 1 + +#----------------------------------------------------------# +# Configure VESTA # +#----------------------------------------------------------# + +# AppArmor +aa-complain /usr/sbin/named 2>/dev/null + +# Downlading sudo configuration +mkdir -p /etc/sudoers.d +wget $vestacp/sudo/admin -O /etc/sudoers.d/admin +chmod 440 /etc/sudoers.d/admin + +# Configuring system env +echo "export VESTA='/usr/local/vesta'" > /etc/profile.d/vesta.sh +chmod 755 /etc/profile.d/vesta.sh +source /etc/profile.d/vesta.sh +echo 'PATH=$PATH:/usr/local/vesta/bin' >> /root/.bash_profile +echo 'export PATH' >> /root/.bash_profile +source /root/.bash_profile + +# Configuring logrotate for vesta logs +wget $vestacp/logrotate/vesta -O /etc/logrotate.d/vesta + +# Buidling directory tree and creating some blank files for vesta +mkdir -p $VESTA/conf $VESTA/log $VESTA/ssl $VESTA/data/ips \ + $VESTA/data/queue $VESTA/data/users $VESTA/data/firewall +touch $VESTA/data/queue/backup.pipe $VESTA/data/queue/disk.pipe \ + $VESTA/data/queue/webstats.pipe $VESTA/data/queue/restart.pipe \ + $VESTA/data/queue/traffic.pipe $VESTA/log/system.log \ + $VESTA/log/nginx-error.log $VESTA/log/auth.log +chmod 750 $VESTA/conf $VESTA/data/users $VESTA/data/ips $VESTA/log +chmod -R 750 $VESTA/data/queue +chmod 660 /var/log/vesta/* +rm -f /var/log/vesta +ln -s /usr/local/vesta/log /var/log/vesta + +# Generating vesta configuration +rm -f $VESTA/conf/vesta.conf 2>/dev/null +touch $VESTA/conf/vesta.conf +chmod 660 $VESTA/conf/vesta.conf + +# WEB stack +if [ "$apache" = 'yes' ] && [ "$nginx" = 'no' ] ; then + echo "WEB_SYSTEM='apache2'" >> $VESTA/conf/vesta.conf + echo "WEB_RGROUPS='www-data'" >> $VESTA/conf/vesta.conf + echo "WEB_PORT='80'" >> $VESTA/conf/vesta.conf + echo "WEB_SSL_PORT='443'" >> $VESTA/conf/vesta.conf + echo "WEB_SSL='mod_ssl'" >> $VESTA/conf/vesta.conf + echo "STATS_SYSTEM='webalizer,awstats'" >> $VESTA/conf/vesta.conf +fi +if [ "$apache" = 'yes' ] && [ "$nginx" = 'yes' ] ; then + echo "WEB_SYSTEM='apache2'" >> $VESTA/conf/vesta.conf + echo "WEB_RGROUPS='www-data'" >> $VESTA/conf/vesta.conf + echo "WEB_PORT='8080'" >> $VESTA/conf/vesta.conf + echo "WEB_SSL_PORT='8443'" >> $VESTA/conf/vesta.conf + echo "WEB_SSL='mod_ssl'" >> $VESTA/conf/vesta.conf + echo "PROXY_SYSTEM='nginx'" >> $VESTA/conf/vesta.conf + echo "PROXY_PORT='80'" >> $VESTA/conf/vesta.conf + echo "PROXY_SSL_PORT='443'" >> $VESTA/conf/vesta.conf + echo "STATS_SYSTEM='webalizer,awstats'" >> $VESTA/conf/vesta.conf +fi +if [ "$apache" = 'no' ] && [ "$nginx" = 'yes' ]; then + echo "WEB_SYSTEM='nginx'" >> $VESTA/conf/vesta.conf + echo "WEB_PORT='80'" >> $VESTA/conf/vesta.conf + echo "WEB_SSL_PORT='443'" >> $VESTA/conf/vesta.conf + echo "WEB_SSL='openssl'" >> $VESTA/conf/vesta.conf + if [ "$phpfpm" = 'yes' ]; then + echo "WEB_BACKEND='php5-fpm'" >> $VESTA/conf/vesta.conf + fi + echo "STATS_SYSTEM='webalizer,awstats'" >> $VESTA/conf/vesta.conf fi -# Apache configuration -wget $CHOST/$VERSION/apache2.conf -O /etc/apache2/apache2.conf -if [ "$codename" = 'saucy' ] || [ "$codename" = 'trusty' ]; then - sed -i "/^LockFile /d" /etc/apache2/apache2.conf +# FTP stack +if [ "$vsftpd" = 'yes' ]; then + echo "FTP_SYSTEM='vsftpd'" >> $VESTA/conf/vesta.conf fi -wget $CHOST/$VERSION/apache2-status.conf \ - -O /etc/apache2/mods-enabled/status.conf -wget $CHOST/$VERSION/apache2.log -O /etc/logrotate.d/apache2 -echo "# Powered by vesta" > /etc/apache2/sites-available/default -echo "# Powered by vesta" > /etc/apache2/sites-available/default-ssl -echo "# Powered by vesta" > /etc/apache2/ports.conf -mkdir -p /etc/apache2/conf.d -rm -f /etc/apache2/conf.d/vesta.conf -echo > /etc/apache2/conf.d/vesta.conf -touch /var/log/apache2/access.log -touch /var/log/apache2/error.log -mkdir -p /var/log/apache2/domains -chmod a+x /var/log/apache2 -chmod 640 /var/log/apache2/access.log -chmod 640 /var/log/apache2/error.log -chmod 751 /var/log/apache2/domains -a2enmod rewrite -a2enmod ssl -a2enmod suexec -echo -e "/home\npublic_html/cgi-bin" > /etc/apache2/suexec/www-data -update-rc.d apache2 defaults -service apache2 stop > /dev/null 2>&1 -service apache2 start -if [ "$?" -ne 0 ]; then - echo "Error: apache2 start failed" - exit 1 +if [ "$proftpd" = 'yes' ]; then + echo "FTP_SYSTEM='proftpd'" >> $VESTA/conf/vesta.conf fi -# Vsftpd configuration -wget $CHOST/$VERSION/vsftpd.conf -O /etc/vsftpd.conf -update-rc.d vsftpd defaults -service vsftpd stop > /dev/null 2>&1 -service vsftpd start -if [ "$?" -ne 0 ]; then - echo "Error: vsftpd start failed" - exit 1 +# DNS stack +if [ "$named" = 'yes' ]; then + echo "DNS_SYSTEM='bind9'" >> $VESTA/conf/vesta.conf fi -# Generating MySQL password if it wasn't set -if [ -z "$mpass" ]; then - mpass=$(gen_pass) +# Mail stack +if [ "$exim" = 'yes' ]; then + echo "MAIL_SYSTEM='exim4'" >> $VESTA/conf/vesta.conf + if [ "$clamd" = 'yes' ]; then + echo "ANTIVIRUS_SYSTEM='clamav-daemon'" >> $VESTA/conf/vesta.conf + fi + if [ "$spamd" = 'yes' ]; then + echo "ANTISPAM_SYSTEM='spamassassin'" >> $VESTA/conf/vesta.conf + fi + if [ "$dovecot" = 'yes' ]; then + echo "IMAP_SYSTEM='dovecot'" >> $VESTA/conf/vesta.conf + fi fi -# MySQL configuration -wget $CHOST/$VERSION/my.cnf -O /etc/mysql/my.cnf -mysql_install_db -if [ "$release" != '14.04' ]; then +# CRON daemon +echo "CRON_SYSTEM='cron'" >> $VESTA/conf/vesta.conf + +# Firewall stack +if [ "$iptables" = 'yes' ]; then + echo "FIREWALL_SYSTEM='iptables'" >> $VESTA/conf/vesta.conf +fi +if [ "$iptables" = 'yes' ] && [ "$fail2ban" = 'yes' ]; then + echo "FIREWALL_EXTENSION='fail2ban'" >> $VESTA/conf/vesta.conf +fi + +# Disk quota +if [ "$quota" = 'yes' ]; then + echo "DISK_QUOTA='yes'" >> $VESTA/conf/vesta.conf +fi + +# Backups +echo "BACKUP_SYSTEM='local'" >> $VESTA/conf/vesta.conf + +# Language +echo "LANGUAGE='$lang'" >> $VESTA/conf/vesta.conf + +# Version +echo "VERSION='0.9.8'" >> $VESTA/conf/vesta.conf + +# Downloading hosting packages +cd $VESTA/data +wget $vestacp/packages.tar.gz -O packages.tar.gz +tar -xzf packages.tar.gz +rm -f packages.tar.gz + +# Downloading templates +wget $vestacp/templates.tar.gz -O templates.tar.gz +tar -xzf templates.tar.gz +rm -f templates.tar.gz + +# Copying index.html to default documentroot +cp templates/web/skel/public_html/index.html /var/www/ +sed -i 's/%domain%/It worked!/g' /var/www/index.html + +# Downloading firewall rules +wget $vestacp/firewall.tar.gz -O firewall.tar.gz +tar -xzf firewall.tar.gz +rm -f firewall.tar.gz + +# Configuring server hostname +$VESTA/bin/v-change-sys-hostname $servername 2>/dev/null + +# Generating SSL certificate +$VESTA/bin/v-generate-ssl-cert $(hostname) $email 'US' 'California' \ + 'San Francisco' 'Vesta Control Panel' 'IT' > /tmp/vst.pem + +# Parsing certificate file +crt_end=$(grep -n "END CERTIFICATE-" /tmp/vst.pem |cut -f 1 -d:) +key_start=$(grep -n "BEGIN RSA" /tmp/vst.pem |cut -f 1 -d:) +key_end=$(grep -n "END RSA" /tmp/vst.pem |cut -f 1 -d:) + +# Adding SSL certificate +cd $VESTA/ssl +sed -n "1,${crt_end}p" /tmp/vst.pem > certificate.crt +sed -n "$key_start,${key_end}p" /tmp/vst.pem > certificate.key +chown root:mail $VESTA/ssl/* +chmod 660 $VESTA/ssl/* +rm /tmp/vst.pem + + +#----------------------------------------------------------# +# Configure Nginx # +#----------------------------------------------------------# + +if [ "$nginx" = 'yes' ]; then + rm -f /etc/nginx/conf.d/*.conf + wget $vestacp/nginx/nginx.conf -O /etc/nginx/nginx.conf + wget $vestacp/nginx/status.conf -O /etc/nginx/conf.d/status.conf + wget $vestacp/nginx/phpmyadmin.inc -O /etc/nginx/conf.d/phpmyadmin.inc + wget $vestacp/nginx/phppgadmin.inc -O /etc/nginx/conf.d/phppgadmin.inc + wget $vestacp/nginx/webmail.inc -O /etc/nginx/conf.d/webmail.inc + wget $vestacp/logrotate/nginx -O /etc/logrotate.d/nginx + echo > /etc/nginx/conf.d/vesta.conf + mkdir -p /var/log/nginx/domains + update-rc.d nginx defaults + service nginx start + check_result $? "nginx start failed" +fi + + +#----------------------------------------------------------# +# Configure Apache # +#----------------------------------------------------------# + +if [ "$apache" = 'yes' ]; then + wget $vestacp/apache2/apache2.conf -O /etc/apache2/apache2.conf + wget $vestacp/apache2/status.conf -O /etc/apache2/mods-enabled/status.conf + wget $vestacp/logrotate/apache2 -O /etc/logrotate.d/apache2 + a2enmod rewrite + a2enmod suexec + a2enmod ssl + a2enmod actions + a2enmod ruid2 + mkdir -p /etc/apache2/conf.d + echo > /etc/apache2/conf.d/vesta.conf + echo "# Powered by vesta" > /etc/apache2/sites-available/default + echo "# Powered by vesta" > /etc/apache2/sites-available/default-ssl + echo "# Powered by vesta" > /etc/apache2/ports.conf + echo -e "/home\npublic_html/cgi-bin" > /etc/apache2/suexec/www-data + touch /var/log/apache2/access.log /var/log/apache2/error.log + mkdir -p /var/log/apache2/domains + chmod a+x /var/log/apache2 + chmod 640 /var/log/apache2/access.log /var/log/apache2/error.log + chmod 751 /var/log/apache2/domains + update-rc.d apache2 defaults + service apache2 start + check_result $? "apache2 start failed" +fi + + +#----------------------------------------------------------# +# Configure PHP-FPM # +#----------------------------------------------------------# + +if [ "$phpfpm" = 'yes' ]; then + wget $vestacp/php5-fpm/www.conf -O /etc/php5/fpm/pool.d/www.conf + update-rc.d php5-fpm defaults + service php5-fpm start + check_result $? "php-fpm start failed" +fi + + +#----------------------------------------------------------# +# Configure PHP # +#----------------------------------------------------------# + +ZONE=$(timedatectl 2>/dev/null|grep Timezone|awk '{print $2}') +if [ -z "$ZONE" ]; then + ZONE='UTC' +fi +sed -i "s/;date.timezone =/date.timezone = $ZONE/g" /etc/php5/apache2/php.ini +sed -i "s/;date.timezone =/date.timezone = $ZONE/g" /etc/php5/cli/php.ini +sed -i 's%_open_tag = Off%_open_tag = On%g' /etc/php5/apache2/php.ini +sed -i 's%_open_tag = Off%_open_tag = On%g' /etc/php5/cli/php.ini + + +#----------------------------------------------------------# +# Configure VSFTPD # +#----------------------------------------------------------# + +if [ "$vsftpd" = 'yes' ]; then + wget $vestacp/vsftpd/vsftpd.conf -O /etc/vsftpd.conf + update-rc.d vsftpd defaults + service vsftpd start + check_result $? "vsftpd start failed" +fi + + +#----------------------------------------------------------# +# Configure ProFTPD # +#----------------------------------------------------------# + +if [ "$proftpd" = 'yes' ]; then + echo "127.0.0.1 $servername" >> /etc/hosts + wget $vestacp/proftpd/proftpd.conf -O /etc/proftpd/proftpd.conf + update-rc.d proftpd defaults + service proftpd start + check_result $? "proftpd start failed" +fi + + +#----------------------------------------------------------# +# Configure MySQL/MariaDB # +#----------------------------------------------------------# + +if [ "$mysql" = 'yes' ]; then + mycnf="my-small.cnf" + if [ $memory -gt 1200000 ]; then + mycnf="my-medium.cnf" + fi + if [ $memory -gt 3900000 ]; then + mycnf="my-large.cnf" + fi + + # MySQL configuration + wget $vestacp/mysql/$mycnf -O /etc/mysql/my.cnf + mysql_install_db update-rc.d mysql defaults -fi -service mysql stop > /dev/null 2>&1 -service mysql start -if [ "$?" -ne 0 ]; then - echo "Error: mysql start failed" - exit 1 -fi -mysqladmin -u root password $mpass -echo -e "[client]\npassword='$mpass'\n" > /root/.my.cnf -chmod 600 /root/.my.cnf -mysql -e "DELETE FROM mysql.user WHERE User=''" -mysql -e "DROP DATABASE test" > /dev/null 2>&1 -mysql -e "DELETE FROM mysql.db WHERE Db='test' OR Db='test\\_%'" -mysql -e "DELETE FROM mysql.user WHERE user='' or password='';" -mysql -e "FLUSH PRIVILEGES" + service mysql start + check_result $? "mysql start failed" -# Bind configuration -wget $CHOST/$VERSION/named.conf -O /etc/bind/named.conf -sed -i "s%listen-on%//listen%" /etc/bind/named.conf.options -chown root:bind /etc/bind/named.conf -chmod 640 /etc/bind/named.conf -update-rc.d bind9 defaults -service bind9 stop > /dev/null 2>&1 -service bind9 start -if [ "$?" -ne 0 ]; then - echo "Error: bind9 start failed" - exit 1 + # Securing MySQL installation + mysqladmin -u root password $vpass + echo -e "[client]\npassword='$vpass'\n" > /root/.my.cnf + chmod 600 /root/.my.cnf + mysql -e "DELETE FROM mysql.user WHERE User=''" + mysql -e "DROP DATABASE test" >/dev/null 2>&1 + mysql -e "DELETE FROM mysql.db WHERE Db='test' OR Db='test\\_%'" + mysql -e "DELETE FROM mysql.user WHERE user='' or password='';" + mysql -e "FLUSH PRIVILEGES" + + # Configuring phpMyAdmin + if [ "$apache" = 'yes' ]; then + wget $vestacp/pma/apache.conf -O /etc/phpmyadmin/apache.conf + ln -s /etc/phpmyadmin/apache.conf /etc/apache2/conf.d/phpmyadmin.conf + fi + wget $vestacp/pma/config.inc.php -O /etc/phpmyadmin/config.inc.php + chmod 777 /var/lib/phpmyadmin/tmp fi -# Exim -wget $CHOST/$VERSION/exim4.conf.template -O /etc/exim4/exim4.conf.template -if [ "$srv_type" != 'micro' ] && [ "$srv_type" != 'small' ]; then - sed -i "s/#SPAM/SPAM/g" /etc/exim4/exim4.conf.template - sed -i "s/#CLAMD/CLAMD/g" /etc/exim4/exim4.conf.template -fi -wget $CHOST/$VERSION/dnsbl.conf -O /etc/exim4/dnsbl.conf -wget $CHOST/$VERSION/spam-blocks.conf -O /etc/exim4/spam-blocks.conf -touch /etc/exim4/white-blocks.conf -rm -rf /etc/exim4/domains -mkdir -p /etc/exim4/domains -chmod 640 /etc/exim4/exim4.conf.template -gpasswd -a Debian-exim mail -if [ -e /etc/init.d/sendmail ]; then - update-rc.d -f sendmail remove - service sendmail stop -fi -if [ -e /etc/init.d/postfix ]; then - update-rc.d -f postfix remove - service postfix stop -fi -rm -f /etc/alternatives/mta -ln -s /usr/sbin/exim4 /etc/alternatives/mta -update-rc.d exim4 defaults -service exim4 stop > /dev/null 2>&1 -service exim4 start -if [ "$?" -ne 0 ]; then - echo "Error: exim start failed" - exit +#----------------------------------------------------------# +# Configure PostgreSQL # +#----------------------------------------------------------# + +if [ "$postgresql" = 'yes' ]; then + wget $vestacp/postgresql/pg_hba.conf -O /etc/postgresql/*/main/pg_hba.conf + service postgresql restart + sudo -u postgres psql -c "ALTER USER postgres WITH PASSWORD '$vpass'" 2>/dev/null + + # Configuring phpPgAdmin + if [ "$apache" = 'yes' ]; then + wget $vestacp/pga/phppgadmin.conf -O /etc/apache2/conf.d/phppgadmin.conf + fi + wget $vestacp/pga/config.inc.php -O /etc/phppgadmin/config.inc.php fi -# Dovecot configuration -wget $CHOST/$VERSION/dovecot.conf -O /etc/dovecot/dovecot.conf -cd /etc/dovecot/ -wget $CHOST/$VERSION/dovecot-conf.d.tar.gz -rm -rf conf.d *.ext README -tar -xzf dovecot-conf.d.tar.gz -rm -f dovecot-conf.d.tar.gz -chown -R root:root /etc/dovecot -gpasswd -a dovecot mail -update-rc.d dovecot defaults -service dovecot stop > /dev/null 2>&1 -service dovecot start -if [ "$?" -ne 0 ]; then - echo "Error: dovecot start failed" - exit 1 + +#----------------------------------------------------------# +# Configure Bind # +#----------------------------------------------------------# + +if [ "$named" = 'yes' ]; then + wget $vestacp/bind/named.conf -O /etc/bind/named.conf + sed -i "s%listen-on%//listen%" /etc/bind/named.conf.options + chown root:bind /etc/bind/named.conf + chmod 640 /etc/bind/named.conf + update-rc.d bind9 defaults + service bind9 start + check_result $? "bind9 start failed" fi -# ClamAV configuration -if [ "$srv_type" = 'medium' ] || [ "$srv_type" = 'large' ]; then - wget $CHOST/$VERSION/clamd.conf -O /etc/clamav/clamd.conf +#----------------------------------------------------------# +# Configure Exim # +#----------------------------------------------------------# + +if [ "$exim" = 'yes' ]; then + gpasswd -a Debian-exim mail + wget $vestacp/exim/exim4.conf.template -O /etc/exim4/exim4.conf.template + wget $vestacp/exim/dnsbl.conf -O /etc/exim4/dnsbl.conf + wget $vestacp/exim/spam-blocks.conf -O /etc/exim4/spam-blocks.conf + touch /etc/exim4/white-blocks.conf + + if [ "$spamd" = 'yes' ]; then + sed -i "s/#SPAM/SPAM/g" /etc/exim4/exim4.conf.template + fi + if [ "$clamd" = 'yes' ]; then + sed -i "s/#CLAMD/CLAMD/g" /etc/exim4/exim4.conf.template + fi + + chmod 640 /etc/exim4/exim4.conf.template + rm -rf /etc/exim4/domains + mkdir -p /etc/exim4/domains + + rm -f /etc/alternatives/mta + ln -s /usr/sbin/exim4 /etc/alternatives/mta + update-rc.d -f sendmail remove > /dev/null 2>&1 + service sendmail stop > /dev/null 2>&1 + update-rc.d -f postfix remove > /dev/null 2>&1 + service postfix stop > /dev/null 2>&1 + + update-rc.d exim4 defaults + service exim4 start + check_result $? "exim4 start failed" +fi + + +#----------------------------------------------------------# +# Configure Dovecot # +#----------------------------------------------------------# + +if [ "$dovecot" = 'yes' ]; then + gpasswd -a dovecot mail + wget $vestacp/dovecot.tar.gz -O /etc/dovecot.tar.gz + cd /etc + rm -rf dovecot dovecot.conf + tar -xzf dovecot.tar.gz + rm -f dovecot.tar.gz + chown -R root:root /etc/dovecot* + update-rc.d dovecot defaults + service dovecot start + check_result $? "dovecot start failed" +fi + + +#----------------------------------------------------------# +# Configure ClamAV # +#----------------------------------------------------------# + +if [ "$clamd" = 'yes' ]; then gpasswd -a clamav mail gpasswd -a clamav Debian-exim + wget $vestacp/clamav/clamd.conf -O /etc/clamav/clamd.conf /usr/bin/freshclam update-rc.d clamav-daemon defaults - service clamav-daemon stop > /dev/null 2>&1 service clamav-daemon start - if [ "$?" -ne 0 ]; then - echo "Error: clamav start failed" - exit 1 - fi + check_result $? "clamav-daeom start failed" fi -# SpamAssassin configuration -if [ "$srv_type" = 'medium' ] || [ "$srv_type" = 'large' ]; then + +#----------------------------------------------------------# +# Configure SpamAssassin # +#----------------------------------------------------------# + +if [ "$spamd" = 'yes' ]; then update-rc.d spamassassin defaults sed -i "s/ENABLED=0/ENABLED=1/" /etc/default/spamassassin - service spamassassin stop > /dev/null 2>&1 service spamassassin start - if [ "$?" -ne 0 ]; then - echo "Error: spamassassin start failed" - exit 1 + check_result $? "spamassassin start failed" +fi + + +#----------------------------------------------------------# +# Configure RoundCube # +#----------------------------------------------------------# + +if [ "$exim" = 'yes' ] && [ "$mysql" = 'yes' ]; then + if [ "$apache" = 'yes' ]; then + wget $vestacp/roundcube/apache.conf -O /etc/roundcube/apache.conf + ln -s /etc/roundcube/apache.conf /etc/apache2/conf.d/roundcube.conf + fi + wget $vestacp/roundcube/main.inc.php -O /etc/roundcube/main.inc.php + wget $vestacp/roundcube/db.inc.php -O /etc/roundcube/db.inc.php + wget $vestacp/roundcube/vesta.php -O \ + /usr/share/roundcube/plugins/password/drivers/vesta.php + wget $vestacp/roundcube/config.inc.php -O \ + /etc/roundcube/plugins/password/config.inc.php + r="$(gen_pass)" + mysql -e "CREATE DATABASE roundcube" + mysql -e "GRANT ALL ON roundcube.* TO roundcube@localhost IDENTIFIED BY '$r'" + sed -i "s/%password%/$r/g" /etc/roundcube/db.inc.php + mysql roundcube < /usr/share/dbconfig-common/data/roundcube/install/mysql + php5enmod mcrypt 2>/dev/null + service apache2 restart + if [ "$release" -eq 8 ]; then + mv -f /etc/roundcube/main.inc.php /etc/roundcube/config.inc.php + mv -f /etc/roundcube/db.inc.php /etc/roundcube/debian-db-roundcube.php fi fi -# Fail2ban configuration -if [ -z "$disable_fail2ban" ]; then + +#----------------------------------------------------------# +# Configure Fail2Ban # +#----------------------------------------------------------# + +if [ "$fail2ban" = 'yes' ]; then cd /etc - wget $CHOST/$VERSION/fail2ban.tar.gz -O fail2ban.tar.gz + wget $vestacp/fail2ban.tar.gz -O fail2ban.tar.gz tar -xzf fail2ban.tar.gz rm -f fail2ban.tar.gz - chkconfig fail2ban on + if [ "$dovecot" = 'no' ]; then + fline=$(cat /etc/fail2ban/jail.local |grep -n dovecot-iptables -A 2) + fline=$(echo "$fline" |tail -n1 |cut -f 1 -d -) + sed -i "${fline}s/true/false/" /etc/fail2ban/jail.local + fi + if [ "$exim" = 'no' ]; then + fline=$(cat /etc/fail2ban/jail.local |grep -n exim-iptables -A 2) + fline=$(echo "$fline" |tail -n1 |cut -f 1 -d -) + sed -i "${fline}s/true/false/" /etc/fail2ban/jail.local + fi + update-rc.d fail2ban defaults service fail2ban start -else - sed -i "s/fail2ban//" $VESTA/conf/vestac.conf + check_result $? "fail2ban start failed" fi -# php configuration -sed -i "s/;date.timezone =/date.timezone = UTC/g" /etc/php5/apache2/php.ini -sed -i "s/;date.timezone =/date.timezone = UTC/g" /etc/php5/cli/php.ini -if [ "$codename" = 'saucy' ] || [ "$codename" = 'trusty' ]; then - ln -s /etc/php5/conf.d/mcrypt.ini /etc/php5/mods-available - php5enmod mcrypt - service apache2 restart -fi -# phpMyAdmin configuration -wget $CHOST/$VERSION/apache2-pma.conf -O /etc/phpmyadmin/apache.conf -wget $CHOST/$VERSION/pma.conf -O /etc/phpmyadmin/config.inc.php -ln -s /etc/phpmyadmin/apache.conf /etc/apache2/conf.d/phpmyadmin.conf -mv -f /etc/phpmyadmin/config-db.php /etc/phpmyadmin/config-db.php_ -chmod 777 /var/lib/phpmyadmin/tmp +#----------------------------------------------------------# +# Configure Admin User # +#----------------------------------------------------------# -# Roundcube configuration -wget $CHOST/$VERSION/apache2-webmail.conf -O /etc/roundcube/apache.conf -wget $CHOST/$VERSION/roundcube-main.conf -O /etc/roundcube/main.inc.php -wget $CHOST/$VERSION/roundcube-db.conf -O /etc/roundcube/db.inc.php -wget $CHOST/$VERSION/roundcube-driver.php -O \ - /usr/share/roundcube/plugins/password/drivers/vesta.php -wget $CHOST/$VERSION/roundcube-pw.conf -O \ - /etc/roundcube/plugins/password/config.inc.php -r="$(gen_pass)" -mysql -e "DROP DATABASE roundcube" > /dev/null 2>&1 -mysql -e "CREATE DATABASE roundcube" -mysql -e "GRANT ALL ON roundcube.* TO roundcube@localhost IDENTIFIED BY '$r'" -sed -i "s/%password%/$r/g" /etc/roundcube/db.inc.php -mysql roundcube < /usr/share/dbconfig-common/data/roundcube/install/mysql -if [ "$codename" = 'saucy' ] || [ "$codename" = 'trusty' ]; then - wget $CHOST/$VERSION/roundcube-driver-new.php -O \ - /usr/share/roundcube/plugins/password/drivers/vesta.php - ln -s /etc/roundcube/apache.conf /etc/apache2/conf.d/ - service apache2 restart -fi -mkdir -p /var/log/roundcube/error -chmod -R 777 /var/log/roundcube - -# Deleting old admin user account if exists +# Deleting old admin user if [ ! -z "$(grep ^admin: /etc/passwd)" ] && [ "$force" = 'yes' ]; then chattr -i /home/admin/conf > /dev/null 2>&1 - userdel -f admin - chattr -i /home/admin/conf - mv -f /home/admin $vst_backups/home/ - rm -f /tmp/sess_* + userdel -f admin >/dev/null 2>&1 + chattr -i /home/admin/conf >/dev/null 2>&1 + mv -f /home/admin $vst_backups/home/ >/dev/null 2>&1 + rm -f /tmp/sess_* >/dev/null 2>&1 fi -if [ ! -z "$(grep ^admin: /etc/group)" ]; then +if [ ! -z "$(grep ^admin: /etc/group)" ] && [ "$force" = 'yes' ]; then groupdel admin > /dev/null 2>&1 fi -# Generating admin password if it wasn't set -if [ -z "$vpass" ]; then - vpass=$(gen_pass) -fi - -# Adding admin account +# Adding vesta account $VESTA/bin/v-add-user admin $vpass $email default System Administrator -if [ $? -ne 0 ]; then - echo "Error: can't create admin user" - exit 1 -fi +check_result $? "can't create admin user" $VESTA/bin/v-change-user-shell admin bash -$VESTA/bin/v-change-user-language admin en - -# Configure mysql host -$VESTA/bin/v-add-database-host mysql localhost root $mpass -$VESTA/bin/v-add-database admin default default $(gen_pass) mysql +$VESTA/bin/v-change-user-language admin $lang # Configuring system ips $VESTA/bin/v-update-sys-ip -# Firewall configuartion -cd $VESTA/data -wget $CHOST/$VERSION/firewall.tar.gz -O firewall.tar.gz -tar -xzf firewall.tar.gz -rm -f firewall.tar.gz -if [ "$disable_iptables" = 'yes' ]; then - sed -i "s/iptables//" $VESTA/conf/vesta.conf -else - /usr/local/vesta/bin/v-update-firewall -fi - # Get main ip -main_ip=$(ifconfig |grep 'inet addr:' |grep -v 127.0.0.1 |head -n1 | \ - cut -f2 -d: | cut -f1 -d ' ') +ip=$(ip addr|grep 'inet '|grep global|head -n1|awk '{print $2}'|cut -f1 -d/) -# Get remote ip -vst_ip=$(wget vestacp.com/what-is-my-ip/ -O - 2>/dev/null) -if [ ! -z "$vst_ip" ] && [ "$vst_ip" != "$main_ip" ]; then - # Set NAT association - $VESTA/bin/v-change-sys-ip-nat $main_ip $vst_ip +# Get public ip +pub_ip=$(wget vestacp.com/what-is-my-ip/ -O - 2>/dev/null) +if [ ! -z "$pub_ip" ] && [ "$pub_ip" != "$ip" ]; then + $VESTA/bin/v-change-sys-ip-nat $ip $pub_ip fi -if [ -z "$vst_ip" ]; then - vst_ip=$main_ip +if [ -z "$pub_ip" ]; then + ip=$main_ip fi -# Add default web domain -$VESTA/bin/v-add-web-domain admin default.domain $vst_ip +# Firewall configuration +if [ "$iptables" = 'yes' ]; then + $VESTA/bin/v-update-firewall +fi -# Add default dns domain -$VESTA/bin/v-add-dns-domain admin default.domain $vst_ip +# Configuring mysql host +if [ "$mysql" = 'yes' ]; then + $VESTA/bin/v-add-database-host mysql localhost root $vpass + $VESTA/bin/v-add-database admin default default $(gen_pass) mysql +fi -# Add default mail domain -$VESTA/bin/v-add-mail-domain admin default.domain +# Configuring pgsql host +if [ "$postgresql" = 'yes' ]; then + $VESTA/bin/v-add-database-host pgsql localhost postgres $vpass + $VESTA/bin/v-add-database admin db db $(gen_pass) pgsql +fi -# Configuring cron jobs +# Adding default domain +$VESTA/bin/v-add-domain admin $servername +check_result $? "can't create $servername domain" + +# Adding cron jobs command='sudo /usr/local/vesta/bin/v-update-sys-queue disk' $VESTA/bin/v-add-cron-job 'admin' '15' '02' '*' '*' '*' "$command" command='sudo /usr/local/vesta/bin/v-update-sys-queue traffic' @@ -854,35 +1147,42 @@ command='sudo /usr/local/vesta/bin/v-update-user-stats' $VESTA/bin/v-add-cron-job 'admin' '20' '00' '*' '*' '*' "$command" command='sudo /usr/local/vesta/bin/v-update-sys-rrd' $VESTA/bin/v-add-cron-job 'admin' '*/5' '*' '*' '*' '*' "$command" +service cron restart # Building inititall rrd images $VESTA/bin/v-update-sys-rrd -# Enable file system quota +# Enabling file system quota if [ "$quota" = 'yes' ]; then $VESTA/bin/v-add-sys-quota fi -# Start system service +# Starting vesta service update-rc.d vesta defaults -service vesta stop > /dev/null 2>&1 service vesta start -if [ "$?" -ne 0 ]; then - echo "Error: vesta start failed" - exit 1 +check_result $? "vesta start failed" + + +#----------------------------------------------------------# +# Vesta Access Info # +#----------------------------------------------------------# + +# Sending install notification to vestacp.com +wget vestacp.com/notify/?$codename -O /dev/null -q + +# Comparing hostname and ip +host_ip=$(host $servername| head -n 1 | awk '{print $NF}') +if [ "$host_ip" = "$ip" ]; then + ip="$servername" fi -# Send notification to vestacp.com -wget vestacp.com/notify/?$codename -O /dev/null - -# Send notification to admin email +# Sending notification to admin email echo -e "Congratulations, you have just successfully installed \ -the Vesta Control Panel +Vesta Control Panel -You can login in Vesta with following credentials: + https://$ip:8083 username: admin password: $vpass - https://$vst_ip:8083 We hope that you enjoy your installation of Vesta. Please \ feel free to contact us anytime if you have any questions. @@ -895,12 +1195,10 @@ vestacp.com team send_mail="$VESTA/web/inc/mail-wrapper.php" cat $tmpfile | $send_mail -s "Vesta Control Panel" $email -rm -f $tmpfile # Congrats echo '=======================================================' echo -echo echo ' _| _| _|_|_|_| _|_|_| _|_|_|_|_| _|_| ' echo ' _| _| _| _| _| _| _| ' echo ' _| _| _|_|_| _|_| _| _|_|_|_| ' @@ -908,20 +1206,7 @@ echo ' _| _| _| _| _| _| _| ' echo ' _| _|_|_|_| _|_|_| _| _| _| ' echo echo -echo '-------------------------------' -echo " https://$vst_ip:8083" -echo ' username: admin' -echo " password: $vpass" -echo '-------------------------------' -echo -echo -echo 'Congratulations,' -echo 'you have successfully installed Vesta Control Panel.' -echo -echo +cat $tmpfile +rm -f $tmpfile -# Tricky way to get new PATH variable -cd -bash - -#EOF +# EOF diff --git a/install/vst-install.sh b/install/vst-install.sh old mode 100644 new mode 100755 index 9c064ab01..9e05feea1 --- a/install/vst-install.sh +++ b/install/vst-install.sh @@ -5,10 +5,10 @@ # # Currently Supported Operating Systems: # -# RHEL 5, RHEL 6 -# CentOS 5, CentOS 6 -# Debian 7 -# Ubuntu LTS, Ubuntu 13.04, Ubuntu 13.10 +# RHEL 5, 6, 7 +# CentOS 5, 6, 7 +# Debian 7, 8 +# Ubuntu 12.04 - 15.04 # # Am I root? From 4b9cb6e42467260a9bd40b5995c7c63b13a73245 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Wed, 21 Oct 2015 20:28:46 +0300 Subject: [PATCH 111/264] Correct shell setting when SFTP chroot is enabled --- bin/v-change-user-shell | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/bin/v-change-user-shell b/bin/v-change-user-shell index 513e55243..8f2b5b4de 100755 --- a/bin/v-change-user-shell +++ b/bin/v-change-user-shell @@ -36,12 +36,16 @@ is_object_unsuspended 'user' 'USER' "$user" shell_path=$(grep -w "$shell" /etc/shells | head -n1) # Changing passwd file -/usr/bin/chsh -s "$shell_path" "$user" &>/dev/null +/usr/bin/chsh -s "$shell_path" "$user" >/dev/null 2>&1 shell=$(basename $shell_path) # Adding jailed sftp env if [ ! -z "$SFTPJAIL_KEY" ]; then - $BIN/v-add-user-sftp-jail $user + if [[ "$shell" =~ nologin ]] || [[ "$shell" =~ rssh ]]; then + $BIN/v-add-user-sftp-jail $user >/dev/null 2>&1 + else + $BIN/v-delete-user-sftp-jail $user >/dev/null 2>&1 + fi fi From fa570e400977168a38fb64406907a176c6bd0d14 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Wed, 21 Oct 2015 20:29:01 +0300 Subject: [PATCH 112/264] json listing support --- bin/v-list-web-domain-accesslog | 45 ++++++++++++++++++++++++++++----- bin/v-list-web-domain-errorlog | 45 ++++++++++++++++++++++++++++----- 2 files changed, 78 insertions(+), 12 deletions(-) diff --git a/bin/v-list-web-domain-accesslog b/bin/v-list-web-domain-accesslog index 9fdff009a..b066b2b2c 100755 --- a/bin/v-list-web-domain-accesslog +++ b/bin/v-list-web-domain-accesslog @@ -1,6 +1,6 @@ #!/bin/bash # info: list web domain access log -# options: USER DOMAIN [LINES] +# options: USER DOMAIN [LINES] [FORMAT] # # The function of obtaining raw access web domain logs. @@ -12,33 +12,66 @@ # Argument defenition user=$1 domain=$2 -lines=${3-70} +ttl=${3-70} +format=${4-shell} # Includes source $VESTA/func/main.sh source $VESTA/conf/vesta.conf +# Json function +json_list_log() { + i=1 + echo '[' + for str in $lines; do + str=$(echo "$str" |sed -e 's/"/\\"/g') + if [ "$i" -lt "$counter" ]; then + echo -e "\t\"$str\"," + else + echo -e "\t\"$str\"" + fi + (( ++i)) + done + echo "]" +} + +# Shell function +shell_list_log() { + echo "$lines" +} + #----------------------------------------------------------# # Verifications # #----------------------------------------------------------# -check_args '2' "$#" 'USER DOMAIN [FORMAT]' +check_args '2' "$#" 'USER DOMAIN [LINES] [FORMAT]' +validate_format 'user' 'domain' 'ttl' is_object_valid 'user' 'USER' "$user" is_object_valid 'web' 'DOMAIN' "$domain" + #----------------------------------------------------------# # Action # #----------------------------------------------------------# # Check number of output lines -if [ "$lines" -gt '3000' ]; then +if [ "$ttl" -gt '3000' ]; then read_cmd="cat" else - read_cmd="tail -n $lines" + read_cmd="tail -n $ttl" fi -$read_cmd /var/log/$WEB_SYSTEM/domains/$domain.log +lines=$($read_cmd /var/log/$WEB_SYSTEM/domains/$domain.log) +counter=$(echo "$lines" |wc -l) +IFS=$'\n' + +# Listing logs +case $format in + json) json_list_log ;; + plain) shell_list_log ;; + shell) shell_list_log ;; +esac #----------------------------------------------------------# diff --git a/bin/v-list-web-domain-errorlog b/bin/v-list-web-domain-errorlog index 04520213c..f21b581a3 100755 --- a/bin/v-list-web-domain-errorlog +++ b/bin/v-list-web-domain-errorlog @@ -1,6 +1,6 @@ #!/bin/bash # info: list web domain error log -# options: USER DOMAIN [LINES] +# options: USER DOMAIN [LINES] [FORMAT] # # The function of obtaining raw error web domain logs. @@ -12,33 +12,66 @@ # Argument defenition user=$1 domain=$2 -lines=${3-70} +ttl=${3-70} +format=${4-shell} # Includes source $VESTA/func/main.sh source $VESTA/conf/vesta.conf +# Json function +json_list_log() { + i=1 + echo '[' + for str in $lines; do + str=$(echo "$str" |sed -e 's/"/\\"/g') + if [ "$i" -lt "$counter" ]; then + echo -e "\t\"$str\"," + else + echo -e "\t\"$str\"" + fi + (( ++i)) + done + echo "]" +} + +# Shell function +shell_list_log() { + echo "$lines" +} + #----------------------------------------------------------# # Verifications # #----------------------------------------------------------# -check_args '2' "$#" 'USER DOMAIN [FORMAT]' +check_args '2' "$#" 'USER DOMAIN [LINES] [FORMAT]' +validate_format 'user' 'domain' 'ttl' is_object_valid 'user' 'USER' "$user" is_object_valid 'web' 'DOMAIN' "$domain" + #----------------------------------------------------------# # Action # #----------------------------------------------------------# # Check number of output lines -if [ "$lines" -gt '3000' ]; then +if [ "$ttl" -gt '3000' ]; then read_cmd="cat" else - read_cmd="tail -n $lines" + read_cmd="tail -n $ttl" fi -$read_cmd /var/log/$WEB_SYSTEM/domains/$domain.error.log +lines=$($read_cmd /var/log/$WEB_SYSTEM/domains/$domain.error.log) +counter=$(echo "$lines" |wc -l) +IFS=$'\n' + +# Listing logs +case $format in + json) json_list_log ;; + plain) shell_list_log ;; + shell) shell_list_log ;; +esac #----------------------------------------------------------# From 7a1975ce398956373d9b8eb1e17ce911e50e7f05 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Wed, 21 Oct 2015 20:49:50 +0300 Subject: [PATCH 113/264] Fix for MariaDB listing --- bin/v-list-sys-services | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/bin/v-list-sys-services b/bin/v-list-sys-services index af09cea44..168575fae 100755 --- a/bin/v-list-sys-services +++ b/bin/v-list-sys-services @@ -170,10 +170,15 @@ fi service=$DB_SYSTEM if [ ! -z "$service" ] && [ "$service" != 'remote' ]; then for db in ${DB_SYSTEM//,/ }; do + db_proc_name='' service="$db" if [ "$service" = 'mysql' ]; then if [ -e "/etc/redhat-release" ]; then service='mysqld' + db_proc_name='mysqld' + if [ -e "/usr/lib/systemd/system/mariadb.service" ]; then + service='mariadb' + fi fi fi if [ "$service" == 'pgsql' ]; then From fdce35d610f6b44317e9ff1b05a521c9fecfec9c Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Thu, 22 Oct 2015 16:57:24 +0300 Subject: [PATCH 114/264] typo fix --- bin/v-change-fs-file-permission | 2 +- web/file_manager/UploadHandler.php | 2 +- web/js/file_manager.js | 15 +++++++++++---- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/bin/v-change-fs-file-permission b/bin/v-change-fs-file-permission index 2b60865ab..29e47babb 100755 --- a/bin/v-change-fs-file-permission +++ b/bin/v-change-fs-file-permission @@ -41,7 +41,7 @@ if [ -z "$(echo $rpath |egrep "^/tmp|^$homedir")" ]; then fi # Changing file permissions -sudo -u $user chmod $permisions "$src_file" >/dev/null 2>&1 +sudo -u $user chmod $permissions "$src_file" >/dev/null 2>&1 if [ $? -ne 0 ]; then echo "Error: access permission on $src_file was not changed" exit 3 diff --git a/web/file_manager/UploadHandler.php b/web/file_manager/UploadHandler.php index fb77be1d0..56b67c541 100644 --- a/web/file_manager/UploadHandler.php +++ b/web/file_manager/UploadHandler.php @@ -84,7 +84,7 @@ class UploadHandler // The php.ini settings upload_max_filesize and post_max_size // take precedence over the following max_file_size setting: 'max_file_size' => null, - 'min_file_size' => 1, + 'min_file_size' => 0, // The maximum number of files for the upload directory: 'max_number_of_files' => null, // Defines which files are handled as image files: diff --git a/web/js/file_manager.js b/web/js/file_manager.js index 8167753ac..d54097c8a 100644 --- a/web/js/file_manager.js +++ b/web/js/file_manager.js @@ -1237,7 +1237,7 @@ FM.unpackItem = function() { var tpl = Tpl.get('popup_unpack', 'FM'); tpl.set(':FILENAME', src.name); - tpl.set(':DST_DIRNAME', dst + '/' + src.name); + tpl.set(':DST_DIRNAME', (dst + '/' + src.name).replace('//', '/')); FM.popupOpen(tpl.finalize()); } @@ -1275,7 +1275,7 @@ FM.packItem = function() { var tpl = Tpl.get('popup_pack', 'FM'); tpl.set(':FILENAME', src.name); - tpl.set(':DST_DIRNAME', dst + '/' + src.name + '.tar.gz'); + tpl.set(':DST_DIRNAME', (dst + '/' + src.name + '.tar.gz').replace('//', '/')); FM.popupOpen(tpl.finalize()); } @@ -1448,7 +1448,7 @@ FM.copyItems = function() { var tpl = Tpl.get('popup_copy', 'FM'); tpl.set(':SRC_FILENAME', src.full_path); - tpl.set(':DST_FILENAME', dst + '/' + src.name); + tpl.set(':DST_FILENAME', (dst + '/' + src.name).replace('//', '/')); FM.popupOpen(tpl.finalize()); } @@ -2081,7 +2081,14 @@ $(document).ready(function() { FM.open(src.full_path, FM.CURRENT_TAB); } else { - FM.openFile(src.full_path, FM.CURRENT_TAB, elm); + if(FM.IMG_FILETYPES.indexOf(src.filetype) >= 0 && src.filetype.length > 0) { + //FM.IMAGES[tab][FM.IMAGES[tab].length] = {'img': "/view/file/?path=/home/admin/"+o.name+"&raw=true", 'thumb': "/view/file/?path=/home/admin/"+o.name//+"&raw=true", 'id': 'img-'+i}; + //cl_act = 'onClick="FM.fotoramaOpen(\'' + tab + '\', \'img-' + i +'\')"'; + FM.fotoramaOpen(tab, 'img-' + elm.index()); + } + else { + FM.openFile(src.full_path, FM.CURRENT_TAB, elm); + } } } },{ From 2322eed4c89b1ee7ac99d776d570362edf269077 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Thu, 22 Oct 2015 16:57:55 +0300 Subject: [PATCH 115/264] FS manager stuff --- bin/v-add-fs-archive | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/v-add-fs-archive b/bin/v-add-fs-archive index d61f36217..47dc0d5d7 100755 --- a/bin/v-add-fs-archive +++ b/bin/v-add-fs-archive @@ -52,7 +52,7 @@ done sudo -u $user tar -czf "$archive.tar.gz" \ $src1 $src2 $src3 $src4 $src5 $src6 $src7 > /dev/null 2>&1 if [ "$?" -ne 0 ]; then - echo "Error: archive $archive.tar.gz was not created" +# echo "Error: archive $archive.tar.gz was not created" exit 3 fi From 79e4f5ed262115428884d4e36ae38aa462988f5d Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Thu, 22 Oct 2015 17:05:02 +0300 Subject: [PATCH 116/264] Fix for application/javascript from infinitnet --- install/debian/7/nginx/nginx.conf | 2 +- install/debian/8/nginx/nginx.conf | 2 +- install/rhel/5/nginx/nginx.conf | 2 +- install/rhel/6/nginx/nginx.conf | 2 +- install/rhel/7/nginx/nginx.conf | 2 +- install/ubuntu/12.04/nginx/nginx.conf | 2 +- install/ubuntu/12.10/nginx/nginx.conf | 2 +- install/ubuntu/13.04/nginx/nginx.conf | 2 +- install/ubuntu/13.10/nginx/nginx.conf | 2 +- install/ubuntu/14.04/nginx/nginx.conf | 2 +- install/ubuntu/14.10/nginx/nginx.conf | 2 +- install/ubuntu/15.04/nginx/nginx.conf | 2 +- src/rpm/conf/nginx.conf | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/install/debian/7/nginx/nginx.conf b/install/debian/7/nginx/nginx.conf index 7937301c1..90dd50c6b 100644 --- a/install/debian/7/nginx/nginx.conf +++ b/install/debian/7/nginx/nginx.conf @@ -52,7 +52,7 @@ http { gzip_min_length 512; gzip_buffers 8 64k; gzip_types text/plain text/css text/javascript - application/x-javascript; + application/x-javascript application/javascript; gzip_proxied any; diff --git a/install/debian/8/nginx/nginx.conf b/install/debian/8/nginx/nginx.conf index 7937301c1..90dd50c6b 100644 --- a/install/debian/8/nginx/nginx.conf +++ b/install/debian/8/nginx/nginx.conf @@ -52,7 +52,7 @@ http { gzip_min_length 512; gzip_buffers 8 64k; gzip_types text/plain text/css text/javascript - application/x-javascript; + application/x-javascript application/javascript; gzip_proxied any; diff --git a/install/rhel/5/nginx/nginx.conf b/install/rhel/5/nginx/nginx.conf index 0316de7ac..154fd0fe7 100644 --- a/install/rhel/5/nginx/nginx.conf +++ b/install/rhel/5/nginx/nginx.conf @@ -52,7 +52,7 @@ http { gzip_min_length 512; gzip_buffers 8 64k; gzip_types text/plain text/css text/javascript - application/x-javascript; + application/x-javascript application/javascript; gzip_proxied any; diff --git a/install/rhel/6/nginx/nginx.conf b/install/rhel/6/nginx/nginx.conf index 0316de7ac..154fd0fe7 100644 --- a/install/rhel/6/nginx/nginx.conf +++ b/install/rhel/6/nginx/nginx.conf @@ -52,7 +52,7 @@ http { gzip_min_length 512; gzip_buffers 8 64k; gzip_types text/plain text/css text/javascript - application/x-javascript; + application/x-javascript application/javascript; gzip_proxied any; diff --git a/install/rhel/7/nginx/nginx.conf b/install/rhel/7/nginx/nginx.conf index 0316de7ac..154fd0fe7 100644 --- a/install/rhel/7/nginx/nginx.conf +++ b/install/rhel/7/nginx/nginx.conf @@ -52,7 +52,7 @@ http { gzip_min_length 512; gzip_buffers 8 64k; gzip_types text/plain text/css text/javascript - application/x-javascript; + application/x-javascript application/javascript; gzip_proxied any; diff --git a/install/ubuntu/12.04/nginx/nginx.conf b/install/ubuntu/12.04/nginx/nginx.conf index 7937301c1..90dd50c6b 100644 --- a/install/ubuntu/12.04/nginx/nginx.conf +++ b/install/ubuntu/12.04/nginx/nginx.conf @@ -52,7 +52,7 @@ http { gzip_min_length 512; gzip_buffers 8 64k; gzip_types text/plain text/css text/javascript - application/x-javascript; + application/x-javascript application/javascript; gzip_proxied any; diff --git a/install/ubuntu/12.10/nginx/nginx.conf b/install/ubuntu/12.10/nginx/nginx.conf index 7937301c1..90dd50c6b 100644 --- a/install/ubuntu/12.10/nginx/nginx.conf +++ b/install/ubuntu/12.10/nginx/nginx.conf @@ -52,7 +52,7 @@ http { gzip_min_length 512; gzip_buffers 8 64k; gzip_types text/plain text/css text/javascript - application/x-javascript; + application/x-javascript application/javascript; gzip_proxied any; diff --git a/install/ubuntu/13.04/nginx/nginx.conf b/install/ubuntu/13.04/nginx/nginx.conf index 7937301c1..90dd50c6b 100644 --- a/install/ubuntu/13.04/nginx/nginx.conf +++ b/install/ubuntu/13.04/nginx/nginx.conf @@ -52,7 +52,7 @@ http { gzip_min_length 512; gzip_buffers 8 64k; gzip_types text/plain text/css text/javascript - application/x-javascript; + application/x-javascript application/javascript; gzip_proxied any; diff --git a/install/ubuntu/13.10/nginx/nginx.conf b/install/ubuntu/13.10/nginx/nginx.conf index 7937301c1..90dd50c6b 100644 --- a/install/ubuntu/13.10/nginx/nginx.conf +++ b/install/ubuntu/13.10/nginx/nginx.conf @@ -52,7 +52,7 @@ http { gzip_min_length 512; gzip_buffers 8 64k; gzip_types text/plain text/css text/javascript - application/x-javascript; + application/x-javascript application/javascript; gzip_proxied any; diff --git a/install/ubuntu/14.04/nginx/nginx.conf b/install/ubuntu/14.04/nginx/nginx.conf index 7937301c1..90dd50c6b 100644 --- a/install/ubuntu/14.04/nginx/nginx.conf +++ b/install/ubuntu/14.04/nginx/nginx.conf @@ -52,7 +52,7 @@ http { gzip_min_length 512; gzip_buffers 8 64k; gzip_types text/plain text/css text/javascript - application/x-javascript; + application/x-javascript application/javascript; gzip_proxied any; diff --git a/install/ubuntu/14.10/nginx/nginx.conf b/install/ubuntu/14.10/nginx/nginx.conf index 7937301c1..90dd50c6b 100644 --- a/install/ubuntu/14.10/nginx/nginx.conf +++ b/install/ubuntu/14.10/nginx/nginx.conf @@ -52,7 +52,7 @@ http { gzip_min_length 512; gzip_buffers 8 64k; gzip_types text/plain text/css text/javascript - application/x-javascript; + application/x-javascript application/javascript; gzip_proxied any; diff --git a/install/ubuntu/15.04/nginx/nginx.conf b/install/ubuntu/15.04/nginx/nginx.conf index 7937301c1..90dd50c6b 100644 --- a/install/ubuntu/15.04/nginx/nginx.conf +++ b/install/ubuntu/15.04/nginx/nginx.conf @@ -52,7 +52,7 @@ http { gzip_min_length 512; gzip_buffers 8 64k; gzip_types text/plain text/css text/javascript - application/x-javascript; + application/x-javascript application/javascript; gzip_proxied any; diff --git a/src/rpm/conf/nginx.conf b/src/rpm/conf/nginx.conf index 9d4ffbfd6..d055bd694 100644 --- a/src/rpm/conf/nginx.conf +++ b/src/rpm/conf/nginx.conf @@ -54,7 +54,7 @@ http { gzip_min_length 512; gzip_buffers 8 64k; gzip_types text/plain text/css text/javascript - application/x-javascript; + application/x-javascript application/javascript; gzip_proxied any; From e3f636cb3a35d9756189c3178d46edae2a6ffb09 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Thu, 22 Oct 2015 17:23:44 +0300 Subject: [PATCH 117/264] Fixes from Neilpang --- bin/v-add-firewall-rule | 2 +- bin/v-update-firewall | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/bin/v-add-firewall-rule b/bin/v-add-firewall-rule index 126f62b49..56a6fcf48 100755 --- a/bin/v-add-firewall-rule +++ b/bin/v-add-firewall-rule @@ -52,7 +52,7 @@ is_system_enabled "$FIREWALL_SYSTEM" 'FIREWALL_SYSTEM' get_next_fw_rule validate_format 'rule' is_object_new '../../data/firewall/rules' 'RULE' "$rule" -if [ ! -z "$comment"]; then +if [ ! -z "$comment" ]; then validate_format 'comment' fi diff --git a/bin/v-update-firewall b/bin/v-update-firewall index 65b9438dd..04a15a5fe 100755 --- a/bin/v-update-firewall +++ b/bin/v-update-firewall @@ -51,6 +51,12 @@ if [ $? -ne 0 ]; then conntrack_ftp='no' fi +# Checking custom OpenSSH port +sshport=$(grep '^Port ' /etc/ssh/sshd_config | head -1 | cut -d ' ' -f 2) +if [[ "$sshport" =~ ^[0-9]+$ ]] && [ "$sshport" -ne "22" ]; then + sed -i "s/PORT='22'/PORT=\'$sshport\'/" $rules +fi + # Creating temporary file tmp=$(mktemp) From 13d3fd476be0072af55f06173814be9ce007b7fd Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Thu, 22 Oct 2015 17:26:20 +0300 Subject: [PATCH 118/264] File Manger stuff --- web/file_manager/files.php | 107 +++++++++++++++++++++++-------------- 1 file changed, 67 insertions(+), 40 deletions(-) diff --git a/web/file_manager/files.php b/web/file_manager/files.php index 657194dca..c11cd917e 100644 --- a/web/file_manager/files.php +++ b/web/file_manager/files.php @@ -4,18 +4,25 @@ //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
@@ -26,7 +33,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;
@@ -46,12 +53,24 @@ switch($_REQUEST['action']) {
     break;
 }
 
+
+
+
+
+
 //echo $_GET['sort_field'];
 
 //    if(in_array($_GET['sort_field'], $available_sort_fields)){
 //	echo '1';
 //    }	
 
+
+
+
+
+
+
+
 /*
   upload_file
 
@@ -68,16 +87,17 @@ 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 (bool) fopen($filename, 'w'); // (bool) > !!, sorry
+    return !!fopen($filename, 'w');
 }
 
-function fm_create_dir($dirname)
-{
+
+function fm_create_dir($dirname){
     if(is_dir($filename))
         return array('error' => 'directory exists', 'code' => 1);
 
@@ -85,49 +105,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(
@@ -142,21 +162,19 @@ 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),
@@ -169,13 +187,14 @@ 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
@@ -195,9 +214,12 @@ 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/*");
@@ -208,6 +230,9 @@ function rmrf($dir)
     }
 }
 
+
+
+
 function dir_list($dir, $sort = 0)
 {
     $sort_order_for_filename = SORT_ASC;
@@ -227,7 +252,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));
@@ -249,11 +274,8 @@ 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,
@@ -272,6 +294,7 @@ function dir_list($dir, $sort = 0)
             	);
 	    }
 
+
 	    $listing['count']++;
 
 	    if($item['type'] == 'd'){
@@ -288,6 +311,7 @@ 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']){
@@ -300,6 +324,7 @@ function dir_list($dir, $sort = 0)
 
     return $listing;
 }
+
 	
 function explain_mode($mode)
 {
@@ -330,3 +355,5 @@ function explain_mode($mode)
 
     return $info;
 }
+
+?>

From 2127cfd44b486a3c580a412ffe00690c86198a4f Mon Sep 17 00:00:00 2001
From: Serghey Rodin 
Date: Thu, 22 Oct 2015 17:41:51 +0300
Subject: [PATCH 119/264] Removing debug loging

---
 web/add/user/index.php | 5 -----
 web/bulk/web/index.php | 7 ++-----
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/web/add/user/index.php b/web/add/user/index.php
index 32f91562a..26de10209 100644
--- a/web/add/user/index.php
+++ b/web/add/user/index.php
@@ -50,11 +50,6 @@ if (!empty($_POST['ok'])) {
         $pw_len = strlen($_POST['v_password']);
         if ($pw_len < 6 ) $_SESSION['error_msg'] = __('Password is too short.',$error_msg);
     }
-    // Check username length
-    if (empty($_SESSION['error_msg'])) {
-	$username_len = strlen($_POST['v_username']);
-	if ($username_len > 12) $_SESSION['error_msg'] = __('Username is too long. Maximum 12 characters', $error_msg);
-    }
 
     // Protect input
     $v_username = escapeshellarg($_POST['v_username']);
diff --git a/web/bulk/web/index.php b/web/bulk/web/index.php
index d7bc3c9a9..d7c050077 100644
--- a/web/bulk/web/index.php
+++ b/web/bulk/web/index.php
@@ -27,22 +27,19 @@ if ($_SESSION['user'] == 'admin') {
     }
 } else {
     switch ($action) {
-        case 'delete': $cmd='v-web-domain';
+        case 'delete': $cmd='v-delete-domain';
             break;
         default: header("Location: /list/web/"); exit;
     }
 }
 
-print_r($_POST);
-
 foreach ($domain as $value) {
     $value = escapeshellarg($value);
     echo VESTA_CMD.$cmd." ".$user." ".$value." no";
-//    exec (VESTA_CMD.$cmd." ".$user." ".$value." no", $output, $return_var);
+    exec (VESTA_CMD.$cmd." ".$user." ".$value." no", $output, $return_var);
     $restart='yes';
 }
 
-exit();
 
 if (isset($restart)) {
     exec (VESTA_CMD."v-restart-web", $output, $return_var);

From c5ea206e5b2315475dbab4c3c508444e584cb870 Mon Sep 17 00:00:00 2001
From: Serghey Rodin 
Date: Thu, 22 Oct 2015 18:01:54 +0300
Subject: [PATCH 120/264] fail tollerance against already synced domains

---
 bin/v-add-dns-domain | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/v-add-dns-domain b/bin/v-add-dns-domain
index c33602998..512c64791 100755
--- a/bin/v-add-dns-domain
+++ b/bin/v-add-dns-domain
@@ -179,7 +179,7 @@ fi
 
 # Updating dns-cluster queue
 if [ ! -z "$DNS_CLUSTER" ]; then
-    cmd="$BIN/v-add-remote-dns-domain $user $domain no"
+    cmd="$BIN/v-add-remote-dns-domain $user $domain yes"
     echo "$cmd" >> $VESTA/data/queue/dns-cluster.pipe
 fi
 

From 5eb10ba388222997ba3ff373a0097ce4bdee3337 Mon Sep 17 00:00:00 2001
From: Serghey Rodin 
Date: Sat, 24 Oct 2015 14:57:30 +0300
Subject: [PATCH 121/264] new and better way to backup - tar without find

---
 bin/v-backup-user | 30 ++++++++----------------------
 web/inc/main.php  |  5 +++--
 2 files changed, 11 insertions(+), 24 deletions(-)

diff --git a/bin/v-backup-user b/bin/v-backup-user
index 9ebd0b69b..b1d4efb1d 100755
--- a/bin/v-backup-user
+++ b/bin/v-backup-user
@@ -206,36 +206,26 @@ if [ ! -z "$WEB_SYSTEM" ] && [ "$WEB" != '*' ]; then
         fi
 
         # Define exclude arguments
+        exlusion=$(echo -e "$WEB" |tr ',' '\n' |grep "^$domain:")
         set -f
         fargs=()
-        fargs+=(-not)
-        fargs+=(-path)
-        fargs+=("./logs*")
-        exlusion=$(echo -e "$WEB" |tr ',' '\n' |grep "^$domain:")
+        fargs+=(--exclude='logs/*')
         if [ ! -z "$exlusion" ]; then
             xdirs="$(echo -e "$exlusion" |tr ':' '\n' |grep -v $domain)"
             for xpath in $xdirs; do
-                xpath="$(echo $xpath |sed -e 's/\/*$//' -e 's/^\/*//')"
-                fargs+=(-not)
-                fargs+=(-path)
-                fargs+=("./$xpath/*")
+                fargs+=(--exclude=$xpath/*)
                 echo "$(date "+%F %T") excluding directory $xpath"
                 msg="$msg\n$(date "+%F %T") excluding directory $xpath"
             done
         fi
+        set +f
 
         # Backup files
         cd $HOMEDIR/$user/web/$domain
-        find . ${fargs[@]} -type f -or -type l -print0 |\
-            tar -cpf $tmpdir/web/$domain/domain_data.tar --null -T -
-
-        # Backup empty folders
-        find . ${fargs[@]} -type d -empty -print0 |\
-            tar -rpf $tmpdir/web/$domain/domain_data.tar --null -T -
+        tar -cpf $tmpdir/web/$domain/domain_data.tar * ${fargs[@]} 
 
         # Compress archive
         gzip -$BACKUP_GZIP $tmpdir/web/$domain/domain_data.tar
-        set +f
     done
 
     # Print total
@@ -488,6 +478,7 @@ if [ "$USER" != '*' ]; then
     IFS=$'\n'
     set -f
     i=0
+
     for udir in $(ls -a |egrep -v "conf|web|dns|mail|^\.\.$|^\.$"); do
         exclusion=$(echo "$USER" |tr ',' '\n' |grep "^$udir$")
         if [ -z "$exclusion" ]; then
@@ -496,13 +487,8 @@ if [ "$USER" != '*' ]; then
             echo -e "$(date "+%F %T") adding $udir"
             msg="$msg\n$(date "+%F %T") adding  $udir"
 
-            # Backup files
-            find ./$udir ${fargs[@]} -type f -or -type l -print0 |\
-                tar -cpf $tmpdir/user_dir/$udir.tar --null -T -
-
-            # Backup empty folders
-            find ./$udir ${fargs[@]} -type d -empty -print0 |\
-                tar -rpf $tmpdir/user_dir/$udir.tar --null -T -
+            # Backup files and dirs
+            tar -cpf $tmpdir/user_dir/$udir.tar $udir
 
             # Compress arhive
             gzip -$BACKUP_GZIP $tmpdir/user_dir/$udir.tar
diff --git a/web/inc/main.php b/web/inc/main.php
index 7aa3a0328..07113d3a8 100644
--- a/web/inc/main.php
+++ b/web/inc/main.php
@@ -102,8 +102,9 @@ if (isset($_SESSION['look']) && ( $_SESSION['look'] != 'admin' )) {
     $user = $_SESSION['look'];
 }
 
-get_favorites();
-
+if (isset($_SESSION['user'])) {
+    get_favorites();
+}
 
 function get_favorites(){
     exec (VESTA_CMD."v-list-user-favourites ".$_SESSION['user']." json", $output, $return_var);

From aa409cac251d250bc1cc6dbca56c928d7fb10bbe Mon Sep 17 00:00:00 2001
From: Serghey Rodin 
Date: Sat, 24 Oct 2015 15:06:20 +0300
Subject: [PATCH 122/264] remi argument handler

---
 install/vst-install-debian.sh | 2 ++
 install/vst-install-ubuntu.sh | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/install/vst-install-debian.sh b/install/vst-install-debian.sh
index 103a4cf19..d0e8de6ca 100755
--- a/install/vst-install-debian.sh
+++ b/install/vst-install-debian.sh
@@ -131,6 +131,7 @@ for arg; do
         --spamassassin)         args="${args}-t " ;;
         --iptables)             args="${args}-i " ;;
         --fail2ban)             args="${args}-b " ;;
+        --remi)                 args="${args}-r " ;;
         --quota)                args="${args}-q " ;;
         --lang)                 args="${args}-l " ;;
         --interactive)          args="${args}-y " ;;
@@ -163,6 +164,7 @@ while getopts "a:n:w:v:j:k:m:g:d:x:z:c:t:i:b:r:q:l:y:s:e:p:fh" Option; do
         t) spamd=$OPTARG ;;             # SpamAssassin
         i) iptables=$OPTARG ;;          # Iptables
         b) fail2ban=$OPTARG ;;          # Fail2ban
+        r) remi=$OPTARG ;;              # Remi repo
         q) quota=$OPTARG ;;             # FS Quota
         l) lang=$OPTARG ;;              # Language
         y) interactive=$OPTARG ;;       # Interactive install
diff --git a/install/vst-install-ubuntu.sh b/install/vst-install-ubuntu.sh
index 5fb068861..a32b3632c 100755
--- a/install/vst-install-ubuntu.sh
+++ b/install/vst-install-ubuntu.sh
@@ -116,6 +116,7 @@ for arg; do
         --spamassassin)         args="${args}-t " ;;
         --iptables)             args="${args}-i " ;;
         --fail2ban)             args="${args}-b " ;;
+        --remi)                 args="${args}-r " ;;
         --quota)                args="${args}-q " ;;
         --lang)                 args="${args}-l " ;;
         --interactive)          args="${args}-y " ;;
@@ -148,6 +149,7 @@ while getopts "a:n:w:v:j:k:m:g:d:x:z:c:t:i:b:r:q:l:y:s:e:p:fh" Option; do
         t) spamd=$OPTARG ;;             # SpamAssassin
         i) iptables=$OPTARG ;;          # Iptables
         b) fail2ban=$OPTARG ;;          # Fail2ban
+        r) remi=$OPTARG ;;              # Remi repo
         q) quota=$OPTARG ;;             # FS Quota
         l) lang=$OPTARG ;;              # Language
         y) interactive=$OPTARG ;;       # Interactive install

From ad138d681c5f8ee99567d93f054f7a0e2da44613 Mon Sep 17 00:00:00 2001
From: Serghey Rodin 
Date: Sat, 24 Oct 2015 15:12:55 +0300
Subject: [PATCH 123/264] no versions at c.vestacp.com

---
 install/vst-install-debian.sh | 2 +-
 install/vst-install-rhel.sh   | 2 +-
 install/vst-install-ubuntu.sh | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/install/vst-install-debian.sh b/install/vst-install-debian.sh
index d0e8de6ca..a77c05b26 100755
--- a/install/vst-install-debian.sh
+++ b/install/vst-install-debian.sh
@@ -9,7 +9,7 @@ export PATH=$PATH:/sbin
 export DEBIAN_FRONTEND=noninteractive
 RHOST='apt.vestacp.com'
 CHOST='c.vestacp.com'
-VERSION='0.9.8/debian'
+VERSION='debian'
 memory=$(grep 'MemTotal' /proc/meminfo |tr ' ' '\n' |grep [0-9])
 arch=$(uname -i)
 os='debian'
diff --git a/install/vst-install-rhel.sh b/install/vst-install-rhel.sh
index 9aa438570..3f2f64127 100755
--- a/install/vst-install-rhel.sh
+++ b/install/vst-install-rhel.sh
@@ -9,7 +9,7 @@ export PATH=$PATH:/sbin
 RHOST='r.vestacp.com'
 CHOST='c.vestacp.com'
 REPO='cmmnt'
-VERSION='0.9.8/rhel'
+VERSION='rhel'
 memory=$(grep 'MemTotal' /proc/meminfo |tr ' ' '\n' |grep [0-9])
 arch=$(uname -i)
 os=$(cut -f 1 -d ' ' /etc/redhat-release)
diff --git a/install/vst-install-ubuntu.sh b/install/vst-install-ubuntu.sh
index a32b3632c..19a30caff 100755
--- a/install/vst-install-ubuntu.sh
+++ b/install/vst-install-ubuntu.sh
@@ -9,7 +9,7 @@ export PATH=$PATH:/sbin
 export DEBIAN_FRONTEND=noninteractive
 RHOST='apt.vestacp.com'
 CHOST='c.vestacp.com'
-VERSION='0.9.8/ubuntu'
+VERSION='ubuntu'
 memory=$(grep 'MemTotal' /proc/meminfo |tr ' ' '\n' |grep [0-9])
 arch=$(uname -i)
 os='ubuntu'

From 0c0b039d8456cbde4c55674651ed4462819120b4 Mon Sep 17 00:00:00 2001
From: Serghey Rodin 
Date: Sat, 24 Oct 2015 15:15:53 +0300
Subject: [PATCH 124/264] No apache2.2-common in old Ubuntu

---
 install/vst-install-ubuntu.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/install/vst-install-ubuntu.sh b/install/vst-install-ubuntu.sh
index 19a30caff..0b01c94d7 100755
--- a/install/vst-install-ubuntu.sh
+++ b/install/vst-install-ubuntu.sh
@@ -489,6 +489,10 @@ rm -rf /usr/local/vesta > /dev/null 2>&1
 #----------------------------------------------------------#
 
 # Excluding packages
+if [ "$release" != "15.04" ] && [ "$release" != "15.04" ]; then
+    software=$(echo "$software" | sed -e "s/apache2.2-common//")
+fi
+
 if [ "$nginx" = 'no'  ]; then
     software=$(echo "$software" | sed -e "s/^nginx//")
 fi

From ad9c035f8cc578cf82cfafe6a0fba86cf22e8127 Mon Sep 17 00:00:00 2001
From: Serghey Rodin 
Date: Sat, 24 Oct 2015 15:18:30 +0300
Subject: [PATCH 125/264] updated log location

---
 install/vst-install-debian.sh | 2 +-
 install/vst-install-rhel.sh   | 2 +-
 install/vst-install-ubuntu.sh | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/install/vst-install-debian.sh b/install/vst-install-debian.sh
index a77c05b26..36e619714 100755
--- a/install/vst-install-debian.sh
+++ b/install/vst-install-debian.sh
@@ -650,7 +650,7 @@ touch $VESTA/data/queue/backup.pipe $VESTA/data/queue/disk.pipe \
     $VESTA/log/nginx-error.log $VESTA/log/auth.log
 chmod 750 $VESTA/conf $VESTA/data/users $VESTA/data/ips $VESTA/log
 chmod -R 750 $VESTA/data/queue
-chmod 660 /var/log/vesta/*
+chmod 660 $VESTA/log/*
 rm -f /var/log/vesta
 ln -s /usr/local/vesta/log /var/log/vesta
 
diff --git a/install/vst-install-rhel.sh b/install/vst-install-rhel.sh
index 3f2f64127..53c6912d4 100755
--- a/install/vst-install-rhel.sh
+++ b/install/vst-install-rhel.sh
@@ -684,7 +684,7 @@ touch $VESTA/data/queue/backup.pipe $VESTA/data/queue/disk.pipe \
     $VESTA/log/nginx-error.log $VESTA/log/auth.log
 chmod 750 $VESTA/conf $VESTA/data/users $VESTA/data/ips $VESTA/log
 chmod -R 750 $VESTA/data/queue
-chmod 660 /var/log/vesta/*
+chmod 660 $VESTA/log/*
 rm -f /var/log/vesta
 ln -s /usr/local/vesta/log /var/log/vesta
 
diff --git a/install/vst-install-ubuntu.sh b/install/vst-install-ubuntu.sh
index 0b01c94d7..e6c7c165f 100755
--- a/install/vst-install-ubuntu.sh
+++ b/install/vst-install-ubuntu.sh
@@ -642,7 +642,7 @@ touch $VESTA/data/queue/backup.pipe $VESTA/data/queue/disk.pipe \
     $VESTA/log/nginx-error.log $VESTA/log/auth.log
 chmod 750 $VESTA/conf $VESTA/data/users $VESTA/data/ips $VESTA/log
 chmod -R 750 $VESTA/data/queue
-chmod 660 /var/log/vesta/*
+chmod 660 $VESTA/log/*
 rm -f /var/log/vesta
 ln -s /usr/local/vesta/log /var/log/vesta
 

From 80bf6422c44e693455e6f68376b5ad6be5a78497 Mon Sep 17 00:00:00 2001
From: Serghey Rodin 
Date: Sat, 24 Oct 2015 15:23:30 +0300
Subject: [PATCH 126/264] no custom location for roundcube configs

---
 install/vst-install-ubuntu.sh | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/install/vst-install-ubuntu.sh b/install/vst-install-ubuntu.sh
index e6c7c165f..0aeb8878b 100755
--- a/install/vst-install-ubuntu.sh
+++ b/install/vst-install-ubuntu.sh
@@ -1048,10 +1048,6 @@ if [ "$exim" = 'yes' ] && [ "$mysql" = 'yes' ]; then
     mysql roundcube < /usr/share/dbconfig-common/data/roundcube/install/mysql
     php5enmod mcrypt 2>/dev/null
     service apache2 restart
-    if [ "$release" -eq 8 ]; then
-        mv -f /etc/roundcube/main.inc.php /etc/roundcube/config.inc.php
-        mv -f /etc/roundcube/db.inc.php /etc/roundcube/debian-db-roundcube.php
-    fi
 fi
 
 

From 56012d8719db1c783dbca01609123fa7e634540c Mon Sep 17 00:00:00 2001
From: Serghey Rodin 
Date: Sat, 24 Oct 2015 16:48:35 +0300
Subject: [PATCH 127/264] smart way to hanlde php.ini

---
 install/vst-install-debian.sh | 9 +++++----
 install/vst-install-rhel.sh   | 6 ++++--
 install/vst-install-ubuntu.sh | 9 +++++----
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/install/vst-install-debian.sh b/install/vst-install-debian.sh
index 36e619714..b740e6c09 100755
--- a/install/vst-install-debian.sh
+++ b/install/vst-install-debian.sh
@@ -105,6 +105,7 @@ set_default_value() {
     fi
 }
 
+
 #----------------------------------------------------------#
 #                    Verifications                         #
 #----------------------------------------------------------#
@@ -853,10 +854,10 @@ ZONE=$(timedatectl 2>/dev/null|grep Timezone|awk '{print $2}')
 if [ -z "$ZONE" ]; then
     ZONE='UTC'
 fi
-sed -i "s/;date.timezone =/date.timezone = $ZONE/g" /etc/php5/apache2/php.ini
-sed -i "s/;date.timezone =/date.timezone = $ZONE/g" /etc/php5/cli/php.ini
-sed -i 's%_open_tag = Off%_open_tag = On%g' /etc/php5/apache2/php.ini
-sed -i 's%_open_tag = Off%_open_tag = On%g' /etc/php5/cli/php.ini
+for pconf in $(find /etc/php* -name php.ini); do
+    sed -i "s/;date.timezone =/date.timezone = $ZONE/g" $pconf
+    sed -i 's%_open_tag = Off%_open_tag = On%g' $pconf
+fi
 
 
 #----------------------------------------------------------#
diff --git a/install/vst-install-rhel.sh b/install/vst-install-rhel.sh
index 53c6912d4..470c45ad2 100755
--- a/install/vst-install-rhel.sh
+++ b/install/vst-install-rhel.sh
@@ -892,8 +892,10 @@ fi
 if [ -z "$ZONE" ]; then
     ZONE='UTC'
 fi
-sed -i 's%short_open_tag = Off%short_open_tag = On%g' /etc/php.ini
-sed -i "s%;date.timezone =%date.timezone = $ZONE%g" /etc/php.ini
+for pconf in $(find /etc/php* -name php.ini); do
+    sed -i "s/;date.timezone =/date.timezone = $ZONE/g" $pconf
+    sed -i 's%_open_tag = Off%_open_tag = On%g' $pconf
+fi
 
 
 #----------------------------------------------------------#
diff --git a/install/vst-install-ubuntu.sh b/install/vst-install-ubuntu.sh
index 0aeb8878b..6847da629 100755
--- a/install/vst-install-ubuntu.sh
+++ b/install/vst-install-ubuntu.sh
@@ -90,6 +90,7 @@ set_default_value() {
     fi
 }
 
+
 #----------------------------------------------------------#
 #                    Verifications                         #
 #----------------------------------------------------------#
@@ -845,10 +846,10 @@ ZONE=$(timedatectl 2>/dev/null|grep Timezone|awk '{print $2}')
 if [ -z "$ZONE" ]; then
     ZONE='UTC'
 fi
-sed -i "s/;date.timezone =/date.timezone = $ZONE/g" /etc/php5/apache2/php.ini
-sed -i "s/;date.timezone =/date.timezone = $ZONE/g" /etc/php5/cli/php.ini
-sed -i 's%_open_tag = Off%_open_tag = On%g' /etc/php5/apache2/php.ini
-sed -i 's%_open_tag = Off%_open_tag = On%g' /etc/php5/cli/php.ini
+for pconf in $(find /etc/php* -name php.ini); do
+    sed -i "s/;date.timezone =/date.timezone = $ZONE/g" $pconf
+    sed -i 's%_open_tag = Off%_open_tag = On%g' $pconf
+fi
 
 
 #----------------------------------------------------------#

From 0c25d7f4ae260f84b9b4afac8836e3302e5887d1 Mon Sep 17 00:00:00 2001
From: Serghey Rodin 
Date: Sat, 24 Oct 2015 17:17:20 +0300
Subject: [PATCH 128/264] increased client_max_body_size to 256m

---
 install/debian/7/nginx/nginx.conf     | 2 +-
 install/debian/8/nginx/nginx.conf     | 2 +-
 install/rhel/5/nginx/nginx.conf       | 2 +-
 install/rhel/6/nginx/nginx.conf       | 2 +-
 install/rhel/7/nginx/nginx.conf       | 2 +-
 install/ubuntu/12.04/nginx/nginx.conf | 2 +-
 install/ubuntu/12.10/nginx/nginx.conf | 2 +-
 install/ubuntu/13.04/nginx/nginx.conf | 2 +-
 install/ubuntu/13.10/nginx/nginx.conf | 2 +-
 install/ubuntu/14.04/nginx/nginx.conf | 2 +-
 install/ubuntu/14.10/nginx/nginx.conf | 2 +-
 install/ubuntu/15.04/nginx/nginx.conf | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/install/debian/7/nginx/nginx.conf b/install/debian/7/nginx/nginx.conf
index 90dd50c6b..1e29f1fce 100644
--- a/install/debian/7/nginx/nginx.conf
+++ b/install/debian/7/nginx/nginx.conf
@@ -21,7 +21,7 @@ http {
     client_body_timeout             1m;
     client_header_buffer_size       2k;
     client_body_buffer_size         256k;
-    client_max_body_size            100m;
+    client_max_body_size            256m;
     large_client_header_buffers     4   8k;
     send_timeout                    30;
     keepalive_timeout               60 60;
diff --git a/install/debian/8/nginx/nginx.conf b/install/debian/8/nginx/nginx.conf
index 90dd50c6b..1e29f1fce 100644
--- a/install/debian/8/nginx/nginx.conf
+++ b/install/debian/8/nginx/nginx.conf
@@ -21,7 +21,7 @@ http {
     client_body_timeout             1m;
     client_header_buffer_size       2k;
     client_body_buffer_size         256k;
-    client_max_body_size            100m;
+    client_max_body_size            256m;
     large_client_header_buffers     4   8k;
     send_timeout                    30;
     keepalive_timeout               60 60;
diff --git a/install/rhel/5/nginx/nginx.conf b/install/rhel/5/nginx/nginx.conf
index 154fd0fe7..1b953c01a 100644
--- a/install/rhel/5/nginx/nginx.conf
+++ b/install/rhel/5/nginx/nginx.conf
@@ -21,7 +21,7 @@ http {
     client_body_timeout             1m;
     client_header_buffer_size       2k;
     client_body_buffer_size         256k;
-    client_max_body_size            100m;
+    client_max_body_size            256m;
     large_client_header_buffers     4   8k;
     send_timeout                    30;
     keepalive_timeout               60 60;
diff --git a/install/rhel/6/nginx/nginx.conf b/install/rhel/6/nginx/nginx.conf
index 154fd0fe7..1b953c01a 100644
--- a/install/rhel/6/nginx/nginx.conf
+++ b/install/rhel/6/nginx/nginx.conf
@@ -21,7 +21,7 @@ http {
     client_body_timeout             1m;
     client_header_buffer_size       2k;
     client_body_buffer_size         256k;
-    client_max_body_size            100m;
+    client_max_body_size            256m;
     large_client_header_buffers     4   8k;
     send_timeout                    30;
     keepalive_timeout               60 60;
diff --git a/install/rhel/7/nginx/nginx.conf b/install/rhel/7/nginx/nginx.conf
index 154fd0fe7..1b953c01a 100644
--- a/install/rhel/7/nginx/nginx.conf
+++ b/install/rhel/7/nginx/nginx.conf
@@ -21,7 +21,7 @@ http {
     client_body_timeout             1m;
     client_header_buffer_size       2k;
     client_body_buffer_size         256k;
-    client_max_body_size            100m;
+    client_max_body_size            256m;
     large_client_header_buffers     4   8k;
     send_timeout                    30;
     keepalive_timeout               60 60;
diff --git a/install/ubuntu/12.04/nginx/nginx.conf b/install/ubuntu/12.04/nginx/nginx.conf
index 90dd50c6b..1e29f1fce 100644
--- a/install/ubuntu/12.04/nginx/nginx.conf
+++ b/install/ubuntu/12.04/nginx/nginx.conf
@@ -21,7 +21,7 @@ http {
     client_body_timeout             1m;
     client_header_buffer_size       2k;
     client_body_buffer_size         256k;
-    client_max_body_size            100m;
+    client_max_body_size            256m;
     large_client_header_buffers     4   8k;
     send_timeout                    30;
     keepalive_timeout               60 60;
diff --git a/install/ubuntu/12.10/nginx/nginx.conf b/install/ubuntu/12.10/nginx/nginx.conf
index 90dd50c6b..1e29f1fce 100644
--- a/install/ubuntu/12.10/nginx/nginx.conf
+++ b/install/ubuntu/12.10/nginx/nginx.conf
@@ -21,7 +21,7 @@ http {
     client_body_timeout             1m;
     client_header_buffer_size       2k;
     client_body_buffer_size         256k;
-    client_max_body_size            100m;
+    client_max_body_size            256m;
     large_client_header_buffers     4   8k;
     send_timeout                    30;
     keepalive_timeout               60 60;
diff --git a/install/ubuntu/13.04/nginx/nginx.conf b/install/ubuntu/13.04/nginx/nginx.conf
index 90dd50c6b..1e29f1fce 100644
--- a/install/ubuntu/13.04/nginx/nginx.conf
+++ b/install/ubuntu/13.04/nginx/nginx.conf
@@ -21,7 +21,7 @@ http {
     client_body_timeout             1m;
     client_header_buffer_size       2k;
     client_body_buffer_size         256k;
-    client_max_body_size            100m;
+    client_max_body_size            256m;
     large_client_header_buffers     4   8k;
     send_timeout                    30;
     keepalive_timeout               60 60;
diff --git a/install/ubuntu/13.10/nginx/nginx.conf b/install/ubuntu/13.10/nginx/nginx.conf
index 90dd50c6b..1e29f1fce 100644
--- a/install/ubuntu/13.10/nginx/nginx.conf
+++ b/install/ubuntu/13.10/nginx/nginx.conf
@@ -21,7 +21,7 @@ http {
     client_body_timeout             1m;
     client_header_buffer_size       2k;
     client_body_buffer_size         256k;
-    client_max_body_size            100m;
+    client_max_body_size            256m;
     large_client_header_buffers     4   8k;
     send_timeout                    30;
     keepalive_timeout               60 60;
diff --git a/install/ubuntu/14.04/nginx/nginx.conf b/install/ubuntu/14.04/nginx/nginx.conf
index 90dd50c6b..1e29f1fce 100644
--- a/install/ubuntu/14.04/nginx/nginx.conf
+++ b/install/ubuntu/14.04/nginx/nginx.conf
@@ -21,7 +21,7 @@ http {
     client_body_timeout             1m;
     client_header_buffer_size       2k;
     client_body_buffer_size         256k;
-    client_max_body_size            100m;
+    client_max_body_size            256m;
     large_client_header_buffers     4   8k;
     send_timeout                    30;
     keepalive_timeout               60 60;
diff --git a/install/ubuntu/14.10/nginx/nginx.conf b/install/ubuntu/14.10/nginx/nginx.conf
index 90dd50c6b..1e29f1fce 100644
--- a/install/ubuntu/14.10/nginx/nginx.conf
+++ b/install/ubuntu/14.10/nginx/nginx.conf
@@ -21,7 +21,7 @@ http {
     client_body_timeout             1m;
     client_header_buffer_size       2k;
     client_body_buffer_size         256k;
-    client_max_body_size            100m;
+    client_max_body_size            256m;
     large_client_header_buffers     4   8k;
     send_timeout                    30;
     keepalive_timeout               60 60;
diff --git a/install/ubuntu/15.04/nginx/nginx.conf b/install/ubuntu/15.04/nginx/nginx.conf
index 90dd50c6b..1e29f1fce 100644
--- a/install/ubuntu/15.04/nginx/nginx.conf
+++ b/install/ubuntu/15.04/nginx/nginx.conf
@@ -21,7 +21,7 @@ http {
     client_body_timeout             1m;
     client_header_buffer_size       2k;
     client_body_buffer_size         256k;
-    client_max_body_size            100m;
+    client_max_body_size            256m;
     large_client_header_buffers     4   8k;
     send_timeout                    30;
     keepalive_timeout               60 60;

From bcc02c858dad2fcdfd59ca6aec44fe5f4d283e02 Mon Sep 17 00:00:00 2001
From: Serghey Rodin 
Date: Sat, 24 Oct 2015 18:43:42 +0300
Subject: [PATCH 129/264] new web template scheme

---
 bin/v-update-web-templates | 75 ++++++++++++++++++++------------------
 1 file changed, 39 insertions(+), 36 deletions(-)

diff --git a/bin/v-update-web-templates b/bin/v-update-web-templates
index 617a7e27a..7599f7c76 100755
--- a/bin/v-update-web-templates
+++ b/bin/v-update-web-templates
@@ -1,5 +1,5 @@
 #!/bin/bash
-# info: updates web templates
+# info: update web templates
 # options: [RESTART]
 #
 # The function for obtaining updated pack of web templates.
@@ -21,37 +21,40 @@ source $VESTA/conf/vesta.conf
 #                       Action                             #
 #----------------------------------------------------------#
 
-# Find out OS name
-if [ -e "/etc/redhat-release" ]; then
-    os="rhel"
-else
-    os="ubuntu"
+# Defining config host
+chost='c.vestacp.com'
+
+# Detcing OS
+case $(head -n1 /etc/issue |cut -f 1 -d ' ') in
+    Debian)     version="debian" ;;
+    Ubuntu)     version="ubuntu" ;;
+    *)          version="rhel" ;;
+esac
+
+# Detecting release
+if [ "$version" = 'rhel' ]; then
+    release=$(grep -o "[0-9]" /etc/redhat-release |head -n1)
+fi
+if [ "$version" = 'ubuntu' ]; then
+    release=$(lsb_release -r |awk '{print $2}')
+fi
+if [ "$version" = 'debian' ]; then
+    release=$(cat /etc/issue|grep -o [0-9]|head -n1)
 fi
 
-# Get new archive
-tmpdir=$(mktemp -d --dry-run)
-mkdir $tmpdir
-cd $tmpdir
-wget http://c.vestacp.com/$VERSION/$os/templates.tar.gz -q
-if [ "$?" -ne 0 ]; then
-    echo "Error: can't download template.tar.gz"
-    log_event "$E_CONNECT" "$EVENT"
-    rm -rf $tmpdir
-    exit $E_CONNECT
-fi
+# Defining download url
+vestacp="http://$chost/$version/$release"
 
-# Update templates
+# Downloading template archive
+cd $(mktemp -d)
+wget $vestacp/templates.tar.gz -q
+
+check_result $? "can't download template.tar.gz" $E_CONNECT
+
+# Updating templates
 tar -xzpf templates.tar.gz -C $VESTA/data/ templates/web
 
-# Replace includes for apache2.4
-if [ "$WEB_SYSTEM" = 'httpd' ] || [ "$WEB_SYSTEM" = 'apache2' ]; then
-    if [ ! -z "$(/usr/sbin/apachectl -v | grep 'Apache/2.4')" ]; then
-        sed -i "s/Include /IncludeOptional /g" \
-            $VESTA/data/templates/web/$WEB_SYSTEM/*tpl
-    fi
-fi
-
-# Rebuild web domains
+# Rebuilding web domains
 for user in $($BIN/v-list-sys-users plain); do
     $BIN/v-rebuild-web-domains $user no
 done
@@ -61,20 +64,20 @@ done
 #                       Vesta                              #
 #----------------------------------------------------------#
 
-# Restart web server
+# Restarting web server
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-web
-    if [ $? -ne 0 ]; then
-        exit $E_RESTART
+    check_result $? "restart" >/dev/null 2>&1
+
+    if [ ! -z "$PROXY_SYSTTEM" ]; then
+        $BIN/v-restart-proxy
+        check_result $? "restart" >/dev/null 2>&1
     fi
 
-    $BIN/v-restart-proxy
-    if [ $? -ne 0 ]; then
-        exit $E_RESTART
+    if [ ! -z "$WEB_BACKEND" ]; then
+        $BIN/v-restart-proxy
+        check_result $? "restart" >/dev/null 2>&1
     fi
 fi
 
-# Delete tmpdir
-rm -rf $tmpdir
-
 exit

From 083e820f57e7cd83102eadec37e3a58cf4e06601 Mon Sep 17 00:00:00 2001
From: Serghey Rodin 
Date: Sat, 24 Oct 2015 18:44:19 +0300
Subject: [PATCH 130/264] set ip even if ip doesn't exist

---
 func/ip.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/func/ip.sh b/func/ip.sh
index a77c62d59..9fb0a28aa 100644
--- a/func/ip.sh
+++ b/func/ip.sh
@@ -178,7 +178,11 @@ get_real_ip() {
         echo $1
     else
         nated_ip=$(grep -H "^NAT='$1'" $VESTA/data/ips/*)
-        echo "$nated_ip" | cut -f 1 -d : | cut -f 7 -d /
+        if [ ! -z "$nated_ip" ]; then
+            echo "$nated_ip" | cut -f 1 -d : | cut -f 7 -d /
+        else
+            get_user_ip
+        fi
     fi
 }
 

From 41ec0508fb67a8cbaac1ce8bec76526b62001d88 Mon Sep 17 00:00:00 2001
From: Serghey Rodin 
Date: Sat, 24 Oct 2015 19:04:07 +0300
Subject: [PATCH 131/264] no-php template

---
 .../templates/web/nginx/php5-fpm/no-php.stpl  | 42 +++++++++++++++++++
 .../7/templates/web/nginx/php5-fpm/no-php.tpl | 38 +++++++++++++++++
 .../templates/web/nginx/php5-fpm/no-php.stpl  | 42 +++++++++++++++++++
 .../8/templates/web/nginx/php5-fpm/no-php.tpl | 38 +++++++++++++++++
 .../7/templates/web/nginx/php-fpm/no-php.stpl | 42 +++++++++++++++++++
 .../7/templates/web/nginx/php-fpm/no-php.tpl  | 38 +++++++++++++++++
 .../templates/web/nginx/php5-fpm/no-php.stpl  | 42 +++++++++++++++++++
 .../templates/web/nginx/php5-fpm/no-php.tpl   | 38 +++++++++++++++++
 .../templates/web/nginx/php5-fpm/no-php.stpl  | 42 +++++++++++++++++++
 .../templates/web/nginx/php5-fpm/no-php.tpl   | 38 +++++++++++++++++
 .../templates/web/nginx/php5-fpm/no-php.stpl  | 42 +++++++++++++++++++
 .../templates/web/nginx/php5-fpm/no-php.tpl   | 38 +++++++++++++++++
 .../templates/web/nginx/php5-fpm/no-php.stpl  | 42 +++++++++++++++++++
 .../templates/web/nginx/php5-fpm/no-php.tpl   | 38 +++++++++++++++++
 .../templates/web/nginx/php5-fpm/no-php.stpl  | 42 +++++++++++++++++++
 .../templates/web/nginx/php5-fpm/no-php.tpl   | 38 +++++++++++++++++
 .../templates/web/nginx/php5-fpm/no-php.stpl  | 42 +++++++++++++++++++
 .../templates/web/nginx/php5-fpm/no-php.tpl   | 38 +++++++++++++++++
 .../templates/web/nginx/php5-fpm/no-php.stpl  | 42 +++++++++++++++++++
 .../templates/web/nginx/php5-fpm/no-php.tpl   | 38 +++++++++++++++++
 20 files changed, 800 insertions(+)
 create mode 100644 install/debian/7/templates/web/nginx/php5-fpm/no-php.stpl
 create mode 100644 install/debian/7/templates/web/nginx/php5-fpm/no-php.tpl
 create mode 100644 install/debian/8/templates/web/nginx/php5-fpm/no-php.stpl
 create mode 100644 install/debian/8/templates/web/nginx/php5-fpm/no-php.tpl
 create mode 100644 install/rhel/7/templates/web/nginx/php-fpm/no-php.stpl
 create mode 100644 install/rhel/7/templates/web/nginx/php-fpm/no-php.tpl
 create mode 100644 install/ubuntu/12.04/templates/web/nginx/php5-fpm/no-php.stpl
 create mode 100644 install/ubuntu/12.04/templates/web/nginx/php5-fpm/no-php.tpl
 create mode 100644 install/ubuntu/12.10/templates/web/nginx/php5-fpm/no-php.stpl
 create mode 100644 install/ubuntu/12.10/templates/web/nginx/php5-fpm/no-php.tpl
 create mode 100644 install/ubuntu/13.04/templates/web/nginx/php5-fpm/no-php.stpl
 create mode 100644 install/ubuntu/13.04/templates/web/nginx/php5-fpm/no-php.tpl
 create mode 100644 install/ubuntu/13.10/templates/web/nginx/php5-fpm/no-php.stpl
 create mode 100644 install/ubuntu/13.10/templates/web/nginx/php5-fpm/no-php.tpl
 create mode 100644 install/ubuntu/14.04/templates/web/nginx/php5-fpm/no-php.stpl
 create mode 100644 install/ubuntu/14.04/templates/web/nginx/php5-fpm/no-php.tpl
 create mode 100644 install/ubuntu/14.10/templates/web/nginx/php5-fpm/no-php.stpl
 create mode 100644 install/ubuntu/14.10/templates/web/nginx/php5-fpm/no-php.tpl
 create mode 100644 install/ubuntu/15.04/templates/web/nginx/php5-fpm/no-php.stpl
 create mode 100644 install/ubuntu/15.04/templates/web/nginx/php5-fpm/no-php.tpl

diff --git a/install/debian/7/templates/web/nginx/php5-fpm/no-php.stpl b/install/debian/7/templates/web/nginx/php5-fpm/no-php.stpl
new file mode 100644
index 000000000..a0234ae3a
--- /dev/null
+++ b/install/debian/7/templates/web/nginx/php5-fpm/no-php.stpl
@@ -0,0 +1,42 @@
+server {
+    listen      %ip%:%web_ssl_port%;
+    server_name %domain_idn% %alias_idn%;
+    root        %sdocroot%;
+    index       index.php index.html index.htm;
+    access_log  /var/log/nginx/domains/%domain%.log combined;
+    access_log  /var/log/nginx/domains/%domain%.bytes bytes;
+    error_log   /var/log/nginx/domains/%domain%.error.log error;
+
+    ssl         on;
+    ssl_certificate      %ssl_pem%;
+    ssl_certificate_key  %ssl_key%;
+
+    types {
+            text/html   html htm shtml php php5;
+    }
+
+    location / {
+        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+            expires     max;
+        }
+    }
+
+    error_page  403 /error/404.html;
+    error_page  404 /error/404.html;
+    error_page  500 502 503 504 /error/50x.html;
+
+    location /error/ {
+        alias   %home%/%user%/web/%domain%/document_errors/;
+    }
+
+    location ~* "/\.(htaccess|htpasswd)$" {
+        deny    all;
+        return  404;
+    }
+
+    include     /etc/nginx/conf.d/phpmyadmin.inc*;
+    include     /etc/nginx/conf.d/phppgadmin.inc*;
+    include     /etc/nginx/conf.d/webmail.inc*;
+
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
+}
diff --git a/install/debian/7/templates/web/nginx/php5-fpm/no-php.tpl b/install/debian/7/templates/web/nginx/php5-fpm/no-php.tpl
new file mode 100644
index 000000000..97d045990
--- /dev/null
+++ b/install/debian/7/templates/web/nginx/php5-fpm/no-php.tpl
@@ -0,0 +1,38 @@
+server {
+    listen      %ip%:%web_port%;
+    server_name %domain_idn% %alias_idn%;
+    root        %docroot%;
+    index       index.php index.html index.htm;
+    access_log  /var/log/nginx/domains/%domain%.log combined;
+    access_log  /var/log/nginx/domains/%domain%.bytes bytes;
+    error_log   /var/log/nginx/domains/%domain%.error.log error;
+
+    types {
+            text/html   html htm shtml php php5;
+    }
+
+    location / {
+        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+            expires     max;
+        }
+    }
+
+    error_page  403 /error/404.html;
+    error_page  404 /error/404.html;
+    error_page  500 502 503 504 /error/50x.html;
+
+    location /error/ {
+        alias   %home%/%user%/web/%domain%/document_errors/;
+    }
+
+    location ~* "/\.(htaccess|htpasswd)$" {
+        deny    all;
+        return  404;
+    }
+
+    include     /etc/nginx/conf.d/phpmyadmin.inc*;
+    include     /etc/nginx/conf.d/phppgadmin.inc*;
+    include     /etc/nginx/conf.d/webmail.inc*;
+
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
+}
diff --git a/install/debian/8/templates/web/nginx/php5-fpm/no-php.stpl b/install/debian/8/templates/web/nginx/php5-fpm/no-php.stpl
new file mode 100644
index 000000000..a0234ae3a
--- /dev/null
+++ b/install/debian/8/templates/web/nginx/php5-fpm/no-php.stpl
@@ -0,0 +1,42 @@
+server {
+    listen      %ip%:%web_ssl_port%;
+    server_name %domain_idn% %alias_idn%;
+    root        %sdocroot%;
+    index       index.php index.html index.htm;
+    access_log  /var/log/nginx/domains/%domain%.log combined;
+    access_log  /var/log/nginx/domains/%domain%.bytes bytes;
+    error_log   /var/log/nginx/domains/%domain%.error.log error;
+
+    ssl         on;
+    ssl_certificate      %ssl_pem%;
+    ssl_certificate_key  %ssl_key%;
+
+    types {
+            text/html   html htm shtml php php5;
+    }
+
+    location / {
+        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+            expires     max;
+        }
+    }
+
+    error_page  403 /error/404.html;
+    error_page  404 /error/404.html;
+    error_page  500 502 503 504 /error/50x.html;
+
+    location /error/ {
+        alias   %home%/%user%/web/%domain%/document_errors/;
+    }
+
+    location ~* "/\.(htaccess|htpasswd)$" {
+        deny    all;
+        return  404;
+    }
+
+    include     /etc/nginx/conf.d/phpmyadmin.inc*;
+    include     /etc/nginx/conf.d/phppgadmin.inc*;
+    include     /etc/nginx/conf.d/webmail.inc*;
+
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
+}
diff --git a/install/debian/8/templates/web/nginx/php5-fpm/no-php.tpl b/install/debian/8/templates/web/nginx/php5-fpm/no-php.tpl
new file mode 100644
index 000000000..97d045990
--- /dev/null
+++ b/install/debian/8/templates/web/nginx/php5-fpm/no-php.tpl
@@ -0,0 +1,38 @@
+server {
+    listen      %ip%:%web_port%;
+    server_name %domain_idn% %alias_idn%;
+    root        %docroot%;
+    index       index.php index.html index.htm;
+    access_log  /var/log/nginx/domains/%domain%.log combined;
+    access_log  /var/log/nginx/domains/%domain%.bytes bytes;
+    error_log   /var/log/nginx/domains/%domain%.error.log error;
+
+    types {
+            text/html   html htm shtml php php5;
+    }
+
+    location / {
+        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+            expires     max;
+        }
+    }
+
+    error_page  403 /error/404.html;
+    error_page  404 /error/404.html;
+    error_page  500 502 503 504 /error/50x.html;
+
+    location /error/ {
+        alias   %home%/%user%/web/%domain%/document_errors/;
+    }
+
+    location ~* "/\.(htaccess|htpasswd)$" {
+        deny    all;
+        return  404;
+    }
+
+    include     /etc/nginx/conf.d/phpmyadmin.inc*;
+    include     /etc/nginx/conf.d/phppgadmin.inc*;
+    include     /etc/nginx/conf.d/webmail.inc*;
+
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
+}
diff --git a/install/rhel/7/templates/web/nginx/php-fpm/no-php.stpl b/install/rhel/7/templates/web/nginx/php-fpm/no-php.stpl
new file mode 100644
index 000000000..a0234ae3a
--- /dev/null
+++ b/install/rhel/7/templates/web/nginx/php-fpm/no-php.stpl
@@ -0,0 +1,42 @@
+server {
+    listen      %ip%:%web_ssl_port%;
+    server_name %domain_idn% %alias_idn%;
+    root        %sdocroot%;
+    index       index.php index.html index.htm;
+    access_log  /var/log/nginx/domains/%domain%.log combined;
+    access_log  /var/log/nginx/domains/%domain%.bytes bytes;
+    error_log   /var/log/nginx/domains/%domain%.error.log error;
+
+    ssl         on;
+    ssl_certificate      %ssl_pem%;
+    ssl_certificate_key  %ssl_key%;
+
+    types {
+            text/html   html htm shtml php php5;
+    }
+
+    location / {
+        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+            expires     max;
+        }
+    }
+
+    error_page  403 /error/404.html;
+    error_page  404 /error/404.html;
+    error_page  500 502 503 504 /error/50x.html;
+
+    location /error/ {
+        alias   %home%/%user%/web/%domain%/document_errors/;
+    }
+
+    location ~* "/\.(htaccess|htpasswd)$" {
+        deny    all;
+        return  404;
+    }
+
+    include     /etc/nginx/conf.d/phpmyadmin.inc*;
+    include     /etc/nginx/conf.d/phppgadmin.inc*;
+    include     /etc/nginx/conf.d/webmail.inc*;
+
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
+}
diff --git a/install/rhel/7/templates/web/nginx/php-fpm/no-php.tpl b/install/rhel/7/templates/web/nginx/php-fpm/no-php.tpl
new file mode 100644
index 000000000..97d045990
--- /dev/null
+++ b/install/rhel/7/templates/web/nginx/php-fpm/no-php.tpl
@@ -0,0 +1,38 @@
+server {
+    listen      %ip%:%web_port%;
+    server_name %domain_idn% %alias_idn%;
+    root        %docroot%;
+    index       index.php index.html index.htm;
+    access_log  /var/log/nginx/domains/%domain%.log combined;
+    access_log  /var/log/nginx/domains/%domain%.bytes bytes;
+    error_log   /var/log/nginx/domains/%domain%.error.log error;
+
+    types {
+            text/html   html htm shtml php php5;
+    }
+
+    location / {
+        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+            expires     max;
+        }
+    }
+
+    error_page  403 /error/404.html;
+    error_page  404 /error/404.html;
+    error_page  500 502 503 504 /error/50x.html;
+
+    location /error/ {
+        alias   %home%/%user%/web/%domain%/document_errors/;
+    }
+
+    location ~* "/\.(htaccess|htpasswd)$" {
+        deny    all;
+        return  404;
+    }
+
+    include     /etc/nginx/conf.d/phpmyadmin.inc*;
+    include     /etc/nginx/conf.d/phppgadmin.inc*;
+    include     /etc/nginx/conf.d/webmail.inc*;
+
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
+}
diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/no-php.stpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/no-php.stpl
new file mode 100644
index 000000000..a0234ae3a
--- /dev/null
+++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/no-php.stpl
@@ -0,0 +1,42 @@
+server {
+    listen      %ip%:%web_ssl_port%;
+    server_name %domain_idn% %alias_idn%;
+    root        %sdocroot%;
+    index       index.php index.html index.htm;
+    access_log  /var/log/nginx/domains/%domain%.log combined;
+    access_log  /var/log/nginx/domains/%domain%.bytes bytes;
+    error_log   /var/log/nginx/domains/%domain%.error.log error;
+
+    ssl         on;
+    ssl_certificate      %ssl_pem%;
+    ssl_certificate_key  %ssl_key%;
+
+    types {
+            text/html   html htm shtml php php5;
+    }
+
+    location / {
+        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+            expires     max;
+        }
+    }
+
+    error_page  403 /error/404.html;
+    error_page  404 /error/404.html;
+    error_page  500 502 503 504 /error/50x.html;
+
+    location /error/ {
+        alias   %home%/%user%/web/%domain%/document_errors/;
+    }
+
+    location ~* "/\.(htaccess|htpasswd)$" {
+        deny    all;
+        return  404;
+    }
+
+    include     /etc/nginx/conf.d/phpmyadmin.inc*;
+    include     /etc/nginx/conf.d/phppgadmin.inc*;
+    include     /etc/nginx/conf.d/webmail.inc*;
+
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
+}
diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/no-php.tpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/no-php.tpl
new file mode 100644
index 000000000..97d045990
--- /dev/null
+++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/no-php.tpl
@@ -0,0 +1,38 @@
+server {
+    listen      %ip%:%web_port%;
+    server_name %domain_idn% %alias_idn%;
+    root        %docroot%;
+    index       index.php index.html index.htm;
+    access_log  /var/log/nginx/domains/%domain%.log combined;
+    access_log  /var/log/nginx/domains/%domain%.bytes bytes;
+    error_log   /var/log/nginx/domains/%domain%.error.log error;
+
+    types {
+            text/html   html htm shtml php php5;
+    }
+
+    location / {
+        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+            expires     max;
+        }
+    }
+
+    error_page  403 /error/404.html;
+    error_page  404 /error/404.html;
+    error_page  500 502 503 504 /error/50x.html;
+
+    location /error/ {
+        alias   %home%/%user%/web/%domain%/document_errors/;
+    }
+
+    location ~* "/\.(htaccess|htpasswd)$" {
+        deny    all;
+        return  404;
+    }
+
+    include     /etc/nginx/conf.d/phpmyadmin.inc*;
+    include     /etc/nginx/conf.d/phppgadmin.inc*;
+    include     /etc/nginx/conf.d/webmail.inc*;
+
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
+}
diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/no-php.stpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/no-php.stpl
new file mode 100644
index 000000000..a0234ae3a
--- /dev/null
+++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/no-php.stpl
@@ -0,0 +1,42 @@
+server {
+    listen      %ip%:%web_ssl_port%;
+    server_name %domain_idn% %alias_idn%;
+    root        %sdocroot%;
+    index       index.php index.html index.htm;
+    access_log  /var/log/nginx/domains/%domain%.log combined;
+    access_log  /var/log/nginx/domains/%domain%.bytes bytes;
+    error_log   /var/log/nginx/domains/%domain%.error.log error;
+
+    ssl         on;
+    ssl_certificate      %ssl_pem%;
+    ssl_certificate_key  %ssl_key%;
+
+    types {
+            text/html   html htm shtml php php5;
+    }
+
+    location / {
+        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+            expires     max;
+        }
+    }
+
+    error_page  403 /error/404.html;
+    error_page  404 /error/404.html;
+    error_page  500 502 503 504 /error/50x.html;
+
+    location /error/ {
+        alias   %home%/%user%/web/%domain%/document_errors/;
+    }
+
+    location ~* "/\.(htaccess|htpasswd)$" {
+        deny    all;
+        return  404;
+    }
+
+    include     /etc/nginx/conf.d/phpmyadmin.inc*;
+    include     /etc/nginx/conf.d/phppgadmin.inc*;
+    include     /etc/nginx/conf.d/webmail.inc*;
+
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
+}
diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/no-php.tpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/no-php.tpl
new file mode 100644
index 000000000..97d045990
--- /dev/null
+++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/no-php.tpl
@@ -0,0 +1,38 @@
+server {
+    listen      %ip%:%web_port%;
+    server_name %domain_idn% %alias_idn%;
+    root        %docroot%;
+    index       index.php index.html index.htm;
+    access_log  /var/log/nginx/domains/%domain%.log combined;
+    access_log  /var/log/nginx/domains/%domain%.bytes bytes;
+    error_log   /var/log/nginx/domains/%domain%.error.log error;
+
+    types {
+            text/html   html htm shtml php php5;
+    }
+
+    location / {
+        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+            expires     max;
+        }
+    }
+
+    error_page  403 /error/404.html;
+    error_page  404 /error/404.html;
+    error_page  500 502 503 504 /error/50x.html;
+
+    location /error/ {
+        alias   %home%/%user%/web/%domain%/document_errors/;
+    }
+
+    location ~* "/\.(htaccess|htpasswd)$" {
+        deny    all;
+        return  404;
+    }
+
+    include     /etc/nginx/conf.d/phpmyadmin.inc*;
+    include     /etc/nginx/conf.d/phppgadmin.inc*;
+    include     /etc/nginx/conf.d/webmail.inc*;
+
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
+}
diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/no-php.stpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/no-php.stpl
new file mode 100644
index 000000000..a0234ae3a
--- /dev/null
+++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/no-php.stpl
@@ -0,0 +1,42 @@
+server {
+    listen      %ip%:%web_ssl_port%;
+    server_name %domain_idn% %alias_idn%;
+    root        %sdocroot%;
+    index       index.php index.html index.htm;
+    access_log  /var/log/nginx/domains/%domain%.log combined;
+    access_log  /var/log/nginx/domains/%domain%.bytes bytes;
+    error_log   /var/log/nginx/domains/%domain%.error.log error;
+
+    ssl         on;
+    ssl_certificate      %ssl_pem%;
+    ssl_certificate_key  %ssl_key%;
+
+    types {
+            text/html   html htm shtml php php5;
+    }
+
+    location / {
+        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+            expires     max;
+        }
+    }
+
+    error_page  403 /error/404.html;
+    error_page  404 /error/404.html;
+    error_page  500 502 503 504 /error/50x.html;
+
+    location /error/ {
+        alias   %home%/%user%/web/%domain%/document_errors/;
+    }
+
+    location ~* "/\.(htaccess|htpasswd)$" {
+        deny    all;
+        return  404;
+    }
+
+    include     /etc/nginx/conf.d/phpmyadmin.inc*;
+    include     /etc/nginx/conf.d/phppgadmin.inc*;
+    include     /etc/nginx/conf.d/webmail.inc*;
+
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
+}
diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/no-php.tpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/no-php.tpl
new file mode 100644
index 000000000..97d045990
--- /dev/null
+++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/no-php.tpl
@@ -0,0 +1,38 @@
+server {
+    listen      %ip%:%web_port%;
+    server_name %domain_idn% %alias_idn%;
+    root        %docroot%;
+    index       index.php index.html index.htm;
+    access_log  /var/log/nginx/domains/%domain%.log combined;
+    access_log  /var/log/nginx/domains/%domain%.bytes bytes;
+    error_log   /var/log/nginx/domains/%domain%.error.log error;
+
+    types {
+            text/html   html htm shtml php php5;
+    }
+
+    location / {
+        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+            expires     max;
+        }
+    }
+
+    error_page  403 /error/404.html;
+    error_page  404 /error/404.html;
+    error_page  500 502 503 504 /error/50x.html;
+
+    location /error/ {
+        alias   %home%/%user%/web/%domain%/document_errors/;
+    }
+
+    location ~* "/\.(htaccess|htpasswd)$" {
+        deny    all;
+        return  404;
+    }
+
+    include     /etc/nginx/conf.d/phpmyadmin.inc*;
+    include     /etc/nginx/conf.d/phppgadmin.inc*;
+    include     /etc/nginx/conf.d/webmail.inc*;
+
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
+}
diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/no-php.stpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/no-php.stpl
new file mode 100644
index 000000000..a0234ae3a
--- /dev/null
+++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/no-php.stpl
@@ -0,0 +1,42 @@
+server {
+    listen      %ip%:%web_ssl_port%;
+    server_name %domain_idn% %alias_idn%;
+    root        %sdocroot%;
+    index       index.php index.html index.htm;
+    access_log  /var/log/nginx/domains/%domain%.log combined;
+    access_log  /var/log/nginx/domains/%domain%.bytes bytes;
+    error_log   /var/log/nginx/domains/%domain%.error.log error;
+
+    ssl         on;
+    ssl_certificate      %ssl_pem%;
+    ssl_certificate_key  %ssl_key%;
+
+    types {
+            text/html   html htm shtml php php5;
+    }
+
+    location / {
+        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+            expires     max;
+        }
+    }
+
+    error_page  403 /error/404.html;
+    error_page  404 /error/404.html;
+    error_page  500 502 503 504 /error/50x.html;
+
+    location /error/ {
+        alias   %home%/%user%/web/%domain%/document_errors/;
+    }
+
+    location ~* "/\.(htaccess|htpasswd)$" {
+        deny    all;
+        return  404;
+    }
+
+    include     /etc/nginx/conf.d/phpmyadmin.inc*;
+    include     /etc/nginx/conf.d/phppgadmin.inc*;
+    include     /etc/nginx/conf.d/webmail.inc*;
+
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
+}
diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/no-php.tpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/no-php.tpl
new file mode 100644
index 000000000..97d045990
--- /dev/null
+++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/no-php.tpl
@@ -0,0 +1,38 @@
+server {
+    listen      %ip%:%web_port%;
+    server_name %domain_idn% %alias_idn%;
+    root        %docroot%;
+    index       index.php index.html index.htm;
+    access_log  /var/log/nginx/domains/%domain%.log combined;
+    access_log  /var/log/nginx/domains/%domain%.bytes bytes;
+    error_log   /var/log/nginx/domains/%domain%.error.log error;
+
+    types {
+            text/html   html htm shtml php php5;
+    }
+
+    location / {
+        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+            expires     max;
+        }
+    }
+
+    error_page  403 /error/404.html;
+    error_page  404 /error/404.html;
+    error_page  500 502 503 504 /error/50x.html;
+
+    location /error/ {
+        alias   %home%/%user%/web/%domain%/document_errors/;
+    }
+
+    location ~* "/\.(htaccess|htpasswd)$" {
+        deny    all;
+        return  404;
+    }
+
+    include     /etc/nginx/conf.d/phpmyadmin.inc*;
+    include     /etc/nginx/conf.d/phppgadmin.inc*;
+    include     /etc/nginx/conf.d/webmail.inc*;
+
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
+}
diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/no-php.stpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/no-php.stpl
new file mode 100644
index 000000000..a0234ae3a
--- /dev/null
+++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/no-php.stpl
@@ -0,0 +1,42 @@
+server {
+    listen      %ip%:%web_ssl_port%;
+    server_name %domain_idn% %alias_idn%;
+    root        %sdocroot%;
+    index       index.php index.html index.htm;
+    access_log  /var/log/nginx/domains/%domain%.log combined;
+    access_log  /var/log/nginx/domains/%domain%.bytes bytes;
+    error_log   /var/log/nginx/domains/%domain%.error.log error;
+
+    ssl         on;
+    ssl_certificate      %ssl_pem%;
+    ssl_certificate_key  %ssl_key%;
+
+    types {
+            text/html   html htm shtml php php5;
+    }
+
+    location / {
+        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+            expires     max;
+        }
+    }
+
+    error_page  403 /error/404.html;
+    error_page  404 /error/404.html;
+    error_page  500 502 503 504 /error/50x.html;
+
+    location /error/ {
+        alias   %home%/%user%/web/%domain%/document_errors/;
+    }
+
+    location ~* "/\.(htaccess|htpasswd)$" {
+        deny    all;
+        return  404;
+    }
+
+    include     /etc/nginx/conf.d/phpmyadmin.inc*;
+    include     /etc/nginx/conf.d/phppgadmin.inc*;
+    include     /etc/nginx/conf.d/webmail.inc*;
+
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
+}
diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/no-php.tpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/no-php.tpl
new file mode 100644
index 000000000..97d045990
--- /dev/null
+++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/no-php.tpl
@@ -0,0 +1,38 @@
+server {
+    listen      %ip%:%web_port%;
+    server_name %domain_idn% %alias_idn%;
+    root        %docroot%;
+    index       index.php index.html index.htm;
+    access_log  /var/log/nginx/domains/%domain%.log combined;
+    access_log  /var/log/nginx/domains/%domain%.bytes bytes;
+    error_log   /var/log/nginx/domains/%domain%.error.log error;
+
+    types {
+            text/html   html htm shtml php php5;
+    }
+
+    location / {
+        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+            expires     max;
+        }
+    }
+
+    error_page  403 /error/404.html;
+    error_page  404 /error/404.html;
+    error_page  500 502 503 504 /error/50x.html;
+
+    location /error/ {
+        alias   %home%/%user%/web/%domain%/document_errors/;
+    }
+
+    location ~* "/\.(htaccess|htpasswd)$" {
+        deny    all;
+        return  404;
+    }
+
+    include     /etc/nginx/conf.d/phpmyadmin.inc*;
+    include     /etc/nginx/conf.d/phppgadmin.inc*;
+    include     /etc/nginx/conf.d/webmail.inc*;
+
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
+}
diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/no-php.stpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/no-php.stpl
new file mode 100644
index 000000000..a0234ae3a
--- /dev/null
+++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/no-php.stpl
@@ -0,0 +1,42 @@
+server {
+    listen      %ip%:%web_ssl_port%;
+    server_name %domain_idn% %alias_idn%;
+    root        %sdocroot%;
+    index       index.php index.html index.htm;
+    access_log  /var/log/nginx/domains/%domain%.log combined;
+    access_log  /var/log/nginx/domains/%domain%.bytes bytes;
+    error_log   /var/log/nginx/domains/%domain%.error.log error;
+
+    ssl         on;
+    ssl_certificate      %ssl_pem%;
+    ssl_certificate_key  %ssl_key%;
+
+    types {
+            text/html   html htm shtml php php5;
+    }
+
+    location / {
+        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+            expires     max;
+        }
+    }
+
+    error_page  403 /error/404.html;
+    error_page  404 /error/404.html;
+    error_page  500 502 503 504 /error/50x.html;
+
+    location /error/ {
+        alias   %home%/%user%/web/%domain%/document_errors/;
+    }
+
+    location ~* "/\.(htaccess|htpasswd)$" {
+        deny    all;
+        return  404;
+    }
+
+    include     /etc/nginx/conf.d/phpmyadmin.inc*;
+    include     /etc/nginx/conf.d/phppgadmin.inc*;
+    include     /etc/nginx/conf.d/webmail.inc*;
+
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
+}
diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/no-php.tpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/no-php.tpl
new file mode 100644
index 000000000..97d045990
--- /dev/null
+++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/no-php.tpl
@@ -0,0 +1,38 @@
+server {
+    listen      %ip%:%web_port%;
+    server_name %domain_idn% %alias_idn%;
+    root        %docroot%;
+    index       index.php index.html index.htm;
+    access_log  /var/log/nginx/domains/%domain%.log combined;
+    access_log  /var/log/nginx/domains/%domain%.bytes bytes;
+    error_log   /var/log/nginx/domains/%domain%.error.log error;
+
+    types {
+            text/html   html htm shtml php php5;
+    }
+
+    location / {
+        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+            expires     max;
+        }
+    }
+
+    error_page  403 /error/404.html;
+    error_page  404 /error/404.html;
+    error_page  500 502 503 504 /error/50x.html;
+
+    location /error/ {
+        alias   %home%/%user%/web/%domain%/document_errors/;
+    }
+
+    location ~* "/\.(htaccess|htpasswd)$" {
+        deny    all;
+        return  404;
+    }
+
+    include     /etc/nginx/conf.d/phpmyadmin.inc*;
+    include     /etc/nginx/conf.d/phppgadmin.inc*;
+    include     /etc/nginx/conf.d/webmail.inc*;
+
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
+}
diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/no-php.stpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/no-php.stpl
new file mode 100644
index 000000000..a0234ae3a
--- /dev/null
+++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/no-php.stpl
@@ -0,0 +1,42 @@
+server {
+    listen      %ip%:%web_ssl_port%;
+    server_name %domain_idn% %alias_idn%;
+    root        %sdocroot%;
+    index       index.php index.html index.htm;
+    access_log  /var/log/nginx/domains/%domain%.log combined;
+    access_log  /var/log/nginx/domains/%domain%.bytes bytes;
+    error_log   /var/log/nginx/domains/%domain%.error.log error;
+
+    ssl         on;
+    ssl_certificate      %ssl_pem%;
+    ssl_certificate_key  %ssl_key%;
+
+    types {
+            text/html   html htm shtml php php5;
+    }
+
+    location / {
+        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+            expires     max;
+        }
+    }
+
+    error_page  403 /error/404.html;
+    error_page  404 /error/404.html;
+    error_page  500 502 503 504 /error/50x.html;
+
+    location /error/ {
+        alias   %home%/%user%/web/%domain%/document_errors/;
+    }
+
+    location ~* "/\.(htaccess|htpasswd)$" {
+        deny    all;
+        return  404;
+    }
+
+    include     /etc/nginx/conf.d/phpmyadmin.inc*;
+    include     /etc/nginx/conf.d/phppgadmin.inc*;
+    include     /etc/nginx/conf.d/webmail.inc*;
+
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
+}
diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/no-php.tpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/no-php.tpl
new file mode 100644
index 000000000..97d045990
--- /dev/null
+++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/no-php.tpl
@@ -0,0 +1,38 @@
+server {
+    listen      %ip%:%web_port%;
+    server_name %domain_idn% %alias_idn%;
+    root        %docroot%;
+    index       index.php index.html index.htm;
+    access_log  /var/log/nginx/domains/%domain%.log combined;
+    access_log  /var/log/nginx/domains/%domain%.bytes bytes;
+    error_log   /var/log/nginx/domains/%domain%.error.log error;
+
+    types {
+            text/html   html htm shtml php php5;
+    }
+
+    location / {
+        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+            expires     max;
+        }
+    }
+
+    error_page  403 /error/404.html;
+    error_page  404 /error/404.html;
+    error_page  500 502 503 504 /error/50x.html;
+
+    location /error/ {
+        alias   %home%/%user%/web/%domain%/document_errors/;
+    }
+
+    location ~* "/\.(htaccess|htpasswd)$" {
+        deny    all;
+        return  404;
+    }
+
+    include     /etc/nginx/conf.d/phpmyadmin.inc*;
+    include     /etc/nginx/conf.d/phppgadmin.inc*;
+    include     /etc/nginx/conf.d/webmail.inc*;
+
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
+}

From fa4813cf89aa7d24c3d656e3f96fd87c7ab6c9ef Mon Sep 17 00:00:00 2001
From: Serghey Rodin 
Date: Wed, 28 Oct 2015 16:32:20 +0200
Subject: [PATCH 132/264] exclusion list in array

---
 bin/v-add-backup-host | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/bin/v-add-backup-host b/bin/v-add-backup-host
index 7cf08fe30..00fcfeccf 100755
--- a/bin/v-add-backup-host
+++ b/bin/v-add-backup-host
@@ -98,11 +98,7 @@ if [ "$type" != 'local' ];then
     is_password_valid
     if [ "$type" = 'sftp' ]; then
         which expect >/dev/null 2>&1
-        if [ $? -ne 0 ];then
-            echo "Error: expect utility not found"
-            log_event "$E_NOTEXIST" "$EVENT"
-            exit $E_NOTEXIST
-        fi
+        check_result $? "expect command not found"  $E_NOTEXIST
     fi
 fi
 

From 062b7e81f050dfe229ed994033a71300964fd622 Mon Sep 17 00:00:00 2001
From: Serghey Rodin 
Date: Wed, 28 Oct 2015 16:33:55 +0200
Subject: [PATCH 133/264] switched to bc for math calculation

---
 bin/v-update-user-quota | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/bin/v-update-user-quota b/bin/v-update-user-quota
index 3dffb1220..754639b71 100755
--- a/bin/v-update-user-quota
+++ b/bin/v-update-user-quota
@@ -33,17 +33,17 @@ 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 * 1024 * 0.90))
-hard=$((quota * 1024))
+soft=$(echo "$quota * 1024 * 0.90"|bc |cut -f 1 -d .)
+hard=$(echo "$quota * 1024"|bc |cut -f 1 -d .)
 
 # Searching home mount point
 mnt=$(df -P /home |awk '{print $6}' |tail -n1)
 
 # Checking unlinmited quota
 if [ "$quota" = 'unlimited' ]; then
-    setquota $user 0 0 0 0 $mnt
+    setquota $user 0 0 0 0 $mnt 2>/dev/null
 else
-    setquota $user $soft $hard 0 0 $mnt
+    setquota $user $soft $hard 0 0 $mnt 2>/dev/null
 fi
 
 

From 91a804c1c8ef02f44785f9a8ff428b44f7dab737 Mon Sep 17 00:00:00 2001
From: Serghey Rodin 
Date: Wed, 28 Oct 2015 16:34:41 +0200
Subject: [PATCH 134/264] check_result function

---
 bin/v-add-cron-job                  |  6 ++----
 bin/v-add-cron-reports              |  4 +---
 bin/v-add-cron-vesta-autoupdate     |  6 ++----
 bin/v-add-sys-ip                    |  8 ++------
 bin/v-add-sys-quota                 | 17 +++------------
 bin/v-add-user                      |  6 +-----
 bin/v-add-web-domain                | 11 ++++------
 bin/v-add-web-domain-alias          | 14 ++++++-------
 bin/v-add-web-domain-backend        |  4 +---
 bin/v-add-web-domain-proxy          |  6 ++----
 bin/v-add-web-domain-ssl            | 14 ++++++-------
 bin/v-change-cron-job               |  6 ++----
 bin/v-change-dns-domain-ip          |  6 ++----
 bin/v-change-dns-domain-soa         |  6 ++----
 bin/v-change-dns-domain-tpl         |  6 ++----
 bin/v-change-dns-domain-ttl         |  6 ++----
 bin/v-change-dns-record             |  6 ++----
 bin/v-change-dns-record-id          |  6 ++----
 bin/v-change-sys-ip-nat             |  4 +---
 bin/v-change-web-domain-backend-tpl | 11 ++++------
 bin/v-change-web-domain-ip          | 24 ++++++++++------------
 bin/v-change-web-domain-proxy-tpl   |  8 +++-----
 bin/v-change-web-domain-sslcert     | 21 ++++++++++---------
 bin/v-change-web-domain-sslhome     | 21 ++++++++++---------
 bin/v-change-web-domain-tpl         |  6 ++----
 bin/v-delete-cron-job               |  6 ++----
 bin/v-delete-cron-reports           |  6 ++----
 bin/v-delete-cron-vesta-autoupdate  |  6 ++----
 bin/v-delete-dns-domain             |  6 ++----
 bin/v-delete-dns-domains            |  9 ++++----
 bin/v-delete-dns-domains-src        |  4 +---
 bin/v-delete-dns-record             |  6 ++----
 bin/v-delete-sys-ip                 |  8 ++------
 bin/v-delete-web-domain             | 10 +++------
 bin/v-delete-web-domain-alias       | 14 ++++++-------
 bin/v-delete-web-domain-backend     |  6 ++----
 bin/v-delete-web-domain-proxy       |  4 +---
 bin/v-delete-web-domain-ssl         | 14 ++++++-------
 bin/v-delete-web-domains            | 10 +++------
 bin/v-insert-dns-domain             |  6 ++----
 bin/v-insert-dns-record             |  6 ++----
 bin/v-insert-dns-records            |  6 ++----
 bin/v-rebuild-cron-jobs             |  6 ++----
 bin/v-rebuild-dns-domain            |  6 ++----
 bin/v-rebuild-dns-domains           |  6 ++----
 bin/v-rebuild-web-domains           | 12 ++++-------
 bin/v-start-service                 |  8 ++------
 bin/v-stop-service                  |  8 ++------
 bin/v-suspend-cron-job              |  6 ++----
 bin/v-suspend-cron-jobs             |  6 ++----
 bin/v-suspend-dns-domain            |  8 --------
 bin/v-suspend-dns-domains           |  8 --------
 bin/v-suspend-dns-record            |  8 --------
 bin/v-suspend-user                  | 14 ++++---------
 bin/v-suspend-web-domain            | 30 +++++++++++++--------------
 bin/v-suspend-web-domains           | 12 +++++------
 bin/v-unsuspend-cron-job            |  6 ++----
 bin/v-unsuspend-cron-jobs           |  6 ++----
 bin/v-unsuspend-dns-domain          |  9 --------
 bin/v-unsuspend-dns-domains         |  8 --------
 bin/v-unsuspend-dns-record          |  8 --------
 bin/v-unsuspend-user                | 13 ++++--------
 bin/v-unsuspend-web-domain          | 32 ++++++++++++++---------------
 bin/v-unsuspend-web-domains         | 12 +++++------
 bin/v-update-sys-ip                 |  4 +---
 bin/v-update-sys-vesta              | 12 ++---------
 66 files changed, 204 insertions(+), 404 deletions(-)

diff --git a/bin/v-add-cron-job b/bin/v-add-cron-job
index 75a396a09..b233f9a2d 100755
--- a/bin/v-add-cron-job
+++ b/bin/v-add-cron-job
@@ -72,11 +72,9 @@ sync_cron_jobs
 # Increasing cron value
 increase_user_value $user '$U_CRON_JOBS'
 
-# Restart crond
+# Restarting crond
 $BIN/v-restart-cron
-if [ $? -ne 0 ]; then
-    exit $E_RESTART
-fi
+check_result $? "Cron restart failed" >/dev/null
 
 # Logging
 log_history "added cron job $job"
diff --git a/bin/v-add-cron-reports b/bin/v-add-cron-reports
index d38eaf4f8..81f75284f 100755
--- a/bin/v-add-cron-reports
+++ b/bin/v-add-cron-reports
@@ -46,9 +46,7 @@ sync_cron_jobs
 
 # Restart crond
 $BIN/v-restart-cron
-if [ $? -ne 0 ]; then
-    exit $E_RESTART
-fi
+check_result $? "Cron restart failed" >/dev/null
 
 # Logging
 log_history "enabled cron reporting"
diff --git a/bin/v-add-cron-vesta-autoupdate b/bin/v-add-cron-vesta-autoupdate
index 84c041c40..be881d636 100755
--- a/bin/v-add-cron-vesta-autoupdate
+++ b/bin/v-add-cron-vesta-autoupdate
@@ -66,11 +66,9 @@ sync_cron_jobs
 # Increasing cron value
 increase_user_value $user '$U_CRON_JOBS'
 
-# Restart crond
+# Restarting crond
 $BIN/v-restart-cron
-if [ $? -ne 0 ]; then
-    exit $E_RESTART
-fi
+check_result $? "Cron restart failed" >/dev/null
 
 # Logging
 log_history "added cron job $job"
diff --git a/bin/v-add-sys-ip b/bin/v-add-sys-ip
index 07fe7568d..79d607abc 100755
--- a/bin/v-add-sys-ip
+++ b/bin/v-add-sys-ip
@@ -161,16 +161,12 @@ fi
 
 # Restarting web server
 $BIN/v-restart-web
-if [ $? -ne 0 ]; then
-    exit $E_RESTART
-fi
+check_result $? "Web restart failed" >/dev/null
 
 # Restarting proxy server
 if [ ! -z "$PROXY_SYSTEM" ]; then
     $BIN/v-restart-proxy
-    if [ $? -ne 0 ]; then
-        exit $E_RESTART
-    fi
+    check_result $? "Proxy restart failed" >/dev/null
 fi
 
 # Restarting firewall
diff --git a/bin/v-add-sys-quota b/bin/v-add-sys-quota
index 9b35c59d9..10432a608 100755
--- a/bin/v-add-sys-quota
+++ b/bin/v-add-sys-quota
@@ -22,18 +22,11 @@ source $VESTA/conf/vesta.conf
 if [ ! -e "/usr/sbin/setquota" ]; then
     if [ -e "/etc/redhat-release" ]; then
         yum -y install quota >/dev/null 2>&1
-        result=$?
+        check_result $? "quota package installation failed" $E_UPDATE
     else
         export DEBIAN_FRONTEND=noninteractive
         apt-get -y install quota >/dev/null 2>&1
-        result=$?
-    fi
-
-    # Checking installation status
-    if [ "$result" -ne 0 ]; then
-        echo "Error: quota package wasn't successfully installed"
-        log_event "$E_UPDATE" "$EVENT"
-        exit $E_UPDATE
+        check_result $? "quota package installation failed" $E_UPDATE
     fi
 fi
 
@@ -66,11 +59,7 @@ chmod a+x /etc/cron.daily/quotacheck
 # Enabling fs quota
 if [ ! -z "$(quotaon -pa|grep " $mnt "|grep user|grep 'off')" ]; then
     quotaon $mnt
-    if [ $? -ne 0 ]; then
-        echo "Error: quota can't be enabled on $mnt partition"
-        log_event "$E_DISK" "$EVENT"
-        exit $E_DISK
-    fi
+    check_result $? "quota can't be enabled in $mtn" $E_DISK
 fi
 
 # Updating DISK_QUOTA value
diff --git a/bin/v-add-user b/bin/v-add-user
index 9afb1e9d0..06ae6aac6 100755
--- a/bin/v-add-user
+++ b/bin/v-add-user
@@ -58,11 +58,7 @@ shell=$(grep -w "$shell_conf" /etc/shells |head -n1)
 
 # Adding user
 /usr/sbin/useradd "$user" -s "$shell" -c "$email" -m -d "$HOMEDIR/$user"
-if [ $? -ne 0 ]; then
-    echo "Error: user creation failed"
-    log_event "$E_INVALID" "$EVENT"
-    exit $E_INVALID
-fi
+check_result $? "user creation failed" $E_INVALID
 
 # Adding password
 echo "$user:$password" | /usr/sbin/chpasswd
diff --git a/bin/v-add-web-domain b/bin/v-add-web-domain
index 58d48e55c..8924d148d 100755
--- a/bin/v-add-web-domain
+++ b/bin/v-add-web-domain
@@ -213,17 +213,14 @@ str="$str TIME='$TIME' DATE='$DATE'"
 # Registering domain
 echo "$str" >> $USER_DATA/web.conf
 
-# Restart web server
+# Restarting web server
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-web
-    if [ $? -ne 0 ]; then
-        exit $E_RESTART
-    fi
+    check_result $? "Web restart failed" >/dev/null
+
     if [ ! -z "$PROXY_SYSTEM" ]; then
         $BIN/v-restart-proxy
-        if [ $? -ne 0 ]; then
-            exit $E_RESTART
-        fi
+        check_result $? "Proxy restart failed" >/dev/null
     fi
 fi
 
diff --git a/bin/v-add-web-domain-alias b/bin/v-add-web-domain-alias
index fefbdf9d2..2630190f5 100755
--- a/bin/v-add-web-domain-alias
+++ b/bin/v-add-web-domain-alias
@@ -75,7 +75,7 @@ if [ "$SSL" = 'yes' ]; then
 fi
 
 # Checking proxy
-if [ ! -z "$PROXY" ]; then
+if [ ! -z "$PROXY_SYSTEM" ] && [ ! -z "$PROXY" ]; then
     tpl_file="$WEBTPL/$PROXY_SYSTEM/$PROXY.tpl"
     conf="$HOMEDIR/$user/conf/web/$PROXY_SYSTEM.conf"
     del_web_config
@@ -100,16 +100,14 @@ update_object_value 'web' 'DOMAIN' "$domain" '$ALIAS' "$ALIAS"
 # Update counters
 increase_user_value "$user" '$U_WEB_ALIASES'
 
-# Adding task to the vesta pipe
+# Restarting web server
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-web
-    if [ $? -ne 0 ]; then
-        exit $E_RESTART
-    fi
+    check_result $? "Web restart failed" >/dev/null
 
-    $BIN/v-restart-proxy
-    if [ $? -ne 0 ]; then
-        exit $E_RESTART
+    if [ ! -z "$PROXY_SYSTEM" ]; then
+        $BIN/v-restart-proxy
+        check_result $? "Proxy restart failed" >/dev/null
     fi
 fi
 
diff --git a/bin/v-add-web-domain-backend b/bin/v-add-web-domain-backend
index c9f327a28..66273e816 100755
--- a/bin/v-add-web-domain-backend
+++ b/bin/v-add-web-domain-backend
@@ -67,9 +67,7 @@ cat $WEBTPL/$WEB_BACKEND/$template.tpl |\
 # Restart backend server
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-web-backend
-    if [ $? -ne 0 ]; then
-        exit $E_RESTART
-    fi
+    check_result $? "Web backend restart failed" >/dev/null
 fi
 
 # Logging
diff --git a/bin/v-add-web-domain-proxy b/bin/v-add-web-domain-proxy
index 7c3502c86..a64b3e308 100755
--- a/bin/v-add-web-domain-proxy
+++ b/bin/v-add-web-domain-proxy
@@ -100,12 +100,10 @@ fi
 update_object_value 'web' 'DOMAIN' "$domain" '$PROXY' "$PROXY"
 update_object_value 'web' 'DOMAIN' "$domain" '$PROXY_EXT' "$extentions"
 
-# Restart web server
+# Restarting web server
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-proxy
-    if [ $? -ne 0 ]; then
-        exit $E_RESTART
-    fi
+    check_result $? "Proxy restart failed" >/dev/null
 fi
 
 log_history "enabled proxy support for $domain"
diff --git a/bin/v-add-web-domain-ssl b/bin/v-add-web-domain-ssl
index 946e454a5..a18ff90bd 100755
--- a/bin/v-add-web-domain-ssl
+++ b/bin/v-add-web-domain-ssl
@@ -97,7 +97,7 @@ if [ -z "$(grep "$conf" $web_conf)" ]; then
 fi
 
 # Checking proxy
-if [ ! -z "$PROXY" ]; then
+if [ ! -z "$PROXY_SYSTEM" ] && [ ! -z "$PROXY" ]; then
     conf="$HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf"
     tpl_file="$WEBTPL/$PROXY_SYSTEM/$PROXY.stpl"
     add_web_config
@@ -124,16 +124,14 @@ increase_user_value "$user" '$U_WEB_SSL'
 update_object_value 'web' 'DOMAIN' "$domain" '$SSL_HOME' "$SSL_HOME"
 update_object_value 'web' 'DOMAIN' "$domain" '$SSL' "yes"
 
-# Restart web server
+# Restarting web server
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-web
-    if [ $? -ne 0 ]; then
-        exit $E_RESTART
-    fi
+    check_result $? "Web restart failed" >/dev/null
 
-    $BIN/v-restart-proxy
-    if [ $? -ne 0 ]; then
-        exit $E_RESTART
+    if [ ! -z "$PROXY_SYSTEM" ]; then
+        $BIN/v-restart-proxy
+        check_result $? "Proxy restart failed" >/dev/null
     fi
 fi
 
diff --git a/bin/v-change-cron-job b/bin/v-change-cron-job
index 31fb7ad2f..23df67e88 100755
--- a/bin/v-change-cron-job
+++ b/bin/v-change-cron-job
@@ -64,11 +64,9 @@ sync_cron_jobs
 #                       Vesta                              #
 #----------------------------------------------------------#
 
-# Restart crond
+# Restarting crond
 $BIN/v-restart-cron
-if [ $? -ne 0 ]; then
-    exit $E_RESTART
-fi
+check_result $? "Cron restart failed" >/dev/null
 
 # Logging
 log_history "changed cron job $job"
diff --git a/bin/v-change-dns-domain-ip b/bin/v-change-dns-domain-ip
index e2c9c24c7..deb511cf6 100755
--- a/bin/v-change-dns-domain-ip
+++ b/bin/v-change-dns-domain-ip
@@ -70,12 +70,10 @@ fi
 #                       Vesta                              #
 #----------------------------------------------------------#
 
-# Restart named
+# Restarting named
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-dns
-    if [ $? -ne 0 ]; then
-        exit $E_RESTART
-    fi
+    check_result $? "DNS restart failed" >/dev/null
 fi
 
 # Logging
diff --git a/bin/v-change-dns-domain-soa b/bin/v-change-dns-domain-soa
index 9a819f205..dc281f77c 100755
--- a/bin/v-change-dns-domain-soa
+++ b/bin/v-change-dns-domain-soa
@@ -64,12 +64,10 @@ fi
 #                       Vesta                              #
 #----------------------------------------------------------#
 
-# Restart named
+# Restarting named
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-dns
-    if [ $? -ne 0 ]; then
-        exit $E_RESTART
-    fi
+    check_result $? "DNS restart failed" >/dev/null
 fi
 
 # Logging
diff --git a/bin/v-change-dns-domain-tpl b/bin/v-change-dns-domain-tpl
index 52e149e99..1acad59bc 100755
--- a/bin/v-change-dns-domain-tpl
+++ b/bin/v-change-dns-domain-tpl
@@ -90,12 +90,10 @@ fi
 update_object_value 'dns' 'DOMAIN' "$domain" '$TPL' "$template"
 update_object_value 'dns' 'DOMAIN' "$domain" '$RECORDS' "$records"
 
-# Restart named
+# Restarting named
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-dns
-    if [ $? -ne 0 ]; then
-        exit $E_RESTART
-    fi
+    check_result $? "DNS restart failed" >/dev/null
 fi
 
 # Logging
diff --git a/bin/v-change-dns-domain-ttl b/bin/v-change-dns-domain-ttl
index 109b243e6..a99dc7f3e 100755
--- a/bin/v-change-dns-domain-ttl
+++ b/bin/v-change-dns-domain-ttl
@@ -63,12 +63,10 @@ fi
 #                       Vesta                              #
 #----------------------------------------------------------#
 
-# Restart named
+# Restarting named
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-dns
-    if [ $? -ne 0 ]; then
-        exit $E_RESTART
-    fi
+    check_result $? "DNS restart failed" >/dev/null
 fi
 
 # Logging
diff --git a/bin/v-change-dns-record b/bin/v-change-dns-record
index 6614f2e0b..018aa55dd 100755
--- a/bin/v-change-dns-record
+++ b/bin/v-change-dns-record
@@ -96,12 +96,10 @@ fi
 #                       Vesta                              #
 #----------------------------------------------------------#
 
-# Restart named
+# Restarting named
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-dns
-    if [ $? -ne 0 ]; then
-        exit $E_RESTART
-    fi
+    check_result $? "DNS restart failed" >/dev/null
 fi
 
 # Logging
diff --git a/bin/v-change-dns-record-id b/bin/v-change-dns-record-id
index 4324524a5..202eb9ee3 100755
--- a/bin/v-change-dns-record-id
+++ b/bin/v-change-dns-record-id
@@ -70,12 +70,10 @@ fi
 #                       Vesta                              #
 #----------------------------------------------------------#
 
-# Restart named
+# Restarting named
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-dns
-    if [ $? -ne 0 ]; then
-        exit $E_RESTART
-    fi
+    check_result $? "DNS restart failed" >/dev/null
 fi
 
 # Logging
diff --git a/bin/v-change-sys-ip-nat b/bin/v-change-sys-ip-nat
index 8d34b8642..f6b448615 100755
--- a/bin/v-change-sys-ip-nat
+++ b/bin/v-change-sys-ip-nat
@@ -77,9 +77,7 @@ fi
 # Restart ftp server
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-ftp
-    if [ $? -ne 0 ]; then
-        exit $E_RESTART
-    fi
+    check_result $? "FTP restart failed" >/dev/null
 fi
 
 # Logging
diff --git a/bin/v-change-web-domain-backend-tpl b/bin/v-change-web-domain-backend-tpl
index bce3d5f9f..b932bde2b 100755
--- a/bin/v-change-web-domain-backend-tpl
+++ b/bin/v-change-web-domain-backend-tpl
@@ -155,16 +155,13 @@ fi
 #----------------------------------------------------------#
 
 
-# Restart web
+# Restarting web
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-web
-    if [ $? -ne 0 ]; then
-        exit $E_RESTART
-    fi
+    check_result $? "Web restart failed" >/dev/null
+
     $BIN/v-restart-web-backend
-    if [ $? -ne 0 ]; then
-        exit $E_RESTART
-    fi
+    check_result $? "Web backend restart failed" >/dev/null
 fi
 
 # Logging
diff --git a/bin/v-change-web-domain-ip b/bin/v-change-web-domain-ip
index 4ad36a5a5..e5b0e4c52 100755
--- a/bin/v-change-web-domain-ip
+++ b/bin/v-change-web-domain-ip
@@ -59,17 +59,17 @@ if [ "$SSL" = 'yes' ]; then
 fi
 
 # Checking proxy
-if [ ! -z "$PROXY" ]; then
+if [ ! -z "$PROXY_SYSTEM" ] && [ ! -z "$PROXY" ]; then
     tpl_file="$WEBTPL/$PROXY_SYSTEM/$PROXY.tpl"
     conf="$HOMEDIR/$user/conf/web/$PROXY_SYSTEM.conf"
     replace_web_config
-fi
 
-# Checking SSL proxy
-if [ "$SSL" = 'yes' ] && [ ! -z "$PROXY" ]; then 
-    tpl_file="$WEBTPL/$PROXY_SYSTEM/$PROXY.stpl"
-    conf="$HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf"
-    replace_web_config
+    # Checking SSL proxy
+    if [ "$SSL" = 'yes' ] && [ ! -z "$PROXY" ]; then 
+        tpl_file="$WEBTPL/$PROXY_SYSTEM/$PROXY.stpl"
+        conf="$HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf"
+        replace_web_config
+    fi
 fi
 
 
@@ -87,13 +87,11 @@ update_object_value 'web' 'DOMAIN' "$domain" '$IP' "$3"
 # Restart web server
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-web
-    if [ $? -ne 0 ]; then
-        exit $E_RESTART
-    fi
+    check_result $? "WEB restart failed" >/dev/null
 
-    $BIN/v-restart-proxy
-    if [ $? -ne 0 ]; then
-        exit $E_RESTART
+    if [ ! -z "$PROXY_SYSTEM" ]; then
+        $BIN/v-restart-proxy
+        check_result $? "Proxy restart failed" >/dev/null
     fi
 fi
 
diff --git a/bin/v-change-web-domain-proxy-tpl b/bin/v-change-web-domain-proxy-tpl
index ca0b46433..bd03ca888 100755
--- a/bin/v-change-web-domain-proxy-tpl
+++ b/bin/v-change-web-domain-proxy-tpl
@@ -87,16 +87,14 @@ fi
 #                       Vesta                              #
 #----------------------------------------------------------#
 
-# Update config
+# Updating config
 update_object_value 'web' 'DOMAIN' "$domain" '$PROXY' "$PROXY"
 update_object_value 'web' 'DOMAIN' "$domain" '$PROXY_EXT' "$extentions"
 
-# Restart web
+# Restarting proxy
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-proxy
-    if [ $? -ne 0 ]; then
-        exit $E_RESTART
-    fi
+    check_result $? "Proxy restart failed" >/dev/null
 fi
 
 # Logging
diff --git a/bin/v-change-web-domain-sslcert b/bin/v-change-web-domain-sslcert
index 7b6b77037..58a3c6f0f 100755
--- a/bin/v-change-web-domain-sslcert
+++ b/bin/v-change-web-domain-sslcert
@@ -1,6 +1,6 @@
 #!/bin/bash
 # info: change domain ssl certificate
-# options: USER DOMAIN SSL_DIR
+# options: USER DOMAIN SSL_DIR [RESTART]
 #
 # The function changes SSL domain certificate and the key. If ca file present
 # it will be replaced as well.
@@ -15,6 +15,7 @@ user=$1
 domain=$(idn -t --quiet -u "$2" )
 domain_idn=$(idn -t --quiet -a "$domain")
 ssl_dir=$3
+restart=$4
 
 # Includes
 source $VESTA/func/main.sh
@@ -26,7 +27,7 @@ source $VESTA/conf/vesta.conf
 #                    Verifications                         #
 #----------------------------------------------------------#
 
-check_args '3' "$#" 'USER DOMAIN SSL_DIR'
+check_args '3' "$#" 'USER DOMAIN SSL_DIR [RESTART]'
 validate_format 'user' 'domain' 'ssl_dir'
 is_system_enabled "$WEB_SYSTEM" 'WEB_SYSTEM'
 is_object_valid 'user' 'USER' "$user"
@@ -69,15 +70,15 @@ fi
 #                       Vesta                              #
 #----------------------------------------------------------#
 
-# Restart web server
-$BIN/v-restart-web
-if [ $? -ne 0 ]; then
-    exit $E_RESTART
-fi
+# Restarting web server
+if [ "$restart" != 'no' ]; then
+    $BIN/v-restart-web
+    check_result $? "Web restart failed" >/dev/null
 
-$BIN/v-restart-proxy
-if [ $? -ne 0 ]; then
-    exit $E_RESTART
+    if [ ! -z "$PROXY_SYSTEM" ]; then
+        $BIN/v-restart-proxy
+        check_result $? "Proxy restart failed" >/dev/null
+    fi
 fi
 
 # Logging
diff --git a/bin/v-change-web-domain-sslhome b/bin/v-change-web-domain-sslhome
index 06128dc3e..277bd3527 100755
--- a/bin/v-change-web-domain-sslhome
+++ b/bin/v-change-web-domain-sslhome
@@ -10,6 +10,7 @@ user=$1
 domain=$(idn -t --quiet -u "$2" )
 domain_idn=$(idn -t --quiet -a "$domain")
 ssl_home=$3
+restart=$4
 
 # Includes
 source $VESTA/func/main.sh
@@ -21,7 +22,7 @@ source $VESTA/conf/vesta.conf
 #                    Verifications                         #
 #----------------------------------------------------------#
 
-check_args '3' "$#" 'USER DOMAIN SSL_HOME'
+check_args '3' "$#" 'USER DOMAIN SSL_HOME [RESTART]'
 validate_format 'user' 'domain'
 is_system_enabled "$WEB_SYSTEM" 'WEB_SYSTEM'
 is_object_valid 'user' 'USER' "$user"
@@ -55,7 +56,7 @@ esac
 replace_web_config
 
 # Checking proxy config
-if [ ! -z "$PROXY" ]; then
+if [ ! -z "$PROXY_SYSTEM" ] && [ ! -z "$PROXY" ]; then
     tpl_file="$WEBTPL/$PROXY_SYSTEM/$PROXY.stpl"
     conf="$HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf"
     replace_web_config
@@ -69,15 +70,15 @@ fi
 # Update config
 update_object_value 'web' 'DOMAIN' "$domain" '$SSL_HOME' "$SSL_HOME"
 
-# Restart web server
-$BIN/v-restart-web
-if [ $? -ne 0 ]; then
-    exit $E_RESTART
-fi
+# Restarting web server
+if [ "$restart" != 'no' ]; then
+    $BIN/v-restart-web
+    check_result $? "Web restart failed" >/dev/null
 
-$BIN/v-restart-proxy
-if [ $? -ne 0 ]; then
-    exit $E_RESTART
+    if [ ! -z "$PROXY_SYSTEM" ]; then
+        $BIN/v-restart-proxy
+        check_result $? "Proxy restart failed" >/dev/null
+    fi
 fi
 
 # Logging
diff --git a/bin/v-change-web-domain-tpl b/bin/v-change-web-domain-tpl
index a046220c5..56f7417db 100755
--- a/bin/v-change-web-domain-tpl
+++ b/bin/v-change-web-domain-tpl
@@ -93,12 +93,10 @@ fi
 # Changing tpl in config
 update_object_value 'web' 'DOMAIN' "$domain" '$TPL' "$template"
 
-# Restart web
+# Restarting web
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-web
-    if [ $? -ne 0 ]; then
-        exit $E_RESTART
-    fi
+    check_result $? "Web restart failed" >/dev/null
 fi
 
 # Logging
diff --git a/bin/v-delete-cron-job b/bin/v-delete-cron-job
index f47bbc92c..54eecdb7e 100755
--- a/bin/v-delete-cron-job
+++ b/bin/v-delete-cron-job
@@ -52,11 +52,9 @@ sync_cron_jobs
 # Decreasing cron value
 decrease_user_value "$user" '$U_CRON_JOBS'
 
-# Restart crond
+# Restarting crond
 $BIN/v-restart-cron
-if [ $? -ne 0 ]; then
-    exit $E_RESTART
-fi
+check_result $? "Restart restart failed" >/dev/null
 
 # Logging
 log_history "deleted cron job $job"
diff --git a/bin/v-delete-cron-reports b/bin/v-delete-cron-reports
index 247f17b13..c04a3bd02 100755
--- a/bin/v-delete-cron-reports
+++ b/bin/v-delete-cron-reports
@@ -44,11 +44,9 @@ sync_cron_jobs
 #                       Vesta                              #
 #----------------------------------------------------------#
 
-# Restart crond
+# Restarting crond
 $BIN/v-restart-cron
-if [ $? -ne 0 ]; then
-    exit $E_RESTART
-fi
+check_result $? "Cron restart failed" >/dev/null
 
 # Logging
 log_history "disabled cron reporting"
diff --git a/bin/v-delete-cron-vesta-autoupdate b/bin/v-delete-cron-vesta-autoupdate
index ee5f74a6b..9e68e5197 100755
--- a/bin/v-delete-cron-vesta-autoupdate
+++ b/bin/v-delete-cron-vesta-autoupdate
@@ -51,11 +51,9 @@ sync_cron_jobs
 # Decreasing cron value
 decrease_user_value "$user" '$U_CRON_JOBS'
 
-# Restart crond
+# Restarting crond
 $BIN/v-restart-cron
-if [ $? -ne 0 ]; then
-    exit $E_RESTART
-fi
+check_result $? "Cron restart failed" >/dev/null
 
 # Logging
 log_event "$OK" "$EVENT"
diff --git a/bin/v-delete-dns-domain b/bin/v-delete-dns-domain
index 18e41337c..eba97bbc3 100755
--- a/bin/v-delete-dns-domain
+++ b/bin/v-delete-dns-domain
@@ -71,12 +71,10 @@ rm -f $USER_DATA/dns/$domain.conf
 decrease_user_value "$user" '$U_DNS_DOMAINS'
 decrease_user_value "$user" '$U_DNS_RECORDS' "$records"
 
-# Restart named
+# Restarting named
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-dns $restart
-    if [ $? -ne 0 ]; then
-        exit $E_RESTART
-    fi
+    check_result $? "Bind restart failed" >/dev/null
 fi
 
 # Logging
diff --git a/bin/v-delete-dns-domains b/bin/v-delete-dns-domains
index da97aa69e..5a3e86ae1 100755
--- a/bin/v-delete-dns-domains
+++ b/bin/v-delete-dns-domains
@@ -11,6 +11,7 @@
 
 # Argument defenition
 user=$1
+restart=$2
 
 # Includes
 source $VESTA/func/main.sh
@@ -41,10 +42,10 @@ done
 #                       Vesta                              #
 #----------------------------------------------------------#
 
-# Restart named
-$BIN/v-restart-dns
-if [ $? -ne 0 ]; then
-    exit $E_RESTART
+# Restarting named
+if [ "$restart" != 'no' ]; then
+    $BIN/v-restart-dns
+    check_result $? "Bind restart failed" >/dev/null
 fi
 
 # Logging
diff --git a/bin/v-delete-dns-domains-src b/bin/v-delete-dns-domains-src
index dd646b705..91abc238d 100755
--- a/bin/v-delete-dns-domains-src
+++ b/bin/v-delete-dns-domains-src
@@ -46,9 +46,7 @@ done
 # Restart named
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-dns
-    if [ $? -ne 0 ]; then
-        exit $E_RESTART
-    fi
+    check_result $? "Bind restart failed" >/dev/null
 fi
 
 # Logging
diff --git a/bin/v-delete-dns-record b/bin/v-delete-dns-record
index 6f8969b4e..c317da23e 100755
--- a/bin/v-delete-dns-record
+++ b/bin/v-delete-dns-record
@@ -69,12 +69,10 @@ records="$(wc -l $USER_DATA/dns/$domain.conf | cut -f1 -d ' ')"
 update_object_value 'dns' 'DOMAIN' "$domain" '$RECORDS' "$records"
 decrease_user_value "$user" '$U_DNS_RECORDS'
 
-# Restart named
+# Restarting named
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-dns
-    if [ $? -ne 0 ]; then
-        exit $E_RESTART
-    fi
+    check_result $? "Bind restart failed" >/dev/null
 fi
 
 # Logging
diff --git a/bin/v-delete-sys-ip b/bin/v-delete-sys-ip
index e9186fc7d..550251b23 100755
--- a/bin/v-delete-sys-ip
+++ b/bin/v-delete-sys-ip
@@ -123,16 +123,12 @@ fi
 
 # Restarting web server
 $BIN/v-restart-web
-if [ $? -ne 0 ]; then
-    exit $E_RESTART
-fi
+check_result $? "Web restart failed" >/dev/null
 
 # Restarting proxy server
 if [ ! -z "$PROXY_SYSTEM" ]; then
     $BIN/v-restart-proxy
-    if [ $? -ne 0 ]; then
-        exit $E_RESTART
-    fi
+    check_result $? "Proxy restart failed" >/dev/null
 fi
 
 # Restarting firewall
diff --git a/bin/v-delete-web-domain b/bin/v-delete-web-domain
index b205917de..2a4f2844f 100755
--- a/bin/v-delete-web-domain
+++ b/bin/v-delete-web-domain
@@ -168,18 +168,14 @@ if [ "$SSL" = 'yes' ]; then
     decrease_user_value "$user" '$U_WEB_SSL'
 fi
 
-# Restart web server
+# Restarting web server
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-web
-    if [ $? -ne 0 ]; then
-        exit $E_RESTART
-    fi
+    check_result $? "Web restart failed" >/dev/null
 
     if [ ! -z "$PROXY_SYSTEM" ]; then
         $BIN/v-restart-proxy
-        if [ $? -ne 0 ]; then
-            exit $E_RESTART
-        fi
+        check_result $? "Proxy restart failed" >/dev/null
     fi
 fi
 
diff --git a/bin/v-delete-web-domain-alias b/bin/v-delete-web-domain-alias
index da6645ce5..714489d86 100755
--- a/bin/v-delete-web-domain-alias
+++ b/bin/v-delete-web-domain-alias
@@ -73,7 +73,7 @@ if [ "$SSL" = 'yes' ]; then
 fi
 
 # Checking proxy
-if [ ! -z "$PROXY" ]; then
+if [ ! -z "$PROXY_SYSTEM" ] && [ ! -z "$PROXY" ]; then
     tpl_file="$WEBTPL/$PROXY_SYSTEM/$PROXY.tpl"
     conf="$HOMEDIR/$user/conf/web/$PROXY_SYSTEM.conf"
     del_web_config
@@ -98,16 +98,14 @@ update_object_value 'web' 'DOMAIN' "$domain" '$ALIAS' "$ALIAS"
 # Update counters
 decrease_user_value "$user" '$U_WEB_ALIASES'
 
-# Restart web server
+# Restarting web server
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-web
-    if [ $? -ne 0 ]; then
-        exit $E_RESTART
-    fi
+    check_result $? "Web restart failed" >/dev/null
 
-    $BIN/v-restart-proxy
-    if [ $? -ne 0 ]; then
-        exit $E_RESTART
+    if [ ! -z "$PROXY_SYSTEM" ]; then
+        $BIN/v-restart-proxy
+        check_result $? "Proxy restart failed" >/dev/null
     fi
 fi
 
diff --git a/bin/v-delete-web-domain-backend b/bin/v-delete-web-domain-backend
index 286c3922b..06e501bdd 100755
--- a/bin/v-delete-web-domain-backend
+++ b/bin/v-delete-web-domain-backend
@@ -52,12 +52,10 @@ rm -f $pool/$backend.conf
 #                       Vesta                              #
 #----------------------------------------------------------#
 
-# Restart backend server
+# Restarting backend server
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-web-backend
-    if [ $? -ne 0 ]; then
-        exit $E_RESTART
-    fi
+    check_result $? "Backend restart failed" >/dev/null
 fi
 
 # Logging
diff --git a/bin/v-delete-web-domain-proxy b/bin/v-delete-web-domain-proxy
index 0aa73e150..2bd06ba52 100755
--- a/bin/v-delete-web-domain-proxy
+++ b/bin/v-delete-web-domain-proxy
@@ -87,9 +87,7 @@ fi
 # Restart proxy server
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-proxy
-    if [ $? -ne 0 ]; then
-        exit $E_RESTART
-    fi
+    check_result $? "Proxy restart failed" >/dev/null
 fi
 
 # Logging
diff --git a/bin/v-delete-web-domain-ssl b/bin/v-delete-web-domain-ssl
index 4d19fb37b..b9ec4e129 100755
--- a/bin/v-delete-web-domain-ssl
+++ b/bin/v-delete-web-domain-ssl
@@ -48,7 +48,7 @@ tpl_file="$WEBTPL/$WEB_SYSTEM/$WEB_BACKEND/$TPL.stpl"
 del_web_config
 
 # Checking proxy
-if [ ! -z "$PROXY" ]; then
+if [ ! -z "$PROXY_SYSTEM" ] && [ ! -z "$PROXY" ]; then
     conf="$HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf"
     tpl_file="$WEBTPL/$PROXY_SYSTEM/$PROXY.stpl"
     del_web_config
@@ -89,16 +89,14 @@ fi
 # Decreasing domain value
 decrease_user_value "$user" '$U_WEB_SSL'
 
-# Restart web server
+# Restarting web server
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-web
-    if [ $? -ne 0 ]; then
-        exit $E_RESTART
-    fi
+    check_result $? "Web restart failed" >/dev/null
 
-    $BIN/v-restart-proxy
-    if [ $? -ne 0 ]; then
-        exit $E_RESTART
+    if [ ! -z "$PROXY_SYSTEM" ]; then
+        $BIN/v-restart-proxy
+        check_result $? "Proxy restart failed" >/dev/null
     fi
 fi
 
diff --git a/bin/v-delete-web-domains b/bin/v-delete-web-domains
index 824e72881..547461421 100755
--- a/bin/v-delete-web-domains
+++ b/bin/v-delete-web-domains
@@ -42,18 +42,14 @@ done
 #                       Vesta                              #
 #----------------------------------------------------------#
 
-# Restart web server
+# Restarting web server
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-web
-    if [ $? -ne 0 ]; then
-        exit $E_RESTART
-    fi
+    check_result $? "Web restart failed" >/dev/null
 
     if [ ! -z "$PROXY_SYSTEM" ]; then
         $BIN/v-restart-proxy
-        if [ $? -ne 0 ]; then
-            exit $E_RESTART
-        fi
+        check_result $? "Proxy restart failed" >/dev/null
     fi
 fi
 
diff --git a/bin/v-insert-dns-domain b/bin/v-insert-dns-domain
index fcd548ae7..00c2c53db 100755
--- a/bin/v-insert-dns-domain
+++ b/bin/v-insert-dns-domain
@@ -68,12 +68,10 @@ chmod 660 $USER_DATA/dns.conf
 #                       Vesta                              #
 #----------------------------------------------------------#
 
-# Restart named
+# Restarting named
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-dns $restart
-    if [ $? -ne 0 ]; then
-        exit $E_RESTART
-    fi
+    check_result $? "Bind restart failed" >/dev/null
 fi
 
 # Logging
diff --git a/bin/v-insert-dns-record b/bin/v-insert-dns-record
index 25f87dbe5..d81db1893 100755
--- a/bin/v-insert-dns-record
+++ b/bin/v-insert-dns-record
@@ -44,12 +44,10 @@ echo "$data" >> $USER_DATA/dns/$domain.conf
 #                       Vesta                              #
 #----------------------------------------------------------#
 
-# Restart named
+# Restarting named
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-dns $restart
-    if [ $? -ne 0 ]; then
-        exit $E_RESTART
-    fi
+    check_result $? "Bind restart failed" >/dev/null
 fi
 
 # Logging
diff --git a/bin/v-insert-dns-records b/bin/v-insert-dns-records
index 8fb2f55ce..ce61f5ad0 100755
--- a/bin/v-insert-dns-records
+++ b/bin/v-insert-dns-records
@@ -47,12 +47,10 @@ fi
 #                       Vesta                              #
 #----------------------------------------------------------#
 
-# Restart named
+# Restarting named
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-dns
-    if [ $? -ne 0 ]; then
-        exit $E_RESTART
-    fi
+    check_result $? "Bind restart failed" >/dev/null
 fi
 
 # Logging
diff --git a/bin/v-rebuild-cron-jobs b/bin/v-rebuild-cron-jobs
index 8fcd2da2d..c4bac3ed8 100755
--- a/bin/v-rebuild-cron-jobs
+++ b/bin/v-rebuild-cron-jobs
@@ -40,12 +40,10 @@ sync_cron_jobs
 #                       Vesta                              #
 #----------------------------------------------------------#
 
-# Restart crond
+# Restarting crond
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-cron
-    if [ $? -ne 0 ]; then
-        exit $E_RESTART
-    fi
+    check_result $? "Cron restart failed" >/dev/null
 fi
 
 # Logging
diff --git a/bin/v-rebuild-dns-domain b/bin/v-rebuild-dns-domain
index 732e14eda..f21fad08b 100755
--- a/bin/v-rebuild-dns-domain
+++ b/bin/v-rebuild-dns-domain
@@ -81,12 +81,10 @@ update_user_value "$user" '$U_DNS_DOMAINS' "$user_domains"
 update_user_value "$user" '$U_DNS_RECORDS' "$user_records"
 update_user_value "$user" '$SUSPENDED_DNS' "$suspended_dns"
 
-# Restart named
+# Restarting named
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-dns "$restart"
-    if [ $? -ne 0 ]; then
-        exit $E_RESTART
-    fi
+    check_result $? "Bind restart failed" >/dev/null
 fi
 
 # Logging
diff --git a/bin/v-rebuild-dns-domains b/bin/v-rebuild-dns-domains
index b2c4aba39..83c4d6f0c 100755
--- a/bin/v-rebuild-dns-domains
+++ b/bin/v-rebuild-dns-domains
@@ -82,12 +82,10 @@ update_user_value "$user" '$U_DNS_DOMAINS' "$user_domains"
 update_user_value "$user" '$U_DNS_RECORDS' "$user_records"
 update_user_value "$user" '$SUSPENDED_DNS' "$suspended_dns"
 
-# Restart named
+# Restarting named
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-dns
-    if [ $? -ne 0 ]; then
-        exit $E_RESTART
-    fi
+    check_result $? "Bind restart failed" >/dev/null
 fi
 
 # Logging
diff --git a/bin/v-rebuild-web-domains b/bin/v-rebuild-web-domains
index b0dfeb9d4..1afb36de3 100755
--- a/bin/v-rebuild-web-domains
+++ b/bin/v-rebuild-web-domains
@@ -159,18 +159,14 @@ update_user_value "$user" '$U_WEB_DOMAINS' "$user_domains"
 update_user_value "$user" '$U_WEB_SSL' "$user_ssl"
 update_user_value "$user" '$U_WEB_ALIASES' "$user_aliases"
 
-# Restart web server
+# Restarting web server
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-web
-    if [ $? -ne 0 ]; then
-        exit $E_RESTART
-    fi
+    check_result $? "Web restart failed" >/dev/null
 
-    if [ ! -z "$PROXY_SYSTEM" ];then
+    if [ ! -z "$PROXY_SYSTEM" ]; then
         $BIN/v-restart-proxy
-        if [ $? -ne 0 ]; then
-            exit $E_RESTART
-        fi
+        check_result $? "Proxy restart failed" >/dev/null
     fi
 fi
 
diff --git a/bin/v-start-service b/bin/v-start-service
index 970c7ca0a..100b82881 100755
--- a/bin/v-start-service
+++ b/bin/v-start-service
@@ -29,14 +29,10 @@ check_args '1' "$#" 'SERVICE'
 
 if [ "$service" != 'iptables' ]; then
     service $service start >/dev/null 2>&1
-    if [ $? -ne 0 ]; then
-        exit $E_RESTART
-    fi
+    check_result $? "$service start failed" $E_RESTART
 else
     $BIN/v-update-firewall
-    if [ $? -ne 0 ]; then
-        exit $E_RESTART
-    fi
+    check_result $? "$service start failed" $E_RESTART
 fi
 
 
diff --git a/bin/v-stop-service b/bin/v-stop-service
index 7355a113c..b05f8744d 100755
--- a/bin/v-stop-service
+++ b/bin/v-stop-service
@@ -29,14 +29,10 @@ check_args '1' "$#" 'SERVICE'
 
 if [ "$service" != 'iptables' ]; then
     service $service stop >/dev/null 2>&1
-    if [ $? -ne 0 ]; then
-        exit $E_RESTART
-    fi
+    check_result $? "$service stop failed" $E_RESTART
 else
     $BIN/v-stop-firewall
-    if [ $? -ne 0 ]; then
-        exit $E_RESTART
-    fi
+    check_result $? "$service stop failed" $E_RESTART
 fi
 
 
diff --git a/bin/v-suspend-cron-job b/bin/v-suspend-cron-job
index 977b77aba..19124b80b 100755
--- a/bin/v-suspend-cron-job
+++ b/bin/v-suspend-cron-job
@@ -46,12 +46,10 @@ sync_cron_jobs
 #                       Vesta                              #
 #----------------------------------------------------------#
 
-# Restart crond
+# Restarting crond
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-cron
-    if [ $? -ne 0 ]; then
-        exit $E_RESTART
-    fi
+    check_result $? "Cron restart failed" >/dev/null
 fi
 
 # Logging
diff --git a/bin/v-suspend-cron-jobs b/bin/v-suspend-cron-jobs
index 993989a5f..7de5a1aad 100755
--- a/bin/v-suspend-cron-jobs
+++ b/bin/v-suspend-cron-jobs
@@ -41,12 +41,10 @@ done
 #                       Vesta                              #
 #----------------------------------------------------------#
 
-# Restart crond
+# Restarting crond
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-cron
-    if [ $? -ne 0 ]; then
-        exit $E_RESTART
-    fi
+    check_result $? "Cron restart failed" >/dev/null
 fi
 
 # Logging
diff --git a/bin/v-suspend-dns-domain b/bin/v-suspend-dns-domain
index 9d6c0906c..38eb76d36 100755
--- a/bin/v-suspend-dns-domain
+++ b/bin/v-suspend-dns-domain
@@ -46,14 +46,6 @@ update_object_value 'dns' 'DOMAIN' "$domain" '$SUSPENDED' 'yes'
 sed -i "s/SUSPENDED='no'/SUSPENDED='yes'/g" $USER_DATA/dns/$domain.conf
 increase_user_value "$user" '$SUSPENDED_DNS'
 
-# Restart named
-#if [ "$restart" != 'no' ]; then
-#    $BIN/v-restart-dns
-#    if [ $? -ne 0 ]; then
-#        exit $E_RESTART
-#    fi
-#fi
-
 # Logging
 log_event "$OK" "$EVENT"
 
diff --git a/bin/v-suspend-dns-domains b/bin/v-suspend-dns-domains
index f46cc39e6..34d41dcb3 100755
--- a/bin/v-suspend-dns-domains
+++ b/bin/v-suspend-dns-domains
@@ -42,14 +42,6 @@ done
 #                       Vesta                              #
 #----------------------------------------------------------#
 
-# Restart dns server
-#if [ "$restart" != 'no' ]; then
-#    $BIN/v-restart-dns
-#    if [ $? -ne 0 ]; then
-#        exit $E_RESTART
-#    fi
-#fi
-
 # Logging
 log_event "$OK" "$EVENT"
 
diff --git a/bin/v-suspend-dns-record b/bin/v-suspend-dns-record
index 7ac0a3093..f98025f91 100755
--- a/bin/v-suspend-dns-record
+++ b/bin/v-suspend-dns-record
@@ -63,14 +63,6 @@ fi
 #                       Vesta                              #
 #----------------------------------------------------------#
 
-# Restart named
-#if [ "$restart" != 'no' ]; then
-#    $BIN/v-restart-dns
-#    if [ $? -ne 0 ]; then
-#        exit $E_RESTART
-#    fi
-#fi
-
 # Logging
 log_event "$OK" "$EVENT"
 
diff --git a/bin/v-suspend-user b/bin/v-suspend-user
index 1f15dedc5..99e732271 100755
--- a/bin/v-suspend-user
+++ b/bin/v-suspend-user
@@ -73,22 +73,16 @@ fi
 #                       Vesta                              #
 #----------------------------------------------------------#
 
-# Restart web server
+# Restarting system services
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-web
-    if [ $? -ne 0 ]; then
-        exit $E_RESTART
-    fi
+    check_result $? "Web restart failed" >/dev/null
 
     $BIN/v-restart-dns
-    if [ $? -ne 0 ]; then
-        exit $E_RESTART
-    fi
+    check_result $? "DNS restart failed" >/dev/null
 
     $BIN/v-restart-cron
-    if [ $? -ne 0 ]; then
-        exit $E_RESTART
-    fi
+    check_result $? "Cron restart failed" >/dev/null
 fi
 
 # Changing suspend value
diff --git a/bin/v-suspend-web-domain b/bin/v-suspend-web-domain
index 5eac5cdaa..d98ed633f 100755
--- a/bin/v-suspend-web-domain
+++ b/bin/v-suspend-web-domain
@@ -63,41 +63,39 @@ if [ "$SSL" = 'yes' ]; then
 fi
 
 # Checking proxy
-if [ ! -z "$PROXY" ]; then
+if [ ! -z "$PROXY_SYSTEM" ] && [ ! -z "$PROXY" ]; then
     tpl_file="$WEBTPL/$PROXY_SYSTEM/$PROXY.tpl"
     conf="$HOMEDIR/$user/conf/web/$PROXY_SYSTEM.conf"
     del_web_config
     add_web_config
 
+    # Checking proxy SSL
+    if [ "$SSL" = 'yes' ]; then
+        tpl_file="$WEBTPL/$PROXY_SYSTEM/$PROXY.stpl"
+        conf="$HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf"
+        del_web_config
+        add_web_config
+    fi
 fi
 
-# Checking proxy SSL
-if [ ! -z "$PROXY" ] && [ "$SSL" = 'yes' ]; then
-    tpl_file="$WEBTPL/$PROXY_SYSTEM/$PROXY.stpl"
-    conf="$HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf"
-    del_web_config
-    add_web_config
-fi
 
 
 #----------------------------------------------------------#
 #                       Vesta                              #
 #----------------------------------------------------------#
 
-# Update config
+# Updating config
 update_object_value 'web' 'DOMAIN' "$domain" '$SUSPENDED' 'yes'
 increase_user_value "$user" '$SUSPENDED_WEB'
 
-# Restart web server
+# Restarting web server
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-web
-    if [ $? -ne 0 ]; then
-        exit $E_RESTART
-    fi
+    check_result $? "Web restart failed" >/dev/null
 
-    $BIN/v-restart-proxy
-    if [ $? -ne 0 ]; then
-        exit $E_RESTART
+    if [ ! -z "$PROXY_SYSTEM" ]; then
+        $BIN/v-restart-proxy
+        check_result $? "Proxy restart failed" >/dev/null
     fi
 fi
 
diff --git a/bin/v-suspend-web-domains b/bin/v-suspend-web-domains
index fc4bf125c..5ff752bf7 100755
--- a/bin/v-suspend-web-domains
+++ b/bin/v-suspend-web-domains
@@ -42,16 +42,14 @@ done
 #                       Vesta                              #
 #----------------------------------------------------------#
 
-# Restart web server
+# Restarting web server
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-web
-    if [ $? -ne 0 ]; then
-        exit $E_RESTART
-    fi
+    check_result $? "Web restart failed" >/dev/null
 
-    $BIN/v-restart-proxy
-    if [ $? -ne 0 ]; then
-        exit $E_RESTART
+    if [ ! -z "$PROXY_SYSTEM" ]; then
+        $BIN/v-restart-proxy
+        check_result $? "Proxy restart failed" >/dev/null
     fi
 fi
 
diff --git a/bin/v-unsuspend-cron-job b/bin/v-unsuspend-cron-job
index 39af81b16..c152d011f 100755
--- a/bin/v-unsuspend-cron-job
+++ b/bin/v-unsuspend-cron-job
@@ -46,12 +46,10 @@ sync_cron_jobs
 #                       Vesta                              #
 #----------------------------------------------------------#
 
-# Restart crond
+# Restarting crond
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-cron
-    if [ $? -ne 0 ]; then
-        exit $E_RESTART
-    fi
+    check_result $? "Cron restart failed" >/dev/null
 fi
 
 # Logging
diff --git a/bin/v-unsuspend-cron-jobs b/bin/v-unsuspend-cron-jobs
index e1d3e686b..f767ce612 100755
--- a/bin/v-unsuspend-cron-jobs
+++ b/bin/v-unsuspend-cron-jobs
@@ -41,12 +41,10 @@ done
 #                       Vesta                              #
 #----------------------------------------------------------#
 
-# Restart crond
+# Restarting crond
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-cron
-    if [ $? -ne 0 ]; then
-        exit $E_RESTART
-    fi
+    check_result $? "Cron restart failed" >/dev/null
 fi
 
 # Logging
diff --git a/bin/v-unsuspend-dns-domain b/bin/v-unsuspend-dns-domain
index 25253590c..1e5dcfac9 100755
--- a/bin/v-unsuspend-dns-domain
+++ b/bin/v-unsuspend-dns-domain
@@ -47,15 +47,6 @@ update_object_value 'dns' 'DOMAIN' "$domain" '$SUSPENDED' 'no'
 decrease_user_value "$user" '$SUSPENDED_DNS'
 sed -i "s/SUSPENDED='yes'/SUSPENDED='no'/g" $USER_DATA/dns/$domain.conf
 
-
-# Restart named
-#if [ "$restart" != 'no' ]; then
-#    $BIN/v-restart-dns
-#    if [ $? -ne 0 ]; then
-#        exit $E_RESTART
-#    fi
-#fi
-
 # Logging
 log_event "$OK" "$EVENT"
 
diff --git a/bin/v-unsuspend-dns-domains b/bin/v-unsuspend-dns-domains
index 177770e04..7d184b4a2 100755
--- a/bin/v-unsuspend-dns-domains
+++ b/bin/v-unsuspend-dns-domains
@@ -42,14 +42,6 @@ done
 #                       Vesta                              #
 #----------------------------------------------------------#
 
-# Restart dns server
-#if [ "$restart" != 'no' ]; then
-#    $BIN/v-restart-dns
-#    if [ $? -ne 0 ]; then
-#        exit $E_RESTART
-#    fi
-#fi
-
 # Logging
 log_event "$OK" "$EVENT"
 
diff --git a/bin/v-unsuspend-dns-record b/bin/v-unsuspend-dns-record
index 52fb15fb1..38c9e58e3 100755
--- a/bin/v-unsuspend-dns-record
+++ b/bin/v-unsuspend-dns-record
@@ -62,14 +62,6 @@ fi
 #                       Vesta                              #
 #----------------------------------------------------------#
 
-# Restart named
-#if [ "$restart" != 'no' ]; then
-#    $BIN/v-restart-dns
-#    if [ $? -ne 0 ]; then
-#        exit $E_RESTART
-#    fi
-#fi
-
 # Logging
 log_event "$OK" "$EVENT"
 
diff --git a/bin/v-unsuspend-user b/bin/v-unsuspend-user
index 6173092a5..f2a44f5e6 100755
--- a/bin/v-unsuspend-user
+++ b/bin/v-unsuspend-user
@@ -76,21 +76,16 @@ fi
 update_user_value "$user" '$SUSPENDED' 'no'
 decrease_user_value 'admin' '$SUSPENDED_USERS'
 
+# Restarting system services
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-web
-    if [ $? -ne 0 ]; then
-        exit $E_RESTART
-    fi
+    check_result $? "Web restart failed" >/dev/null
 
     $BIN/v-restart-dns
-    if [ $? -ne 0 ]; then
-        exit $E_RESTART
-    fi
+    check_result $? "DNS restart failed" >/dev/null
 
     $BIN/v-restart-cron
-    if [ $? -ne 0 ]; then
-        exit $E_RESTART
-    fi
+    check_result $? "Cron restart failed" >/dev/null
 fi
 
 # Logging
diff --git a/bin/v-unsuspend-web-domain b/bin/v-unsuspend-web-domain
index ad189c9aa..f0baea176 100755
--- a/bin/v-unsuspend-web-domain
+++ b/bin/v-unsuspend-web-domain
@@ -52,7 +52,7 @@ upd_web_domain_values
 del_web_config
 add_web_config
 
-# Check SSL
+# Checking SSL
 if [ "$SSL" = 'yes' ]; then
     tpl_file="$WEBTPL/$WEB_SYSTEM/$WEB_BACKEND/$TPL.stpl"
     conf="$HOMEDIR/$user/conf/web/s$WEB_SYSTEM.conf"
@@ -61,19 +61,19 @@ if [ "$SSL" = 'yes' ]; then
 fi
 
 # Checking proxy
-if [ ! -z "$PROXY" ]; then
+if [ ! -z "$PROXY_SYSTEM" ] && [ ! -z "$PROXY" ]; then
     tpl_file="$WEBTPL/$PROXY_SYSTEM/$PROXY.tpl"
     conf="$HOMEDIR/$user/conf/web/$PROXY_SYSTEM.conf"
     del_web_config
     add_web_config
-fi
 
-# Checking SSL proxy
-if [ ! -z "$PROXY" ] && [ "$SSL" = 'yes' ]; then
-    tpl_file="$WEBTPL/$PROXY_SYSTEM/$PROXY.stpl"
-    conf="$HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf"
-    del_web_config
-    add_web_config
+    # Checking proxy SSL
+    if [ "$SSL" = 'yes' ]; then
+        tpl_file="$WEBTPL/$PROXY_SYSTEM/$PROXY.stpl"
+        conf="$HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf"
+        del_web_config
+        add_web_config
+    fi
 fi
 
 
@@ -81,20 +81,18 @@ fi
 #                       Vesta                              #
 #----------------------------------------------------------#
 
-# Update config
+# Updating config
 update_object_value 'web' 'DOMAIN' "$domain" '$SUSPENDED' 'no'
 decrease_user_value "$user" '$SUSPENDED_WEB'
 
-# Restart web erver
+# Restarting web server
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-web
-    if [ $? -ne 0 ]; then
-        exit $E_RESTART
-    fi
+    check_result $? "Web restart failed" >/dev/null
 
-    $BIN/v-restart-proxy
-    if [ $? -ne 0 ]; then
-        exit $E_RESTART
+    if [ ! -z "$PROXY_SYSTEM" ]; then
+        $BIN/v-restart-proxy
+        check_result $? "Proxy restart failed" >/dev/null
     fi
 fi
 
diff --git a/bin/v-unsuspend-web-domains b/bin/v-unsuspend-web-domains
index 15c860260..c5ae0c032 100755
--- a/bin/v-unsuspend-web-domains
+++ b/bin/v-unsuspend-web-domains
@@ -43,16 +43,14 @@ done
 #                       Vesta                              #
 #----------------------------------------------------------#
 
-# Restart web server
+# Restarting web server
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-web
-    if [ $? -ne 0 ]; then
-        exit $E_RESTART
-    fi
+    check_result $? "Web restart failed" >/dev/null
 
-    $BIN/v-restart-proxy
-    if [ $? -ne 0 ]; then
-        exit $E_RESTART
+    if [ ! -z "$PROXY_SYSTEM" ]; then
+        $BIN/v-restart-proxy
+        check_result $? "Proxy restart failed" >/dev/null
     fi
 fi
 
diff --git a/bin/v-update-sys-ip b/bin/v-update-sys-ip
index 5e6d48729..0c152e600 100755
--- a/bin/v-update-sys-ip
+++ b/bin/v-update-sys-ip
@@ -87,9 +87,7 @@ if [ ! -z "$vst_ip_list" ] && [ "$vst_ip_num" -eq '1' ]; then
                 $BIN/v-rebuild-dns-domains $user no
             done
             $BIN/v-restart-dns
-            if [ $? -ne 0 ]; then
-                exit $E_RESTART
-            fi
+            check_result $? "dns restart failed" >/dev/null
         fi
 
         # No further comparation is needed
diff --git a/bin/v-update-sys-vesta b/bin/v-update-sys-vesta
index d47fb9f06..8fec0ce73 100755
--- a/bin/v-update-sys-vesta
+++ b/bin/v-update-sys-vesta
@@ -42,11 +42,7 @@ if [ -e "/etc/redhat-release" ]; then
 
     # Update vesta package
     $yum update $package > /dev/null 2>&1
-    if [ $? -ne 0 ]; then
-        echo "Error: $package update failed"
-        log_event "$E_UPDATE" "$EVENT"
-        exit $E_UPDATE
-    fi
+    check_result $? "$pacakge update failed" $E_UPDATE
 else
     # Update repo
     apt-get update -o Dir::Etc::sourcelist="sources.list.d/vesta.list" \
@@ -54,11 +50,7 @@ else
 
     # Update vesta package
     apt-get install $package -qq > /dev/null 2>&1
-    if [ $? -ne 0 ]; then
-        echo "Error: $package update failed"
-        log_event "$E_UPDATE" "$EVENT"
-        exit $E_UPDATE
-    fi
+    check_result $? "$pacakge update failed" $E_UPDATE
 fi
 
 

From cd437282b210df02d2853c64a7882ae3387cd307 Mon Sep 17 00:00:00 2001
From: Serghey Rodin 
Date: Wed, 28 Oct 2015 16:36:29 +0200
Subject: [PATCH 135/264] php-fpm support

---
 web/templates/admin/edit_web.html |  2 +-
 web/templates/admin/list_web.html | 29 ++++++++++++++++++++
 web/templates/user/edit_web.html  | 45 -------------------------------
 web/templates/user/list_web.html  | 29 ++++++++++++++++++++
 4 files changed, 59 insertions(+), 46 deletions(-)

diff --git a/web/templates/admin/edit_web.html b/web/templates/admin/edit_web.html
index dd2fef9df..51822ec78 100644
--- a/web/templates/admin/edit_web.html
+++ b/web/templates/admin/edit_web.html
@@ -148,7 +148,7 @@
        - / " . strtoupper($_SESSION['WEB_BACKEND']) . "";?> + " . strtoupper($_SESSION['WEB_BACKEND']) . "";?>
        +
        @@ -213,6 +219,19 @@ sort-name="" sort-bandwidth="" sort-dis + + + +
        + +
        +
        :
        +
        + +
        +
        + +
        +
        :
        + + +
        +
        :
        +
        + +
        +
        +
        - -
        - -
        @@ -154,30 +133,6 @@
        - - - - - - @@ -234,12 +253,22 @@ sort-bandwidth="" sort-disk=" From a5efa885d885c1c231d1091a19e4355afc5bc4cc Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Wed, 28 Oct 2015 16:37:41 +0200 Subject: [PATCH 136/264] imroved favorites handler --- web/add/favorite/index.php | 48 +++-------------------------------- web/delete/favorite/index.php | 10 +++----- web/inc/main.php | 9 +++---- web/login/index.php | 3 +++ 4 files changed, 13 insertions(+), 57 deletions(-) diff --git a/web/add/favorite/index.php b/web/add/favorite/index.php index 5cfe582d0..e9f2e828d 100644 --- a/web/add/favorite/index.php +++ b/web/add/favorite/index.php @@ -1,65 +1,23 @@
        '; - -// Init error_reporting(NULL); -ob_start(); session_start(); -// mail_acc -// firewall - include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); -// Check POST request -//if (!empty($_POST['ok'])) { - - // Check token +// Check token // if ((!isset($_POST['token'])) || ($_SESSION['token'] != $_POST['token'])) { // header('location: /login/'); // exit(); // } - - // v-list-user-favourites - // v-delete-user-favourites admin web test0011.com - // Protect input -// $v_section = escapeshellarg($_POST['v_section']); -// $v_unit_id = escapeshellarg($_POST['v_unit_id']); - $v_section = escapeshellarg($_REQUEST['v_section']); $v_unit_id = escapeshellarg($_REQUEST['v_unit_id']); -// $v_section = 'web'; -// $v_unit_id = 'test0011.com'; + $_SESSION['favourites'][strtoupper($_REQUEST['v_section'])][$_REQUEST['v_unit_id']] = 1; - - echo VESTA_CMD."v-add-user-favourites ".$_SESSION['user']." ".$v_section." ".$v_unit_id; - - echo ' - '; - - // Add cron job exec (VESTA_CMD."v-add-user-favourites ".$_SESSION['user']." ".$v_section." ".$v_unit_id, $output, $return_var); - check_return_code($return_var,$output); - - var_dump($return_var); - echo '
        --------------------
        '; - - var_dump($output); - echo '
        --------------------
        '; - - -/* - echo '
        favorites:
        '; - - // Data - exec (VESTA_CMD."v-list-user-favourites $user json", $output, $return_var); - $data = json_decode(implode('', $output), true); - $data = array_reverse($data,true); - print_r($data); -*/ -//} +// check_return_code($return_var,$output); ?> \ No newline at end of file diff --git a/web/delete/favorite/index.php b/web/delete/favorite/index.php index 0b61b2c44..9f471b9bd 100644 --- a/web/delete/favorite/index.php +++ b/web/delete/favorite/index.php @@ -1,19 +1,15 @@ '; - - error_reporting(NULL); - ob_start(); session_start(); include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); + unset($_SESSION['favourites'][strtoupper($_REQUEST['v_section'])][$_REQUEST['v_unit_id']]); + $v_section = escapeshellarg($_REQUEST['v_section']); $v_unit_id = escapeshellarg($_REQUEST['v_unit_id']); exec (VESTA_CMD."v-delete-user-favourites ".$_SESSION['user']." ".$v_section." ".$v_unit_id, $output, $return_var); - check_return_code($return_var,$output); - - +// check_return_code($return_var,$output); ?> \ No newline at end of file diff --git a/web/inc/main.php b/web/inc/main.php index 07113d3a8..68fbe272a 100644 --- a/web/inc/main.php +++ b/web/inc/main.php @@ -89,6 +89,9 @@ if (isset($_SESSION['language'])) { case 'es': setlocale(LC_ALL, 'es_ES.utf8'); break; + case 'ja': + setlocale(LC_ALL, 'ja_JP.utf8'); + break; default: setlocale(LC_ALL, 'en_US.utf8'); } @@ -102,11 +105,7 @@ if (isset($_SESSION['look']) && ( $_SESSION['look'] != 'admin' )) { $user = $_SESSION['look']; } -if (isset($_SESSION['user'])) { - get_favorites(); -} - -function get_favorites(){ +function get_favourites(){ exec (VESTA_CMD."v-list-user-favourites ".$_SESSION['user']." json", $output, $return_var); // $data = json_decode(implode('', $output).'}', true); $data = json_decode(implode('', $output), true); diff --git a/web/login/index.php b/web/login/index.php index 1216e259e..06617e2f4 100644 --- a/web/login/index.php +++ b/web/login/index.php @@ -67,6 +67,9 @@ if (isset($_POST['user']) && isset($_POST['password'])) { $_SESSION['user'] = key($data); $v_user = $_SESSION['user']; + // Get user favorites + get_favourites(); + // Define language if (!empty($data[$v_user]['LANGUAGE'])) $_SESSION['language'] = $data[$v_user]['LANGUAGE']; From ae15d937635ac241ba171e0f50ce8d38478073a3 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Wed, 28 Oct 2015 16:38:05 +0200 Subject: [PATCH 137/264] removed template selector --- web/templates/user/edit_dns.html | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/web/templates/user/edit_dns.html b/web/templates/user/edit_dns.html index f590ab890..d49c3330c 100644 --- a/web/templates/user/edit_dns.html +++ b/web/templates/user/edit_dns.html @@ -67,27 +67,6 @@ - - -         - - - '; @@ -323,7 +323,7 @@ echo ''; @@ -331,7 +331,7 @@ echo ''; @@ -339,7 +339,7 @@ echo ''; @@ -347,7 +347,7 @@ echo ''; @@ -355,13 +355,13 @@ echo ''; ?> >
        - -
        - -
        diff --git a/web/templates/user/list_web.html b/web/templates/user/list_web.html index 3ee9c16ba..9a5602d30 100644 --- a/web/templates/user/list_web.html +++ b/web/templates/user/list_web.html @@ -101,6 +101,11 @@ $ftp_user = str_replace(':', ', ', $ftp_user); } + $backend_support='no'; + if (!empty($data[$key]['BACKEND'])) { + $backend_support='yes'; + } + $proxy_support='no'; if (!empty($data[$key]['PROXY'])) { $proxy_support='yes'; @@ -207,6 +212,7 @@ sort-bandwidth="" sort-disk=" + .
        @@ -217,6 +223,19 @@ sort-bandwidth="" sort-disk=" + + . + +
        + +
        +
        :
        +
        + +
        +
        + +
        + .
        :
        + + . +
        +
        :
        +
        + +
        +
        +
        - -
        () From ec43524083641ce0a2d51966f78ab472e8583267 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Wed, 28 Oct 2015 16:38:34 +0200 Subject: [PATCH 138/264] fix for js hint --- web/templates/admin/add_mail_acc.html | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/web/templates/admin/add_mail_acc.html b/web/templates/admin/add_mail_acc.html index 811bc1873..9b68b403a 100644 --- a/web/templates/admin/add_mail_acc.html +++ b/web/templates/admin/add_mail_acc.html @@ -49,6 +49,11 @@ randomstring += chars.substring(rnum,rnum+1); } document.v_add_mail_acc.v_password.value = randomstring; + + if($('input[name=v_password]').attr('type') == 'text') + $('#v_password').text(randomstring); + else + $('#v_password').text(Array(randomstring.length+1).join('*')); } $(document).ready(function() { $('#v_account').text($('input[name=v_account]').val()); From 5d070fc9a5428e9349cce1c5caa8260ba5809306 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Wed, 28 Oct 2015 16:39:39 +0200 Subject: [PATCH 139/264] Fixes for FM --- web/css/file_manager.css | 3 +- web/css/file_manager_editor.css | 11 +- web/css/styles.min.css | 156 +++- web/file_manager/UploadHandler.php | 1343 --------------------------- web/file_manager/index.php | 15 - web/file_manager/upload_file.php | 38 - web/images/sprite.png | Bin 52380 -> 50443 bytes web/js/events.js | 69 +- web/js/file_manager.js | 5 +- web/js/i18n.js.php | 2 +- web/templates/file_manager/main.php | 22 +- web/templates/footer.html | 83 +- web/upload/UploadHandler.php | 16 +- 13 files changed, 274 insertions(+), 1489 deletions(-) delete mode 100644 web/file_manager/UploadHandler.php delete mode 100644 web/file_manager/index.php delete mode 100644 web/file_manager/upload_file.php diff --git a/web/css/file_manager.css b/web/css/file_manager.css index bd805998e..c78137077 100644 --- a/web/css/file_manager.css +++ b/web/css/file_manager.css @@ -556,11 +556,12 @@ input[type="checkbox"] { .menu div.button { display: none; } .menu div.button.medium, .menu div.button.small { display: inline-block; } - .listing li .filename-holder { max-width: 20%; } } @media (max-width: 1080px) { + .listing li .filename-holder { max-width: 36%; } .listing li .owner { display: none; } + .listing li .mode { display: none; } } @media (max-width: 890px) { diff --git a/web/css/file_manager_editor.css b/web/css/file_manager_editor.css index 1730e5410..f0800e777 100644 --- a/web/css/file_manager_editor.css +++ b/web/css/file_manager_editor.css @@ -1,11 +1,10 @@ body, form { padding: 0; margin: 0; background: #333; } -input.save { +input.save { background-color: rgba(247, 165, 48, 0.8); border: 1px solid #f79b44; border-radius: 3px; -/* bottom: 17px;*/ top: 9px; color: #fafafa; cursor: pointer; @@ -32,13 +31,5 @@ input.save:active { border: 1px solid #FFCC00; background-color: #FFCC00; color: .ace-twilight .ace_gutter-active-line { margin-top: 10px; } .ace_gutter-cell { color: #777; } -/* -.ace_gutter-cell { color: #777; padding: 9px 0px 0px 4px; } -.ace_line { padding: 9px 0px 0px 4px; } - -.ace_editor, -.ace-twilight .ace_cursor, -.ace_text-input { font-size: 17px; } -*/ .ace_editor { font-size: 19px !important; } diff --git a/web/css/styles.min.css b/web/css/styles.min.css index 9fcace9d2..bb5c3b3ec 100644 --- a/web/css/styles.min.css +++ b/web/css/styles.min.css @@ -663,7 +663,7 @@ input[type="checkbox"] { height: 22px; margin-top: 4px; width: 73px; - margin-left: -11px; + margin-left: -2px; } .l-header { @@ -746,7 +746,8 @@ input[type="checkbox"] { float: left; color: #a4abad; font-weight: 700; - padding: 10px 5px; + padding: 10px 0 0 10px; + margin-right: 12px; } .l-profile__username:hover { color: #ffd62e; @@ -759,8 +760,8 @@ input[type="checkbox"] { .l-profile__logout { float: left; color: #fff; - margin-left: 40px; - padding: 10px 5px; +/* margin-left: 40px; */ + padding: 10px 0 0 10px; } .l-profile__logout:hover { color: #C0E60E; @@ -775,6 +776,111 @@ input[type="checkbox"] { padding: 8px 5px; } +.l-profile__notifications { + background: url("/images/sprite.png") no-repeat scroll -129px -135px; + border-radius: 30px; + color: #fff; + cursor: pointer; + float: left; + font-weight: bold; + height: 15px; + margin-right: 4px; + margin-top: 5px; + padding: 10px 5px 0; + width: 15px; +} +.l-profile__notifications.active { + background-color: #454545; +} +.l-profile__notifications:hover { + background-color: #333; +} +.l-profile__notifications:active { + background-color: #c4da5e; +} +.l-profile__notifications.updates { + background-position: -165px -135px; +} + +.l-profile__notifications.updates2 { +/* background-position: -202px -135px; */ + background-position: -202px -157px; +} + +.notification-container { + background-color: #454545; + box-shadow: 0 2px 7px 0 rgba(0, 0, 0, 0.3); + list-style-type: none; + margin: 0; + overflow: hidden; + padding-left: 0; + position: fixed; + top: 34px; + width: 351px; + z-index: 21; + font-size: 12px; + padding: 0; + color: #9E9E9E; +} +.notification-container li { + border-bottom: 1px solid #555; + padding: 10px 15px 24px; +} +.notification-container .mark-seen { + background: rgba(0, 0, 0, 0) url("/images/sprite.png") repeat scroll -427px -486px; + border: 5px solid #454545; + border-radius: 12px; + cursor: pointer; + display: inline-block; + float: right; + height: 9px; + margin-right: -8px; + margin-top: -3px; + width: 9px; +} +.notification-container .mark-seen:hover { + background-color: #333; + border-color: #333; +} +.notification-container .mark-seen:active { + background-color: #777; + border-color: #777; +} +.notification-container .title { + color: #9e9e9e; + font-weight: bold; + line-height: 30px; + padding: 0; + text-transform: none; + float: none; + display: block; +} +.notification-container .title a { + color: #9e9e9e; +} + +.notification-container .unseen .title a, +.notification-container .unseen .title { + color: #C4DA5E; +} +.notification-container .unseen .title a:hover { + color: #ffcc00; +} +.notification-container .unseen .title a:active { + color: #dacf2e; +} + + +.notification-container a { + color: #5ABDB5;/* #eee;*/ +} +.notification-container a:hover { + color: #2CA99B; +} +.notification-container a:active { + color: #00C0C0; +} + .l-stat { @@ -1406,7 +1512,7 @@ div.l-content > div.l-separator:nth-of-type(4) { width: 250px; } .l-unit__stat-col--left.wide-4 { - width: 575px; + width: 550px; } @@ -2686,6 +2792,7 @@ form#vstobjects.suspended { padding: 3px 14px 3px 27px; position: absolute; text-transform: uppercase; + word-break: keep-all; z-index: -1; } @@ -2838,7 +2945,7 @@ form#vstobjects.suspended { .description { font-weight: normal; line-height: 25px; - padding-bottom: 20px; + padding-bottom: 45px; margin-left: 50px; } .description ul{ @@ -2857,13 +2964,13 @@ form#vstobjects.suspended { color: #2c9491; } .description a.purchase { - color: #86A307; + color: #FFF; background-color: #9fbf0c; + border: none; border-radius: 3px; - color: #fff; font-size: 13px; font-weight: bold; - padding: 7px; + padding: 7px 15px;; text-transform: capitalize; text-decoration: none; } @@ -2871,6 +2978,30 @@ form#vstobjects.suspended { background-color: #c0e60f; color: #555; } +.description a.purchase:active { + background-color: #D9F210; + color: #555; +} + +.description a.cancel { + background-color: #999; + border: none; + border-radius: 3px; + color: #fff; + font-size: 13px; + font-weight: bold; + padding: 7px 15px; + text-transform: capitalize; + text-decoration: none; +} +.description a.cancel:hover { + background-color: #2c9491; +} +.description a.cancel:active { + background-color: #5f9491; +} + + .description .licence { padding: 20px 0; color: #2c9491; @@ -2887,3 +3018,10 @@ form#vstobjects.suspended { padding-top: 20px; } +.description .twoco { + font-style: italic; + line-height: 15px; + font-size: 12px; +} + + diff --git a/web/file_manager/UploadHandler.php b/web/file_manager/UploadHandler.php deleted file mode 100644 index 56b67c541..000000000 --- a/web/file_manager/UploadHandler.php +++ /dev/null @@ -1,1343 +0,0 @@ - 'The uploaded file exceeds the upload_max_filesize directive in php.ini', - 2 => 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form', - 3 => 'The uploaded file was only partially uploaded', - 4 => 'No file was uploaded', - 6 => 'Missing a temporary folder', - 7 => 'Failed to write file to disk', - 8 => 'A PHP extension stopped the file upload', - 'post_max_size' => 'The uploaded file exceeds the post_max_size directive in php.ini', - 'max_file_size' => 'File is too big', - 'min_file_size' => 'File is too small', - 'accept_file_types' => 'Filetype not allowed', - 'max_number_of_files' => 'Maximum number of files exceeded', - 'max_width' => 'Image exceeds maximum width', - 'min_width' => 'Image requires a minimum width', - 'max_height' => 'Image exceeds maximum height', - 'min_height' => 'Image requires a minimum height', - 'abort' => 'File upload aborted', - 'image_resize' => 'Failed to resize image' - ); - - protected $image_objects = array(); - - function __construct($options = null, $initialize = true, $error_messages = null) { - $this->options = array( - 'script_url' => $this->get_full_url().'/', - 'upload_dir' => dirname($this->get_server_var('SCRIPT_FILENAME')).'/files/', - 'upload_url' => $this->get_full_url().'/files/', - 'user_dirs' => false, - 'mkdir_mode' => 0755, - 'param_name' => 'files', - // Set the following option to 'POST', if your server does not support - // DELETE requests. This is a parameter sent to the client: - 'delete_type' => 'DELETE', - 'access_control_allow_origin' => '*', - 'access_control_allow_credentials' => false, - 'access_control_allow_methods' => array( - 'OPTIONS', - 'HEAD', - 'GET', - 'POST', - 'PUT', - 'PATCH', - 'DELETE' - ), - 'access_control_allow_headers' => array( - 'Content-Type', - 'Content-Range', - 'Content-Disposition' - ), - // Enable to provide file downloads via GET requests to the PHP script: - // 1. Set to 1 to download files via readfile method through PHP - // 2. Set to 2 to send a X-Sendfile header for lighttpd/Apache - // 3. Set to 3 to send a X-Accel-Redirect header for nginx - // If set to 2 or 3, adjust the upload_url option to the base path of - // the redirect parameter, e.g. '/files/'. - 'download_via_php' => false, - // Read files in chunks to avoid memory limits when download_via_php - // is enabled, set to 0 to disable chunked reading of files: - 'readfile_chunk_size' => 10 * 1024 * 1024, // 10 MiB - // Defines which files can be displayed inline when downloaded: - 'inline_file_types' => '/\.(gif|jpe?g|png)$/i', - // Defines which files (based on their names) are accepted for upload: - 'accept_file_types' => '/.+$/i', - // The php.ini settings upload_max_filesize and post_max_size - // take precedence over the following max_file_size setting: - 'max_file_size' => null, - 'min_file_size' => 0, - // The maximum number of files for the upload directory: - 'max_number_of_files' => null, - // Defines which files are handled as image files: - 'image_file_types' => '/\.(gif|jpe?g|png)$/i', - // Use exif_imagetype on all files to correct file extensions: - 'correct_image_extensions' => false, - // Image resolution restrictions: - 'max_width' => null, - 'max_height' => null, - 'min_width' => 1, - 'min_height' => 1, - // Set the following option to false to enable resumable uploads: - 'discard_aborted_uploads' => true, - // Set to 0 to use the GD library to scale and orient images, - // set to 1 to use imagick (if installed, falls back to GD), - // set to 2 to use the ImageMagick convert binary directly: - 'image_library' => 1, - // Uncomment the following to define an array of resource limits - // for imagick: - /* - 'imagick_resource_limits' => array( - imagick::RESOURCETYPE_MAP => 32, - imagick::RESOURCETYPE_MEMORY => 32 - ), - */ - // Command or path for to the ImageMagick convert binary: - 'convert_bin' => 'convert', - // Uncomment the following to add parameters in front of each - // ImageMagick convert call (the limit constraints seem only - // to have an effect if put in front): - /* - 'convert_params' => '-limit memory 32MiB -limit map 32MiB', - */ - // Command or path for to the ImageMagick identify binary: - 'identify_bin' => 'identify', - 'image_versions' => array( - // The empty image version key defines options for the original image: - '' => array( - // Automatically rotate images based on EXIF meta data: - 'auto_orient' => true - ), - // Uncomment the following to create medium sized images: - /* - 'medium' => array( - 'max_width' => 800, - 'max_height' => 600 - ), - */ - 'thumbnail' => array( - // Uncomment the following to use a defined directory for the thumbnails - // instead of a subdirectory based on the version identifier. - // Make sure that this directory doesn't allow execution of files if you - // don't pose any restrictions on the type of uploaded files, e.g. by - // copying the .htaccess file from the files directory for Apache: - //'upload_dir' => dirname($this->get_server_var('SCRIPT_FILENAME')).'/thumb/', - //'upload_url' => $this->get_full_url().'/thumb/', - // Uncomment the following to force the max - // dimensions and e.g. create square thumbnails: - //'crop' => true, - 'max_width' => 80, - 'max_height' => 80 - ) - ) - ); - if ($options) { - $this->options = $options + $this->options; - } - if ($error_messages) { - $this->error_messages = $error_messages + $this->error_messages; - } - if ($initialize) { - $this->initialize(); - } - } - - protected function initialize() { - switch ($this->get_server_var('REQUEST_METHOD')) { - case 'OPTIONS': - case 'HEAD': - $this->head(); - break; - case 'GET': - $this->get(); - break; - case 'PATCH': - case 'PUT': - case 'POST': - $this->post(); - break; - case 'DELETE': - $this->delete(); - break; - default: - $this->header('HTTP/1.1 405 Method Not Allowed'); - } - } - - protected function get_full_url() { - $https = !empty($_SERVER['HTTPS']) && strcasecmp($_SERVER['HTTPS'], 'on') === 0 || - !empty($_SERVER['HTTP_X_FORWARDED_PROTO']) && - strcasecmp($_SERVER['HTTP_X_FORWARDED_PROTO'], 'https') === 0; - return - ($https ? 'https://' : 'http://'). - (!empty($_SERVER['REMOTE_USER']) ? $_SERVER['REMOTE_USER'].'@' : ''). - (isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : ($_SERVER['SERVER_NAME']. - ($https && $_SERVER['SERVER_PORT'] === 443 || - $_SERVER['SERVER_PORT'] === 80 ? '' : ':'.$_SERVER['SERVER_PORT']))). - substr($_SERVER['SCRIPT_NAME'],0, strrpos($_SERVER['SCRIPT_NAME'], '/')); - } - - protected function get_user_id() { - @session_start(); - return session_id(); - } - - protected function get_user_path() { - if ($this->options['user_dirs']) { - return $this->get_user_id().'/'; - } - return ''; - } - - protected function get_upload_path($file_name = null, $version = null) { - $file_name = $file_name ? $file_name : ''; - if (empty($version)) { - $version_path = ''; - } else { - $version_dir = @$this->options['image_versions'][$version]['upload_dir']; - if ($version_dir) { - return $version_dir.$this->get_user_path().$file_name; - } - $version_path = $version.'/'; - } - return $this->options['upload_dir'].$this->get_user_path() - .$version_path.$file_name; - } - - protected function get_query_separator($url) { - return strpos($url, '?') === false ? '?' : '&'; - } - - protected function get_download_url($file_name, $version = null, $direct = false) { - if (!$direct && $this->options['download_via_php']) { - $url = $this->options['script_url'] - .$this->get_query_separator($this->options['script_url']) - .$this->get_singular_param_name() - .'='.rawurlencode($file_name); - if ($version) { - $url .= '&version='.rawurlencode($version); - } - return $url.'&download=1'; - } - if (empty($version)) { - $version_path = ''; - } else { - $version_url = @$this->options['image_versions'][$version]['upload_url']; - if ($version_url) { - return $version_url.$this->get_user_path().rawurlencode($file_name); - } - $version_path = rawurlencode($version).'/'; - } - return $this->options['upload_url'].$this->get_user_path() - .$version_path.rawurlencode($file_name); - } - - protected function set_additional_file_properties($file) { - $file->deleteUrl = $this->options['script_url'] - .$this->get_query_separator($this->options['script_url']) - .$this->get_singular_param_name() - .'='.rawurlencode($file->name); - $file->deleteType = $this->options['delete_type']; - if ($file->deleteType !== 'DELETE') { - $file->deleteUrl .= '&_method=DELETE'; - } - if ($this->options['access_control_allow_credentials']) { - $file->deleteWithCredentials = true; - } - } - - // Fix for overflowing signed 32 bit integers, - // works for sizes up to 2^32-1 bytes (4 GiB - 1): - protected function fix_integer_overflow($size) { - if ($size < 0) { - $size += 2.0 * (PHP_INT_MAX + 1); - } - return $size; - } - - protected function get_file_size($file_path, $clear_stat_cache = false) { - if ($clear_stat_cache) { - if (version_compare(PHP_VERSION, '5.3.0') >= 0) { - clearstatcache(true, $file_path); - } else { - clearstatcache(); - } - } - return $this->fix_integer_overflow(filesize($file_path)); - } - - protected function is_valid_file_object($file_name) { - $file_path = $this->get_upload_path($file_name); - if (is_file($file_path) && $file_name[0] !== '.') { - return true; - } - return false; - } - - protected function get_file_object($file_name) { - if ($this->is_valid_file_object($file_name)) { - $file = new \stdClass(); - $file->name = $file_name; - $file->size = $this->get_file_size( - $this->get_upload_path($file_name) - ); - $file->url = $this->get_download_url($file->name); - foreach($this->options['image_versions'] as $version => $options) { - if (!empty($version)) { - if (is_file($this->get_upload_path($file_name, $version))) { - $file->{$version.'Url'} = $this->get_download_url( - $file->name, - $version - ); - } - } - } - $this->set_additional_file_properties($file); - return $file; - } - return null; - } - - protected function get_file_objects($iteration_method = 'get_file_object') { - $upload_dir = $this->get_upload_path(); - if (!is_dir($upload_dir)) { - return array(); - } - return array_values(array_filter(array_map( - array($this, $iteration_method), - scandir($upload_dir) - ))); - } - - protected function count_file_objects() { - return count($this->get_file_objects('is_valid_file_object')); - } - - protected function get_error_message($error) { - return array_key_exists($error, $this->error_messages) ? - $this->error_messages[$error] : $error; - } - - function get_config_bytes($val) { - $val = trim($val); - $last = strtolower($val[strlen($val)-1]); - switch($last) { - case 'g': - $val *= 1024; - case 'm': - $val *= 1024; - case 'k': - $val *= 1024; - } - return $this->fix_integer_overflow($val); - } - - protected function validate($uploaded_file, $file, $error, $index) { - if ($error) { - $file->error = $this->get_error_message($error); - return false; - } - $content_length = $this->fix_integer_overflow(intval( - $this->get_server_var('CONTENT_LENGTH') - )); - $post_max_size = $this->get_config_bytes(ini_get('post_max_size')); - if ($post_max_size && ($content_length > $post_max_size)) { - $file->error = $this->get_error_message('post_max_size'); - return false; - } - if (!preg_match($this->options['accept_file_types'], $file->name)) { - $file->error = $this->get_error_message('accept_file_types'); - return false; - } - if ($uploaded_file && is_uploaded_file($uploaded_file)) { - $file_size = $this->get_file_size($uploaded_file); - } else { - $file_size = $content_length; - } - if ($this->options['max_file_size'] && ( - $file_size > $this->options['max_file_size'] || - $file->size > $this->options['max_file_size']) - ) { - $file->error = $this->get_error_message('max_file_size'); - return false; - } - if ($this->options['min_file_size'] && - $file_size < $this->options['min_file_size']) { - $file->error = $this->get_error_message('min_file_size'); - return false; - } - if (is_int($this->options['max_number_of_files']) && - ($this->count_file_objects() >= $this->options['max_number_of_files']) && - // Ignore additional chunks of existing files: - !is_file($this->get_upload_path($file->name))) { - $file->error = $this->get_error_message('max_number_of_files'); - return false; - } - $max_width = @$this->options['max_width']; - $max_height = @$this->options['max_height']; - $min_width = @$this->options['min_width']; - $min_height = @$this->options['min_height']; - if (($max_width || $max_height || $min_width || $min_height) - && preg_match($this->options['image_file_types'], $file->name)) { - list($img_width, $img_height) = $this->get_image_size($uploaded_file); - } - if (!empty($img_width)) { - if ($max_width && $img_width > $max_width) { - $file->error = $this->get_error_message('max_width'); - return false; - } - if ($max_height && $img_height > $max_height) { - $file->error = $this->get_error_message('max_height'); - return false; - } - if ($min_width && $img_width < $min_width) { - $file->error = $this->get_error_message('min_width'); - return false; - } - if ($min_height && $img_height < $min_height) { - $file->error = $this->get_error_message('min_height'); - return false; - } - } - return true; - } - - protected function upcount_name_callback($matches) { - $index = isset($matches[1]) ? intval($matches[1]) + 1 : 1; - $ext = isset($matches[2]) ? $matches[2] : ''; - return ' ('.$index.')'.$ext; - } - - protected function upcount_name($name) { - return preg_replace_callback( - '/(?:(?: \(([\d]+)\))?(\.[^.]+))?$/', - array($this, 'upcount_name_callback'), - $name, - 1 - ); - } - - protected function get_unique_filename($file_path, $name, $size, $type, $error, - $index, $content_range) { - while(is_dir($this->get_upload_path($name))) { - $name = $this->upcount_name($name); - } - // Keep an existing filename if this is part of a chunked upload: - $uploaded_bytes = $this->fix_integer_overflow(intval($content_range[1])); - while(is_file($this->get_upload_path($name))) { - if ($uploaded_bytes === $this->get_file_size( - $this->get_upload_path($name))) { - break; - } - $name = $this->upcount_name($name); - } - return $name; - } - - protected function fix_file_extension($file_path, $name, $size, $type, $error, - $index, $content_range) { - // Add missing file extension for known image types: - if (strpos($name, '.') === false && - preg_match('/^image\/(gif|jpe?g|png)/', $type, $matches)) { - $name .= '.'.$matches[1]; - } - if ($this->options['correct_image_extensions'] && - function_exists('exif_imagetype')) { - switch(@exif_imagetype($file_path)){ - case IMAGETYPE_JPEG: - $extensions = array('jpg', 'jpeg'); - break; - case IMAGETYPE_PNG: - $extensions = array('png'); - break; - case IMAGETYPE_GIF: - $extensions = array('gif'); - break; - } - // Adjust incorrect image file extensions: - if (!empty($extensions)) { - $parts = explode('.', $name); - $extIndex = count($parts) - 1; - $ext = strtolower(@$parts[$extIndex]); - if (!in_array($ext, $extensions)) { - $parts[$extIndex] = $extensions[0]; - $name = implode('.', $parts); - } - } - } - return $name; - } - - protected function trim_file_name($file_path, $name, $size, $type, $error, - $index, $content_range) { - // Remove path information and dots around the filename, to prevent uploading - // into different directories or replacing hidden system files. - // Also remove control characters and spaces (\x00..\x20) around the filename: - $name = trim(basename(stripslashes($name)), ".\x00..\x20"); - // Use a timestamp for empty filenames: - if (!$name) { - $name = str_replace('.', '-', microtime(true)); - } - return $name; - } - - protected function get_file_name($file_path, $name, $size, $type, $error, - $index, $content_range) { - $name = $this->trim_file_name($file_path, $name, $size, $type, $error, - $index, $content_range); - return $this->get_unique_filename( - $file_path, - $this->fix_file_extension($file_path, $name, $size, $type, $error, - $index, $content_range), - $size, - $type, - $error, - $index, - $content_range - ); - } - - protected function handle_form_data($file, $index) { - // Handle form data, e.g. $_REQUEST['description'][$index] - } - - protected function get_scaled_image_file_paths($file_name, $version) { - $file_path = $this->get_upload_path($file_name); - if (!empty($version)) { - $version_dir = $this->get_upload_path(null, $version); - if (!is_dir($version_dir)) { - mkdir($version_dir, $this->options['mkdir_mode'], true); - } - $new_file_path = $version_dir.'/'.$file_name; - } else { - $new_file_path = $file_path; - } - return array($file_path, $new_file_path); - } - - protected function gd_get_image_object($file_path, $func, $no_cache = false) { - if (empty($this->image_objects[$file_path]) || $no_cache) { - $this->gd_destroy_image_object($file_path); - $this->image_objects[$file_path] = $func($file_path); - } - return $this->image_objects[$file_path]; - } - - protected function gd_set_image_object($file_path, $image) { - $this->gd_destroy_image_object($file_path); - $this->image_objects[$file_path] = $image; - } - - protected function gd_destroy_image_object($file_path) { - $image = (isset($this->image_objects[$file_path])) ? $this->image_objects[$file_path] : null ; - return $image && imagedestroy($image); - } - - protected function gd_imageflip($image, $mode) { - if (function_exists('imageflip')) { - return imageflip($image, $mode); - } - $new_width = $src_width = imagesx($image); - $new_height = $src_height = imagesy($image); - $new_img = imagecreatetruecolor($new_width, $new_height); - $src_x = 0; - $src_y = 0; - switch ($mode) { - case '1': // flip on the horizontal axis - $src_y = $new_height - 1; - $src_height = -$new_height; - break; - case '2': // flip on the vertical axis - $src_x = $new_width - 1; - $src_width = -$new_width; - break; - case '3': // flip on both axes - $src_y = $new_height - 1; - $src_height = -$new_height; - $src_x = $new_width - 1; - $src_width = -$new_width; - break; - default: - return $image; - } - imagecopyresampled( - $new_img, - $image, - 0, - 0, - $src_x, - $src_y, - $new_width, - $new_height, - $src_width, - $src_height - ); - return $new_img; - } - - protected function gd_orient_image($file_path, $src_img) { - if (!function_exists('exif_read_data')) { - return false; - } - $exif = @exif_read_data($file_path); - if ($exif === false) { - return false; - } - $orientation = intval(@$exif['Orientation']); - if ($orientation < 2 || $orientation > 8) { - return false; - } - switch ($orientation) { - case 2: - $new_img = $this->gd_imageflip( - $src_img, - defined('IMG_FLIP_VERTICAL') ? IMG_FLIP_VERTICAL : 2 - ); - break; - case 3: - $new_img = imagerotate($src_img, 180, 0); - break; - case 4: - $new_img = $this->gd_imageflip( - $src_img, - defined('IMG_FLIP_HORIZONTAL') ? IMG_FLIP_HORIZONTAL : 1 - ); - break; - case 5: - $tmp_img = $this->gd_imageflip( - $src_img, - defined('IMG_FLIP_HORIZONTAL') ? IMG_FLIP_HORIZONTAL : 1 - ); - $new_img = imagerotate($tmp_img, 270, 0); - imagedestroy($tmp_img); - break; - case 6: - $new_img = imagerotate($src_img, 270, 0); - break; - case 7: - $tmp_img = $this->gd_imageflip( - $src_img, - defined('IMG_FLIP_VERTICAL') ? IMG_FLIP_VERTICAL : 2 - ); - $new_img = imagerotate($tmp_img, 270, 0); - imagedestroy($tmp_img); - break; - case 8: - $new_img = imagerotate($src_img, 90, 0); - break; - default: - return false; - } - $this->gd_set_image_object($file_path, $new_img); - return true; - } - - protected function gd_create_scaled_image($file_name, $version, $options) { - if (!function_exists('imagecreatetruecolor')) { - error_log('Function not found: imagecreatetruecolor'); - return false; - } - list($file_path, $new_file_path) = - $this->get_scaled_image_file_paths($file_name, $version); - $type = strtolower(substr(strrchr($file_name, '.'), 1)); - switch ($type) { - case 'jpg': - case 'jpeg': - $src_func = 'imagecreatefromjpeg'; - $write_func = 'imagejpeg'; - $image_quality = isset($options['jpeg_quality']) ? - $options['jpeg_quality'] : 75; - break; - case 'gif': - $src_func = 'imagecreatefromgif'; - $write_func = 'imagegif'; - $image_quality = null; - break; - case 'png': - $src_func = 'imagecreatefrompng'; - $write_func = 'imagepng'; - $image_quality = isset($options['png_quality']) ? - $options['png_quality'] : 9; - break; - default: - return false; - } - $src_img = $this->gd_get_image_object( - $file_path, - $src_func, - !empty($options['no_cache']) - ); - $image_oriented = false; - if (!empty($options['auto_orient']) && $this->gd_orient_image( - $file_path, - $src_img - )) { - $image_oriented = true; - $src_img = $this->gd_get_image_object( - $file_path, - $src_func - ); - } - $max_width = $img_width = imagesx($src_img); - $max_height = $img_height = imagesy($src_img); - if (!empty($options['max_width'])) { - $max_width = $options['max_width']; - } - if (!empty($options['max_height'])) { - $max_height = $options['max_height']; - } - $scale = min( - $max_width / $img_width, - $max_height / $img_height - ); - if ($scale >= 1) { - if ($image_oriented) { - return $write_func($src_img, $new_file_path, $image_quality); - } - if ($file_path !== $new_file_path) { - return copy($file_path, $new_file_path); - } - return true; - } - if (empty($options['crop'])) { - $new_width = $img_width * $scale; - $new_height = $img_height * $scale; - $dst_x = 0; - $dst_y = 0; - $new_img = imagecreatetruecolor($new_width, $new_height); - } else { - if (($img_width / $img_height) >= ($max_width / $max_height)) { - $new_width = $img_width / ($img_height / $max_height); - $new_height = $max_height; - } else { - $new_width = $max_width; - $new_height = $img_height / ($img_width / $max_width); - } - $dst_x = 0 - ($new_width - $max_width) / 2; - $dst_y = 0 - ($new_height - $max_height) / 2; - $new_img = imagecreatetruecolor($max_width, $max_height); - } - // Handle transparency in GIF and PNG images: - switch ($type) { - case 'gif': - case 'png': - imagecolortransparent($new_img, imagecolorallocate($new_img, 0, 0, 0)); - case 'png': - imagealphablending($new_img, false); - imagesavealpha($new_img, true); - break; - } - $success = imagecopyresampled( - $new_img, - $src_img, - $dst_x, - $dst_y, - 0, - 0, - $new_width, - $new_height, - $img_width, - $img_height - ) && $write_func($new_img, $new_file_path, $image_quality); - $this->gd_set_image_object($file_path, $new_img); - return $success; - } - - protected function imagick_get_image_object($file_path, $no_cache = false) { - if (empty($this->image_objects[$file_path]) || $no_cache) { - $this->imagick_destroy_image_object($file_path); - $image = new \Imagick(); - if (!empty($this->options['imagick_resource_limits'])) { - foreach ($this->options['imagick_resource_limits'] as $type => $limit) { - $image->setResourceLimit($type, $limit); - } - } - $image->readImage($file_path); - $this->image_objects[$file_path] = $image; - } - return $this->image_objects[$file_path]; - } - - protected function imagick_set_image_object($file_path, $image) { - $this->imagick_destroy_image_object($file_path); - $this->image_objects[$file_path] = $image; - } - - protected function imagick_destroy_image_object($file_path) { - $image = (isset($this->image_objects[$file_path])) ? $this->image_objects[$file_path] : null ; - return $image && $image->destroy(); - } - - protected function imagick_orient_image($image) { - $orientation = $image->getImageOrientation(); - $background = new \ImagickPixel('none'); - switch ($orientation) { - case \imagick::ORIENTATION_TOPRIGHT: // 2 - $image->flopImage(); // horizontal flop around y-axis - break; - case \imagick::ORIENTATION_BOTTOMRIGHT: // 3 - $image->rotateImage($background, 180); - break; - case \imagick::ORIENTATION_BOTTOMLEFT: // 4 - $image->flipImage(); // vertical flip around x-axis - break; - case \imagick::ORIENTATION_LEFTTOP: // 5 - $image->flopImage(); // horizontal flop around y-axis - $image->rotateImage($background, 270); - break; - case \imagick::ORIENTATION_RIGHTTOP: // 6 - $image->rotateImage($background, 90); - break; - case \imagick::ORIENTATION_RIGHTBOTTOM: // 7 - $image->flipImage(); // vertical flip around x-axis - $image->rotateImage($background, 270); - break; - case \imagick::ORIENTATION_LEFTBOTTOM: // 8 - $image->rotateImage($background, 270); - break; - default: - return false; - } - $image->setImageOrientation(\imagick::ORIENTATION_TOPLEFT); // 1 - return true; - } - - protected function imagick_create_scaled_image($file_name, $version, $options) { - list($file_path, $new_file_path) = - $this->get_scaled_image_file_paths($file_name, $version); - $image = $this->imagick_get_image_object( - $file_path, - !empty($options['no_cache']) - ); - if ($image->getImageFormat() === 'GIF') { - // Handle animated GIFs: - $images = $image->coalesceImages(); - foreach ($images as $frame) { - $image = $frame; - $this->imagick_set_image_object($file_name, $image); - break; - } - } - $image_oriented = false; - if (!empty($options['auto_orient'])) { - $image_oriented = $this->imagick_orient_image($image); - } - $new_width = $max_width = $img_width = $image->getImageWidth(); - $new_height = $max_height = $img_height = $image->getImageHeight(); - if (!empty($options['max_width'])) { - $new_width = $max_width = $options['max_width']; - } - if (!empty($options['max_height'])) { - $new_height = $max_height = $options['max_height']; - } - if (!($image_oriented || $max_width < $img_width || $max_height < $img_height)) { - if ($file_path !== $new_file_path) { - return copy($file_path, $new_file_path); - } - return true; - } - $crop = !empty($options['crop']); - if ($crop) { - $x = 0; - $y = 0; - if (($img_width / $img_height) >= ($max_width / $max_height)) { - $new_width = 0; // Enables proportional scaling based on max_height - $x = ($img_width / ($img_height / $max_height) - $max_width) / 2; - } else { - $new_height = 0; // Enables proportional scaling based on max_width - $y = ($img_height / ($img_width / $max_width) - $max_height) / 2; - } - } - $success = $image->resizeImage( - $new_width, - $new_height, - isset($options['filter']) ? $options['filter'] : \imagick::FILTER_LANCZOS, - isset($options['blur']) ? $options['blur'] : 1, - $new_width && $new_height // fit image into constraints if not to be cropped - ); - if ($success && $crop) { - $success = $image->cropImage( - $max_width, - $max_height, - $x, - $y - ); - if ($success) { - $success = $image->setImagePage($max_width, $max_height, 0, 0); - } - } - $type = strtolower(substr(strrchr($file_name, '.'), 1)); - switch ($type) { - case 'jpg': - case 'jpeg': - if (!empty($options['jpeg_quality'])) { - $image->setImageCompression(\imagick::COMPRESSION_JPEG); - $image->setImageCompressionQuality($options['jpeg_quality']); - } - break; - } - if (!empty($options['strip'])) { - $image->stripImage(); - } - return $success && $image->writeImage($new_file_path); - } - - protected function imagemagick_create_scaled_image($file_name, $version, $options) { - list($file_path, $new_file_path) = - $this->get_scaled_image_file_paths($file_name, $version); - $resize = @$options['max_width'] - .(empty($options['max_height']) ? '' : 'X'.$options['max_height']); - if (!$resize && empty($options['auto_orient'])) { - if ($file_path !== $new_file_path) { - return copy($file_path, $new_file_path); - } - return true; - } - $cmd = $this->options['convert_bin']; - if (!empty($this->options['convert_params'])) { - $cmd .= ' '.$this->options['convert_params']; - } - $cmd .= ' '.escapeshellarg($file_path); - if (!empty($options['auto_orient'])) { - $cmd .= ' -auto-orient'; - } - if ($resize) { - // Handle animated GIFs: - $cmd .= ' -coalesce'; - if (empty($options['crop'])) { - $cmd .= ' -resize '.escapeshellarg($resize.'>'); - } else { - $cmd .= ' -resize '.escapeshellarg($resize.'^'); - $cmd .= ' -gravity center'; - $cmd .= ' -crop '.escapeshellarg($resize.'+0+0'); - } - // Make sure the page dimensions are correct (fixes offsets of animated GIFs): - $cmd .= ' +repage'; - } - if (!empty($options['convert_params'])) { - $cmd .= ' '.$options['convert_params']; - } - $cmd .= ' '.escapeshellarg($new_file_path); - exec($cmd, $output, $error); - if ($error) { - error_log(implode('\n', $output)); - return false; - } - return true; - } - - protected function get_image_size($file_path) { - if ($this->options['image_library']) { - if (extension_loaded('imagick')) { - $image = new \Imagick(); - try { - if (@$image->pingImage($file_path)) { - $dimensions = array($image->getImageWidth(), $image->getImageHeight()); - $image->destroy(); - return $dimensions; - } - return false; - } catch (Exception $e) { - error_log($e->getMessage()); - } - } - if ($this->options['image_library'] === 2) { - $cmd = $this->options['identify_bin']; - $cmd .= ' -ping '.escapeshellarg($file_path); - exec($cmd, $output, $error); - if (!$error && !empty($output)) { - // image.jpg JPEG 1920x1080 1920x1080+0+0 8-bit sRGB 465KB 0.000u 0:00.000 - $infos = preg_split('/\s+/', $output[0]); - $dimensions = preg_split('/x/', $infos[2]); - return $dimensions; - } - return false; - } - } - if (!function_exists('getimagesize')) { - error_log('Function not found: getimagesize'); - return false; - } - return @getimagesize($file_path); - } - - protected function create_scaled_image($file_name, $version, $options) { - if ($this->options['image_library'] === 2) { - return $this->imagemagick_create_scaled_image($file_name, $version, $options); - } - if ($this->options['image_library'] && extension_loaded('imagick')) { - return $this->imagick_create_scaled_image($file_name, $version, $options); - } - return $this->gd_create_scaled_image($file_name, $version, $options); - } - - protected function destroy_image_object($file_path) { - if ($this->options['image_library'] && extension_loaded('imagick')) { - return $this->imagick_destroy_image_object($file_path); - } - } - - protected function is_valid_image_file($file_path) { - if (!preg_match($this->options['image_file_types'], $file_path)) { - return false; - } - if (function_exists('exif_imagetype')) { - return @exif_imagetype($file_path); - } - $image_info = $this->get_image_size($file_path); - return $image_info && $image_info[0] && $image_info[1]; - } - - protected function handle_image_file($file_path, $file) { - $failed_versions = array(); - foreach($this->options['image_versions'] as $version => $options) { - if ($this->create_scaled_image($file->name, $version, $options)) { - if (!empty($version)) { - $file->{$version.'Url'} = $this->get_download_url( - $file->name, - $version - ); - } else { - $file->size = $this->get_file_size($file_path, true); - } - } else { - $failed_versions[] = $version ? $version : 'original'; - } - } - if (count($failed_versions)) { - $file->error = $this->get_error_message('image_resize') - .' ('.implode($failed_versions,', ').')'; - } - // Free memory: - $this->destroy_image_object($file_path); - } - - protected function handle_file_upload($uploaded_file, $name, $size, $type, $error, - $index = null, $content_range = null) { - $file = new \stdClass(); - $file->name = $this->get_file_name($uploaded_file, $name, $size, $type, $error, - $index, $content_range); - $file->size = $this->fix_integer_overflow(intval($size)); - $file->type = $type; - if ($this->validate($uploaded_file, $file, $error, $index)) { - $this->handle_form_data($file, $index); - $upload_dir = $this->get_upload_path(); - if (!is_dir($upload_dir)) { - mkdir($upload_dir, $this->options['mkdir_mode'], true); - } - $file_path = $this->get_upload_path($file->name); - $append_file = $content_range && is_file($file_path) && - $file->size > $this->get_file_size($file_path); - if ($uploaded_file && is_uploaded_file($uploaded_file)) { - // multipart/formdata uploads (POST method uploads) - if ($append_file) { - file_put_contents( - $file_path, - fopen($uploaded_file, 'r'), - FILE_APPEND - ); - } else { - move_uploaded_file($uploaded_file, $file_path); - } - } else { - // Non-multipart uploads (PUT method support) - file_put_contents( - $file_path, - fopen('php://input', 'r'), - $append_file ? FILE_APPEND : 0 - ); - } - $file_size = $this->get_file_size($file_path, $append_file); - if ($file_size === $file->size) { - $file->url = $this->get_download_url($file->name); - if ($this->is_valid_image_file($file_path)) { - $this->handle_image_file($file_path, $file); - } - } else { - $file->size = $file_size; - if (!$content_range && $this->options['discard_aborted_uploads']) { - unlink($file_path); - $file->error = $this->get_error_message('abort'); - } - } - $this->set_additional_file_properties($file); - } - return $file; - } - - protected function readfile($file_path) { - $file_size = $this->get_file_size($file_path); - $chunk_size = $this->options['readfile_chunk_size']; - if ($chunk_size && $file_size > $chunk_size) { - $handle = fopen($file_path, 'rb'); - while (!feof($handle)) { - echo fread($handle, $chunk_size); - @ob_flush(); - @flush(); - } - fclose($handle); - return $file_size; - } - return readfile($file_path); - } - - protected function body($str) { - echo $str; - } - - protected function header($str) { - header($str); - } - - protected function get_server_var($id) { - return isset($_SERVER[$id]) ? $_SERVER[$id] : ''; - } - - protected function generate_response($content, $print_response = true) { - if ($print_response) { - $json = json_encode($content); - $redirect = isset($_REQUEST['redirect']) ? - stripslashes($_REQUEST['redirect']) : null; - if ($redirect) { - $this->header('Location: '.sprintf($redirect, rawurlencode($json))); - return; - } - $this->head(); - if ($this->get_server_var('HTTP_CONTENT_RANGE')) { - $files = isset($content[$this->options['param_name']]) ? - $content[$this->options['param_name']] : null; - if ($files && is_array($files) && is_object($files[0]) && $files[0]->size) { - $this->header('Range: 0-'.( - $this->fix_integer_overflow(intval($files[0]->size)) - 1 - )); - } - } - $this->body($json); - } - return $content; - } - - protected function get_version_param() { - return isset($_GET['version']) ? basename(stripslashes($_GET['version'])) : null; - } - - protected function get_singular_param_name() { - return substr($this->options['param_name'], 0, -1); - } - - protected function get_file_name_param() { - $name = $this->get_singular_param_name(); - return isset($_REQUEST[$name]) ? basename(stripslashes($_REQUEST[$name])) : null; - } - - protected function get_file_names_params() { - $params = isset($_REQUEST[$this->options['param_name']]) ? - $_REQUEST[$this->options['param_name']] : array(); - foreach ($params as $key => $value) { - $params[$key] = basename(stripslashes($value)); - } - return $params; - } - - protected function get_file_type($file_path) { - switch (strtolower(pathinfo($file_path, PATHINFO_EXTENSION))) { - case 'jpeg': - case 'jpg': - return 'image/jpeg'; - case 'png': - return 'image/png'; - case 'gif': - return 'image/gif'; - default: - return ''; - } - } - - protected function download() { - switch ($this->options['download_via_php']) { - case 1: - $redirect_header = null; - break; - case 2: - $redirect_header = 'X-Sendfile'; - break; - case 3: - $redirect_header = 'X-Accel-Redirect'; - break; - default: - return $this->header('HTTP/1.1 403 Forbidden'); - } - $file_name = $this->get_file_name_param(); - if (!$this->is_valid_file_object($file_name)) { - return $this->header('HTTP/1.1 404 Not Found'); - } - if ($redirect_header) { - return $this->header( - $redirect_header.': '.$this->get_download_url( - $file_name, - $this->get_version_param(), - true - ) - ); - } - $file_path = $this->get_upload_path($file_name, $this->get_version_param()); - // Prevent browsers from MIME-sniffing the content-type: - $this->header('X-Content-Type-Options: nosniff'); - if (!preg_match($this->options['inline_file_types'], $file_name)) { - $this->header('Content-Type: application/octet-stream'); - $this->header('Content-Disposition: attachment; filename="'.$file_name.'"'); - } else { - $this->header('Content-Type: '.$this->get_file_type($file_path)); - $this->header('Content-Disposition: inline; filename="'.$file_name.'"'); - } - $this->header('Content-Length: '.$this->get_file_size($file_path)); - $this->header('Last-Modified: '.gmdate('D, d M Y H:i:s T', filemtime($file_path))); - $this->readfile($file_path); - } - - protected function send_content_type_header() { - $this->header('Vary: Accept'); - if (strpos($this->get_server_var('HTTP_ACCEPT'), 'application/json') !== false) { - $this->header('Content-type: application/json'); - } else { - $this->header('Content-type: text/plain'); - } - } - - protected function send_access_control_headers() { - $this->header('Access-Control-Allow-Origin: '.$this->options['access_control_allow_origin']); - $this->header('Access-Control-Allow-Credentials: ' - .($this->options['access_control_allow_credentials'] ? 'true' : 'false')); - $this->header('Access-Control-Allow-Methods: ' - .implode(', ', $this->options['access_control_allow_methods'])); - $this->header('Access-Control-Allow-Headers: ' - .implode(', ', $this->options['access_control_allow_headers'])); - } - - public function head() { - $this->header('Pragma: no-cache'); - $this->header('Cache-Control: no-store, no-cache, must-revalidate'); - $this->header('Content-Disposition: inline; filename="files.json"'); - // Prevent Internet Explorer from MIME-sniffing the content-type: - $this->header('X-Content-Type-Options: nosniff'); - if ($this->options['access_control_allow_origin']) { - $this->send_access_control_headers(); - } - $this->send_content_type_header(); - } - - public function get($print_response = true) { - if ($print_response && isset($_GET['download'])) { - return $this->download(); - } - $file_name = $this->get_file_name_param(); - if ($file_name) { - $response = array( - $this->get_singular_param_name() => $this->get_file_object($file_name) - ); - } else { - $response = array( - $this->options['param_name'] => $this->get_file_objects() - ); - } - return $this->generate_response($response, $print_response); - } - - public function post($print_response = true) { - if (isset($_REQUEST['_method']) && $_REQUEST['_method'] === 'DELETE') { - return $this->delete($print_response); - } - $upload = isset($_FILES[$this->options['param_name']]) ? - $_FILES[$this->options['param_name']] : null; - // Parse the Content-Disposition header, if available: - $file_name = $this->get_server_var('HTTP_CONTENT_DISPOSITION') ? - rawurldecode(preg_replace( - '/(^[^"]+")|("$)/', - '', - $this->get_server_var('HTTP_CONTENT_DISPOSITION') - )) : null; - // Parse the Content-Range header, which has the following form: - // Content-Range: bytes 0-524287/2000000 - $content_range = $this->get_server_var('HTTP_CONTENT_RANGE') ? - preg_split('/[^0-9]+/', $this->get_server_var('HTTP_CONTENT_RANGE')) : null; - $size = $content_range ? $content_range[3] : null; - $files = array(); - if ($upload && is_array($upload['tmp_name'])) { - // param_name is an array identifier like "files[]", - // $_FILES is a multi-dimensional array: - foreach ($upload['tmp_name'] as $index => $value) { - $files[] = $this->handle_file_upload( - $upload['tmp_name'][$index], - $file_name ? $file_name : $upload['name'][$index], - $size ? $size : $upload['size'][$index], - $upload['type'][$index], - $upload['error'][$index], - $index, - $content_range - ); - } - } else { - // param_name is a single object identifier like "file", - // $_FILES is a one-dimensional array: - $files[] = $this->handle_file_upload( - isset($upload['tmp_name']) ? $upload['tmp_name'] : null, - $file_name ? $file_name : (isset($upload['name']) ? - $upload['name'] : null), - $size ? $size : (isset($upload['size']) ? - $upload['size'] : $this->get_server_var('CONTENT_LENGTH')), - isset($upload['type']) ? - $upload['type'] : $this->get_server_var('CONTENT_TYPE'), - isset($upload['error']) ? $upload['error'] : null, - null, - $content_range - ); - } - return $this->generate_response( - array($this->options['param_name'] => $files), - $print_response - ); - } - - public function delete($print_response = true) { - $file_names = $this->get_file_names_params(); - if (empty($file_names)) { - $file_names = array($this->get_file_name_param()); - } - $response = array(); - foreach($file_names as $file_name) { - $file_path = $this->get_upload_path($file_name); - $success = is_file($file_path) && $file_name[0] !== '.' && unlink($file_path); - if ($success) { - foreach($this->options['image_versions'] as $version => $options) { - if (!empty($version)) { - $file = $this->get_upload_path($file_name, $version); - if (is_file($file)) { - unlink($file); - } - } - } - } - $response[$file_name] = $success; - } - return $this->generate_response($response, $print_response); - } - -} diff --git a/web/file_manager/index.php b/web/file_manager/index.php deleted file mode 100644 index 3ae1295ef..000000000 --- a/web/file_manager/index.php +++ /dev/null @@ -1,15 +0,0 @@ - 0 ) { - header("Location: /error/"); - exit; - } - $panel = json_decode(implode('', $output), true); -} - - -// Define a destination -//$targetFolder = '/home/admin/'; // Relative to the root -$targetFolder = $panel[$user]['HOME']; // Relative to the root - -$verifyToken = md5('unique_salt' . $_POST['timestamp']); - -if (!empty($_FILES) && $_POST['token'] == $verifyToken) { - $tempFile = $_FILES['Filedata']['tmp_name']; - $targetPath = $targetFolder; - $targetFile = rtrim($targetPath,'/') . '/' . $_FILES['Filedata']['name']; - - exec (VESTA_CMD . "v-copy-fs-file {$user} {$tempFile} {$targetFile}", $output, $return_var); - - $error = check_return_code($return_var, $output); - if ($return_var != 0) { - echo '0'; - } else { - echo '1'; - } -} - -?> diff --git a/web/images/sprite.png b/web/images/sprite.png index a20baf8a14705aa5de2e1993518bf59209bf3d7c..05535f56a1f09a88d4cb2cd386d1518aae826456 100644 GIT binary patch literal 50443 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 k>#UPE_5LqTGU({=-0+jZW!1P;45=9%ze*gdg literal 52380 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 diff --git a/web/js/events.js b/web/js/events.js index 9b7ceb38c..66d793272 100644 --- a/web/js/events.js +++ b/web/js/events.js @@ -238,6 +238,7 @@ VE.navigation.enter_focused = function() { } } +/* VE.navigation.move_focus_left = function(){ var index = parseInt($(VE.navigation.state.menu_selector).index($(VE.navigation.state.menu_selector+'.focus'))); if(index == -1) @@ -248,6 +249,8 @@ VE.navigation.move_focus_left = function(){ } else { $($(VE.navigation.state.menu_selector)[0]).addClass('focus'); } + + } VE.navigation.move_focus_right = function(){ @@ -286,6 +289,71 @@ VE.navigation.switch_menu = function(){ $($(VE.navigation.state.menu_selector)[index]).addClass('focus'); } } +*/ + + +VE.navigation.move_focus_left = function(){ + var index = parseInt($(VE.navigation.state.menu_selector).index($(VE.navigation.state.menu_selector+'.focus'))); + if(index == -1) + index = parseInt($(VE.navigation.state.menu_selector).index($(VE.navigation.state.menu_active_selector))); + + $(VE.navigation.state.menu_selector).removeClass('focus'); + + if(index > 0){ + $($(VE.navigation.state.menu_selector)[index-1]).addClass('focus'); + } else { + VE.navigation.switch_menu('last'); + } +} + +VE.navigation.move_focus_right = function(){ + var max_index = $(VE.navigation.state.menu_selector).length-1; + var index = parseInt($(VE.navigation.state.menu_selector).index($(VE.navigation.state.menu_selector+'.focus'))); + if(index == -1) + index = parseInt($(VE.navigation.state.menu_selector).index($(VE.navigation.state.menu_active_selector))) || 0; + + $(VE.navigation.state.menu_selector).removeClass('focus'); + + if(index < max_index){ + $($(VE.navigation.state.menu_selector)[index+1]).addClass('focus'); + } else { + VE.navigation.switch_menu('first'); + } +} + +VE.navigation.switch_menu = function(position){ + position = position || 'first'; // last + + if(VE.navigation.state.active_menu == 0){ + VE.navigation.state.active_menu = 1; + VE.navigation.state.menu_selector = '.l-stat__col'; + VE.navigation.state.menu_active_selector = '.l-stat__col--active'; + $('.l-menu').removeClass('active'); + $('.l-stat').addClass('active'); + + if(position == 'first'){ + $($(VE.navigation.state.menu_selector)[0]).addClass('focus'); + } else { + var max_index = $(VE.navigation.state.menu_selector).length-1; + $($(VE.navigation.state.menu_selector)[max_index]).addClass('focus'); + } + } else { + VE.navigation.state.active_menu = 0; + VE.navigation.state.menu_selector = '.l-menu__item'; + VE.navigation.state.menu_active_selector = '.l-menu__item--active'; + $('.l-menu').addClass('active'); + $('.l-stat').removeClass('active'); + + if(position == 'first'){ + $($(VE.navigation.state.menu_selector)[0]).addClass('focus'); + } else { + var max_index = $(VE.navigation.state.menu_selector).length-1; + $($(VE.navigation.state.menu_selector)[max_index]).addClass('focus'); + } + } +} + + VE.navigation.init = function(){ if($('.l-menu__item.l-menu__item--active').length){ @@ -295,7 +363,6 @@ VE.navigation.init = function(){ VE.navigation.state.menu_active_selector = '.l-menu__item--active'; $('.l-menu').addClass('active'); $('.l-stat').removeClass('active'); - } else { $('.l-stat').addClass('active'); } diff --git a/web/js/file_manager.js b/web/js/file_manager.js index d54097c8a..ae3ab5df2 100644 --- a/web/js/file_manager.js +++ b/web/js/file_manager.js @@ -663,9 +663,8 @@ FM.generate_listing = function(reply, box) { tpl.set(':SIZE_VALUE', o.type == 'f' ? FM.humanFileSizeValue(o.size) : ' '); tpl.set(':SIZE_UNIT', o.type == 'f' ? FM.humanFileSizeUnit(o.size) : ' '); tpl.set(':TIME', (psDate.getFullYear() != new Date().getFullYear()) ? psDate.getFullYear() || "" : time); - tpl.set(':DATE', o.date.trim() != '' ? psDate.format('mmm d') : ' '/*o.date*/); - - + tpl.set(':DATE', o.date.trim() != '' ? App.Constants.FM_TRANSLATED_DATES[psDate.format('mmm')] + psDate.format(' d'): ' '/*o.date*/); + if (o.name == '..' || o.type == 'd') { tpl.set(':SUBMENU_CLASS', 'hidden'); } diff --git a/web/js/i18n.js.php b/web/js/i18n.js.php index d3f2a7e0f..d84c95801 100644 --- a/web/js/i18n.js.php +++ b/web/js/i18n.js.php @@ -83,6 +83,6 @@ App.Constants.FM_FILE = ''; App.Constants.FM_ALREADY_EXISTS = ''; App.Constants.FM_CREATE_FILE = ''; App.Constants.FM_CREATE_DIRECTORY = ''; - +App.Constants.FM_TRANSLATED_DATES = {'Jan': '', 'Feb': '','Mar': '','Apr': '','May': '','Jun': '','Jul': '','Aug': '','Sep': '','Oct': '','Nov': '','Dec': ''}; diff --git a/web/templates/file_manager/main.php b/web/templates/file_manager/main.php index d395633c4..7fed618e5 100644 --- a/web/templates/file_manager/main.php +++ b/web/templates/file_manager/main.php @@ -86,11 +86,11 @@
      • n
      • F7
      • d
        • -
      • F2 / <Shift>+F6
        • +
      • F2 / Shift+F6
      • F5
      • a
      • F8 / Del
        • -
      • <Ctrl> + s
        • +
      • Ctrl + s
      • h
      • Esc
        • @@ -99,15 +99,15 @@
      • ↓
      • ←
      • →
        • -
      • <Tab>
        • -
      • <Home>
        • -
      • <End>
        • -
      • <Enter>
        • -
      • <Backspace>
        • -
      • <Insert> / <Space>
        • -
      • <Shift> + click
        • -
      • <Ctrl> + click
        • -
      • <Ctrl> + a
        • +
      • Tab
        • +
      • Home
        • +
      • End
        • +
      • Enter
        • +
      • Backspace
        • +
      • Insert / Space
        • +
      • Shift + click
        • +
      • Ctrl + click
        • +
      • Ctrl + a
          • Midnight Commander file manager')?>
        diff --git a/web/templates/footer.html b/web/templates/footer.html index 23503e660..361b516da 100644 --- a/web/templates/footer.html +++ b/web/templates/footer.html @@ -177,19 +177,26 @@ } ); - shortcut.add("a", function(evt){ - if (!evt.ctrlKey && !evt.shiftKey) { - if ($('.l-sort__create-btn')[0]) { - location.href=$('.l-sort__create-btn').attr('href'); + $(window).bind('keypress', function(evt) { + if (evt.charCode == 97) { + evt.preventDefault(); + if (!evt.ctrlKey && !evt.shiftKey) { + if ($('.l-sort__create-btn')[0]) { + location.href=$('.l-sort__create-btn').attr('href'); + } } - } - }, { - 'type': 'keyup', - 'propagate': false, - 'disable_in_input': true, - 'target': document - } - ); + else { + if ($('.l-unit .ch-toggle:eq(0)').attr('checked')) { + $('.l-unit').removeClass('selected'); + $('.l-unit .ch-toggle').attr('checked', false); + } + else { + $('.l-unit').addClass('selected'); + $('.l-unit .ch-toggle').attr('checked', true); + } + } + } + }); shortcut.add("n", function(evt){ if (!evt.ctrlKey && !evt.shiftKey) { @@ -205,29 +212,6 @@ } ); - - shortcut.add("Ctrl+m", function(evt){ - console.log('ctrl+m'); - }, { - 'type': 'keyup', - 'propagate': false, - 'disable_in_input': true, - 'target': document - } - ); - - shortcut.add("m", function(evt){ - console.log('m'); - }, { - 'type': 'keyup', - 'propagate': false, - 'disable_in_input': true, - 'target': document - } - ); - - - shortcut.add("a+1", function(){ location.href='/add/user/'; }, { @@ -238,9 +222,6 @@ } ); - - - shortcut.add("1", function(){ if(VE.tmp.form_changed){ VE.helpers.createConfirmationDialog($('.confirmation-text-redirect'), '', $('.l-stat .l-stat__col:nth-of-type(1) a').attr('href')); @@ -393,17 +374,6 @@ } ); - shortcut.add("Alt", function(){ - VE.navigation.switch_menu(); - }, { - 'type': 'keydown', - 'propagate': false, - 'disable_in_input': false, - 'target': document - } - ); - - $('.shortcuts .close').click(function(){ $('.shortcuts').hide(); }); @@ -412,13 +382,21 @@ $('.shortcuts').toggle(); }); + $('.l-profile__notifications').click(function(){ + $('.notification-container').toggle(); + $('.l-profile__notifications').toggleClass('active'); + + left = $('.l-profile__notifications').offset().left - $('.notification-container').outerWidth() + 28; + $('.notification-container').css({left: left+'px'}); + }); + VE.navigation.init(); VE.core.register(); if (location.href.search(/list/) != -1) { var shift_select_ref = $('body').finderSelect({ - children: '.l-unit', + children: '.l-unit', 'onFinish': function(evt) { var ref = $(evt.target); $('.l-content').find('.l-unit .ch-toggle').attr('checked', false); @@ -462,7 +440,7 @@
        • n
          • -
        • <Ctrl> + Enter
          • +
        • Ctrl + Enter
        • Backspace
        • 1
          • @@ -479,8 +457,7 @@
        • ←
        • →
          • -
        • <Alt>
          • -
        • <Enter>
          • +
        • Enter
        diff --git a/web/upload/UploadHandler.php b/web/upload/UploadHandler.php index 19078b53d..f26387eab 100755 --- a/web/upload/UploadHandler.php +++ b/web/upload/UploadHandler.php @@ -116,7 +116,7 @@ class UploadHandler // The php.ini settings upload_max_filesize and post_max_size // take precedence over the following max_file_size setting: 'max_file_size' => null, - 'min_file_size' => 1, + 'min_file_size' => null, // The maximum number of files for the upload directory: 'max_number_of_files' => null, // Defines which files are handled as image files: @@ -476,9 +476,17 @@ class UploadHandler 1 ); } + + protected function sanitizeFileName($file) { + $file = preg_replace("/[^a-z0-9\._-]+/", '', $file); + + return $file; + } protected function get_unique_filename($file_path, $name, $size, $type, $error, $index, $content_range) { + $name = $this->sanitizeFileName($name); + while(is_dir($this->get_upload_path($name))) { $name = $this->upcount_name($name); } @@ -1074,8 +1082,8 @@ class UploadHandler protected function handle_file_upload($uploaded_file, $name, $size, $type, $error, $index = null, $content_range = null) { - - + + $file = new \stdClass(); $file->name = $this->get_file_name($uploaded_file, $name, $size, $type, $error, $index, $content_range); @@ -1162,7 +1170,7 @@ class UploadHandler protected function body($str) { echo $str; } - + protected function header($str) { header($str); } From aa558a66c0d6fc0ad8ed234858f57c76161a77c5 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Wed, 28 Oct 2015 16:44:49 +0200 Subject: [PATCH 140/264] i18n update --- web/inc/i18n/ar.php | 1 - web/inc/i18n/bs.php | 1 - web/inc/i18n/cn.php | 1 - web/inc/i18n/cz.php | 1 - web/inc/i18n/da.php | 594 ++++++++++++++++++++++++++++++++++++++++++++ web/inc/i18n/de.php | 157 ++++++------ web/inc/i18n/el.php | 1 - web/inc/i18n/en.php | 1 - web/inc/i18n/es.php | 52 ++-- web/inc/i18n/fi.php | 1 - web/inc/i18n/fr.php | 1 - web/inc/i18n/hu.php | 190 +++++++------- web/inc/i18n/id.php | 1 - web/inc/i18n/it.php | 1 - web/inc/i18n/ja.php | 89 +++++++ web/inc/i18n/nl.php | 1 - web/inc/i18n/no.php | 1 - web/inc/i18n/pl.php | 111 ++++++++- web/inc/i18n/pt.php | 1 - web/inc/i18n/ro.php | 1 - web/inc/i18n/ru.php | 1 - web/inc/i18n/se.php | 1 - web/inc/i18n/tr.php | 9 +- web/inc/i18n/tw.php | 466 +++++++++++++++++++++++++++++++++- web/inc/i18n/ua.php | 1 - 25 files changed, 1453 insertions(+), 232 deletions(-) create mode 100644 web/inc/i18n/da.php diff --git a/web/inc/i18n/ar.php b/web/inc/i18n/ar.php index e239ba521..232bd8c97 100644 --- a/web/inc/i18n/ar.php +++ b/web/inc/i18n/ar.php @@ -562,7 +562,6 @@ $LANG['ar'] = array( 'Display/Close shortcuts' => 'Display/Close shortcuts', 'Move backward through top menu' => 'Move backward through top menu', 'Move forward through top menu' => 'Move forward through top menu', - 'Switch active menu' => 'Switch active menu', 'Enter focused element' => 'Enter focused element', 'Upload' => 'Upload', diff --git a/web/inc/i18n/bs.php b/web/inc/i18n/bs.php index a03ea5832..359731938 100644 --- a/web/inc/i18n/bs.php +++ b/web/inc/i18n/bs.php @@ -556,7 +556,6 @@ $LANG['bs'] = array( 'Display/Close shortcuts' => 'Display/Close shortcuts', 'Move backward through top menu' => 'Move backward through top menu', 'Move forward through top menu' => 'Move forward through top menu', - 'Switch active menu' => 'Switch active menu', 'Enter focused element' => 'Enter focused element', 'Upload' => 'Upload', diff --git a/web/inc/i18n/cn.php b/web/inc/i18n/cn.php index d8c6c4b9d..9a43d3653 100644 --- a/web/inc/i18n/cn.php +++ b/web/inc/i18n/cn.php @@ -561,7 +561,6 @@ $LANG['cn'] = array( 'Display/Close shortcuts' => 'Display/Close shortcuts', 'Move backward through top menu' => 'Move backward through top menu', 'Move forward through top menu' => 'Move forward through top menu', - 'Switch active menu' => 'Switch active menu', 'Enter focused element' => 'Enter focused element', 'Upload' => 'Upload', diff --git a/web/inc/i18n/cz.php b/web/inc/i18n/cz.php index b408ec21c..dddeb1816 100644 --- a/web/inc/i18n/cz.php +++ b/web/inc/i18n/cz.php @@ -562,7 +562,6 @@ $LANG['cz'] = array( 'Display/Close shortcuts' => 'Display/Close shortcuts', 'Move backward through top menu' => 'Move backward through top menu', 'Move forward through top menu' => 'Move forward through top menu', - 'Switch active menu' => 'Switch active menu', 'Enter focused element' => 'Enter focused element', 'Upload' => 'Upload', diff --git a/web/inc/i18n/da.php b/web/inc/i18n/da.php new file mode 100644 index 000000000..31cf5ac3d --- /dev/null +++ b/web/inc/i18n/da.php @@ -0,0 +1,594 @@ + 'Pakker', + 'IP' => 'IP', + 'Graphs' => 'Grafer', + 'Statistics' => 'Statistik', + 'Log' => 'Log', + 'Server' => 'Server', + 'Services' => 'Services', + 'Firewall' => 'Firewall', + 'Updates' => 'Opdateringer', + 'Log in' => 'Log ind', + 'Log out' => 'Log ud', + + 'USER' => 'BRUGER', + 'WEB' => 'WEB', + 'DNS' => 'DNS', + 'MAIL' => 'MAIL', + 'DB' => 'DB', + 'CRON' => 'CRON', + 'BACKUP' => 'BACKUP', + + 'Add User' => '', + 'Add Domain' => 'Tilføj Domæne', + 'Add Web Domain' => 'Tilføj Web Domæne', + 'Add DNS Domain' => 'Tilføj DNS Domæne', + 'Add DNS Record' => 'Tilføj DNS Record', + 'Add Mail Domain' => 'Tilføj Mail Domæne', + 'Add Mail Account' => 'Tilføj Mail Konto', + 'Add Database' => 'Tilføj Database', + 'Add Cron Job' => 'Tilføj Cron Job', + 'Create Backup' => 'Opret Backup', + 'Configure' => 'Konfigurér', + 'Restore All' => 'Genskab Alle', + 'Add Package' => 'Tilføj Pakke', + 'Add IP' => 'Tilføj IP-Addresse', + 'Add Rule' => 'Tilføj Regel', + 'Ban IP Address' => 'Ban IP-Addresse', + 'Search' => 'Search', + 'Add one more FTP Account' => 'Tilføj en FTP-Konto mere', + 'Overall Statistics' => 'Overordnet Statistik', + 'Daily' => 'Daglig', + 'Weekly' => 'Ugentlig', + 'Monthly' => 'Månedlig', + 'Yearly' => 'Årlig', + 'Add' => 'Tilføj', + 'Back' => 'Tilbage', + 'Save' => 'Gem', + 'Submit' => 'Send', + + 'toggle all' => 'skift alle', + 'apply to selected' => 'udfør på valgte', + 'rebuild' => 'genskab', + 'rebuild web' => 'genskab web', + 'rebuild dns' => 'genskab dns', + 'rebuild mail' => 'genskab mail', + 'rebuild db' => 'genskab db', + 'rebuild cron' => 'genskab cron', + 'update counters' => 'opdater tællere', + 'suspend' => 'suspendér', + 'unsuspend' => 'afsuspendér', + 'delete' => 'slet', + 'show per user' => 'vis per bruger', + 'login as' => 'log ind som', + 'logout' => 'log ud', + 'edit' => 'redigér', + 'open webstats' => 'åbn webstats', + 'view logs' => 'se logs', + 'list records' => 'vis %s records', + 'add record' => 'tilføj record', + 'list accounts' => 'list %s konti', + 'add account' => 'add konto', + 'open webmail' => 'åbn webmail', + 'list fail2ban' => 'list fail2ban', + 'open %s' => 'åbn %s', + 'download' => 'download', + 'restore' => 'restore', + 'configure restore settings' => 'konfigurér indstillinger for genskabelse', + 'stop' => 'stop', + 'start' => 'start', + 'restart' => 'restart', + 'update' => 'opdatér', + 'generate' => 'generér', + 'Generate CSR' => 'Generér CSR', + 'reread IP' => 'genindlæs IP', + 'enable autoupdate' => 'aktivér autoupdate', + 'disable autoupdate' => 'slå autoopdatéring fra', + 'turn on notifications' => 'slå notifikationer til', + 'turn off notifications' => 'slå notifikationer fra', + + 'Adding User' => 'Tilføjer Bruger', + 'Editing User' => 'Ændrer Bruger', + 'Adding Domain' => 'Tilføjer Domæne', + 'Editing Domain' => 'Ændrer Domæne', + 'Adding DNS Domain' => 'Tilføjer DNS Domæne', + 'Editing DNS Domain' => 'Ændrer DNS Domæne', + 'Adding DNS Record' => 'Tilføjer DNS Record', + 'Editing DNS Record' => 'Ændrer DNS Record', + 'Adding Mail Domain' => 'Tilføjer Mail Domæne', + 'Editing Mail Domain' => 'Ændrer Mail Domæne', + 'Adding Mail Account' => 'Tilføjer Mail Konto', + 'Editing Mail Account' => 'Ændrer Mail Konto', + 'Adding database' => 'Tilføjer database', + 'Editing Cron Job' => 'Ændrer Cron Job', + 'Adding Cron Job' => 'Tilføjer Cron Job', + 'Editing Database' => 'Ændrer Database', + 'Adding Package' => 'Tilføjer Package', + 'Editing Package' => 'Ændrer Package', + 'Adding IP address' => 'Tilføjer IP address', + 'Editing IP Address' => 'Ændrer IP Address', + 'Editing Backup Exclusions' => 'Ændrer Backup Exclusions', + 'Generating CSR' => 'Generating CSR', + 'Listing' => 'Listing', + 'Search Results' => 'Søgeresultater', + 'Adding Firewall Rule' => 'Tilføjer Firewall Regel', + 'Editing Firewall Rule' => 'Ændrer Firewall Regel', + 'Adding IP Address to Banlist' => 'Tilføjer IP Addresse til Banliste', + + 'active' => 'aktiv', + 'spnd' => 'suspenderet', + 'suspended' => 'suspenderet', + 'running' => 'kører', + 'stopped' => 'stoppet', + 'outdated' => 'uddateret', + 'updated' => 'opdatéret', + + 'yes' => 'ja', + 'no' => 'nej', + 'none' => 'ingen', + 'pb' => 'pb', + 'tb' => 'tb', + 'gb' => 'gb', + 'mb' => 'mb', + 'minute' => 'minut', + 'hour' => 'time', + 'day' => 'dag', + 'days' => 'dage', + 'hours' => 'timer', + 'minutes' => 'minutter', + 'month' => 'måned', + 'package' => 'pakke', + 'Bandwidth' => 'Båndbredde', + 'Disk' => 'Disk', + 'Web' => 'Web', + 'Mail' => 'Mail', + 'Databases' => 'Databaser', + 'User Directories' => 'Bruger Mapper', + 'Template' => 'Skabelon', + 'Web Template' => 'Web Skabelon', + 'Backend Template' => 'Backend Skabelon', + 'Proxy Template' =>'Proxy Skabelon', + 'DNS Template' => 'DNS Skabelon', + 'Web Domains' => 'Web Domæner', + 'SSL Domains' => 'SSL Domæner', + 'Web Aliases' => 'Web Aliaser', + 'per domain' => 'per domæne', + 'DNS Domains' => 'DNS Domæner', + 'DNS Domains' => 'DNS Domæner', + 'DNS records' => 'DNS Records' , + 'Name Servers' => 'Name Servers', + 'Mail Domains' => 'Mail Domæner', + 'Mail Accounts' => 'Mail Accounts', + 'Cron Jobs' => 'Cron Jobs', + 'SSH Access' => 'SSH Adgang', + 'IP Addresses' => 'IP Addresser', + 'Backups' => 'Backups', + 'Backup System' => 'Backup System', + 'backup exclusions' => 'backup ekslusioner', + 'template' => 'skabelon', + 'SSL Support' => 'SSL Support', + 'SSL Home Directory' => 'SSL Home', + 'Proxy Support' => 'Proxy Support', + 'Proxy Extensions' => 'Proxy Tilføjelser', + 'Web Statistics' => 'Web Statistik', + 'Additional FTP Account' => 'Ekstra FTP', + 'SOA' => 'SOA', + 'TTL' => 'TTL', + 'Expire' => 'Udløber', + 'Records' => 'Records', + 'Catchall email' => 'Catchall email', + 'AntiVirus Support' => 'AntiVirus Support', + 'AntiSpam Support' => 'AntiSpam Support', + 'DKIM Support' => 'DKIM Support', + 'Accounts' => 'Konti', + 'Quota' => 'Quota', + 'Autoreply' => 'Autosvar', + 'Forward to' => 'Vidersend til', + 'Do not store forwarded mail' => 'Gem ikke vidersendte mails', + 'database' => 'database', + 'User' => 'Bruger', + 'Host' => 'Host', + 'Charset' => 'Karaktersæt', + 'Min' => 'Min', + 'Hour' => 'Time', + 'Day' => 'Dag', + 'Month' => 'Måned', + 'Day of week' => 'Ugedag', + 'local' => 'lokal', + 'Run Time' => 'Tid for kørsel', + 'Backup Size' => 'Backup Størelse', + 'SYS' => 'SYS', + 'Domains' => 'Domæner', + 'Status' => 'Status', + 'shared' => 'delt', + 'dedicated' => 'dedikeret', + 'Owner' => 'Ejer', + 'Users' => 'Brugere', + 'Load Average' => 'Load Gennemsnit', + 'Memory Usage' => 'Hukommelsesforbrug', + 'HTTPD Usage' => 'HTTPD Forbrug', + 'NGINX Usage' => 'NGINX Forbrug', + 'MySQL Usage on localhost' => 'MySQL Forbrug på localhost', + 'PostgreSQL Usage on localhost' => 'PostgreSQL Forbrug på localhost', + 'Bandwidth Usage eth0' => 'Båndbredde Forbrug eth0', + 'FTP Usage' => 'FTP Forbrug', + 'SSH Usage' => 'SSH Forbrug', + 'reverse proxy' => 'reverse proxy', + 'web server' => 'web server', + 'dns server' => 'dns server', + 'mail server' => 'mail server', + 'pop/imap server' => 'pop/imap server', + 'email antivirus' => 'email antivirus', + 'email antispam' => 'email antispam', + 'database server' => 'database server', + 'ftp server' => 'ftp server', + 'job scheduler' => 'job scheduler', + 'CPU' => 'CPU', + 'Memory' => 'Hukommelse', + 'Uptime' => 'Oppetid', + 'core package' => 'core pakke', + 'php interpreter' => 'php fortolker', + 'internal web server' => 'intern web server', + 'Version' => 'Version', + 'Release' => 'Udgivelse', + 'Architecture' => 'Arkitektur', + 'Object' => 'Object', + 'Owner' => 'Ejer', + 'Username' => 'Brugernavn', + 'Password' => 'Adgangskode', + 'Email' => 'Email', + 'Package' => 'Pakke', + 'Language' => 'Sprog', + 'First Name' => 'Fornavn', + 'Last Name' => 'Efternavn', + 'Send login credentials to email address' => 'Send loginoplysninger til denne email-adresse', + 'Default Template' => 'Standard Skabelon', + 'Default Name Servers' => 'Standard Navneservere', + 'Domain' => 'Domæne', + 'DNS Support' => 'DNS Support', + 'Mail Support' => 'Mail Support', + 'Advanced options' => 'Avancerede Indstillinger', + 'Aliases' => 'Aliaser', + 'SSL Certificate' => 'SSL Certifikat', + 'SSL Key' => 'SSL Key', + 'SSL Certificate Authority / Intermediate' => 'SSL Certifikat Authority / Intermediate', + 'SSL CSR' => 'SSL CSR', + 'optional' => 'valgfi', + 'internal' => 'inter', + 'Statistics Authorization' => 'Statistik Login', + 'Statistics Auth' => 'Statistics Login', + 'Account' => 'Konto', + 'Prefix will be automaticaly added to username' => 'Prefixet %s bliver automatisk tilføjet brugernavnet', + 'Send FTP credentials to email' => 'Send FTP oplysninger til denne email', + 'Expiration Date' => 'Udløbsdato', + 'YYYY-MM-DD' => 'YYYY-MM-DD', + 'Name servers' => 'Navneservere', + 'Record' => 'Record', + 'IP or Value' => 'IP or Værdi', + 'Priority' => 'Prioritet', + 'Record Number' => 'Record Nummer', + 'in megabytes' => 'i megabytes', + 'Message' => 'Besked', + 'use local-part' => 'brug local-part', + 'one or more email addresses' => 'en eller flere email-adresser', + 'Prefix will be automaticaly added to database name and database user' => 'Prefixet %s bliver automatisk tilføjet databasenavnet og databasebrugernavnet', + 'Database' => 'Database', + 'Type' => 'Type', + 'Minute' => 'Minut', + 'Command' => 'Kommado', + 'Package Name' => 'Pakkenavn', + 'Netmask' => 'Netmask', + 'Interface' => 'Interface', + 'Shared' => 'Delt', + 'Assigned user' => 'Tildelt bruger', + 'Assigned domain' => 'Assigned domain', + 'NAT IP association' => 'NAT IP association', + 'shell' => 'shell', + 'web domains' => 'webdomæner', + 'web aliases' => 'webaliaser', + 'dns records' => 'dns records', + 'mail domains' => 'maildomæner', + 'mail accounts' => 'mailkonti', + 'accounts' => 'konti', + 'databases' => 'databaser', + 'cron jobs' => 'cronjobs', + 'backups' => 'backups', + 'quota' => 'quota', + 'day of week' => 'ugedag', + 'cmd' => 'cmd', + 'users' => 'brugere', + 'domains' => 'domæner', + 'aliases' => 'aliaser', + 'records' => 'records', + 'jobs' => 'jobs', + 'username' => 'brugernavn', + 'password' => 'adgangskode', + 'type' => 'type', + 'charset' => 'karaktersæt', + 'domain' => 'domæne', + 'ip' => 'ip', + 'ip address' => 'ip address', + 'IP address' => 'IP address', + 'netmask' => 'netmaske', + 'interface' => 'interface', + 'assigned user' => 'tildelt bruger', + 'ns1' => 'ns1', + 'ns2' => 'ns2', + 'user' => 'bruger', + 'email' => 'email', + 'first name' => 'fornavn', + 'last name' => 'efternavn', + 'account' => 'konto', + 'ssl certificate' => 'ssl-certifikat', + 'ssl key' => 'ssl key', + 'stats user password' => 'stats user adgangskode', + 'stats username' => 'stats brugernavn', + 'stats password' => 'stats adgangskode', + 'ftp user password' => 'ftp-bruger adgangskode', + 'ftp user' => 'ftp bruger', + 'Last 70 lines of %s.%s.log' => 'De sidste 70 linier af %s.%s.log', + 'Download AccessLog' => 'Hent AccessLog', + 'Download ErrorLog' => 'Hent ErrorLog', + 'Country' => 'Land', + '2 letter code' => '2 letter code', + 'State / Province' => 'Stat / Provins', + 'City / Locality' => 'By / Lokation', + 'Organization' => 'Organisation', + 'Action' => 'Action', + 'Protocol' => 'Protokol', + 'Port' => 'Port', + 'Comment' => 'Kommentar', + 'Banlist' => 'Banliste', + 'ranges are acceptable' => 'intervallerne er acceptable', + 'CIDR format is supported' => 'CIDR format er understøttet', + 'Add one more Name Server' => 'Add one more Name Server', + + 'unlimited' => 'ubegrænset', + '1 account' => '1 konto', + '%s accounts' => '%s konti', + '1 domain' => '1 domæner', + '%s domains' => '%s domæner', + '1 record' => '1 record', + '%s records' => '%s records', + '1 mail account' => '1 mailkonto', + '%s mail accounts' => '%s mailkonti', + '1 database' => '1 database', + '%s databases' => '%s databases', + '1 cron job' => '1 cronjob', + '%s cron jobs' => '%s cronjobs', + '1 archive' => '1 arkiv', + '%s archives' => '%s arkiver', + '1 package' => '1 pakke', + '%s packages' => '%s pakker', + '1 IP address' => '1 IP addresse', + '%s IP addresses' => '%s IP addresser', + '1 month' => '1 måned', + '%s months' => '%s måneder', + '1 log record' => '1 log record', + '%s log records' => '%s log records', + '1 object' => '1 objekt', + '%s objects' => '%s objekter', + 'no exclusions' => 'ingen ekslusioner', + '1 rule' => '1 regel', + '%s rules' => '%s regler', + 'There are no currently banned IP' => 'Der er ingen bannede IP\'er i øjeblikket', + + 'USER_CREATED_OK' => 'Bruger %s blev oprettet med succes.', + 'WEB_DOMAIN_CREATED_OK' => 'Domænet %s blev oprettet med succes.', + 'DNS_DOMAIN_CREATED_OK' => 'DNS-domæne %s blev oprettet med succes.', + 'DNS_RECORD_CREATED_OK' => 'Record %s.%s blev oprettet med succes.', + 'MAIL_DOMAIN_CREATED_OK' => 'Maildomæne %s blev oprettet med succes.', + 'MAIL_ACCOUNT_CREATED_OK' => 'Mailkonto %s@%s blev oprettet med succes.', + 'DATABASE_CREATED_OK' => 'Database %s blev oprettet med succes.', + 'CRON_CREATED_OK' => 'Cronjob blev oprettet med succes.', + 'IP_CREATED_OK' => 'IP-addresse %s blev oprettet med succes.', + 'PACKAGE_CREATED_OK' => 'Pakke %s blev oprettet med succes.', + 'SSL_GENERATED_OK' => 'Certifikat blev genereret med succes.', + 'RULE_CREATED_OK' => 'Regel blev oprettet med succes.', + 'Autoupdate has been successfully enabled' => 'Autoupdate blev aktiveret med succes.', + 'Autoupdate has been successfully disabled' => 'Autoupdate blev deaktiveret med succes.', + 'Cronjob email reporting has been successfully enabled' => 'Cronjob email rapportering blev aktiveret med succes', + 'Cronjob email reporting has been successfully disabled' => 'Cronjob email rapportering blev deaktiveret med succes', + 'Changes has been saved.' => 'Ændringer blev gemt.', + 'Confirmation' => 'Bekræftelse', + 'DELETE_USER_CONFIRMATION' => 'Er du sikker på at du vil slette brugeren %s?', + 'SUSPEND_USER_CONFIRMATION' => 'Er du sikker på at du vil suspendere brugeren %s?', + 'UNSUSPEND_USER_CONFIRMATION' => 'Er du sikker på at du vil afsuspendere brugeren %s?', + 'DELETE_DOMAIN_CONFIRMATION' => 'Er du sikker på at du vil slette domænet %s?', + 'SUSPEND_DOMAIN_CONFIRMATION' => 'Er du sikker på at du vil suspendere domænet %s?', + 'UNSUSPEND_DOMAIN_CONFIRMATION' => 'Er du sikker på at du vil afsuspendere domænet %s?', + 'DELETE_RECORD_CONFIRMATION' => 'Er du sikker på at du vil slette record %s?', + 'SUSPEND_RECORD_CONFIRMATION' => 'Er du sikker på at du vil suspendere record %s?', + 'UNSUSPEND_RECORD_CONFIRMATION' => 'Er du sikker på at du vil afsuspendere record %s?', + 'DELETE_MAIL_ACCOUNT_CONFIRMATION' => 'Er du sikker på at du vil slette %s?', + 'SUSPEND_MAIL_ACCOUNT_CONFIRMATION' => 'Er du sikker på at du vil suspendere %s?', + 'UNSUSPEND_MAIL_ACCOUNT_CONFIRMATION' => 'Er du sikker på at du vil afsuspendere %s?', + 'DELETE_DATABASE_CONFIRMATION' => 'Er du sikker på at du vil slette databasen %s?', + 'SUSPEND_DATABASE_CONFIRMATION' => 'Er du sikker på at du vil suspendere databasen %s?', + 'UNSUSPEND_DATABASE_CONFIRMATION' => 'Er du sikker på at du vil afsuspendere databasen %s?', + 'DELETE_CRON_CONFIRMATION' => 'Er du sikker på at du vil slette cron job?', + 'SUSPEND_CRON_CONFIRMATION' => 'Er du sikker på at du vil suspendere cron job?', + 'UNSUSPEND_CRON_CONFIRMATION' => 'Er du sikker på at du vil afsuspendere cron job?', + 'DELETE_BACKUP_CONFIRMATION' => 'Er du sikker på at du vil slette %s backup?', + 'DELETE_EXCLUSION_CONFIRMATION' => 'Er du sikker på at du vil slette %s eksklusionen?', + 'DELETE_PACKAGE_CONFIRMATION' => 'Er du sikker på at du vil slette pakken %s?', + 'DELETE_IP_CONFIRMATION' => 'Er du sikker på at du vil slette IP addressen %s?', + 'DELETE_RULE_CONFIRMATION' => 'Er du sikker på at du vil delete reglen #%s?', + 'SUSPEND_RULE_CONFIRMATION' => 'Er du sikker på at du vil suspendere reglen #%s?', + 'UNSUSPEND_RULE_CONFIRMATION' => 'Er du sikker på at du vil afsuspendere reglen #%s?', + 'LEAVE_PAGE_CONFIRMATION' => 'Forlad siden?', + 'RESTART_CONFIRMATION' => 'Er du sikker på at du vil genstarte %s?', + 'Welcome' => 'Velkommen', + 'LOGGED_IN_AS' => 'Logget ind som bruger: %s', + 'Error' => 'Fejl', + 'Invalid username or password' => 'Ugyldigt brugernavn eller adgangskode.', + 'Invalid username or code' => 'Ugyldigt brugernavn eller kode.', + 'Passwords not match' => 'Adgangskoderne stemmer ikke overens.', + 'Please enter valid email address.' => 'Indtast venligst en gyldig email-adresse.', + 'Field "%s" can not be blank.' => 'Feltet "%s" kan ikke være tomt.', + 'Password is too short.' => 'Adgangskoden er for kort (mindst 6 karakterer)', + 'Error code:' => 'Fejlkode: %s', + 'SERVICE_ACTION_FAILED' => '"%s" "%s" fejlede', + 'IP address is in use' => 'IP addressen er i brug', + 'BACKUP_SCHEDULED' => 'Opgaven er blevet tilføjet til køen. Du vil modtage en email når backup er klar til download.', + 'BACKUP_EXISTS' => 'En eksisterende backup kører allerede. Vent venligst til den er færdig.', + 'RESTORE_SCHEDULED' => 'Opgaven er blevet tilføjet til køen. Du vil modtage en email når din genskabelse er færdig.', + 'RESTORE_EXISTS' => 'En eksisterende genskabelse kører allerede. Vent venligst til den er færdig før du kører den igen.', + + 'WEB_EXCLUSIONS' => "Indtast domænenavn, et per linie. For at udelukke alle domæner, brug *. Benyt følgende format for at udelukke specifikke mapper: domain.com:public_html/cache:public_html/tmp", + 'DNS_EXCLUSIONS' => "Indtast domænenavn, et per linie. For at udelukke alle domæner, brug *", + 'MAIL_EXCLUSIONS' => "Indtast domænenavn, et per linie. For at udelukke alle domæner, brug *. Benyt følgende format for at udelukke specifikke konti: domain.com:info:support:postmaster", + 'DB_EXCLUSIONS' => "Indtast det fulde databasenavn, et per linie. To exclude all databases use *", + 'CRON_EXCLUSIONS' => "For at udelukke alle opgaver, brug *", + 'USER_EXCLUSIONS' => "Indtast mappenavn, et per linie. For at udelukke alle mapper, brug *", + + 'Welcome to Vesta Control Panel' => 'Velkommen til Vesta Kontrolpanel', + 'MAIL_FROM' => 'Vesta Kontrolpanel ', + 'GREETINGS_GORDON_FREEMAN' => "Hej, %s %s,\n", + 'GREETINGS' => "Hej,\n", + 'ACCOUNT_READY' => "Din konto er oprettet og er klar til brug.\n\nhttps://%s/login/\nBrugernavn: %s\nAdgangskode: %s\n\n--\nVesta Kontrolpanel\n", + + 'FTP login credentials' => 'FTP login oplysninger', + 'FTP_ACCOUNT_READY' => "FTP konto blev oprettet og er klar til brug.\n\nHost: %s\nBrugernavn: %s_%s\nAdgangskode: %s\n\n--\nVesta Kontrolpanel\n", + + 'Database Credentials' => 'Databaseoplysninger', + 'DATABASE_READY' => "Database has been created successfully.\n\nDatabase: %s\nBruger: %s\nAdgangskode: %s\n%s\n\n--\nVesta Kontrolpanel\n", + + 'forgot password' => 'glemt adgangskode', + 'Confirm' => 'Bekræft', + 'New Password' => 'Ny adgangskode', + 'Confirm Password' => 'Bekræft Adgangskode', + 'Reset' => 'Nulstil', + 'Reset Code' => 'Nulstillingskode', + 'RESET_NOTICE' => '', + 'RESET_CODE_SENT' => 'Kode til at nultille adgangskode er blevet sendt til din email-adresse
        ', + 'MAIL_RESET_SUBJECT' => 'Adgangskode Nulstillet %s', + 'PASSWORD_RESET_REQUEST' => "Følg dette link for at nulstille din adgangskode:\nhttps://%s/reset/?action=confirm&user=%s&code=%s\n\nAlternativt, kan du også gå til https://%s/reset/?action=code&user=%s og indtast følgende nulstillingskode:\n%s\n\nHvis du ikke selv har bedt om at få nulstillet din adgangskode, bedes du ignorere denne besked - vi beklager.\n\n--\nVesta Kontrolpanel\n", + + 'Jan' => 'Jan', + 'Feb' => 'Feb', + 'Mar' => 'Mar', + 'Apr' => 'Apr', + 'May' => 'Maj', + 'Jun' => 'Jun', + 'Jul' => 'Jul', + 'Aug' => 'Aug', + 'Sep' => 'Sep', + 'Oct' => 'Okt', + 'Nov' => 'Nov', + 'Dec' => 'Dec', + + 'Configuring Server' => 'Konfigurerer Server', + 'Hostname' => 'Hostname', + 'Time Zone' => 'Tidszone', + 'Default Language' => 'Standard Sprog', + 'FileSystem Disk Quota ' => 'FilSystem Disk Quota ', + 'Vesta Control Panel Plugins' => 'Vesta Kontrolpanel Plugins', + 'preview' => 'preview', + 'Reseller Role' => 'Forhandlerrolle', + 'Web Config Editor' => 'Web Config Editor', + 'Template Manager' => 'Skabelonanager', + 'Backup Migration Manager' => 'Backup Migration Manager', + 'FileManager' => 'Filmanager', + 'show: CPU / MEM / NET / DISK' => 'show: CPU / MEM / NET / DISK', + + 'sort by' => 'sortér efter', + 'Date' => 'Dato', + 'Starred' => 'Starred', + 'Name' => 'Navn', + + 'File Manager' => 'File Manager', + 'type' => 'type', + 'size' => 'size', + 'date' => 'date', + 'name' => 'name', + 'Initializing' => 'Initializing', + 'UPLOAD' => 'UPLOAD', + 'NEW FILE' => 'NEW FILE', + 'NEW DIR' => 'NEW DIR', + 'DELETE' => 'DELETE', + 'RENAME' => 'RENAME', + 'COPY' => 'COPY', + 'ARCHIVE' => 'ARCHIVE', + 'EXTRACT' => 'EXTRACT', + 'DOWNLOAD' => 'DOWNLOAD', + 'Hit' => 'Hit', + 'to reload the page' => 'to reload the page', + 'Directory name cannot be empty' => 'Directory name cannot be empty', + 'File name cannot be empty' => 'File name cannot be empty', + 'No file selected' => 'No file selected', + 'No file or folder selected' => 'No file or folder selected', + 'File type not supported' => 'File type not supported', + 'Directory download not available in current version' => 'Directory download not available in current version', + 'Directory not available' => 'Directory not available', + 'Done' => 'Done', + 'Close' => 'Close', + 'Copy' => 'Copy', + 'Cancel' => 'Cancel', + 'Rename' => 'Rename', + 'Delete' => 'Delete', + 'Extract' => 'Extract', + 'Create' => 'Create', + 'Compress' => 'Compress', + 'OK' => 'OK', + 'Are you sure you want to copy' => 'Are you sure you want to copy', + 'Are you sure you want to delete' => 'Are you sure you want to delete', + 'into' => 'into', + 'existing files will be replaced' => 'existing files will be replaced', + 'Original name' => 'Original name', + 'File' => 'File', + 'already exists' => 'already exists', + 'Create file' => 'Create file', + 'Create directory' => 'Create directory', + + 'Add New object' => 'Add New object', + 'Save Form' => 'Save Form', + 'Cancel saving form' => 'Cancel saving form', + 'Go to USER list' => 'Go to USER list', + 'Go to WEB list' => 'Go to WEB list', + 'Go to DNS list' => 'Go to DNS list', + 'Go to MAIL list' => 'Go to MAIL list', + 'Go to DB list' => 'Go to DB list', + 'Go to CRON list' => 'Go to CRON list', + 'Go to BACKUP list' => 'Go to BACKUP list', + 'Focus on search' => 'Focus on search', + 'Display/Close shortcuts' => 'Display/Close shortcuts', + 'Move backward through top menu' => 'Move backward through top menu', + 'Move forward through top menu' => 'Move forward through top menu', + 'Enter focused element' => 'Enter focused element', + + 'Upload' => 'Upload', + 'New File' => 'New File', + 'New Folder' => 'New Folder', + 'Download' => 'Download', + 'Rename' => 'Rename', + 'Copy' => 'Copy', + 'Archive' => 'Archive', + 'Delete' => 'Delete', + 'Save File (in text editor)' => 'Save File (in text editor)', + 'Close Popup / Cancel' => 'Close Popup / Cancel', + 'Move Cursor Up' => 'Move Cursor Up', + 'Move Cursor Dow' => 'Move Cursor Dow', + 'Switch to Left Tab' => 'Switch to Left Tab', + 'Switch to Right Tab' => 'Switch to Right Tab', + 'Switch Tab' => 'Switch Tab', + 'Go to the Top of File List' => 'Go to the Top of File List', + 'Go to the Last File' => 'Go to the Last File', + 'Open File/Enter Directory' => 'Open File/Enter Directory', + 'Go to Parent Directory' => 'Go to Parent Directory', + 'Select Current File' => 'Select Current File', + 'Select Bunch of Files' => 'Select Bunch of Files', + 'Append File to the Current Selection' => 'Append File to the Current Selection', + 'Select All Files' => 'Select All Files', + 'shortcuts are inspired by magnificent GNU Midnight Commander file manager' => + 'shortcuts are inspired by magnificent GNU Midnight Commander file manager' + +); diff --git a/web/inc/i18n/de.php b/web/inc/i18n/de.php index 069c9cb55..5e9d6f09f 100644 --- a/web/inc/i18n/de.php +++ b/web/inc/i18n/de.php @@ -26,18 +26,18 @@ $LANG['de'] = array( 'BACKUP' => 'BACKUPS', 'Add User' => 'Benutzer anlegen', - 'Add Domain' => 'Domäne hinzufügen', - 'Add Web Domain' => 'Domäne hinzufügen', - 'Add DNS Domain' => 'Domäne hinzufügen', + 'Add Domain' => 'Domain hinzufügen', + 'Add Web Domain' => 'Domain hinzufügen', + 'Add DNS Domain' => 'Domain hinzufügen', 'Add DNS Record' => 'DNS Eintrag anlegen', - 'Add Mail Domain' => 'Domäne hinzufügen', + 'Add Mail Domain' => 'Domain hinzufügen', 'Add Mail Account' => 'Konto anlegen', 'Add Database' => 'Datenbank anlegen', 'Add Cron Job' => 'Cron Job hinzufügen', 'Create Backup' => 'Backup erstellen', 'Configure' => 'Konfigurieren', 'Restore All' => 'Alles wiederherstellen', - 'Add Package' => 'Paket erstellen', + 'Add Package' => 'Paket hinzufügen', 'Add IP' => 'IP hinzufügen', 'Add Rule' => 'Regel hinzufügen', 'Ban IP Address' => 'IP blockieren', @@ -55,12 +55,12 @@ $LANG['de'] = array( 'toggle all' => 'Alle wählen/abwählen', 'apply to selected' => 'Auswählen', - 'rebuild' => 'Wiederherstellen', - 'rebuild web' => 'Web wiederherstellen', - 'rebuild dns' => 'DNS wiederherstellen', - 'rebuild mail' => 'Mail wiederherstellen', - 'rebuild db' => 'DB wiederherstellen', - 'rebuild cron' => 'Cron Jobs wiederherstellen', + 'rebuild' => 'Erneuern', + 'rebuild web' => 'Web erneuern', + 'rebuild dns' => 'DNS erneuern', + 'rebuild mail' => 'Mail erneuern', + 'rebuild db' => 'DB erneuern', + 'rebuild cron' => 'Cron Jobs erneuern', 'update counters' => 'Zähler aktualisieren', 'suspend' => 'Sperren', 'unsuspend' => 'Entsperren', @@ -70,7 +70,7 @@ $LANG['de'] = array( 'logout' => 'Abmelden', 'edit' => 'Bearbeiten', 'open webstats' => 'Webstatistiken öffnen', - 'view logs' => 'Logs absehen', + 'view logs' => 'Logs ansehen', 'list records' => '%s Einträge auflisten', 'add record' => 'Eintrag hinzufügen', 'list accounts' => '%s Konten auflisten', @@ -97,14 +97,14 @@ $LANG['de'] = array( 'Editing User' => 'Benutzer bearbeiten', 'Adding Domain' => 'Domain hinzufügen', 'Editing Domain' => 'Domain bearbeiten', - 'Adding DNS Domain' => 'Domain hinzufügen', - 'Editing DNS Domain' => 'Domain bearbeiten', + 'Adding DNS Domain' => 'DNS-Domain hinzufügen', + 'Editing DNS Domain' => 'DNS-Domain bearbeiten', 'Adding DNS Record' => 'DNS-Eintrag anlegen', 'Editing DNS Record' => 'DNS-Eintrag bearbeiten', - 'Adding Mail Domain' => 'Domain hinzufügen', - 'Editing Mail Domain' => 'Domain bearbeiten', - 'Adding Mail Account' => 'Konto hinzufügen', - 'Editing Mail Account' => 'Konto bearbeiten', + 'Adding Mail Domain' => 'E-mail Domain hinzufügen', + 'Editing Mail Domain' => 'E-mail Domain bearbeiten', + 'Adding Mail Account' => 'E-mail Konto hinzufügen', + 'Editing Mail Account' => 'E-mail Konto bearbeiten', 'Adding database' => 'Datenbank hinzufügen', 'Editing Cron Job' => 'Cron Job bearbeiten', 'Adding Cron Job' => 'Cron Job hinzufügen', @@ -117,9 +117,9 @@ $LANG['de'] = array( 'Generating CSR' => 'CSR generieren', 'Listing' => 'Auflistung', 'Search Results' => 'Suchergebnisse', - 'Adding Firewall Rule' => 'Hinzufügen von Firewall-Regel', - 'Editing Firewall Rule' => 'Bearbeiten von Firewall-Regel', - 'Adding IP Address to Banlist' => 'Hinzufügen von IP-Adresse zur schwarzen Liste', + 'Adding Firewall Rule' => 'Hinzufügen einer Firewall-Regel', + 'Editing Firewall Rule' => 'Bearbeiten einer Firewall-Regel', + 'Adding IP Address to Banlist' => 'Hinzufügen einer IP-Adresse zur schwarzen Liste', 'active' => 'Aktiv', 'spnd' => 'Gesperrt', @@ -162,7 +162,7 @@ $LANG['de'] = array( 'DNS Domains' => 'DNS Domains', 'DNS records' => 'DNS Einträge' , 'Name Servers' => 'Name Server', - 'Mail Domains' => 'Mail Domäne', + 'Mail Domains' => 'Mail Domain', 'Mail Accounts' => 'Mail Konten', 'Cron Jobs' => 'Cron Jobs', 'SSH Access' => 'SSH Zugriff', @@ -203,21 +203,21 @@ $LANG['de'] = array( 'Run Time' => 'Laufzeit', 'Backup Size' => 'Backup Größe', 'SYS' => 'SYS', - 'Domains' => 'Domäne', + 'Domains' => 'Domains', 'Status' => 'Status', 'shared' => 'Gemeinsam genutzt', 'dedicated' => 'Dediziert', 'Owner' => 'Besitzer', 'Users' => 'Benutzer', 'Load Average' => 'Durchschnittliche Last', - 'Memory Usage' => 'Arbeitsspeicher Verbrauch', - 'HTTPD Usage' => 'HTTPD Verbrauch', - 'NGINX Usage' => 'NGINX Verbrauch', - 'MySQL Usage on localhost' => 'MySQL Verbrauch auf localhost', - 'PostgreSQL Usage on localhost' => 'PostgreSQL Verbrauch on localhost', - 'Bandwidth Usage eth0' => 'Datenvolumen Verbrauch eth0', - 'FTP Usage' => 'FTP Verbrauch', - 'SSH Usage' => 'SSH Verbrauch', + 'Memory Usage' => 'Arbeitsspeichernutzung', + 'HTTPD Usage' => 'HTTPD Benutzung', + 'NGINX Usage' => 'NGINX Benutzung', + 'MySQL Usage on localhost' => 'MySQL Benutzung auf localhost', + 'PostgreSQL Usage on localhost' => 'PostgreSQL Benutzung on localhost', + 'Bandwidth Usage eth0' => 'Bandbreitennutzung eth0', + 'FTP Usage' => 'FTP Benutzung', + 'SSH Usage' => 'SSH Benutzung', 'reverse proxy' => 'Reverse Proxy', 'web server' => 'Web Server', 'dns server' => 'DNS Server', @@ -256,7 +256,7 @@ $LANG['de'] = array( 'Aliases' => 'Aliase', 'SSL Certificate' => 'SSL Zertifikat', 'SSL Key' => 'SSL Schlüssel', - 'SSL Certificate Authority / Intermediate' => 'SSL Zertifikat Ersteller', + 'SSL Certificate Authority / Intermediate' => 'SSL Zertifizierungsstelle', 'SSL CSR' => 'CSR-Anfrage', 'optional' => 'optional', 'internal' => 'Intern', @@ -274,9 +274,9 @@ $LANG['de'] = array( 'Record Number' => 'Eintragsnummer', 'in megabytes' => 'in Megabyte', 'Message' => 'Nachricht', - 'use local-part' => 'verwende local-part', + 'use local-part' => 'verwende lokalen Teil', 'one or more email addresses' => 'eine oder mehrere E-Mail Adressen', - 'Prefix will be automaticaly added to database name and database user' => 'Prefix %s wird automatisch zum Datenbanknamen und Benutzernamen hinzugefügt', + 'Prefix will be automaticaly added to database name and database user' => 'Prefix %s wird automatisch zum Datenbank- und Benutzernamen hinzugefügt', 'Database' => 'Datenbank', 'Type' => 'Typ', 'Minute' => 'Minute', @@ -285,11 +285,11 @@ $LANG['de'] = array( 'Netmask' => 'Netzmaske', 'Interface' => 'Interface', 'Shared' => 'Gemeinsam genutzt', - 'Assigned user' => 'Benutzer zuordnen', - 'Assigned domain' => 'Domain zuordnen', + 'Assigned user' => 'Zugeordneter Benutzer', + 'Assigned domain' => 'Zugeordnete Domain', 'NAT IP association' => 'NAT IP-Verband', 'shell' => 'Shell', - 'web domains' => 'Web Domäne', + 'web domains' => 'Web Domains', 'web aliases' => 'Web Aliase', 'dns records' => 'DNS Einträge', 'mail domains' => 'Mail Domains', @@ -302,7 +302,7 @@ $LANG['de'] = array( 'day of week' => 'Tag der Woche', 'cmd' => 'cmd', 'users' => 'Benutzer', - 'domains' => 'Domäne', + 'domains' => 'domains', 'aliases' => 'Aliase', 'records' => 'Einträge', 'jobs' => 'Jobs', @@ -326,14 +326,14 @@ $LANG['de'] = array( 'account' => 'Konto', 'ssl certificate' => 'SSL-Zertifikat', 'ssl key' => 'SSL Schlüssel', - 'stats user password' => 'Statistik Benutzer Passwort', - 'stats username' => 'Statistik Benutzername', - 'stats password' => 'Statistik Password', + 'stats user password' => 'Benutzerpasswort-Statistik', + 'stats username' => 'Benutzernamen-Statistik', + 'stats password' => 'Passwort-Statistik', 'ftp user password' => 'FTP Benutzer Passwort', 'ftp user' => 'FTP Benutzer', 'Last 70 lines of %s.%s.log' => 'Die letzten 70 Zeilen von %s.%s.log', - 'Download AccessLog' => 'AccessLog runterladen', - 'Download ErrorLog' => 'ErrorLog runterladen', + 'Download AccessLog' => 'AccessLog herunterladen', + 'Download ErrorLog' => 'ErrorLog herunterladen', 'Country' => 'Land', '2 letter code' => '2-Buchstaben-Code', 'State / Province' => 'Staat / Provinz', @@ -343,12 +343,12 @@ $LANG['de'] = array( 'Protocol' => 'Protokoll', 'Port' => 'Port', 'Comment' => 'Kommentar', - 'Banlist' => 'Bannliste', - 'ranges are acceptable' => 'Bereiche sind akzeptabel', + 'Banlist' => 'schwarze Liste', + 'ranges are acceptable' => 'Bereiche sind erlaubt', 'CIDR format is supported' => 'CIDR-Format wird unterstützt', 'Add one more Name Server' => 'Add one more Name Server', - 'unlimited' => 'unlimited', + 'unlimited' => 'unbegrenzt', '1 account' => '1 Konto', '%s accounts' => '%s Konten', '1 domain' => '1 Domain', @@ -374,25 +374,25 @@ $LANG['de'] = array( '1 object' => '1 Objekt', '%s objects' => '%s Objekte', 'no exclusions' => 'Keine Ausschlüsse', - '1 rule' => '1 regel', - '%s rules' => '%s regeln', - 'There are no currently banned IP' => 'Es gibt keine aktuell gesperrte IP', + '1 rule' => '1 Regel', + '%s rules' => '%s Regeln', + 'There are no currently banned IP' => 'Es gibt momentan keine gesperrte IP', 'USER_CREATED_OK' => 'Benutzer %s wurde erfolgreich angelegt.', 'WEB_DOMAIN_CREATED_OK' => 'Domain %s wurde erfolgreich angelegt.', - 'DNS_DOMAIN_CREATED_OK' => 'DNS Domäne %s wurde erfolgreich angelegt.', + 'DNS_DOMAIN_CREATED_OK' => 'DNS Domain %s wurde erfolgreich angelegt.', 'DNS_RECORD_CREATED_OK' => 'Eintrag %s.%s wurde erfolgreich angelegt.', - 'MAIL_DOMAIN_CREATED_OK' => 'Mail Domäne %s wurde erfolgreich angelegt.', + 'MAIL_DOMAIN_CREATED_OK' => 'Mail Domain %s wurde erfolgreich angelegt.', 'MAIL_ACCOUNT_CREATED_OK' => 'Mail Account %s@%s wurde erfolgreich angelegt.', 'DATABASE_CREATED_OK' => 'Datenbank %s wurde erfolgreich angelegt', 'CRON_CREATED_OK' => 'Cron Job wurde erfolgreich angelegt.', 'IP_CREATED_OK' => 'IP Adresse %s wurde erfolgreich hinzugefügt.', 'PACKAGE_CREATED_OK' => 'Packet %s wurde erfolgreich angelegt.', - 'SSL_GENERATED_OK' => 'SSL zertifikat wurde erfolgreich angelegt.', + 'SSL_GENERATED_OK' => 'SSL Zertifikat wurde erfolgreich angelegt.', 'RULE_CREATED_OK' => 'Regel wurde erfolgreich erstellt.', - 'Autoupdate has been successfully enabled' => 'Autoupdate has been successfully enabled', - 'Autoupdate has been successfully disabled' => 'Autoupdate has been successfully disabled', - 'Cronjob email reporting has been successfully enabled' => 'Cronjob E-Mail-Berichterstattung wurde erfolgreich aktiviert wurde', + 'Autoupdate has been successfully enabled' => 'Autoupdate wurde erfolgreich aktiviert', + 'Autoupdate has been successfully disabled' => 'Autoupdate wurde erfolgreich deaktiviert', + 'Cronjob email reporting has been successfully enabled' => 'Cronjob E-Mail-Berichterstattung wurde erfolgreich aktiviert', 'Cronjob email reporting has been successfully disabled' => 'Cronjob E-Mail-Berichterstattung wurde erfolgreich deaktiviert', 'Changes has been saved.' => 'Änderungen wurden gespeichert.', 'Confirmation' => 'Bestätigung', @@ -416,7 +416,7 @@ $LANG['de'] = array( 'UNSUSPEND_CRON_CONFIRMATION' => 'Cron Job wirklich entsperren?', 'DELETE_BACKUP_CONFIRMATION' => 'Backup %s wirklich löschen?', 'DELETE_EXCLUSION_CONFIRMATION' => 'Ausschlüsse %s wirklich löschen?', - 'DELETE_PACKAGE_CONFIRMATION' => 'Packet %s? wirklich löschen?', + 'DELETE_PACKAGE_CONFIRMATION' => 'Packet %s wirklich löschen?', 'DELETE_IP_CONFIRMATION' => '%s wirklich löschen?', 'DELETE_RULE_CONFIRMATION' => 'Regel #%s wirklich löschen?', 'SUSPEND_RULE_CONFIRMATION' => 'Regel #%s wirklich sperren?', @@ -428,24 +428,24 @@ $LANG['de'] = array( 'Error' => 'Fehler', 'Invalid username or password' => 'Falscher Benutzername oder Passwort', 'Invalid username or code' => 'Falscher Benutzername oder Code', - 'Passwords not match' => 'Passwort stimmt nicht überein', + 'Passwords not match' => 'Passwörter stimmen nicht überein', 'Please enter valid email address.' => 'Bitte geben Sie eine gültige E-Mail Adresse ein.', - 'Field "%s" can not be blank.' => 'Feld "%s" kann nicht leer bleiben.', + 'Field "%s" can not be blank.' => 'Feld "%s" darf nicht leer bleiben.', 'Password is too short.' => 'Passwort zu kurz (mindestens 6 Zeichen)', 'Error code:' => 'Fehler: %s', 'SERVICE_ACTION_FAILED' => '"%s" "%s" fehlgeschlagen', 'IP address is in use' => 'IP Adresse wir schon benutzt', 'BACKUP_SCHEDULED' => 'Job wurde in die Warteschlange eingereiht. Sie erhalten eine E-Mail wenn Ihr Backup zum Download bereit steht.', 'BACKUP_EXISTS' => 'Ein Backup Job läuft bereits. Bitte warten Sie bis dieser erledigt wurde.', - 'RESTORE_SCHEDULED' => 'Job wurde in die Warteschlange eingereiht. Sie erhalten eine E-Mail wenn Ihr Backup hergestellt wurde.', + 'RESTORE_SCHEDULED' => 'Job wurde in die Warteschlange eingereiht. Sie erhalten eine E-Mail wenn Ihr Backup wiederhergestellt wurde.', 'RESTORE_EXISTS' => 'Ein Wiederherstellungs Job läuft bereits. Bitte warten Sie bis dieser erledigt wurde.', - 'WEB_EXCLUSIONS' => "Type domain name, one per line. To exclude all domains use *. To exclude specific dirs use following format: domain.com:public_html/cache:public_html/tmp", - 'DNS_EXCLUSIONS' => "Type domain name, one per line. To exclude all domains use *", - 'MAIL_EXCLUSIONS' => "Type domain name, one per line. To exclude all domains use *. To exclude specific accounts use following format: domain.com:info:support:postmaster", - 'DB_EXCLUSIONS' => "Type full database name, one per line. To exclude all databases use *", - 'CRON_EXCLUSIONS' => "To exclude all jobs use *", - 'USER_EXCLUSIONS' => "Type directory name, one per line. To exlude all dirs use *", + 'WEB_EXCLUSIONS' => "Einen Domainname pro Zeile eingeben. '*' um alle Domains auszuschließen. Folgendes Format um bestimmte Verzeichnisse auszuschließen: domain.de:public_html/cache:public_html/tmp", + 'DNS_EXCLUSIONS' => "Einen Domainname pro Zeile eingeben. '*' um alle Domains auszuschließen.", + 'MAIL_EXCLUSIONS' => "Einen Domainname pro Zeile eingeben. '*' um alle Domains auszuschließen. Um bestimmte Konten auszuschließen folgendes Format verwenden: domain.de:info:support:postmaster", + 'DB_EXCLUSIONS' => "Einen Datenbanknamen pro Zeile eingeben. '*' um alle Datenbanken auszuschließen", + 'CRON_EXCLUSIONS' => "'*' um alle Cron Jobs auszuschließen", + 'USER_EXCLUSIONS' => "Pro Zeile einen Verzeichnisnamen eingeben. '*' um alle Verzeichnisse auszuschließen", 'Welcome to Vesta Control Panel' => 'Willkommen im Vesta Control Panel', 'MAIL_FROM' => 'Vesta Control Panel ', @@ -464,40 +464,40 @@ $LANG['de'] = array( 'New Password' => 'Neues Passwort', 'Confirm Password' => 'Passwort bestätigen', 'Reset' => 'Zurücksetzen', - 'Reset Code' => 'Zurücksetzen-Code', + 'Reset Code' => 'Rücksetz-Code', 'RESET_NOTICE' => '', - 'RESET_CODE_SENT' => 'Passwort Zurücksetzen-Code wurde erfolgreich an Ihre Adresse gesandt
        ', + 'RESET_CODE_SENT' => 'Passwort Rücksetz-Code wurde an Ihre Adresse gesandt
        ', 'MAIL_RESET_SUBJECT' => 'Passwort Reset für %s', - 'PASSWORD_RESET_REQUEST' => "Zum Zurücksetzten Ihre Passwortes, besuchen Sie bitte folgenden Link:\nhttps://%s/reset/?action=confirm&user=%s&code=%s\n\nAlternativ, können Sie auf https://%s/reset/?action=code&user=%s gehen und dort folgenden Reset Code eingeben:\n%s\n\nWenn Sie Ihr Passwort nicht zurücksetzen wollten, ignorieren Sie diese Nachricht und entschuldigen Sie uns die Unannehmlichkeiten.\n\n--\nVesta Control Panel\n", + 'PASSWORD_RESET_REQUEST' => "Zum Zurücksetzen Ihres Passwortes, besuchen Sie bitte folgenden Link:\nhttps://%s/reset/?action=confirm&user=%s&code=%s\n\nAlternativ, können Sie auf https://%s/reset/?action=code&user=%s gehen und dort folgenden Reset Code eingeben:\n%s\n\nWenn Sie Ihr Passwort nicht zurücksetzen wollten, ignorieren Sie diese Nachricht und entschuldigen Sie uns die Unannehmlichkeiten.\n\n--\nVesta Control Panel\n", 'Jan' => 'Jan', 'Feb' => 'Feb', - 'Mar' => 'Mar', + 'Mar' => 'Mär', 'Apr' => 'Apr', - 'May' => 'May', + 'May' => 'Mai', 'Jun' => 'Jun', 'Jul' => 'Jul', 'Aug' => 'Aug', 'Sep' => 'Sep', 'Oct' => 'Oct', 'Nov' => 'Nov', - 'Dec' => 'Dec', + 'Dec' => 'Dez', - 'Configuring Server' => 'Configuring Server', + 'Configuring Server' => 'Server konfigurieren', 'Hostname' => 'Hostname', - 'Time Zone' => 'Time Zone', - 'Default Language' => 'Default Language', - 'FileSystem Disk Quota' => 'FileSystem Disk Quota', + 'Time Zone' => 'Zeitzone', + 'Default Language' => 'Standardsprache', + 'FileSystem Disk Quota' => 'Dateisystem Nutzungskontingent', 'Vesta Control Panel Plugins' => 'Vesta Control Panel Plugins', - 'preview' => 'preview', + 'preview' => 'vorschau', 'Reseller Role' => 'Reseller Role', 'Web Config Editor' => 'Web Config Editor', 'Template Manager' => 'Template Manager', 'Backup Migration Manager' => 'Backup Migration Manager', - 'FileManager' => 'FileManager', + 'FileManager' => 'Datei-Manager', 'show: CPU / MEM / NET / DISK' => 'show: CPU / MEM / NET / DISK', - 'sort by' => 'sort by', + 'sort by' => 'sortieren', 'Date' => 'Datum', 'Starred' => 'Starred', 'Name' => 'Name', @@ -560,7 +560,6 @@ $LANG['de'] = array( 'Display/Close shortcuts' => 'Display/Close shortcuts', 'Move backward through top menu' => 'Move backward through top menu', 'Move forward through top menu' => 'Move forward through top menu', - 'Switch active menu' => 'Switch active menu', 'Enter focused element' => 'Enter focused element', 'Upload' => 'Upload', diff --git a/web/inc/i18n/el.php b/web/inc/i18n/el.php index ccd972403..71db88ff8 100644 --- a/web/inc/i18n/el.php +++ b/web/inc/i18n/el.php @@ -562,7 +562,6 @@ $LANG['el'] = array( 'Display/Close shortcuts' => 'Display/Close shortcuts', 'Move backward through top menu' => 'Move backward through top menu', 'Move forward through top menu' => 'Move forward through top menu', - 'Switch active menu' => 'Switch active menu', 'Enter focused element' => 'Enter focused element', 'Upload' => 'Upload', diff --git a/web/inc/i18n/en.php b/web/inc/i18n/en.php index 1cfff5843..7aeeef484 100644 --- a/web/inc/i18n/en.php +++ b/web/inc/i18n/en.php @@ -563,7 +563,6 @@ $LANG['en'] = array( 'Display/Close shortcuts' => 'Display/Close shortcuts', 'Move backward through top menu' => 'Move backward through top menu', 'Move forward through top menu' => 'Move forward through top menu', - 'Switch active menu' => 'Switch active menu', 'Enter focused element' => 'Enter focused element', 'Upload' => 'Upload', diff --git a/web/inc/i18n/es.php b/web/inc/i18n/es.php index 5e66036e7..3812030ca 100644 --- a/web/inc/i18n/es.php +++ b/web/inc/i18n/es.php @@ -441,12 +441,12 @@ $LANG['es'] = array( 'RESTORE_SCHEDULED' => "La tarea se ha añadido a la cola. Usted recibirá un correo de notificación cuando el respaldo de seguridad este listo para su descarga.", 'RESTORE_EXISTS' => "Una tarea se está ejecutando. Por favor espere a que esta termine.", - 'WEB_EXCLUSIONS' => "Type domain name, one per line. To exclude all domains use *. To exclude specific dirs use following format: domain.com:public_html/cache:public_html/tmp", - 'DNS_EXCLUSIONS' => "Type domain name, one per line. To exclude all domains use *", - 'MAIL_EXCLUSIONS' => "Type domain name, one per line. To exclude all domains use *. To exclude specific accounts use following format: domain.com:info:support:postmaster", - 'DB_EXCLUSIONS' => "Type full database name, one per line. To exclude all databases use *", - 'CRON_EXCLUSIONS' => "To exclude all jobs use *", - 'USER_EXCLUSIONS' => "Type directory name, one per line. To exlude all dirs use *", + 'WEB_EXCLUSIONS' => "Ingrese el nombre de dominio, uno por línea. Para excluir a todos utiliza *. Para excluir uno específico utilice el siguiente formato: domain.com:public_html/cache:public_html/tmp", + 'DNS_EXCLUSIONS' => "Ingrese el nombre de dominio, uno por línea. Para excluir a todos utiliza *", + 'MAIL_EXCLUSIONS' => "Ingrese el nombre del correo, uno por línea. Para excluir a todos utiliza *. Para excluir uno específico utilice el siguiente formato: domain.com:info:support:postmaster", + 'DB_EXCLUSIONS' => "Ingrese el nombre completo de la base de datos, una por linea. Para excluir a todos utiliza *", + 'CRON_EXCLUSIONS' => "Para excluir todos los trabajos utiliza *", + 'USER_EXCLUSIONS' => "Ingrese el nombre del directorio, uno por linea. Para excluir todos los firectorios utiliza * To exlude all dirs use *", 'Welcome to Vesta Control Panel' => 'Bienvenido al Panel de Control Vesta', 'MAIL_FROM' => 'Panel de Control Vesta ', @@ -471,37 +471,38 @@ $LANG['es'] = array( 'MAIL_RESET_SUBJECT' => 'Cambio de Contraseña en %s', 'PASSWORD_RESET_REQUEST' => "Para cambiar su contraseña del panel, por favor siga este link:\nhttps://%s/reset/?action=confirm&user=%s&code=%s\n\nAlternativamente, puede dirigirse a https://%s/reset/?action=code&user=%s e ingresar el siguiente código de cambio:\n%s\n\nSi usted no ha solicitado un cambio de contraseña, por favor ignore este mensaje y acepte nuestras disculpas.\n\n--\nPanel de Control Vesta\n", - 'Jan' => 'Jan', + 'Jan' => 'Ene', 'Feb' => 'Feb', 'Mar' => 'Mar', - 'Apr' => 'Apr', + 'Apr' => 'Abr', 'May' => 'May', 'Jun' => 'Jun', 'Jul' => 'Jul', - 'Aug' => 'Aug', + 'Aug' => 'Ago', 'Sep' => 'Sep', 'Oct' => 'Oct', 'Nov' => 'Nov', - 'Dec' => 'Dec', + 'Dec' => 'Dic', - 'Configuring Server' => 'Configuring Server', + 'Configuring Server' => 'Configurar Servidor', 'Hostname' => 'Hostname', - 'Time Zone' => 'Time Zone', - 'Default Language' => 'Default Language', - 'FileSystem Disk Quota' => 'FileSystem Disk Quota', - 'Vesta Control Panel Plugins' => 'Vesta Control Panel Plugins', - 'preview' => 'preview', - 'Reseller Role' => 'Reseller Role', - 'Web Config Editor' => 'Web Config Editor', - 'Template Manager' => 'Template Manager', - 'Backup Migration Manager' => 'Backup Migration Manager', - 'FileManager' => 'FileManager', + 'Time Zone' => 'Zona Horaria', + 'Default Language' => 'Idioma por Defecto', + 'FileSystem Disk Quota' => 'Cuota del disco FileSystem', + 'Vesta Control Panel Plugins' => 'Plugins de Vesta Control Panel', + 'preview' => 'previsualizar', + 'Reseller Role' => 'Revendedor', + 'Web Config Editor' => 'Editor de Configuración Web', + 'Template Manager' => 'Manejador de PLantilla', + 'Backup Migration Manager' => 'Manejador de Migracion de Respaldos', + 'FileManager' => 'Manejador de Archivos', + 'show: CPU / MEM / NET / DISK' => 'show: CPU / MEM / NET / DISK', - 'sort by' => 'sort by', - 'Date' => 'Date', - 'Starred' => 'Starred', - 'Name' => 'Name', + 'sort by' => 'ordenar por', + 'Date' => 'Fecha', + 'Starred' => 'Favorito', + 'Name' => 'Nombre', 'File Manager' => 'File Manager', 'type' => 'type', @@ -561,7 +562,6 @@ $LANG['es'] = array( 'Display/Close shortcuts' => 'Display/Close shortcuts', 'Move backward through top menu' => 'Move backward through top menu', 'Move forward through top menu' => 'Move forward through top menu', - 'Switch active menu' => 'Switch active menu', 'Enter focused element' => 'Enter focused element', 'Upload' => 'Upload', diff --git a/web/inc/i18n/fi.php b/web/inc/i18n/fi.php index a912477d5..fb2a3518d 100644 --- a/web/inc/i18n/fi.php +++ b/web/inc/i18n/fi.php @@ -565,7 +565,6 @@ $LANG['fi'] = array( 'Display/Close shortcuts' => 'Display/Close shortcuts', 'Move backward through top menu' => 'Move backward through top menu', 'Move forward through top menu' => 'Move forward through top menu', - 'Switch active menu' => 'Switch active menu', 'Enter focused element' => 'Enter focused element', 'Upload' => 'Upload', diff --git a/web/inc/i18n/fr.php b/web/inc/i18n/fr.php index 7b07f7df9..e6fad323a 100644 --- a/web/inc/i18n/fr.php +++ b/web/inc/i18n/fr.php @@ -563,7 +563,6 @@ $LANG['fr'] = array( 'Display/Close shortcuts' => 'Display/Close shortcuts', 'Move backward through top menu' => 'Move backward through top menu', 'Move forward through top menu' => 'Move forward through top menu', - 'Switch active menu' => 'Switch active menu', 'Enter focused element' => 'Enter focused element', 'Upload' => 'Upload', diff --git a/web/inc/i18n/hu.php b/web/inc/i18n/hu.php index ff2a9a38d..8444e3ecf 100644 --- a/web/inc/i18n/hu.php +++ b/web/inc/i18n/hu.php @@ -1,28 +1,30 @@ 'Csomagok', - 'IP' => 'IP', + 'IP' => 'IP címek', 'Graphs' => 'Grafikonok', 'Statistics' => 'Statisztikák', - 'Log' => 'Log', - 'Server' => 'Szerveren', + 'Log' => 'Naplók', + 'Server' => 'Szerver', + 'Firewall' => 'Tűzfal', 'Services' => 'Szolgáltatások', - 'Firewall' => 'Firewall', 'Updates' => 'Frissítések', 'Log in' => 'Belépés', 'Log out' => 'Kilépés', - 'USER' => 'USER', + 'USER' => 'ÜGYFÉL', 'WEB' => 'WEB', 'DNS' => 'DNS', - 'MAIL' => 'MAIL', + 'MAIL' => 'LEVELEZÉS', 'DB' => 'ADATBÁZIS', 'CRON' => 'CRON', 'BACKUP' => 'MENTÉS', @@ -41,9 +43,9 @@ $LANG['hu'] = array( 'Restore All' => 'Összes visszaállítása', 'Add Package' => 'Csomag hozzáadása', 'Add IP' => 'Új IP', - 'Add Rule' => 'Új szabály', - 'Ban IP Address' => 'Új IP', - 'Add one more FTP Account' => 'Add one more FTP Account', + 'Add Rule' => 'Új tűzfal szabály', + 'Ban IP Address' => 'IP cím tiltása', + 'Add one more FTP Account' => 'Új FTP hozzáférés', 'Search' => 'Keresés', 'Overall Statistics' => 'Átfogó statisztikák', 'Daily' => 'Napi', @@ -55,8 +57,8 @@ $LANG['hu'] = array( 'Save' => 'Mentés', 'Submit' => 'OK', - 'toggle all' => 'összes kinyit/bezár', - 'apply to selected' => 'alkalmazás a kiválasztottakra', + 'toggle all' => 'összes kijelölése', + 'apply to selected' => 'művelet a kijelöltekkel', 'rebuild' => 'újratelepít', 'rebuild web' => 'web újraépítés', 'rebuild dns' => 'dns újraépítés', @@ -64,10 +66,10 @@ $LANG['hu'] = array( 'rebuild db' => 'adatbázis újraépítés', 'rebuild cron' => 'cron újraépítés', 'update counters' => 'számlálók frissítése', - 'suspend' => 'felfüggeszt', - 'unsuspend' => 'újraaktivál', + 'suspend' => 'felfüggesztés', + 'unsuspend' => 'újraaktiválás', 'delete' => 'törlés', - 'show per user' => 'felhasználónként listáz', + 'show per user' => 'minden felhasználó', 'login as' => 'bejelentkezés, mint', 'logout' => 'kilépés', 'edit' => 'szerkesztés', @@ -78,13 +80,13 @@ $LANG['hu'] = array( 'list accounts' => '%s fiók listázása', 'add account' => 'fiók hozzáadása', 'open webmail' => 'webmail megnyitása', - 'list fail2ban' => 'fail2ban listázása', + 'list fail2ban' => 'fail2ban lista', 'open %s' => '%s megnyitása', 'download' => 'letöltés', 'restore' => 'visszaállítás', 'configure restore settings' => 'visszaállítási beállítások konfigurálása', - 'stop' => 'stop', - 'start' => 'start', + 'stop' => 'leállítás', + 'start' => 'indítás', 'restart' => 'újraindítás', 'update' => 'frissítés', 'generate' => 'létrehoz', @@ -92,8 +94,8 @@ $LANG['hu'] = array( 'reread IP' => 'IP újraolvasása', 'enable autoupdate' => 'automatikus frissítés engedélyezése', 'disable autoupdate' => 'automatikus frissítés tiltása', - 'turn on notifications' => 'bekapcsol értesítések', - 'turn off notifications' => 'kikapcsolni értesítések', + 'turn on notifications' => 'értesítések bekapcsolása', + 'turn off notifications' => 'értesítések kikapcsolása', 'Adding User' => 'Felhasználó hozzáadása', 'Editing User' => 'Felhasználó szerkesztése', @@ -117,10 +119,10 @@ $LANG['hu'] = array( 'Editing IP Address' => 'IP cím szerkesztése', 'Editing Backup Exclusions' => 'Mentési kivételek szerkesztése', 'Generating CSR' => 'CSR generálása', - 'Listing' => 'Listázás', + 'Listing' => 'Lista:', 'Search Results' => 'Keresési eredmények', - 'Adding Firewall Rule' => 'Firewal hozzáadása', - 'Editing Firewall Rule' => 'Firewall szerkesztése', + 'Adding Firewall Rule' => 'Tűzfal szabály hozzáadása', + 'Editing Firewall Rule' => 'Tűzfal szabály szerkesztése', 'Adding IP Address to Banlist' => 'IP cím hozzáadása', 'active' => 'aktív', @@ -157,20 +159,20 @@ $LANG['hu'] = array( 'Backend Template' => 'Backend sablon', 'Proxy Template' =>'Proxy sablon', 'DNS Template' => 'DNS sablon', - 'Web Domains' => 'Web Domainek', - 'SSL Domains' => 'SSL Domainek', - 'Web Aliases' => 'Web Alias', + 'Web Domains' => 'Web domain', + 'SSL Domains' => 'SSL domain', + 'Web Aliases' => 'Web alias', 'per domain' => 'domainenként', - 'DNS Domains' => 'DNS Domainek', - 'DNS Domains' => 'DNS Domainek', - 'DNS records' => 'DNS recordok' , - 'Name Servers' => 'Name Serverek', - 'Mail Domains' => 'Mail Domainek', - 'Mail Accounts' => 'Mail Fiókok', - 'Cron Jobs' => 'Cron Jobs', + 'DNS Domains' => 'DNS domain', + 'DNS Domains' => 'DNS domain', + 'DNS records' => 'DNS record' , + 'Name Servers' => 'Névszerverek', + 'Mail Domains' => 'Mail domain', + 'Mail Accounts' => 'Mail fiók', + 'Cron Jobs' => 'Cron feladat', 'SSH Access' => 'SSH hozzáférés', - 'IP Addresses' => 'IP Címek', - 'Backups' => 'Mentések', + 'IP Addresses' => 'IP cím', + 'Backups' => 'Mentés', 'Backup System' => 'Mentési rendszer', 'backup exclusions' => 'kihagyás a mentésből', 'template' => 'sablon', @@ -184,7 +186,7 @@ $LANG['hu'] = array( 'TTL' => 'TTL', 'Expire' => 'Lejár', 'Records' => 'Rekordok', - 'Catchall email' => 'Catchall email', + 'Catchall email' => 'Catchall e-mail', 'AntiVirus Support' => 'AntiVirus támogatás', 'AntiSpam Support' => 'AntiSpam támogatás', 'DKIM Support' => 'DKIM támogatás', @@ -195,7 +197,7 @@ $LANG['hu'] = array( 'Do not store forwarded mail' => 'Továbbított e-mailek mentésének tiltása', 'database' => 'adatbázis', 'User' => 'Felhasználó', - 'Host' => 'Hoszt', + 'Host' => 'Adatbázis szerver', 'Charset' => 'Karakterkódolás', 'Min' => 'Perc', 'Hour' => 'Óra', @@ -206,19 +208,21 @@ $LANG['hu'] = array( 'Run Time' => 'Futási idő', 'Backup Size' => 'Mentés mérete', 'SYS' => 'SYS', - 'Domains' => 'Domainek', + 'Domains' => 'Domain', 'Status' => 'Státusz', 'shared' => 'megosztott', 'dedicated' => 'dedikált', 'Owner' => 'Tulajdonos', 'Users' => 'Felhasználók', - 'Load Average' => 'Load átlag', + 'Load Average' => 'Átlag terhelés', 'Memory Usage' => 'Memória használat', 'HTTPD Usage' => 'HTTPD használat', 'NGINX Usage' => 'NGINX használat', 'MySQL Usage on localhost' => 'MySQL használat a localhoston', 'PostgreSQL Usage on localhost' => 'PostgreSQL használat a localhoston', 'Bandwidth Usage eth0' => 'eth0 sávszélesség használat', + 'Bandwidth Usage eth1' => 'eth1 sávszélesség használat', + 'Exim Usage' => 'Exim használat', 'FTP Usage' => 'FTP használat', 'SSH Usage' => 'SSH használat', 'reverse proxy' => 'fordított proxy', @@ -226,10 +230,12 @@ $LANG['hu'] = array( 'dns server' => 'dns szerver', 'mail server' => 'mail szerver', 'pop/imap server' => 'pop/imap szerver', - 'email antivirus' => 'email antivirus', - 'email antispam' => 'email antispam', + 'email antivirus' => 'e-mail antivirus', + 'email antispam' => 'e-mail antispam', 'database server' => 'adatbázis szerver', 'ftp server' => 'ftp szerver', + 'brute-force monitor' => 'betörésvédelem', + 'firewall' => 'tűzfal', 'job scheduler' => 'job ütemező', 'CPU' => 'CPU', 'Memory' => 'Memória', @@ -244,11 +250,11 @@ $LANG['hu'] = array( 'Owner' => 'Tulajdonos', 'Username' => 'Felhasználónév', 'Password' => 'Jelszó', - 'Email' => 'Email', + 'Email' => 'E-mail', 'Package' => 'Csomag', 'Language' => 'Nyelv', - 'First Name' => 'Keresztnév', - 'Last Name' => 'Vezetéknév', + 'First Name' => 'Vezetéknév', + 'Last Name' => 'Keresztnév', 'Send login credentials to email address' => 'Belépési adatok küldése e-mailben', 'Default Template' => 'Alapértelmezett sablon', 'Default Name Servers' => 'Alapértelmezett névszerverek', @@ -268,6 +274,7 @@ $LANG['hu'] = array( 'Account' => 'Fiók', 'Prefix will be automaticaly added to username' => 'A(z) %s előtag automatikusan hozzáadásra kerül a felhasználónévhez.', 'Send FTP credentials to email' => 'FTP adatok küldése e-mailben', + 'Path' => 'Útvonal', 'Expiration Date' => 'Lejárati dárum', 'YYYY-MM-DD' => 'ÉÉÉÉ-HH-NN', 'Name servers' => 'Névszerverek', @@ -291,24 +298,24 @@ $LANG['hu'] = array( 'Assigned user' => 'Hozzárendelt felhasználó', 'Assigned domain' => 'Hozzárendelt domain', 'NAT IP association' => 'NAT IP hozzárendelés', - 'shell' => 'rendszerhéj', - 'web domains' => 'web domainek', - 'web aliases' => 'web aliaszok', - 'dns records' => 'dns rekordok', - 'mail domains' => 'mail domainek', - 'mail accounts' => 'mail fiókok', - 'accounts' => 'fiókok', - 'databases' => 'adatbázisok', - 'cron jobs' => 'cron jobs', - 'backups' => 'mentések', + 'shell' => 'shell', + 'web domains' => 'web domain', + 'web aliases' => 'web aliasz', + 'dns records' => 'dns rekord', + 'mail domains' => 'mail domain', + 'mail accounts' => 'mail fiók', + 'accounts' => 'fiók', + 'databases' => 'adatbázis', + 'cron jobs' => 'cron feladat', + 'backups' => 'mentés', 'quota' => 'kvóta', 'day of week' => 'a hét napja', 'cmd' => 'cmd', - 'users' => 'felhasználók', + 'users' => 'felhasználó', 'domains' => 'domainek', - 'aliases' => 'aliaszok', - 'records' => 'rekordok', - 'jobs' => 'jobs', + 'aliases' => 'aliasz', + 'records' => 'rekord', + 'jobs' => 'feladat', 'username' => 'felhasználónév', 'password' => 'jelszó', 'type' => 'típus', @@ -323,7 +330,7 @@ $LANG['hu'] = array( 'ns1' => 'ns1', 'ns2' => 'ns2', 'user' => 'felhasználó', - 'email' => 'email', + 'email' => 'e-mail', 'first name' => 'vezetéknév', 'last name' => 'keresztnév', 'account' => 'fiók', @@ -338,7 +345,7 @@ $LANG['hu'] = array( 'Download AccessLog' => 'AccessLog letöltése', 'Download ErrorLog' => 'ErrorLog letöltése', 'Country' => 'Ország', - '2 letter code' => '2 Irányítószám', + '2 letter code' => 'Országkód (2 karakter)', 'State / Province' => 'Megye', 'City / Locality' => 'Város', 'Organization' => 'Szervezet', @@ -347,19 +354,19 @@ $LANG['hu'] = array( 'Port' => 'Port', 'Comment' => 'Megjegyzés', 'Banlist' => 'Banlista', - 'ranges are acceptable' => 'tartományok megengedett', - 'CIDR format is supported' => 'CIDR formátum támogatott', + 'ranges are acceptable' => 'tartományok használata megengedett', + 'CIDR format is supported' => 'a CIDR formátum támogatott', 'Add one more Name Server' => 'Add one more Name Server', - 'unlimited' => 'unlimited', + 'unlimited' => 'végtelen', '1 account' => '1 fiók', '%s accounts' => '%s fiók', '1 domain' => '1 domain', - '%s domains' => '%s domainek', + '%s domains' => '%s domain', '1 record' => '1 rekord', - '%s records' => '%s recordok', + '%s records' => '%s record', '1 mail account' => '1 mail fiók', - '%s mail accounts' => '%s mail fiókok', + '%s mail accounts' => '%s mail fiók', '1 database' => '1 adatbázis', '%s databases' => '%s adatbázis', '1 cron job' => '1 cron job', @@ -378,8 +385,8 @@ $LANG['hu'] = array( '%s objects' => '%s objektum', 'no exclusions' => 'nincs kihagyás', '1 rule' => '1 szabály', - '%s rules' => '%s szabályok', - 'There are no currently banned IP' => 'Nem tiltott IP', + '%s rules' => '%s szabály', + 'There are no currently banned IP' => 'Jelenleg nincs tiltott IP', 'USER_CREATED_OK' => '%s felhasználó sikeresen létrehozva.', 'WEB_DOMAIN_CREATED_OK' => '%s domain sikeresen létrehozva.', @@ -395,8 +402,8 @@ $LANG['hu'] = array( 'RULE_CREATED_OK' => 'Szabály sikeresen létrehozva.', 'Autoupdate has been successfully enabled' => 'Az automatikus frissítés bekapcsolva.', 'Autoupdate has been successfully disabled' => 'Az automatikus frissítés kikapcsolva.', - 'Cronjob email reporting has been successfully enabled' => 'Cronjob email reporting has been successfully enabled', - 'Cronjob email reporting has been successfully disabled' => 'Cronjob email reporting has been successfully disabled', + 'Cronjob email reporting has been successfully enabled' => 'Cronjob e-mail jelentés bekapcsolva.', + 'Cronjob email reporting has been successfully disabled' => 'Cronjob e-mail jelentés kikapcsolva.', 'Changes has been saved.' => 'A módosítások sikeresen mentésre kerültek.', 'Confirmation' => 'Megerősítés', 'DELETE_USER_CONFIRMATION' => 'Biztos, hogy törölni szeretnéd %s felhasználót?', @@ -450,8 +457,8 @@ $LANG['hu'] = array( 'CRON_EXCLUSIONS' => "Az összes job kihagyásához használj "*" -ot.", 'USER_EXCLUSIONS' => "Írd be a könyvtár nevét, soronként egyet. Az összes kihagyásához használj "*" -ot.", - 'Welcome to Vesta Control Panel' => 'Üdv, a Kezelőfelület!', - 'MAIL_FROM' => 'Kezelőfelület ', + 'Welcome to Vesta Control Panel' => 'Üdvözli a Vesta Control Panel!', + 'MAIL_FROM' => 'Vesta Control Panel ', 'GREETINGS_GORDON_FREEMAN' => "Üdv, %s %s,\n", 'GREETINGS' => "Üdv,\n", 'ACCOUNT_READY' => "A fiókod létrejött és készen áll a használatra.\n\nhttps://%s/login/\nFelhasználónév: %s\nJelszó: %s\n\n--\nKezelőfelület\n", @@ -475,29 +482,29 @@ $LANG['hu'] = array( 'Jan' => 'Jan', 'Feb' => 'Feb', - 'Mar' => 'Mar', - 'Apr' => 'Apr', - 'May' => 'May', - 'Jun' => 'Jun', - 'Jul' => 'Jul', + 'Mar' => 'Már', + 'Apr' => 'Ápr', + 'May' => 'Máj', + 'Jun' => 'Jún', + 'Jul' => 'Júl', 'Aug' => 'Aug', - 'Sep' => 'Sep', - 'Oct' => 'Oct', + 'Sep' => 'Sze', + 'Oct' => 'Okt', 'Nov' => 'Nov', 'Dec' => 'Dec', - 'Configuring Server' => 'Configuring Server', + 'Configuring Server' => 'Szerver beállítások', 'Hostname' => 'Hostname', - 'Time Zone' => 'Time Zone', - 'Default Language' => 'Default Language', - 'FileSystem Disk Quota' => 'FileSystem Disk Quota', - 'Vesta Control Panel Plugins' => 'Vesta Control Panel Plugins', - 'preview' => 'preview', - 'Reseller Role' => 'Reseller Role', - 'Web Config Editor' => 'Web Config Editor', - 'Template Manager' => 'Template Manager', + 'Time Zone' => 'Időzóna', + 'Default Language' => 'Alapértelmezett nyelv', + 'FileSystem Disk Quota' => 'Fájlrendszer kvóta', + 'Vesta Control Panel Plugins' => 'Vesta Control Panel Pluginek', + 'preview' => 'előnézet', + 'Reseller Role' => 'Viszonteladói jogosultságok', + 'Web Config Editor' => 'Web konfiguráció szerkesztő', + 'Template Manager' => 'Sablonkezelő', 'Backup Migration Manager' => 'Backup Migration Manager', - 'FileManager' => 'FileManager', + 'FileManager' => 'Fájlmenedzser', 'show: CPU / MEM / NET / DISK' => 'show: CPU / MEM / NET / DISK', 'sort by' => 'sort by', @@ -563,7 +570,6 @@ $LANG['hu'] = array( 'Display/Close shortcuts' => 'Display/Close shortcuts', 'Move backward through top menu' => 'Move backward through top menu', 'Move forward through top menu' => 'Move forward through top menu', - 'Switch active menu' => 'Switch active menu', 'Enter focused element' => 'Enter focused element', 'Upload' => 'Upload', diff --git a/web/inc/i18n/id.php b/web/inc/i18n/id.php index 64bb5727d..165614059 100644 --- a/web/inc/i18n/id.php +++ b/web/inc/i18n/id.php @@ -564,7 +564,6 @@ $LANG['id'] = array( 'Display/Close shortcuts' => 'Display/Close shortcuts', 'Move backward through top menu' => 'Move backward through top menu', 'Move forward through top menu' => 'Move forward through top menu', - 'Switch active menu' => 'Switch active menu', 'Enter focused element' => 'Enter focused element', 'Upload' => 'Upload', diff --git a/web/inc/i18n/it.php b/web/inc/i18n/it.php index dbe75b674..1ce1105fb 100644 --- a/web/inc/i18n/it.php +++ b/web/inc/i18n/it.php @@ -562,7 +562,6 @@ $LANG['it'] = array( 'Display/Close shortcuts' => 'Display/Close shortcuts', 'Move backward through top menu' => 'Move backward through top menu', 'Move forward through top menu' => 'Move forward through top menu', - 'Switch active menu' => 'Switch active menu', 'Enter focused element' => 'Enter focused element', 'Upload' => 'Upload', diff --git a/web/inc/i18n/ja.php b/web/inc/i18n/ja.php index b3dd4711a..7015001b7 100644 --- a/web/inc/i18n/ja.php +++ b/web/inc/i18n/ja.php @@ -347,6 +347,7 @@ $LANG['ja'] = array( 'Banlist' => 'BANリスト', 'ranges are acceptable' => '範囲指定が可能です', 'CIDR format is supported' => 'CIDRフォーマットが使用できます', + 'Add one more Name Server' => 'Add one more Name Server', 'unlimited' => '無制限', '1 account' => '1つのアカウント', @@ -495,9 +496,97 @@ $LANG['ja'] = array( 'Template Manager' => 'テンプレートマネージャー', 'Backup Migration Manager' => 'バックアップ移行マネージャー', 'FileManager' => 'ファイルマネージャー', + 'show: CPU / MEM / NET / DISK' => 'show: CPU / MEM / NET / DISK', 'sort by' => 'ソート', 'Date' => '日付', 'Starred' => 'スター付き', 'Name' => '名前', + + 'File Manager' => 'File Manager', + 'type' => 'type', + 'size' => 'size', + 'date' => 'date', + 'name' => 'name', + 'Initializing' => 'Initializing', + 'UPLOAD' => 'UPLOAD', + 'NEW FILE' => 'NEW FILE', + 'NEW DIR' => 'NEW DIR', + 'DELETE' => 'DELETE', + 'RENAME' => 'RENAME', + 'COPY' => 'COPY', + 'ARCHIVE' => 'ARCHIVE', + 'EXTRACT' => 'EXTRACT', + 'DOWNLOAD' => 'DOWNLOAD', + 'Hit' => 'Hit', + 'to reload the page' => 'to reload the page', + 'Directory name cannot be empty' => 'Directory name cannot be empty', + 'File name cannot be empty' => 'File name cannot be empty', + 'No file selected' => 'No file selected', + 'No file or folder selected' => 'No file or folder selected', + 'File type not supported' => 'File type not supported', + 'Directory download not available in current version' => 'Directory download not available in current version', + 'Directory not available' => 'Directory not available', + 'Done' => 'Done', + 'Close' => 'Close', + 'Copy' => 'Copy', + 'Cancel' => 'Cancel', + 'Rename' => 'Rename', + 'Delete' => 'Delete', + 'Extract' => 'Extract', + 'Create' => 'Create', + 'Compress' => 'Compress', + 'OK' => 'OK', + 'Are you sure you want to copy' => 'Are you sure you want to copy', + 'Are you sure you want to delete' => 'Are you sure you want to delete', + 'into' => 'into', + 'existing files will be replaced' => 'existing files will be replaced', + 'Original name' => 'Original name', + 'File' => 'File', + 'already exists' => 'already exists', + 'Create file' => 'Create file', + 'Create directory' => 'Create directory', + + 'Add New object' => 'Add New object', + 'Save Form' => 'Save Form', + 'Cancel saving form' => 'Cancel saving form', + 'Go to USER list' => 'Go to USER list', + 'Go to WEB list' => 'Go to WEB list', + 'Go to DNS list' => 'Go to DNS list', + 'Go to MAIL list' => 'Go to MAIL list', + 'Go to DB list' => 'Go to DB list', + 'Go to CRON list' => 'Go to CRON list', + 'Go to BACKUP list' => 'Go to BACKUP list', + 'Focus on search' => 'Focus on search', + 'Display/Close shortcuts' => 'Display/Close shortcuts', + 'Move backward through top menu' => 'Move backward through top menu', + 'Move forward through top menu' => 'Move forward through top menu', + 'Enter focused element' => 'Enter focused element', + + 'Upload' => 'Upload', + 'New File' => 'New File', + 'New Folder' => 'New Folder', + 'Download' => 'Download', + 'Rename' => 'Rename', + 'Copy' => 'Copy', + 'Archive' => 'Archive', + 'Delete' => 'Delete', + 'Save File (in text editor)' => 'Save File (in text editor)', + 'Close Popup / Cancel' => 'Close Popup / Cancel', + 'Move Cursor Up' => 'Move Cursor Up', + 'Move Cursor Dow' => 'Move Cursor Dow', + 'Switch to Left Tab' => 'Switch to Left Tab', + 'Switch to Right Tab' => 'Switch to Right Tab', + 'Switch Tab' => 'Switch Tab', + 'Go to the Top of File List' => 'Go to the Top of File List', + 'Go to the Last File' => 'Go to the Last File', + 'Open File/Enter Directory' => 'Open File/Enter Directory', + 'Go to Parent Directory' => 'Go to Parent Directory', + 'Select Current File' => 'Select Current File', + 'Select Bunch of Files' => 'Select Bunch of Files', + 'Append File to the Current Selection' => 'Append File to the Current Selection', + 'Select All Files' => 'Select All Files', + 'shortcuts are inspired by magnificent GNU Midnight Commander file manager' => + 'shortcuts are inspired by magnificent GNU Midnight Commander file manager' + ); \ No newline at end of file diff --git a/web/inc/i18n/nl.php b/web/inc/i18n/nl.php index c287f4dc1..d8c89e965 100644 --- a/web/inc/i18n/nl.php +++ b/web/inc/i18n/nl.php @@ -562,7 +562,6 @@ $LANG['nl'] = array( 'Display/Close shortcuts' => 'Display/Close shortcuts', 'Move backward through top menu' => 'Move backward through top menu', 'Move forward through top menu' => 'Move forward through top menu', - 'Switch active menu' => 'Switch active menu', 'Enter focused element' => 'Enter focused element', 'Upload' => 'Upload', diff --git a/web/inc/i18n/no.php b/web/inc/i18n/no.php index 7c85ab4b3..75e964d28 100644 --- a/web/inc/i18n/no.php +++ b/web/inc/i18n/no.php @@ -562,7 +562,6 @@ $LANG['no'] = array( 'Display/Close shortcuts' => 'Display/Close shortcuts', 'Move backward through top menu' => 'Move backward through top menu', 'Move forward through top menu' => 'Move forward through top menu', - 'Switch active menu' => 'Switch active menu', 'Enter focused element' => 'Enter focused element', 'Upload' => 'Upload', diff --git a/web/inc/i18n/pl.php b/web/inc/i18n/pl.php index cc53d907e..e9ed720fd 100644 --- a/web/inc/i18n/pl.php +++ b/web/inc/i18n/pl.php @@ -17,7 +17,7 @@ $LANG['pl'] = array( 'Log in' => 'Zaloguj', 'Log out' => 'Wyloguj', -'USER' => 'USER', + 'USER' => 'USER', 'WEB' => 'WEB', 'DNS' => 'DNS', 'MAIL' => 'MAIL', @@ -61,7 +61,7 @@ $LANG['pl'] = array( 'rebuild mail' => 'przebuduj mail', 'rebuild db' => 'przebuduj db', 'rebuild cron' => 'przebuduj cron', -'update counters' => 'zaktualizuj liczniki', + 'update counters' => 'zaktualizuj liczniki', 'suspend' => 'zawieś', 'unsuspend' => 'przywróć', 'delete' => 'usuń', @@ -87,7 +87,7 @@ $LANG['pl'] = array( 'update' => 'zaktualizuj', 'generate' => 'wygeneruj', 'Generate CSR' => 'Wygeneruj CSR', -'reread IP' => 'odczytaj ponownie IP', + 'reread IP' => 'odczytaj ponownie IP', 'enable autoupdate' => 'aktywuj automatyczną aktualizację', 'disable autoupdate' => 'wyłącz automatyczną aktualizację', 'turn on notifications' => 'włącz powiadomienia', @@ -115,7 +115,7 @@ $LANG['pl'] = array( 'Editing IP Address' => 'Edytowanie adresu IP', 'Editing Backup Exclusions' => 'Edytowanie wyłączeń kopii zapasowej', 'Generating CSR' => 'Generowanie CSR', -'Listing' => 'Listowanie', + 'Listing' => 'Listowanie', 'Search Results' => 'Wyniki wyszukiwania', 'Adding Firewall Rule' => 'Dodawanie reguły zapory', 'Editing Firewall Rule' => 'Edytowanie reguły zapory', @@ -179,7 +179,7 @@ $LANG['pl'] = array( 'Additional FTP Account' => 'Dodatkowe FTP', 'SOA' => 'SOA', 'TTL' => 'TTL', -'Expire' => 'Wygasa', + 'Expire' => 'Wygasa', 'Records' => 'Rekordy', 'Catchall email' => 'Email Catchall', 'AntiVirus Support' => 'Wsparcie dla antywirusa', @@ -199,7 +199,7 @@ $LANG['pl'] = array( 'Day' => 'Dzień', 'Month' => 'Miesiąc', 'Day of week' => 'Dzień tygodnia', -'local' => 'lokalne', + 'local' => 'lokalne', 'Run Time' => 'Czas uruchomienia', 'Backup Size' => 'Wielkość kopii zapasowej', 'SYS' => 'SYS', @@ -231,7 +231,7 @@ $LANG['pl'] = array( 'CPU' => 'CPU', 'Memory' => 'Pamięć', 'Uptime' => 'Czas uruchomienia', -'core package' => 'pakiet jądra', + 'core package' => 'pakiet jądra', 'php interpreter' => 'interpreter php', 'internal web server' => 'wewnętrzny serwer web', 'Version' => 'Wersja', @@ -259,7 +259,7 @@ $LANG['pl'] = array( 'SSL Certificate Authority / Intermediate' => 'Użąd certyfikacji SSL (CA) root / pośredni', 'SSL CSR' => 'SSL CSR', 'optional' => 'opcjonalne', -'internal' => 'wewnętrzne', + 'internal' => 'wewnętrzne', 'Statistics Authorization' => 'Autoryzacja statystyk', 'Statistics Auth' => 'Autoryzacja statystyk', 'Account' => 'Konto', @@ -274,7 +274,7 @@ $LANG['pl'] = array( 'Record Number' => 'Numer rekordu', 'in megabytes' => 'w megabajtach', 'Message' => 'Wiadomość', -'use local-part' => 'użyj części lokalnej', + 'use local-part' => 'użyj części lokalnej', 'one or more email addresses' => 'jeden lub więcej adresów email', 'Prefix will be automaticaly added to database name and database user' => 'Przedrostek %s zostanie automatycznie dodany do nazwy bazy danych i nazwy użytkownika.', 'Database' => 'Baza danych', @@ -346,6 +346,7 @@ $LANG['pl'] = array( 'Banlist' => 'Lista zbanowanych', 'ranges are acceptable' => 'zakresy są uznawane', 'CIDR format is supported' => 'format CIDR jest wspierany', + 'Add one more Name Server' => 'Add one more Name Server', 'unlimited' => 'nielimitowne', '1 account' => '1 konto', @@ -437,7 +438,7 @@ $LANG['pl'] = array( 'BACKUP_SCHEDULED' => 'Dodano zadanie do kolejki. Otrzymasz powiadomienie na maila, kiedy będzie można pobrać kopię zapasową.', 'BACKUP_EXISTS' => 'Aktualnie jest już uruchomiony proces kopii zapasowej. Proszę czekać na jego zakończenie.', 'RESTORE_SCHEDULED' => 'Dodano zadanie do kolejki. Otrzymasz powiadomienie na maila, kiedy zostanie zakończone przywracanie danych.', - 'RESTORE_EXISTS' => 'Aktualnie jest już uruchomiony proces przywracania danych. Proszę czekać na jego zakończenie przed powtórnym uruchomieniem.', + 'RESTORE_EXISTS' => 'Aktualnie jest już uruchomiony proces przywracania danych. Proszę czekać na jego zakończenie przed powtórnym uruchomieniem.', 'WEB_EXCLUSIONS' => "Wpisz nazwy domen, po jednej w linijce. W celu wyłączenia wszystkich domen użyj *, a żeby wyłączyć konkretne foldery użyj takiego formatu: domena.com:public_html/cache:public_html/tmp", 'DNS_EXCLUSIONS' => "Wpisz nazwy domen, po jednej w linijce. W celu wyłączenia wszystkich domen użyj *.", @@ -463,7 +464,7 @@ $LANG['pl'] = array( 'New Password' => 'Nowe hasło', 'Confirm Password' => 'Potwierdź hasło', 'Reset' => 'Resetuj', -'Reset Code' => 'Kod resetu', + 'Reset Code' => 'Kod resetu', 'RESET_NOTICE' => '', 'RESET_CODE_SENT' => 'Kod resetu hasła został wysłany na twój adres email
        ', 'MAIL_RESET_SUBJECT' => 'Zresetowano hasło o %s', @@ -494,9 +495,97 @@ $LANG['pl'] = array( 'Template Manager' => 'Zarządzanie szablonami', 'Backup Migration Manager' => 'Zarządzanie migracją kopii zapasowej', 'FileManager' => 'Menedżer plików', + 'show: CPU / MEM / NET / DISK' => 'show: CPU / MEM / NET / DISK', 'sort by' => 'sortuj', 'Date' => 'Data', 'Starred' => 'Gwiazdka', 'Name' => 'Nazwa', + + 'File Manager' => 'File Manager', + 'type' => 'type', + 'size' => 'size', + 'date' => 'date', + 'name' => 'name', + 'Initializing' => 'Initializing', + 'UPLOAD' => 'UPLOAD', + 'NEW FILE' => 'NEW FILE', + 'NEW DIR' => 'NEW DIR', + 'DELETE' => 'DELETE', + 'RENAME' => 'RENAME', + 'COPY' => 'COPY', + 'ARCHIVE' => 'ARCHIVE', + 'EXTRACT' => 'EXTRACT', + 'DOWNLOAD' => 'DOWNLOAD', + 'Hit' => 'Hit', + 'to reload the page' => 'to reload the page', + 'Directory name cannot be empty' => 'Directory name cannot be empty', + 'File name cannot be empty' => 'File name cannot be empty', + 'No file selected' => 'No file selected', + 'No file or folder selected' => 'No file or folder selected', + 'File type not supported' => 'File type not supported', + 'Directory download not available in current version' => 'Directory download not available in current version', + 'Directory not available' => 'Directory not available', + 'Done' => 'Done', + 'Close' => 'Close', + 'Copy' => 'Copy', + 'Cancel' => 'Cancel', + 'Rename' => 'Rename', + 'Delete' => 'Delete', + 'Extract' => 'Extract', + 'Create' => 'Create', + 'Compress' => 'Compress', + 'OK' => 'OK', + 'Are you sure you want to copy' => 'Are you sure you want to copy', + 'Are you sure you want to delete' => 'Are you sure you want to delete', + 'into' => 'into', + 'existing files will be replaced' => 'existing files will be replaced', + 'Original name' => 'Original name', + 'File' => 'File', + 'already exists' => 'already exists', + 'Create file' => 'Create file', + 'Create directory' => 'Create directory', + + 'Add New object' => 'Add New object', + 'Save Form' => 'Save Form', + 'Cancel saving form' => 'Cancel saving form', + 'Go to USER list' => 'Go to USER list', + 'Go to WEB list' => 'Go to WEB list', + 'Go to DNS list' => 'Go to DNS list', + 'Go to MAIL list' => 'Go to MAIL list', + 'Go to DB list' => 'Go to DB list', + 'Go to CRON list' => 'Go to CRON list', + 'Go to BACKUP list' => 'Go to BACKUP list', + 'Focus on search' => 'Focus on search', + 'Display/Close shortcuts' => 'Display/Close shortcuts', + 'Move backward through top menu' => 'Move backward through top menu', + 'Move forward through top menu' => 'Move forward through top menu', + 'Enter focused element' => 'Enter focused element', + + 'Upload' => 'Upload', + 'New File' => 'New File', + 'New Folder' => 'New Folder', + 'Download' => 'Download', + 'Rename' => 'Rename', + 'Copy' => 'Copy', + 'Archive' => 'Archive', + 'Delete' => 'Delete', + 'Save File (in text editor)' => 'Save File (in text editor)', + 'Close Popup / Cancel' => 'Close Popup / Cancel', + 'Move Cursor Up' => 'Move Cursor Up', + 'Move Cursor Dow' => 'Move Cursor Dow', + 'Switch to Left Tab' => 'Switch to Left Tab', + 'Switch to Right Tab' => 'Switch to Right Tab', + 'Switch Tab' => 'Switch Tab', + 'Go to the Top of File List' => 'Go to the Top of File List', + 'Go to the Last File' => 'Go to the Last File', + 'Open File/Enter Directory' => 'Open File/Enter Directory', + 'Go to Parent Directory' => 'Go to Parent Directory', + 'Select Current File' => 'Select Current File', + 'Select Bunch of Files' => 'Select Bunch of Files', + 'Append File to the Current Selection' => 'Append File to the Current Selection', + 'Select All Files' => 'Select All Files', + 'shortcuts are inspired by magnificent GNU Midnight Commander file manager' => + 'shortcuts are inspired by magnificent GNU Midnight Commander file manager' + ); diff --git a/web/inc/i18n/pt.php b/web/inc/i18n/pt.php index 823dbacc0..2789cc6e2 100644 --- a/web/inc/i18n/pt.php +++ b/web/inc/i18n/pt.php @@ -561,7 +561,6 @@ $LANG['pt'] = array( 'Display/Close shortcuts' => 'Display/Close shortcuts', 'Move backward through top menu' => 'Move backward through top menu', 'Move forward through top menu' => 'Move forward through top menu', - 'Switch active menu' => 'Switch active menu', 'Enter focused element' => 'Enter focused element', 'Upload' => 'Upload', diff --git a/web/inc/i18n/ro.php b/web/inc/i18n/ro.php index fccc5724b..ebf1f1f21 100644 --- a/web/inc/i18n/ro.php +++ b/web/inc/i18n/ro.php @@ -563,7 +563,6 @@ $LANG['ro'] = array( 'Display/Close shortcuts' => 'Display/Close shortcuts', 'Move backward through top menu' => 'Move backward through top menu', 'Move forward through top menu' => 'Move forward through top menu', - 'Switch active menu' => 'Switch active menu', 'Enter focused element' => 'Enter focused element', 'Upload' => 'Upload', diff --git a/web/inc/i18n/ru.php b/web/inc/i18n/ru.php index 0829b9185..093b2f7cc 100644 --- a/web/inc/i18n/ru.php +++ b/web/inc/i18n/ru.php @@ -563,7 +563,6 @@ $LANG['ru'] = array( 'Display/Close shortcuts' => 'Показать/Скрыть список горячих клавиш', 'Move backward through top menu' => 'Фокус на предыдущий пункт меню', 'Move forward through top menu' => 'Фокус на следующий пункт меню', - 'Switch active menu' => 'Переключиться между меню', 'Enter focused element' => 'Перейти в активный пункт меню', 'Upload' => 'Загрузить файл', diff --git a/web/inc/i18n/se.php b/web/inc/i18n/se.php index 3c529eb5e..e060b1322 100644 --- a/web/inc/i18n/se.php +++ b/web/inc/i18n/se.php @@ -559,7 +559,6 @@ $LANG['se'] = array( 'Display/Close shortcuts' => 'Display/Close shortcuts', 'Move backward through top menu' => 'Move backward through top menu', 'Move forward through top menu' => 'Move forward through top menu', - 'Switch active menu' => 'Switch active menu', 'Enter focused element' => 'Enter focused element', 'Upload' => 'Upload', diff --git a/web/inc/i18n/tr.php b/web/inc/i18n/tr.php index 44d7176bd..0a525c1ac 100644 --- a/web/inc/i18n/tr.php +++ b/web/inc/i18n/tr.php @@ -498,10 +498,10 @@ $LANG['tr'] = array( 'FileManager' => 'DosyaYöneticisi', 'show: CPU / MEM / NET / DISK' => 'show: CPU / MEM / NET / DISK', - 'sort by' => 'sort by', - 'Date' => 'Date', - 'Starred' => 'Starred', - 'Name' => 'Name', + 'sort by' => 'sıralama ölçütü', + 'Date' => 'Tarih', + 'Starred' => 'Yıldızlı', + 'Name' => 'İsim', 'File Manager' => 'File Manager', 'type' => 'type', @@ -561,7 +561,6 @@ $LANG['tr'] = array( 'Display/Close shortcuts' => 'Display/Close shortcuts', 'Move backward through top menu' => 'Move backward through top menu', 'Move forward through top menu' => 'Move forward through top menu', - 'Switch active menu' => 'Switch active menu', 'Enter focused element' => 'Enter focused element', 'Upload' => 'Upload', diff --git a/web/inc/i18n/tw.php b/web/inc/i18n/tw.php index 050ac603b..3327c0ed3 100644 --- a/web/inc/i18n/tw.php +++ b/web/inc/i18n/tw.php @@ -1,3 +1,467 @@ + '方案設定', + 'IP' => 'IP管理', + 'Graphs' => '資源使用圖表', + 'Statistics' => '統計資料', + 'Log' => '系統紀錄', + 'Services' => '服務', + 'Firewall' => '防火牆', + 'Updates' => '系統更新', + 'Log in' => '登入', + 'Log out' => '登出', + 'USER' => '使用者管理', + 'WEB' => '網站管理', + 'DNS' => 'DNS管理', + 'MAIL' => '信箱管理', + 'DB' => '資料庫', + 'CRON' => 'CRON', + 'BACKUP' => '備份', + 'Add User' => '新增使用者', + 'Add Domain' => '新增網域', + 'Add Web Domain' => '新增網站網域', + 'Add DNS Domain' => '新增DNS網域', + 'Add DNS Record' => '新增DNS紀錄', + 'Add Mail Domain' => '新增信箱網域', + 'Add Mail Account' => '新增信箱帳號', + 'Add Database' => '新增資料庫', + 'Add Cron Job' => '新增Cron Job', + 'Create Backup' => '建立備份', + 'Configure' => '調整設定', + 'Restore All' => '全部回復', + 'Add Package' => '新增方案', + 'Add IP' => '新增IP', + 'Add Rule' => '新增規則', + 'Ban IP Address' => '封鎖IP', + 'Search' => '搜尋', + 'Add one more FTP Account' => '增加一個FTP帳號', + 'Overall Statistics' => '整理統計資料', + 'Daily' => '每天', + 'Weekly' => '每週', + 'Monthly' => '每月', + 'Yearly' => '每年', + 'Add' => '新增', + 'Back' => '返回', + 'Save' => '儲存', + 'Submit' => '送出', + 'toggle all' => '批次執行', + 'apply to selected' => '套用到所有已選擇的', + 'rebuild' => '重建', + 'rebuild web' => '重建網站', + 'rebuild dns' => '重建DNS', + 'rebuild mail' => '重建信箱', + 'rebuild db' => '重建資料庫', + 'rebuild cron' => '重建 Cron', + 'update counters' => '更新計數器', + 'suspend' => '封鎖', + 'unsuspend' => '解除封鎖', + 'delete' => '刪除', + 'show per user' => 'show per user', + 'login as' => '登入帳號', + 'logout' => '登出', + 'edit' => '編輯', + 'open webstats' => '開啟網站統計資料', + 'view logs' => '查看系統紀錄', + 'list records' => '列出 %s 紀錄', + 'add record' => '新增紀錄', + 'list accounts' => '列出 %s 帳號', + 'add account' => '新增帳號', + 'open webmail' => '開啟網路信箱', + 'list fail2ban' => '列出登入失敗遭封鎖名單', + 'open %s' => '開啟 %s', + 'download' => '下載', + 'restore' => '回復', + 'configure restore settings' => '調整回復設定', + 'stop' => '停止', + 'start' => '啟動', + 'restart' => '重新啟動', + 'update' => '更新', + 'generate' => '產生', + 'Generate CSR' => '產生 CSR', + 'reread IP' => '重新取得IP', + 'enable autoupdate' => '啟用自動更新', + 'disable autoupdate' => '停用自動更新', + 'turn on notifications' => '啟用通知', + 'turn off notifications' => '停用通知', + 'Adding User' => '新增使用者', + 'Editing User' => '編輯使用者', + 'Adding Domain' => '新增網域', + 'Editing Domain' => '編輯網域', + 'Adding DNS Domain' => '新增DNS網域', + 'Editing DNS Domain' => '編輯DNS網域', + 'Adding DNS Record' => '新增DNS紀錄', + 'Editing DNS Record' => '編輯DNS紀錄', + 'Adding Mail Domain' => '新增信箱網域', + 'Editing Mail Domain' => '編輯信箱網域', + 'Adding Mail Account' => '新增信箱帳號', + 'Editing Mail Account' => '編輯信箱帳號', + 'Adding database' => '新增資料庫', + 'Editing Cron Job' => '編輯Cron Job', + 'Adding Cron Job' => '新增Cron Job', + 'Editing Database' => '編輯資料庫', + 'Adding Package' => '新增方案', + 'Editing Package' => '編輯方案', + 'Adding IP address' => '新增IP', + 'Editing IP Address' => '編輯IP', + 'Editing Backup Exclusions' => '編輯備份排除項目', + 'Generating CSR' => '產生CSR檔', + 'Listing' => '列出', + 'Search Results' => '搜尋結果', + 'Adding Firewall Rule' => '新增防火牆規則', + 'Editing Firewall Rule' => '編輯防火牆規則', + 'Adding IP Address to Banlist' => '新增IP至黑名單', + 'active' => '正常', + 'spnd' => '封鎖', + 'suspended' => '已封鎖', + 'running' => '執行中', + 'stopped' => '已停止', + 'outdated' => '有新版本可升級', + 'updated' => '已是最新版本', + 'yes' => '是', + 'no' => '否', + 'none' => '無', + 'pb' => 'PB', + 'tb' => 'TB', + 'gb' => 'GB', + 'mb' => 'MB', + 'minute' => '分鐘', + 'hour' => '小時', + 'day' => '天', + 'days' => '天', + 'hours' => '小時', + 'minutes' => '分鐘', + 'month' => '月', + 'package' => '方案', + 'Bandwidth' => '流量', + 'Disk' => '磁碟空間', + 'Web' => '網站', + 'Mail' => '信箱', + 'Databases' => '資料庫', + 'User Directories' => '使用者目錄', + 'Template' => '模板', + 'Web Template' => 'Apache模板', + 'Proxy Template' => 'Nginx模板', + 'DNS Template' => 'DNS模板', + 'Web Domains' => '網站網域', + 'SSL Domains' => 'SSL網域', + 'Web Aliases' => '網站次網域', + 'per domain' => '(每網域)', + 'DNS Domains' => 'DNS網域', + 'DNS Domains' => 'DNS網域', + 'DNS records' => 'DNS紀錄' , + 'Name Servers' => 'NS主機', + 'Mail Domains' => '信箱網域', + 'Mail Accounts' => '信箱使用者', + 'Cron Jobs' => 'Cron Jobs', + 'SSH Access' => 'SSH權限', + 'IP Addresses' => 'IP位置', + 'Backups' => '備份', + 'Backup System' => '備份系統', + 'backup exclusions' => '備份例外', + 'template' => '模板', + 'SSL Support' => 'SSL支援', + 'SSL Home Directory' => 'SSL主目錄', + 'Proxy Support' => 'Nginx支援', + 'Proxy Extensions' => 'Nginx擴充', + 'Web Statistics' => '網站統計', + 'Additional FTP Account' => '其他FTP帳號', + 'SOA' => 'SOA', + 'TTL' => 'TTL', + 'Expire' => '過期', + 'Records' => '紀錄', + 'Catchall email' => '收到所有郵件', + 'AntiVirus Support' => '防毒支援', + 'AntiSpam Support' => '防垃圾郵件支援', + 'DKIM Support' => 'DKIM支援', + 'Accounts' => '帳號', + 'Quota' => '配額', + 'Autoreply' => '自動回覆', + 'Forward to' => '轉寄到', + 'Do not store forwarded mail' => '不保留已轉發的郵件', + 'database' => '資料庫', + 'User' => '使用者', + 'Host' => '主機', + 'Charset' => '編碼', + 'Min' => '分鐘', + 'Hour' => '小時', + 'Day' => '天', + 'Month' => '月', + 'Day of week' => '星期幾', + 'local' => '本地', + 'Run Time' => '運作時間', + 'Backup Size' => '備份大小', + 'SYS' => 'SYS', + 'Domains' => '網域', + 'Status' => '狀態', + 'shared' => '共享', + 'dedicated' => '獨立', + 'Owner' => '擁有者', + 'Users' => '使用者', + 'Load Average' => '平均負載量', + 'Memory Usage' => '記憶體使用量', + 'HTTPD Usage' => 'Apache使用量', + 'NGINX Usage' => 'NGINX使用量', + 'MySQL Usage on localhost' => 'MySQL使用量 (localhost)', + 'PostgreSQL Usage on localhost' => 'PostgreSQL使用量 (localhost)', + 'Bandwidth Usage eth0' => '網路流量 (eth0)', + 'FTP Usage' => 'FTP使用量', + 'SSH Usage' => 'SSH使用量', + 'reverse proxy' => '反向Proxy', + 'web server' => '網站主機', + 'dns server' => 'DNS主機', + 'mail server' => '信箱主機', + 'pop/imap server' => 'POP/IMAP主機', + 'email antivirus' => '信箱防毒', + 'email antispam' => '信箱防垃圾信', + 'database server' => '資料庫主機', + 'ftp server' => 'FTP主機', + 'job scheduler' => '定時執行指令', + 'CPU' => 'CPU', + 'Memory' => '記憶體', + 'Uptime' => '已啟動時間', + 'core package' => '核心系統', + 'php interpreter' => 'PHP讀取', + 'internal web server' => '網路網站主機', + 'Version' => '版本', + 'Release' => '發佈號碼', + 'Architecture' => 'Architecture', + 'Object' => 'Object', + 'Owner' => '擁有者', + 'Username' => '使用者名稱', + 'Password' => '密碼', + 'Email' => '電子信箱', + 'Package' => '方案', + 'Language' => '語言', + 'First Name' => '名字', + 'Last Name' => '姓氏', + 'Send login credentials to email address' => '傳送登入資訊至使用者的信箱', + 'Default Template' => '預設模板', + 'Default Name Servers' => '預設NS主機', + 'Domain' => '網域', + 'DNS Support' => 'DNS支援', + 'Mail Support' => '信箱支援', + 'Advanced options' => '進階選項', + 'Aliases' => '次網域', + 'SSL Certificate' => 'SSL證書', + 'SSL Key' => 'SSL密鑰', + 'SSL Certificate Authority / Intermediate' => 'SSL認證機構/中級', + 'SSL CSR' => 'SSL CSR', + 'optional' => '選用', + 'internal' => '內部', + 'Statistics Authorization' => '統計授權', + 'Statistics Auth' => '統計驗證', + 'Account' => '帳號', + 'Prefix will be automaticaly added to username' => '前綴 %s 將會自動加到使用者名稱', + 'Send FTP credentials to email' => '將FTP登入資料傳送到使用者信箱', + 'Expiration Date' => '到期日期', + 'YYYY-MM-DD' => 'YYYY-MM-DD', + 'Name servers' => 'NS伺服器', + 'Record' => '紀錄', + 'IP or Value' => 'IP或值', + 'Priority' => '優先順序', + 'Record Number' => '記錄編號', + 'in megabytes' => '以MB為單位', + 'Message' => '訊息', + 'use local-part' => '使用本地部分', + 'one or more email addresses' => '一個或更多郵件地址', + 'Prefix will be automaticaly added to database name and database user' => '前綴 %s 將會自動加入資料庫名稱及使用者名稱', + 'Database' => '資料庫', + 'Type' => '類型', + 'Minute' => '分鐘', + 'Command' => '指令', + 'Package Name' => '方案名稱', + 'Netmask' => '子網路遮罩', + 'Interface' => '端口', + 'Shared' => '共享', + 'Assigned user' => '指定使用者', + 'Assigned domain' => '指定網址', + 'NAT IP association' => 'NAT IP連結', + 'shell' => 'shell', + 'web domains' => '網站網域', + 'web aliases' => '網站次網域', + 'dns records' => 'DNS記錄', + 'mail domains' => '信箱網域', + 'mail accounts' => '信箱帳號', + 'accounts' => '帳號', + 'databases' => '資料庫', + 'cron jobs' => 'Cron Jobs', + 'backups' => '備份', + 'quota' => '配額', + 'day of week' => '星期幾', + 'cmd' => '指令', + 'users' => '使用者', + 'domains' => '網域', + 'aliases' => '次網域', + 'records' => '記錄', + 'jobs' => 'Jobs', + 'username' => '使用者名稱', + 'password' => '密碼', + 'type' => '類型', + 'charset' => '編碼', + 'domain' => '網域', + 'ip' => 'IP', + 'ip address' => 'IP位置', + 'IP address' => 'IP位置', + 'netmask' => '子網路遮罩', + 'interface' => '端口', + 'assigned user' => '指定使用者', + 'ns1' => 'ns1', + 'ns2' => 'ns2', + 'user' => '使用者', + 'email' => '信箱', + 'first name' => '名字', + 'last name' => '姓氏', + 'account' => '帳號', + 'ssl certificate' => 'SSL 證書', + 'ssl key' => 'SSL密鑰', + 'stats user password' => '統計使用者帳號密碼', + 'stats username' => '統計使用者名稱', + 'stats password' => '統計密碼', + 'ftp user password' => 'FTP使用者帳號密碼', + 'ftp user' => 'FTP使用者', + 'Last 70 lines of %s.%s.log' => '最後70行的 %s.%s.記錄', + 'Download AccessLog' => '下載存取記錄', + 'Download ErrorLog' => '下載錯誤記錄', + 'Country' => '國家', + '2 letter code' => '國家簡碼(台灣是TW/香港是HK)', + 'State / Province' => '州 / 省', + 'City / Locality' => '市 / 地區', + 'Organization' => '組織名稱', + 'Action' => '動作', + 'Protocol' => 'Protocol', + 'Port' => 'Port', + 'Comment' => '備註', + 'Banlist' => '黑名單', + 'ranges are acceptable' => '可使用範圍(例如:21-22)', + 'CIDR format is supported' => '支援CIDR格式', + 'Add one more Name Server' => 'Add one more Name Server', + + '1 account' => '1 帳號', + '%s accounts' => '%s 帳號', + '1 domain' => '1 網域', + '%s domains' => '%s 網域', + '1 record' => '1 記錄', + '%s records' => '%s 記錄', + '1 mail account' => '1 信箱帳號', + '%s mail accounts' => '%s 信箱帳號', + '1 database' => '1 資料庫', + '%s databases' => '%s 資料庫', + '1 cron job' => '1 Cron Job', + '%s cron jobs' => '%s Cron Jobs', + '1 archive' => '1 archive', + '%s archives' => '%s archives', + '1 package' => '1 方案', + '%s packages' => '%s 方案', + '1 IP address' => '1 IP位置', + '%s IP addresses' => '%s IP位置', + '1 month' => '1 月', + '%s months' => '%s 月', + '1 log record' => '1 系統記錄', + '%s log records' => '%s 系統記錄', + '1 object' => '1 object', + '%s objects' => '%s objects', + 'no exclusions' => '取消排除', + '1 rule' => '1 規則', + '%s rules' => '%s 規則', + 'There are no currently banned IP' => '目前沒有任何已封鎖的IP', + 'USER_CREATED_OK' => '使用者 %s has been 已加入成功!', + 'WEB_DOMAIN_CREATED_OK' => '網域 %s 已加入成功!', + 'DNS_DOMAIN_CREATED_OK' => 'DNS網域 %s 已加入成功!', + 'DNS_RECORD_CREATED_OK' => '記錄 %s.%s 已加入成功!', + 'MAIL_DOMAIN_CREATED_OK' => '信箱網域 %s 已加入成功!', + 'MAIL_ACCOUNT_CREATED_OK' => '信箱帳號 %s@%s 已加入成功!', + 'DATABASE_CREATED_OK' => '資料庫 %s 已加入成功!', + 'CRON_CREATED_OK' => 'Cron Job 已加入成功!', + 'IP_CREATED_OK' => 'IP位置 %s 已加入成功!', + 'PACKAGE_CREATED_OK' => '方案 %s 已加入成功!', + 'SSL_GENERATED_OK' => 'SSL證書 已加入成功!', + 'RULE_CREATED_OK' => 'Rule 已加入成功!', + 'Autoupdate has been successfully enabled' => '自動更新已成功啟動', + 'Autoupdate has been successfully disabled' => '自動更新已成功關閉', + 'Cronjob email reporting has been successfully enabled' => 'Cron Job 電子郵件回報已成功啟動', + 'Cronjob email reporting has been successfully disabled' => 'Cron Job 電子郵件回報已成功關閉', + 'Changes has been saved.' => '已儲存更改', + 'Confirmation' => 'Confirmation', + 'DELETE_USER_CONFIRMATION' => '確定要刪除使用者 %s 嗎?', + 'SUSPEND_USER_CONFIRMATION' => '確定要封鎖使用者 %s 嗎?', + 'UNSUSPEND_USER_CONFIRMATION' => '確定要解除封鎖使用者 %s 嗎?', + 'DELETE_DOMAIN_CONFIRMATION' => '確定要刪除網域 %s 嗎?', + 'SUSPEND_DOMAIN_CONFIRMATION' => '確定要封鎖網域 %s 嗎?', + 'UNSUSPEND_DOMAIN_CONFIRMATION' => '確定要解除封鎖網域 %s 嗎?', + 'DELETE_RECORD_CONFIRMATION' => '確定要刪除記錄 %s 嗎?', + 'SUSPEND_RECORD_CONFIRMATION' => '確定要封鎖記錄 %s 嗎?', + 'UNSUSPEND_RECORD_CONFIRMATION' => '確定要解除封鎖紀錄 %s 嗎?', + 'DELETE_MAIL_ACCOUNT_CONFIRMATION' => '確定要刪除 %s 嗎?', + 'SUSPEND_MAIL_ACCOUNT_CONFIRMATION' => '確定要封鎖 %s 嗎?', + 'UNSUSPEND_MAIL_ACCOUNT_CONFIRMATION' => '確定要解除封鎖 %s 嗎?', + 'DELETE_DATABASE_CONFIRMATION' => '確定要刪除資料庫 %s 嗎?', + 'SUSPEND_DATABASE_CONFIRMATION' => '確定要封鎖資料庫 %s 嗎?', + 'UNSUSPEND_DATABASE_CONFIRMATION' => '確定要解除封鎖資料庫 %s 嗎?', + 'DELETE_CRON_CONFIRMATION' => '確定要刪除 Cron Job嗎?', + 'SUSPEND_CRON_CONFIRMATION' => '確定要封鎖 Cron Job嗎?', + 'UNSUSPEND_CRON_CONFIRMATION' => '確定要解除封鎖 Cron Job嗎?', + 'DELETE_BACKUP_CONFIRMATION' => '確定要刪除 %s 備份嗎?', + 'DELETE_EXCLUSION_CONFIRMATION' => '確定要刪除 %s 例外嗎?', + 'DELETE_PACKAGE_CONFIRMATION' => '確定要方案 %s 嗎?', + 'DELETE_IP_CONFIRMATION' => '確定要刪除IP地址 %s 嗎?', + 'DELETE_RULE_CONFIRMATION' => '確定要刪除規則 #%s 嗎?', + 'SUSPEND_RULE_CONFIRMATION' => '確定要封鎖規則 #%s 嗎?', + 'UNSUSPEND_RULE_CONFIRMATION' => '確定要解除封鎖規則 #%s 嗎?', + 'RESTART_CONFIRMATION' => '確定要重新啟動 %s 嗎?', + 'Welcome' => '歡迎', + 'LOGGED_IN_AS' => '以使用者身份 %s 登入', + 'Error' => '錯誤', + 'Invalid username or password' => '無效的使用者名稱或密碼', + 'Invalid username or code' => '無效的使用者名稱或驗證碼.', + 'Passwords not match' => '密碼錯誤', + 'Please enter valid email address.' => '請輸入正確的信箱', + 'Field "%s" can not be blank.' => '"%s" 不能為空白', + 'Password is too short.' => '密碼太短 (是少要6個數字+字母)', + 'Error code:' => '錯誤代碼: %s', + 'SERVICE_ACTION_FAILED' => '"%s" "%s" 失敗', + 'IP address is in use' => 'IP位置為使用中', + 'BACKUP_SCHEDULED' => '您的要求已加入隊列中，備份完成後會再以電子郵件通知您', + 'BACKUP_EXISTS' => '已經有一個備份正在執行中，請等待備份完成後在操作', + 'RESTORE_SCHEDULED' => '您的要求已加入隊列中，回復完成後會再以電子郵件通知您', + 'RESTORE_EXISTS' => '已經有一個回復正在執行中，請等待備份完成後在操作', + 'WEB_EXCLUSIONS' => "Type domain name, one per line. To exclude all domains use *. To exclude specific dirs use following format: domain.com:public_html/cache:public_html/tmp", + 'DNS_EXCLUSIONS' => "Type domain name, one per line. To exclude all domains use *", + 'MAIL_EXCLUSIONS' => "Type domain name, one per line. To exclude all domains use *. To exclude specific accounts use following format: domain.com:info:support:postmaster", + 'DB_EXCLUSIONS' => "Type full database name, one per line. To exclude all databases use *", + 'CRON_EXCLUSIONS' => "To exclude all jobs use *", + 'USER_EXCLUSIONS' => "Type directory name, one per line. To exlude all dirs use *", + 'Welcome to Vesta Control Panel' => '歡迎來到 Vesta 管理系統', + 'MAIL_FROM' => 'Vesta 管理系統 ', + 'GREETINGS_GORDON_FREEMAN' => "您好, %s %s,\n", + 'GREETINGS' => "您好,\n", + 'ACCOUNT_READY' => "您的帳號已成功建立，並可以開始使用了!\n\nhttps://%s/login/\n使用者名稱: %s\n密碼: %s\n\n--\nVesta Control Panel\n", + 'FTP login credentials' => 'FTP 登入資料', + 'FTP_ACCOUNT_READY' => "FTP帳號已成功建立，並可以開始使用了!\n\n主機名稱: %s\n使用者名稱: %s_%s\n密碼: %s\n\n--\nVesta Control Panel\n", + 'Database Credentials' => "Database 登入資料", + 'DATABASE_READY' => "資料庫已加入成功!\n\n資料庫名稱: %s\n使用者名稱: %s\n密碼: %s\n%s\n\n--\nVesta Control Panel\n", + 'forgot password' => '忘記密碼', + 'Confirm' => '確認', + 'New Password' => '新密碼', + 'Confirm Password' => '確認密碼', + 'Reset' => '重設', + 'Reset Code' => '重設代碼', + 'RESET_NOTICE' => '', + 'RESET_CODE_SENT' => '密買重設代碼已發送到您的信箱
        ', + 'MAIL_RESET_SUBJECT' => '密碼重置在 %s', + 'PASSWORD_RESET_REQUEST' => '重置密碼請點擊連結:\nhttps://%s/reset/?action=confirm&user=%s&code=%s\n\n或者您可以到 https://%s/reset/?action=code&user=%s 輸入密碼重設代碼:\n%s\n\n如果您沒有要求重設密碼，請忽略此郵件\n\n—\nVesta Control Panel\n', +); + + + 'Display/Close shortcuts', 'Move backward through top menu' => 'Move backward through top menu', 'Move forward through top menu' => 'Move forward through top menu', - 'Switch active menu' => 'Switch active menu', 'Enter focused element' => 'Enter focused element', 'Upload' => 'Upload', @@ -589,5 +1052,4 @@ $LANG['tw'] = array( 'Select All Files' => 'Select All Files', 'shortcuts are inspired by magnificent GNU Midnight Commander file manager' => 'shortcuts are inspired by magnificent GNU Midnight Commander file manager' - ); \ No newline at end of file diff --git a/web/inc/i18n/ua.php b/web/inc/i18n/ua.php index 8cf8271d9..3abe6a2f0 100644 --- a/web/inc/i18n/ua.php +++ b/web/inc/i18n/ua.php @@ -563,7 +563,6 @@ $LANG['ua'] = array( 'Display/Close shortcuts' => 'Display/Close shortcuts', 'Move backward through top menu' => 'Move backward through top menu', 'Move forward through top menu' => 'Move forward through top menu', - 'Switch active menu' => 'Switch active menu', 'Enter focused element' => 'Enter focused element', 'Upload' => 'Upload', From 10ed8021ef215533b41926a6a5256f0f5d34cfb0 Mon Sep 17 00:00:00 2001 From: MarPiRK Date: Wed, 28 Oct 2015 19:02:21 +0100 Subject: [PATCH 141/264] Updated Polish translation --- web/inc/i18n/pl.php | 170 ++++++++++++++++++++++---------------------- 1 file changed, 85 insertions(+), 85 deletions(-) diff --git a/web/inc/i18n/pl.php b/web/inc/i18n/pl.php index e9ed720fd..3e42affac 100644 --- a/web/inc/i18n/pl.php +++ b/web/inc/i18n/pl.php @@ -1,7 +1,7 @@ + * Plik językowy panelu Vesta + * Marek Pikuła */ $LANG['pl'] = array( @@ -346,7 +346,7 @@ $LANG['pl'] = array( 'Banlist' => 'Lista zbanowanych', 'ranges are acceptable' => 'zakresy są uznawane', 'CIDR format is supported' => 'format CIDR jest wspierany', - 'Add one more Name Server' => 'Add one more Name Server', + 'Add one more Name Server' => 'Dodaj jeszcze jeden serwer DNS', 'unlimited' => 'nielimitowne', '1 account' => '1 konto', @@ -495,97 +495,97 @@ $LANG['pl'] = array( 'Template Manager' => 'Zarządzanie szablonami', 'Backup Migration Manager' => 'Zarządzanie migracją kopii zapasowej', 'FileManager' => 'Menedżer plików', - 'show: CPU / MEM / NET / DISK' => 'show: CPU / MEM / NET / DISK', + 'show: CPU / MEM / NET / DISK' => 'pokaż: CPU / MEM / NET / DYSK', 'sort by' => 'sortuj', 'Date' => 'Data', 'Starred' => 'Gwiazdka', 'Name' => 'Nazwa', - 'File Manager' => 'File Manager', - 'type' => 'type', - 'size' => 'size', - 'date' => 'date', - 'name' => 'name', - 'Initializing' => 'Initializing', - 'UPLOAD' => 'UPLOAD', - 'NEW FILE' => 'NEW FILE', - 'NEW DIR' => 'NEW DIR', - 'DELETE' => 'DELETE', - 'RENAME' => 'RENAME', - 'COPY' => 'COPY', - 'ARCHIVE' => 'ARCHIVE', - 'EXTRACT' => 'EXTRACT', - 'DOWNLOAD' => 'DOWNLOAD', - 'Hit' => 'Hit', - 'to reload the page' => 'to reload the page', - 'Directory name cannot be empty' => 'Directory name cannot be empty', - 'File name cannot be empty' => 'File name cannot be empty', - 'No file selected' => 'No file selected', - 'No file or folder selected' => 'No file or folder selected', - 'File type not supported' => 'File type not supported', - 'Directory download not available in current version' => 'Directory download not available in current version', - 'Directory not available' => 'Directory not available', - 'Done' => 'Done', - 'Close' => 'Close', - 'Copy' => 'Copy', - 'Cancel' => 'Cancel', - 'Rename' => 'Rename', - 'Delete' => 'Delete', - 'Extract' => 'Extract', - 'Create' => 'Create', - 'Compress' => 'Compress', + 'File Manager' => 'Manager Plików', + 'type' => 'typ', + 'size' => 'rozmiar', + 'date' => 'data', + 'name' => 'nazwa', + 'Initializing' => 'Inicjalizowanie', + 'UPLOAD' => 'WYŚLIJ', + 'NEW FILE' => 'NOWY PLIK', + 'NEW DIR' => 'NOWY FOLDER', + 'DELETE' => 'USUŃ', + 'RENAME' => 'ZMIEŃ NAZWĘ', + 'COPY' => 'KOPIUJ', + 'ARCHIVE' => 'ARCHIWIZUJ', + 'EXTRACT' => 'ROZPAKUJ', + 'DOWNLOAD' => 'POBIERZ', + 'Hit' => 'Naciśnij', + 'to reload the page' => 'żeby załadować ponownie stronę', + 'Directory name cannot be empty' => 'Nazwa folderu nie może być pusta', + 'File name cannot be empty' => 'Nazwa pliku nie może być pusta', + 'No file selected' => 'Nie wybrano pliku', + 'No file or folder selected' => 'Nie wybrano pliku ani folderu', + 'File type not supported' => 'Typ pliku niewspierany', + 'Directory download not available in current version' => 'Pobieranie folderów nie jest wspierane w aktualnej wersji', + 'Directory not available' => 'Folder niedostępny', + 'Done' => 'Zrobione', + 'Close' => 'Zamknij', + 'Copy' => 'Kopiuj', + 'Cancel' => 'Anuluj', + 'Rename' => 'Zmień nazwę', + 'Delete' => 'Usuń', + 'Extract' => 'Rozpakuj', + 'Create' => 'Stwórz', + 'Compress' => 'Skompresuj', 'OK' => 'OK', - 'Are you sure you want to copy' => 'Are you sure you want to copy', - 'Are you sure you want to delete' => 'Are you sure you want to delete', - 'into' => 'into', - 'existing files will be replaced' => 'existing files will be replaced', - 'Original name' => 'Original name', - 'File' => 'File', - 'already exists' => 'already exists', - 'Create file' => 'Create file', - 'Create directory' => 'Create directory', + 'Are you sure you want to copy' => 'Czy jesteś pewny, że chcesz skopiować?', + 'Are you sure you want to delete' => 'Czy jesteś pewny, że chcesz usunąć?', + 'into' => 'do', + 'existing files will be replaced' => 'istniejące pliki zostaną zastąpione', + 'Original name' => 'Pierwotna nazwa', + 'File' => 'Plik', + 'already exists' => 'już istnieje', + 'Create file' => 'Stwórz plik', + 'Create directory' => 'Stwórz katalog', - 'Add New object' => 'Add New object', - 'Save Form' => 'Save Form', - 'Cancel saving form' => 'Cancel saving form', - 'Go to USER list' => 'Go to USER list', - 'Go to WEB list' => 'Go to WEB list', - 'Go to DNS list' => 'Go to DNS list', - 'Go to MAIL list' => 'Go to MAIL list', - 'Go to DB list' => 'Go to DB list', - 'Go to CRON list' => 'Go to CRON list', - 'Go to BACKUP list' => 'Go to BACKUP list', - 'Focus on search' => 'Focus on search', - 'Display/Close shortcuts' => 'Display/Close shortcuts', - 'Move backward through top menu' => 'Move backward through top menu', - 'Move forward through top menu' => 'Move forward through top menu', - 'Enter focused element' => 'Enter focused element', + 'Add New object' => 'Dodaj nowy objekt', + 'Save Form' => 'Zapisz formularz', + 'Cancel saving form' => 'Anuluj zapisywanie formularza', + 'Go to USER list' => 'Idź do listy UŻYTKOWNIKÓW', + 'Go to WEB list' => 'Idź do listy WEB', + 'Go to DNS list' => 'Idź do listy DNS', + 'Go to MAIL list' => 'Idź do listy MAIL', + 'Go to DB list' => 'Idź do listy DB', + 'Go to CRON list' => 'Idź do listy CRON', + 'Go to BACKUP list' => 'Idź do listy BACKUP', + 'Focus on search' => 'Skoncentruj na szukaniu', + 'Display/Close shortcuts' => 'Pokaż/ukryj sktóry', + 'Move backward through top menu' => 'Przejdź do tyłu przez menu górne', + 'Move forward through top menu' => 'Przejdź do przodu przez menu górne', + 'Enter focused element' => 'Wpisz zaznaczony element', - 'Upload' => 'Upload', - 'New File' => 'New File', - 'New Folder' => 'New Folder', - 'Download' => 'Download', - 'Rename' => 'Rename', - 'Copy' => 'Copy', - 'Archive' => 'Archive', - 'Delete' => 'Delete', - 'Save File (in text editor)' => 'Save File (in text editor)', - 'Close Popup / Cancel' => 'Close Popup / Cancel', - 'Move Cursor Up' => 'Move Cursor Up', - 'Move Cursor Dow' => 'Move Cursor Dow', - 'Switch to Left Tab' => 'Switch to Left Tab', - 'Switch to Right Tab' => 'Switch to Right Tab', - 'Switch Tab' => 'Switch Tab', - 'Go to the Top of File List' => 'Go to the Top of File List', - 'Go to the Last File' => 'Go to the Last File', - 'Open File/Enter Directory' => 'Open File/Enter Directory', - 'Go to Parent Directory' => 'Go to Parent Directory', - 'Select Current File' => 'Select Current File', - 'Select Bunch of Files' => 'Select Bunch of Files', - 'Append File to the Current Selection' => 'Append File to the Current Selection', - 'Select All Files' => 'Select All Files', + 'Upload' => 'Wyślij', + 'New File' => 'Nowy plik', + 'New Folder' => 'Nowy folder', + 'Download' => 'Pobierz', + 'Rename' => 'Zmień nazwę', + 'Copy' => 'Kopiuj', + 'Archive' => 'Archiwizuj', + 'Delete' => 'Usuń', + 'Save File (in text editor)' => 'Zapisz plik (w edytorze tekstu))', + 'Close Popup / Cancel' => 'Zamknij okno / Anuluj', + 'Move Cursor Up' => 'Przenieś kursor wyżej', + 'Move Cursor Dow' => 'Przenień kursor niżej', + 'Switch to Left Tab' => 'Przełącz do zakładki po lewej', + 'Switch to Right Tab' => 'Przełącz do zakładki po prawej', + 'Switch Tab' => 'Przełącz zakładkę', + 'Go to the Top of File List' => 'Przejdź na górę listy plików', + 'Go to the Last File' => 'Przejdź do ostatniego pliku', + 'Open File/Enter Directory' => 'Otwórz plik/folder', + 'Go to Parent Directory' => 'Przejdź do katalogu nadrzędnego', + 'Select Current File' => 'Wybierz aktywny plik', + 'Select Bunch of Files' => 'Wybierz kilka plików', + 'Append File to the Current Selection' => 'Nadpisz plik do aktualnego zaznaczenia', + 'Select All Files' => 'Wybierz wszystkie pliki', 'shortcuts are inspired by magnificent GNU Midnight Commander file manager' => - 'shortcuts are inspired by magnificent GNU Midnight Commander file manager' + 'skróty klawiszowe są zainspirowane wspaniałym managerem plików GNU Midnight Commander' ); From b560c99ceb3ec6cca084d2672c23ce637db9e6bd Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Thu, 29 Oct 2015 15:01:14 +0200 Subject: [PATCH 142/264] user notification backend --- bin/v-acknowledge-user-notification | 66 ++++++++++++++++++++ bin/v-add-user | 1 + bin/v-add-user-notification | 71 +++++++++++++++++++++ bin/v-change-user-package | 1 + bin/v-delete-user-notification | 66 ++++++++++++++++++++ bin/v-list-user | 2 +- bin/v-list-user-notifications | 97 +++++++++++++++++++++++++++++ 7 files changed, 303 insertions(+), 1 deletion(-) create mode 100755 bin/v-acknowledge-user-notification create mode 100755 bin/v-add-user-notification create mode 100755 bin/v-delete-user-notification create mode 100755 bin/v-list-user-notifications diff --git a/bin/v-acknowledge-user-notification b/bin/v-acknowledge-user-notification new file mode 100755 index 000000000..16a40e55b --- /dev/null +++ b/bin/v-acknowledge-user-notification @@ -0,0 +1,66 @@ +#!/bin/bash +# info: update user notification +# options: USER NOTIFICATION +# +# The function updates user notification. + + +#----------------------------------------------------------# +# Variable&Function # +#----------------------------------------------------------# + +# Argument defenition +user=$1 +nid=$2 + +# Includes +source $VESTA/func/main.sh +source $VESTA/conf/vesta.conf + + +#----------------------------------------------------------# +# Verifications # +#----------------------------------------------------------# + +check_args '2' "$#" 'USER NOTIFICATION' +validate_format 'user' 'nid' +is_object_valid 'user' 'USER' "$user" + + +#----------------------------------------------------------# +# Action # +#----------------------------------------------------------# + +# Updating notification +update_object_value 'notifications' 'NID' "$nid" '$ACK' 'yes' 2>/dev/null + +# Checking last notification +if [ -e "$USER_DATA/notifications.conf" ]; then + if [ -z "$(grep NID= $USER_DATA/notifications.conf)" ]; then + notice='no' + fi + if [ -z "$(grep "ACK='no'" $USER_DATA/notifications.conf)" ]; then + notice='no' + fi +else + notice='no' +fi + + +#----------------------------------------------------------# +# Vesta # +#----------------------------------------------------------# + +# Updating notification counter +if [ "$notice" = 'no' ]; then + if [ -z "$(grep NOTIFICATIONS $USER_DATA/user.conf)" ]; then + sed -i "s/^TIME/NOTIFICATIONS='no'\nTIME/g" $USER_DATA/user.conf + else + update_user_value "$user" '$NOTIFICATIONS' "no" + fi +fi + +# Logging +log_event "$OK" "$EVENT" + +exit diff --git a/bin/v-add-user b/bin/v-add-user index 06ae6aac6..ba250ccb3 100755 --- a/bin/v-add-user +++ b/bin/v-add-user @@ -180,6 +180,7 @@ U_DATABASES='0' U_CRON_JOBS='0' U_BACKUPS='0' LANGUAGE='' +NOTIFICATIONS='no' TIME='$TIME' DATE='$DATE'" > $USER_DATA/user.conf chmod 660 $USER_DATA/user.conf diff --git a/bin/v-add-user-notification b/bin/v-add-user-notification new file mode 100755 index 000000000..7a9146b93 --- /dev/null +++ b/bin/v-add-user-notification @@ -0,0 +1,71 @@ +#!/bin/bash +# info: add user notification +# options: USER TOPIC NOTICE [TYPE] +# +# The function adds user notification. + + +#----------------------------------------------------------# +# Variable&Function # +#----------------------------------------------------------# + +# Argument defenition +user=$1 +topic=$(echo $2 |sed "s/'/%quote%/g") +notice=$(echo $3 |sed "s/'/%quote%/g") +type=$4 + +# Includes +source $VESTA/func/main.sh +source $VESTA/conf/vesta.conf + + +#----------------------------------------------------------# +# Verifications # +#----------------------------------------------------------# + +check_args '2' "$#" 'USER TOPIC NOTICE [TYPE]' +validate_format 'user' 'topic' 'notice' +is_object_valid 'user' 'USER' "$user" + + +#----------------------------------------------------------# +# Action # +#----------------------------------------------------------# + +# Defining notification id +if [ -e "$USER_DATA/notifications.conf" ]; then + nid=$(grep "NID=" $USER_DATA/notifications.conf |cut -f 2 -d \') + nid=$(echo "$nid" |sort -n |tail -n1) + if [ ! -z "$nid" ]; then + nid="$((nid +1))" + else + nid=1 + fi +else + nid=1 +fi + +# Concatenating string +str="NID='$nid' TOPIC='$topic' NOTICE='$notice' TYPE='$type'" +str="$str ACK='no' TIME='$TIME' DATE='$DATE'" + +# Adding to config +echo "$str" >> $USER_DATA/notifications.conf + +# Changing permissions +chmod 660 $USER_DATA/notifications.conf + + +#----------------------------------------------------------# +# Vesta # +#----------------------------------------------------------# + +# Updating notification counter +if [ -z "$(grep NOTIFICATIONS $USER_DATA/user.conf)" ]; then + sed -i "s/^TIME/NOTIFICATIONS='yes'\nTIME/g" $USER_DATA/user.conf +else + update_user_value "$user" '$NOTIFICATIONS' "yes" +fi + +exit diff --git a/bin/v-change-user-package b/bin/v-change-user-package index d9b0b756d..bfa91bcbb 100755 --- a/bin/v-change-user-package +++ b/bin/v-change-user-package @@ -148,6 +148,7 @@ U_DATABASES='$U_DATABASES' U_CRON_JOBS='$U_CRON_JOBS' U_BACKUPS='$U_BACKUPS' LANGUAGE='$LANGUAGE' +NOTIFICATIONS='$NOTIFICATIONS' TIME='$TIME' DATE='$DATE'" > $USER_DATA/user.conf } diff --git a/bin/v-delete-user-notification b/bin/v-delete-user-notification new file mode 100755 index 000000000..c0246f89c --- /dev/null +++ b/bin/v-delete-user-notification @@ -0,0 +1,66 @@ +#!/bin/bash +# info: delete user notification +# options: USER NOTIFICATION +# +# The function deletes user notification. + + +#----------------------------------------------------------# +# Variable&Function # +#----------------------------------------------------------# + +# Argument defenition +user=$1 +nid=$2 + +# Includes +source $VESTA/func/main.sh +source $VESTA/conf/vesta.conf + + +#----------------------------------------------------------# +# Verifications # +#----------------------------------------------------------# + +check_args '2' "$#" 'USER NOTIFICATION' +validate_format 'user' 'nid' +is_object_valid 'user' 'USER' "$user" + + +#----------------------------------------------------------# +# Action # +#----------------------------------------------------------# + +# Deleting notification +sed -i "/NID='$nid' /d" $USER_DATA/notifications.conf 2>/dev/null + +# Checking last notification +if [ -e "$USER_DATA/notifications.conf" ]; then + if [ -z "$(grep NID= $USER_DATA/notifications.conf)" ]; then + notice='no' + fi + if [ -z "$(grep "ACK='no'" $USER_DATA/notifications.conf)" ]; then + notice='no' + fi +else + notice='no' +fi + + +#----------------------------------------------------------# +# Vesta # +#----------------------------------------------------------# + +# Updating notification counter +if [ "$notice" = 'no' ]; then + if [ -z "$(grep NOTIFICATIONS $USER_DATA/user.conf)" ]; then + sed -i "s/^TIME/NOTIFICATIONS='no'\nTIME/g" $USER_DATA/user.conf + else + update_user_value "$user" '$NOTIFICATIONS' "no" + fi +fi + +# Logging +log_event "$OK" "$EVENT" + +exit diff --git a/bin/v-list-user b/bin/v-list-user index b1cb64e57..da4e96fd1 100755 --- a/bin/v-list-user +++ b/bin/v-list-user @@ -82,7 +82,7 @@ fields='$USER $FNAME $LNAME $PACKAGE $WEB_TEMPLATE $BACKEND_TEMPLATE $U_USERS $U_DISK $U_DISK_DIRS $U_DISK_WEB $U_DISK_MAIL $U_DISK_DB $U_BANDWIDTH $U_WEB_DOMAINS $U_WEB_SSL $U_WEB_ALIASES $U_DNS_DOMAINS $U_DNS_RECORDS $U_MAIL_DOMAINS $U_MAIL_DKIM $U_MAIL_ACCOUNTS $U_DATABASES - $U_CRON_JOBS $U_BACKUPS $LANGUAGE $HOME $TIME $DATE' + $U_CRON_JOBS $U_BACKUPS $LANGUAGE $HOME $NOTIFICATIONS $TIME $DATE' # Listing user case $format in diff --git a/bin/v-list-user-notifications b/bin/v-list-user-notifications new file mode 100755 index 000000000..160cf815c --- /dev/null +++ b/bin/v-list-user-notifications @@ -0,0 +1,97 @@ +#!/bin/bash +# info: list user notifications +# options: USER [FORMAT] +# +# The function for getting the list notifications + + +#----------------------------------------------------------# +# Variable&Function # +#----------------------------------------------------------# + +# Argument defenition +user=$1 +format=${2-shell} + +# Includes +source $VESTA/func/main.sh + +# Json function +json_list_notifications() { + echo '{' + fileds_count=$(echo $fields| wc -w ) + while read line; do + eval $line + if [ -n "$data" ]; then + echo -e ' },' + fi + i=1 + IFS=' ' + for field in $fields; do + eval value=\"$field\" + value=$(echo "$value"|sed -e 's/"/\\"/g' -e "s/%quote%/'/g") + if [ $i -eq 1 ]; then + (( ++i)) + echo -e "\t\"$value\": {" + else + if [ $i -lt $fileds_count ]; then + (( ++i)) + echo -e "\t\t\"${field//$/}\": \"${value//,/, }\"," + else + echo -e "\t\t\"${field//$/}\": \"${value//,/, }\"" + data=1 + fi + fi + done + done < $conf + if [ -n "$data" ]; then + echo -e ' }' + fi + echo -e '}' +} + +# Shell function +shell_list_notifications() { + while read line ; do + eval $line + echo "$TOPIC" |sed -e "s/%quote%/'/g" + echo "$NOTICE" |sed -e "s/%quote%/'/g" + echo "$DATE $TIME" + echo "--" + echo + done < $conf +} + + +#----------------------------------------------------------# +# Verifications # +#----------------------------------------------------------# + +# Checking args +check_args '1' "$#" 'USER [FORMAT]' +validate_format 'user' +is_object_valid 'user' 'USER' "$user" + + +#----------------------------------------------------------# +# Action # +#----------------------------------------------------------# + +# Defining fileds to select +conf=$USER_DATA/notifications.conf +fields='$NID $TOPIC $NOTICE $TYPE $ACK $TIME $DATE' + +# Listing favourites +case $format in + json) json_list_notifications ;; + plain) shell_list_notifications ;; + shell) shell_list_notifications ;; + *) check_args '1' '0' 'USER [FORMAT]' +esac + + +#----------------------------------------------------------# +# Vesta # +#----------------------------------------------------------# + +exit From 0db0f4b9daab1e917ca7d647631efccbe8507eaa Mon Sep 17 00:00:00 2001 From: Demon_Goxa Date: Fri, 30 Oct 2015 00:01:51 +0300 Subject: [PATCH 143/264] Fix vst-install-debian.sh --- install/vst-install-debian.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/vst-install-debian.sh b/install/vst-install-debian.sh index b740e6c09..3baf90102 100755 --- a/install/vst-install-debian.sh +++ b/install/vst-install-debian.sh @@ -857,7 +857,7 @@ fi for pconf in $(find /etc/php* -name php.ini); do sed -i "s/;date.timezone =/date.timezone = $ZONE/g" $pconf sed -i 's%_open_tag = Off%_open_tag = On%g' $pconf -fi +done #----------------------------------------------------------# From d8adf4f8145420441966f9b93a0041e87c794a25 Mon Sep 17 00:00:00 2001 From: Demon_Goxa Date: Fri, 30 Oct 2015 00:03:19 +0300 Subject: [PATCH 144/264] Fix vst-install-rhel.sh --- install/vst-install-rhel.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/vst-install-rhel.sh b/install/vst-install-rhel.sh index 470c45ad2..5be5787c4 100755 --- a/install/vst-install-rhel.sh +++ b/install/vst-install-rhel.sh @@ -895,7 +895,7 @@ fi for pconf in $(find /etc/php* -name php.ini); do sed -i "s/;date.timezone =/date.timezone = $ZONE/g" $pconf sed -i 's%_open_tag = Off%_open_tag = On%g' $pconf -fi +done #----------------------------------------------------------# From 6338361ba0a05f5c97959a103c3b3fa8cbc34b5c Mon Sep 17 00:00:00 2001 From: Demon_Goxa Date: Fri, 30 Oct 2015 00:03:49 +0300 Subject: [PATCH 145/264] Fix vst-install-ubuntu.sh --- install/vst-install-ubuntu.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/vst-install-ubuntu.sh b/install/vst-install-ubuntu.sh index 6847da629..ef64440c0 100755 --- a/install/vst-install-ubuntu.sh +++ b/install/vst-install-ubuntu.sh @@ -849,7 +849,7 @@ fi for pconf in $(find /etc/php* -name php.ini); do sed -i "s/;date.timezone =/date.timezone = $ZONE/g" $pconf sed -i 's%_open_tag = Off%_open_tag = On%g' $pconf -fi +done #----------------------------------------------------------# From 45fd7dc75b91b2799bee7db1b9bc777858a9eb6b Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Fri, 30 Oct 2015 13:53:41 +0200 Subject: [PATCH 146/264] default backend --- bin/v-add-web-domain | 3 +++ bin/v-add-web-domain-backend | 2 +- func/main.sh | 2 +- web/add/firewall/index.php | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/bin/v-add-web-domain b/bin/v-add-web-domain index 8924d148d..87be95702 100755 --- a/bin/v-add-web-domain +++ b/bin/v-add-web-domain @@ -75,6 +75,9 @@ if [ ! -z "$WEB_BACKEND" ]; then fi get_domain_backend_values backend=$(get_user_value '$BACKEND_TEMPLATE') + if [ -z "$backend" ]; then + backend='default' + fi fi # Defining variables for add_config function diff --git a/bin/v-add-web-domain-backend b/bin/v-add-web-domain-backend index 66273e816..7787afbed 100755 --- a/bin/v-add-web-domain-backend +++ b/bin/v-add-web-domain-backend @@ -13,7 +13,7 @@ user=$1 domain=$2 domain_idn=$(idn -t --quiet -a "$domain") -template=$3 +template=${3-default} # Includes source $VESTA/func/main.sh diff --git a/func/main.sh b/func/main.sh index 2dd448f78..94f64e294 100644 --- a/func/main.sh +++ b/func/main.sh @@ -341,7 +341,7 @@ search_objects() { # Get user value get_user_value() { - grep "^${1//$/}=" $USER_DATA/user.conf| cut -f 2 -d \' + grep "^${1//$/}=" $USER_DATA/user.conf |awk -F "'" '{print $2}' } # Update user value in user.conf diff --git a/web/add/firewall/index.php b/web/add/firewall/index.php index 917da0671..caae650ce 100644 --- a/web/add/firewall/index.php +++ b/web/add/firewall/index.php @@ -26,7 +26,7 @@ if (!empty($_POST['ok'])) { // Check empty fields if (empty($_POST['v_action'])) $errors[] = __('action'); if (empty($_POST['v_protocol'])) $errors[] = __('protocol'); - if (empty($_POST['v_port'])) $errors[] = __('port'); + if (!isset($_POST['v_port'])) $errors[] = __('port'); if (empty($_POST['v_ip'])) $errors[] = __('ip address'); if (!empty($errors[0])) { foreach ($errors as $i => $error) { From b66f926af03e0df266829181a82218fdd1e3384a Mon Sep 17 00:00:00 2001 From: Daniel Ting Date: Fri, 30 Oct 2015 23:18:35 +1100 Subject: [PATCH 147/264] Forgotten RSA Private key? Going through the source, I cannot see any reason that this should exist; seems orphaned, old, and "Why Publish the PRIVATE KEY?". Perhaps some ancient private commits that didn't get cleaned ? --- web/ssl/demo.vestacp.com.key | 27 --------------------------- 1 file changed, 27 deletions(-) delete mode 100644 web/ssl/demo.vestacp.com.key diff --git a/web/ssl/demo.vestacp.com.key b/web/ssl/demo.vestacp.com.key deleted file mode 100644 index 0d54940ae..000000000 --- a/web/ssl/demo.vestacp.com.key +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEpAIBAAKCAQEAvOf5OhJH6Nc/QH8zhTXHtK4MvPe55ZHYhHa+ux9OZYRZVB2N -dvb84K62QpADY4vbEdLRsHEXXNmh6E5W0BmeH+euy21q1GNJHOJLuev+b++GpH9j -+B0ZuQIUhekRyX4rJeefIvybjvTPn8Aqda/aDonGqXMjCc2klyHg07nVmpSs8AjS -Eh953gPo8LiTxb8PjSrUKGB0DdWoNuK5itSFIXV+9B73q8EvgycpKhCHEzLjjeBW -dFB8fF6+lN6UPcobpR00BFNN7y9+dzjSekmMc2UZ7ehnRPozfgLEg6ND+5kT6FLb -4up9QHlUvokmpS32TdAhFcbjJ47wNSOA7TzWTQIDAQABAoIBAHPgdB/sINIyXylo -HalkAPnTHhs4dn7dBQzUblEIdiWNluIjMqi7/wiwAzs3bey9WIdJY7kw1hztnwSK -MXR7kmSN0MoWd0aLFMk0AzGsEqqFKnlzb1Y+O44iOYafHnsT+tHIj/R9McryXv3m -eeUxFrh+SS+eYerci07tyCT4RJAJ/3RjQvlpZbZEkS/EF4lgg+V87CNF2hYzVIS0 -obOXVMMl7TeAF56tJfFM2hjVS9lD7o7AmfpuMLirZ/HNscjx9MgUgPDTpCLQ+o5g -bV5QC5VdJtHKaH9H11CmOyl6FQp006dOzVfhxdblNSq8d9VYrLv3IF+j8MfvTxw1 -nVUj8P0CgYEA3AggZ/EuAWBDdks3y9vTnJVoaHDjrO9j7ldqWU3UONYjYPupCWXG -LPxfFnHwifQBW2Yp0GrGoRI1Nz8wvZ1Q9JvziaWDSWfbUP/VtEL1N8QDQDemfh+p -vQ48rMJ0cWtRQWloTDWiRJ6S57+bUcIlXfBhieZ7fsnrL092cUS/f58CgYEA28lO -GLQA5KdiS0cDTCrzDP2ZnfPhsHEv+M0hIbjiULKkwJZkOHfp2byRJYakoT9Dnjwo -3N1gFqGyXeCunI2P2yxu7HsYdDUsrK16IjRDhrwm2Yi0qQdBVBdC8EtCOpgdMbPw -j+bavowW4sdZ+Cdt1UiXJW2inkVTeMn7u/82spMCgYEA1QPNE7PrPQvL4/8IAoVM -RYBjtxDraiXMUhcw70oo1emCEMcyq9Vq2WxuRhWCsJuYoLq0aoCk0ZUGDflQH5Ho -qRc93Blvk6ZHLhCv/LcCHb3XA9mchufydQQOe5Y6Ev+5h6EbhwQ5l0MJp/DY1nsl -n98zHsUS8/lZhdDhMuFCn7MCgYAvEkobmFGopwCyRp86LOipG5dO8PChLVys2KID -6ujth5Upegw029nFvFEJzHBt6HK+7PuDchYmQrNEz94VwWvR8Q5Ar4xpNwo+YVkL -Ak6ECL/5TwICQX+IVwMLG9MvYWy/PF6FM1gd/zrXjwKB10/6ofVdGsH9S7O45ul3 -Ng2s6QKBgQDYFKzhN8vDDGhmhDIz0uAPaMkMUvsjFHvsuurboAHgLnOstXhc/M0N -t/AhI+TM+JewVoT6F4FGWOR6ykGn9F5N7e+rHfU+/6yloD4quDavV+4JWuJomRpC -QE0k8Pmgm3s5xo3kyb7J9h4l3b8MF2rXTzcqyG8UQMrSRjVUJ07scg== ------END RSA PRIVATE KEY----- From a69d2ebcfbf45f546a9080ed08c5358941b5a8f6 Mon Sep 17 00:00:00 2001 From: Daniel Ting Date: Fri, 30 Oct 2015 23:22:40 +1100 Subject: [PATCH 148/264] Delete (compromised?) cert As the assumed corresponding private key for this cert is now publicly available, this certificate should not be used. (in reference to my other pull request.) --- web/ssl/demo.vestacp.com.crt | 22 ---------------------- 1 file changed, 22 deletions(-) delete mode 100644 web/ssl/demo.vestacp.com.crt diff --git a/web/ssl/demo.vestacp.com.crt b/web/ssl/demo.vestacp.com.crt deleted file mode 100644 index 10df24b38..000000000 --- a/web/ssl/demo.vestacp.com.crt +++ /dev/null @@ -1,22 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDmjCCAoICCQCjpzusnGxWaDANBgkqhkiG9w0BAQUFADCBjjELMAkGA1UEBhMC -VVMxEjAQBgNVBAgMCUJlcmtzaGlyZTESMBAGA1UEBwwJV2VzdG5vcnRoMQ4wDAYD -VQQKDAVWZXN0YTELMAkGA1UECwwCSVQxGTAXBgNVBAMMEGRlbW8udmVzdGFjcC5j -b20xHzAdBgkqhkiG9w0BCQEWEGluZm9AdmVzdGFjcC5jb20wHhcNMTExMjE0MTky -NDU4WhcNMTIxMjEzMTkyNDU4WjCBjjELMAkGA1UEBhMCVVMxEjAQBgNVBAgMCUJl -cmtzaGlyZTESMBAGA1UEBwwJV2VzdG5vcnRoMQ4wDAYDVQQKDAVWZXN0YTELMAkG -A1UECwwCSVQxGTAXBgNVBAMMEGRlbW8udmVzdGFjcC5jb20xHzAdBgkqhkiG9w0B -CQEWEGluZm9AdmVzdGFjcC5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK -AoIBAQC85/k6Ekfo1z9AfzOFNce0rgy897nlkdiEdr67H05lhFlUHY129vzgrrZC -kANji9sR0tGwcRdc2aHoTlbQGZ4f567LbWrUY0kc4ku56/5v74akf2P4HRm5AhSF -6RHJfisl558i/JuO9M+fwCp1r9oOicapcyMJzaSXIeDTudWalKzwCNISH3neA+jw -uJPFvw+NKtQoYHQN1ag24rmK1IUhdX70HverwS+DJykqEIcTMuON4FZ0UHx8Xr6U -3pQ9yhulHTQEU03vL353ONJ6SYxzZRnt6GdE+jN+AsSDo0P7mRPoUtvi6n1AeVS+ -iSalLfZN0CEVxuMnjvA1I4DtPNZNAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAIft -cXO9VpxvdlItINllvy5jrOVYn/U8NKNO1TNcqeCQmg2PQHfx8WCK4q3RBVV5aAu4 -87h6aTMH1YnxZfMtpMSZZi2FVQgeZsXs86UJu0jYXU06DApyL3G28w2LDwO/m1cw -8xtMpofALyzmS/YKuGv5ptWCR57mw5a/5fyscWdFc3xgmZZxm/gO1o9pLcotVkLg -H8dHFcQlqQbp2ejmvJmBdCgkNtgjdrJSVYQGsL1Ja/53S82NQD5LgDBq81kcbvqF -ikD0BTAwKY6sETo3xCRxfno3A9ZTw7byk/QRl++qK02WrMnDVbcj1xeZR866QIfZ -plL7FfrMTcBCs1S0Hwc= ------END CERTIFICATE----- From 6fa8db714af6d290951a67034086aec75f8db65d Mon Sep 17 00:00:00 2001 From: System Void Date: Sat, 31 Oct 2015 19:48:18 +0000 Subject: [PATCH 149/264] Rename LICENSE.txt to LICENSE Not usually a .txt extension. --- LICENSE.txt => LICENSE | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename LICENSE.txt => LICENSE (100%) diff --git a/LICENSE.txt b/LICENSE similarity index 100% rename from LICENSE.txt rename to LICENSE From 790cedbe7932cdadea4fee6250093614de66ff30 Mon Sep 17 00:00:00 2001 From: ozgurbozkurt Date: Sun, 1 Nov 2015 01:40:05 +0300 Subject: [PATCH 150/264] Update tr.php --- web/inc/i18n/tr.php | 164 ++++++++++++++++++++++---------------------- 1 file changed, 82 insertions(+), 82 deletions(-) diff --git a/web/inc/i18n/tr.php b/web/inc/i18n/tr.php index 0a525c1ac..2240e3c26 100644 --- a/web/inc/i18n/tr.php +++ b/web/inc/i18n/tr.php @@ -496,97 +496,97 @@ $LANG['tr'] = array( 'Template Manager' => 'Şablon Yöneticisi', 'Backup Migration Manager' => 'Yedek Aktarma Yöneticisi', 'FileManager' => 'DosyaYöneticisi', - 'show: CPU / MEM / NET / DISK' => 'show: CPU / MEM / NET / DISK', + 'show: CPU / MEM / NET / DISK' => 'göster: CPU / BEL / AĞ / DISK', 'sort by' => 'sıralama ölçütü', 'Date' => 'Tarih', 'Starred' => 'Yıldızlı', 'Name' => 'İsim', - 'File Manager' => 'File Manager', - 'type' => 'type', - 'size' => 'size', - 'date' => 'date', - 'name' => 'name', - 'Initializing' => 'Initializing', - 'UPLOAD' => 'UPLOAD', - 'NEW FILE' => 'NEW FILE', - 'NEW DIR' => 'NEW DIR', - 'DELETE' => 'DELETE', - 'RENAME' => 'RENAME', - 'COPY' => 'COPY', - 'ARCHIVE' => 'ARCHIVE', - 'EXTRACT' => 'EXTRACT', - 'DOWNLOAD' => 'DOWNLOAD', + 'File Manager' => 'Dosya Yöneticisi', + 'type' => 'tip', + 'size' => 'boyut', + 'date' => 'tarih', + 'name' => 'isim', + 'Initializing' => 'Başlatılıyor', + 'UPLOAD' => 'YÜKLE', + 'NEW FILE' => 'YENİ DOSYA', + 'NEW DIR' => 'YENİ KLASÖR', + 'DELETE' => 'SİL', + 'RENAME' => 'YENİDEN ADLANDIR', + 'COPY' => 'KOPYALA', + 'ARCHIVE' => 'ARŞİVLE', + 'EXTRACT' => 'ÇIKART', + 'DOWNLOAD' => 'İNDİR', 'Hit' => 'Hit', - 'to reload the page' => 'to reload the page', - 'Directory name cannot be empty' => 'Directory name cannot be empty', - 'File name cannot be empty' => 'File name cannot be empty', - 'No file selected' => 'No file selected', - 'No file or folder selected' => 'No file or folder selected', - 'File type not supported' => 'File type not supported', - 'Directory download not available in current version' => 'Directory download not available in current version', - 'Directory not available' => 'Directory not available', - 'Done' => 'Done', - 'Close' => 'Close', - 'Copy' => 'Copy', - 'Cancel' => 'Cancel', - 'Rename' => 'Rename', - 'Delete' => 'Delete', - 'Extract' => 'Extract', - 'Create' => 'Create', - 'Compress' => 'Compress', - 'OK' => 'OK', - 'Are you sure you want to copy' => 'Are you sure you want to copy', - 'Are you sure you want to delete' => 'Are you sure you want to delete', + 'to reload the page' => 'sayfayı yenilemek için', + 'Directory name cannot be empty' => 'Dizin adı boş olamaz', + 'File name cannot be empty' => 'Dosya adı boş olamaz', + 'No file selected' => 'Dosya seçilmedi', + 'No file or folder selected' => 'Dosya veya klasör seçilmedi', + 'File type not supported' => 'Dosya tipi desteklenmiyor', + 'Directory download not available in current version' => 'Dizin indirme şuanki sürümde mevcut değil', + 'Directory not available' => 'Dizin geçerli değil', + 'Done' => 'Bitti', + 'Close' => 'Kapat', + 'Copy' => 'Kopyala', + 'Cancel' => 'Vazgeç', + 'Rename' => 'Yeniden Adlandır', + 'Delete' => 'Sil', + 'Extract' => 'Çıkart', + 'Create' => 'Oluştur', + 'Compress' => 'Sıkıştır', + 'OK' => 'TAMAM', + 'Are you sure you want to copy' => 'Kopyalamak istediğinizden emin misiniz', + 'Are you sure you want to delete' => 'Silmek istediğinizden emin misiniz', 'into' => 'into', - 'existing files will be replaced' => 'existing files will be replaced', - 'Original name' => 'Original name', - 'File' => 'File', - 'already exists' => 'already exists', - 'Create file' => 'Create file', - 'Create directory' => 'Create directory', + 'existing files will be replaced' => 'varolan dosyalar değiştirilir', + 'Original name' => 'Orijinal adı', + 'File' => 'Dosya', + 'already exists' => 'zaten var', + 'Create file' => 'Dosya oluştur', + 'Create directory' => 'Dizin oluştur', - 'Add New object' => 'Add New object', - 'Save Form' => 'Save Form', - 'Cancel saving form' => 'Cancel saving form', - 'Go to USER list' => 'Go to USER list', - 'Go to WEB list' => 'Go to WEB list', - 'Go to DNS list' => 'Go to DNS list', - 'Go to MAIL list' => 'Go to MAIL list', - 'Go to DB list' => 'Go to DB list', - 'Go to CRON list' => 'Go to CRON list', - 'Go to BACKUP list' => 'Go to BACKUP list', - 'Focus on search' => 'Focus on search', - 'Display/Close shortcuts' => 'Display/Close shortcuts', - 'Move backward through top menu' => 'Move backward through top menu', - 'Move forward through top menu' => 'Move forward through top menu', - 'Enter focused element' => 'Enter focused element', + 'Add New object' => 'Yeni Nesne Ekle', + 'Save Form' => 'Formu Kaydet', + 'Cancel saving form' => 'Formu kaydetmekten vazgeç', + 'Go to USER list' => 'KULLANICI listesine git', + 'Go to WEB list' => 'WEB listesine git', + 'Go to DNS list' => 'DNS listesine git', + 'Go to MAIL list' => 'MAIL listesine git', + 'Go to DB list' => 'DB listesine git', + 'Go to CRON list' => 'CRON listesine git', + 'Go to BACKUP list' => 'YEDEK listesine git', + 'Focus on search' => 'Aramaya odaklan', + 'Display/Close shortcuts' => 'Kısayolları görüntüle/kapat', + 'Move backward through top menu' => 'Üst menüden arasında geriye doğru git', + 'Move forward through top menu' => 'Üst menüden arasında ileriye doğru git', + 'Enter focused element' => 'Odaklanmış elemanı gir', - 'Upload' => 'Upload', - 'New File' => 'New File', - 'New Folder' => 'New Folder', - 'Download' => 'Download', - 'Rename' => 'Rename', - 'Copy' => 'Copy', - 'Archive' => 'Archive', - 'Delete' => 'Delete', - 'Save File (in text editor)' => 'Save File (in text editor)', - 'Close Popup / Cancel' => 'Close Popup / Cancel', - 'Move Cursor Up' => 'Move Cursor Up', - 'Move Cursor Dow' => 'Move Cursor Dow', - 'Switch to Left Tab' => 'Switch to Left Tab', - 'Switch to Right Tab' => 'Switch to Right Tab', - 'Switch Tab' => 'Switch Tab', - 'Go to the Top of File List' => 'Go to the Top of File List', - 'Go to the Last File' => 'Go to the Last File', - 'Open File/Enter Directory' => 'Open File/Enter Directory', - 'Go to Parent Directory' => 'Go to Parent Directory', - 'Select Current File' => 'Select Current File', - 'Select Bunch of Files' => 'Select Bunch of Files', - 'Append File to the Current Selection' => 'Append File to the Current Selection', - 'Select All Files' => 'Select All Files', + 'Upload' => 'Yükle', + 'New File' => 'Yeni Dosya', + 'New Folder' => 'Yeni Klasör', + 'Download' => 'İndir', + 'Rename' => 'Yeniden Adlandır', + 'Copy' => 'Kopyala', + 'Archive' => 'Arşivle', + 'Delete' => 'Sil', + 'Save File (in text editor)' => 'Dosyayı Kaydet (metin editöründe)', + 'Close Popup / Cancel' => 'Popup Kapat / Vazgeç', + 'Move Cursor Up' => 'İmleci Yukarı Hareket Ettir', + 'Move Cursor Dow' => 'İmleci Aşağı Hareket Ettir', + 'Switch to Left Tab' => 'Sol Sekmeye geçin', + 'Switch to Right Tab' => 'Sağ Sekmeye geçin', + 'Switch Tab' => 'Sekmeye geç', + 'Go to the Top of File List' => 'Dosya Listesinin Tepesine git', + 'Go to the Last File' => 'Son Dosyaya git', + 'Open File/Enter Directory' => 'Dosya Aç/Dizin Gir', + 'Go to Parent Directory' => 'Üst Dizine Git', + 'Select Current File' => 'Şuanki Dosyayı Seç', + 'Select Bunch of Files' => 'Dosya Demetini Seç', + 'Append File to the Current Selection' => 'Şuanki Seçime Dosya Ekle', + 'Select All Files' => 'Tüm Dosyaları Seç', 'shortcuts are inspired by magnificent GNU Midnight Commander file manager' => - 'shortcuts are inspired by magnificent GNU Midnight Commander file manager' + 'kısayollar muhteşem dosya yöneticisi Midnight Commander arayüzünden esinlenilmiştir' -); \ No newline at end of file +); From 60ebfe321abd466804e24ea2c084363be50ca2a0 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Mon, 2 Nov 2015 15:28:16 +0200 Subject: [PATCH 151/264] license manager --- bin/v-activate-vesta-license | 62 +++++++++++++ bin/v-check-vesta-license | 59 ++++++++++++ bin/v-deactivate-vesta-license | 61 +++++++++++++ web/css/styles.min.css | 53 +++++++---- web/delete/notification/index.php | 30 +++++++ web/edit/server/index.php | 65 +++++++++++++- web/js/app.js | 2 +- web/js/events.js | 52 +++++++++++ web/js/templates.js | 9 +- web/list/notifications/index.php | 45 ++++++++++ web/list/user/index.php | 1 + web/templates/admin/edit_server.html | 128 ++++++++++++++++++++++----- web/templates/footer.html | 14 +-- 13 files changed, 534 insertions(+), 47 deletions(-) create mode 100755 bin/v-activate-vesta-license create mode 100755 bin/v-check-vesta-license create mode 100755 bin/v-deactivate-vesta-license create mode 100644 web/delete/notification/index.php create mode 100644 web/list/notifications/index.php diff --git a/bin/v-activate-vesta-license b/bin/v-activate-vesta-license new file mode 100755 index 000000000..d3796a982 --- /dev/null +++ b/bin/v-activate-vesta-license @@ -0,0 +1,62 @@ +#!/bin/bash +# info: activate vesta license +# options: MODULE LICENSE +# +# The function activates and register vesta license + + +#----------------------------------------------------------# +# Variable&Function # +#----------------------------------------------------------# + +# Argument defenition +module=$(echo $1 | tr '[:lower:]' '[:upper:]') +license=$2 + +# Importing system enviroment +source /etc/profile + +# Includes +source $VESTA/func/main.sh +source $VESTA/conf/vesta.conf + + +#----------------------------------------------------------# +# Verifications # +#----------------------------------------------------------# + +# Checking arg number +check_args '2' "$#" 'MODULE LICENSE' + + +#----------------------------------------------------------# +# Action # +#----------------------------------------------------------# + +# Activating license +v_host='https://vestacp.com/checkout' +answer=$(curl -s $v_host/activate.php?licence_key=$license&module=$module) +check_result $? "cant' connect to vestacp.com " $E_CONNECT + +# Checking server answer +if [[ "$answer" != '0' ]]; then + echo "Error: $module license $license is invalid" + exit $E_INVALID +fi + + +#----------------------------------------------------------# +# Vesta # +#----------------------------------------------------------# + +# Updating vesta.conf +if [ -z "$(grep "${module}_KEY" $VESTA/conf/vesta.conf)" ]; then + echo "${module}_KEY='$license'" >> $VESTA/conf/vesta.conf +else + sed -i "s/${module}_KEY=.*/${module}_KEY='$license'/g" $VESTA/conf/vesta.conf +fi + +# Logging +log_event "$OK" "$EVENT" + +exit diff --git a/bin/v-check-vesta-license b/bin/v-check-vesta-license new file mode 100755 index 000000000..46aa40a7e --- /dev/null +++ b/bin/v-check-vesta-license @@ -0,0 +1,59 @@ +#!/bin/bash +# info: check vesta license +# options: [MODULE] +# +# The function activates and register vesta license + + +#----------------------------------------------------------# +# Variable&Function # +#----------------------------------------------------------# + +# Argument defenition +module=$(echo $1 | tr '[:lower:]' '[:upper:]') + +# Importing system enviroment +source /etc/profile + +# Includes +source $VESTA/func/main.sh +source $VESTA/conf/vesta.conf + + +#----------------------------------------------------------# +# Verifications # +#----------------------------------------------------------# + + +#----------------------------------------------------------# +# Action # +#----------------------------------------------------------# + +# Checking module +if [ -z "$module" ]; then + modules=$(grep _KEY= $VESTA/conf/vesta.conf) +else + modules=$(grep "${module}_KEY" $VESTA/conf/vesta.conf) +fi + +IFS=$'\n' +for str in $modules; do + module=$(echo "$str" |cut -f 1 -d _) + license=$(echo "$str" |cut -f 2 -d \') + if [ ! -z "$license" ]; then + v_host='https://vestacp.com/checkout' + answer=$(curl -s $v_host/check.php?licence_key=$license) + check_result $? "cant' connect to vestacp.com " 0 + if [[ "$answer" != '0' ]]; then + sed -i "s/${module}_KEY=.*/${module}_KEY=''/g" $VESTA/conf/vesta.conf + echo "deactivating $module" + fi + fi +done + + +#----------------------------------------------------------# +# Vesta # +#----------------------------------------------------------# + +exit diff --git a/bin/v-deactivate-vesta-license b/bin/v-deactivate-vesta-license new file mode 100755 index 000000000..c460cda6e --- /dev/null +++ b/bin/v-deactivate-vesta-license @@ -0,0 +1,61 @@ +#!/bin/bash +# info: deactivate vesta license +# options: MODULE LICENSE +# +# The function activates and register vesta license + + +#----------------------------------------------------------# +# Variable&Function # +#----------------------------------------------------------# + +# Argument defenition +module=$(echo $1 | tr '[:lower:]' '[:upper:]') +license=$2 + +# Importing system enviroment +source /etc/profile + +# Includes +source $VESTA/func/main.sh +source $VESTA/conf/vesta.conf + + +#----------------------------------------------------------# +# Verifications # +#----------------------------------------------------------# + +# Checking arg number +check_args '2' "$#" 'MODULE LICENSE' + + +#----------------------------------------------------------# +# Action # +#----------------------------------------------------------# + +# Activating license +v_host='https://vestacp.com/checkout' +answer=$(curl -s $v_host/cancel.php?licence_key=$license) +check_result $? "cant' connect to vestacp.com " $E_CONNECT +echo $answer + +# Checking server answer +if [[ "$answer" != '0' ]]; then + echo "Error: $module license $license is invalid" + exit $E_INVALID +fi + + +#----------------------------------------------------------# +# Vesta # +#----------------------------------------------------------# + +# Updating vesta.conf +if [ ! -z "$(grep "${module}_KEY" $VESTA/conf/vesta.conf)" ]; then + sed -i "s/${module}_KEY=.*/${module}_KEY=''/g" $VESTA/conf/vesta.conf +fi + +# Logging +log_event "$OK" "$EVENT" + +exit diff --git a/web/css/styles.min.css b/web/css/styles.min.css index bb5c3b3ec..2b126f6db 100644 --- a/web/css/styles.min.css +++ b/web/css/styles.min.css @@ -799,11 +799,6 @@ input[type="checkbox"] { background-color: #c4da5e; } .l-profile__notifications.updates { - background-position: -165px -135px; -} - -.l-profile__notifications.updates2 { -/* background-position: -202px -135px; */ background-position: -202px -157px; } @@ -820,32 +815,40 @@ input[type="checkbox"] { z-index: 21; font-size: 12px; padding: 0; - color: #9E9E9E; + color: #7f7f7f; } +.notification-container .unseen { + color: #ABABAB; +} + + .notification-container li { border-bottom: 1px solid #555; padding: 10px 15px 24px; } .notification-container .mark-seen { - background: rgba(0, 0, 0, 0) url("/images/sprite.png") repeat scroll -427px -486px; - border: 5px solid #454545; - border-radius: 12px; + background-color: #abc04b; + border: 2px solid #454545; + border-radius: 10px; cursor: pointer; - display: inline-block; + display: none; float: right; - height: 9px; - margin-right: -8px; - margin-top: -3px; - width: 9px; + height: 7px; + margin-right: -5px; + margin-top: 0; + width: 7px; } .notification-container .mark-seen:hover { background-color: #333; - border-color: #333; + border-color: #abc04b; } .notification-container .mark-seen:active { background-color: #777; border-color: #777; } +.notification-container .unseen .mark-seen{ + display: inline-block; +} .notification-container .title { color: #9e9e9e; font-weight: bold; @@ -870,7 +873,6 @@ input[type="checkbox"] { color: #dacf2e; } - .notification-container a { color: #5ABDB5;/* #eee;*/ } @@ -881,6 +883,21 @@ input[type="checkbox"] { color: #00C0C0; } +.notification-container .icon { + display: inline-block; + width: 0; +} +.notification-container .icon.filemanager { + display: inline-block; + width: 22px; + background: url("/images/flat_icons.png") repeat scroll -31px -100px; +} +.notification-container .icon.starred { + display: inline-block; + width: 21px; + background: url("/images/sprite.png") repeat scroll -184px 556px; +} + .l-stat { @@ -3001,6 +3018,10 @@ form#vstobjects.suspended { background-color: #5f9491; } +.description.cancel-success { + color: #8fac0a; + font-weight: bold; +} .description .licence { padding: 20px 0; diff --git a/web/delete/notification/index.php b/web/delete/notification/index.php new file mode 100644 index 000000000..fa3a14f10 --- /dev/null +++ b/web/delete/notification/index.php @@ -0,0 +1,30 @@ + \ +  ~!:TOPIC~!\ + ~!:NOTICE~!\ + ' + ] + }, // file manager // diff --git a/web/list/notifications/index.php b/web/list/notifications/index.php new file mode 100644 index 000000000..0130bb2ba --- /dev/null +++ b/web/list/notifications/index.php @@ -0,0 +1,45 @@ + $note){ + $note['ID'] = $key; + $data[$key] = $note; + } + echo json_encode($data); + exit(); +} + + + +$TAB = 'NOTIFICATIONS'; +// Header +include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html'); + +// Panel +top_panel($user,$TAB); + +// Data +exec (VESTA_CMD."v-list-user-notifications $user json", $output, $return_var); +$data = json_decode(implode('', $output), true); +$data = array_reverse($data,true); +if ($_SESSION['user'] == 'admin') { + include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_notifications.html'); +} else { + include($_SERVER['DOCUMENT_ROOT'].'/templates/user/list_notifications.html'); +} + +// Back uri +$_SESSION['back'] = $_SERVER['REQUEST_URI']; + +// Footer +include($_SERVER['DOCUMENT_ROOT'].'/templates/footer.html'); diff --git a/web/list/user/index.php b/web/list/user/index.php index 4e7e3e09d..129a78c4a 100644 --- a/web/list/user/index.php +++ b/web/list/user/index.php @@ -1,4 +1,5 @@         		- preview +
        - +
        - + + + + + + + @@ -732,5 +808,13 @@ $('.filemanager.description').hide(); } }); - }); + + $('select[name=v_sftp]').change(function(){ + if($(this).val() == 'yes'){ + $('.sftp.description').show(); + } else { + $('.sftp.description').hide(); + } + }); + }); \ No newline at end of file diff --git a/web/templates/footer.html b/web/templates/footer.html index 361b516da..08ca16d4d 100644 --- a/web/templates/footer.html +++ b/web/templates/footer.html @@ -383,13 +383,17 @@ }); $('.l-profile__notifications').click(function(){ - $('.notification-container').toggle(); - $('.l-profile__notifications').toggleClass('active'); + if(!$('.l-profile__notifications').hasClass('active')){ + VE.notifications.get_list(); + $('.l-profile__notifications').addClass('active'); + left = $('.l-profile__notifications').offset().left - $('.notification-container').outerWidth() + 28; + $('.notification-container').css({left: left+'px'}); - left = $('.l-profile__notifications').offset().left - $('.notification-container').outerWidth() + 28; - $('.notification-container').css({left: left+'px'}); + } else { + $('.notification-container').hide(); + $('.l-profile__notifications').removeClass('active'); + } }); - VE.navigation.init(); From 8cc1ddf10195adb51a83539f60b74fa88c2dd907 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Mon, 2 Nov 2015 15:31:36 +0200 Subject: [PATCH 152/264] filemanager fix --- web/css/file_manager_editor.css | 4 ++-- web/js/file_manager.js | 9 +++++++-- web/upload/UploadHandler.php | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/web/css/file_manager_editor.css b/web/css/file_manager_editor.css index f0800e777..858d0d167 100644 --- a/web/css/file_manager_editor.css +++ b/web/css/file_manager_editor.css @@ -28,8 +28,8 @@ input.save:active { border: 1px solid #FFCC00; background-color: #FFCC00; color: .ace_gutter, .ace_scroller { padding-top: 0px; } -.ace-twilight .ace_gutter-active-line { margin-top: 10px; } +/*.ace-twilight .ace_gutter-active-line { margin-top: 10px; } */ .ace_gutter-cell { color: #777; } -.ace_editor { font-size: 19px !important; } +.ace_editor { font-size: 17px !important; font-family: "Courier New", Courier, "Lucida Console", Monaco, monospace !important; } diff --git a/web/js/file_manager.js b/web/js/file_manager.js index ae3ab5df2..4e884eb7f 100644 --- a/web/js/file_manager.js +++ b/web/js/file_manager.js @@ -648,7 +648,12 @@ FM.generate_listing = function(reply, box) { o.filetype = FM.getFileType(o.name); if(FM.IMG_FILETYPES.indexOf(o.filetype) >= 0 && o.filetype.length > 0) { - FM.IMAGES[tab][FM.IMAGES[tab].length] = {'img': "/view/file/?path=/home/admin/"+o.name+"&raw=true", 'thumb': "/view/file/?path=/home/admin/"+o.name+"&raw=true", 'id': 'img-'+i}; + FM.IMAGES[tab][FM.IMAGES[tab].length++] = + { + 'img': "/view/file/?path="+o.full_path+"&raw=true", + 'thumb': "/view/file/?path="+o.full_path+"&raw=true", + 'id': 'img-'+i + }; cl_act = 'onClick="FM.fotoramaOpen(\'' + tab + '\', \'img-' + i +'\')"'; } @@ -717,7 +722,7 @@ FM.fotoramaOpen = function(tab, img_index) { }); $('.fotorama').on('fotorama:fullscreenexit', function (e, fotorama) { - $('.fotorama').data('fotorama').destroy(); + $('.fotorama').data('fotorama').destroy(); }); $('.fotorama').fotorama().data('fotorama').requestFullScreen(); diff --git a/web/upload/UploadHandler.php b/web/upload/UploadHandler.php index f26387eab..837b6f113 100755 --- a/web/upload/UploadHandler.php +++ b/web/upload/UploadHandler.php @@ -478,7 +478,7 @@ class UploadHandler } protected function sanitizeFileName($file) { - $file = preg_replace("/[^a-z0-9\._-]+/", '', $file); + $file = preg_replace("/[^A-Za-z0-9\._-]+/", '', $file); return $file; } From 045e9242f927e97b61647fab49a280f39637fc0c Mon Sep 17 00:00:00 2001 From: nguyenngocphuongnb Date: Tue, 3 Nov 2015 02:19:09 +0700 Subject: [PATCH 153/264] Add Vietnamese Language Add new language file for support Vietnamese language --- web/inc/i18n/vi.php | 468 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 468 insertions(+) create mode 100644 web/inc/i18n/vi.php diff --git a/web/inc/i18n/vi.php b/web/inc/i18n/vi.php new file mode 100644 index 000000000..70305d215 --- /dev/null +++ b/web/inc/i18n/vi.php @@ -0,0 +1,468 @@ + 'Gói hosting', + 'IP' => 'IP', + 'Graphs' => 'Theo dõi', + 'Statistics' => 'Thống kê', + 'Log' => 'Lịch sử', + 'Services' => 'Dịch vụ', + 'Firewall' => 'Tường lửa', + 'Updates' => 'Cập nhật', + 'Log in' => 'Đăng nhập', + 'Log out' => 'Thoát', + + 'USER' => 'Thành viên', + 'WEB' => 'WEB', + 'DNS' => 'DNS', + 'MAIL' => 'MAIL', + 'DB' => 'DB', + 'CRON' => 'CRON', + 'BACKUP' => 'Sao lưu', + + 'Add User' => 'Thêm tài khoản', + 'Add Domain' => 'Thêm tên miền', + 'Add Web Domain' => 'Thêm website', + 'Add DNS Domain' => 'Thêm DNS', + 'Add DNS Record' => 'Thêm bản ghi DNS', + 'Add Mail Domain' => 'Thêm miền mail', + 'Add Mail Account' => 'Thêm tài khoản mail', + 'Add Database' => 'Thêm CSDL', + 'Add Cron Job' => 'Thêm Cron Job', + 'Create Backup' => 'Tạo sao lưu', + 'Configure' => 'Cài đặt', + 'Restore All' => 'Khôi phục tất cả', + 'Add Package' => 'Thêm gói Hosting', + 'Add IP' => 'Thêm địa chỉ IP', + 'Add Rule' => 'Thêm luạt', + 'Ban IP Address' => 'Chặn địa chỉ IP', + 'Search' => 'Tìm kiếm', + 'Add one more FTP Account' => 'Thêm tài khoản FTP', + 'Overall Statistics' => 'Thống kê tổng quát', + 'Daily' => 'Hàng ngày', + 'Weekly' => 'Hàng tuần', + 'Monthly' => 'Hàng tháng', + 'Yearly' => 'Hàng năm', + 'Add' => 'Thêm', + 'Back' => 'Quay lại', + 'Save' => 'Lưu lại', + 'Submit' => 'Gửi', + + 'toggle all' => 'chọn cả', + 'apply to selected' => 'thực hiện cho mục đã chọn', + 'rebuild' => 'dựng lại', + 'rebuild web' => 'dựng lại web', + 'rebuild dns' => 'dựng lại dns', + 'rebuild mail' => 'dựng lại mail', + 'rebuild db' => 'dựng lại cơ sở dữ liệu', + 'rebuild cron' => 'dựng lại cron', + 'update counters' => 'cập nhật bộ đếm', + 'suspend' => 'đình chỉ', + 'unsuspend' => 'hủy đình chỉ', + 'delete' => 'xóa', + 'show per user' => 'hiển thị theo người dùng', + 'login as' => 'Đăng nhập như', + 'logout' => 'thoát', + 'edit' => 'sửa', + 'open webstats' => 'mở webstats', + 'view logs' => 'Xem lịch sử', + 'list records' => 'danh sách bản ghi %s', + 'add record' => 'thêm bản ghi', + 'list accounts' => 'danh sách tài khoản %s', + 'add account' => 'thêm tài khoản', + 'open webmail' => 'mở webmail', + 'list fail2ban' => 'danh sách fail2ban', + 'open %s' => 'mở %s', + 'download' => 'tải về', + 'restore' => 'khôi phục', + 'configure restore settings' => 'cài đặt cấu hình khôi phục', + 'stop' => 'dừng', + 'start' => 'bật', + 'restart' => 'khởi động lại', + 'update' => 'cập nhật', + 'generate' => 'tạo mới', + 'Generate CSR' => 'Tạo CSR', + 'reread IP' => 'đọc lại IP', + 'enable autoupdate' => 'bật tự động cập nhật', + 'disable autoupdate' => 'tắt tự động cập nhật', + 'turn on notifications' => 'bật thông báo', + 'turn off notifications' => 'tắt thông báo', + + 'Adding User' => 'Thêm tài khoản', + 'Editing User' => 'Sửa tài khoản', + 'Adding Domain' => 'Thêm tên miền', + 'Editing Domain' => 'Sửa tên miền', + 'Adding DNS Domain' => 'Thêm miền DNS', + 'Editing DNS Domain' => 'Sửa miền DNS', + 'Adding DNS Record' => 'Thêm bản ghi DNS', + 'Editing DNS Record' => 'Sửa bản ghi DNS', + 'Adding Mail Domain' => 'Thêm miền email', + 'Editing Mail Domain' => 'Sửa miền email', + 'Adding Mail Account' => 'Thêm tài khoản email', + 'Editing Mail Account' => 'Sửa tài khoản email', + 'Adding database' => 'Thêm CSDL', + 'Editing Cron Job' => 'Sửa Cron Job', + 'Adding Cron Job' => 'Thêm Cron Job', + 'Editing Database' => 'Sửa CSDL', + 'Adding Package' => 'Thêm gói hosting', + 'Editing Package' => 'Sửa gói hosting', + 'Adding IP address' => 'Thêm địa chỉ IP', + 'Editing IP Address' => 'Sửa địa chỉ IP', + 'Editing Backup Exclusions' => 'Sửa nội dung không sao lưu', + 'Generating CSR' => 'Tạo CSR', + 'Listing' => 'Danh sách', + 'Search Results' => 'Kết quả tìm kiếm', + 'Adding Firewall Rule' => 'Thêm luật tường lửa', + 'Editing Firewall Rule' => 'Sửa luật tường lửa', + 'Adding IP Address to Banlist' => 'Thêm địa chỉ IP vào danh sách hạn chế', + + 'active' => 'kích hoạt', + 'spnd' => 'đình chỉ', + 'suspended' => 'đình chỉ', + 'running' => 'đang chạy', + 'stopped' => 'đã dừng', + 'outdated' => 'đã hết hạn', + 'updated' => 'đã cập nhật', + + 'yes' => 'có', + 'no' => 'không', + 'none' => 'không có', + 'pb' => 'pb', + 'tb' => 'tb', + 'gb' => 'gb', + 'mb' => 'mb', + 'minute' => 'phút', + 'hour' => 'giờ', + 'day' => 'ngày', + 'days' => 'ngày', + 'hours' => 'giờ', + 'minutes' => 'phút', + 'month' => 'tháng', + 'package' => 'gói hosting', + 'Bandwidth' => 'Băng thông', + 'Disk' => 'Đĩa cứng', + 'Web' => 'Web', + 'Mail' => 'Mail', + 'Databases' => 'CSDL', + 'User Directories' => 'Thư mục người dùng', + 'Template' => 'Mẫu', + 'Web Template' => 'Mẫu Apache', + 'Proxy Template' => 'Mẫu Nginx', + 'DNS Template' => 'Mẫu DNS', + 'Web Domains' => 'Tên miền web', + 'SSL Domains' => 'Tên miền SSL', + 'Web Aliases' => 'Ánh xạ web', + 'per domain' => 'mỗi tên miền', + 'DNS Domains' => 'Miền DNS', + 'DNS Domains' => 'Miên DNS', + 'DNS records' => 'Bản ghi DNS' , + 'Name Servers' => 'Name Servers', + 'Mail Domains' => 'Miên Email', + 'Mail Accounts' => 'Tài khoản email', + 'Cron Jobs' => 'Cron Jobs', + 'SSH Access' => 'Truy cập SSH', + 'IP Addresses' => 'Địa chỉ IP', + 'Backups' => 'Sao lưu', + 'Backup System' => 'Sao lưu Hệ thống', + 'backup exclusions' => 'không sao lưu', + 'template' => 'mẫu', + 'SSL Support' => 'Hỗ trợ SSL', + 'SSL Home Directory' => 'Trang chủ SSL', + 'Proxy Support' => 'Hỗ trợ Nginx', + 'Proxy Extensions' => 'Phần mở rộng Nginx', + 'Web Statistics' => 'Thống kê Web', + 'Additional FTP Account' => 'Tài khoản FTP', + 'SOA' => 'SOA', + 'TTL' => 'TTL', + 'Expire' => 'Hết hạn', + 'Records' => 'Bản ghi', + 'Catchall email' => 'Lấy tất cả email', + 'AntiVirus Support' => 'Hỗ trợ chống virus', + 'AntiSpam Support' => 'Hỗ trợ chống spam', + 'DKIM Support' => 'Hỗ trợ DKIM', + 'Accounts' => 'Tài khoản', + 'Quota' => 'Chỉ tiêu', + 'Autoreply' => 'Tự động trả lời', + 'Forward to' => 'Chuyển tiếp đến', + 'Do not store forwarded mail' => 'Không lưu thư chuyển tiếp', + 'database' => 'csdl', + 'User' => 'Người dùng', + 'Host' => 'Host', + 'Charset' => 'Bảng mã', + 'Min' => 'Phút', + 'Hour' => 'Giờ', + 'Day' => 'Ngày', + 'Month' => 'Tháng', + 'Day of week' => 'Ngày trong tuần', + 'local' => 'địa phương', + 'Run Time' => 'Thời gian chạy', + 'Backup Size' => 'Kích thước bản sao lưu', + 'SYS' => 'Hệ thống', + 'Domains' => 'Tên miền', + 'Status' => 'Trạng thái', + 'shared' => 'chia sẻ', + 'dedicated' => 'dành riêng', + 'Owner' => 'Chủ sở hữu', + 'Users' => 'Người dùng', + 'Load Average' => 'Tải trung bình', + 'Memory Usage' => 'Sử dụng ram', + 'HTTPD Usage' => 'HTTPD sử dụng', + 'NGINX Usage' => 'NGINX sử dụng', + 'MySQL Usage on localhost' => 'MySQL sử dụng tại localhost', + 'PostgreSQL Usage on localhost' => 'PostgreSQL sử dụng tại localhost', + 'Bandwidth Usage eth0' => 'Băng thông eth0 sử dụng', + 'FTP Usage' => 'FTP sử dụng', + 'SSH Usage' => 'SSH sử dụng', + 'reverse proxy' => 'reverse proxy', + 'web server' => 'máy chủ web', + 'dns server' => 'máy chủ dns', + 'mail server' => 'máy chủ mail', + 'pop/imap server' => 'máy chủ pop/imap', + 'email antivirus' => 'chống virus mail', + 'email antispam' => 'chống spam mail', + 'database server' => 'máy chủ CSDL', + 'ftp server' => 'máy chủ FTP', + 'job scheduler' => 'việc lập lịch', + 'CPU' => 'CPU', + 'Memory' => 'Ram', + 'Uptime' => 'Thời gian sống', + 'core package' => 'gõi lõi', + 'php interpreter' => 'trình thông dịch php', + 'internal web server' => 'máy chủ web nội bộ', + 'Version' => 'Phiên bản', + 'Release' => 'Bản phát hành', + 'Architecture' => 'Kiến trúc', + 'Object' => 'Đối tượng', + 'Owner' => 'Chủ sở hữu', + 'Username' => 'Tên đăng nhập', + 'Password' => 'Mật khẩu', + 'Email' => 'Email', + 'Package' => 'Gói hosting', + 'Language' => 'Ngôn ngữ', + 'First Name' => 'Họ', + 'Last Name' => 'Tên', + 'Send login credentials to email address' => 'Gửi thông tin đăng nhập đến địa chỉ email', + 'Default Template' => 'Mẫu mặc định', + 'Default Name Servers' => 'Name Servers mặc định', + 'Domain' => 'Tên miền', + 'DNS Support' => 'Hỗ trỡ DNS', + 'Mail Support' => 'Hỗ trợ email', + 'Advanced options' => 'Cấu hình nâng cao', + 'Aliases' => 'Ánh xạ', + 'SSL Certificate' => 'Chứng chỉ SSL', + 'SSL Key' => 'SSL Key', + 'SSL Certificate Authority / Intermediate' => 'SSL Certificate Authority / Intermediate', + 'SSL CSR' => 'SSL CSR', + 'optional' => 'tùy chọn', + 'internal' => 'nội bộ', + 'Statistics Authorization' => 'Cấp phép thống kê', + 'Statistics Auth' => 'Xác thực thống kê', + 'Account' => 'Tài khoản', + 'Prefix will be automaticaly added to username' => 'Tiền tố %s sẽ được tự động thêm vào username', + 'Send FTP credentials to email' => 'Gửi thông tin FTP đến email', + 'Expiration Date' => 'Ngày hết hạn', + 'YYYY-MM-DD' => 'YYYY-MM-DD', + 'Name servers' => 'Name servers', + 'Record' => 'Bản ghi', + 'IP or Value' => 'IP hoặc giá trị', + 'Priority' => 'Độ ưu tiên', + 'Record Number' => 'Số bản ghi', + 'in megabytes' => 'tính bằng megabyte', + 'Message' => 'Tin nhắn', + 'use local-part' => 'sử dụng local-part', + 'one or more email addresses' => 'một hoặc nhiều địa chỉ email', + 'Prefix will be automaticaly added to database name and database user' => 'Tiền tố %s sẽ được tự động thêm vào tên csdl và người dùng csdl.', + 'Database' => 'CSDL', + 'Type' => 'Loại', + 'Minute' => 'Phút', + 'Command' => 'Lệnh', + 'Package Name' => 'Tên gói', + 'Netmask' => 'Netmask', + 'Interface' => 'Interface', + 'Shared' => 'Chia sẻ', + 'Assigned user' => 'Người dùng được chỉ định', + 'Assigned domain' => 'Tên miền được chỉ định', + 'NAT IP association' => 'Kết hợp NAT IP', + 'shell' => 'shell', + 'web domains' => 'tên miền web', + 'web aliases' => 'ánh xạ web', + 'dns records' => 'bản ghi dns', + 'mail domains' => 'miền email', + 'mail accounts' => 'tài khoản email', + 'accounts' => 'tài khoản', + 'databases' => 'csdl', + 'cron jobs' => 'cron jobs', + 'backups' => 'sao lưu', + 'quota' => 'hạn mức', + 'day of week' => 'ngày trong tuần', + 'cmd' => 'cmd', + 'users' => 'người dùng', + 'domains' => 'tên miền', + 'aliases' => 'ánh xạ', + 'records' => 'bản ghi', + 'jobs' => 'công việc', + 'username' => 'tên tài khoản', + 'password' => 'mật khẩu', + 'type' => 'loại', + 'charset' => 'bộ ký tự', + 'domain' => 'tên miền', + 'ip' => 'ip', + 'ip address' => 'địa chỉ ip', + 'IP address' => 'Địa chỉ IP', + 'netmask' => 'netmask', + 'interface' => 'Giao tiếp', + 'assigned user' => 'người dùng đơ]cj chỉ định', + 'ns1' => 'ns1', + 'ns2' => 'ns2', + 'user' => 'tài khoản', + 'email' => 'email', + 'first name' => 'họ', + 'last name' => 'tên', + 'account' => 'tài khoản', + 'ssl certificate' => 'chứng chỉ ssl', + 'ssl key' => 'ssl key', + 'stats user password' => 'số liệu mật khẩu người dùng', + 'stats username' => 'số liệu người dùng', + 'stats password' => 'số liệu mật khẩu', + 'ftp user password' => 'mật khẩu người dùng ftp', + 'ftp user' => 'người dùng ftp', + 'Last 70 lines of %s.%s.log' => '70 dòng cuối của %s.%s.log', + 'Download AccessLog' => 'Tải lịch sử truy cập', + 'Download ErrorLog' => 'Tải lịch sử lỗi', + 'Country' => 'quốc gia', + '2 letter code' => 'mã 2 kí tự', + 'State / Province' => 'Bang / Tỉnh', + 'City / Locality' => 'Thành phố / Địa bàn', + 'Organization' => 'Tổ chức', + 'Action' => 'Hành động', + 'Protocol' => 'Giao thức', + 'Port' => 'Cổng', + 'Comment' => 'Bình luật', + 'Banlist' => 'Danh sách chặn', + 'ranges are acceptable' => 'chấp nhận phạm vi', + 'CIDR format is supported' => 'định dạng CIDR được hỗ trợ', + + '1 account' => '1 tài khoản', + '%s accounts' => '%s tài khoản', + '1 domain' => '1 tên miền', + '%s domains' => '%s tên miền', + '1 record' => '1 bản ghi', + '%s records' => '%s bản ghi', + '1 mail account' => '1 tài khoản email', + '%s mail accounts' => '%s tài khoản email', + '1 database' => '1 CSDL', + '%s databases' => '%s CSDL', + '1 cron job' => '1 cron job', + '%s cron jobs' => '%s cron jobs', + '1 archive' => '1 lưu trữ', + '%s archives' => '%s lưu trữ', + '1 package' => '1 gói hosting', + '%s packages' => '%s gói hosting', + '1 IP address' => '1 địa chỉ IP', + '%s IP addresses' => '%s địa chỉ IP', + '1 month' => '1 tháng', + '%s months' => '%s tháng', + '1 log record' => '1 bản ghi lịch sử', + '%s log records' => '%s bản ghi lịch sử', + '1 object' => '1 đối tượng', + '%s objects' => '%s đối tượng', + 'no exclusions' => 'không loại trừ', + '1 rule' => '1 luật', + '%s rules' => '%s luật', + 'There are no currently banned IP' => 'Hiện tại không có IP nào bị chặn', + + 'USER_CREATED_OK' => 'Tài khoản %s đã được tạo thành công.', + 'WEB_DOMAIN_CREATED_OK' => 'Tên miền %s đã được tạo thành công.', + 'DNS_DOMAIN_CREATED_OK' => 'Miền DNS %s đã được tạo thành công.', + 'DNS_RECORD_CREATED_OK' => 'Bản ghi %s.%s đã được tạo thành công.', + 'MAIL_DOMAIN_CREATED_OK' => 'Miền email %s đã được tạo thành công.', + 'MAIL_ACCOUNT_CREATED_OK' => 'Tài khoản email %s@%s đã được tạo thành công.', + 'DATABASE_CREATED_OK' => 'CSDL %s đã được tạo thành công.', + 'CRON_CREATED_OK' => 'Tiến trình tự động đã được tạo thành công.', + 'IP_CREATED_OK' => 'Địa chỉ IP %s đã được tạo thành công.', + 'PACKAGE_CREATED_OK' => 'Gói hosting %s đã được tạo thành công.', + 'SSL_GENERATED_OK' => 'Tạo thành công chứng chỉ.', + 'RULE_CREATED_OK' => 'Tạo thành công luật tường lửa.', + 'Autoupdate has been successfully enabled' => 'Bật thành công chế độ tự động cập nhật.', + 'Autoupdate has been successfully disabled' => 'Tắt thành công chế độ tự động cập nhật.', + 'Cronjob email reporting has been successfully enabled' => 'Bật thành công tiến trình tự động báo cáo email', + 'Cronjob email reporting has been successfully disabled' => 'Tắt thành công tiến trình tự động báo cáo email', + 'Changes has been saved.' => 'Thay đổi đã được lưu.', + 'Confirmation' => 'Xác nhận', + 'DELETE_USER_CONFIRMATION' => 'Bạn có chắc chắn muốn xóa tài khoản %s?', + 'SUSPEND_USER_CONFIRMATION' => 'Bạn có chắc chắn muốn đình chỉ tài khoản %s?', + 'UNSUSPEND_USER_CONFIRMATION' => 'Bạn có chắc chắn muốn kích hoạt tài khoản %s?', + 'DELETE_DOMAIN_CONFIRMATION' => 'Bạn có chắc chắn muốn xóa tên miền %s?', + 'SUSPEND_DOMAIN_CONFIRMATION' => 'Bạn có chắc chắn muốn đình chỉ tên miền %s?', + 'UNSUSPEND_DOMAIN_CONFIRMATION' => 'Bạn có chắc chắn muốn kích hoạt tên miền %s?', + 'DELETE_RECORD_CONFIRMATION' => 'Bạn có chắc chắn muốn xóa bản ghi %s?', + 'SUSPEND_RECORD_CONFIRMATION' => 'Bạn có chắc chắn muốn đình chỉ bản ghi %s?', + 'UNSUSPEND_RECORD_CONFIRMATION' => 'Bạn có chắc chắn muốn kích hoạt bản ghi %s?', + 'DELETE_MAIL_ACCOUNT_CONFIRMATION' => 'Bạn có chắc chắn muốn xóa %s?', + 'SUSPEND_MAIL_ACCOUNT_CONFIRMATION' => 'Bạn có chắc chắn muốn đình chỉ %s?', + 'UNSUSPEND_MAIL_ACCOUNT_CONFIRMATION' => 'Bạn có chắc chắn muốn kích hoạt %s?', + 'DELETE_DATABASE_CONFIRMATION' => 'Bạn có chắc chắn muốn xóa CSDL %s?', + 'SUSPEND_DATABASE_CONFIRMATION' => 'Bạn có chắc chắn muốn đình chỉ CSDL %s?', + 'UNSUSPEND_DATABASE_CONFIRMATION' => 'Bạn có chắc chắn muốn kích hoạt CSDL %s?', + 'DELETE_CRON_CONFIRMATION' => 'Bạn có chắc chắn muốn xóa tiến trình tự động?', + 'SUSPEND_CRON_CONFIRMATION' => 'Bạn có chắc chắn muốn đình chỉ tiến trình tự động?', + 'UNSUSPEND_CRON_CONFIRMATION' => 'Bạn có chắc chắn muốn kích hoạt tiến trình tự động?', + 'DELETE_BACKUP_CONFIRMATION' => 'Bạn có chắc chắn muốn xóa bản sao lưu %s?', + 'DELETE_EXCLUSION_CONFIRMATION' => 'Bạn có chắc chắn muốn xóa loại trừ %s?', + 'DELETE_PACKAGE_CONFIRMATION' => 'Bạn có chắc chắn muốn xóa gói %s?', + 'DELETE_IP_CONFIRMATION' => 'Bạn có chắc chắn muốn xóa địa chỉ IP %s?', + 'DELETE_RULE_CONFIRMATION' => 'Bạn có chắc chắn muốn xóa luật #%s?', + 'SUSPEND_RULE_CONFIRMATION' => 'Bạn có chắc chắn muốn đình chỉ luật #%s?', + 'UNSUSPEND_RULE_CONFIRMATION' => 'Bạn có chắc chắn muốn kích hoạt luật #%s?', + 'RESTART_CONFIRMATION' => 'Bạn có chắc chắn muốn khởi động lại %s?', + 'Welcome' => 'Xin chào', + 'LOGGED_IN_AS' => 'Đăng nhập với tài khoản %s', + 'Error' => 'Lôi', + 'Invalid username or password' => 'Sai tên đăng nhập hoặc mật khẩu.', + 'Invalid username or code' => 'Sai tên đăng nhập hoặc mã.', + 'Passwords not match' => 'Mật khẩu không khớp.', + 'Please enter valid email address.' => 'Vui lòng điền đúng địa chỉ email.', + 'Field "%s" can not be blank.' => 'Trường "%s" không thể để trống.', + 'Password is too short.' => 'Mật khẩu quá ngắn (tối thiểu 6 ký tự)', + 'Error code:' => 'Mã lỗi: %s', + 'SERVICE_ACTION_FAILED' => '"%s" "%s" thất bại', + 'IP address is in use' => 'Địa chỉ IP đang được sử dụng', + 'BACKUP_SCHEDULED' => 'Tiến trình đã được thêm vào hàng đợi. Bạn sẽ nhận được email thông báo khi bản sao lưu đã sẵn sàng để tải về.', + 'BACKUP_EXISTS' => 'Một bản sao lưu khác đang được tạo. Vui lòng chờ đến khi bản sao lưu đó được tạo xong.', + 'RESTORE_SCHEDULED' => 'Tiến trình đã được thêm vào hàng đợi. Bạn sẽ nhận được email thông báo khi tiến trình khôi phục hoàn thành.', + 'RESTORE_EXISTS' => 'Một tiến trình khôi phục đang được chạy. Vui lòng chờ kết thúc trước khi thực hiện lại.', + + 'WEB_EXCLUSIONS' => "Điền tên miền, mỗi dòng một tên miền. Để loại bỏ tất cả tên miền, sử dụng ký tự *. Để loại bỏ một thư mục đặc biệt vui lòng sử dụng định sạng sau: domain.com:public_html/cache:public_html/tmp", + 'DNS_EXCLUSIONS' => "Điền tên miền, mỗi dòng một tên miền. Để loại bỏ tất cả tên miền, sử dụng ký tự *", + 'MAIL_EXCLUSIONS' => "Điền tên miền, mỗi dòng một tên miền. Để loại bỏ tất cả tên miền, sử dụng ký tự *. Để loại bỏ một thư mục đặc biệt vui lòng sử dụng định sạng sau: domain.com:info:support:postmaster", + 'DB_EXCLUSIONS' => "Điền đầy đủ tên CSDL, mỗi CSDL một dòng. Để loại bỏ tất cả CSDL, sử dụng ký tự *", + 'CRON_EXCLUSIONS' => "Để loại bỏ tất cả tiến trình, sử dụng ký tự *", + 'USER_EXCLUSIONS' => "Điền tên thư mục, mỗi thư mục một dòng. Để loại bỏ tất cả thư mục, sử dụng ký tự *", + + 'Welcome to Vesta Control Panel' => 'Chào mứng đến Vesta Control Panel', + 'MAIL_FROM' => 'Vesta Control Panel ', + 'GREETINGS_GORDON_FREEMAN' => "Xin chào, %s %s,\n", + 'GREETINGS' => "Hello,\n", + 'ACCOUNT_READY' => "Tài khoản của bạn đã được tạo thành công và sẵn sàng để sử dụng.\n\nhttps://%s/login/\nTên đăng nhập: %s\nMật khẩu: %s\n\n--\nVesta Control Panel\n", + + 'FTP login credentials' => 'Thông tin đăng nhập FTP', + 'FTP_ACCOUNT_READY' => "Tài khoản FTP của bạn đã được tạo thành công và sẵn sàng để sử dụng.\n\nHostname: %s\nTên đăng nhập: %s_%s\nMật khẩu: %s\n\n--\nVesta Control Panel\n", + + 'Database Credentials' => 'Thông tin CSDL', + 'DATABASE_READY' => "Tạo thành công CSDL.\n\nDatabase: %s\nNgười dùng: %s\nMật khẩu: %s\n%s\n\n--\nVesta Control Panel\n", + + 'forgot password' => 'quên mật khẩu', + 'Confirm' => 'Xác nhận', + 'New Password' => 'Mật khẩu mới', + 'Confirm Password' => 'Xác nhận mật khẩu', + 'Reset' => 'Thiết lập lại', + 'Reset Code' => 'Thiết lập lại mã', + 'RESET_NOTICE' => '', + 'RESET_CODE_SENT' => 'Mã thiết lập lại mật khẩu đã được gửi đến địa chỉ email
        ', + 'MAIL_RESET_SUBJECT' => 'Khôi phục mật khẩu tại %s', + 'PASSWORD_RESET_REQUEST' => "Để thiết lập lại mật khẩu quản trị, vui lòng truy cập vào địa chỉ:\nhttps://%s/reset/?action=confirm&user=%s&code=%s\n\nAlternatively, you may go to https://%s/reset/?action=code&user=%s và nhập mã sau:\n%s\n\nNếu bạn không thực hiện khôi phục mật khẩu, vui lòng bỏ qua email này.\n\n--\nVesta Control Panel\n", +); From 408f8f3c2f579186f9394081a3b811be02ae8c4b Mon Sep 17 00:00:00 2001 From: nguyenngocphuongnb Date: Tue, 3 Nov 2015 02:24:23 +0700 Subject: [PATCH 154/264] Translate phrase "Cron job" into Vietnamese words --- web/inc/i18n/vi.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/web/inc/i18n/vi.php b/web/inc/i18n/vi.php index 70305d215..04aecc4e8 100644 --- a/web/inc/i18n/vi.php +++ b/web/inc/i18n/vi.php @@ -32,7 +32,7 @@ $LANG['vi'] = array( 'Add Mail Domain' => 'Thêm miền mail', 'Add Mail Account' => 'Thêm tài khoản mail', 'Add Database' => 'Thêm CSDL', - 'Add Cron Job' => 'Thêm Cron Job', + 'Add Cron Job' => 'Thêm Tiến trình tự động', 'Create Backup' => 'Tạo sao lưu', 'Configure' => 'Cài đặt', 'Restore All' => 'Khôi phục tất cả', @@ -105,8 +105,8 @@ $LANG['vi'] = array( 'Adding Mail Account' => 'Thêm tài khoản email', 'Editing Mail Account' => 'Sửa tài khoản email', 'Adding database' => 'Thêm CSDL', - 'Editing Cron Job' => 'Sửa Cron Job', - 'Adding Cron Job' => 'Thêm Cron Job', + 'Editing Cron Job' => 'Sửa Tiến trình tự động', + 'Adding Cron Job' => 'Thêm Tiến trình tự động', 'Editing Database' => 'Sửa CSDL', 'Adding Package' => 'Thêm gói hosting', 'Editing Package' => 'Sửa gói hosting', @@ -163,7 +163,7 @@ $LANG['vi'] = array( 'Name Servers' => 'Name Servers', 'Mail Domains' => 'Miên Email', 'Mail Accounts' => 'Tài khoản email', - 'Cron Jobs' => 'Cron Jobs', + 'Cron Jobs' => 'Tiến trình tự động', 'SSH Access' => 'Truy cập SSH', 'IP Addresses' => 'Địa chỉ IP', 'Backups' => 'Sao lưu', @@ -295,7 +295,7 @@ $LANG['vi'] = array( 'mail accounts' => 'tài khoản email', 'accounts' => 'tài khoản', 'databases' => 'csdl', - 'cron jobs' => 'cron jobs', + 'cron jobs' => 'Tiến trình tự động', 'backups' => 'sao lưu', 'quota' => 'hạn mức', 'day of week' => 'ngày trong tuần', @@ -356,8 +356,8 @@ $LANG['vi'] = array( '%s mail accounts' => '%s tài khoản email', '1 database' => '1 CSDL', '%s databases' => '%s CSDL', - '1 cron job' => '1 cron job', - '%s cron jobs' => '%s cron jobs', + '1 cron job' => '1 Tiến trình tự động', + '%s cron jobs' => '%s Tiến trình tự động', '1 archive' => '1 lưu trữ', '%s archives' => '%s lưu trữ', '1 package' => '1 gói hosting', From b15b5e5cbd2beffa948be2fd94b5994b86b9cdd1 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Tue, 3 Nov 2015 00:58:39 +0200 Subject: [PATCH 155/264] fixes for license manager --- bin/v-activate-vesta-license | 5 +++++ bin/v-check-vesta-license | 10 +++++++--- bin/v-deactivate-vesta-license | 6 +++++- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/bin/v-activate-vesta-license b/bin/v-activate-vesta-license index d3796a982..4774e9288 100755 --- a/bin/v-activate-vesta-license +++ b/bin/v-activate-vesta-license @@ -56,6 +56,11 @@ else sed -i "s/${module}_KEY=.*/${module}_KEY='$license'/g" $VESTA/conf/vesta.conf fi +# Activating sftpjail +if [ "$module" = 'SFTPJAIL' ]; then + setsid $BIN/v-add-sys-sftp-jail 2>/dev/null +fi + # Logging log_event "$OK" "$EVENT" diff --git a/bin/v-check-vesta-license b/bin/v-check-vesta-license index 46aa40a7e..74dd8327f 100755 --- a/bin/v-check-vesta-license +++ b/bin/v-check-vesta-license @@ -42,11 +42,15 @@ for str in $modules; do license=$(echo "$str" |cut -f 2 -d \') if [ ! -z "$license" ]; then v_host='https://vestacp.com/checkout' - answer=$(curl -s $v_host/check.php?licence_key=$license) + answer=$(curl -s "$v_host/check.php?licence_key=$license&module=$module") check_result $? "cant' connect to vestacp.com " 0 + echo "$module $license $answer" if [[ "$answer" != '0' ]]; then - sed -i "s/${module}_KEY=.*/${module}_KEY=''/g" $VESTA/conf/vesta.conf - echo "deactivating $module" + if [ "$module" = 'SFTPJAIL' ]; then + setsid $BIN/v-delete-sys-sftp-jail 2>/dev/null + fi + sed -i "s/${module}_KEY=.*/${module}_KEY=''/g" \ + $VESTA/conf/vesta.conf fi fi done diff --git a/bin/v-deactivate-vesta-license b/bin/v-deactivate-vesta-license index c460cda6e..4cbf0cc97 100755 --- a/bin/v-deactivate-vesta-license +++ b/bin/v-deactivate-vesta-license @@ -37,7 +37,6 @@ check_args '2' "$#" 'MODULE LICENSE' v_host='https://vestacp.com/checkout' answer=$(curl -s $v_host/cancel.php?licence_key=$license) check_result $? "cant' connect to vestacp.com " $E_CONNECT -echo $answer # Checking server answer if [[ "$answer" != '0' ]]; then @@ -55,6 +54,11 @@ if [ ! -z "$(grep "${module}_KEY" $VESTA/conf/vesta.conf)" ]; then sed -i "s/${module}_KEY=.*/${module}_KEY=''/g" $VESTA/conf/vesta.conf fi +# Deactivating sftpjail +if [ "$module" = 'SFTPJAIL' ]; then + setsid $BIN/v-delete-sys-sftp-jail 2>/dev/null +fi + # Logging log_event "$OK" "$EVENT" From 6626ba34bf420fd9e6467bf535da5845eff8d6ba Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Tue, 3 Nov 2015 01:00:44 +0200 Subject: [PATCH 156/264] Firewall support enable/disable --- bin/v-add-sys-firewall | 57 +++++++++++++++++++++++++++++++++++++++ bin/v-delete-sys-firewall | 48 +++++++++++++++++++++++++++++++++ 2 files changed, 105 insertions(+) create mode 100755 bin/v-add-sys-firewall create mode 100755 bin/v-delete-sys-firewall diff --git a/bin/v-add-sys-firewall b/bin/v-add-sys-firewall new file mode 100755 index 000000000..47676e9e8 --- /dev/null +++ b/bin/v-add-sys-firewall @@ -0,0 +1,57 @@ +#!/bin/bash +# info: add system firewall +# opions: NONE +# +# The script enables firewall + + +#----------------------------------------------------------# +# Variable&Function # +#----------------------------------------------------------# + +# Includes +source $VESTA/func/main.sh +source $VESTA/conf/vesta.conf + + +#----------------------------------------------------------# +# Verifications # +#----------------------------------------------------------# + +if [ "$FIREWALL_SYSTEM" = 'iptables' ]; then + exit +fi + + +#----------------------------------------------------------# +# Action # +#----------------------------------------------------------# + +# Adding firewall directory +mkdir -p $VESTA/data/firewall/ + +# Adding default ruleset +if [ ! -e "$VESTA/data/firewall/rules.conf" ]; then + cp $VESTA/install/rhel/7/* $VESTA/data/firewall/ +fi + +# Updating FIREWAL_SYSTEM value +if [ -z "$(grep FIREWALL_SYSTEM $VESTA/conf/vesta.conf)" ]; then + echo "FIREWALL_SYSTEM='iptables'" >> $VESTA/conf/vesta.conf +else + sed -i "s/FIREWALL_SYSTEM.*/FIREWALL_SYSTEM='iptables'/g" \ + $VESTA/conf/vesta.conf +fi + +# Updating firewall rules +$BIN/v-update-firewall + + +#----------------------------------------------------------# +# Vesta # +#----------------------------------------------------------# + +# Logging +log_event "$OK" "$EVENT" + +exit diff --git a/bin/v-delete-sys-firewall b/bin/v-delete-sys-firewall new file mode 100755 index 000000000..e1f512401 --- /dev/null +++ b/bin/v-delete-sys-firewall @@ -0,0 +1,48 @@ +#!/bin/bash +# info: delete system firewall +# opions: NONE +# +# The script disables firewall support + + +#----------------------------------------------------------# +# Variable&Function # +#----------------------------------------------------------# + +# Includes +source $VESTA/func/main.sh +source $VESTA/conf/vesta.conf + + +#----------------------------------------------------------# +# Verifications # +#----------------------------------------------------------# + +if [ -z "$FIREWALL_SYSTEM" ]; then + exit +fi + + +#----------------------------------------------------------# +# Action # +#----------------------------------------------------------# + +# Stopping firewall +$BIN/v-stop-firewall + +# Updating FIREWALL_SYSTEM value +if [ -z "$(grep FIREWALL_SYSTEM $VESTA/conf/vesta.conf)" ]; then + echo "FIREWALL_SYSTEM=''" >> $VESTA/conf/vesta.conf +else + sed -i "s/FIREWALL_SYSTEM=.*/FIREWALL_SYSTEM=''/g" $VESTA/conf/vesta.conf +fi + + +#----------------------------------------------------------# +# Vesta # +#----------------------------------------------------------# + +# Logging +log_event "$OK" "$EVENT" + +exit From ac3ed7b0812850f2782099bc932820a989775993 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Tue, 3 Nov 2015 01:01:05 +0200 Subject: [PATCH 157/264] license checker --- bin/v-backup-users | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bin/v-backup-users b/bin/v-backup-users index efac63787..a7867632a 100755 --- a/bin/v-backup-users +++ b/bin/v-backup-users @@ -22,6 +22,8 @@ source $VESTA/conf/vesta.conf # Action # #----------------------------------------------------------# +$BIN/v-check-vesta-license >/dev/null + if [ -z "$BACKUP_SYSTEM" ]; then exit fi From 98e6fec79545d2ebe839d4856c83f917bbb5b3a8 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Tue, 3 Nov 2015 01:01:27 +0200 Subject: [PATCH 158/264] fix for netmask --- bin/v-delete-firewall-ban | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bin/v-delete-firewall-ban b/bin/v-delete-firewall-ban index 468b58c5b..c81dfe680 100755 --- a/bin/v-delete-firewall-ban +++ b/bin/v-delete-firewall-ban @@ -45,7 +45,8 @@ if [ -z "$check_ip" ]; then fi # Deleting ip from banlist -sed -i "/IP='$ip' CHAIN='$chain'/d" $conf +sip=$(echo "$ip"| sed "s|/|\\\/|g") +sed -i "/IP='$sip' CHAIN='$chain'/d" $conf b=$($iptables -L fail2ban-$chain --line-number -n|grep $ip|awk '{print $1}') $iptables -D fail2ban-$chain $b 2>/dev/null From 9ce85c8bc69d0d66d19e5568eac48c74a118f33e Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Tue, 3 Nov 2015 01:01:52 +0200 Subject: [PATCH 159/264] removed check for smooth deactivation --- bin/v-delete-sys-sftp-jail | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/v-delete-sys-sftp-jail b/bin/v-delete-sys-sftp-jail index ef4292ef8..3e10f9329 100755 --- a/bin/v-delete-sys-sftp-jail +++ b/bin/v-delete-sys-sftp-jail @@ -22,9 +22,9 @@ source $VESTA/conf/vesta.conf # Verifications # #----------------------------------------------------------# -if [ -z "$SFTPJAIL_KEY" ]; then - exit -fi +#if [ -z "$SFTPJAIL_KEY" ]; then +# exit +#fi #----------------------------------------------------------# From 899b3d282bd289d90d86ef5556c302fa74911b18 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Tue, 3 Nov 2015 01:07:12 +0200 Subject: [PATCH 160/264] file manager fixes --- web/css/styles.min.css | 2 +- web/edit/file/index.php | 11 +++++++++++ web/templates/file_manager/main.php | 9 ++++++--- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/web/css/styles.min.css b/web/css/styles.min.css index 2b126f6db..4f3346397 100644 --- a/web/css/styles.min.css +++ b/web/css/styles.min.css @@ -2250,7 +2250,7 @@ div.l-content > div.l-separator:nth-of-type(4) { height: 16px; overflow: hidden; padding-top: 6px; - width: 620px; + width: 593px; } .vst-ok { diff --git a/web/edit/file/index.php b/web/edit/file/index.php index a09563ae0..58158eac8 100644 --- a/web/edit/file/index.php +++ b/web/edit/file/index.php @@ -15,6 +15,9 @@ if (empty($panel)) { $panel = json_decode(implode('', $output), true); } */ + + + /* // Check user session if ((!isset($_SESSION['user'])) && (!defined('NO_AUTH_REQUIRED'))) { @@ -24,6 +27,14 @@ if ((!isset($_SESSION['user'])) && (!defined('NO_AUTH_REQUIRED'))) { } */ +// Check module activation +if (!$_SESSION['FILEMANAGER_KEY']) { + $_SESSION['request_uri'] = $_SERVER['REQUEST_URI']; + header("Location: /login/"); + exit; +} + + ?> Edit file <?= htmlspecialchars($_REQUEST['path']) ?> diff --git a/web/templates/file_manager/main.php b/web/templates/file_manager/main.php index 7fed618e5..3ab5b1dc0 100644 --- a/web/templates/file_manager/main.php +++ b/web/templates/file_manager/main.php @@ -267,10 +267,13 @@ var src = $(item).find('.source').val(); src = $.parseJSON(src); var tab = FM.getTabLetter(FM.CURRENT_TAB); + if (FM.itemIsArchieve(src)) { - $('.menu-'+tab+' .extract-btn').show(); - } - else { + if($('.menu-'+tab+' .archive.button').first().is(':visible')) + $('.menu-'+tab+' .extract-btn').first().show(); + else + $('.menu-'+tab+' .extract-btn.small').show(); + } else { $('.menu-'+tab+' .extract-btn').hide(); } } From 868092219f1b44b1e7aff8e26abca8cf52dfe8af Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Tue, 3 Nov 2015 01:07:41 +0200 Subject: [PATCH 161/264] improved server configuration page --- web/edit/server/index.php | 29 ++++++++-- web/templates/admin/edit_server.html | 79 ++++++++++++---------------- 2 files changed, 57 insertions(+), 51 deletions(-) diff --git a/web/edit/server/index.php b/web/edit/server/index.php index de4990ec4..849657221 100644 --- a/web/edit/server/index.php +++ b/web/edit/server/index.php @@ -157,6 +157,25 @@ if (!empty($_POST['save'])) { } } + // Set firewall support + if (empty($_SESSION['error_msg'])) { + if ($_SESSION['FIREWALL_SYSTEM'] == 'iptables') $v_firewall = 'yes'; + if ($_SESSION['FIREWALL_SYSTEM'] != 'iptables') $v_firewall = 'no'; + if ((!empty($_POST['v_firewall'])) && ($v_firewall != $_POST['v_firewall'])) { + if($_POST['v_firewall'] == 'yes') { + exec (VESTA_CMD."v-add-sys-firewall", $output, $return_var); + check_return_code($return_var,$output); + unset($output); + if (empty($_SESSION['error_msg'])) $_SESSION['FIREWALL_SYSTEM'] = 'iptables'; + } else { + exec (VESTA_CMD."v-delete-sys-firewall", $output, $return_var); + check_return_code($return_var,$output); + unset($output); + if (empty($_SESSION['error_msg'])) $_SESSION['FIREWALL_SYSTEM'] = ''; + } + } + } + // Update mysql pasword if (empty($_SESSION['error_msg'])) { if (!empty($_POST['v_mysql_password'])) { @@ -336,7 +355,7 @@ if (!empty($_POST['save'])) { // activating sftp licence if (empty($_SESSION['error_msg'])) { - if($_SESSION['SFTP_KEY'] != $_POST['v_sftp_licence'] && $_POST['v_sftp'] == 'yes'){ + if($_SESSION['SFTPJAIL_KEY'] != $_POST['v_sftp_licence'] && $_POST['v_sftp'] == 'yes'){ $module = 'sftpjail'; $licence_key = escapeshellarg($_POST['v_sftp_licence']); exec (VESTA_CMD."v-activate-vesta-license ".$module." ".$licence_key, $output, $return_var); @@ -344,22 +363,22 @@ if (!empty($_POST['save'])) { unset($output); if (empty($_SESSION['error_msg'])) { $_SESSION['ok_msg'] = __('Licence Activated'); - $_SESSION['SFTP_KEY'] = $_POST['v_sftp_licence']; + $_SESSION['SFTPJAIL_KEY'] = $_POST['v_sftp_licence']; } } } // cancel sftp licence if (empty($_SESSION['error_msg'])) { - if($_POST['v_sftp'] == 'cancel' && $_SESSION['SFTP_KEY']){ + if($_POST['v_sftp'] == 'cancel' && $_SESSION['SFTPJAIL_KEY']){ $module = 'sftpjail'; - $licence_key = escapeshellarg($_SESSION['SFTP_KEY']); + $licence_key = escapeshellarg($_SESSION['SFTPJAIL_KEY']); exec (VESTA_CMD."v-deactivate-vesta-license ".$module." ".$licence_key, $output, $return_var); check_return_code($return_var,$output); unset($output); if (empty($_SESSION['error_msg'])) { $_SESSION['ok_msg'] = __('Licence Deactivated'); - unset($_SESSION['SFTP_KEY']); + unset($_SESSION['SFTPJAIL_KEY']); } } } diff --git a/web/templates/admin/edit_server.html b/web/templates/admin/edit_server.html index 170da7476..434ec8ef4 100644 --- a/web/templates/admin/edit_server.html +++ b/web/templates/admin/edit_server.html @@ -111,21 +111,6 @@

        -         - - - - - + + + + + + + + + + + + - - - - - - - - - - - - '; } ?> + -
        @@ -630,7 +630,7 @@
        -

        @@ -643,7 +643,7 @@
        -

        @@ -656,7 +656,7 @@
        -

        @@ -669,35 +669,111 @@
        -

        - + + +
        + +

        +
        > + + Licence Key:
        +
        '; + } else { + echo ' + Restrict users so that they cannot use SSH and access only their home directory. + This is a commercial module, you would need to purchace license key to enable it. + +
        + Enter License Key:
        +
        + + 2Checkout.com Inc. (Ohio, USA) is a payment facilitator for goods and services provided by vestacp.com.'; + } + ?> + +
        +


        -
        - -
        - -

        -
        @@ -623,6 +608,34 @@

        + +
        + +

        +
        + +
        + +

        +
        @@ -636,32 +649,6 @@

        - -
        - -

        -
        - -
        - -

        -
        @@ -684,21 +671,21 @@

        -
        > +
        > Licence Key:
        From 4def19f6ff6e0f96d363942b771904d2f91958fd Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Tue, 3 Nov 2015 01:08:03 +0200 Subject: [PATCH 162/264] set default language --- web/templates/admin/add_user.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/web/templates/admin/add_user.html b/web/templates/admin/add_user.html index bf6f33d1d..7f978c65e 100644 --- a/web/templates/admin/add_user.html +++ b/web/templates/admin/add_user.html @@ -128,12 +128,12 @@ foreach ($languages as $key => $value) { echo "\n\t\t\t\t\t\t\t\t\t\n"; From 50784054d72f73e3377589f055d3565e64ac4740 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Tue, 3 Nov 2015 01:08:23 +0200 Subject: [PATCH 163/264] notifications --- web/templates/user/panel.html | 1 + 1 file changed, 1 insertion(+) diff --git a/web/templates/user/panel.html b/web/templates/user/panel.html index c39c3143c..2d3afc45b 100644 --- a/web/templates/user/panel.html +++ b/web/templates/user/panel.html @@ -1,3 +1,4 @@ + From 84a967a6ab34507fe8b0d76e0e2d91fb4a90dfff Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Tue, 3 Nov 2015 01:08:41 +0200 Subject: [PATCH 164/264] notifications mend --- web/templates/admin/panel.html | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/web/templates/admin/panel.html b/web/templates/admin/panel.html index ed55ed263..95b6e6700 100644 --- a/web/templates/admin/panel.html +++ b/web/templates/admin/panel.html @@ -1,3 +1,4 @@ + @@ -21,14 +22,42 @@
        -
        + "> 
        + + From 9754eb602f87910c531a8c0acc81bf246e0705e1 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Tue, 3 Nov 2015 01:09:40 +0200 Subject: [PATCH 165/264] no suspend on user level --- web/templates/user/list_cron.html | 11 --------- web/templates/user/list_db.html | 16 +++---------- web/templates/user/list_dns.html | 11 --------- web/templates/user/list_dns_rec.html | 9 ++++---- web/templates/user/list_mail.html | 11 --------- web/templates/user/list_mail_acc.html | 11 --------- web/templates/user/list_search.html | 33 --------------------------- web/templates/user/list_user.html | 11 --------- web/templates/user/list_web.html | 11 --------- 9 files changed, 7 insertions(+), 117 deletions(-) diff --git a/web/templates/user/list_cron.html b/web/templates/user/list_cron.html index a91caafc2..d6493d3ed 100644 --- a/web/templates/user/list_cron.html +++ b/web/templates/user/list_cron.html @@ -41,8 +41,6 @@ '.__('turn off notifications').''; ?> '.__('turn on notifications').''; ?> - - @@ -91,15 +89,6 @@ sort-date="" sort-nam
        -
        - - - - - -
        diff --git a/web/templates/user/list_db.html b/web/templates/user/list_db.html index dff13d0dd..4c3d4ec9f 100644 --- a/web/templates/user/list_db.html +++ b/web/templates/user/list_db.html @@ -23,13 +23,13 @@ if ($data[$key]['TYPE'] == 'mysql'){ $mysql = 1; - $db_admin_link = "http://".$http_host."/phpmyadmin/"; + $db_myadmin_link = "http://".$http_host."/phpmyadmin/"; if (!empty($_SESSION['DB_PMA_URL'])) $db_myadmin_link = $_SESSION['DB_PMA_URL']; } if ($data[$key]['TYPE'] == 'pgsql'){ $pgsql = 1; - $db_admin_link = "http://".$http_host."/phppgadmin/"; + $db_pgadmin_link = "http://".$http_host."/phppgadmin/"; if (!empty($_SESSION['DB_PGA_URL'])) $db_pgadmin_link = $_SESSION['DB_PGA_URL']; } @@ -41,6 +41,7 @@ echo '
        		phpPgAdmin
        @@ -61,8 +62,6 @@
        @@ -121,15 +120,6 @@ sort-user="" sort-server="" so
        -
        - - - - - -
        diff --git a/web/templates/user/list_dns.html b/web/templates/user/list_dns.html index 432d0d83c..77d2ce40a 100644 --- a/web/templates/user/list_dns.html +++ b/web/templates/user/list_dns.html @@ -33,8 +33,6 @@
        @@ -84,15 +82,6 @@ sort-expire="" sort-records="
        -
        - - - - - -
        diff --git a/web/templates/user/list_dns_rec.html b/web/templates/user/list_dns_rec.html index ecb6f8027..754acb8d4 100644 --- a/web/templates/user/list_dns_rec.html +++ b/web/templates/user/list_dns_rec.html @@ -17,12 +17,11 @@
        		+
        - - -
        @@ -71,8 +70,8 @@ v_unit_id="" v_section="dns_rec">
        - - + +
        diff --git a/web/templates/user/list_mail.html b/web/templates/user/list_mail.html index e45c2eb62..150c85fdf 100644 --- a/web/templates/user/list_mail.html +++ b/web/templates/user/list_mail.html @@ -39,8 +39,6 @@
        @@ -100,15 +98,6 @@ sort-accounts="" sort-star="
        -
        - - - - - -
        diff --git a/web/templates/user/list_mail_acc.html b/web/templates/user/list_mail_acc.html index 3840b7ad4..ed563f628 100644 --- a/web/templates/user/list_mail_acc.html +++ b/web/templates/user/list_mail_acc.html @@ -38,8 +38,6 @@
        @@ -95,15 +93,6 @@ sort-star="
        -
        - - - - - -
        diff --git a/web/templates/user/list_search.html b/web/templates/user/list_search.html index 2ecb27a82..f722e89f4 100644 --- a/web/templates/user/list_search.html +++ b/web/templates/user/list_search.html @@ -125,39 +125,6 @@
        - - -
        - - - - - -
        - - -
        @@ -122,15 +120,6 @@ sort-disk="" sort-star="
        -
        - - - - - -
        diff --git a/web/templates/user/list_web.html b/web/templates/user/list_web.html index 9a5602d30..226f8aecf 100644 --- a/web/templates/user/list_web.html +++ b/web/templates/user/list_web.html @@ -32,8 +32,6 @@
        @@ -140,15 +138,6 @@ sort-bandwidth="" sort-disk="
        -
        - - - - - -
        From 3d989fa74b58d1aaf7e4dc945631235241e1fdfb Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Tue, 3 Nov 2015 01:10:14 +0200 Subject: [PATCH 166/264] backend template only for admin --- web/edit/web/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/edit/web/index.php b/web/edit/web/index.php index d02de19cb..c0d1f6f80 100644 --- a/web/edit/web/index.php +++ b/web/edit/web/index.php @@ -206,7 +206,7 @@ if (!empty($_POST['save'])) { } // Change backend template - if ((!empty($_SESSION['WEB_BACKEND'])) && ( $v_backend_template != $_POST['v_backend_template']) && (empty($_SESSION['error_msg']))) { + if ((!empty($_SESSION['WEB_BACKEND'])) && ( $v_backend_template != $_POST['v_backend_template']) && ( $_SESSION['user'] == 'admin') && (empty($_SESSION['error_msg']))) { $v_backend_template = $_POST['v_backend_template']; exec (VESTA_CMD."v-change-web-domain-backend-tpl ".$v_username." ".$v_domain." ".escapeshellarg($v_backend_template), $output, $return_var); check_return_code($return_var,$output); From 0f8578f7a8f2a1c8b74b169e04b276df10f5e7e8 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Tue, 3 Nov 2015 01:11:05 +0200 Subject: [PATCH 167/264] no delete button for now --- web/templates/admin/list_backup_exclusions.html | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/web/templates/admin/list_backup_exclusions.html b/web/templates/admin/list_backup_exclusions.html index 1c4f599cf..eea811ba7 100644 --- a/web/templates/admin/list_backup_exclusions.html +++ b/web/templates/admin/list_backup_exclusions.html @@ -11,7 +11,7 @@
        		+
        @@ -49,12 +49,12 @@
        - - +
        -
        +
        From db4c4d333b9122c9909ac88f8654580087c2f535 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Tue, 3 Nov 2015 01:11:26 +0200 Subject: [PATCH 168/264] fix for bulk operations --- web/templates/admin/list_dns_rec.html | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/web/templates/admin/list_dns_rec.html b/web/templates/admin/list_dns_rec.html index e04033ea2..f025fdad3 100644 --- a/web/templates/admin/list_dns_rec.html +++ b/web/templates/admin/list_dns_rec.html @@ -17,9 +17,10 @@
        +
        - @@ -71,8 +72,8 @@ v_unit_id="" v_section="dns_rec">
        - - + +
        From 6ad69fb4ca9fe65bc927353145981a0dd24c7ea0 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Tue, 3 Nov 2015 01:12:56 +0200 Subject: [PATCH 169/264] disabled debug --- web/bulk/web/index.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/web/bulk/web/index.php b/web/bulk/web/index.php index d7c050077..4a661a1ff 100644 --- a/web/bulk/web/index.php +++ b/web/bulk/web/index.php @@ -35,12 +35,10 @@ if ($_SESSION['user'] == 'admin') { foreach ($domain as $value) { $value = escapeshellarg($value); - echo VESTA_CMD.$cmd." ".$user." ".$value." no"; exec (VESTA_CMD.$cmd." ".$user." ".$value." no", $output, $return_var); $restart='yes'; } - if (isset($restart)) { exec (VESTA_CMD."v-restart-web", $output, $return_var); exec (VESTA_CMD."v-restart-proxy", $output, $return_var); From 305a6b1fb1f70e8b6f6695fed3820e0e623485f5 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Tue, 3 Nov 2015 12:42:51 +0200 Subject: [PATCH 170/264] bulk operation for backup restore --- web/templates/admin/list_backup_detail.html | 26 ++++++++++----------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/web/templates/admin/list_backup_detail.html b/web/templates/admin/list_backup_detail.html index 87115f09d..b22ff40ed 100644 --- a/web/templates/admin/list_backup_detail.html +++ b/web/templates/admin/list_backup_detail.html @@ -20,7 +20,7 @@
        - @@ -57,8 +57,8 @@
        - - + +
        @@ -108,8 +108,8 @@
        - - + +
        @@ -156,8 +156,8 @@
        - - + +
        @@ -203,8 +203,8 @@
        - - + +
        @@ -251,8 +251,8 @@
        - - + +
        @@ -299,8 +299,8 @@
        - - + +
        From d5371c3dcd5ce1e0215fac9930c8830d3e88730d Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Tue, 3 Nov 2015 14:15:41 +0200 Subject: [PATCH 171/264] removed error catcher --- bin/v-delete-remote-dns-record | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/v-delete-remote-dns-record b/bin/v-delete-remote-dns-record index 0c09d68cc..e6066d86f 100755 --- a/bin/v-delete-remote-dns-record +++ b/bin/v-delete-remote-dns-record @@ -55,7 +55,7 @@ for cluster in $(cat $VESTA/conf/dns-cluster.conf); do # Sync domain cluster_cmd v-delete-dns-record $DNS_USER $domain $id 'no' - check_result $? "$HOST connection failed (rebuild)" $E_CONNECT + #check_result $? "$HOST connection failed (delete)" $E_CONNECT # Rebuilding dns zone cluster_cmd v-rebuild-dns-domain $DNS_USER $domain 'yes' 'no' From 52a22e2f3a60f0529429a17882abe779d2fbb92b Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Tue, 3 Nov 2015 14:20:36 +0200 Subject: [PATCH 172/264] flushing pipe when domain doesn't exist --- bin/v-add-remote-dns-domain | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/v-add-remote-dns-domain b/bin/v-add-remote-dns-domain index e84a0e3dc..758a9ebe7 100755 --- a/bin/v-add-remote-dns-domain +++ b/bin/v-add-remote-dns-domain @@ -44,7 +44,7 @@ remote_dns_health_check str=$(grep "DOMAIN='$domain'" $USER_DATA/dns.conf 2>/dev/null) if [ -z "$str" ]; then pipe="$VESTA/data/queue/dns-cluster.pipe" - queue_str=$(grep -n "$SCRIPT $1 $2 no$" $pipe |cut -f1 -d: |head -n1) + queue_str=$(grep -n "$SCRIPT $1 $2 " $pipe |cut -f1 -d: |head -n1) if [ ! -z "$queue_str" ]; then sed -i "$queue_str d" $pipe fi From 4210399fc02c8a0fa45c71c5f05d24f54ea11ad5 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Tue, 3 Nov 2015 18:51:53 +0200 Subject: [PATCH 173/264] white search --- web/css/styles.min.css | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/web/css/styles.min.css b/web/css/styles.min.css index 4f3346397..832a6d3aa 100644 --- a/web/css/styles.min.css +++ b/web/css/styles.min.css @@ -2848,13 +2848,14 @@ form#vstobjects.suspended { } .search-input { + background-color: #fff; border: 1px solid #ddd; height: 21px; line-height: 28px; padding-left: 7px; float: left; - width: 0px; - visibility: hidden; + width: 74px; +/* visibility: hidden;*/ -webkit-transition: width .2s ease-out; -moz-transition: width .2s ease-out; -o-transition: width .2s ease-out; @@ -2865,9 +2866,9 @@ form#vstobjects.suspended { visibility: visible; } .search-input:focus { - background-color: #d7f9ff; - border-color: #55c9c0; - color: #333; +// background-color: #e8fcff; +// border-color: #75c9c2; +// color: #333; } .float-left { From 03a6b6f34e9b59d6188277790766e5f4d2001f8b Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Tue, 3 Nov 2015 18:52:15 +0200 Subject: [PATCH 174/264] style versioning --- web/templates/header.html | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/web/templates/header.html b/web/templates/header.html index 83696d9c4..863911d42 100644 --- a/web/templates/header.html +++ b/web/templates/header.html @@ -4,14 +4,14 @@ Vesta - <?="$TAB"?> - + - - - - - - + + + + + + From cc456f20b5f5d34b9e00f153293b51f4ec6710e5 Mon Sep 17 00:00:00 2001 From: Vlad Ya Date: Wed, 4 Nov 2015 13:09:29 -0500 Subject: [PATCH 177/264] Proper fix for the prefix corruption (for user names with non-alphanumeric characters) and keep the prevention of addition of ftp user names with non-alphanumeric characters as it was intended initially --- web/js/pages/add.web.js | 4 ++-- web/js/pages/edit.web.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/web/js/pages/add.web.js b/web/js/pages/add.web.js index 2762ba140..7a01f7460 100644 --- a/web/js/pages/add.web.js +++ b/web/js/pages/add.web.js @@ -3,11 +3,11 @@ App.Actions.WEB.update_ftp_username_hint = function(elm, hint) { $(elm).parent().find('.hint').html(''); } - //hint = hint.replace(/[^\w\d]/gi, ''); - if (hint.indexOf(GLOBAL.FTP_USER_PREFIX) == 0) { hint = hint.slice(GLOBAL.FTP_USER_PREFIX.length, hint.length); } + hint = hint.replace(/[^\w\d]/gi, ''); + $(elm).parent().find('.v-ftp-user').val(hint); $(elm).parent().find('.hint').text(GLOBAL.FTP_USER_PREFIX + hint); } diff --git a/web/js/pages/edit.web.js b/web/js/pages/edit.web.js index ef20c831a..1406d9d09 100644 --- a/web/js/pages/edit.web.js +++ b/web/js/pages/edit.web.js @@ -3,11 +3,11 @@ App.Actions.WEB.update_ftp_username_hint = function(elm, hint) { $(elm).parent().find('.hint').html(''); } - //hint = hint.replace(/[^\w\d]/gi, ''); - if (hint.indexOf(GLOBAL.FTP_USER_PREFIX) == 0) { hint = hint.slice(GLOBAL.FTP_USER_PREFIX.length, hint.length); } + hint = hint.replace(/[^\w\d]/gi, ''); + $(elm).parent().find('.v-ftp-user').val(hint); $(elm).parent().find('.hint').text(GLOBAL.FTP_USER_PREFIX + hint); } From a0ee9bbc98b7560ce81f091babf639fe374686ce Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Thu, 5 Nov 2015 03:10:57 +0200 Subject: [PATCH 178/264] one file at the time for now --- bin/v-add-fs-archive | 37 +++++++++++++++++-------------------- 1 file changed, 17 insertions(+), 20 deletions(-) diff --git a/bin/v-add-fs-archive b/bin/v-add-fs-archive index 47dc0d5d7..fa4b7aa3d 100755 --- a/bin/v-add-fs-archive +++ b/bin/v-add-fs-archive @@ -1,22 +1,16 @@ #!/bin/bash # info: archive directory -# options: USER ARCHIVE DIRECTORY [DIRECTORY_N] +# options: USER ARCHIVE SOURCE # # The function creates tar archive user=$1 archive=$2 -src1=$3 -src2=$4 -src3=$5 -src4=$6 -src5=$7 -src6=$8 -src7=$9 +src=$3 # Checking arguments -if [ -z "$src1" ]; then - echo "Usage: USER ARCHIVE DIRECTORY [DIRECTORY_N]" +if [ -z "$src" ]; then + echo "Usage: USER ARCHIVE SOURCE" exit 1 fi @@ -40,19 +34,22 @@ if [ -e "$archive.tar.gz" ]; then fi # Checking source path -for src_path in $src1 $src2 $src3 $src4 $src5 $src6 $src7; do - rpath=$(readlink -f "$src_path") - if [ -z "$(echo $rpath |egrep "^/tmp|^$homedir")" ]; then - echo "Error: invalid source path $src_path" - exit 1 - fi -done +rpath=$(readlink -f "$src") +if [ -z "$(echo $rpath |egrep "^/tmp|^$homedir")" ]; then + echo "Error: invalid source path $src" + exit 1 +fi + +# Parsing current directory +d=$(dirname "$src") + +# Removing leading file path +f=$(echo "$src" |sed -e "s|$d/||") # Creating tar.gz archive -sudo -u $user tar -czf "$archive.tar.gz" \ - $src1 $src2 $src3 $src4 $src5 $src6 $src7 > /dev/null 2>&1 +sudo -u $user tar -czf "$archive.tar.gz" -C $d $f >/dev/null 2>&1 if [ "$?" -ne 0 ]; then -# echo "Error: archive $archive.tar.gz was not created" + echo "Error: archive $archive.tar.gz was not created" exit 3 fi From c06ba9fc9c4e43fd1822c591e85de56f56574bf5 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Thu, 5 Nov 2015 03:11:34 +0200 Subject: [PATCH 179/264] safe way to check permissions --- bin/v-check-fs-permission | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/bin/v-check-fs-permission b/bin/v-check-fs-permission index 59e491cf3..00e5482af 100755 --- a/bin/v-check-fs-permission +++ b/bin/v-check-fs-permission @@ -5,10 +5,10 @@ # The function opens/reads files on the file system user=$1 -src_file=$2 +src=$2 # Checking arguments -if [ -z "$src_file" ]; then +if [ -z "$src" ]; then echo "Usage: USER FILE" exit 1 fi @@ -27,27 +27,19 @@ if [ -z $homedir ]; then fi # Checking path -if [ ! -z "$src_file" ]; then - rpath=$(readlink -f "$src_file") +if [ ! -z "$src" ]; then + rpath=$(readlink -f "$src") if [ -z "$(echo $rpath |egrep "^/tmp|^$homedir")" ]; then - echo "Error: invalid source path $src_file" + echo "Error: invalid source path $user $src" exit 2 fi fi -# Reading file -#sudo -u $user cat "$src_file" 2>/dev/null -#if [ $? -ne 0 ]; then -# echo "Error: file $src_file was not opened" -# exit 3 -#fi - # Checking if file has readable permission -if [[ ! -r $src_file ]] -then -# echo "File is readable" -#else - echo "Cannot read file" +sudo -u $user ls "$src" > /dev/null 2>&1 +if [ $? -ne 0 ]; then + echo "Error: can't read $src" + exit 1 fi # Exiting From 8ec9ae5d86af787c379cd739a7d89b7a11f61939 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Thu, 5 Nov 2015 03:12:10 +0200 Subject: [PATCH 180/264] quotes around path --- bin/v-get-fs-file-type | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/v-get-fs-file-type b/bin/v-get-fs-file-type index 04d28d343..ba2b7a660 100755 --- a/bin/v-get-fs-file-type +++ b/bin/v-get-fs-file-type @@ -34,7 +34,7 @@ if [ -z "$(echo $rpath |grep $homedir)" ]; then fi # Listing file type -sudo -u $user file -i -b $path 2>/dev/null +sudo -u $user file -i -b "$path" 2>/dev/null # Exiting exit $? From 4da89d5fe1954cf32e35235e7843bbe54111a635 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Thu, 5 Nov 2015 03:12:33 +0200 Subject: [PATCH 181/264] remove debug --- bin/v-list-fs-directory | 1 - 1 file changed, 1 deletion(-) diff --git a/bin/v-list-fs-directory b/bin/v-list-fs-directory index 65102888d..57a2c7c32 100755 --- a/bin/v-list-fs-directory +++ b/bin/v-list-fs-directory @@ -40,7 +40,6 @@ fi # Listing directory sudo -u $user find "$path" -maxdepth 1 \ -printf "%y|%m|%TY-%Tm-%Td|%TH:%TM|%u|%g|%s|%P\n" 2>/dev/null -# -printf "%y|%m|%TY-%Tm-%Td|%TH:%TM:%TS|%u|%g|%s|%P\n" 2>/dev/null # Exiting exit $? From 89b62eb4ac58b50adca74f5e223a717fcc3048e8 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Thu, 5 Nov 2015 03:13:54 +0200 Subject: [PATCH 182/264] border-bottom: none --- web/css/styles.min.css | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/web/css/styles.min.css b/web/css/styles.min.css index c9e0555bc..675ac7062 100644 --- a/web/css/styles.min.css +++ b/web/css/styles.min.css @@ -1278,14 +1278,12 @@ div.l-content > div.l-separator:nth-of-type(4) { overflow: hidden; font-size: 13px; } - -.units div:last-child { - border-bottom: none !important; -} - .units .l-unit { border-bottom: 1px solid #ddd; } +.units > div:last-child { + border-bottom: none; +} From f064c0966700b562ec7f10ab2e71c2293bdb4d01 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Thu, 5 Nov 2015 03:14:15 +0200 Subject: [PATCH 183/264] Tab name --- web/edit/backup/exclusions/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/edit/backup/exclusions/index.php b/web/edit/backup/exclusions/index.php index 4c67de264..8bac32c16 100644 --- a/web/edit/backup/exclusions/index.php +++ b/web/edit/backup/exclusions/index.php @@ -3,7 +3,7 @@ error_reporting(NULL); ob_start(); session_start(); -$TAB = 'BACKUP EXCLUSIONS'; +$TAB = 'BACKUP'; include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); From d207b7a752a43b5850e44c68bc9ba8e8e9e30918 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Thu, 5 Nov 2015 03:17:21 +0200 Subject: [PATCH 184/264] FM changes --- web/download/file/index.php | 17 ++-- web/edit/file/index.php | 123 ++++++++++------------------ web/file_manager/fm_core.php | 21 +++-- web/js/file_manager.js | 26 ++++-- web/js/templates.js | 3 + web/list/directory/index.php | 7 +- web/templates/file_manager/main.php | 6 +- web/upload/UploadHandler.php | 31 +++---- web/view/file/index.php | 19 ++--- 9 files changed, 117 insertions(+), 136 deletions(-) diff --git a/web/download/file/index.php b/web/download/file/index.php index 6065d0fc7..97afa8f7e 100644 --- a/web/download/file/index.php +++ b/web/download/file/index.php @@ -1,11 +1,18 @@ 0 ) { - header("Location: /error/"); - exit; - } - $panel = json_decode(implode('', $output), true); -} -*/ - - - -/* -// Check user session -if ((!isset($_SESSION['user'])) && (!defined('NO_AUTH_REQUIRED'))) { - $_SESSION['request_uri'] = $_SERVER['REQUEST_URI']; - header("Location: /login/"); - exit; -} -*/ // Check module activation if (!$_SESSION['FILEMANAGER_KEY']) { @@ -34,6 +10,11 @@ if (!$_SESSION['FILEMANAGER_KEY']) { exit; } +// Check login_as feature +if (($_SESSION['user'] == 'admin') && (!empty($_SESSION['look']))) { + $user=$_SESSION['look']; +} + ?> @@ -55,66 +36,46 @@ if (!$_SESSION['FILEMANAGER_KEY']) { if (!empty($_REQUEST['path'])) { $content = ''; $path = $_REQUEST['path']; - if (is_readable($path)) { - $image = getimagesize($path) ? true : false; - - if ($image) { - header('Location: /view/file/?path='.$path); - exit; - } - - if (!empty($_POST['save'])) { - $fn = tempnam ('/tmp', 'vst-save-file-'); - if ($fn) { - $f = fopen ($fn, 'w+'); - fwrite($f, $_POST['contents']); - fclose($f); - - chmod($fn, 0644); - - if ($f) { - //copy($fn, $path); - exec (VESTA_CMD . "v-copy-fs-file {$user} {$fn} {$path}", $output, $return_var); + if (!empty($_POST['save'])) { + $fn = tempnam ('/tmp', 'vst-save-file-'); + if ($fn) { + $contents = $_POST['contents']; + $contents = preg_replace("/\r/", "", $contents); + $f = fopen ($fn, 'w+'); + fwrite($f, $contents); + fclose($f); + chmod($fn, 0644); - $error = check_return_code($return_var, $output); - if ($return_var != 0) { - /*var_dump(VESTA_CMD . "v-copy-fs-file {$user} {$fn} {$path}"); - var_dump($path); - var_dump($output);*/ - die('

        Error while saving file

        ');//echo '0'; - } + if ($f) { + exec (VESTA_CMD . "v-copy-fs-file {$user} {$fn} {$path}", $output, $return_var); + $error = check_return_code($return_var, $output); + if ($return_var != 0) { + print('

        Error while saving file

        '); + exit; } - unlink($fn); } + unlink($fn); } - - // $content = file_get_contents($path); - // v-open-fs-file - - - //print file_get_contents($path); - exec (VESTA_CMD . "v-check-fs-permission {$user} {$path}", $content, $return_var); - - if ($return_var != 0) { - print 'Error while opening file'; // todo: handle this more styled - exit; - } - - - /*exec (VESTA_CMD . "v-open-fs-file {$user} {$path}", $content, $return_var); - if ($return_var != 0) { - print 'Error while opening file'; // todo: handle this more styled - exit; - } - - $content = implode("\n", $content);*/ - $content = file_get_contents($path); } - } - else { + + exec (VESTA_CMD . "v-check-fs-permission {$user} '{$path}'", $content, $return_var); + if ($return_var != 0) { + var_dump($return_var); + var_dump($content); + exit; + print 'Error while opening file'; // todo: handle this more styled + exit; + } + + exec (VESTA_CMD . "v-open-fs-file {$user} {$path}", $content, $return_var); + if ($return_var != 0) { + print 'Error while opening file'; // todo: handle this more styled + exit; + } + $content = implode("\n", $content)."\n"; + } else { $content = ''; } - ?> @@ -131,9 +92,11 @@ if (!$_SESSION['FILEMANAGER_KEY']) { $('.editor').ace({ theme: 'twilight', lang: 'ruby' }); var dcrt = $('#editor').data('ace'); - var editor = dcrt.editor.ace; - editor.gotoLine(0); - editor.focus(); + dcrt.editor.ace.getSession().setNewLineMode('unix'); + var aceInstance = dcrt.editor.ace; + aceInstance.gotoLine(0); + aceInstance.focus(); + var makeBackup = function() { diff --git a/web/file_manager/fm_core.php b/web/file_manager/fm_core.php index 1b3c09f91..9cf70e28d 100644 --- a/web/file_manager/fm_core.php +++ b/web/file_manager/fm_core.php @@ -44,9 +44,7 @@ class FileManager { public function checkFileType($dir) { $dir = $this->formatFullPath($dir); - exec(VESTA_CMD . "v-get-fs-file-type {$this->user} {$dir}", $output, $return_var); - $error = self::check_return_code($return_var, $output); if (empty($error)) { return array( @@ -76,12 +74,13 @@ class FileManager { function deleteItem($dir, $item) { $dir = $this->formatFullPath($item); - if (is_dir($item)) { + //if (is_dir($item)) { + //var_dump(VESTA_CMD . "v-delete-fs-directory {$this->user} {$dir}");die(); exec (VESTA_CMD . "v-delete-fs-directory {$this->user} {$dir}", $output, $return_var); - } - else { - exec (VESTA_CMD . "v-delete-fs-file {$this->user} {$dir}", $output, $return_var); - } + //} + //else { + // exec (VESTA_CMD . "v-delete-fs-file {$this->user} {$dir}", $output, $return_var); + //} $error = self::check_return_code($return_var, $output); @@ -189,8 +188,12 @@ class FileManager { function packItem($item, $dir, $target_dir, $filename) { $item = $this->formatFullPath($item); $dst_item = $this->formatFullPath($target_dir); -//print VESTA_CMD . "v-add-fs-archive {$this->user} {$item} {$dst_item}";die(); - exec (VESTA_CMD . "v-add-fs-archive {$this->user} {$item} {$dst_item}", $output, $return_var); + + $dst_item = str_replace('.tar.gz', '', $dst_item); + + //$item = str_replace($dir . '/', '', $item); +//var_dump(VESTA_CMD . "v-add-fs-archive {$this->user} {$dst_item} {$item}");die(); + exec (VESTA_CMD . "v-add-fs-archive {$this->user} {$dst_item} {$item}", $output, $return_var); $error = self::check_return_code($return_var, $output); diff --git a/web/js/file_manager.js b/web/js/file_manager.js index cff3d0418..c428851e5 100644 --- a/web/js/file_manager.js +++ b/web/js/file_manager.js @@ -99,6 +99,10 @@ FM.showError = function(type, message) { return; } + + if (ref.find('.results').length > 0) { + ref.find('.results').html(message); + } } else { FM.popupClose(); @@ -750,7 +754,7 @@ FM.bulkOperation = function(ref) { } FM.checkBulkStatus = function(bulkStatuses, acc) { - var status = false; + var status = true; var msg = ''; if (bulkStatuses.length == acc.length) { $.each(bulkStatuses, function(i, o) { @@ -759,18 +763,24 @@ FM.checkBulkStatus = function(bulkStatuses, acc) { } }); - if (msg == '') { - status = true; + if (msg != '') { + status = false; } } if (status == true) { - $('#popup .results').html(App.Constants.FM_DONE); - $('.controls').html('

        '+App.Constants.FM_DONE+'

        '); + //$('#popup .results').html(App.Constants.FM_DONE); + //$('.controls').html('

        '+App.Constants.FM_DONE+'

        '); + FM.popupClose(); + + var box = FM['TAB_' + tab]; + var tab = FM.getTabLetter(FM.CURRENT_TAB); + FM.openAndSync(FM['TAB_' + tab + '_CURRENT_PATH'], box); } else { - $('#popup .results').html(msg); - $('.controls').html('

        '+App.Constants.FM_DONE+'

        '); + $('#popup .results').show().html(msg); + //$('.controls').html('

        '+App.Constants.FM_DONE+'

        '); + $('#popup .ok').hide(); } } @@ -1249,7 +1259,7 @@ FM.unpackItem = function() { var tpl = Tpl.get('popup_unpack', 'FM'); tpl.set(':FILENAME', src.name); - tpl.set(':DST_DIRNAME', (dst + '/' + src.name).replace('//', '/')); + tpl.set(':DST_DIRNAME', (dst).replace('//', '/')); FM.popupOpen(tpl.finalize()); } diff --git a/web/js/templates.js b/web/js/templates.js index 1a4b09cb9..4ccc13de7 100644 --- a/web/js/templates.js +++ b/web/js/templates.js @@ -46,6 +46,7 @@ App.Templates.html = {
        '], popup_bulk_remove: ['
        \
        '+App.Constants.FM_CONFIRM_DELETE_BULK+' (~!:NUMBER_OF_ITEMS~!)?
        \ +
        \
        \

        '+App.Constants.FM_CANCEL+'

        \

        '+App.Constants.FM_DELETE+'

        \ @@ -73,6 +74,7 @@ App.Templates.html = {
        '],*/ popup_delete: ['
        \
        '+App.Constants.FM_CONFIRM_DELETE+' "~!:FILENAME~!"?
        \ +
        \
        \

        '+App.Constants.FM_CANCEL+'

        \

        '+App.Constants.FM_DELETE+'

        \ @@ -84,6 +86,7 @@ App.Templates.html = { \
        \
        '+App.Constants.FM_EXISTING_FILES_WILL_BE_REPLACED+'
        \ +
        \
        \

        '+App.Constants.FM_CANCEL+'

        \

        '+App.Constants.FM_COPY+'

        \ diff --git a/web/list/directory/index.php b/web/list/directory/index.php index 96c0cf51c..bd3686d91 100644 --- a/web/list/directory/index.php +++ b/web/list/directory/index.php @@ -3,14 +3,15 @@ include($_SERVER['DOCUMENT_ROOT'] . "/inc/main.php"); - - if ((!isset($_SESSION['FILEMANAGER_KEY'])) || (empty($_SESSION['FILEMANAGER_KEY']))) { header("Location: /filemanager-not-purchased/"); exit; } - +// Check login_as feature +if (($_SESSION['user'] == 'admin') && (!empty($_SESSION['look']))) { + $user=$_SESSION['look']; +} if (empty($panel)) { $command = VESTA_CMD."v-list-user '".$user."' 'json'"; diff --git a/web/templates/file_manager/main.php b/web/templates/file_manager/main.php index 3ab5b1dc0..c41355e9e 100644 --- a/web/templates/file_manager/main.php +++ b/web/templates/file_manager/main.php @@ -25,7 +25,7 @@
        -
          +
            @@ -33,7 +33,7 @@
            -
              +
                @@ -420,4 +420,4 @@ }); - \ No newline at end of file + diff --git a/web/upload/UploadHandler.php b/web/upload/UploadHandler.php index 837b6f113..7db8bc414 100755 --- a/web/upload/UploadHandler.php +++ b/web/upload/UploadHandler.php @@ -4,19 +4,12 @@ include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); -//$user = $_SESSION['user']; - -if (empty($panel)) { - $command = VESTA_CMD."v-list-user '".$user."' 'json'"; - exec ($command, $output, $return_var); - if ( $return_var > 0 ) { - header("Location: /error/"); - exit; - } - $panel = json_decode(implode('', $output), true); +// Check login_as feature +$user = $_SESSION['user']; +if (($_SESSION['user'] == 'admin') && (!empty($_SESSION['look']))) { + $user=$_SESSION['look']; } -$user = array_keys($panel); -$user = $user[0]; + define('USERNAME', $user); @@ -478,7 +471,9 @@ class UploadHandler } protected function sanitizeFileName($file) { - $file = preg_replace("/[^A-Za-z0-9\._-]+/", '', $file); + // (|\\?*<\":>+[]/') + // \|\\\?\*\<\"\'\:\>\+\[\] + $file = preg_replace("/'/", '', $file); return $file; } @@ -1140,11 +1135,11 @@ class UploadHandler // $this->handle_image_file($file_path, $file); //} } else { - $file->size = $file_size; - if (!$content_range && $this->options['discard_aborted_uploads']) { - unlink($file_path); - $file->error = $this->get_error_message('abort'); - } + //$file->size = $file_size; + //if (!$content_range && $this->options['discard_aborted_uploads']) { + // unlink($file_path); + // $file->error = $this->get_error_message('abort'); + //} } $this->set_additional_file_properties($file); } diff --git a/web/view/file/index.php b/web/view/file/index.php index 2e8fd58f7..60d1396fa 100644 --- a/web/view/file/index.php +++ b/web/view/file/index.php @@ -2,18 +2,17 @@ include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); +// Check login_as feature +$user = $_SESSION['user']; +if (($_SESSION['user'] == 'admin') && (!empty($_SESSION['look']))) { + $user=$_SESSION['look']; +} + if (!empty($_REQUEST['path'])) { $path = $_REQUEST['path']; - if (is_readable($path) && !empty($_REQUEST['raw'])) { - //print file_get_contents($path); - exec (VESTA_CMD . "v-check-fs-permission {$user} {$path}", $content, $return_var); - - if ($return_var != 0) { - print 'Error while opening file'; // todo: handle this more styled - exit; - } - header('content-type: image/jpeg'); - print file_get_contents($path); + if (!empty($_REQUEST['raw'])) { + header('content-type: image/jpeg'); + passthru (VESTA_CMD . "v-open-fs-file " . $user . " " . escapeshellarg($_REQUEST['path'])); exit; } } From 1c3ac33813537636c67a27e4489c4d7a4799c9a9 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Thu, 5 Nov 2015 03:17:43 +0200 Subject: [PATCH 185/264] new tab name --- web/list/backup/exclusions/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/list/backup/exclusions/index.php b/web/list/backup/exclusions/index.php index 8c5f88869..25cdd8f88 100644 --- a/web/list/backup/exclusions/index.php +++ b/web/list/backup/exclusions/index.php @@ -1,6 +1,6 @@ Date: Thu, 5 Nov 2015 03:18:11 +0200 Subject: [PATCH 186/264] footer update --- web/templates/footer.html | 37 +++++++++++++++++++++++++------------ 1 file changed, 25 insertions(+), 12 deletions(-) diff --git a/web/templates/footer.html b/web/templates/footer.html index 9c2b423c6..605b9b4de 100644 --- a/web/templates/footer.html +++ b/web/templates/footer.html @@ -178,7 +178,8 @@ ); $(window).bind('keypress', function(evt) { - if (evt.charCode == 97) { + var tag = evt.target.tagName.toLowerCase(); + if (evt.charCode == 97 && tag != 'input' && tag != 'textarea' && tag != 'selectbox') { evt.preventDefault(); if (!evt.ctrlKey && !evt.shiftKey) { if ($('.l-sort__create-btn')[0]) { @@ -382,16 +383,31 @@ $('.shortcuts').toggle(); }); + $(document).click(function(evt){ + //close notification popup + if(!$(evt.target).hasClass('l-profile__notifications') && $(evt.target).parents('ul.notification-container').length == 0){ + $('.notification-container').hide(); + $('.l-profile__notifications').removeClass('active'); + } + }); + + + // focusing on the first input at form + if(location.href.indexOf('lead=') == -1){ + $('#vstobjects .vst-input:not([disabled]), #vstobjects .vst-list:not([disabled])').first().focus(); + } + + $('.l-profile__notifications').click(function(){ if(!$('.l-profile__notifications').hasClass('active')){ - VE.notifications.get_list(); - $('.l-profile__notifications').addClass('active'); - left = $('.l-profile__notifications').offset().left - $('.notification-container').outerWidth() + 28; - $('.notification-container').css({left: left+'px'}); + VE.notifications.get_list(); + $('.l-profile__notifications').addClass('active'); + left = $('.l-profile__notifications').offset().left - $('.notification-container').outerWidth() + 28; + $('.notification-container').css({left: left+'px'}); } else { - $('.notification-container').hide(); - $('.l-profile__notifications').removeClass('active'); + $('.notification-container').hide(); + $('.l-profile__notifications').removeClass('active'); } }); @@ -432,11 +448,8 @@ }); } - $(document).click(function(evt){ - //close notification popup - $('.notification-container').hide(); - $('.l-profile__notifications').removeClass('active'); - }); + + }); From accfa41ce43dda79fd4c1330559832037182dae4 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Thu, 5 Nov 2015 03:18:25 +0200 Subject: [PATCH 187/264] notification bell --- web/templates/admin/panel.html | 28 +--------------------------- 1 file changed, 1 insertion(+), 27 deletions(-) diff --git a/web/templates/admin/panel.html b/web/templates/admin/panel.html index 95b6e6700..c26e050c3 100644 --- a/web/templates/admin/panel.html +++ b/web/templates/admin/panel.html @@ -30,33 +30,7 @@
                - + From 0794c23dbeda73a1494cb9a80f5744aba3930932 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Thu, 5 Nov 2015 03:19:02 +0200 Subject: [PATCH 188/264] commercial plugin links --- web/templates/admin/edit_server.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/web/templates/admin/edit_server.html b/web/templates/admin/edit_server.html index f9baee451..34c2d6428 100644 --- a/web/templates/admin/edit_server.html +++ b/web/templates/admin/edit_server.html @@ -697,10 +697,10 @@
                2Checkout.com Inc. (Ohio, USA) is a payment facilitator for goods and services provided by vestacp.com.'; @@ -745,10 +745,10 @@
                2Checkout.com Inc. (Ohio, USA) is a payment facilitator for goods and services provided by vestacp.com.'; From 905e5269a78117459e996c682a3d2f3113fb1ae7 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Thu, 5 Nov 2015 03:19:25 +0200 Subject: [PATCH 189/264] fix for bulk operations --- web/templates/admin/list_services.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/templates/admin/list_services.html b/web/templates/admin/list_services.html index 2a36447b9..fe671de68 100644 --- a/web/templates/admin/list_services.html +++ b/web/templates/admin/list_services.html @@ -133,7 +133,7 @@
                - +
                From 5dbb80aaf389bac33568010e1a552b5287f01406 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Thu, 5 Nov 2015 04:48:45 +0200 Subject: [PATCH 190/264] no old stuff --- web/view/file/index_new.php | 31 ------------- web/view/file/index_old.php | 86 ------------------------------------- 2 files changed, 117 deletions(-) delete mode 100644 web/view/file/index_new.php delete mode 100644 web/view/file/index_old.php diff --git a/web/view/file/index_new.php b/web/view/file/index_new.php deleted file mode 100644 index ee2349cf6..000000000 --- a/web/view/file/index_new.php +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - fotorama - - - - - -
                - -
                - - diff --git a/web/view/file/index_old.php b/web/view/file/index_old.php deleted file mode 100644 index 6fa369710..000000000 --- a/web/view/file/index_old.php +++ /dev/null @@ -1,86 +0,0 @@ - - - - - - iviewer - - - - - - - - - -

                iviewer

                - -
                - - + - - - fit - orig - update - -
                -
                - - From e02e470d349980e277bfc2b0cfc5a63c4f1f50d6 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Thu, 5 Nov 2015 04:50:15 +0200 Subject: [PATCH 191/264] FileManager latest changes --- web/download/file/index.php | 5 +++++ web/edit/file/index.php | 13 ++----------- web/file_manager/fm_core.php | 8 +------- web/file_manager/index.php | 3 +++ web/view/file/index.php | 6 +++++- 5 files changed, 16 insertions(+), 19 deletions(-) create mode 100644 web/file_manager/index.php diff --git a/web/download/file/index.php b/web/download/file/index.php index 97afa8f7e..5322185b1 100644 --- a/web/download/file/index.php +++ b/web/download/file/index.php @@ -1,6 +1,11 @@ Error while saving file

                '); @@ -58,16 +58,7 @@ if (($_SESSION['user'] == 'admin') && (!empty($_SESSION['look']))) { } } - exec (VESTA_CMD . "v-check-fs-permission {$user} '{$path}'", $content, $return_var); - if ($return_var != 0) { - var_dump($return_var); - var_dump($content); - exit; - print 'Error while opening file'; // todo: handle this more styled - exit; - } - - exec (VESTA_CMD . "v-open-fs-file {$user} {$path}", $content, $return_var); + exec (VESTA_CMD . "v-open-fs-file {$user} ".escapeshellarg($path), $content, $return_var); if ($return_var != 0) { print 'Error while opening file'; // todo: handle this more styled exit; diff --git a/web/file_manager/fm_core.php b/web/file_manager/fm_core.php index 9cf70e28d..724368989 100644 --- a/web/file_manager/fm_core.php +++ b/web/file_manager/fm_core.php @@ -74,13 +74,7 @@ class FileManager { function deleteItem($dir, $item) { $dir = $this->formatFullPath($item); - //if (is_dir($item)) { - //var_dump(VESTA_CMD . "v-delete-fs-directory {$this->user} {$dir}");die(); - exec (VESTA_CMD . "v-delete-fs-directory {$this->user} {$dir}", $output, $return_var); - //} - //else { - // exec (VESTA_CMD . "v-delete-fs-file {$this->user} {$dir}", $output, $return_var); - //} + exec (VESTA_CMD . "v-delete-fs-directory {$this->user} {$dir}", $output, $return_var); $error = self::check_return_code($return_var, $output); diff --git a/web/file_manager/index.php b/web/file_manager/index.php new file mode 100644 index 000000000..8df684698 --- /dev/null +++ b/web/file_manager/index.php @@ -0,0 +1,3 @@ + Date: Fri, 6 Nov 2015 00:43:06 +0200 Subject: [PATCH 192/264] bulk operations fix --- web/css/styles.min.css | 13 +++++++------ web/js/templates.js | 2 +- web/templates/footer.html | 4 ++++ 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/web/css/styles.min.css b/web/css/styles.min.css index 675ac7062..e0c9595f9 100644 --- a/web/css/styles.min.css +++ b/web/css/styles.min.css @@ -633,6 +633,7 @@ a { background-size: 450px auto; background-repeat: no-repeat; background-position: -232px -9px; + z-index: 99; } input[type="checkbox"] { @@ -672,7 +673,7 @@ input[type="checkbox"] { margin-bottom: 28px; position: fixed; width: 100%; - z-index: 11; + z-index: 100; } .l-header a { font-size: 12px; @@ -812,7 +813,7 @@ input[type="checkbox"] { position: fixed; top: 34px; width: 351px; - z-index: 21; + z-index: 200; font-size: 12px; padding: 0; color: #7f7f7f; @@ -906,7 +907,7 @@ input[type="checkbox"] { margin: 34px auto; position: fixed; background-color: #fff; - z-index: 10; + z-index: 100; padding-top: 30px; } .l-stat__col { @@ -989,21 +990,21 @@ div.l-content > div.l-separator:nth-of-type(2) { margin-top: 214px; width: 100%; position: fixed; - z-index: 20; + z-index: 120; } div.l-content > div.l-separator:nth-of-type(4) { margin-top: 259px; width: 100%; position: fixed; - z-index: 5; + z-index: 100; } .l-sort { position: fixed; width: 998px; background-color: #fff; - z-index: 10; + z-index: 110; margin-top: 215px; } .l-sort__create-btn { diff --git a/web/js/templates.js b/web/js/templates.js index 4ccc13de7..d600ddc6d 100644 --- a/web/js/templates.js +++ b/web/js/templates.js @@ -58,7 +58,7 @@ App.Templates.html = { \
                \
                \ -
                '+App.Constants.FM_EXISTING_FILES_WILL_BE_REPLACED+'
                \ +
                '+App.Constants.FM_EXISTING_FILES_WILL_BE_REPLACED+'
                \
                \

                '+App.Constants.FM_CANCEL+'

                \

                '+App.Constants.FM_COPY+'

                \ diff --git a/web/templates/footer.html b/web/templates/footer.html index 605b9b4de..f10ca8fe6 100644 --- a/web/templates/footer.html +++ b/web/templates/footer.html @@ -448,6 +448,10 @@ }); } + // + $('form#objects').bind('submit', function(evt) { + $('.l-unit.selected').find('.ch-toggle').attr('checked', true); + }); }); From c9c8697f28b93e895d1ad6e1b0637d22da63f92c Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Fri, 6 Nov 2015 00:44:17 +0200 Subject: [PATCH 193/264] very final fixes for FM --- web/js/file_manager.js | 70 ++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 44 deletions(-) diff --git a/web/js/file_manager.js b/web/js/file_manager.js index c428851e5..c551b21c2 100644 --- a/web/js/file_manager.js +++ b/web/js/file_manager.js @@ -161,34 +161,16 @@ FM.setActive = function(index, box) { $(box + ' .active').removeClass('active'); $(box).find('li.dir:eq('+index+')').addClass('active'); - //$(box).find('li:eq('+index+')').addClass('selected'); - //var w_h = $(window).height() - 100; var w_offset = $(box).scrollTop(); var w_height = $(box).height() var pos = $(box).find('li.selected').position(); - //console.log(w_height); - //console.log(w_offset); - //console.log(pos); + var wwh = w_height - w_offset + pos.top; - //console.info(wwh); - //console.info((pos.top + w_offset) + ' > ' + w_height); - //console.log((pos.top + w_offset) > w_height); -/* if (pos.top > w_height) { - var cur_elm = $(box).find('li.selected').position(); - var cur_elm_height = $(box).find('li.selected').height(); - //$(box).scrollTo(wwh - 350); - $(box).scrollTo(w_offset + cur_elm.top - w_height/2 + cur_elm_height/2); - - } - else {*/ - var cur_elm = $(box).find('li.selected').position(); - var cur_elm_height = $(box).find('li.selected').height(); - $(box).scrollTo(w_offset + cur_elm.top - w_height/2 + cur_elm_height/2); + var cur_elm = $(box).find('li.selected').position(); + var cur_elm_height = $(box).find('li.selected').height(); - //} - - + $(box).scrollTo(w_offset + cur_elm.top - w_height/2 + cur_elm_height/2); FM['CURRENT_' + tab + '_LINE'] = index; @@ -215,7 +197,6 @@ FM.setActive = function(index, box) { } FM.setSecondInactive = function(index, box) { - //$(box + ' .active').removeClass('selected-inactive'); $(box).find('li:eq('+index+')').addClass('selected-inactive'); FM.BG_LINE = index; @@ -286,9 +267,7 @@ FM.goDown = function() { var tab = FM.getTabLetter(FM.CURRENT_TAB); var index = FM['CURRENT_' + tab + '_LINE']; index += 1; - /*if (index > ($(FM.CURRENT_TAB).find('li.dir').length - 1)) { - index = 0; - }*/ + if (index > ($(FM.CURRENT_TAB).find('li.dir').length - 1)) { index = $(FM.CURRENT_TAB).find('li.dir').length - 1; } @@ -298,7 +277,7 @@ FM.goDown = function() { // reloads provided tab // reloads opposite tab if its needed -FM.openAndSync = function(dir, box, callback) { +FM.openAndSync = function(dir, box, callback, forceOppositeSync) { var tab = FM.getTabLetter(box); var opposite_tab = 'A'; @@ -312,6 +291,9 @@ FM.openAndSync = function(dir, box, callback) { oppositeSyncNeeded = true; } + if ('undefined' != typeof forceOppositeSync) { + oppositeSyncNeeded = forceOppositeSync; + } if (oppositeSyncNeeded) { FM.open(dir, FM['TAB_' + opposite_tab], callback); @@ -365,11 +347,16 @@ FM.updateTopLevelPathBar = function(box, tab, path) { path = path.replace(FM.ROOT_DIR, ''); formattedPath.push(''+FM.ROOT_DIR+''); + var fullDirPath = FM.ROOT_DIR; $.each(path.split('/'), function(i, part) { if (part.trim() == '') { return; } - formattedPath.push(''+part+''); + fullDirPath += '/' + part; + + fullDirPath = fullDirPath.replace(/\/\//g, '/'); + + formattedPath.push(''+part+''); }); $('.pwd-tab-' + tab).html(formattedPath.join(' / ')); @@ -403,6 +390,7 @@ FM.sortItems = function(items, box) { $.each(items, function(i, o) { if (i > 0) { // i == 0 means first .. element in list if (FM.isItemFile(o) || FM.isItemLink(o)) { + o.filetype = FM.getFileType(o.name); files.push(o); } else { @@ -411,7 +399,6 @@ FM.sortItems = function(items, box) { } }); - // var sort_type = $(box).parents('.window').find('.menu').find('.sort-by-v').val(); var sort_type = FM.ORDER_TAB_A; if($(box).closest('.window').find('.menu').hasClass('menu-right')){ sort_type = FM.ORDER_TAB_B; @@ -420,7 +407,7 @@ FM.sortItems = function(items, box) { switch (sort_type) { case 'type_asc': files.sort(function (a, b) { - return a.name.localeCompare( b.name ); + return a.filetype.localeCompare( b.filetype ); }); dirs.sort(function (a, b) { return a.name.localeCompare( b.name ); @@ -429,7 +416,7 @@ FM.sortItems = function(items, box) { break; case 'type_desc': files.sort(function (a, b) { - return a.name.localeCompare( b.name ); + return b.filetype.localeCompare( a.filetype ); }); dirs.sort(function (a, b) { return a.name.localeCompare( b.name ); @@ -555,8 +542,6 @@ FM.downloadFileFromSubcontext = function(elm) { FM.openFile = function(dir, box, elm) { var tab = FM.getTabLetter(box); - //FM['TAB_'+tab+'_CURRENT_PATH'] = dir; - var elm = $(elm).hasClass('dir') ? $(elm) : $(elm).closest('.dir'); var src = $.parseJSON($(elm).find('.source').val()); @@ -769,19 +754,16 @@ FM.checkBulkStatus = function(bulkStatuses, acc) { } if (status == true) { - //$('#popup .results').html(App.Constants.FM_DONE); - //$('.controls').html('

                '+App.Constants.FM_DONE+'

                '); FM.popupClose(); - - var box = FM['TAB_' + tab]; - var tab = FM.getTabLetter(FM.CURRENT_TAB); - FM.openAndSync(FM['TAB_' + tab + '_CURRENT_PATH'], box); } else { $('#popup .results').show().html(msg); - //$('.controls').html('

                '+App.Constants.FM_DONE+'

                '); $('#popup .ok').hide(); } + + var box = FM['TAB_' + tab]; + var tab = FM.getTabLetter(FM.CURRENT_TAB); + FM.openAndSync(FM['TAB_' + tab + '_CURRENT_PATH'], box, function(){}, true); } FM.bulkPopupClose = function() { @@ -901,7 +883,7 @@ FM.bulkCopy = function() { var src = $(ref).find('.source').val(); src = $.parseJSON(src); - if (!FM.isItemPseudo(o)) { + if (!FM.isItemPseudo(src)) { cfr_html += '
                '+src.name+'
                '; numberOfItems++; } @@ -1002,7 +984,7 @@ FM.bulkRemove = function() { var src = $(ref).find('.source').val(); src = $.parseJSON(src); - if (!FM.isItemPseudo(o)) { + if (!FM.isItemPseudo(src)) { cfr_html += '
                '+src.name+'
                '; numberOfItems++; } @@ -1355,7 +1337,7 @@ FM.setTabActive = function(box, action) { FM.confirmRename = function() { var tab = FM.getTabLetter(FM.CURRENT_TAB); var box = FM['TAB_' + tab]; - var selected = $(FM['TAB_' + tab] ).find('.dir.selected'); + var selected = $(FM['TAB_' + tab] ).find('.dir.active'); if (!selected) { return FM.displayError( App.Constants.FM_NO_FILE_OR_DIRECTORY_SELECTED @@ -1531,7 +1513,7 @@ FM.confirmUnpackItem = function () { FM.confirmPackItem = function () { var tab = FM.getTabLetter(FM.CURRENT_TAB); var box = FM['TAB_' + tab]; - var selected = $(FM['TAB_' + tab] ).find('.dir.selected'); + var selected = $(FM['TAB_' + tab] ).find('.dir.active'); if (selected.length == 0) { return FM.displayError( App.Constants.FM_NO_FILE_OR_DIRECTORY_SELECTED From cdcda8d1e6badfd16b719b159cd4978670468fed Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Fri, 6 Nov 2015 00:44:49 +0200 Subject: [PATCH 194/264] bulk operations for customized restore --- web/templates/admin/list_backup_detail.html | 55 +++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/web/templates/admin/list_backup_detail.html b/web/templates/admin/list_backup_detail.html index b22ff40ed..aad82ace9 100644 --- a/web/templates/admin/list_backup_detail.html +++ b/web/templates/admin/list_backup_detail.html @@ -334,9 +334,64 @@ + + +
                +
                +
                + + +
                + +
                +
                + +
                + +
                + + +
                + +
                +
                + + + + +
                +
                +
                +
                +
                +
                +
                + +
                + +
                + + +
                +
                +
                +
                +
                +
                +
                + +
                +
                +
                From 95aab70c3e2ac7bd6b4f159366a1f875dad6eb0e Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Fri, 6 Nov 2015 01:31:08 +0200 Subject: [PATCH 195/264] Release 0.9.8-15 --- src/deb/nginx/control | 2 +- src/deb/php/control | 2 +- src/deb/vesta/control | 2 +- src/deb/vesta/postinst | 27 +++------------------ src/rpm/conf/php-fpm.conf | 13 ++++++---- src/rpm/specs/vesta-nginx.spec | 2 +- src/rpm/specs/vesta-php.spec | 2 +- src/rpm/specs/vesta.spec | 44 ++++++++++++++++++++++------------ upd/add_notifications.sh | 10 ++++++++ upd/add_sudo.sh | 18 ++++++++++---- 10 files changed, 68 insertions(+), 54 deletions(-) create mode 100755 upd/add_notifications.sh diff --git a/src/deb/nginx/control b/src/deb/nginx/control index c9aa82857..708e501f9 100644 --- a/src/deb/nginx/control +++ b/src/deb/nginx/control @@ -1,7 +1,7 @@ Source: vesta-nginx Package: vesta-nginx Priority: optional -Version: 0.9.7-3 +Version: 0.9.8-15 Section: admin Maintainer: Serghey Rodin Homepage: http://vestacp.com diff --git a/src/deb/php/control b/src/deb/php/control index 31260d5ff..6a1094e61 100644 --- a/src/deb/php/control +++ b/src/deb/php/control @@ -1,7 +1,7 @@ Source: vesta-php Package: vesta-php Priority: optional -Version: 0.9.7-3 +Version: 0.9.8-15 Section: admin Maintainer: Serghey Rodin Homepage: http://vestacp.com diff --git a/src/deb/vesta/control b/src/deb/vesta/control index 795d64dc7..d33f84677 100644 --- a/src/deb/vesta/control +++ b/src/deb/vesta/control @@ -1,7 +1,7 @@ Source: vesta Package: vesta Priority: optional -Version: 0.9.8-14 +Version: 0.9.8-15 Section: admin Maintainer: Serghey Rodin Homepage: http://vestacp.com diff --git a/src/deb/vesta/postinst b/src/deb/vesta/postinst index 5e102c55d..e600138cc 100755 --- a/src/deb/vesta/postinst +++ b/src/deb/vesta/postinst @@ -1,34 +1,13 @@ #!/bin/bash -# Run fwd_only trigger -if [ -x "/usr/local/vesta/upd/add_fwd_only.sh" ]; then - /usr/local/vesta/upd/add_fwd_only.sh -fi - -# Run exim permission fixer -if [ -x "/usr/local/vesta/upd/fix_exim_permissions.sh" ]; then - /usr/local/vesta/upd/fix_exim_permissions.sh -fi - -# Run vesta permission fixer -if [ -x "/usr/local/vesta/upd/fix_vesta_ssl_permissions.sh" ]; then - /usr/local/vesta/upd/fix_vesta_ssl_permissions.sh -fi - -# Run MySQL autostart fixed -if [ -x "/usr/local/vesta/upd/fix_mysql_startup.sh" ]; then - /usr/local/vesta/upd/fix_mysql_startup.sh -fi - # Run SUDO trigger if [ -x "/usr/local/vesta/upd/add_sudo.sh" ]; then /usr/local/vesta/upd/add_sudo.sh fi -# Run Firewall trigger -if [ -x "/usr/local/vesta/upd/add_firewall.sh" ]; then - /usr/local/vesta/upd/add_firewall.sh +# Run Notification trigger +if [ -x "/usr/local/vesta/upd/add_notifications.sh" ]; then + /usr/local/vesta/upd/add_notifications.sh fi - exit 0 diff --git a/src/rpm/conf/php-fpm.conf b/src/rpm/conf/php-fpm.conf index deb95582e..7283dfdd2 100755 --- a/src/rpm/conf/php-fpm.conf +++ b/src/rpm/conf/php-fpm.conf @@ -490,8 +490,11 @@ env[LANG] = en_US.UTF-8 ; Default Value: nothing is defined by default except the values in php.ini and ; specified at startup with the -d argument -;php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f www@my.domain.com -;php_flag[display_errors] = off -;php_admin_value[error_log] = /var/log/fpm-php.www.log -;php_admin_flag[log_errors] = on -;php_admin_value[memory_limit] = 32M +php_flag[display_errors] = off +php_admin_value[error_log] = /usr/local/vesta/log/fpm-php.log +php_admin_flag[log_errors] = on +php_admin_value[memory_limit] = 256M +php_admin_value[post_max_size] = 512M +php_admin_value[upload_max_filesize] = 512M +php_admin_value[max_execution_time] = 600 +php_admin_value[max_input_time] = 600 diff --git a/src/rpm/specs/vesta-nginx.spec b/src/rpm/specs/vesta-nginx.spec index 944c399b7..9741d75eb 100644 --- a/src/rpm/specs/vesta-nginx.spec +++ b/src/rpm/specs/vesta-nginx.spec @@ -1,6 +1,6 @@ Name: vesta-nginx Version: 0.9.8 -Release: 3 +Release: 15 Summary: Vesta Control Panel Group: System Environment/Base License: BSD-like diff --git a/src/rpm/specs/vesta-php.spec b/src/rpm/specs/vesta-php.spec index 2d0213505..5dcfd28b4 100644 --- a/src/rpm/specs/vesta-php.spec +++ b/src/rpm/specs/vesta-php.spec @@ -1,6 +1,6 @@ Name: vesta-php Version: 0.9.8 -Release: 2 +Release: 15 Summary: Vesta Control Panel Group: System Environment/Base License: GPL diff --git a/src/rpm/specs/vesta.spec b/src/rpm/specs/vesta.spec index 62c7ec50f..38eae0b77 100644 --- a/src/rpm/specs/vesta.spec +++ b/src/rpm/specs/vesta.spec @@ -1,6 +1,6 @@ Name: vesta Version: 0.9.8 -Release: 14 +Release: 15 Summary: Vesta Control Panel Group: System Environment/Base License: GPL @@ -30,23 +30,11 @@ rm -rf %{buildroot} %post if [ $1 -ge 2 ]; then - if [ -e /usr/local/vesta/upd/convert_templates.sh ]; then - /usr/local/vesta/upd/convert_templates.sh - fi - if [ -e /usr/local/vesta/upd/convert_webip.sh ]; then - /usr/local/vesta/upd/convert_webip.sh - fi - if [ -e /usr/local/vesta/upd/add_fwd_only.sh ]; then - /usr/local/vesta/upd/add_fwd_only.sh - fi - if [ -e /usr/local/vesta/upd/fix_vesta_ssl_permissions.sh ]; then - /usr/local/vesta/upd/fix_vesta_ssl_permissions.sh - fi if [ -e /usr/local/vesta/upd/add_sudo.sh ]; then /usr/local/vesta/upd/add_sudo.sh fi - if [ -e /usr/local/vesta/upd/add_firewall.sh ]; then - /usr/local/vesta/upd/add_firewall.sh + if [ -e /usr/local/vesta/upd/add_notifications.sh ]; then + /usr/local/vesta/upd/add_notifications.sh fi fi %files @@ -62,6 +50,32 @@ fi %config(noreplace) %{_vestadir}/web/css/uploadify.css %changelog +* Fri Nov 06 2015 Serghey Rodin - 0.9.8-15 +- File Manager (commercial plugin) +- SFTP Chroot (commercial plugin) +- Monitoring Tools: top/free/df/server-status/mysql-status/etc +- New installer +- Improved PHP-FPM support +- UI: Notification center +- UI: Starred objects +- UI: Object sorting +- UI: HotKeys suport +- UI: Mail account settings JS hint +- UI: Autofocus on first input when adding/editing +- UI: Up to 8 nameserver dns support +- Core: Improved system logger, domain adding api and backup routine +- Japanese language support. Thanks to Flatta +- Polish language support. Thanks to MarPiRK +- Vietnamese language support. Thanks to Nguyen Ngoc Phuong +- Security Fix: Command Injection and XSS Thanks to Global IT +- BugFix: DNS Cluster SOA synchronization +- BugFix: Bulk Operation +- BugFix: Backup exclusions +- BugFix: Domain validation +- BugFix: FTP user name prefix +- BugFix: Fail2Ban manager +- BugFix: Service manager + * Wed Jun 03 2015 Serghey Rodin - 0.9.8-13 - New UI - PHP-FPM support diff --git a/upd/add_notifications.sh b/upd/add_notifications.sh new file mode 100755 index 000000000..f0e76d16f --- /dev/null +++ b/upd/add_notifications.sh @@ -0,0 +1,10 @@ +#!/bin/bash +# Add notifications + +if [ ! -e '/usr/local/vesta/data/users/admin/notifications.conf' ]; then + /usr/local/vesta/bin/v-add-user-notification admin "File Manager" "Browse, coppy, edit, view, and retrieve all of your web domain files using fully featured File Manager. Plugin is avaiable for purchase" 'filemanager' + /usr/local/vesta/bin/v-add-user-notification admin "Chroot SFTP" "If you want have SFTP accounts that will be used only to transfer files (and not to ssh), you can purchase SFTP Chroot plugin." + /usr/local/vesta/bin/v-add-user-notification admin "Starred Objects" "Use stars to easily mark certain object as important or to indicate that you need to do something about it later." 'starred' + /usr/local/vesta/bin/v-add-user-notification admin "Monitoring Tools" "This module answers common performance, health, usage and monitoring questions. Server -> Show CPU, Memory, Disk usage" + /usr/local/vesta/bin/v-add-user-notification admin "Release 0.9.8-15" "New version is cool. A lot of work has been put in the user experience and stability. Check out release notes" +fi diff --git a/upd/add_sudo.sh b/upd/add_sudo.sh index dfe5ff2b8..92518a03e 100755 --- a/upd/add_sudo.sh +++ b/upd/add_sudo.sh @@ -1,10 +1,18 @@ #!/bin/bash +# New sudoers format -if [ ! -e /etc/sudoers.d/admin ]; then - echo "# Created by vesta update-trigger" > /etc/sudoers.d/admin - echo "# $(date)" >> /etc/sudoers.d/admin - echo "admin ALL=(ALL) ALL" >> /etc/sudoers.d/admin - echo "admin ALL=NOPASSWD:/usr/local/vesta/bin/*" >> /etc/sudoers.d/admin +if [ ! -e '/etc/sudoers.d/admin' ]; then + if [ ! -d '/etc/sudoers.d' ]; then + mkidr /etc/sudoers.d + chmod 750 /etc/sudoers.d + fi + echo '# Created by vesta update-trigger' > /etc/sudoers.d/admin + echo 'Defaults env_keep="VESTA"' >> /etc/sudoers.d/admin + echo 'Defaults:admin !syslog' >> /etc/sudoers.d/admin + echo 'Defaults:admin !requiretty' >> /etc/sudoers.d/admin + echo '' >> /etc/sudoers.d/admin + echo 'admin ALL=(ALL) ALL' >> /etc/sudoers.d/admin + echo 'admin ALL=NOPASSWD:/usr/local/vesta/bin/*' >> /etc/sudoers.d/admin chmod 440 /etc/sudoers.d/admin if [ -z "$(grep /etc/sudoers.d /etc/sudoers)" ]; then From 30dc9b7154cf45e9998a1922d62c27e24f4f916a Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Fri, 6 Nov 2015 14:41:59 +0200 Subject: [PATCH 196/264] ignore tarballs --- .gitignore | 3 +++ install/debian/7/dovecot.tar.gz | Bin 3487 -> 3482 bytes install/debian/7/fail2ban.tar.gz | Bin 721 -> 706 bytes install/debian/7/firewall.tar.gz | Bin 540 -> 537 bytes install/debian/7/packages.tar.gz | Bin 562 -> 555 bytes install/debian/7/templates.tar.gz | Bin 12831 -> 12114 bytes install/debian/8/dovecot.tar.gz | Bin 3487 -> 3482 bytes install/debian/8/fail2ban.tar.gz | Bin 721 -> 706 bytes install/debian/8/firewall.tar.gz | Bin 540 -> 537 bytes install/debian/8/packages.tar.gz | Bin 562 -> 555 bytes install/debian/8/templates.tar.gz | Bin 12935 -> 12217 bytes install/rhel/5/dovecot.tar.gz | Bin 439 -> 474 bytes install/rhel/5/fail2ban.tar.gz | Bin 727 -> 693 bytes install/rhel/5/firewall.tar.gz | Bin 540 -> 537 bytes install/rhel/5/packages.tar.gz | Bin 552 -> 530 bytes install/rhel/5/templates.tar.gz | Bin 12995 -> 12051 bytes install/rhel/6/dovecot.tar.gz | Bin 2640 -> 2640 bytes install/rhel/6/fail2ban.tar.gz | Bin 727 -> 693 bytes install/rhel/6/firewall.tar.gz | Bin 540 -> 537 bytes install/rhel/6/packages.tar.gz | Bin 552 -> 530 bytes install/rhel/6/templates.tar.gz | Bin 12998 -> 12051 bytes install/rhel/7/dovecot.tar.gz | Bin 2640 -> 2641 bytes install/rhel/7/fail2ban.tar.gz | Bin 727 -> 693 bytes install/rhel/7/firewall.tar.gz | Bin 540 -> 537 bytes install/rhel/7/packages.tar.gz | Bin 552 -> 530 bytes install/rhel/7/templates.tar.gz | Bin 12995 -> 12248 bytes install/ubuntu/12.04/dovecot.tar.gz | Bin 3487 -> 3440 bytes install/ubuntu/12.04/fail2ban.tar.gz | Bin 721 -> 708 bytes install/ubuntu/12.04/firewall.tar.gz | Bin 540 -> 531 bytes install/ubuntu/12.04/packages.tar.gz | Bin 562 -> 541 bytes install/ubuntu/12.04/templates.tar.gz | Bin 12935 -> 11940 bytes install/ubuntu/12.10/dovecot.tar.gz | Bin 3487 -> 3440 bytes install/ubuntu/12.10/fail2ban.tar.gz | Bin 721 -> 708 bytes install/ubuntu/12.10/firewall.tar.gz | Bin 540 -> 531 bytes install/ubuntu/12.10/packages.tar.gz | Bin 562 -> 541 bytes install/ubuntu/12.10/templates.tar.gz | Bin 12935 -> 11941 bytes install/ubuntu/13.04/dovecot.tar.gz | Bin 3487 -> 3440 bytes install/ubuntu/13.04/fail2ban.tar.gz | Bin 721 -> 708 bytes install/ubuntu/13.04/firewall.tar.gz | Bin 540 -> 531 bytes install/ubuntu/13.04/packages.tar.gz | Bin 562 -> 541 bytes install/ubuntu/13.04/templates.tar.gz | Bin 12935 -> 11941 bytes install/ubuntu/13.10/dovecot.tar.gz | Bin 3487 -> 3440 bytes install/ubuntu/13.10/fail2ban.tar.gz | Bin 721 -> 708 bytes install/ubuntu/13.10/firewall.tar.gz | Bin 540 -> 531 bytes install/ubuntu/13.10/packages.tar.gz | Bin 562 -> 541 bytes install/ubuntu/13.10/templates.tar.gz | Bin 12935 -> 11944 bytes install/ubuntu/14.04/dovecot.tar.gz | Bin 3487 -> 3482 bytes install/ubuntu/14.04/fail2ban.tar.gz | Bin 721 -> 706 bytes install/ubuntu/14.04/firewall.tar.gz | Bin 540 -> 537 bytes install/ubuntu/14.04/packages.tar.gz | Bin 562 -> 555 bytes install/ubuntu/14.04/templates.tar.gz | Bin 12935 -> 12151 bytes install/ubuntu/14.10/dovecot.tar.gz | Bin 3487 -> 3482 bytes install/ubuntu/14.10/fail2ban.tar.gz | Bin 721 -> 706 bytes install/ubuntu/14.10/firewall.tar.gz | Bin 540 -> 537 bytes install/ubuntu/14.10/packages.tar.gz | Bin 562 -> 555 bytes install/ubuntu/14.10/templates.tar.gz | Bin 12935 -> 12152 bytes install/ubuntu/15.04/dovecot.tar.gz | Bin 3487 -> 3482 bytes install/ubuntu/15.04/fail2ban.tar.gz | Bin 721 -> 706 bytes install/ubuntu/15.04/firewall.tar.gz | Bin 540 -> 537 bytes install/ubuntu/15.04/packages.tar.gz | Bin 562 -> 555 bytes install/ubuntu/15.04/templates.tar.gz | Bin 12935 -> 12213 bytes 61 files changed, 3 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..980bc5b3c --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +*.tar +*.zip +*.gzip diff --git a/install/debian/7/dovecot.tar.gz b/install/debian/7/dovecot.tar.gz index bfabaa030981d087ea4ccd8c7b86cc4d7ab1b7c6..4d4676756cb179066421050e1c012e829df8b0e4 100644 GIT binary patch literal 3482 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 N{0}P55eWcL004dY&`|&Y diff --git a/install/debian/7/fail2ban.tar.gz b/install/debian/7/fail2ban.tar.gz index 628545b6b12d83a4dfcf4529b41f62792c228c85..7a400e6c231cba992866571410b6598f6882da13 100644 GIT binary patch literal 706 zcmV;z0zLg7iwFRoo;+3n1MQbvPunmQ$NTJ0aU>p)CZ*S;c_~P+fG2RCtA zZ;l-jrz_Gv{Oly{Xh}2q)UK{_Wvl@TfZM7>~Qx zc_ax^#^7Ej1mILo2$$5uk_rx3N)kpgK?ev8F0a2{-F44;Lo_1Foxl-zA`Au3(nuL} zNkBQ(jzgp~E+%6#Q&v#@0-cMSUjG>MW8#Apz{HqxM8{l>R2U+(?{)gDEb9Ms<_yD%%LliGEd^;<%>nYr1Kuq#C0T&tf9uNA=QC{a~5|GV;rH1I&^o z;oNwQ^m+fbTsrqE6DKnomPoJ6_z1M!LUl>>+sWnCU)3j~+QqJgm~yR)2ELdQPsnZ5 z3e#5#7GBj{E__TL*tW}B80!$NS=;Vu`O;>drD4^++e|hyET8KAS+9RmI@io-O-k*% zj6N)j{+|cqpE>{A=KQ}Cp2vUp=l}Mz_}gyN?EgFA$@yQ0oQ~5tKj5ooO|t(2d9PkR z!xybvFP+paI!$zoR%geeNslP6O)c#ERzPF&3o~YU6SXTsNB8*Sg}aE>d;5eDNj47P zO^EkXjWFMFz~W$C!R7VsT_1kKI3^KT4{$h7ax3>9z;`)3EXGiex152t?9k|V`5V&B oBdpG1b&!3>-(WBp3#Ira4D7AZL1=&Z6#&~ zz`KruB3xbg09_DCMo>VRAaZ-;y)^U@ z_5_W1em^5}=Uk3M(j5%0M~Fp}7>lVIYRqubkoOIoiK#qP6BOckLPYW;2OWgmSsIAg zuZ|mFmaYUYjJJfo8s1fhF1)IOlQ|75La(j33(9U0btUMJvtIut>QYeUVmCrexr&Qi zKbjFQ61zkzP2U-?^r{!(!l(3+?Yga{u}aaFy}dZE-rC%=GOfyYm&N9W)k}T291PDY z*P0t`IZ}uIjJ_-j{V$SH_dlT#cu)PeEcx8DI+m&H|328vfBu=(y@&@N72}Qi-)t}U ze|i14JEpGxd*KMK)CoAp98}8bBuj9v%2KQe1W{6IHF7UVKsi-oBUDPa+B%^mI!l#A z%iggR=`rPvnSp)Z2xvn7V8#q@Dyt%#D2+c|xJU7JZ=WzC$g2~0Q{w%WGdx!uFgO@} z=-u4i58*FN5)y;)2*=Nd+$g+V_$fxmCp11?eTVGz8P->^KFOi;zxe)( z;(T!ZH#>H&|F+iuy|9`8{p-KwZ0f&dYyIB`OZs27=SuT4o@Sm$(ja3D9@K#V)prvv zs8^H+ECdN-k)k768hSV1`}Y@@gAp1N=}x2^dQlk4c0wJawc4RhTtX&fF0G*c4Nk6a z2g6fPkL6zl5rJ&(DMxg|?8hvNkvLGGEmHW9!R1+hhN`r``SI^|$t6d-fcCgFOIK|2cTx z(0@?+Iwpkj77jhTk`dl{|JR$_G$f2TQQTx@5t1m5)2bm(wJw`7E^kAU#d)Ro<+=$8 zB~Di9<@)ft(c8Gp^R&>RDl0w_r{2_6S|n)_l82T!O_ukMR{;|N_{2$~M(;Ugu%xRc z^T^e+0B#e|#6y0c`ob*XOIkOPK?79*&_HK=p+PRWJZcaVH3&gHSAyVXA<2i?Dqx}t z2EtvfEXBz3sG6-pPF2CERv|6Fin0>3Rd^FsaOr|4UFj>AOKwq9=gs_@D4Uv1GN_T3 zrX)o@JHJ1*8q8%}`|6T$MlA>S<6qQbHTk@{0G4`uO-(07dj^Got5eV5aMZx))Ph(} zYF&S}m=*-U#!TzAUHg0t^Z!TN?O$j9>zF$E|0jSdod5rV@dHE2mBCs}0d5M&-vcjQ za{Lb8l)N{R@ra&6hAfO5?=e2DpYMjyVd|S?8-@EI%wN_w3hX^Rc=qr&WH<O4Mzij(@XnhsKo&*MSlh#7(1g=&0&FEG%?Me6ampuO4>y-_`!)kpP&FT0Pj|*j)GSV93 zG0u%P9?@5H>Ue&9TJ8w(mS4U;YbU>kw!5dto6pc!`1H`piz?!Qs? zZ2zTY(j)A}O)l`C?|(Hfn=&r%X0(YbN~&_+%&1`W&E*1z3IZzVUki(*D`*Kk5kQkG z1wFz!17_g@d9ch)G0;wCGL8I9sNtr~X-yEB=^d3PuoC0XT$oBik3eT~aJ zPYYM7vf@1@^`frQB1w}O-E1jovb=r04Y>?eKuHocY1?18ny~4FyPO>aM4!NUUOmFePy(-1M3SddTi>v8NVjB&*t=IgAYbgkDfmmx*FWy-yM^~-2uA1 z`-8QZ4$iCJUfZClsXi!k+gGp^gsj(jT}WJxQ(W4?Rswg^FKlTCd%;5d=XH e1VIo4K@bE%5ClOG1VIqwGCu%8Tmj4gC;$K)2?m1z diff --git a/install/debian/7/packages.tar.gz b/install/debian/7/packages.tar.gz index 4b778dadce20a61f03a8ca920ec81c55a8730fee..32db6df0ad3f28a40a514d648cce3ab79ab8c227 100644 GIT binary patch literal 555 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 literal 12831 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 N{0}P55eWcL004dY&`|&Y diff --git a/install/debian/8/fail2ban.tar.gz b/install/debian/8/fail2ban.tar.gz index 628545b6b12d83a4dfcf4529b41f62792c228c85..7a400e6c231cba992866571410b6598f6882da13 100644 GIT binary patch literal 706 zcmV;z0zLg7iwFRoo;+3n1MQbvPunmQ$NTJ0aU>p)CZ*S;c_~P+fG2RCtA zZ;l-jrz_Gv{Oly{Xh}2q)UK{_Wvl@TfZM7>~Qx zc_ax^#^7Ej1mILo2$$5uk_rx3N)kpgK?ev8F0a2{-F44;Lo_1Foxl-zA`Au3(nuL} zNkBQ(jzgp~E+%6#Q&v#@0-cMSUjG>MW8#Apz{HqxM8{l>R2U+(?{)gDEb9Ms<_yD%%LliGEd^;<%>nYr1Kuq#C0T&tf9uNA=QC{a~5|GV;rH1I&^o z;oNwQ^m+fbTsrqE6DKnomPoJ6_z1M!LUl>>+sWnCU)3j~+QqJgm~yR)2ELdQPsnZ5 z3e#5#7GBj{E__TL*tW}B80!$NS=;Vu`O;>drD4^++e|hyET8KAS+9RmI@io-O-k*% zj6N)j{+|cqpE>{A=KQ}Cp2vUp=l}Mz_}gyN?EgFA$@yQ0oQ~5tKj5ooO|t(2d9PkR z!xybvFP+paI!$zoR%geeNslP6O)c#ERzPF&3o~YU6SXTsNB8*Sg}aE>d;5eDNj47P zO^EkXjWFMFz~W$C!R7VsT_1kKI3^KT4{$h7ax3>9z;`)3EXGiex152t?9k|V`5V&B oBdpG1b&!3>-(WBp3#Ira4D7AZL1=&Z6#&~ zz`KruB3xbg09_DCMo>VRAaZ-;y)^U@ z_5_W1em^5}=Uk3M(j5%0M~Fp}7>lVIYRqubkoOIoiK#qP6BOckLPYW;2OWgmSsIAg zuZ|mFmaYUYjJJfo8s1fhF1)IOlQ|75La(j33(9U0btUMJvtIut>QYeUVmCrexr&Qi zKbjFQ61zkzP2U-?^r{!(!l(3+?Yga{u}aaFy}dZE-rC%=GOfyYm&N9W)k}T291PDY z*P0t`IZ}uIjJ_-j{V$SH_dlT#cu)PeEcx8DI+m&H|328vfBu=(y@&@N72}Qi-)t}U ze|i14JEpGxd*KMK)CoAp98}8bBuj9v%2KQe1W{6IHF7UVKsi-oBUDPa+B%^mI!l#A z%iggR=`rPvnSp)Z2xvn7V8#q@Dyt%#D2+c|xJU7JZ=WzC$g2~0Q{w%WGdx!uFgO@} z=-u4i58*FN5)y;)2*=Nd+$g+V_$fxmCp11?eTVGz8P->^KFOi;zxe)( z;(T!ZH#>H&|F+iuy|9`8{p-KwZ0f&dYyIB`OZs27=SuT4o@Sm$(ja3D9@K#V)prvv zs8^H+ECdN-k)k768hSV1`}Y@@gAp1N=}x2^dQlk4c0wJawc4RhTtX&fF0G*c4Nk6a z2g6fPkL6zl5rJ&(DMxg|?8hvNkvLGGEmHW9!R1+hhN`r``SI^|$t6d-fcCgFOIK|2cTx z(0@?+Iwpkj77jhTk`dl{|JR$_G$f2TQQTx@5t1m5)2bm(wJw`7E^kAU#d)Ro<+=$8 zB~Di9<@)ft(c8Gp^R&>RDl0w_r{2_6S|n)_l82T!O_ukMR{;|N_{2$~M(;Ugu%xRc z^T^e+0B#e|#6y0c`ob*XOIkOPK?79*&_HK=p+PRWJZcaVH3&gHSAyVXA<2i?Dqx}t z2EtvfEXBz3sG6-pPF2CERv|6Fin0>3Rd^FsaOr|4UFj>AOKwq9=gs_@D4Uv1GN_T3 zrX)o@JHJ1*8q8%}`|6T$MlA>S<6qQbHTk@{0G4`uO-(07dj^Got5eV5aMZx))Ph(} zYF&S}m=*-U#!TzAUHg0t^Z!TN?O$j9>zF$E|0jSdod5rV@dHE2mBCs}0d5M&-vcjQ za{Lb8l)N{R@ra&6hAfO5?=e2DpYMjyVd|S?8-@EI%wN_w3hX^Rc=qr&WH<O4Mzij(@XnhsKo&*MSlh#7(1g=&0&FEG%?Me6ampuO4>y-_`!)kpP&FT0Pj|*j)GSV93 zG0u%P9?@5H>Ue&9TJ8w(mS4U;YbU>kw!5dto6pc!`1H`piz?!Qs? zZ2zTY(j)A}O)l`C?|(Hfn=&r%X0(YbN~&_+%&1`W&E*1z3IZzVUki(*D`*Kk5kQkG z1wFz!17_g@d9ch)G0;wCGL8I9sNtr~X-yEB=^d3PuoC0XT$oBik3eT~aJ zPYYM7vf@1@^`frQB1w}O-E1jovb=r04Y>?eKuHocY1?18ny~4FyPO>aM4!NUUOmFePy(-1M3SddTi>v8NVjB&*t=IgAYbgkDfmmx*FWy-yM^~-2uA1 z`-8QZ4$iCJUfZClsXi!k+gGp^gsj(jT}WJxQ(W4?Rswg^FKlTCd%;5d=XH e1VIo4K@bE%5ClOG1VIqwGCu%8Tmj4gC;$K)2?m1z diff --git a/install/debian/8/packages.tar.gz b/install/debian/8/packages.tar.gz index 4b778dadce20a61f03a8ca920ec81c55a8730fee..32db6df0ad3f28a40a514d648cce3ab79ab8c227 100644 GIT binary patch literal 555 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 literal 12935 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 literal 439 zcmV;o0Z9HIiwFRS|Atin1MSnzZrmUc0AQba3NCw0@XyAnD)kNe0J&K#jI(I@vG{Qk zMf>gnoVJ@wlS88_(tHPF4>K%`Sm{;}E?x^~=jM~N*|^`=@pimybf7<|GJL6zKo_?R^%016_tV1T zF(0Je%*|Eh)#F zl9GCwoi{w@_^$nSm&#)$W$9@Je{iAf@Cm{eN&&p(1}=(zCQ|39gqbHD=`*330deG3 z1yg!k_e^uYl&zBs4?!O4@F1^h8@8%~`}$MejmIH?bnCJ`Vd$x9olU0bzM*Huc|mn;ts zn8X_x3MOl%efXV$bWK9iOiDUcyWa~o-1)GN{~ZAnVQb8!)z}|4((Sg3E3$ko#!k!a zxK6j_blryS;LL46dynt*LY^s>0yNS%R-5eJdj3HP=J}rwn%{BI^kNz8EQU^S2NSv` z|IU%!(fMyVZrgTSI{&WQJ!*ixvp3klf1dwgmQ78OC^imxHZr)>10Uc7RGM=m5TW9D zJUB-~-(a2+u`K2@jwd&iEaE5q{?*6`<4MBQR6nw2EVXcMW!%eCZba-Uc ztcVFIO~JmX%hwux4m{$;?*s|puAXOH2w$66V)Tus-U?fF^#(UzWdM_V{=v)jV3 zey1f(BV}504M+el%Zk6 literal 727 zcmV;|0x10-iwFR>PexP#1MQbfPvbBU$9vAF7>NVYN@*TV+6y4T0s@I;ky^NPdvKFU z>fOW%iPHsXKm6KBD6~yWk)Yj&f0yPl@i_R>*Fv5J=ZON1&hDswPicD z-1Fox50A!rzlpW?IkRDFAW*suH&qXf7i60>)#Z1meaHC7MSn#0qgkB384%Q7>V&{=ANXhy?u<3!{eK%Q$AA0%-*(NV{@+pke=EG`|5XN*J-=Xi;dz(`MHIoEOb8$apCIGZtF{Ni zImRi^wLP&lTwZ^^x;;JXkF+rgcNFc=OX64@CuABe>>V=WG7RxSSV8*}99(?u4~{@S zMjv=VUA66~gC(n`Yt4OXPF7D2@*_ZjfG>?;%LLnd+SA zm*dN;XVn*?(#43yDYewqhJG?dFX5Z0)uwM0ti5Wv_%XkaHeJ@*Sa$UlYkPXqytI{P z)6$mCo6NTQOVK#jyR-h_xN)-8sak&Uvi7d4NTER9egiTc J?8hvNkvLGGEmHW9!R1+hhN`r``SI^|$t6d-fcCgFOIK|2cTx z(0@?+Iwpkj77jhTk`dl{|JR$_G$f2TQQTx@5t1m5)2bm(wJw`7E^kAU#d)Ro<+=$8 zB~Di9<@)ft(c8Gp^R&>RDl0w_r{2_6S|n)_l82T!O_ukMR{;|N_{2$~M(;Ugu%xRc z^T^e+0B#e|#6y0c`ob*XOIkOPK?79*&_HK=p+PRWJZcaVH3&gHSAyVXA<2i?Dqx}t z2EtvfEXBz3sG6-pPF2CERv|6Fin0>3Rd^FsaOr|4UFj>AOKwq9=gs_@D4Uv1GN_T3 zrX)o@JHJ1*8q8%}`|6T$MlA>S<6qQbHTk@{0G4`uO-(07dj^Got5eV5aMZx))Ph(} zYF&S}m=*-U#!TzAUHg0t^Z!TN?O$j9>zF$E|0jSdod5rV@dHE2mBCs}0d5M&-vcjQ za{Lb8l)N{R@ra&6hAfO5?=e2DpYMjyVd|S?8-@EI%wN_w3hX^Rc=qr&WH<O4Mzij(@XnhsKo&*MSlh#7(1g=&0&FEG%?Me6ampuO4>y-_`!)kpP&FT0Pj|*j)GSV93 zG0u%P9?@5H>Ue&9TJ8w(mS4U;YbU>kw!5dto6pc!`1H`piz?!Qs? zZ2zTY(j)A}O)l`C?|(Hfn=&r%X0(YbN~&_+%&1`W&E*1z3IZzVUki(*D`*Kk5kQkG z1wFz!17_g@d9ch)G0;wCGL8I9sNtr~X-yEB=^d3PuoC0XT$oBik3eT~aJ zPYYM7vf@1@^`frQB1w}O-E1jovb=r04Y>?eKuHocY1?18ny~4FyPO>aM4!NUUOmFePy(-1M3SddTi>v8NVjB&*t=IgAYbgkDfmmx*FWy-yM^~-2uA1 z`-8QZ4$iCJUfZClsXi!k+gGp^gsj(jT}WJxQ(W4?Rswg^FKlTCd%;5d=XH e1VIo4K@bE%5ClOG1VIqwGCu%8Tmj4gC;$K)2?m1z diff --git a/install/rhel/5/packages.tar.gz b/install/rhel/5/packages.tar.gz index 269d9bee0b4daf7297f7c0f253ab0208388a9940..8aef35a077431424b5d089a98aedad2e5bf60853 100644 GIT binary patch literal 530 zcmV+t0`2`DiwFRio;+3n1MQbfZ<|06fPMC_@Qq93?g9e}QVwfC3JnI=U?n|SG@;ZA z0?Uv?|9yA;pykmfk+9>m^9czvyUQ+&zx8+>-9JW2TzniH55mzw-JUtk^Y$~9K~afD ziOl;^s>s@41V>y`#Zys6o6%^n$@B7W{hn)or>qb8Poh;;e9brcc>S34JBLWHrv5qq zpg|-5Dv_1Ji1fRRZvON9-`bO9XisM@3+*fEA^sLUrKL2SF!RRttgfcn+`s$M)nIu+ zS6Iwo`BUb2!IebGF2G!e1@=B52G)9rz}z#pY9 z_m-dh$)VK=ZkC@He#pc%M?9ow-8xoyT}8y*vx1J({60#*=S4YA%ZCqHA=e|)Fu1l| zm-o%nJXvMC_qCXbsia}(O!@OuYAF2Jt&3mFgu(^UE(l1&w@&(RRQ|7{G)^{goSldN zL`MHlLEV4x1z%;!tNgFVyu^QK`VUS2q3J)g{D-#xQ1>6|{zJomX!#F)`40#GiEgNu zhN{08|BEy##Rl->4gA-&mj5b6|4+fmfB)MBK)V8HmjE3#KvxmatOA;4z{~1@UN!=y zDgKw14r{^e%i}$_Lff$-X>#M3Xt{ZxoC^E&A z5MGC|ig9nCoba6lFGU%x2ZLU;_`b}3Q}?I&zm(Os|EnmClXVth#pl)B|IRAP7AMMdRw8svL}te)>+`D4TJf;&k;wP3i85!f4nFKkqBVQQQH)Y=Ga&TW=dieZ}m z%nP@xjL;bEo@!2gZ~nm_ZD*a}Vg7OEhXx-r_(yuyqhp2lLg7!(3Or2nrzqtgHcZRK zyR0BhMd}Clw(GLmJk673R{vkK3ExWUht8ONKhku1t5dCdFE%C!D>q2JL9F7^P2WTK zzeuB!2f&XD_+L{G@}J5C{C^gj{uicwga5_EYy6MVVE|N0BLRdWBA`;58L*RfAy6;e zr9d^_i-CH6F9&cd2P&nLAdt5~fQc^O>R7(cAQ1jfqGeWm$=CUX&wo_=A7SwSIXJuj zTlR0czh(Zm_m5cr!1)Kpf0ggMuss&G$GXgZ=sImL5dPovt9$pq?fl1F$Fimn@c%i0 q^Z(@MKh~+LE7u+b0000000000000000002MKgCa859^TtC;$NBUl=j~ diff --git a/install/rhel/5/templates.tar.gz b/install/rhel/5/templates.tar.gz index 6a2fd89099235ba19e1e41e099639d3b4b6d9b66..89e987a503623f985ec3824f4b47c2f59009a043 100644 GIT binary patch literal 12051 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 literal 12995 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 literal 727 zcmV;|0x10-iwFR>PexP#1MQbfPvbBU$9vAF7>NVYN@*TV+6y4T0s@I;ky^NPdvKFU z>fOW%iPHsXKm6KBD6~yWk)Yj&f0yPl@i_R>*Fv5J=ZON1&hDswPicD z-1Fox50A!rzlpW?IkRDFAW*suH&qXf7i60>)#Z1meaHC7MSn#0qgkB384%Q7>V&{=ANXhy?u<3!{eK%Q$AA0%-*(NV{@+pke=EG`|5XN*J-=Xi;dz(`MHIoEOb8$apCIGZtF{Ni zImRi^wLP&lTwZ^^x;;JXkF+rgcNFc=OX64@CuABe>>V=WG7RxSSV8*}99(?u4~{@S zMjv=VUA66~gC(n`Yt4OXPF7D2@*_ZjfG>?;%LLnd+SA zm*dN;XVn*?(#43yDYewqhJG?dFX5Z0)uwM0ti5Wv_%XkaHeJ@*Sa$UlYkPXqytI{P z)6$mCo6NTQOVK#jyR-h_xN)-8sak&Uvi7d4NTER9egiTc J?8hvNkvLGGEmHW9!R1+hhN`r``SI^|$t6d-fcCgFOIK|2cTx z(0@?+Iwpkj77jhTk`dl{|JR$_G$f2TQQTx@5t1m5)2bm(wJw`7E^kAU#d)Ro<+=$8 zB~Di9<@)ft(c8Gp^R&>RDl0w_r{2_6S|n)_l82T!O_ukMR{;|N_{2$~M(;Ugu%xRc z^T^e+0B#e|#6y0c`ob*XOIkOPK?79*&_HK=p+PRWJZcaVH3&gHSAyVXA<2i?Dqx}t z2EtvfEXBz3sG6-pPF2CERv|6Fin0>3Rd^FsaOr|4UFj>AOKwq9=gs_@D4Uv1GN_T3 zrX)o@JHJ1*8q8%}`|6T$MlA>S<6qQbHTk@{0G4`uO-(07dj^Got5eV5aMZx))Ph(} zYF&S}m=*-U#!TzAUHg0t^Z!TN?O$j9>zF$E|0jSdod5rV@dHE2mBCs}0d5M&-vcjQ za{Lb8l)N{R@ra&6hAfO5?=e2DpYMjyVd|S?8-@EI%wN_w3hX^Rc=qr&WH<O4Mzij(@XnhsKo&*MSlh#7(1g=&0&FEG%?Me6ampuO4>y-_`!)kpP&FT0Pj|*j)GSV93 zG0u%P9?@5H>Ue&9TJ8w(mS4U;YbU>kw!5dto6pc!`1H`piz?!Qs? zZ2zTY(j)A}O)l`C?|(Hfn=&r%X0(YbN~&_+%&1`W&E*1z3IZzVUki(*D`*Kk5kQkG z1wFz!17_g@d9ch)G0;wCGL8I9sNtr~X-yEB=^d3PuoC0XT$oBik3eT~aJ zPYYM7vf@1@^`frQB1w}O-E1jovb=r04Y>?eKuHocY1?18ny~4FyPO>aM4!NUUOmFePy(-1M3SddTi>v8NVjB&*t=IgAYbgkDfmmx*FWy-yM^~-2uA1 z`-8QZ4$iCJUfZClsXi!k+gGp^gsj(jT}WJxQ(W4?Rswg^FKlTCd%;5d=XH e1VIo4K@bE%5ClOG1VIqwGCu%8Tmj4gC;$K)2?m1z diff --git a/install/rhel/6/packages.tar.gz b/install/rhel/6/packages.tar.gz index 8159005437ddef03e93df18548119984a8ee56b6..8aef35a077431424b5d089a98aedad2e5bf60853 100644 GIT binary patch literal 530 zcmV+t0`2`DiwFRio;+3n1MQbfZ<|06fPMC_@Qq93?g9e}QVwfC3JnI=U?n|SG@;ZA z0?Uv?|9yA;pykmfk+9>m^9czvyUQ+&zx8+>-9JW2TzniH55mzw-JUtk^Y$~9K~afD ziOl;^s>s@41V>y`#Zys6o6%^n$@B7W{hn)or>qb8Poh;;e9brcc>S34JBLWHrv5qq zpg|-5Dv_1Ji1fRRZvON9-`bO9XisM@3+*fEA^sLUrKL2SF!RRttgfcn+`s$M)nIu+ zS6Iwo`BUb2!IebGF2G!e1@=B52G)9rz}z#pY9 z_m-dh$)VK=ZkC@He#pc%M?9ow-8xoyT}8y*vx1J({60#*=S4YA%ZCqHA=e|)Fu1l| zm-o%nJXvMC_qCXbsia}(O!@OuYAF2Jt&3mFgu(^UE(l1&w@&(RRQ|7{G)^{goSldN zL`MHlLEV4x1z%;!tNgFVyu^QK`VUS2q3J)g{D-#xQ1>6|{zJomX!#F)`40#GiEgNu zhN{08|BEy##Rl->4gA-&mj5b6|4+fmfB)MBK)V8HmjE3#KvxmatOA;4z{~1@UN!=y zDgKw14r{^e%i}$_Lff$-X>#M3Xt{ZxoC^E&A z5MGC|ig9nCoba6lFGU%x2ZLU;_`b}3Q}?I&zm(Os|EnmClXVth#pl)B|IRAP7AMMdRw8svL}te)>+`D4TJf;&k;wP3i85!f4nFKkqBVQQQH)Y=Ga&TW=dieZ}m z%nP@xjL;bEo@!2gZ~nm_ZD*a}Vg7OEhXx-r_(yuyqhp2lLg7!(3Or2nrzqtgHcZRK zyR0BhMd}Clw(GLmJk673R{vkK3ExWUht8ONKhku1t5dCdFE%C!D>q2JL9F7^P2WTK zzeuB!2f&XD_+L{G@}J5C{C^gj{uicwga5_EYy6MVVE|N0BLRdWBA`;58L*RfAy6;e zr9d^_i-CH6F9&cd2P&nLAdt5~fQc^O>R7(cAQ1jfqGeWm$=CUX&wo_=A7SwSIXJuj zTlR0czh(Zm_m5cr!1)Kpf0ggMuss&G$GXgZ=sImL5dPovt9$pq?fl1F$Fimn@c%i0 q^Z(@MKh~+LE7u+b0000000000000000002MKgCa859^TtC;$N0s~9Z+ diff --git a/install/rhel/6/templates.tar.gz b/install/rhel/6/templates.tar.gz index c81c85510aeb8c669dd3d2f1e5f2fb2fdf26c1c0..3131a4f46f762bf1e308f20abed3eee3700ca3d0 100644 GIT binary patch literal 12051 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 e^4E43>S<5_kRF#0dYY9 literal 12998 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 literal 2640 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 diff --git a/install/rhel/7/fail2ban.tar.gz b/install/rhel/7/fail2ban.tar.gz index 563451b41911801445523d68e3fe4f910f1adc7c..0880bf8947ed13bd12809586ca3ae65062960b2c 100644 GIT binary patch literal 693 zcmV;m0!sZKiwFRio;+3n1MQYkZ<{a>$MejmIH?bnCJ`Vd$x9olU0bzM*Huc|mn;ts zn8X_x3MOl%efXV$bWK9iOiDUcyWa~o-1)GN{~ZAnVQb8!)z}|4((Sg3E3$ko#!k!a zxK6j_blryS;LL46dynt*LY^s>0yNS%R-5eJdj3HP=J}rwn%{BI^kNz8EQU^S2NSv` z|IU%!(fMyVZrgTSI{&WQJ!*ixvp3klf1dwgmQ78OC^imxHZr)>10Uc7RGM=m5TW9D zJUB-~-(a2+u`K2@jwd&iEaE5q{?*6`<4MBQR6nw2EVXcMW!%eCZba-Uc ztcVFIO~JmX%hwux4m{$;?*s|puAXOH2w$66V)Tus-U?fF^#(UzWdM_V{=v)jV3 zey1f(BV}504M+el%Zk6 literal 727 zcmV;|0x10-iwFR>PexP#1MQbfPvbBU$9vAF7>NVYN@*TV+6y4T0s@I;ky^NPdvKFU z>fOW%iPHsXKm6KBD6~yWk)Yj&f0yPl@i_R>*Fv5J=ZON1&hDswPicD z-1Fox50A!rzlpW?IkRDFAW*suH&qXf7i60>)#Z1meaHC7MSn#0qgkB384%Q7>V&{=ANXhy?u<3!{eK%Q$AA0%-*(NV{@+pke=EG`|5XN*J-=Xi;dz(`MHIoEOb8$apCIGZtF{Ni zImRi^wLP&lTwZ^^x;;JXkF+rgcNFc=OX64@CuABe>>V=WG7RxSSV8*}99(?u4~{@S zMjv=VUA66~gC(n`Yt4OXPF7D2@*_ZjfG>?;%LLnd+SA zm*dN;XVn*?(#43yDYewqhJG?dFX5Z0)uwM0ti5Wv_%XkaHeJ@*Sa$UlYkPXqytI{P z)6$mCo6NTQOVK#jyR-h_xN)-8sak&Uvi7d4NTER9egiTc J?8hvNkvLGGEmHW9!R1+hhN`r``SI^|$t6d-fcCgFOIK|2cTx z(0@?+Iwpkj77jhTk`dl{|JR$_G$f2TQQTx@5t1m5)2bm(wJw`7E^kAU#d)Ro<+=$8 zB~Di9<@)ft(c8Gp^R&>RDl0w_r{2_6S|n)_l82T!O_ukMR{;|N_{2$~M(;Ugu%xRc z^T^e+0B#e|#6y0c`ob*XOIkOPK?79*&_HK=p+PRWJZcaVH3&gHSAyVXA<2i?Dqx}t z2EtvfEXBz3sG6-pPF2CERv|6Fin0>3Rd^FsaOr|4UFj>AOKwq9=gs_@D4Uv1GN_T3 zrX)o@JHJ1*8q8%}`|6T$MlA>S<6qQbHTk@{0G4`uO-(07dj^Got5eV5aMZx))Ph(} zYF&S}m=*-U#!TzAUHg0t^Z!TN?O$j9>zF$E|0jSdod5rV@dHE2mBCs}0d5M&-vcjQ za{Lb8l)N{R@ra&6hAfO5?=e2DpYMjyVd|S?8-@EI%wN_w3hX^Rc=qr&WH<O4Mzij(@XnhsKo&*MSlh#7(1g=&0&FEG%?Me6ampuO4>y-_`!)kpP&FT0Pj|*j)GSV93 zG0u%P9?@5H>Ue&9TJ8w(mS4U;YbU>kw!5dto6pc!`1H`piz?!Qs? zZ2zTY(j)A}O)l`C?|(Hfn=&r%X0(YbN~&_+%&1`W&E*1z3IZzVUki(*D`*Kk5kQkG z1wFz!17_g@d9ch)G0;wCGL8I9sNtr~X-yEB=^d3PuoC0XT$oBik3eT~aJ zPYYM7vf@1@^`frQB1w}O-E1jovb=r04Y>?eKuHocY1?18ny~4FyPO>aM4!NUUOmFePy(-1M3SddTi>v8NVjB&*t=IgAYbgkDfmmx*FWy-yM^~-2uA1 z`-8QZ4$iCJUfZClsXi!k+gGp^gsj(jT}WJxQ(W4?Rswg^FKlTCd%;5d=XH e1VIo4K@bE%5ClOG1VIqwGCu%8Tmj4gC;$K)2?m1z diff --git a/install/rhel/7/packages.tar.gz b/install/rhel/7/packages.tar.gz index b857a50997708f615e832c6d84353378180f0280..8aef35a077431424b5d089a98aedad2e5bf60853 100644 GIT binary patch literal 530 zcmV+t0`2`DiwFRio;+3n1MQbfZ<|06fPMC_@Qq93?g9e}QVwfC3JnI=U?n|SG@;ZA z0?Uv?|9yA;pykmfk+9>m^9czvyUQ+&zx8+>-9JW2TzniH55mzw-JUtk^Y$~9K~afD ziOl;^s>s@41V>y`#Zys6o6%^n$@B7W{hn)or>qb8Poh;;e9brcc>S34JBLWHrv5qq zpg|-5Dv_1Ji1fRRZvON9-`bO9XisM@3+*fEA^sLUrKL2SF!RRttgfcn+`s$M)nIu+ zS6Iwo`BUb2!IebGF2G!e1@=B52G)9rz}z#pY9 z_m-dh$)VK=ZkC@He#pc%M?9ow-8xoyT}8y*vx1J({60#*=S4YA%ZCqHA=e|)Fu1l| zm-o%nJXvMC_qCXbsia}(O!@OuYAF2Jt&3mFgu(^UE(l1&w@&(RRQ|7{G)^{goSldN zL`MHlLEV4x1z%;!tNgFVyu^QK`VUS2q3J)g{D-#xQ1>6|{zJomX!#F)`40#GiEgNu zhN{08|BEy##Rl->4gA-&mj5b6|4+fmfB)MBK)V8HmjE3#KvxmatOA;4z{~1@UN!=y zDgKw14r{^e%i}$_Lff$-X>#M3Xt{ZxoC^E&A z5MGC|ig9nCoba6lFGU%x2ZLU;_`b}3Q}?I&zm(Os|EnmClXVth#pl)B|IRAP7AMMdRw8svL}te)>+`D4TJf;&k;wP3i85!f4nFKkqBVQQQH)Y=Ga&TW=dieZ}m z%nP@xjL;bEo@!2gZ~nm_ZD*a}Vg7OEhXx-r_(yuyqhp2lLg7!(3Or2nrzqtgHcZRK zyR0BhMd}Clw(GLmJk673R{vkK3ExWUht8ONKhku1t5dCdFE%C!D>q2JL9F7^P2WTK zzeuB!2f&XD_+L{G@}J5C{C^gj{uicwga5_EYy6MVVE|N0BLRdWBA`;58L*RfAy6;e zr9d^_i-CH6F9&cd2P&nLAdt5~fQc^O>R7(cAQ1jfqGeWm$=CUX&wo_=A7SwSIXJuj zTlR0czh(Zm_m5cr!1)Kpf0ggMuss&G$GXgZ=sImL5dPovt9$pq?fl1F$Fimn@c%i0 q^Z(@MKh~+LE7u+b0000000000000000002MKgCa859^TtC;$NH%NR8P diff --git a/install/rhel/7/templates.tar.gz b/install/rhel/7/templates.tar.gz index fd86c50695d8193d1085ecc07a66b0355032bae9..07519a418fbb035debdab953421bd57f01fd492f 100644 GIT binary patch literal 12248 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 Q^lKzSg4c>j!6-=o2OPb^c>n+a literal 12995 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 SsG){05B~$V=xn|KPyhhU>Y)z+ literal 3487 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 N{0}P55eWcL004dY&`|&Y diff --git a/install/ubuntu/12.04/fail2ban.tar.gz b/install/ubuntu/12.04/fail2ban.tar.gz index 628545b6b12d83a4dfcf4529b41f62792c228c85..9542e273c3a7e4485b7de15a22896decf78420d7 100644 GIT binary patch literal 708 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 diff --git a/install/ubuntu/12.04/packages.tar.gz b/install/ubuntu/12.04/packages.tar.gz index 4b778dadce20a61f03a8ca920ec81c55a8730fee..7513b71900f7ac41e3db5cee0b7338dc924f2858 100644 GIT binary patch literal 541 zcmV+&0^lsi!0%DpbCwl-MOND-hIYIMT`=p zVJaYu6`~3wcEUB)JQroO9gT!-o|nHH_ow_jWpk*160Ni1OTNv=o2O*hXYc~6l)hSj zrjSGMbJg~4$e_`zdRnBb=*+mS~^p{?ExXTEQ>Caish3~CC`qM+! z32s++OFuODb%i8O4bQrFtnj9e@Y%BhkJJ1iO26erIZn&R4_QH)5lIYgY}c*E=4qa+ zGd`7hyPWe!Nn+^Cs_&1nu2jd%x~gk}Fp-fa6IBu~UD@NP{oh1soNVJbdmH{&Y4HCH zH2vql{dJaf{jU?p_|Mw@v$p@N?LX`I&$|AzrvI$zKWq8VI{vev{AUOMk*3p$PPJeB zS7fBhd@s6mWsjrwzeuB!Zvfvf;6GJ5{wo^ze-2Lb|KDu@x*b5b1?cGk`kH`t7tn44 zj_U&k*$9-n5g@uU(XrBO1ST?h>l;Ds|Gt#N+y6KID^#W6|2Y8vhw&flRMi>k`2TKR f1ONa4000000000000000fPab~sIF|O04M+eNkA7N literal 562 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
                JXql@HLvN@Zghx7di_zx{Jl{l=j8>Rd0iuIDly5)|igW-~8Wh{82vJVRya(Gh28$Tg zNYvQTi%N?bCT;d~G|V4#+1?=$n)3*Hxd;vcbUYEFUd2Vb0A2Nu&?ll{P)8UPg|y7h zt|X>^>LNVb{#blXPfp^$?bprv6EHIeJC+ep4Snj{tkXIm5nFTt8ER^2OuVN!m)S0X zvQb6&n|xqJy&%>~Sa#2_Yw!4`{PZWwbk?(I*2wCsAP|b1st=@4l>#FI_0_}g{H+*3$S0l%u3ywW7$1|v! zaSpbH0u!@>L3X&jg3KQY$hH&phHZrY?~(zKk;K(>(uzNUH- zAZr2aY7}3oR5yTsUaxfjflMoKr|}3vF~{kr4v~c0PlCr#@)7#+3hHvro10o+MqFfo zt~mW?mKeRX>@k4lKg0BMFm;nxaf$PA{1_x*m9s`ei8?E;LBeQjPh;<^BC`vhy=8L5 z7V&1ruJ_U4bC3GCMbrm^YMib4{f-))$Pn`w@a>Pczvf0da-TC@FN1z}mO*A+i99yD z?0_qiI--5?Hby9TD1ip5FaHrL{|FqiUo?X}p29l2ChO3TRP!Rgae*d8XFjXt@lt+2 z(l{O@3MS9x?sg^QXz>(gRF%k(P@nrEjix>Us|FT-+Fwyk>$Q|s_U^a(#+sJf>R0Nk`o%iVEFD>Xu zX43CaBLt7SlSZr>sgwQU=RQ?pa1EU9vC%~c0OR;rBBGUX^6$}2?3>@PSr6go;#A(uRDeJ?r@yt7-{CNjWf$})#`?+ zFPi}mLdWU?k8*Asj=i8JW*@(>J$VC6@%xc~i?g{NFuI%b>=Cb=x3dd$gWg89atW(} zpW$UJH1jFz$K_|Mdo@4XPjjfTLC3Gi)5C_Tc`q8ZDaaS`YX<7~dyc5&+<)V>LrNWw zh|!H@H;_j8_QnQ8l%L8S%>>Q6l5&oGx5~mB7`a#+TWdF^-blaz8YHi*1i^s*##_FvY061=ALqeLd@J$ksHKP z6_vt~i+S&GRR-uk{ed{m2-yA_H6$NcWKeg!b{27o$qN>%+`hm|M zjQrW{eCJpuGlA6OeZNfM*=pe}a)<^~85he}>OE)56_#oGj@puBeg(|;|IxYaXiy&W z-AMMgq<11R%N9ux>R`07CGmPg{W}5dS5v*+RO%`%2QJ-e;6wr@WSo`q^vbpL23}{-71LD?wbSfJb|su5Qg-`CAXhJ6+on33>{I+|^K- zwa7vH3&QmHz2^_T7v2|u1D=jPRs7J?tysxYHt}Nodch%A_&)zMU(j;!`Bbyj0TGQZ zgoKK6jAUQ9a@LP44T9G;z`OFrKX#;sY}9qa3lXQEOut~tlYwZ(?ZXJ~+*(Uv8-?OC zK@NPFkb5V}86w*SD@mDPYD@YSWld@SMH-SkDS26r`r#wM>+(6gP5fS^a8F+sQQ$AA z4fhEU3Tg%Pg)azCL0)w80A(D^hvW*Ci3fRZR8*wwYt}`wMO=4aP7;2-&-EBPV(4cC zH*B^a>!6#azD6inJFwDaC@>201+*`Gm|-5GvFBj>dq9HttUjkJrGq6*7Q}3zGXi^! z+6TPWFZ3J%%rLWIfEKuFqgw;~m|n%79-+Vtadf%`#ET?~C{b#zg9h=&%IS%aFFo`# zNz8vjOOT+`_?p3T0XSE|Ij;d14@Pq^7o$@=1#quf2em$bvWY{l25Q3mFo194!B^Wsg34TJo+;u3;H zh)L68Y8_|n67v>dYp`@xip(ip-0eD;*)jEGuvc-g zmy*qWG(*DDS}Ym#Gs_tjzdh+(;~4jRG3r_pG74zmV*LXIOvP)OSizs4Wc%`@)hbqp5NwjpbcWEw62}W!p z*6|8cobtEeznxZ0F6#XOvo1E@jd zVB@0*+6D6lQ4$(WvC9keSb2MA9kh3)cKl`9lI2`X<_~1cx(V?8$?dig&%>`jKhcrH zGOhC<_!_p)3f}RjY-u8T-)7A%ex2|e`Rq7Da7~%Th32T?PtqT*=7(eaSVvv~-XwzU zrcyVdjp8A8p^dJmXd|m`kJnSJW01feAbrsqaPu~szeWfXH#`8EGGv~_Dbt?S*;r3P z+}1k^|A$;`Hk=Q!Cmfl|LH)`E&U7(tYJ?`&ZzQ9ySb(Eg9}x1|R_ir(zeM42xB=w)0Si$1$NjQTY`AjI?K{SLxzowsX7ZMHi$ zLFA$2ZD*1Z4Y)}Z#W9$I5IUBjLTV9>dp?^gk?KBz@EG=l>nNr+5t2=F1r$$z^twyC zNq{ZCUfd`A7U@Z{&xR!>o4_Fi9-f2LSp%6b(gEM6f_|W}=o0nyXB*!)CA5X?cic3J zQfWU@t(aj(LiOCyeCJL?@YViMMpdULAq2o{4EXP50tIP88CBjjggq-9$J2RU%|1>q zpK9HJ|NC{fQ9kR~e+8N762QdQ|MQ{p$7c{aOq^LnAo95Hae$Uw>hrTlC*Tu)^?A$3rSL#CItz$MK1{#+IIg(P~= zJ>=DZL*G&lxs#hoNz(_dN*L8V2j_f`aP`%iuGN*yF>+%qw-)11PM{Ar!r$TT66xe0 zJsjRCsn&DIEa4m7=bPVKn!*bfTNzcp&L<~ax@$1iqFZ}7yN0u?f+oy$MkR(f!+NWZ z(u|hpY)YTt9dFxTw(*2$}hHhUwJ08-EcnsmZ)-)(-JHS9zNH zKz3TfERImV)15?rnW04WX@E~}+rox?xSHL$^QCcO*4XBhp0L50c!+rg6KCGVIEZH< z+t~QG?0*37FdMe)O?Rm8h(vuncDQHxsj;!;~aoa;ky5pJO-1#@P4%gP=#nVflB&Rn9tL>xE=c2rAyI*><1|WYKK{@dlzKc(0vzK>Hzj6;_pI3=EkI&^?r z%~mU;QU1%QT{_gI%1{qhL;4q3N@E!ZSjS;&haPdV+Yz=5OS2lGrd+ev_TcPdT71{*QLSCls~=|+ynm} z-o9y$nn?iQ;7Um&Bp>mzL+}%Dk*DeLQvxUCHP@_(zF`DUGd5J*c*7E^@Y?4B`~c9eHy;l}b<2I*SECD}i)|-wJLnUGN}~_Ce$cmPWlvGO{qt{5 zuU{^}k9m*)tlyx`v5H1FHee|FjReBJAikh=v)yb9Tgln!p#qUigH#v`%S}~@s9fsh z3r`b*c;yokkH11-cCcrp1UWqGkLaQUs|R|BbzRST__8HjWQy%pcMXo=h8P>QhKn9; zszXG5{30ITQ>UfzkHZns5=6fz1B`yd(`Ds2SKN|eYsdXXIlQ%YPN~{AvNMq^gQkvMwNdVoXleSVR zlX;$}T{H>n{;XpA{b=84d{AQVR+*RIQs%f3!|w}zgK1AhRp`0PcGzz%%9-EkmzBK1 zmk2syi~NO4GPKo&JG(qM?Hes)SJK0go@%q&E9t+dkv1g;81K5OrgB8T7_6)BHlYN4 zShcQtoDHhOKluPAYVXEX1hb5NchbG3qfJ{x!h33I--$j;U#;Zp;%Cr#aN}L4XbE^$ zF{juQPJh$?b}jnX0amS$Qkf%&Oix~}CO{HVi&4ajtls!f2O~i!>A+ogm2@VY3;7-s zA=_=+jZ%6^(bY_;okh{_&%ZlwQa6EP7OB$N+iO2ba(^C_TirN2UWkYn@9thy8RcOZnxL#y*t}1T|4AXp=4A~X%s<6qx9Wb(0JH#Q1%sY-W0hzN*RQPfteP)EUGMO3}+1N<6vdULc=>%S~3;rPEEOyI$6~{aYSOk{LB9TmO=&>6W z3+9Z@uqoOhw}Q=tUa&|d(_#@}!-a;;C0K8mO$C|dSUm{SWJa-t%HYX@B|-$uDyF$K zg4s|SCMPsH6_)U9-YVs=b3M&s*m{#G%{CuXX>lS<5}QnDt+Zik0?xuiGhO-G+iDCLH(%M+0(Gt^tS7jc6H>7-{89LiJfO`{C_vO#7>iU({v5EGt77WbV-YRn@N!6=`%Q*K$T9I$^@zq{>- z4dC)sX7S`Px6D`#dUQy`tRYzo_OyV$ge^^`PuC|pu(iULE*8p2~C*sC=+Zf=**;_ zTVHK82@!~prc6O72?#0WV;O;nfHsu?Whv5%6LQ`fwk^D=$G&>|-Ehd>zCOC%DYb36 zd;v5&LcdpYr^;~1IhPiwuyX-hZ4Q56H&#Xw3xx*#O_W8O8Si7P;0B47|~%0rWeP~^=rH+SV@)w(tE{X!GX;J9T~WwRkot~v4KPN zM(KMF*Ng;^p&OWSEmdX;gyU>#aG+IcfHJ8KT)e;#>@c8@F;~xq?Xx3b`oF+<>d}5~He?12;+a%J( z1CP^4u;IW3cCY1Gg%`IOYLRXG4`u!zLLK z`UmH}?Ghh4coTxole65s04y9LLE`*5UNaMh*F2#MkL|HbWszVo^x^3~xEipDCBB>j zfyPOOOB>FYLc!2s7KtBfmB?R+kLdj%@B!wE%9JAZ{=|c zymMNL?KTATLXV{mFfaj5U^AW!Z&Yx)z|nJl^lo@}JD7l9hye!)D1Z+;tcZ#vwgA+J zHe*}uEl}ghL_Rnx%r|!yidF>VtCSAnbJ)i$?XGg5Qpy#qVD%RLFFGt>8%BN*4O+8I z!1QFWvR8!*k;%rbNyJN42Cc=T{&cB~h#(*_8YL|{zqxx&`YDT8Uts~cM&!eeS79Wa zh`h)OPl3Wn{z7M1K%5uJ7K9nvjE_M{k&mQEsL4xQQ!N(2dC5yVD~ejLxe z36@nsw~1K>qza^RL>i$)mqo!8RR)7>YZ+uKPMs`kG_N=U@H2n7tl@F~Z%p*G*Z)uE z|J}Vu`G0S(U*G?q13=oKmkWrm@M+`=jrXQ++nLerNclW!&jc{24TEhQbYVw$zP7aB zUMzmoe3!NK4t&A-SztKLAQ5M+y8R_$~qWR zULR;kX0XKNntOKE9(wEz;=mmOsWCGNlrXq|464h}Z#Yy`KY|pwO~r{!w_UnPc|~>E zTuVqCZ!EW&X@!*G(XAcNH%in9bCyw-1{@1b12|M(O>;E_NLy}hm(|31DE$y}DM$t| zU1BNq7utF^4AYwfir&JbbHzA%RE2^C?hxXWM0;vfl`C-9C z%95^cPD{f4NPt#z!1L1$?wu!MxNGc^Yf~OtAVx8YxUrQ3pG{n`0qK9+x;r~LXO3G< zqRFL*m`dWTEyHj|iBk)hGrZ^olkR(!~Ja)MnY{IExOo?L%3E=VdSLfeRJ$NESkXK_bc(N$A$8v*V zGpR5|bTSw(U?-dD#PPq_#^tjWWUfd!7L?$x`Lefw-zW5Rs-rW5s=End`I0jJ2rV1?mc7q@ppL@W-R`vy-#iclo3&pH!KV zkHk1~vd2so7d7ER`NO=t1UrY~A+H2sQDP@wJAt)J`nC%fSe-E~_x(@4XJNe98kuwO z#Uu}EC|H@7nTeHD=UY*Bvh2K=bN2>tN|boO3OHnq&ev~e_+RE`9ji>E%2eSH2?y>r zW-Z{$_E@14CUqTClOq6yinGY_L@2X7%JD*HhHZa4U_Gzv?e655vX#+)xzTv_+ao1{+}1or#r%uU}bW29y>0I_+?eLC}JZ|FPxf}4hKmYtp$=dq4Oc&4fz-=%0ZS!RBFhH zE<8QO=6~mvKx)h#x+3LrfvGk#@`;*E?vNdULx5-sycaP!Gr&VydD4eT->4mSx zfQOFSk@uk$7zW@D*hY(XHzsc2%7*QYP(&#>^Mq_(xlrv?)!9hEvP3+y&6ErX^JPn52RXB<)gIT#$TJG+$w`Ba-PPU_MD7%$ zgFwDXQewK@7L$Kde}okKPtqUxtHa~|50-$Rwf@uT?j1aO|EpKmf1U*bX(;&zmxD!^ z2RowIDCwq!pGI&i9pmNAHHqj^EHGqA6Qjw}LPoE8Zu|q1#wZKitC;U=Bh=RYM}x=q z52Bo+D}Oo{@G1N6^w;}8d!2*2|NATe(jKLpEWQnQpf-GO=Q`oR=h|TZ;_$xTf5<0( z0pyeM|MBlXb`R?Q@3Vl*jI^9Vn1&>DwDQ{s8st9YBE}7vl@Wa5!@6R8UYk5@gl+tY zt=UGh@$s6|mp*z8FG~9_eE!qE`Q?D@fBz%)zq{W5-QBC-|9BoK+Pi4k^a~HP*$wyO zDR}g%$qo-U#@vVzwjT0Jg3gjcVcO-TKMx_VNQY|cuAzn+YN(-x8fvJah8k+9p@tf2 SsG){05B~$V=xn|KPyhhU>Y)z+ literal 3487 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 N{0}P55eWcL004dY&`|&Y diff --git a/install/ubuntu/12.10/fail2ban.tar.gz b/install/ubuntu/12.10/fail2ban.tar.gz index 628545b6b12d83a4dfcf4529b41f62792c228c85..9542e273c3a7e4485b7de15a22896decf78420d7 100644 GIT binary patch literal 708 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 diff --git a/install/ubuntu/12.10/packages.tar.gz b/install/ubuntu/12.10/packages.tar.gz index 4b778dadce20a61f03a8ca920ec81c55a8730fee..7513b71900f7ac41e3db5cee0b7338dc924f2858 100644 GIT binary patch literal 541 zcmV+&0^lsi!0%DpbCwl-MOND-hIYIMT`=p zVJaYu6`~3wcEUB)JQroO9gT!-o|nHH_ow_jWpk*160Ni1OTNv=o2O*hXYc~6l)hSj zrjSGMbJg~4$e_`zdRnBb=*+mS~^p{?ExXTEQ>Caish3~CC`qM+! z32s++OFuODb%i8O4bQrFtnj9e@Y%BhkJJ1iO26erIZn&R4_QH)5lIYgY}c*E=4qa+ zGd`7hyPWe!Nn+^Cs_&1nu2jd%x~gk}Fp-fa6IBu~UD@NP{oh1soNVJbdmH{&Y4HCH zH2vql{dJaf{jU?p_|Mw@v$p@N?LX`I&$|AzrvI$zKWq8VI{vev{AUOMk*3p$PPJeB zS7fBhd@s6mWsjrwzeuB!Zvfvf;6GJ5{wo^ze-2Lb|KDu@x*b5b1?cGk`kH`t7tn44 zj_U&k*$9-n5g@uU(XrBO1ST?h>l;Ds|Gt#N+y6KID^#W6|2Y8vhw&flRMi>k`2TKR f1ONa4000000000000000fPab~sIF|O04M+eNkA7N literal 562 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 SsG){05B~$V=xn|KPyhhU>Y)z+ literal 3487 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 N{0}P55eWcL004dY&`|&Y diff --git a/install/ubuntu/13.04/fail2ban.tar.gz b/install/ubuntu/13.04/fail2ban.tar.gz index 628545b6b12d83a4dfcf4529b41f62792c228c85..9542e273c3a7e4485b7de15a22896decf78420d7 100644 GIT binary patch literal 708 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 diff --git a/install/ubuntu/13.04/packages.tar.gz b/install/ubuntu/13.04/packages.tar.gz index 4b778dadce20a61f03a8ca920ec81c55a8730fee..7513b71900f7ac41e3db5cee0b7338dc924f2858 100644 GIT binary patch literal 541 zcmV+&0^lsi!0%DpbCwl-MOND-hIYIMT`=p zVJaYu6`~3wcEUB)JQroO9gT!-o|nHH_ow_jWpk*160Ni1OTNv=o2O*hXYc~6l)hSj zrjSGMbJg~4$e_`zdRnBb=*+mS~^p{?ExXTEQ>Caish3~CC`qM+! z32s++OFuODb%i8O4bQrFtnj9e@Y%BhkJJ1iO26erIZn&R4_QH)5lIYgY}c*E=4qa+ zGd`7hyPWe!Nn+^Cs_&1nu2jd%x~gk}Fp-fa6IBu~UD@NP{oh1soNVJbdmH{&Y4HCH zH2vql{dJaf{jU?p_|Mw@v$p@N?LX`I&$|AzrvI$zKWq8VI{vev{AUOMk*3p$PPJeB zS7fBhd@s6mWsjrwzeuB!Zvfvf;6GJ5{wo^ze-2Lb|KDu@x*b5b1?cGk`kH`t7tn44 zj_U&k*$9-n5g@uU(XrBO1ST?h>l;Ds|Gt#N+y6KID^#W6|2Y8vhw&flRMi>k`2TKR f1ONa4000000000000000fPab~sIF|O04M+eNkA7N literal 562 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%0A{?%Ot^rL@z^8Cck$I+l_3-G(Elf`8-61V-%yRT zM{LY+UMrBGSENgSi=7(40((~-IX3gv@aSZ@H>~{zY{vk|qpDY3o3oc)Lre!j?|0hs zkONs$bJ&lEbMabdjAQ%(V2X=) zxGmjX&w69tI{yg*utyTXIB(uGMaX@0TJ`nB^7~OSXqnjN0Z@szGi7Heth3sW!f6^L zq6@7g(uM&jTY!I1^U)P@#d@A74hTDVyXx6`WVgw+Ago_nnK%C5& zi6D!Cw8?^}yZ;7S4uSVh0^CIMoTdSxGY*&z20H-KhXSoYcx+zi`=UVp?LTH%Y-h-; zD^;XOO64KVMW4IrwEkz{Ra4KIZqRSKjBfz%@93$n0)fi2M2+3oLQ~VLsyB0T-8EQp zHFi-^y&K$H4(5I0o@@abZvjrE^$lhy9ZB$C>W&;<_ja#YtJh)bfeRJnjCqnfT#q&N zfQxmx)f@AHXkxzJ#-Oj5Pc<@h>wt*S-~HRdz|!K{N8r002kbSm6I6X>cHa9a<+wrU z7!6vWg*_cTDo3wbU%E3;dZufFK=%mjIWa|d=JgHA@$!`c8%opAQpY z276Z)YI$uteFJqb9_7$Qr+Nq4lL_=S6CXV3aK&7hXWIq^agEA5vs7DY=Q1d+s%Qxga3Y|`8zo=gqiH>_Rb9(_K zMHT~}U1l405}7cx&xeIV6env*=G*caSBF28bcH2-%xm_b{9aM7buiCNQsXeY#;tFv zR32#8pVe@O$E(<%vlC*a>@b*koVXiC!tsvZ;y5V|%oX>l1}r z^!A4{%w-=={gBz)UChR~TJnqCOva(-s~r}q4F}=Y5v%QN+731-!^j6C>|S;O@4KVa zzB4r2jhR$=(trV;-l<$V5B6?tx((JzRy$RXP|4CZOT%E-iHRuEd9})^%Y>Ky|5_6~ zaUV_cC`jT9G<0zN1ZSzE& zcTsocX3|d2Ht!0Q2yw-~rRxYVwtyi74&pGfgIpL>b(`}-xmJd;4mjq|zuVLIrz#FmfKh&w7 z^J;)#WERxUdFciIRGrp4Y3GpCFF&feGx@(47e8|P%&Ts;bOedi6S*YD9RVhin4-Ku z<)-N?EdFQhE2uoB1Mqw80V?Obh~_@2DAWHC_z!-a?~-%(oI>BYfmbjzr*QDmd@b?k zKfv}s=ybn(25S-0o*#P(l4e8+%ej8s-4TA$h(_Rr(D=vt4H!vhz-%EIZrH`(v_kB( zU`w`)j2H4U&X^}kcu&LMKT~23L}HdA-%J&k@hWCY4l;&)##o0e`M6zcwc? zyEgyubma>wc(1&E8edRhX*{g>WU7gqT%G)U9eGrXZGqi`8rb!DrdeAx4wGEbl0a1r z<;WU2Jt-r|=9oS`(7-rHOte$ZjQ{d`MklfCbQA7(8mZ8`;y-r@P>+-Me&{x$tuK;? zL4<@=b7leC0 z(*#dijYO#wQ&_9cvjpkPYBAkB15<<^Wa0(yWGs zwB^nnWpjA3e#Bb#r=CvD=)|$-QzQ-}xQ(w%j2M3fP;|cWpTG6gB9e4B zP_#|L%s*@b%o7YSHz~S1@Nx<87IU8uX{0dO#AxqNgSo2(`eqf*rSz=z5!waN52Djw zX7=qqC3_dCV_l_Q0ad~^i5Y-fGsFIWhZ+pz?7cO}4HIl(urtwOPk1J5U zuyN+X8?KKBAkUMM_cjtTASV-wLPu|jhRztt#FRkFY1x*{ZM7i;Q@h9C1GoIz1;^YL zn#ddj3^28>a*Z<9@JPsBlExpciuo_(q+W)LUR`DLes6J8plc5=$ti+JvcB!a82nZ> zeCd6_LlfVE9cU0rgMyjQf#Wk3W_0xS z+_ycSAdUce1(h7yoRC;oC-uq_KALz_;#@Z5i80UuJ%u2Hf1S1EH@QOa)qdA;QX>Ty z6^o)=T`Rtdyu~J(yK)hULx0P#8uZzvmCDLQ=kzSpD+h z+VZ~KW&p0Fgy@5c4w{!`GJN_IOb9ONo4|-bBn;osVI?|<>$UF1z#$1gZyMZBxp+!x z2rseW)Z9hoR2AgcOMyM%=Wz2+lT}YYp|fX;5H^%D1nBQSkoFV6l3PPqoBRxVqiz*z*weHI820IZw8Q%IR^P1^13E0Fby;H zRMPg^nDp5e&}SKnKDvc3Zk)#61$q~^qItj?)Nc^*Tf5eTzh8qM#HWBWIs|B<;OF&3 zXa7B@bP(+0L7?p#;Q2<&DqajM*YpF@q$`6Fo%Q`JTQ|)^PrVhDK`5JRhiYGYwP&Ie zK+fL-a7K3RQwFsrcaV~6%iYF*_Y;=ar)1%>ii{lc6@p?j~o9LHb0Px`M1D#gzC-%bP9G`28?ysYoS5g>oT*y^7FrAbWs9A^aW zEmVnO)YT05nG{h@oHedE1NO$Vf&lr1cwdo&ao&r+iiz@t3LTpv^E#C(U5r2VNp3%< ziZP#*5mJ!Fd+TrkPvu=+gcWBlu{4F@1xiCBWs13D2bX{P_i8t&vH4VfkFCklSH5Ky zc*Ub)(-+Cy^OW_|PHeZ{U|QRAg=@+nR1oz8=?F6DX;1fXV!K+uG^~q05B3WDj6vlp z24tSnpgDlNCQ2o}6%15_WxTpqr(~BfEw&X0f`* zCp4Ru2V&X_8g#@D+{^1q)JYvFLah`kk<^>3pCpjA-SjV3)@-Uai<2Y^S*gN|cB4Mn zc46yrIPWcfKUzW-pFg)8F0f9NzUjOcBQ5}o@Fz%D?FP@DwCHf3=c>@-a^GWYC1-up z-*|s{zk(ff&Lbh^o_q3(P@{`RPcA`z=-xjTi>oU)jrOM}bSu-_Ho#aZFJE$bISBV%xcRQ(Ke4`+os=~mcS_cxfUkR%&314k`JBw@U ztn%4h`}eI24{S!2X_o1`Dok85Ij##Q2|V)uMDsa2!|_EfpGxP?!uwE>jccL^hN59x z<4i@FQ-Wfa3Ch0VT4wTPC5&!+AA-KC@q;pA`;P3kCh>t4Z zHjLs?iCBG&Y>IMyIsUWUGI3Ega)HA~y3~)zZnSKzs&~KgJJMYdrq^6)MQsq@C|?Vy zee`OzsQr3{*e@y=^a_2_pzW+U6XdD_PcxB6YMuNP(H+{jp)q@v7zi6>`cxn5CvL}w zKl`VL18106Jp4X>r_X}ymS|nOIU>sdSKaWLWuCbIq(JurxjLHX9rYvlLWjpQBvy^ zru0=C{FPFA+&)r?6bx4PO$S1D+-3DB+hin@H7H)| zqEbVkkhL6(ij}k zAMrKWS+aj}wDOr<)1V5e%IjNcEQ1_R(!3v~FCC&Mju04{bEp4jADR3P5Ao0G9yaZe zPQZXE;y$gxb|^tgDAVkEQt2dvnoN?d&Cj%Tt-}fCM0`V0&z-P5T3q$xq-wH8#s-VN zS48>t-9cZ3OZ}c6mFUqn+`l24w>o_6GP`HkYq9iJ9H;X53M=O`N(8Cp!}zNu>h!-B zM0bOIm{JGw*~ESh5wY-eDky8t-T!z}Iz{{3cAnN2szl`1LnVI~l`J_ON3u=C(cCM+ zDQu@wZW&pwggw7Uoy_&j1V;MevhOfVu6j&a4L9)%(V5YI~%@;m7U$< zq@(p9`0!1F8CD=+3`*tc>OKxDQ-oZvs1CTE1N$QWA%t!6C#HF6$B>9FZz zLPt;NrUlg-Z(-c~(2S4}^1zz%Hj_cM=7g#)RzV|6vzVHji7Rcbg93%UuS(f*$K;~X z;uD%`&FpXf*7r@;&|=tlKAZ{@$zfaRWbSOkkpjI9Z()ENeWjsDzF|X@0s>qP{+7)T z#W@1~5(Op@e;r9dMcYr^vh@3%Fb^gfuO*flj|b2GOKpz?c3pbO=~=x7lP$^bDn)@BmGg5gpAj;fgF`>}^cmT39Rge(b?P5(1&L}67)7iR zalgzFkJ3tq?jJBII8sg)eE1mq4g6=W0HZs8>*VrAV?%NWUhaJ8nFg)tz(LVObb-z9 z9h{z|w*0hb{wnIOk$*)p{6d8aXJwKtjv5o6eJagkvn`TP-MZpIp1*&_uy{#_>mW7U z^x>E}qC-`Tr?c_TbrDK7B4dr9`XP&m#`CWNONoZY9^S}iNVOasQBs2I978zHli*O= zu~`aG;?mR2p087oTSNk}eN~>zT+NC|Sva6Lp+9C$Rakd%F5H>;!=E$;5*mv_nF_IGlMs2hX@#P62mo2Z``st*n?kwrD5 z{J2LM8a}XQ#}1!lzv`kr@R;9Pbh6C(#oDZN4yAnGQOZ?F%Rg_O|C`h1qGS#CpzKwu zQwN@{4Zr=Rdct1;V^^;qobG9sIg9~4$=j`k2Ag8ECp>*Usj0hZYN{W1-=WvQ+bxcK zlg(>b*NG@8$MHkEBahOg&gsC&>;19fza%Rt!S|2oaDVSHQ4g=Jw97T~%uqHQF#lvd zG!B7WmI8}4A9sKpOq)q*-1B9>)qC4ohrN*_@T}ZxVKy)lZF>vG_-K&>HBU{40Dp}7 zVR^V+2+z{jn2dnP5|LkvY{wGW!F56Ao#B)wyM+}YRFfVyk^!r?Kc`{FTEG}O$+#}a zx~#|3{alYHSc)MVA*)L7&hJHr6|xba!3q)U@C$A5 zm{Q~&wNXuPMuWFz$A;KBj>p$nq)9uH1cc%!gfa{%C0z?%kdY+NTp<9b4)9;{LPo^J zzyZA4A&41O_HhPSfnvS@Pjq+E#Q^%7<}pYP2+I3UsW-^Iy?VT9x(Ye<1B|42FOc=9 zgtx-3_h)@B&^Fkzv+g%o7UqT}>@0I_K(N>L#r&hj5a9A>@Y$T_8skpd+XzP&EIHA> zAe1PTv-=n=1Ye(&{aslJ!vV$DzYqR~%drYUm4We zlmY11R^Ni-X8z-qelNh!Vb}{W!XAn{yPx=ERFLI3MvXbbOv$q_1oWXU1pVRN@@vxQ zA1rL$S>M30HYhkX4p?>^V}Qy37ygrU=y$4Xz_yOJq543IGOPb1j0rez96{P%H~55P(`2sc z^_2e(R}ZhSKnq$t1_CvP+9a>2TZ29)W9ZG7FAi_I834V@Do*!Oee8r8R_z${*Uc(A zy9dlI`CQ4vB3b_xdpo%hSTOqAAqtEky5@kEwHuCW7-V*lM9%JwkHCi26+Hmqk@Ryf zXeo8-la4Xq)`tr$?#veD$Br$_$9(G7+p*3h>iVAL7_vBXlV;r|%ipEg&bPCy{%@ia zQ+_0O<#wb9#mP~r3AzB66G_QIbj}Z5vZM1n;gHA}9{*@geG+xpSRl-iJ<1kR7|lFT zus~Mf`XD>w?!Z(^p_@9H!WoGm)BrSt=ESA9q}JYe%epaX45m&Vo~0_jv+``E|Kw15 zCiq73FdEuR8|5GBJ$~KQL@jYel|Pj3%P6WT4z!+w<~jPW@*hClK7d*&GbR8rvEWvP zTiSi~EZt!1di;Bmy4&~cyIE(5ru6->6sXM> zXb?oY`}GD92fg~7*3BA>8GNaz{+>p>+W)8|R)_=ScA zv|x1Xw?lWy@Sb}3zbt1&GuQ<*Cd`3RvdKrqNde?`M%JH-RSc<573q2p6!Ak5sXnjq z9*u+;=_Xh!U_S3eg6OjOIJ=kfW+-b)f}r-p2mT*^P5IM+s(HA0oq`>(ukbCOLx~mS zrJ5;L-k;&>;wg`uQn1w{ZIbXZpHvsQ8*wUDEQ1 zndf;3_i-m}7e15>RXTJvvhO@pDw`6f>}%e~yl_-Z%PNdAb&QyN;nb0y&9mR7hEbB= zYo%rV4Wr%Dn^THmcT%IVAw)A;(Y$^m&ShZA(x*9atO4`1+?s5p=c_ESN_}pmC|?FW z`Sb=rZZdkhPB+b0Ji$0ff#u4%%YnE?Ys`nbs?vqXlN_Prnd!9FO6+!r7;zj<6hoPl z6*RriMA~YeA{$4;ep)7q<_isiz|s6Hs$YmR`lXgt->kbireQ2B^h)N=)ooGq+xPTh z9i5zyo^lr@SEF(=3Uc`5Or}H^{AXf8=hIiQT>cJHsbqT$klnf_IH87h#Y zUiqA2w;v=pi|G>0llT0T`Ak!dh|Mf+E!=Is5UNBeuKKZbeCDpcJ&_RaFOQ=iyx)G6Kw>GXVlUWj2rDYCSLp2UBX;qi{0y5>FbZi*UzBTM_`XfZrqM{W zx72w2$tpJ{DM^YQ|KWv8x?%D=U=fSp$K76<+0vvAYY@?SlwLUN2i}nyyo#s&5tteM zWSQvPyfUJqG?o$FV|^N|9LTDM{1^A&`6malHzln81M&vZXyQ(F5}CSGSag&w+mq1U zbIz9|Nx=ic&nD)I1{P&i0`Y`Dg*F!;(TXTsu6vzD5C6o^k&TP5{CVYeaL46!bg2y$ z0!iIIF&OWgwhV`l_e(d8ubsPb&{h$9Hhz}ZupvIi=DS$7|721J91sAlpIunMfXnB> zNAPnm_Y0)-EL843=u-_O*&$SJgix$t=7#3yUN<@QX=JSyF9pdNsC^Wq*PeO@xXG2I z0RP}D0dOnc(~?au)-C8yDoChgM>sxKU6h@}GqXV99){;dc#+KW+>R7`+jHY{e8E{^ z7gj-AYj4&vIqqs3Pm#<%EMbp%X)F-d<1u;&^oagQeycS4@B_dEuDWDaK;Pbu$X7wT z^uLdiy2gmU4pkoiyP13cl}{)&Oar44()}lOxtJJL|s+Gmk|3uOXSf0~puF zJvFq4H3De#*8wk}4VD|leMzNKlDHtWQJNl4f}pGeqVlIQqS2!1ks%>R)4(lXHp`&^ z*neW+$OFdMy03H!t>k$E@z9-1hu=&8css(reX_Tr9IpU4yJ0Tx-`vXI09#qW3tko& zngs~?;dW*ov8Y~1=7C@+xTZc(6-Ek!JpUH}I?FZI8~B@imisY5g$z6b5*i+zOc>n% TPQr+L0YnlqBWt)Y1i1ePb4pfQ literal 12935 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
                JXql@HLvN@Zghx7di_zx{Jl{l=j8>Rd0iuIDly5)|igW-~8Wh{82vJVRya(Gh28$Tg zNYvQTi%N?bCT;d~G|V4#+1?=$n)3*Hxd;vcbUYEFUd2Vb0A2Nu&?ll{P)8UPg|y7h zt|X>^>LNVb{#blXPfp^$?bprv6EHIeJC+ep4Snj{tkXIm5nFTt8ER^2OuVN!m)S0X zvQb6&n|xqJy&%>~Sa#2_Yw!4`{PZWwbk?(I*2wCsAP|b1st=@4l>#FI_0_}g{H+*3$S0l%u3ywW7$1|v! zaSpbH0u!@>L3X&jg3KQY$hH&phHZrY?~(zKk;K(>(uzNUH- zAZr2aY7}3oR5yTsUaxfjflMoKr|}3vF~{kr4v~c0PlCr#@)7#+3hHvro10o+MqFfo zt~mW?mKeRX>@k4lKg0BMFm;nxaf$PA{1_x*m9s`ei8?E;LBeQjPh;<^BC`vhy=8L5 z7V&1ruJ_U4bC3GCMbrm^YMib4{f-))$Pn`w@a>Pczvf0da-TC@FN1z}mO*A+i99yD z?0_qiI--5?Hby9TD1ip5FaHrL{|FqiUo?X}p29l2ChO3TRP!Rgae*d8XFjXt@lt+2 z(l{O@3MS9x?sg^QXz>(gRF%k(P@nrEjix>Us|FT-+Fwyk>$Q|s_U^a(#+sJf>R0Nk`o%iVEFD>Xu zX43CaBLt7SlSZr>sgwQU=RQ?pa1EU9vC%~c0OR;rBBGUX^6$}2?3>@PSr6go;#A(uRDeJ?r@yt7-{CNjWf$})#`?+ zFPi}mLdWU?k8*Asj=i8JW*@(>J$VC6@%xc~i?g{NFuI%b>=Cb=x3dd$gWg89atW(} zpW$UJH1jFz$K_|Mdo@4XPjjfTLC3Gi)5C_Tc`q8ZDaaS`YX<7~dyc5&+<)V>LrNWw zh|!H@H;_j8_QnQ8l%L8S%>>Q6l5&oGx5~mB7`a#+TWdF^-blaz8YHi*1i^s*##_FvY061=ALqeLd@J$ksHKP z6_vt~i+S&GRR-uk{ed{m2-yA_H6$NcWKeg!b{27o$qN>%+`hm|M zjQrW{eCJpuGlA6OeZNfM*=pe}a)<^~85he}>OE)56_#oGj@puBeg(|;|IxYaXiy&W z-AMMgq<11R%N9ux>R`07CGmPg{W}5dS5v*+RO%`%2QJ-e;6wr@WSo`q^vbpL23}{-71LD?wbSfJb|su5Qg-`CAXhJ6+on33>{I+|^K- zwa7vH3&QmHz2^_T7v2|u1D=jPRs7J?tysxYHt}Nodch%A_&)zMU(j;!`Bbyj0TGQZ zgoKK6jAUQ9a@LP44T9G;z`OFrKX#;sY}9qa3lXQEOut~tlYwZ(?ZXJ~+*(Uv8-?OC zK@NPFkb5V}86w*SD@mDPYD@YSWld@SMH-SkDS26r`r#wM>+(6gP5fS^a8F+sQQ$AA z4fhEU3Tg%Pg)azCL0)w80A(D^hvW*Ci3fRZR8*wwYt}`wMO=4aP7;2-&-EBPV(4cC zH*B^a>!6#azD6inJFwDaC@>201+*`Gm|-5GvFBj>dq9HttUjkJrGq6*7Q}3zGXi^! z+6TPWFZ3J%%rLWIfEKuFqgw;~m|n%79-+Vtadf%`#ET?~C{b#zg9h=&%IS%aFFo`# zNz8vjOOT+`_?p3T0XSE|Ij;d14@Pq^7o$@=1#quf2em$bvWY{l25Q3mFo194!B^Wsg34TJo+;u3;H zh)L68Y8_|n67v>dYp`@xip(ip-0eD;*)jEGuvc-g zmy*qWG(*DDS}Ym#Gs_tjzdh+(;~4jRG3r_pG74zmV*LXIOvP)OSizs4Wc%`@)hbqp5NwjpbcWEw62}W!p z*6|8cobtEeznxZ0F6#XOvo1E@jd zVB@0*+6D6lQ4$(WvC9keSb2MA9kh3)cKl`9lI2`X<_~1cx(V?8$?dig&%>`jKhcrH zGOhC<_!_p)3f}RjY-u8T-)7A%ex2|e`Rq7Da7~%Th32T?PtqT*=7(eaSVvv~-XwzU zrcyVdjp8A8p^dJmXd|m`kJnSJW01feAbrsqaPu~szeWfXH#`8EGGv~_Dbt?S*;r3P z+}1k^|A$;`Hk=Q!Cmfl|LH)`E&U7(tYJ?`&ZzQ9ySb(Eg9}x1|R_ir(zeM42xB=w)0Si$1$NjQTY`AjI?K{SLxzowsX7ZMHi$ zLFA$2ZD*1Z4Y)}Z#W9$I5IUBjLTV9>dp?^gk?KBz@EG=l>nNr+5t2=F1r$$z^twyC zNq{ZCUfd`A7U@Z{&xR!>o4_Fi9-f2LSp%6b(gEM6f_|W}=o0nyXB*!)CA5X?cic3J zQfWU@t(aj(LiOCyeCJL?@YViMMpdULAq2o{4EXP50tIP88CBjjggq-9$J2RU%|1>q zpK9HJ|NC{fQ9kR~e+8N762QdQ|MQ{p$7c{aOq^LnAo95Hae$Uw>hrTlC*Tu)^?A$3rSL#CItz$MK1{#+IIg(P~= zJ>=DZL*G&lxs#hoNz(_dN*L8V2j_f`aP`%iuGN*yF>+%qw-)11PM{Ar!r$TT66xe0 zJsjRCsn&DIEa4m7=bPVKn!*bfTNzcp&L<~ax@$1iqFZ}7yN0u?f+oy$MkR(f!+NWZ z(u|hpY)YTt9dFxTw(*2$}hHhUwJ08-EcnsmZ)-)(-JHS9zNH zKz3TfERImV)15?rnW04WX@E~}+rox?xSHL$^QCcO*4XBhp0L50c!+rg6KCGVIEZH< z+t~QG?0*37FdMe)O?Rm8h(vuncDQHxsj;!;~aoa;ky5pJO-1#@P4%gP=#nVflB&Rn9tL>xE=c2rAyI*><1|WYKK{@dlzKc(0vzK>Hzj6;_pI3=EkI&^?r z%~mU;QU1%QT{_gI%1{qhL;4q3N@E!ZSjS;&haPdV+Yz=5OS2lGrd+ev_TcPdT71{*QLSCls~=|+ynm} z-o9y$nn?iQ;7Um&Bp>mzL+}%Dk*DeLQvxUCHP@_(zF`DUGd5J*c*7E^@Y?4B`~c9eHy;l}b<2I*SECD}i)|-wJLnUGN}~_Ce$cmPWlvGO{qt{5 zuU{^}k9m*)tlyx`v5H1FHee|FjReBJAikh=v)yb9Tgln!p#qUigH#v`%S}~@s9fsh z3r`b*c;yokkH11-cCcrp1UWqGkLaQUs|R|BbzRST__8HjWQy%pcMXo=h8P>QhKn9; zszXG5{30ITQ>UfzkHZns5=6fz1B`yd(`Ds2SKN|eYsdXXIlQ%YPN~{AvNMq^gQkvMwNdVoXleSVR zlX;$}T{H>n{;XpA{b=84d{AQVR+*RIQs%f3!|w}zgK1AhRp`0PcGzz%%9-EkmzBK1 zmk2syi~NO4GPKo&JG(qM?Hes)SJK0go@%q&E9t+dkv1g;81K5OrgB8T7_6)BHlYN4 zShcQtoDHhOKluPAYVXEX1hb5NchbG3qfJ{x!h33I--$j;U#;Zp;%Cr#aN}L4XbE^$ zF{juQPJh$?b}jnX0amS$Qkf%&Oix~}CO{HVi&4ajtls!f2O~i!>A+ogm2@VY3;7-s zA=_=+jZ%6^(bY_;okh{_&%ZlwQa6EP7OB$N+iO2ba(^C_TirN2UWkYn@9thy8RcOZnxL#y*t}1T|4AXp=4A~X%s<6qx9Wb(0JH#Q1%sY-W0hzN*RQPfteP)EUGMO3}+1N<6vdULc=>%S~3;rPEEOyI$6~{aYSOk{LB9TmO=&>6W z3+9Z@uqoOhw}Q=tUa&|d(_#@}!-a;;C0K8mO$C|dSUm{SWJa-t%HYX@B|-$uDyF$K zg4s|SCMPsH6_)U9-YVs=b3M&s*m{#G%{CuXX>lS<5}QnDt+Zik0?xuiGhO-G+iDCLH(%M+0(Gt^tS7jc6H>7-{89LiJfO`{C_vO#7>iU({v5EGt77WbV-YRn@N!6=`%Q*K$T9I$^@zq{>- z4dC)sX7S`Px6D`#dUQy`tRYzo_OyV$ge^^`PuC|pu(iULE*8p2~C*sC=+Zf=**;_ zTVHK82@!~prc6O72?#0WV;O;nfHsu?Whv5%6LQ`fwk^D=$G&>|-Ehd>zCOC%DYb36 zd;v5&LcdpYr^;~1IhPiwuyX-hZ4Q56H&#Xw3xx*#O_W8O8Si7P;0B47|~%0rWeP~^=rH+SV@)w(tE{X!GX;J9T~WwRkot~v4KPN zM(KMF*Ng;^p&OWSEmdX;gyU>#aG+IcfHJ8KT)e;#>@c8@F;~xq?Xx3b`oF+<>d}5~He?12;+a%J( z1CP^4u;IW3cCY1Gg%`IOYLRXG4`u!zLLK z`UmH}?Ghh4coTxole65s04y9LLE`*5UNaMh*F2#MkL|HbWszVo^x^3~xEipDCBB>j zfyPOOOB>FYLc!2s7KtBfmB?R+kLdj%@B!wE%9JAZ{=|c zymMNL?KTATLXV{mFfaj5U^AW!Z&Yx)z|nJl^lo@}JD7l9hye!)D1Z+;tcZ#vwgA+J zHe*}uEl}ghL_Rnx%r|!yidF>VtCSAnbJ)i$?XGg5Qpy#qVD%RLFFGt>8%BN*4O+8I z!1QFWvR8!*k;%rbNyJN42Cc=T{&cB~h#(*_8YL|{zqxx&`YDT8Uts~cM&!eeS79Wa zh`h)OPl3Wn{z7M1K%5uJ7K9nvjE_M{k&mQEsL4xQQ!N(2dC5yVD~ejLxe z36@nsw~1K>qza^RL>i$)mqo!8RR)7>YZ+uKPMs`kG_N=U@H2n7tl@F~Z%p*G*Z)uE z|J}Vu`G0S(U*G?q13=oKmkWrm@M+`=jrXQ++nLerNclW!&jc{24TEhQbYVw$zP7aB zUMzmoe3!NK4t&A-SztKLAQ5M+y8R_$~qWR zULR;kX0XKNntOKE9(wEz;=mmOsWCGNlrXq|464h}Z#Yy`KY|pwO~r{!w_UnPc|~>E zTuVqCZ!EW&X@!*G(XAcNH%in9bCyw-1{@1b12|M(O>;E_NLy}hm(|31DE$y}DM$t| zU1BNq7utF^4AYwfir&JbbHzA%RE2^C?hxXWM0;vfl`C-9C z%95^cPD{f4NPt#z!1L1$?wu!MxNGc^Yf~OtAVx8YxUrQ3pG{n`0qK9+x;r~LXO3G< zqRFL*m`dWTEyHj|iBk)hGrZ^olkR(!~Ja)MnY{IExOo?L%3E=VdSLfeRJ$NESkXK_bc(N$A$8v*V zGpR5|bTSw(U?-dD#PPq_#^tjWWUfd!7L?$x`Lefw-zW5Rs-rW5s=End`I0jJ2rV1?mc7q@ppL@W-R`vy-#iclo3&pH!KV zkHk1~vd2so7d7ER`NO=t1UrY~A+H2sQDP@wJAt)J`nC%fSe-E~_x(@4XJNe98kuwO z#Uu}EC|H@7nTeHD=UY*Bvh2K=bN2>tN|boO3OHnq&ev~e_+RE`9ji>E%2eSH2?y>r zW-Z{$_E@14CUqTClOq6yinGY_L@2X7%JD*HhHZa4U_Gzv?e655vX#+)xzTv_+ao1{+}1or#r%uU}bW29y>0I_+?eLC}JZ|FPxf}4hKmYtp$=dq4Oc&4fz-=%0ZS!RBFhH zE<8QO=6~mvKx)h#x+3LrfvGk#@`;*E?vNdULx5-sycaP!Gr&VydD4eT->4mSx zfQOFSk@uk$7zW@D*hY(XHzsc2%7*QYP(&#>^Mq_(xlrv?)!9hEvP3+y&6ErX^JPn52RXB<)gIT#$TJG+$w`Ba-PPU_MD7%$ zgFwDXQewK@7L$Kde}okKPtqUxtHa~|50-$Rwf@uT?j1aO|EpKmf1U*bX(;&zmxD!^ z2RowIDCwq!pGI&i9pmNAHHqj^EHGqA6Qjw}LPoE8Zu|q1#wZKitC;U=Bh=RYM}x=q z52Bo+D}Oo{@G1N6^w;}8d!2*2|NATe(jKLpEWQnQpf-GO=Q`oR=h|TZ;_$xTf5<0( z0pyeM|MBlXb`R?Q@3Vl*jI^9Vn1&>DwDQ{s8st9YBE}7vl@Wa5!@6R8UYk5@gl+tY zt=UGh@$s6|mp*z8FG~9_eE!qE`Q?D@fBz%)zq{W5-QBC-|9BoK+Pi4k^a~HP*$wyO zDR}g%$qo-U#@vVzwjT0Jg3gjcVcO-TKMx_VNQY|cuAzn+YN(-x8fvJah8k+9p@tf2 SsG){05B~$V=xn|KPyhhU>Y)z+ literal 3487 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 N{0}P55eWcL004dY&`|&Y diff --git a/install/ubuntu/13.10/fail2ban.tar.gz b/install/ubuntu/13.10/fail2ban.tar.gz index 628545b6b12d83a4dfcf4529b41f62792c228c85..9542e273c3a7e4485b7de15a22896decf78420d7 100644 GIT binary patch literal 708 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 diff --git a/install/ubuntu/13.10/packages.tar.gz b/install/ubuntu/13.10/packages.tar.gz index 4b778dadce20a61f03a8ca920ec81c55a8730fee..7513b71900f7ac41e3db5cee0b7338dc924f2858 100644 GIT binary patch literal 541 zcmV+&0^lsi!0%DpbCwl-MOND-hIYIMT`=p zVJaYu6`~3wcEUB)JQroO9gT!-o|nHH_ow_jWpk*160Ni1OTNv=o2O*hXYc~6l)hSj zrjSGMbJg~4$e_`zdRnBb=*+mS~^p{?ExXTEQ>Caish3~CC`qM+! z32s++OFuODb%i8O4bQrFtnj9e@Y%BhkJJ1iO26erIZn&R4_QH)5lIYgY}c*E=4qa+ zGd`7hyPWe!Nn+^Cs_&1nu2jd%x~gk}Fp-fa6IBu~UD@NP{oh1soNVJbdmH{&Y4HCH zH2vql{dJaf{jU?p_|Mw@v$p@N?LX`I&$|AzrvI$zKWq8VI{vev{AUOMk*3p$PPJeB zS7fBhd@s6mWsjrwzeuB!Zvfvf;6GJ5{wo^ze-2Lb|KDu@x*b5b1?cGk`kH`t7tn44 zj_U&k*$9-n5g@uU(XrBO1ST?h>l;Ds|Gt#N+y6KID^#W6|2Y8vhw&flRMi>k`2TKR f1ONa4000000000000000fPab~sIF|O04M+eNkA7N literal 562 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 N{0}P55eWcL004dY&`|&Y diff --git a/install/ubuntu/14.04/fail2ban.tar.gz b/install/ubuntu/14.04/fail2ban.tar.gz index 628545b6b12d83a4dfcf4529b41f62792c228c85..94979c51775d6e7d5b8de548b1782f854abc95d5 100644 GIT binary patch literal 706 zcmV;z0zLg7iwFRlo;+3n1MQbvPunmQ$NTJ0aU>p)CZ*S;c_~P+fG2RCtA zZ;l-jrz_Gv{Oly{Xh}2q)UK{_Wvl@TfZM7>~Qx zc_ax^#^7Ej1mILo2$$5uk_rx3N)kpgK?ev8F0a2{-F44;Lo_1Foxl-zA`Au3(nuL} zNkBQ(jzgp~E+%6#Q&v#@0-cMSUjG>MW8#Apz{HqxM8{l>R2U+(?{)gDEb9Ms<_yD%%LliGEd^;<%>nYr1Kuq#C0T&tf9uNA=QC{a~5|GV;rH1I&^o z;oNwQ^m+fbTsrqE6DKnomPoJ6_z1M!LUl>>+sWnCU)3j~+QqJgm~yR)2ELdQPsnZ5 z3e#5#7GBj{E__TL*tW}B80!$NS=;Vu`O;>drD4^++e|hyET8KAS+9RmI@io-O-k*% zj6N)j{+|cqpE>{A=KQ}Cp2vUp=l}Mz_}gyN?EgFA$@yQ0oQ~5tKj5ooO|t(2d9PkR z!xybvFP+paI!$zoR%geeNslP6O)c#ERzPF&3o~YU6SXTsNB8*Sg}aE>d;5eDNj47P zO^EkXjWFMFz~W$C!R7VsT_1kKI3^KT4{$h7ax3>9z;`)3EXGiex152t?9k|V`5V&B oBdpG1b&!3>-(WBp3R literal 721 zcmV;?0xta@iwFR?P)1Y$1MQbhZ{jczhB^CJjMPJ=l>#Ira4D7AZL1=&Z6#&~ zz`KruB3xbg09_DCMo>VRAaZ-;y)^U@ z_5_W1em^5}=Uk3M(j5%0M~Fp}7>lVIYRqubkoOIoiK#qP6BOckLPYW;2OWgmSsIAg zuZ|mFmaYUYjJJfo8s1fhF1)IOlQ|75La(j33(9U0btUMJvtIut>QYeUVmCrexr&Qi zKbjFQ61zkzP2U-?^r{!(!l(3+?Yga{u}aaFy}dZE-rC%=GOfyYm&N9W)k}T291PDY z*P0t`IZ}uIjJ_-j{V$SH_dlT#cu)PeEcx8DI+m&H|328vfBu=(y@&@N72}Qi-)t}U ze|i14JEpGxd*KMK)CoAp98}8bBuj9v%2KQe1W{6IHF7UVKsi-oBUDPa+B%^mI!l#A z%iggR=`rPvnSp)Z2xvn7V8#q@Dyt%#D2+c|xJU7JZ=WzC$g2~0Q{w%WGdx!uFgO@} z=-u4i58*FN5)y;)2*=Nd+$g+V_$fxmCp11?eTVGz8P->^KFOi;zxe)( z;(T!ZH#>H&|F+iuy|9`8{p-KwZ0f&dYyIB`OZs27=SuT4o@Sm$(ja3D9@K#V)prvv zs8^H+ECdN-k)k768hSV1`}Y@@gAp1N=}x2^dQlk4c0wJawc4RhTtX&fF0G*c4Nk6a z2g6fPkL6zl5rJ&(DMxg|?8hvNkvLGGEmHW9!R1+hhN`r``SI^|$t6d-fcCgFOIK|2cTx z(0@?+Iwpkj77jhTk`dl{|JR$_G$f2TQQTx@5t1m5)2bm(wJw`7E^kAU#d)Ro<+=$8 zB~Di9<@)ft(c8Gp^R&>RDl0w_r{2_6S|n)_l82T!O_ukMR{;|N_{2$~M(;Ugu%xRc z^T^e+0B#e|#6y0c`ob*XOIkOPK?79*&_HK=p+PRWJZcaVH3&gHSAyVXA<2i?Dqx}t z2EtvfEXBz3sG6-pPF2CERv|6Fin0>3Rd^FsaOr|4UFj>AOKwq9=gs_@D4Uv1GN_T3 zrX)o@JHJ1*8q8%}`|6T$MlA>S<6qQbHTk@{0G4`uO-(07dj^Got5eV5aMZx))Ph(} zYF&S}m=*-U#!TzAUHg0t^Z!TN?O$j9>zF$E|0jSdod5rV@dHE2mBCs}0d5M&-vcjQ za{Lb8l)N{R@ra&6hAfO5?=e2DpYMjyVd|S?8-@EI%wN_w3hX^Rc=qr&WH<O4Mzij(@XnhsKo&*MSlh#7(1g=&0&FEG%?Me6ampuO4>y-_`!)kpP&FT0Pj|*j)GSV93 zG0u%P9?@5H>Ue&9TJ8w(mS4U;YbU>kw!5dto6pc!`1H`piz?!Qs? zZ2zTY(j)A}O)l`C?|(Hfn=&r%X0(YbN~&_+%&1`W&E*1z3IZzVUki(*D`*Kk5kQkG z1wFz!17_g@d9ch)G0;wCGL8I9sNtr~X-yEB=^d3PuoC0XT$oBik3eT~aJ zPYYM7vf@1@^`frQB1w}O-E1jovb=r04Y>?eKuHocY1?18ny~4FyPO>aM4!NUUOmFePy(-1M3SddTi>v8NVjB&*t=IgAYbgkDfmmx*FWy-yM^~-2uA1 z`-8QZ4$iCJUfZClsXi!k+gGp^gsj(jT}WJxQ(W4?Rswg^FKlTCd%;5d=XH e1VIo4K@bE%5ClOG1VIqwGCu%8Tmj4gC;$K)2?m1z diff --git a/install/ubuntu/14.04/packages.tar.gz b/install/ubuntu/14.04/packages.tar.gz index 4b778dadce20a61f03a8ca920ec81c55a8730fee..3eff15094971ed39d1d74d3370322c1f4e3752d9 100644 GIT binary patch literal 555 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 N{0}P55eWcL004dY&`|&Y diff --git a/install/ubuntu/14.10/fail2ban.tar.gz b/install/ubuntu/14.10/fail2ban.tar.gz index 628545b6b12d83a4dfcf4529b41f62792c228c85..94979c51775d6e7d5b8de548b1782f854abc95d5 100644 GIT binary patch literal 706 zcmV;z0zLg7iwFRlo;+3n1MQbvPunmQ$NTJ0aU>p)CZ*S;c_~P+fG2RCtA zZ;l-jrz_Gv{Oly{Xh}2q)UK{_Wvl@TfZM7>~Qx zc_ax^#^7Ej1mILo2$$5uk_rx3N)kpgK?ev8F0a2{-F44;Lo_1Foxl-zA`Au3(nuL} zNkBQ(jzgp~E+%6#Q&v#@0-cMSUjG>MW8#Apz{HqxM8{l>R2U+(?{)gDEb9Ms<_yD%%LliGEd^;<%>nYr1Kuq#C0T&tf9uNA=QC{a~5|GV;rH1I&^o z;oNwQ^m+fbTsrqE6DKnomPoJ6_z1M!LUl>>+sWnCU)3j~+QqJgm~yR)2ELdQPsnZ5 z3e#5#7GBj{E__TL*tW}B80!$NS=;Vu`O;>drD4^++e|hyET8KAS+9RmI@io-O-k*% zj6N)j{+|cqpE>{A=KQ}Cp2vUp=l}Mz_}gyN?EgFA$@yQ0oQ~5tKj5ooO|t(2d9PkR z!xybvFP+paI!$zoR%geeNslP6O)c#ERzPF&3o~YU6SXTsNB8*Sg}aE>d;5eDNj47P zO^EkXjWFMFz~W$C!R7VsT_1kKI3^KT4{$h7ax3>9z;`)3EXGiex152t?9k|V`5V&B oBdpG1b&!3>-(WBp3R literal 721 zcmV;?0xta@iwFR?P)1Y$1MQbhZ{jczhB^CJjMPJ=l>#Ira4D7AZL1=&Z6#&~ zz`KruB3xbg09_DCMo>VRAaZ-;y)^U@ z_5_W1em^5}=Uk3M(j5%0M~Fp}7>lVIYRqubkoOIoiK#qP6BOckLPYW;2OWgmSsIAg zuZ|mFmaYUYjJJfo8s1fhF1)IOlQ|75La(j33(9U0btUMJvtIut>QYeUVmCrexr&Qi zKbjFQ61zkzP2U-?^r{!(!l(3+?Yga{u}aaFy}dZE-rC%=GOfyYm&N9W)k}T291PDY z*P0t`IZ}uIjJ_-j{V$SH_dlT#cu)PeEcx8DI+m&H|328vfBu=(y@&@N72}Qi-)t}U ze|i14JEpGxd*KMK)CoAp98}8bBuj9v%2KQe1W{6IHF7UVKsi-oBUDPa+B%^mI!l#A z%iggR=`rPvnSp)Z2xvn7V8#q@Dyt%#D2+c|xJU7JZ=WzC$g2~0Q{w%WGdx!uFgO@} z=-u4i58*FN5)y;)2*=Nd+$g+V_$fxmCp11?eTVGz8P->^KFOi;zxe)( z;(T!ZH#>H&|F+iuy|9`8{p-KwZ0f&dYyIB`OZs27=SuT4o@Sm$(ja3D9@K#V)prvv zs8^H+ECdN-k)k768hSV1`}Y@@gAp1N=}x2^dQlk4c0wJawc4RhTtX&fF0G*c4Nk6a z2g6fPkL6zl5rJ&(DMxg|?8hvNkvLGGEmHW9!R1+hhN`r``SI^|$t6d-fcCgFOIK|2cTx z(0@?+Iwpkj77jhTk`dl{|JR$_G$f2TQQTx@5t1m5)2bm(wJw`7E^kAU#d)Ro<+=$8 zB~Di9<@)ft(c8Gp^R&>RDl0w_r{2_6S|n)_l82T!O_ukMR{;|N_{2$~M(;Ugu%xRc z^T^e+0B#e|#6y0c`ob*XOIkOPK?79*&_HK=p+PRWJZcaVH3&gHSAyVXA<2i?Dqx}t z2EtvfEXBz3sG6-pPF2CERv|6Fin0>3Rd^FsaOr|4UFj>AOKwq9=gs_@D4Uv1GN_T3 zrX)o@JHJ1*8q8%}`|6T$MlA>S<6qQbHTk@{0G4`uO-(07dj^Got5eV5aMZx))Ph(} zYF&S}m=*-U#!TzAUHg0t^Z!TN?O$j9>zF$E|0jSdod5rV@dHE2mBCs}0d5M&-vcjQ za{Lb8l)N{R@ra&6hAfO5?=e2DpYMjyVd|S?8-@EI%wN_w3hX^Rc=qr&WH<O4Mzij(@XnhsKo&*MSlh#7(1g=&0&FEG%?Me6ampuO4>y-_`!)kpP&FT0Pj|*j)GSV93 zG0u%P9?@5H>Ue&9TJ8w(mS4U;YbU>kw!5dto6pc!`1H`piz?!Qs? zZ2zTY(j)A}O)l`C?|(Hfn=&r%X0(YbN~&_+%&1`W&E*1z3IZzVUki(*D`*Kk5kQkG z1wFz!17_g@d9ch)G0;wCGL8I9sNtr~X-yEB=^d3PuoC0XT$oBik3eT~aJ zPYYM7vf@1@^`frQB1w}O-E1jovb=r04Y>?eKuHocY1?18ny~4FyPO>aM4!NUUOmFePy(-1M3SddTi>v8NVjB&*t=IgAYbgkDfmmx*FWy-yM^~-2uA1 z`-8QZ4$iCJUfZClsXi!k+gGp^gsj(jT}WJxQ(W4?Rswg^FKlTCd%;5d=XH e1VIo4K@bE%5ClOG1VIqwGCu%8Tmj4gC;$K)2?m1z diff --git a/install/ubuntu/14.10/packages.tar.gz b/install/ubuntu/14.10/packages.tar.gz index 4b778dadce20a61f03a8ca920ec81c55a8730fee..3eff15094971ed39d1d74d3370322c1f4e3752d9 100644 GIT binary patch literal 555 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 N{0}P55eWcL004dY&`|&Y diff --git a/install/ubuntu/15.04/fail2ban.tar.gz b/install/ubuntu/15.04/fail2ban.tar.gz index 628545b6b12d83a4dfcf4529b41f62792c228c85..94979c51775d6e7d5b8de548b1782f854abc95d5 100644 GIT binary patch literal 706 zcmV;z0zLg7iwFRlo;+3n1MQbvPunmQ$NTJ0aU>p)CZ*S;c_~P+fG2RCtA zZ;l-jrz_Gv{Oly{Xh}2q)UK{_Wvl@TfZM7>~Qx zc_ax^#^7Ej1mILo2$$5uk_rx3N)kpgK?ev8F0a2{-F44;Lo_1Foxl-zA`Au3(nuL} zNkBQ(jzgp~E+%6#Q&v#@0-cMSUjG>MW8#Apz{HqxM8{l>R2U+(?{)gDEb9Ms<_yD%%LliGEd^;<%>nYr1Kuq#C0T&tf9uNA=QC{a~5|GV;rH1I&^o z;oNwQ^m+fbTsrqE6DKnomPoJ6_z1M!LUl>>+sWnCU)3j~+QqJgm~yR)2ELdQPsnZ5 z3e#5#7GBj{E__TL*tW}B80!$NS=;Vu`O;>drD4^++e|hyET8KAS+9RmI@io-O-k*% zj6N)j{+|cqpE>{A=KQ}Cp2vUp=l}Mz_}gyN?EgFA$@yQ0oQ~5tKj5ooO|t(2d9PkR z!xybvFP+paI!$zoR%geeNslP6O)c#ERzPF&3o~YU6SXTsNB8*Sg}aE>d;5eDNj47P zO^EkXjWFMFz~W$C!R7VsT_1kKI3^KT4{$h7ax3>9z;`)3EXGiex152t?9k|V`5V&B oBdpG1b&!3>-(WBp3R literal 721 zcmV;?0xta@iwFR?P)1Y$1MQbhZ{jczhB^CJjMPJ=l>#Ira4D7AZL1=&Z6#&~ zz`KruB3xbg09_DCMo>VRAaZ-;y)^U@ z_5_W1em^5}=Uk3M(j5%0M~Fp}7>lVIYRqubkoOIoiK#qP6BOckLPYW;2OWgmSsIAg zuZ|mFmaYUYjJJfo8s1fhF1)IOlQ|75La(j33(9U0btUMJvtIut>QYeUVmCrexr&Qi zKbjFQ61zkzP2U-?^r{!(!l(3+?Yga{u}aaFy}dZE-rC%=GOfyYm&N9W)k}T291PDY z*P0t`IZ}uIjJ_-j{V$SH_dlT#cu)PeEcx8DI+m&H|328vfBu=(y@&@N72}Qi-)t}U ze|i14JEpGxd*KMK)CoAp98}8bBuj9v%2KQe1W{6IHF7UVKsi-oBUDPa+B%^mI!l#A z%iggR=`rPvnSp)Z2xvn7V8#q@Dyt%#D2+c|xJU7JZ=WzC$g2~0Q{w%WGdx!uFgO@} z=-u4i58*FN5)y;)2*=Nd+$g+V_$fxmCp11?eTVGz8P->^KFOi;zxe)( z;(T!ZH#>H&|F+iuy|9`8{p-KwZ0f&dYyIB`OZs27=SuT4o@Sm$(ja3D9@K#V)prvv zs8^H+ECdN-k)k768hSV1`}Y@@gAp1N=}x2^dQlk4c0wJawc4RhTtX&fF0G*c4Nk6a z2g6fPkL6zl5rJ&(DMxg|?8hvNkvLGGEmHW9!R1+hhN`r``SI^|$t6d-fcCgFOIK|2cTx z(0@?+Iwpkj77jhTk`dl{|JR$_G$f2TQQTx@5t1m5)2bm(wJw`7E^kAU#d)Ro<+=$8 zB~Di9<@)ft(c8Gp^R&>RDl0w_r{2_6S|n)_l82T!O_ukMR{;|N_{2$~M(;Ugu%xRc z^T^e+0B#e|#6y0c`ob*XOIkOPK?79*&_HK=p+PRWJZcaVH3&gHSAyVXA<2i?Dqx}t z2EtvfEXBz3sG6-pPF2CERv|6Fin0>3Rd^FsaOr|4UFj>AOKwq9=gs_@D4Uv1GN_T3 zrX)o@JHJ1*8q8%}`|6T$MlA>S<6qQbHTk@{0G4`uO-(07dj^Got5eV5aMZx))Ph(} zYF&S}m=*-U#!TzAUHg0t^Z!TN?O$j9>zF$E|0jSdod5rV@dHE2mBCs}0d5M&-vcjQ za{Lb8l)N{R@ra&6hAfO5?=e2DpYMjyVd|S?8-@EI%wN_w3hX^Rc=qr&WH<O4Mzij(@XnhsKo&*MSlh#7(1g=&0&FEG%?Me6ampuO4>y-_`!)kpP&FT0Pj|*j)GSV93 zG0u%P9?@5H>Ue&9TJ8w(mS4U;YbU>kw!5dto6pc!`1H`piz?!Qs? zZ2zTY(j)A}O)l`C?|(Hfn=&r%X0(YbN~&_+%&1`W&E*1z3IZzVUki(*D`*Kk5kQkG z1wFz!17_g@d9ch)G0;wCGL8I9sNtr~X-yEB=^d3PuoC0XT$oBik3eT~aJ zPYYM7vf@1@^`frQB1w}O-E1jovb=r04Y>?eKuHocY1?18ny~4FyPO>aM4!NUUOmFePy(-1M3SddTi>v8NVjB&*t=IgAYbgkDfmmx*FWy-yM^~-2uA1 z`-8QZ4$iCJUfZClsXi!k+gGp^gsj(jT}WJxQ(W4?Rswg^FKlTCd%;5d=XH e1VIo4K@bE%5ClOG1VIqwGCu%8Tmj4gC;$K)2?m1z diff --git a/install/ubuntu/15.04/packages.tar.gz b/install/ubuntu/15.04/packages.tar.gz index 4b778dadce20a61f03a8ca920ec81c55a8730fee..3eff15094971ed39d1d74d3370322c1f4e3752d9 100644 GIT binary patch literal 555 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 Date: Fri, 6 Nov 2015 17:15:49 +0200 Subject: [PATCH 197/264] notification links to features page --- upd/add_notifications.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/upd/add_notifications.sh b/upd/add_notifications.sh index f0e76d16f..cf8423062 100755 --- a/upd/add_notifications.sh +++ b/upd/add_notifications.sh @@ -2,8 +2,8 @@ # Add notifications if [ ! -e '/usr/local/vesta/data/users/admin/notifications.conf' ]; then - /usr/local/vesta/bin/v-add-user-notification admin "File Manager" "Browse, coppy, edit, view, and retrieve all of your web domain files using fully featured File Manager. Plugin is avaiable for                 purchase" 'filemanager' - /usr/local/vesta/bin/v-add-user-notification admin "Chroot SFTP" "If you want have SFTP accounts that will be used only to transfer files (and not to ssh), you can purchase SFTP Chroot plugin." + /usr/local/vesta/bin/v-add-user-notification admin "File Manager" "Browse, coppy, edit, view, and retrieve all of your web domain files using fully featured File Manager. Plugin is avaiable for purchase." 'filemanager' + /usr/local/vesta/bin/v-add-user-notification admin "Chroot SFTP" "If you want have SFTP accounts that will be used only to transfer files (and not to ssh), you can purchase and enable SFTP Chroot. " /usr/local/vesta/bin/v-add-user-notification admin "Starred Objects" "Use stars to easily mark certain object as important or to indicate that you need to do something about it later." 'starred' /usr/local/vesta/bin/v-add-user-notification admin "Monitoring Tools" "This module answers common performance, health, usage and monitoring questions. Server -> Show CPU, Memory, Disk usage" /usr/local/vesta/bin/v-add-user-notification admin "Release 0.9.8-15" "New version is cool. A lot of work has been put in the user experience and stability. Check out release notes" From 9189ca9488f443a4cfea25ca1b100020b695459d Mon Sep 17 00:00:00 2001 From: RhysIT Date: Fri, 6 Nov 2015 17:38:58 +0200 Subject: [PATCH 198/264] Corrected spelling mistakes --- bin/v-acknowledge-user-notification | 2 +- bin/v-activate-vesta-license | 6 +++--- bin/v-add-backup-host | 4 ++-- bin/v-add-cron-job | 4 ++-- bin/v-add-cron-reports | 4 ++-- bin/v-add-cron-restart-job | 2 +- bin/v-add-cron-vesta-autoupdate | 4 ++-- bin/v-add-database | 2 +- bin/v-add-database-host | 4 ++-- bin/v-add-dns-domain | 2 +- bin/v-add-dns-on-web-alias | 4 ++-- bin/v-add-dns-record | 4 ++-- bin/v-add-firewall-ban | 2 +- bin/v-add-firewall-chain | 2 +- bin/v-add-firewall-rule | 2 +- bin/v-add-mail-account | 2 +- bin/v-add-mail-account-alias | 2 +- bin/v-add-mail-account-autoreply | 2 +- bin/v-add-mail-account-forward | 2 +- bin/v-add-mail-account-fwd-only | 2 +- bin/v-add-mail-domain | 2 +- bin/v-add-mail-domain-antispam | 4 ++-- bin/v-add-mail-domain-antivirus | 4 ++-- bin/v-add-mail-domain-catchall | 4 ++-- bin/v-add-mail-domain-dkim | 2 +- bin/v-add-remote-dns-domain | 2 +- bin/v-add-remote-dns-host | 2 +- bin/v-add-remote-dns-record | 2 +- bin/v-add-sys-firewall | 2 +- bin/v-add-sys-ip | 4 ++-- bin/v-add-sys-quota | 4 ++-- bin/v-add-sys-sftp-jail | 6 +++--- bin/v-add-user | 2 +- bin/v-add-user-favourites | 2 +- bin/v-add-user-notification | 2 +- bin/v-add-user-package | 2 +- bin/v-add-user-sftp-jail | 4 ++-- bin/v-add-web-domain | 4 ++-- bin/v-add-web-domain-alias | 2 +- bin/v-add-web-domain-backend | 2 +- bin/v-add-web-domain-ftp | 2 +- bin/v-add-web-domain-httpauth | 4 ++-- bin/v-add-web-domain-proxy | 2 +- bin/v-add-web-domain-ssl | 2 +- bin/v-add-web-domain-stats | 2 +- bin/v-add-web-domain-stats-user | 4 ++-- bin/v-backup-user | 4 ++-- bin/v-backup-users | 4 ++-- bin/v-change-cron-job | 2 +- bin/v-change-database-host-password | 2 +- bin/v-change-database-owner | 2 +- bin/v-change-database-password | 2 +- bin/v-change-database-user | 2 +- bin/v-change-dns-domain-exp | 6 +++--- bin/v-change-dns-domain-ip | 2 +- bin/v-change-dns-domain-soa | 2 +- bin/v-change-dns-domain-tpl | 2 +- bin/v-change-dns-domain-ttl | 4 ++-- bin/v-change-dns-record | 2 +- bin/v-change-dns-record-id | 2 +- bin/v-change-domain-owner | 2 +- bin/v-change-firewall-rule | 2 +- bin/v-change-mail-account-password | 2 +- bin/v-change-mail-account-quota | 2 +- bin/v-change-mail-domain-catchall | 4 ++-- bin/v-change-remote-dns-domain-exp | 4 ++-- bin/v-change-remote-dns-domain-soa | 2 +- bin/v-change-remote-dns-domain-ttl | 2 +- bin/v-change-sys-config-value | 2 +- bin/v-change-sys-hostname | 2 +- bin/v-change-sys-ip-name | 2 +- bin/v-change-sys-ip-nat | 2 +- bin/v-change-sys-ip-owner | 2 +- bin/v-change-sys-ip-status | 2 +- bin/v-change-sys-language | 2 +- bin/v-change-sys-timezone | 2 +- bin/v-change-user-contact | 2 +- bin/v-change-user-language | 2 +- bin/v-change-user-name | 2 +- bin/v-change-user-ns | 4 ++-- bin/v-change-user-package | 2 +- bin/v-change-user-password | 2 +- bin/v-change-user-shell | 4 ++-- bin/v-change-user-template | 2 +- bin/v-change-web-domain-backend-tpl | 2 +- bin/v-change-web-domain-ftp-password | 2 +- bin/v-change-web-domain-ftp-path | 2 +- bin/v-change-web-domain-httpauth | 6 +++--- bin/v-change-web-domain-ip | 2 +- bin/v-change-web-domain-proxy-tpl | 2 +- bin/v-change-web-domain-sslcert | 2 +- bin/v-change-web-domain-sslhome | 2 +- bin/v-change-web-domain-stats | 2 +- bin/v-change-web-domain-tpl | 2 +- bin/v-check-user-password | 2 +- bin/v-check-vesta-license | 4 ++-- bin/v-deactivate-vesta-license | 4 ++-- bin/v-delete-backup-host | 2 +- bin/v-delete-cron-job | 2 +- bin/v-delete-cron-reports | 2 +- bin/v-delete-cron-restart-job | 2 +- bin/v-delete-cron-vesta-autoupdate | 2 +- bin/v-delete-database | 2 +- bin/v-delete-database-host | 2 +- bin/v-delete-databases | 2 +- bin/v-delete-dns-domain | 2 +- bin/v-delete-dns-domains | 2 +- bin/v-delete-dns-domains-src | 2 +- bin/v-delete-dns-on-web-alias | 2 +- bin/v-delete-dns-record | 2 +- bin/v-delete-domain | 2 +- bin/v-delete-firewall-ban | 2 +- bin/v-delete-firewall-chain | 2 +- bin/v-delete-firewall-rule | 2 +- bin/v-delete-mail-account | 2 +- bin/v-delete-mail-account-alias | 2 +- bin/v-delete-mail-account-autoreply | 2 +- bin/v-delete-mail-account-forward | 4 ++-- bin/v-delete-mail-account-fwd-only | 2 +- bin/v-delete-mail-domain | 2 +- bin/v-delete-mail-domain-antispam | 4 ++-- bin/v-delete-mail-domain-antivirus | 4 ++-- bin/v-delete-mail-domain-catchall | 2 +- bin/v-delete-mail-domain-dkim | 2 +- bin/v-delete-mail-domains | 2 +- bin/v-delete-remote-dns-domain | 2 +- bin/v-delete-remote-dns-domains | 2 +- bin/v-delete-remote-dns-host | 2 +- bin/v-delete-remote-dns-record | 2 +- bin/v-delete-sys-firewall | 2 +- bin/v-delete-sys-ip | 2 +- bin/v-delete-sys-quota | 4 ++-- bin/v-delete-sys-sftp-jail | 6 +++--- bin/v-delete-user | 4 ++-- bin/v-delete-user-backup | 2 +- bin/v-delete-user-backup-exclusions | 4 ++-- bin/v-delete-user-favourites | 2 +- bin/v-delete-user-ips | 2 +- bin/v-delete-user-notification | 2 +- bin/v-delete-user-package | 4 ++-- bin/v-delete-user-sftp-jail | 4 ++-- bin/v-delete-web-domain | 2 +- bin/v-delete-web-domain-alias | 2 +- bin/v-delete-web-domain-backend | 2 +- bin/v-delete-web-domain-ftp | 2 +- bin/v-delete-web-domain-httpauth | 4 ++-- bin/v-delete-web-domain-proxy | 2 +- bin/v-delete-web-domain-ssl | 2 +- bin/v-delete-web-domain-stats | 2 +- bin/v-delete-web-domain-stats-user | 4 ++-- bin/v-delete-web-domains | 4 ++-- bin/v-generate-ssl-cert | 2 +- bin/v-get-dns-domain-value | 2 +- bin/v-get-mail-account-value | 2 +- bin/v-get-mail-domain-value | 2 +- bin/v-get-sys-timezone | 2 +- bin/v-get-sys-timezones | 2 +- bin/v-get-user-value | 2 +- bin/v-get-web-domain-value | 2 +- bin/v-insert-dns-domain | 2 +- bin/v-insert-dns-record | 2 +- bin/v-insert-dns-records | 2 +- bin/v-list-backup-host | 2 +- bin/v-list-cron-job | 2 +- bin/v-list-cron-jobs | 2 +- bin/v-list-database | 2 +- bin/v-list-database-host | 2 +- bin/v-list-database-hosts | 2 +- bin/v-list-database-types | 2 +- bin/v-list-databases | 2 +- bin/v-list-dns-domain | 2 +- bin/v-list-dns-domains | 2 +- bin/v-list-dns-domains-src | 2 +- bin/v-list-dns-records | 2 +- bin/v-list-dns-template | 2 +- bin/v-list-dns-templates | 2 +- bin/v-list-firewall | 2 +- bin/v-list-firewall-ban | 2 +- bin/v-list-firewall-rule | 2 +- bin/v-list-mail-account | 2 +- bin/v-list-mail-account-autoreply | 4 ++-- bin/v-list-mail-accounts | 2 +- bin/v-list-mail-domain | 2 +- bin/v-list-mail-domain-dkim | 2 +- bin/v-list-mail-domain-dkim-dns | 2 +- bin/v-list-mail-domains | 2 +- bin/v-list-remote-dns-hosts | 2 +- bin/v-list-sys-config | 2 +- bin/v-list-sys-cpu-status | 2 +- bin/v-list-sys-db-status | 2 +- bin/v-list-sys-disk-status | 2 +- bin/v-list-sys-dns-status | 2 +- bin/v-list-sys-info | 2 +- bin/v-list-sys-interfaces | 2 +- bin/v-list-sys-ip | 2 +- bin/v-list-sys-ips | 2 +- bin/v-list-sys-languages | 2 +- bin/v-list-sys-mail-status | 2 +- bin/v-list-sys-memory-status | 2 +- bin/v-list-sys-network-status | 2 +- bin/v-list-sys-services | 2 +- bin/v-list-sys-shells | 2 +- bin/v-list-sys-users | 2 +- bin/v-list-sys-vesta-autoupdate | 2 +- bin/v-list-sys-vesta-updates | 2 +- bin/v-list-sys-web-status | 2 +- bin/v-list-user | 4 ++-- bin/v-list-user-backup | 2 +- bin/v-list-user-backup-exclusions | 2 +- bin/v-list-user-backups | 4 ++-- bin/v-list-user-favourites | 2 +- bin/v-list-user-ips | 4 ++-- bin/v-list-user-log | 2 +- bin/v-list-user-notifications | 2 +- bin/v-list-user-ns | 4 ++-- bin/v-list-user-package | 2 +- bin/v-list-user-packages | 2 +- bin/v-list-user-stats | 2 +- bin/v-list-users | 4 ++-- bin/v-list-users-stats | 2 +- bin/v-list-web-domain | 2 +- bin/v-list-web-domain-accesslog | 2 +- bin/v-list-web-domain-errorlog | 2 +- bin/v-list-web-domain-ssl | 2 +- bin/v-list-web-domains | 2 +- bin/v-list-web-domains-alias | 2 +- bin/v-list-web-domains-proxy | 2 +- bin/v-list-web-domains-ssl | 2 +- bin/v-list-web-domains-stats | 2 +- bin/v-list-web-stats | 2 +- bin/v-list-web-templates | 2 +- bin/v-list-web-templates-backend | 2 +- bin/v-list-web-templates-proxy | 2 +- bin/v-rebuild-cron-jobs | 2 +- bin/v-rebuild-databases | 2 +- bin/v-rebuild-dns-domain | 2 +- bin/v-rebuild-dns-domains | 2 +- bin/v-rebuild-mail-domains | 2 +- bin/v-rebuild-user | 2 +- bin/v-rebuild-web-domains | 2 +- bin/v-restart-service | 2 +- bin/v-restart-system | 2 +- bin/v-restore-user | 2 +- bin/v-schedule-user-backup | 2 +- bin/v-schedule-user-restore | 2 +- bin/v-search-domain-owner | 2 +- bin/v-search-object | 2 +- bin/v-search-user-object | 2 +- bin/v-start-service | 2 +- bin/v-stop-service | 2 +- bin/v-suspend-cron-job | 4 ++-- bin/v-suspend-cron-jobs | 2 +- bin/v-suspend-database | 2 +- bin/v-suspend-database-host | 2 +- bin/v-suspend-databases | 2 +- bin/v-suspend-dns-domain | 2 +- bin/v-suspend-dns-domains | 2 +- bin/v-suspend-dns-record | 2 +- bin/v-suspend-domain | 2 +- bin/v-suspend-firewall-rule | 4 ++-- bin/v-suspend-mail-account | 2 +- bin/v-suspend-mail-accounts | 2 +- bin/v-suspend-mail-domain | 2 +- bin/v-suspend-mail-domains | 2 +- bin/v-suspend-remote-dns-host | 2 +- bin/v-suspend-user | 2 +- bin/v-suspend-web-domain | 2 +- bin/v-suspend-web-domains | 2 +- bin/v-sync-dns-cluster | 2 +- bin/v-unsuspend-cron-job | 6 +++--- bin/v-unsuspend-cron-jobs | 4 ++-- bin/v-unsuspend-database | 2 +- bin/v-unsuspend-database-host | 2 +- bin/v-unsuspend-databases | 2 +- bin/v-unsuspend-dns-domain | 2 +- bin/v-unsuspend-dns-domains | 2 +- bin/v-unsuspend-dns-record | 2 +- bin/v-unsuspend-domain | 2 +- bin/v-unsuspend-firewall-rule | 4 ++-- bin/v-unsuspend-mail-account | 2 +- bin/v-unsuspend-mail-accounts | 2 +- bin/v-unsuspend-mail-domain | 2 +- bin/v-unsuspend-mail-domains | 2 +- bin/v-unsuspend-remote-dns-host | 2 +- bin/v-unsuspend-user | 2 +- bin/v-unsuspend-web-domain | 2 +- bin/v-unsuspend-web-domains | 2 +- bin/v-update-database-disk | 4 ++-- bin/v-update-databases-disk | 2 +- bin/v-update-dns-templates | 2 +- bin/v-update-mail-domain-disk | 2 +- bin/v-update-mail-domains-disk | 2 +- bin/v-update-sys-ip | 2 +- bin/v-update-sys-ip-counters | 2 +- bin/v-update-sys-queue | 4 ++-- bin/v-update-sys-rrd | 4 ++-- bin/v-update-sys-rrd-apache2 | 4 ++-- bin/v-update-sys-rrd-ftp | 2 +- bin/v-update-sys-rrd-httpd | 2 +- bin/v-update-sys-rrd-la | 2 +- bin/v-update-sys-rrd-mail | 2 +- bin/v-update-sys-rrd-mem | 2 +- bin/v-update-sys-rrd-mysql | 2 +- bin/v-update-sys-rrd-net | 2 +- bin/v-update-sys-rrd-nginx | 2 +- bin/v-update-sys-rrd-pgsql | 2 +- bin/v-update-sys-rrd-ssh | 2 +- bin/v-update-sys-vesta | 8 ++++---- bin/v-update-user-backup-exclusions | 2 +- bin/v-update-user-backups | 2 +- bin/v-update-user-counters | 2 +- bin/v-update-user-disk | 2 +- bin/v-update-user-package | 6 +++--- bin/v-update-user-quota | 2 +- bin/v-update-user-stats | 4 ++-- bin/v-update-web-domain-disk | 4 ++-- bin/v-update-web-domain-stat | 4 ++-- bin/v-update-web-domain-traff | 4 ++-- bin/v-update-web-domains-disk | 2 +- bin/v-update-web-domains-stat | 2 +- bin/v-update-web-domains-traff | 2 +- bin/v-update-web-templates | 2 +- install/debian/7/fail2ban/filter.d/vesta.conf | 2 +- install/debian/8/fail2ban/filter.d/vesta.conf | 2 +- install/rhel/5/fail2ban/fail2ban.filter.conf | 2 +- install/rhel/6/fail2ban/fail2ban.filter.conf | 2 +- install/rhel/7/fail2ban/fail2ban.filter.conf | 2 +- install/ubuntu/12.04/fail2ban/filter.d/vesta.conf | 2 +- install/ubuntu/12.10/fail2ban/filter.d/vesta.conf | 2 +- install/ubuntu/13.04/fail2ban/filter.d/vesta.conf | 2 +- install/ubuntu/13.10/fail2ban/filter.d/vesta.conf | 2 +- install/ubuntu/14.04/fail2ban/filter.d/vesta.conf | 2 +- install/ubuntu/14.10/fail2ban/filter.d/vesta.conf | 2 +- install/ubuntu/15.04/fail2ban/filter.d/vesta.conf | 2 +- install/vst-install-debian.sh | 6 +++--- 335 files changed, 408 insertions(+), 408 deletions(-) diff --git a/bin/v-acknowledge-user-notification b/bin/v-acknowledge-user-notification index 16a40e55b..84823d277 100755 --- a/bin/v-acknowledge-user-notification +++ b/bin/v-acknowledge-user-notification @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 nid=$2 diff --git a/bin/v-activate-vesta-license b/bin/v-activate-vesta-license index 4774e9288..f6cc05e02 100755 --- a/bin/v-activate-vesta-license +++ b/bin/v-activate-vesta-license @@ -2,18 +2,18 @@ # info: activate vesta license # options: MODULE LICENSE # -# The function activates and register vesta license +# The function activates and registers the vesta license #----------------------------------------------------------# # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition module=$(echo $1 | tr '[:lower:]' '[:upper:]') license=$2 -# Importing system enviroment +# Importing system environment source /etc/profile # Includes diff --git a/bin/v-add-backup-host b/bin/v-add-backup-host index 00fcfeccf..5595c0439 100755 --- a/bin/v-add-backup-host +++ b/bin/v-add-backup-host @@ -2,14 +2,14 @@ # info: add backup host # options: TYPE HOST USERNAME PASSWORD [PATH] [PORT] # -# The function adds backup host +# This function adds a backup host #----------------------------------------------------------# # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition type=$1 host=$2 user=$3 diff --git a/bin/v-add-cron-job b/bin/v-add-cron-job index b233f9a2d..b6c41480a 100755 --- a/bin/v-add-cron-job +++ b/bin/v-add-cron-job @@ -10,7 +10,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 min=$2 hour=$3 @@ -25,7 +25,7 @@ restart=$9 source $VESTA/func/main.sh source $VESTA/conf/vesta.conf -# Assing new value +# Assigning new value A7="$command" diff --git a/bin/v-add-cron-reports b/bin/v-add-cron-reports index 81f75284f..e0d6b21a9 100755 --- a/bin/v-add-cron-reports +++ b/bin/v-add-cron-reports @@ -1,6 +1,6 @@ #!/bin/bash # info: add cron reports -# opions: user +# options: user # # The script for enabling reports on cron tasks and administrative # notifications. @@ -10,7 +10,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 # Includes diff --git a/bin/v-add-cron-restart-job b/bin/v-add-cron-restart-job index b751c9adb..474ef1196 100755 --- a/bin/v-add-cron-restart-job +++ b/bin/v-add-cron-restart-job @@ -1,6 +1,6 @@ #!/bin/bash # info: add cron reports -# opions: NONE +# options: NONE # # The script for enabling restart cron tasks diff --git a/bin/v-add-cron-vesta-autoupdate b/bin/v-add-cron-vesta-autoupdate index be881d636..2d0268371 100755 --- a/bin/v-add-cron-vesta-autoupdate +++ b/bin/v-add-cron-vesta-autoupdate @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=admin # Includes @@ -34,7 +34,7 @@ fi # Action # #----------------------------------------------------------# -# Define time somewhere at nigth +# Define time somewhere at night min=$(gen_password '012345' '2') hour=$(gen_password '1234567' '1') day='*' diff --git a/bin/v-add-database b/bin/v-add-database index a3c3ff453..68e676479 100755 --- a/bin/v-add-database +++ b/bin/v-add-database @@ -15,7 +15,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 database="$user"_"$2" dbuser="$user"_"$3" diff --git a/bin/v-add-database-host b/bin/v-add-database-host index cf0862eca..550d0a707 100755 --- a/bin/v-add-database-host +++ b/bin/v-add-database-host @@ -13,7 +13,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition type=$1 host=$2 dbuser=$3 @@ -76,7 +76,7 @@ esac # Action # #----------------------------------------------------------# -# Concatentating db host string +# Concatenating db host string case $type in mysql) str="HOST='$host' USER='$dbuser' PASSWORD='$dbpass'"; str="$str CHARSETS='$charsets' MAX_DB='$max_db' U_SYS_USERS=''"; diff --git a/bin/v-add-dns-domain b/bin/v-add-dns-domain index 512c64791..852050ceb 100755 --- a/bin/v-add-dns-domain +++ b/bin/v-add-dns-domain @@ -13,7 +13,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$(idn -t --quiet -u "$2" ) domain=$(echo $domain | sed -e 's/\.*$//g' -e 's/^\.*//g') diff --git a/bin/v-add-dns-on-web-alias b/bin/v-add-dns-on-web-alias index 8646b3143..e0eded79a 100755 --- a/bin/v-add-dns-on-web-alias +++ b/bin/v-add-dns-on-web-alias @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 alias=$2 ip=$3 @@ -54,7 +54,7 @@ if [ "$domain_lvl" -eq 1 ] || [ "${#top_domain}" -le '6' ]; then exit fi -# Adding toplevel domain and then its sub +# Adding top-level domain and then its sub $BIN/v-add-dns-domain $user $top_domain $ip '' '' '' '' $restart >> /dev/null # Checking top-level domain diff --git a/bin/v-add-dns-record b/bin/v-add-dns-record index af1744895..988c0fbe8 100755 --- a/bin/v-add-dns-record +++ b/bin/v-add-dns-record @@ -12,7 +12,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$(idn -t --quiet -u "$2" ) domain=$(echo $domain | tr '[:upper:]' '[:lower:]') @@ -101,7 +101,7 @@ fi # Vesta # #----------------------------------------------------------# -# Upddate counters +# Update counters records="$(wc -l $USER_DATA/dns/$domain.conf | cut -f1 -d ' ')" update_object_value 'dns' 'DOMAIN' "$domain" '$RECORDS' "$records" increase_user_value "$user" '$U_DNS_RECORDS' diff --git a/bin/v-add-firewall-ban b/bin/v-add-firewall-ban index 26dc6cbc3..6fb61c8d0 100755 --- a/bin/v-add-firewall-ban +++ b/bin/v-add-firewall-ban @@ -12,7 +12,7 @@ # Importing system variables source /etc/profile -# Argument defenition +# Argument definition ip=$1 chain=$(echo $2|tr '[:lower:]' '[:upper:]') diff --git a/bin/v-add-firewall-chain b/bin/v-add-firewall-chain index 194602caa..735cd11d1 100755 --- a/bin/v-add-firewall-chain +++ b/bin/v-add-firewall-chain @@ -12,7 +12,7 @@ # Importing system variables source /etc/profile -# Argument defenition +# Argument definition chain=$(echo $1 | tr '[:lower:]' '[:upper:]') port=$2 protocol=${4-TCP} diff --git a/bin/v-add-firewall-rule b/bin/v-add-firewall-rule index 56a6fcf48..37abe98b7 100755 --- a/bin/v-add-firewall-rule +++ b/bin/v-add-firewall-rule @@ -12,7 +12,7 @@ # Importing system variables source /etc/profile -# Argument defenition +# Argument definition action=$(echo $1|tr '[:lower:]' '[:upper:]') ip=$2 port_ext=$3 diff --git a/bin/v-add-mail-account b/bin/v-add-mail-account index 3fbe6ae9b..5bc5cf02e 100755 --- a/bin/v-add-mail-account +++ b/bin/v-add-mail-account @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$(idn -t --quiet -u "$2" ) domain=$(echo $domain | tr '[:upper:]' '[:lower:]') diff --git a/bin/v-add-mail-account-alias b/bin/v-add-mail-account-alias index d1d12a4cf..9cd2b06b9 100755 --- a/bin/v-add-mail-account-alias +++ b/bin/v-add-mail-account-alias @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$(idn -t --quiet -u "$2" ) domain=$(echo $domain | tr '[:upper:]' '[:lower:]') diff --git a/bin/v-add-mail-account-autoreply b/bin/v-add-mail-account-autoreply index f04e9ed93..a1cd09f9c 100755 --- a/bin/v-add-mail-account-autoreply +++ b/bin/v-add-mail-account-autoreply @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$(idn -t --quiet -u "$2" ) domain=$(echo $domain | tr '[:upper:]' '[:lower:]') diff --git a/bin/v-add-mail-account-forward b/bin/v-add-mail-account-forward index 5b2720a13..5f4eaeed9 100755 --- a/bin/v-add-mail-account-forward +++ b/bin/v-add-mail-account-forward @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$(idn -t --quiet -u "$2" ) domain=$(echo $domain | tr '[:upper:]' '[:lower:]') diff --git a/bin/v-add-mail-account-fwd-only b/bin/v-add-mail-account-fwd-only index 5be21965c..72e7c8ec0 100755 --- a/bin/v-add-mail-account-fwd-only +++ b/bin/v-add-mail-account-fwd-only @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$(idn -t --quiet -u "$2" ) domain=$(echo $domain | tr '[:upper:]' '[:lower:]') diff --git a/bin/v-add-mail-domain b/bin/v-add-mail-domain index 8c6ce2804..9fbd18525 100755 --- a/bin/v-add-mail-domain +++ b/bin/v-add-mail-domain @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$(idn -t --quiet -u "$2" ) domain=$(echo $domain | sed -e 's/\.*$//g' -e 's/^\.*//g') diff --git a/bin/v-add-mail-domain-antispam b/bin/v-add-mail-domain-antispam index 6af5f79f0..20e0c2010 100755 --- a/bin/v-add-mail-domain-antispam +++ b/bin/v-add-mail-domain-antispam @@ -2,14 +2,14 @@ # info: add mail domain antispam support # options: USER DOMAIN # -# The function enables spamassasin for incomming emails. +# The function enables spamassasin for incoming emails. #----------------------------------------------------------# # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$(idn -t --quiet -u "$2" ) domain=$(echo $domain | tr '[:upper:]' '[:lower:]') diff --git a/bin/v-add-mail-domain-antivirus b/bin/v-add-mail-domain-antivirus index 714f89d71..fe7151d24 100755 --- a/bin/v-add-mail-domain-antivirus +++ b/bin/v-add-mail-domain-antivirus @@ -2,14 +2,14 @@ # info: add mail domain antivirus support # options: USER DOMAIN # -# The function enables clamav scan for incomming emails. +# The function enables clamav scan for incoming emails. #----------------------------------------------------------# # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$(idn -t --quiet -u "$2" ) domain=$(echo $domain | tr '[:upper:]' '[:lower:]') diff --git a/bin/v-add-mail-domain-catchall b/bin/v-add-mail-domain-catchall index c49bacc91..8ce5eddf0 100755 --- a/bin/v-add-mail-domain-catchall +++ b/bin/v-add-mail-domain-catchall @@ -2,14 +2,14 @@ # info: add mail domain catchall account # options: USER DOMAIN EMAIL # -# The function enables catchall account for incomming emails. +# The function enables catchall account for incoming emails. #----------------------------------------------------------# # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$(idn -t --quiet -u "$2" ) domain=$(echo $domain | tr '[:upper:]' '[:lower:]') diff --git a/bin/v-add-mail-domain-dkim b/bin/v-add-mail-domain-dkim index 7d391816f..f2accc035 100755 --- a/bin/v-add-mail-domain-dkim +++ b/bin/v-add-mail-domain-dkim @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$(idn -t --quiet -u "$2" ) domain=$(echo $domain | tr '[:upper:]' '[:lower:]') diff --git a/bin/v-add-remote-dns-domain b/bin/v-add-remote-dns-domain index 758a9ebe7..a2f5b34a0 100755 --- a/bin/v-add-remote-dns-domain +++ b/bin/v-add-remote-dns-domain @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$2 flush=$3 diff --git a/bin/v-add-remote-dns-host b/bin/v-add-remote-dns-host index c004ee316..32614ce0f 100755 --- a/bin/v-add-remote-dns-host +++ b/bin/v-add-remote-dns-host @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition host=$1 HOST=$host port=$2 diff --git a/bin/v-add-remote-dns-record b/bin/v-add-remote-dns-record index f1a7fee59..9848ef234 100755 --- a/bin/v-add-remote-dns-record +++ b/bin/v-add-remote-dns-record @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$2 id=$3 diff --git a/bin/v-add-sys-firewall b/bin/v-add-sys-firewall index 47676e9e8..ab40345bd 100755 --- a/bin/v-add-sys-firewall +++ b/bin/v-add-sys-firewall @@ -1,6 +1,6 @@ #!/bin/bash # info: add system firewall -# opions: NONE +# options: NONE # # The script enables firewall diff --git a/bin/v-add-sys-ip b/bin/v-add-sys-ip index 79d607abc..3b1a835eb 100755 --- a/bin/v-add-sys-ip +++ b/bin/v-add-sys-ip @@ -5,7 +5,7 @@ # The function adds ip address into a system. It also creates rc scripts. You # can specify ip name which will be used as root domain for temporary aliases. # For example, if you set a1.myhosting.com as name, each new domain created on -# this ip will automaticaly receive alias $domain.a1.myhosting.com. Of course +# this ip will automatically receive alias $domain.a1.myhosting.com. Of course # you must have wildcard record *.a1.myhosting.com pointed to ip. This feature # is very handy when customer wants to test domain before dns migration. @@ -14,7 +14,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition ip=${1// /} netmask=$2 interface="${3-eth0}" diff --git a/bin/v-add-sys-quota b/bin/v-add-sys-quota index 10432a608..95a91ee15 100755 --- a/bin/v-add-sys-quota +++ b/bin/v-add-sys-quota @@ -1,8 +1,8 @@ #!/bin/bash # info: add system quota -# opions: NONE +# options: NONE # -# The script enables filesystem quota on /home patition +# The script enables filesystem quota on /home partition #----------------------------------------------------------# diff --git a/bin/v-add-sys-sftp-jail b/bin/v-add-sys-sftp-jail index 1a207efcf..c31fb4390 100755 --- a/bin/v-add-sys-sftp-jail +++ b/bin/v-add-sys-sftp-jail @@ -1,6 +1,6 @@ #!/bin/bash # info: add system sftp jail -# opions: NONE +# options: NONE # # The script enables sftp jailed environment @@ -9,8 +9,8 @@ # Variable&Function # #----------------------------------------------------------# -# Importing system enviroment as we run this script -# mostly by cron wich do not read it by itself +# Importing system environment as we run this script +# mostly by cron which do not read it by itself source /etc/profile # Includes diff --git a/bin/v-add-user b/bin/v-add-user index ba250ccb3..35424381b 100755 --- a/bin/v-add-user +++ b/bin/v-add-user @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 password=$2; HIDE=2 email=$3 diff --git a/bin/v-add-user-favourites b/bin/v-add-user-favourites index 53620d57d..84764e4ad 100755 --- a/bin/v-add-user-favourites +++ b/bin/v-add-user-favourites @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 system=$(echo "$2" |tr '[:lower:]' '[:upper:]') object=$3 diff --git a/bin/v-add-user-notification b/bin/v-add-user-notification index 7a9146b93..dcc61f8a1 100755 --- a/bin/v-add-user-notification +++ b/bin/v-add-user-notification @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 topic=$(echo $2 |sed "s/'/%quote%/g") notice=$(echo $3 |sed "s/'/%quote%/g") diff --git a/bin/v-add-user-package b/bin/v-add-user-package index ea82411c8..49332154d 100755 --- a/bin/v-add-user-package +++ b/bin/v-add-user-package @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition pkg_dir=$1 package=$2 rewrite=$3 diff --git a/bin/v-add-user-sftp-jail b/bin/v-add-user-sftp-jail index 6d0b87e8b..de2990386 100755 --- a/bin/v-add-user-sftp-jail +++ b/bin/v-add-user-sftp-jail @@ -1,6 +1,6 @@ #!/bin/bash # info: add user sftp jail -# opions: USER +# options: USER # # The script enables sftp jailed environment @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 # Includes diff --git a/bin/v-add-web-domain b/bin/v-add-web-domain index 87be95702..ebe5f0b58 100755 --- a/bin/v-add-web-domain +++ b/bin/v-add-web-domain @@ -5,7 +5,7 @@ # The function adds virtual host to a server. In cases when a template is # undefined in the script, the template "default" will be used. The alias of # www.domain.tld type will be automatically assigned to the domain. If ip have -# assocated dns name, this domain will also get the alias domain-tpl.$ipname. +# associated dns name, this domain will also get the alias domain-tpl.$ipname. # An alias with the ip name is useful during the site testing while dns isn't # moved to a server yet. @@ -14,7 +14,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$(idn -t --quiet -u "$2" ) domain=$(echo $domain | sed -e 's/\.*$//g' -e 's/^\.*//g') diff --git a/bin/v-add-web-domain-alias b/bin/v-add-web-domain-alias index 2630190f5..5e1a5e781 100755 --- a/bin/v-add-web-domain-alias +++ b/bin/v-add-web-domain-alias @@ -10,7 +10,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$(idn -t --quiet -u "$2" ) domain=$(echo $domain | tr '[:upper:]' '[:lower:]') diff --git a/bin/v-add-web-domain-backend b/bin/v-add-web-domain-backend index 7787afbed..cc595ce50 100755 --- a/bin/v-add-web-domain-backend +++ b/bin/v-add-web-domain-backend @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$2 domain_idn=$(idn -t --quiet -a "$domain") diff --git a/bin/v-add-web-domain-ftp b/bin/v-add-web-domain-ftp index 57afec481..6a55155c5 100755 --- a/bin/v-add-web-domain-ftp +++ b/bin/v-add-web-domain-ftp @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$(idn -t --quiet -u "$2" ) domain_idn=$(idn -t --quiet -a "$domain") diff --git a/bin/v-add-web-domain-httpauth b/bin/v-add-web-domain-httpauth index 4b336629e..5f27399af 100755 --- a/bin/v-add-web-domain-httpauth +++ b/bin/v-add-web-domain-httpauth @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$2 auth_user=$3 @@ -21,7 +21,7 @@ source $VESTA/func/main.sh source $VESTA/func/domain.sh source $VESTA/conf/vesta.conf -# Definining htpasswd file +# Defining htpasswd file htaccess="$HOMEDIR/$user/conf/web/$WEB_SYSTEM.$domain.conf_htaccess" htpasswd="$HOMEDIR/$user/conf/web/$WEB_SYSTEM.$domain.htpasswd" docroot="$HOMEDIR/$user/web/$domain/public_html" diff --git a/bin/v-add-web-domain-proxy b/bin/v-add-web-domain-proxy index a64b3e308..476f0cd40 100755 --- a/bin/v-add-web-domain-proxy +++ b/bin/v-add-web-domain-proxy @@ -10,7 +10,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$(idn -t --quiet -u "$2" ) domain_idn=$(idn -t --quiet -a "$domain") diff --git a/bin/v-add-web-domain-ssl b/bin/v-add-web-domain-ssl index a18ff90bd..72767e772 100755 --- a/bin/v-add-web-domain-ssl +++ b/bin/v-add-web-domain-ssl @@ -14,7 +14,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$(idn -t --quiet -u "$2" ) domain_idn=$(idn -t --quiet -a "$domain") diff --git a/bin/v-add-web-domain-stats b/bin/v-add-web-domain-stats index 8ee057618..929e27d0a 100755 --- a/bin/v-add-web-domain-stats +++ b/bin/v-add-web-domain-stats @@ -13,7 +13,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$(idn -t --quiet -u "$2" ) domain_idn=$(idn -t --quiet -a "$domain") diff --git a/bin/v-add-web-domain-stats-user b/bin/v-add-web-domain-stats-user index dbbd31582..007c013da 100755 --- a/bin/v-add-web-domain-stats-user +++ b/bin/v-add-web-domain-stats-user @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$(idn -t --quiet -u "$2" ) stats_user=$3 @@ -39,7 +39,7 @@ is_password_valid # Action # #----------------------------------------------------------# -# Definining statistic dir +# Defining statistic dir stats_dir="$HOMEDIR/$user/web/$domain/stats" # Adding htaccess file diff --git a/bin/v-backup-user b/bin/v-backup-user index b1d4efb1d..0a335da47 100755 --- a/bin/v-backup-user +++ b/bin/v-backup-user @@ -12,7 +12,7 @@ # Importing system variables source /etc/profile -# Argument defenition +# Argument definition user=$1 notify=${2-no} @@ -853,7 +853,7 @@ msg="$msg\n$(date "+%F %T") Runtime: $run_time $min" touch $USER_DATA/backup.conf sed -i "/$user.$DATE.tar/d" $USER_DATA/backup.conf -# Regestering new backup +# Registering new backup backup_str="BACKUP='$user.$DATE.tar'" backup_str="$backup_str TYPE='$BACKUP_SYSTEM' SIZE='$size'" backup_str="$backup_str WEB='${web_list// /,}'" diff --git a/bin/v-backup-users b/bin/v-backup-users index a7867632a..3473ad70c 100755 --- a/bin/v-backup-users +++ b/bin/v-backup-users @@ -9,8 +9,8 @@ # Variable&Function # #----------------------------------------------------------# -# Importing system enviroment as we run this script -# mostly by cron wich not read it by itself +# Importing system environment as we run this script +# mostly by cron which not read it by itself source /etc/profile # Includes diff --git a/bin/v-change-cron-job b/bin/v-change-cron-job index 23df67e88..c38ad7e9e 100755 --- a/bin/v-change-cron-job +++ b/bin/v-change-cron-job @@ -10,7 +10,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 job=$2 min=$3 diff --git a/bin/v-change-database-host-password b/bin/v-change-database-host-password index d5d37ea1d..abe8e06b9 100755 --- a/bin/v-change-database-host-password +++ b/bin/v-change-database-host-password @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition type=$1 host=$2 dbuser=$3 diff --git a/bin/v-change-database-owner b/bin/v-change-database-owner index 3eb207c0a..166528f81 100755 --- a/bin/v-change-database-owner +++ b/bin/v-change-database-owner @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition database=$1 user=$2 diff --git a/bin/v-change-database-password b/bin/v-change-database-password index 29c41af82..1272f00ad 100755 --- a/bin/v-change-database-password +++ b/bin/v-change-database-password @@ -10,7 +10,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 database=$2 password=$3; HIDE=3 diff --git a/bin/v-change-database-user b/bin/v-change-database-user index 77c8ef975..332dfc103 100755 --- a/bin/v-change-database-user +++ b/bin/v-change-database-user @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 database=$2 dbuser="$user"_"$3" diff --git a/bin/v-change-dns-domain-exp b/bin/v-change-dns-domain-exp index 4d5bc5824..da75bca81 100755 --- a/bin/v-change-dns-domain-exp +++ b/bin/v-change-dns-domain-exp @@ -1,5 +1,5 @@ #!/bin/bash -# info: change dns domain expiriation date +# info: change dns domain expiration date # options: USER DOMAIN EXP # # The function of changing the term of expiration domain's registration. The @@ -10,7 +10,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$(idn -t --quiet -u "$2" ) domain_idn=$(idn -t --quiet -a "$domain") @@ -57,7 +57,7 @@ fi #----------------------------------------------------------# # Logging -log_history "changed whois expiriation date for $domain" +log_history "changed whois expiration date for $domain" log_event "$OK" "$EVENT" exit diff --git a/bin/v-change-dns-domain-ip b/bin/v-change-dns-domain-ip index deb511cf6..a066c6be7 100755 --- a/bin/v-change-dns-domain-ip +++ b/bin/v-change-dns-domain-ip @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$(idn -t --quiet -u "$2" ) domain_idn=$(idn -t --quiet -a "$domain") diff --git a/bin/v-change-dns-domain-soa b/bin/v-change-dns-domain-soa index dc281f77c..3a8670f76 100755 --- a/bin/v-change-dns-domain-soa +++ b/bin/v-change-dns-domain-soa @@ -10,7 +10,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$(idn -t --quiet -u "$2" ) domain_idn=$(idn -t --quiet -a "$domain") diff --git a/bin/v-change-dns-domain-tpl b/bin/v-change-dns-domain-tpl index 1acad59bc..e8ee90c6c 100755 --- a/bin/v-change-dns-domain-tpl +++ b/bin/v-change-dns-domain-tpl @@ -11,7 +11,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$(idn -t --quiet -u "$2" ) domain_idn=$(idn -t --quiet -a "$domain") diff --git a/bin/v-change-dns-domain-ttl b/bin/v-change-dns-domain-ttl index a99dc7f3e..120d7e0db 100755 --- a/bin/v-change-dns-domain-ttl +++ b/bin/v-change-dns-domain-ttl @@ -2,14 +2,14 @@ # info: change dns domain ttl # options: USER DOMAIN TTL # -# The function for chaning the time to live TTL parameter for all records. +# The function for changing the time to live TTL parameter for all records. #----------------------------------------------------------# # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$(idn -t --quiet -u "$2" ) domain_idn=$(idn -t --quiet -a "$domain") diff --git a/bin/v-change-dns-record b/bin/v-change-dns-record index 018aa55dd..1569ae9c5 100755 --- a/bin/v-change-dns-record +++ b/bin/v-change-dns-record @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$(idn -t --quiet -u "$2" ) domain=$(echo $domain | tr '[:upper:]' '[:lower:]') diff --git a/bin/v-change-dns-record-id b/bin/v-change-dns-record-id index 202eb9ee3..42ab1d74e 100755 --- a/bin/v-change-dns-record-id +++ b/bin/v-change-dns-record-id @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$(idn -t --quiet -u "$2" ) domain=$(echo $domain | tr '[:upper:]' '[:lower:]') diff --git a/bin/v-change-domain-owner b/bin/v-change-domain-owner index ef0464861..1943473e4 100755 --- a/bin/v-change-domain-owner +++ b/bin/v-change-domain-owner @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition domain=$1 user=$2 ip=$3 diff --git a/bin/v-change-firewall-rule b/bin/v-change-firewall-rule index e7fa16380..806f093bb 100755 --- a/bin/v-change-firewall-rule +++ b/bin/v-change-firewall-rule @@ -13,7 +13,7 @@ # Importing system variables source /etc/profile -# Argument defenition +# Argument definition rule=$1 action=$(echo $2|tr '[:lower:]' '[:upper:]') ip=$3 diff --git a/bin/v-change-mail-account-password b/bin/v-change-mail-account-password index 11afb34b5..3109ea212 100755 --- a/bin/v-change-mail-account-password +++ b/bin/v-change-mail-account-password @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$(idn -t --quiet -u "$2" ) domain=$(echo $domain | tr '[:upper:]' '[:lower:]') diff --git a/bin/v-change-mail-account-quota b/bin/v-change-mail-account-quota index 2c9d39242..3055da72e 100755 --- a/bin/v-change-mail-account-quota +++ b/bin/v-change-mail-account-quota @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$(idn -t --quiet -u "$2" ) domain=$(echo $domain | tr '[:upper:]' '[:lower:]') diff --git a/bin/v-change-mail-domain-catchall b/bin/v-change-mail-domain-catchall index 7428d5526..97909fd66 100755 --- a/bin/v-change-mail-domain-catchall +++ b/bin/v-change-mail-domain-catchall @@ -2,14 +2,14 @@ # info: change mail domain catchall email # options: USER DOMAIN EMAIL # -# The function changes mail domain cathcall. +# The function changes mail domain catchall. #----------------------------------------------------------# # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$(idn -t --quiet -u "$2" ) domain=$(echo $domain | tr '[:upper:]' '[:lower:]') diff --git a/bin/v-change-remote-dns-domain-exp b/bin/v-change-remote-dns-domain-exp index 885f15aef..a335d63bc 100755 --- a/bin/v-change-remote-dns-domain-exp +++ b/bin/v-change-remote-dns-domain-exp @@ -1,5 +1,5 @@ #!/bin/bash -# info: change remote dns domain expiriation date +# info: change remote dns domain expiration date # options: USER DOMAIN # # The function synchronize dns domain with the remote server. @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$2 diff --git a/bin/v-change-remote-dns-domain-soa b/bin/v-change-remote-dns-domain-soa index 4adf2a4d7..65a0c8dfd 100755 --- a/bin/v-change-remote-dns-domain-soa +++ b/bin/v-change-remote-dns-domain-soa @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$2 diff --git a/bin/v-change-remote-dns-domain-ttl b/bin/v-change-remote-dns-domain-ttl index a03664d79..b0e45b774 100755 --- a/bin/v-change-remote-dns-domain-ttl +++ b/bin/v-change-remote-dns-domain-ttl @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$2 diff --git a/bin/v-change-sys-config-value b/bin/v-change-sys-config-value index 7837d8bbb..0af44ee3c 100755 --- a/bin/v-change-sys-config-value +++ b/bin/v-change-sys-config-value @@ -10,7 +10,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition key=$(echo "$1" | tr '[:lower:]' '[:upper:]' ) value=$2 diff --git a/bin/v-change-sys-hostname b/bin/v-change-sys-hostname index eab206a51..d977f39ff 100755 --- a/bin/v-change-sys-hostname +++ b/bin/v-change-sys-hostname @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition domain=$1 # Includes diff --git a/bin/v-change-sys-ip-name b/bin/v-change-sys-ip-name index 8b3a5ef7d..425efb6ec 100755 --- a/bin/v-change-sys-ip-name +++ b/bin/v-change-sys-ip-name @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition ip=$1 ip_name=$2 diff --git a/bin/v-change-sys-ip-nat b/bin/v-change-sys-ip-nat index f6b448615..a76e8878c 100755 --- a/bin/v-change-sys-ip-nat +++ b/bin/v-change-sys-ip-nat @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition ip=$1 nat_ip=$2 restart=$3 diff --git a/bin/v-change-sys-ip-owner b/bin/v-change-sys-ip-owner index 0fe37ddc4..3fbfc43ee 100755 --- a/bin/v-change-sys-ip-owner +++ b/bin/v-change-sys-ip-owner @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition ip=$1 user=$2 diff --git a/bin/v-change-sys-ip-status b/bin/v-change-sys-ip-status index 30f00254e..907c9e964 100755 --- a/bin/v-change-sys-ip-status +++ b/bin/v-change-sys-ip-status @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition ip=$1 ip_status=$2 diff --git a/bin/v-change-sys-language b/bin/v-change-sys-language index 358a143e6..5b79b0f4a 100755 --- a/bin/v-change-sys-language +++ b/bin/v-change-sys-language @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition language=$1 # Includes diff --git a/bin/v-change-sys-timezone b/bin/v-change-sys-timezone index b66a65afc..d168d13a2 100755 --- a/bin/v-change-sys-timezone +++ b/bin/v-change-sys-timezone @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition timezone=$1 # Includes diff --git a/bin/v-change-user-contact b/bin/v-change-user-contact index a9bc75eeb..4228e5aab 100755 --- a/bin/v-change-user-contact +++ b/bin/v-change-user-contact @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 email=$2 diff --git a/bin/v-change-user-language b/bin/v-change-user-language index c6e7b0cbf..8a257d280 100755 --- a/bin/v-change-user-language +++ b/bin/v-change-user-language @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 language=$2 diff --git a/bin/v-change-user-name b/bin/v-change-user-name index 9cbecc596..41223181d 100755 --- a/bin/v-change-user-name +++ b/bin/v-change-user-name @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 fname=$2 lname=$3 diff --git a/bin/v-change-user-ns b/bin/v-change-user-ns index 027cc1b60..02f06ff0b 100755 --- a/bin/v-change-user-ns +++ b/bin/v-change-user-ns @@ -2,14 +2,14 @@ # info: change user nameservers # options: USER NS1 NS2 [NS3] [NS4] [NS5] [NS6] [NS7] [NS8] # -# The function for changing default nameservers for speciefic user. +# The function for changing default nameservers for specific user. #----------------------------------------------------------# # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 ns1=$(echo $2 | sed -e 's/\.*$//g' -e 's/^\.*//g') ns2=$(echo $3 | sed -e 's/\.*$//g' -e 's/^\.*//g') diff --git a/bin/v-change-user-package b/bin/v-change-user-package index bfa91bcbb..80dd20464 100755 --- a/bin/v-change-user-package +++ b/bin/v-change-user-package @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 package=$2 force=$3 diff --git a/bin/v-change-user-password b/bin/v-change-user-password index ce38cb533..af194361d 100755 --- a/bin/v-change-user-password +++ b/bin/v-change-user-password @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 password=$2; HIDE=2 diff --git a/bin/v-change-user-shell b/bin/v-change-user-shell index 8f2b5b4de..721c84755 100755 --- a/bin/v-change-user-shell +++ b/bin/v-change-user-shell @@ -2,14 +2,14 @@ # info: change user shell # options: USER SHELL # -# The function changes system shell of a user. Shell gives abilty to use ssh. +# The function changes system shell of a user. Shell gives ability to use ssh. #----------------------------------------------------------# # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 shell=$2 diff --git a/bin/v-change-user-template b/bin/v-change-user-template index fe7c71825..a67bfc3d8 100755 --- a/bin/v-change-user-template +++ b/bin/v-change-user-template @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 type=$(echo "$2" | tr '[:lower:]' '[:upper:]') template=$3 diff --git a/bin/v-change-web-domain-backend-tpl b/bin/v-change-web-domain-backend-tpl index b932bde2b..91f6f3c20 100755 --- a/bin/v-change-web-domain-backend-tpl +++ b/bin/v-change-web-domain-backend-tpl @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$(idn -t --quiet -u "$2" ) domain_idn=$(idn -t --quiet -a "$domain") diff --git a/bin/v-change-web-domain-ftp-password b/bin/v-change-web-domain-ftp-password index 8d38fbb46..900c6fa30 100755 --- a/bin/v-change-web-domain-ftp-password +++ b/bin/v-change-web-domain-ftp-password @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$(idn -t --quiet -u "$2" ) domain_idn=$(idn -t --quiet -a "$domain") diff --git a/bin/v-change-web-domain-ftp-path b/bin/v-change-web-domain-ftp-path index f4489c0a1..71da7d853 100755 --- a/bin/v-change-web-domain-ftp-path +++ b/bin/v-change-web-domain-ftp-path @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$(idn -t --quiet -u "$2" ) domain_idn=$(idn -t --quiet -a "$domain") diff --git a/bin/v-change-web-domain-httpauth b/bin/v-change-web-domain-httpauth index 9996c0988..3483838c1 100755 --- a/bin/v-change-web-domain-httpauth +++ b/bin/v-change-web-domain-httpauth @@ -2,14 +2,14 @@ # info: change password for http auth user # options: USER DOMAIN AUTH_USER AUTH_PASSWORD # -# The call is used for chaning http auth user password +# The call is used for changing http auth user password #----------------------------------------------------------# # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$2 auth_user=$3 @@ -20,7 +20,7 @@ source $VESTA/func/main.sh source $VESTA/func/domain.sh source $VESTA/conf/vesta.conf -# Definining htpasswd file +# Defining htpasswd file htpasswd="$HOMEDIR/$user/conf/web/$WEB_SYSTEM.$domain.htpasswd" diff --git a/bin/v-change-web-domain-ip b/bin/v-change-web-domain-ip index e5b0e4c52..22aaca855 100755 --- a/bin/v-change-web-domain-ip +++ b/bin/v-change-web-domain-ip @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$(idn -t --quiet -u "$2" ) domain_idn=$(idn -t --quiet -a "$domain") diff --git a/bin/v-change-web-domain-proxy-tpl b/bin/v-change-web-domain-proxy-tpl index bd03ca888..be74713d2 100755 --- a/bin/v-change-web-domain-proxy-tpl +++ b/bin/v-change-web-domain-proxy-tpl @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$(idn -t --quiet -u "$2" ) domain_idn=$(idn -t --quiet -a "$domain") diff --git a/bin/v-change-web-domain-sslcert b/bin/v-change-web-domain-sslcert index 58a3c6f0f..376241946 100755 --- a/bin/v-change-web-domain-sslcert +++ b/bin/v-change-web-domain-sslcert @@ -10,7 +10,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$(idn -t --quiet -u "$2" ) domain_idn=$(idn -t --quiet -a "$domain") diff --git a/bin/v-change-web-domain-sslhome b/bin/v-change-web-domain-sslhome index 277bd3527..52399ef8f 100755 --- a/bin/v-change-web-domain-sslhome +++ b/bin/v-change-web-domain-sslhome @@ -5,7 +5,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$(idn -t --quiet -u "$2" ) domain_idn=$(idn -t --quiet -a "$domain") diff --git a/bin/v-change-web-domain-stats b/bin/v-change-web-domain-stats index 11f59e986..a341f6427 100755 --- a/bin/v-change-web-domain-stats +++ b/bin/v-change-web-domain-stats @@ -10,7 +10,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$(idn -t --quiet -u "$2" ) domain_idn=$(idn -t --quiet -a "$domain") diff --git a/bin/v-change-web-domain-tpl b/bin/v-change-web-domain-tpl index 56f7417db..6d7d51b7b 100755 --- a/bin/v-change-web-domain-tpl +++ b/bin/v-change-web-domain-tpl @@ -10,7 +10,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$(idn -t --quiet -u "$2" ) domain_idn=$(idn -t --quiet -a "$domain") diff --git a/bin/v-check-user-password b/bin/v-check-user-password index 6543333c9..1eecc3dd3 100755 --- a/bin/v-check-user-password +++ b/bin/v-check-user-password @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 password=$2; HIDE=2 ip=${3-127.0.0.1} diff --git a/bin/v-check-vesta-license b/bin/v-check-vesta-license index 74dd8327f..7fa1a12cd 100755 --- a/bin/v-check-vesta-license +++ b/bin/v-check-vesta-license @@ -9,10 +9,10 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition module=$(echo $1 | tr '[:lower:]' '[:upper:]') -# Importing system enviroment +# Importing system environment source /etc/profile # Includes diff --git a/bin/v-deactivate-vesta-license b/bin/v-deactivate-vesta-license index 4cbf0cc97..13a400aba 100755 --- a/bin/v-deactivate-vesta-license +++ b/bin/v-deactivate-vesta-license @@ -9,11 +9,11 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition module=$(echo $1 | tr '[:lower:]' '[:upper:]') license=$2 -# Importing system enviroment +# Importing system environment source /etc/profile # Includes diff --git a/bin/v-delete-backup-host b/bin/v-delete-backup-host index ce63aa12e..21e272218 100755 --- a/bin/v-delete-backup-host +++ b/bin/v-delete-backup-host @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition type=$1 # Includes diff --git a/bin/v-delete-cron-job b/bin/v-delete-cron-job index 54eecdb7e..d41e0141d 100755 --- a/bin/v-delete-cron-job +++ b/bin/v-delete-cron-job @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 job=$2 diff --git a/bin/v-delete-cron-reports b/bin/v-delete-cron-reports index c04a3bd02..65c219a73 100755 --- a/bin/v-delete-cron-reports +++ b/bin/v-delete-cron-reports @@ -10,7 +10,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 # Includes diff --git a/bin/v-delete-cron-restart-job b/bin/v-delete-cron-restart-job index 5876ba3b9..0b27db2bb 100755 --- a/bin/v-delete-cron-restart-job +++ b/bin/v-delete-cron-restart-job @@ -1,6 +1,6 @@ #!/bin/bash # info: delete restart job -# opions: NONE +# options: NONE # # The script for disabling restart cron tasks diff --git a/bin/v-delete-cron-vesta-autoupdate b/bin/v-delete-cron-vesta-autoupdate index 9e68e5197..ec38facfe 100755 --- a/bin/v-delete-cron-vesta-autoupdate +++ b/bin/v-delete-cron-vesta-autoupdate @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=admin # Includes diff --git a/bin/v-delete-database b/bin/v-delete-database index 7257f85d7..e67eda7f1 100755 --- a/bin/v-delete-database +++ b/bin/v-delete-database @@ -10,7 +10,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 database=$2 diff --git a/bin/v-delete-database-host b/bin/v-delete-database-host index fe6f3db78..a5e8a91f0 100755 --- a/bin/v-delete-database-host +++ b/bin/v-delete-database-host @@ -10,7 +10,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition type=$1 host=$2 diff --git a/bin/v-delete-databases b/bin/v-delete-databases index cb1421314..6edf5fb9f 100755 --- a/bin/v-delete-databases +++ b/bin/v-delete-databases @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 # Includes diff --git a/bin/v-delete-dns-domain b/bin/v-delete-dns-domain index eba97bbc3..b12d62961 100755 --- a/bin/v-delete-dns-domain +++ b/bin/v-delete-dns-domain @@ -10,7 +10,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$(idn -t --quiet -u "$2" ) restart="$3" diff --git a/bin/v-delete-dns-domains b/bin/v-delete-dns-domains index 5a3e86ae1..785e3d5b8 100755 --- a/bin/v-delete-dns-domains +++ b/bin/v-delete-dns-domains @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 restart=$2 diff --git a/bin/v-delete-dns-domains-src b/bin/v-delete-dns-domains-src index 91abc238d..22f039841 100755 --- a/bin/v-delete-dns-domains-src +++ b/bin/v-delete-dns-domains-src @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 src=$2 restart=$3 diff --git a/bin/v-delete-dns-on-web-alias b/bin/v-delete-dns-on-web-alias index 0a574bd5d..6cd93dff9 100755 --- a/bin/v-delete-dns-on-web-alias +++ b/bin/v-delete-dns-on-web-alias @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$(echo $2 | sed -e 's/\.*$//g' -e 's/^\.*//g') domain_idn=$(idn -t --quiet -a "$domain") diff --git a/bin/v-delete-dns-record b/bin/v-delete-dns-record index c317da23e..f838b9a0a 100755 --- a/bin/v-delete-dns-record +++ b/bin/v-delete-dns-record @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$(idn -t --quiet -u "$2" ) domain_idn=$(idn -t --quiet -a "$domain") diff --git a/bin/v-delete-domain b/bin/v-delete-domain index 63584c98f..a1fff5ea8 100755 --- a/bin/v-delete-domain +++ b/bin/v-delete-domain @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$2 restart="${3-yes}" diff --git a/bin/v-delete-firewall-ban b/bin/v-delete-firewall-ban index c81dfe680..8bae0e2ce 100755 --- a/bin/v-delete-firewall-ban +++ b/bin/v-delete-firewall-ban @@ -12,7 +12,7 @@ # Importing system variables source /etc/profile -# Argument defenition +# Argument definition ip=$1 chain=$(echo $2|tr '[:lower:]' '[:upper:]') diff --git a/bin/v-delete-firewall-chain b/bin/v-delete-firewall-chain index cb1316bbb..917682b94 100755 --- a/bin/v-delete-firewall-chain +++ b/bin/v-delete-firewall-chain @@ -12,7 +12,7 @@ # Importing system variables source /etc/profile -# Argument defenition +# Argument definition chain=$(echo $1 | tr '[:lower:]' '[:upper:]') # Defining absolute path to iptables diff --git a/bin/v-delete-firewall-rule b/bin/v-delete-firewall-rule index 7f1c24d8e..d37e8a182 100755 --- a/bin/v-delete-firewall-rule +++ b/bin/v-delete-firewall-rule @@ -12,7 +12,7 @@ # Importing system variables source /etc/profile -# Argument defenition +# Argument definition rule=$1 # Includes diff --git a/bin/v-delete-mail-account b/bin/v-delete-mail-account index 7f11911df..6ae7bfec6 100755 --- a/bin/v-delete-mail-account +++ b/bin/v-delete-mail-account @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$(idn -t --quiet -u "$2" ) domain=$(echo $domain | tr '[:upper:]' '[:lower:]') diff --git a/bin/v-delete-mail-account-alias b/bin/v-delete-mail-account-alias index c8d1da444..87a1213c3 100755 --- a/bin/v-delete-mail-account-alias +++ b/bin/v-delete-mail-account-alias @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$(idn -t --quiet -u "$2" ) domain=$(echo $domain | tr '[:upper:]' '[:lower:]') diff --git a/bin/v-delete-mail-account-autoreply b/bin/v-delete-mail-account-autoreply index 9d8c4c223..2f2ef486c 100755 --- a/bin/v-delete-mail-account-autoreply +++ b/bin/v-delete-mail-account-autoreply @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$(idn -t --quiet -u "$2" ) domain=$(echo $domain | tr '[:upper:]' '[:lower:]') diff --git a/bin/v-delete-mail-account-forward b/bin/v-delete-mail-account-forward index 4562789cb..a77b3d7e9 100755 --- a/bin/v-delete-mail-account-forward +++ b/bin/v-delete-mail-account-forward @@ -1,5 +1,5 @@ #!/bin/bash -# info: delte mail account forward +# info: delete mail account forward # options: USER DOMAIN ACCOUNT EMAIL # # The function add delete email account forward address. @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$(idn -t --quiet -u "$2" ) domain=$(echo $domain | tr '[:upper:]' '[:lower:]') diff --git a/bin/v-delete-mail-account-fwd-only b/bin/v-delete-mail-account-fwd-only index 9ea83bbcd..b437b7e30 100755 --- a/bin/v-delete-mail-account-fwd-only +++ b/bin/v-delete-mail-account-fwd-only @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$(idn -t --quiet -u "$2" ) domain=$(echo $domain | tr '[:upper:]' '[:lower:]') diff --git a/bin/v-delete-mail-domain b/bin/v-delete-mail-domain index cb32dfaf6..a57e459d9 100755 --- a/bin/v-delete-mail-domain +++ b/bin/v-delete-mail-domain @@ -10,7 +10,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$(idn -t --quiet -u "$2" ) domain_idn=$(idn -t --quiet -a "$domain") diff --git a/bin/v-delete-mail-domain-antispam b/bin/v-delete-mail-domain-antispam index 3e68529e4..e33b266e1 100755 --- a/bin/v-delete-mail-domain-antispam +++ b/bin/v-delete-mail-domain-antispam @@ -2,14 +2,14 @@ # info: delete mail domain antispam support # options: USER DOMAIN # -# The function disable spamassasin for incomming emails. +# The function disable spamassasin for incoming emails. #----------------------------------------------------------# # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$(idn -t --quiet -u "$2" ) domain=$(echo $domain | tr '[:upper:]' '[:lower:]') diff --git a/bin/v-delete-mail-domain-antivirus b/bin/v-delete-mail-domain-antivirus index 6a925e4c8..7473c1251 100755 --- a/bin/v-delete-mail-domain-antivirus +++ b/bin/v-delete-mail-domain-antivirus @@ -2,14 +2,14 @@ # info: delete mail domain antivirus support # options: USER DOMAIN # -# The function disables clamav scan for incomming emails. +# The function disables clamav scan for incoming emails. #----------------------------------------------------------# # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$(idn -t --quiet -u "$2" ) domain=$(echo $domain | tr '[:upper:]' '[:lower:]') diff --git a/bin/v-delete-mail-domain-catchall b/bin/v-delete-mail-domain-catchall index 3fa0639fb..3791d7adc 100755 --- a/bin/v-delete-mail-domain-catchall +++ b/bin/v-delete-mail-domain-catchall @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$(idn -t --quiet -u "$2" ) domain=$(echo $domain | tr '[:upper:]' '[:lower:]') diff --git a/bin/v-delete-mail-domain-dkim b/bin/v-delete-mail-domain-dkim index a79c2cfe0..88b480b0f 100755 --- a/bin/v-delete-mail-domain-dkim +++ b/bin/v-delete-mail-domain-dkim @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$(idn -t --quiet -u "$2" ) domain=$(echo $domain | tr '[:upper:]' '[:lower:]') diff --git a/bin/v-delete-mail-domains b/bin/v-delete-mail-domains index ae4153810..116e48743 100755 --- a/bin/v-delete-mail-domains +++ b/bin/v-delete-mail-domains @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 # Includes diff --git a/bin/v-delete-remote-dns-domain b/bin/v-delete-remote-dns-domain index bbe3d9290..b92aec229 100755 --- a/bin/v-delete-remote-dns-domain +++ b/bin/v-delete-remote-dns-domain @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$2 diff --git a/bin/v-delete-remote-dns-domains b/bin/v-delete-remote-dns-domains index bb8c9b7ca..1902e576e 100755 --- a/bin/v-delete-remote-dns-domains +++ b/bin/v-delete-remote-dns-domains @@ -8,7 +8,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition host=$1 # Includes diff --git a/bin/v-delete-remote-dns-host b/bin/v-delete-remote-dns-host index 344ece6df..9e4b73680 100755 --- a/bin/v-delete-remote-dns-host +++ b/bin/v-delete-remote-dns-host @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition host=$1 # Includes diff --git a/bin/v-delete-remote-dns-record b/bin/v-delete-remote-dns-record index e6066d86f..eab802ccd 100755 --- a/bin/v-delete-remote-dns-record +++ b/bin/v-delete-remote-dns-record @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$2 id=$3 diff --git a/bin/v-delete-sys-firewall b/bin/v-delete-sys-firewall index e1f512401..86b0ff5de 100755 --- a/bin/v-delete-sys-firewall +++ b/bin/v-delete-sys-firewall @@ -1,6 +1,6 @@ #!/bin/bash # info: delete system firewall -# opions: NONE +# options: NONE # # The script disables firewall support diff --git a/bin/v-delete-sys-ip b/bin/v-delete-sys-ip index 550251b23..17ea16129 100755 --- a/bin/v-delete-sys-ip +++ b/bin/v-delete-sys-ip @@ -10,7 +10,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition ip=$1 # Includes diff --git a/bin/v-delete-sys-quota b/bin/v-delete-sys-quota index 13f23e9c8..6e91908d1 100755 --- a/bin/v-delete-sys-quota +++ b/bin/v-delete-sys-quota @@ -1,8 +1,8 @@ #!/bin/bash # info: delete system quota -# opions: NONE +# options: NONE # -# The script disables filesystem quota on /home patition +# The script disables filesystem quota on /home partition #----------------------------------------------------------# diff --git a/bin/v-delete-sys-sftp-jail b/bin/v-delete-sys-sftp-jail index 3e10f9329..103b41a90 100755 --- a/bin/v-delete-sys-sftp-jail +++ b/bin/v-delete-sys-sftp-jail @@ -1,6 +1,6 @@ #!/bin/bash # info: delete system sftp jail -# opions: NONE +# options: NONE # # The script enables sftp jailed environment @@ -9,8 +9,8 @@ # Variable&Function # #----------------------------------------------------------# -# Importing system enviroment as we run this script -# mostly by cron wich do not read it by itself +# Importing system environment as we run this script +# mostly by cron which do not read it by itself source /etc/profile # Includes diff --git a/bin/v-delete-user b/bin/v-delete-user index 23f2b9ae9..d811fe0cd 100755 --- a/bin/v-delete-user +++ b/bin/v-delete-user @@ -2,7 +2,7 @@ # info: delete user # options: USER # -# This function deletes a certain user and all his resourses such as domains, +# This function deletes a certain user and all his resources such as domains, # databases, cron jobs, etc. @@ -10,7 +10,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 restart=$2 diff --git a/bin/v-delete-user-backup b/bin/v-delete-user-backup index a56ac8a78..00b7e86b5 100755 --- a/bin/v-delete-user-backup +++ b/bin/v-delete-user-backup @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 backup=$(echo $2| cut -f 2 -d \.) diff --git a/bin/v-delete-user-backup-exclusions b/bin/v-delete-user-backup-exclusions index 40f0ec7ca..875eaa919 100755 --- a/bin/v-delete-user-backup-exclusions +++ b/bin/v-delete-user-backup-exclusions @@ -2,14 +2,14 @@ # info: delete backup exclusion # options: USER [SYSTEM] # -# The function for deleteing backup exclusion +# The function for deleting backup exclusion #----------------------------------------------------------# # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 system=$(echo $2 | tr '[:lower:]' '[:upper:]') diff --git a/bin/v-delete-user-favourites b/bin/v-delete-user-favourites index cd515e955..8efffe083 100755 --- a/bin/v-delete-user-favourites +++ b/bin/v-delete-user-favourites @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 system=$(echo "$2" |tr '[:lower:]' '[:upper:]') object=$3 diff --git a/bin/v-delete-user-ips b/bin/v-delete-user-ips index a6125333b..292ce809e 100755 --- a/bin/v-delete-user-ips +++ b/bin/v-delete-user-ips @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 # Includes diff --git a/bin/v-delete-user-notification b/bin/v-delete-user-notification index c0246f89c..c9e32607c 100755 --- a/bin/v-delete-user-notification +++ b/bin/v-delete-user-notification @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 nid=$2 diff --git a/bin/v-delete-user-package b/bin/v-delete-user-package index db5bdaab7..8ce2195af 100755 --- a/bin/v-delete-user-package +++ b/bin/v-delete-user-package @@ -2,7 +2,7 @@ # info: delete user package # options: PACKAGE # -# The function for deleting user package. It does not allow to delete pacakge +# The function for deleting user package. It does not allow to delete package # if it is in use. @@ -10,7 +10,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition package=$1 # Includes diff --git a/bin/v-delete-user-sftp-jail b/bin/v-delete-user-sftp-jail index 49ff07e86..e25121a95 100755 --- a/bin/v-delete-user-sftp-jail +++ b/bin/v-delete-user-sftp-jail @@ -1,6 +1,6 @@ #!/bin/bash # info: delete user sftp jail -# opions: USER +# options: USER # # The script enables sftp jailed environment @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 # Includes diff --git a/bin/v-delete-web-domain b/bin/v-delete-web-domain index 2a4f2844f..4daaf5186 100755 --- a/bin/v-delete-web-domain +++ b/bin/v-delete-web-domain @@ -12,7 +12,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$(idn -t --quiet -u "$2" ) domain_idn=$(idn -t --quiet -a "$domain") diff --git a/bin/v-delete-web-domain-alias b/bin/v-delete-web-domain-alias index 714489d86..9b0ac0d06 100755 --- a/bin/v-delete-web-domain-alias +++ b/bin/v-delete-web-domain-alias @@ -10,7 +10,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$(idn -t --quiet -u "$2" ) domain_idn=$(idn -t --quiet -a "$domain" ) diff --git a/bin/v-delete-web-domain-backend b/bin/v-delete-web-domain-backend index 06e501bdd..4780ae367 100755 --- a/bin/v-delete-web-domain-backend +++ b/bin/v-delete-web-domain-backend @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$(idn -t --quiet -u "$2" ) domain_idn=$(idn -t --quiet -a "$domain") diff --git a/bin/v-delete-web-domain-ftp b/bin/v-delete-web-domain-ftp index 4d9e9feba..8368b1799 100755 --- a/bin/v-delete-web-domain-ftp +++ b/bin/v-delete-web-domain-ftp @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$(idn -t --quiet -u "$2" ) domain_idn=$(idn -t --quiet -a "$domain") diff --git a/bin/v-delete-web-domain-httpauth b/bin/v-delete-web-domain-httpauth index e528bf2fa..96c7eed31 100755 --- a/bin/v-delete-web-domain-httpauth +++ b/bin/v-delete-web-domain-httpauth @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$2 auth_user=$3 @@ -20,7 +20,7 @@ source $VESTA/func/main.sh source $VESTA/func/domain.sh source $VESTA/conf/vesta.conf -# Definining htpasswd file +# Defining htpasswd file htaccess="$HOMEDIR/$user/conf/web/$WEB_SYSTEM.$domain.conf_htaccess" htpasswd="$HOMEDIR/$user/conf/web/$WEB_SYSTEM.$domain.htpasswd" diff --git a/bin/v-delete-web-domain-proxy b/bin/v-delete-web-domain-proxy index 2bd06ba52..d86cb4022 100755 --- a/bin/v-delete-web-domain-proxy +++ b/bin/v-delete-web-domain-proxy @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$(idn -t --quiet -u "$2" ) domain_idn=$(idn -t --quiet -a "$domain") diff --git a/bin/v-delete-web-domain-ssl b/bin/v-delete-web-domain-ssl index b9ec4e129..49943baba 100755 --- a/bin/v-delete-web-domain-ssl +++ b/bin/v-delete-web-domain-ssl @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$(idn -t --quiet -u "$2" ) domain_idn=$(idn -t --quiet -a "$domain") diff --git a/bin/v-delete-web-domain-stats b/bin/v-delete-web-domain-stats index 3d2292a9f..bd5627a6c 100755 --- a/bin/v-delete-web-domain-stats +++ b/bin/v-delete-web-domain-stats @@ -10,7 +10,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$(idn -t --quiet -u "$2" ) domain_idn=$(idn -t --quiet -a "$domain") diff --git a/bin/v-delete-web-domain-stats-user b/bin/v-delete-web-domain-stats-user index 877f5482a..6e1008ba0 100755 --- a/bin/v-delete-web-domain-stats-user +++ b/bin/v-delete-web-domain-stats-user @@ -12,7 +12,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$(idn -t --quiet -u "$2" ) @@ -40,7 +40,7 @@ is_object_value_exist 'web' 'DOMAIN' "$domain" '$STATS_USER' # Action # #----------------------------------------------------------# -# Definining statistic dir +# Defining statistic dir rm -f $HOMEDIR/$user/web/$domain/stats/.htpasswd rm -f $HOMEDIR/$user/web/$domain/stats/.htaccess diff --git a/bin/v-delete-web-domains b/bin/v-delete-web-domains index 547461421..dec2156aa 100755 --- a/bin/v-delete-web-domains +++ b/bin/v-delete-web-domains @@ -2,14 +2,14 @@ # info: delete web domains # options: USER [RESTART] # -# The function deteles all user's webdomains. +# The function deletes all user's webdomains. #----------------------------------------------------------# # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 restart=$2 diff --git a/bin/v-generate-ssl-cert b/bin/v-generate-ssl-cert index 9d9d210d8..e96edaa51 100755 --- a/bin/v-generate-ssl-cert +++ b/bin/v-generate-ssl-cert @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition domain=$1 domain=$(echo $domain | sed -e 's/\.*$//g' -e 's/^\.*//g') domain=$(echo $domain | tr '[:upper:]' '[:lower:]') diff --git a/bin/v-get-dns-domain-value b/bin/v-get-dns-domain-value index 191120504..d8aa0179e 100755 --- a/bin/v-get-dns-domain-value +++ b/bin/v-get-dns-domain-value @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$(idn -t --quiet -u "$2" ) domain_idn=$(idn -t --quiet -a "$domain") diff --git a/bin/v-get-mail-account-value b/bin/v-get-mail-account-value index db9f298ba..282c81989 100755 --- a/bin/v-get-mail-account-value +++ b/bin/v-get-mail-account-value @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$(idn -t --quiet -u "$2" ) domain_idn=$(idn -t --quiet -a "$domain") diff --git a/bin/v-get-mail-domain-value b/bin/v-get-mail-domain-value index b6f4cc458..da9abf16e 100755 --- a/bin/v-get-mail-domain-value +++ b/bin/v-get-mail-domain-value @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$(idn -t --quiet -u "$2" ) domain_idn=$(idn -t --quiet -a "$domain") diff --git a/bin/v-get-sys-timezone b/bin/v-get-sys-timezone index 8a3607b49..ced92ba47 100755 --- a/bin/v-get-sys-timezone +++ b/bin/v-get-sys-timezone @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition format=${1-shell} # Includes diff --git a/bin/v-get-sys-timezones b/bin/v-get-sys-timezones index ec5dcda03..2799fccb9 100755 --- a/bin/v-get-sys-timezones +++ b/bin/v-get-sys-timezones @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition format=${1-shell} # Includes diff --git a/bin/v-get-user-value b/bin/v-get-user-value index 19ccf4ce7..415a764a4 100755 --- a/bin/v-get-user-value +++ b/bin/v-get-user-value @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 key=$(echo "$2"| tr '[:lower:]' '[:upper:]' | sed "s/^/$/") diff --git a/bin/v-get-web-domain-value b/bin/v-get-web-domain-value index 3e74e31ee..2c8569375 100755 --- a/bin/v-get-web-domain-value +++ b/bin/v-get-web-domain-value @@ -11,7 +11,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$(idn -t --quiet -u "$2" ) domain_idn=$(idn -t --quiet -a "$domain") diff --git a/bin/v-insert-dns-domain b/bin/v-insert-dns-domain index 00c2c53db..be66b0a82 100755 --- a/bin/v-insert-dns-domain +++ b/bin/v-insert-dns-domain @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 data=$2 src=$3 diff --git a/bin/v-insert-dns-record b/bin/v-insert-dns-record index d81db1893..12bf1fd42 100755 --- a/bin/v-insert-dns-record +++ b/bin/v-insert-dns-record @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$2 data=$3 diff --git a/bin/v-insert-dns-records b/bin/v-insert-dns-records index ce61f5ad0..9030ba74d 100755 --- a/bin/v-insert-dns-records +++ b/bin/v-insert-dns-records @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$2 data_file=$3 diff --git a/bin/v-list-backup-host b/bin/v-list-backup-host index b08c36265..125a1dd97 100755 --- a/bin/v-list-backup-host +++ b/bin/v-list-backup-host @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition TYPE=$1 format=${2-shell} diff --git a/bin/v-list-cron-job b/bin/v-list-cron-job index 166525eab..450153453 100755 --- a/bin/v-list-cron-job +++ b/bin/v-list-cron-job @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 job=$2 format=${3-shell} diff --git a/bin/v-list-cron-jobs b/bin/v-list-cron-jobs index 1fc327fde..5580b0743 100755 --- a/bin/v-list-cron-jobs +++ b/bin/v-list-cron-jobs @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 format=${2-shell} diff --git a/bin/v-list-database b/bin/v-list-database index d9136aeed..295d934f6 100755 --- a/bin/v-list-database +++ b/bin/v-list-database @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 database=$2 format=${3-shell} diff --git a/bin/v-list-database-host b/bin/v-list-database-host index a3ab0d89c..b38b64670 100755 --- a/bin/v-list-database-host +++ b/bin/v-list-database-host @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition type=$1 host=$2 format=${3-shell} diff --git a/bin/v-list-database-hosts b/bin/v-list-database-hosts index d59d42d26..d7e9e0feb 100755 --- a/bin/v-list-database-hosts +++ b/bin/v-list-database-hosts @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition type=${1-mysql} format=${2-shell} diff --git a/bin/v-list-database-types b/bin/v-list-database-types index 8a08a25b1..20e6044f3 100755 --- a/bin/v-list-database-types +++ b/bin/v-list-database-types @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition format=${1-shell} # Includes diff --git a/bin/v-list-databases b/bin/v-list-databases index 282fb52c2..538f96493 100755 --- a/bin/v-list-databases +++ b/bin/v-list-databases @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 format=${2-shell} diff --git a/bin/v-list-dns-domain b/bin/v-list-dns-domain index 5c6943aa4..51e9d183c 100755 --- a/bin/v-list-dns-domain +++ b/bin/v-list-dns-domain @@ -10,7 +10,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$2 format=${3-shell} diff --git a/bin/v-list-dns-domains b/bin/v-list-dns-domains index b5f2e5ca0..38c5e1954 100755 --- a/bin/v-list-dns-domains +++ b/bin/v-list-dns-domains @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 format=${2-shell} diff --git a/bin/v-list-dns-domains-src b/bin/v-list-dns-domains-src index 0ac5cae3f..50fc23db4 100755 --- a/bin/v-list-dns-domains-src +++ b/bin/v-list-dns-domains-src @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 format=${2-shell} diff --git a/bin/v-list-dns-records b/bin/v-list-dns-records index 46e4da141..1e34202ce 100755 --- a/bin/v-list-dns-records +++ b/bin/v-list-dns-records @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$2 format=${3-shell} diff --git a/bin/v-list-dns-template b/bin/v-list-dns-template index 348153e63..89c464c0a 100755 --- a/bin/v-list-dns-template +++ b/bin/v-list-dns-template @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition template=$1 format=${2-shell} diff --git a/bin/v-list-dns-templates b/bin/v-list-dns-templates index 18090b52b..6cffff38d 100755 --- a/bin/v-list-dns-templates +++ b/bin/v-list-dns-templates @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition format=${1-shell} # Includes diff --git a/bin/v-list-firewall b/bin/v-list-firewall index c841f34e7..b45010375 100755 --- a/bin/v-list-firewall +++ b/bin/v-list-firewall @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition format=${1-shell} # Includes diff --git a/bin/v-list-firewall-ban b/bin/v-list-firewall-ban index d34570295..a73b863ad 100755 --- a/bin/v-list-firewall-ban +++ b/bin/v-list-firewall-ban @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition format=${1-shell} # Includes diff --git a/bin/v-list-firewall-rule b/bin/v-list-firewall-rule index ab9cfa4a5..441212da4 100755 --- a/bin/v-list-firewall-rule +++ b/bin/v-list-firewall-rule @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition rule=$1 format=${2-shell} diff --git a/bin/v-list-mail-account b/bin/v-list-mail-account index 94a441a3b..ff5af1314 100755 --- a/bin/v-list-mail-account +++ b/bin/v-list-mail-account @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$2 account=$3 diff --git a/bin/v-list-mail-account-autoreply b/bin/v-list-mail-account-autoreply index 367f7e602..b1f5386ba 100755 --- a/bin/v-list-mail-account-autoreply +++ b/bin/v-list-mail-account-autoreply @@ -2,14 +2,14 @@ # info: list mail account autoreply # options: USER DOMAIN ACCOUNT [FORMAT] # -# The function of obtainin mail account autoreply message. +# The function of obtaining mail account autoreply message. #----------------------------------------------------------# # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$2 account=$3 diff --git a/bin/v-list-mail-accounts b/bin/v-list-mail-accounts index 9c1f399b6..f62b5c315 100755 --- a/bin/v-list-mail-accounts +++ b/bin/v-list-mail-accounts @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$2 format=${3-shell} diff --git a/bin/v-list-mail-domain b/bin/v-list-mail-domain index fae895279..e73140fdd 100755 --- a/bin/v-list-mail-domain +++ b/bin/v-list-mail-domain @@ -10,7 +10,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$2 format=${3-shell} diff --git a/bin/v-list-mail-domain-dkim b/bin/v-list-mail-domain-dkim index 72ba40093..727f53233 100755 --- a/bin/v-list-mail-domain-dkim +++ b/bin/v-list-mail-domain-dkim @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$2 format=${3-shell} diff --git a/bin/v-list-mail-domain-dkim-dns b/bin/v-list-mail-domain-dkim-dns index b3c8c4887..a78e36e9b 100755 --- a/bin/v-list-mail-domain-dkim-dns +++ b/bin/v-list-mail-domain-dkim-dns @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$2 format=${3-shell} diff --git a/bin/v-list-mail-domains b/bin/v-list-mail-domains index e9daa34d6..e4a9161e9 100755 --- a/bin/v-list-mail-domains +++ b/bin/v-list-mail-domains @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 format=${2-shell} diff --git a/bin/v-list-remote-dns-hosts b/bin/v-list-remote-dns-hosts index 00d265fdc..2269381de 100755 --- a/bin/v-list-remote-dns-hosts +++ b/bin/v-list-remote-dns-hosts @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition format=${1-shell} # Includes diff --git a/bin/v-list-sys-config b/bin/v-list-sys-config index 740290294..fdab5280e 100755 --- a/bin/v-list-sys-config +++ b/bin/v-list-sys-config @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition format=${1-shell} # Json function diff --git a/bin/v-list-sys-cpu-status b/bin/v-list-sys-cpu-status index fa925f8b5..290ad5b24 100755 --- a/bin/v-list-sys-cpu-status +++ b/bin/v-list-sys-cpu-status @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition #format=${1-shell} # Includes diff --git a/bin/v-list-sys-db-status b/bin/v-list-sys-db-status index 755ff5c40..6bbfca5a7 100755 --- a/bin/v-list-sys-db-status +++ b/bin/v-list-sys-db-status @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition #format=${1-shell} # Includes diff --git a/bin/v-list-sys-disk-status b/bin/v-list-sys-disk-status index c8b50f856..5596a449c 100755 --- a/bin/v-list-sys-disk-status +++ b/bin/v-list-sys-disk-status @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition #format=${1-shell} # Includes diff --git a/bin/v-list-sys-dns-status b/bin/v-list-sys-dns-status index d39cd40a7..b657bc891 100755 --- a/bin/v-list-sys-dns-status +++ b/bin/v-list-sys-dns-status @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition #format=${1-shell} # Includes diff --git a/bin/v-list-sys-info b/bin/v-list-sys-info index c9f9ec0d2..975f7249f 100755 --- a/bin/v-list-sys-info +++ b/bin/v-list-sys-info @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition format=${1-shell} # Includes diff --git a/bin/v-list-sys-interfaces b/bin/v-list-sys-interfaces index 3bc8be1ef..bb4dea253 100755 --- a/bin/v-list-sys-interfaces +++ b/bin/v-list-sys-interfaces @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition format=${1-shell} # Includes diff --git a/bin/v-list-sys-ip b/bin/v-list-sys-ip index fac7d358d..d93957bfb 100755 --- a/bin/v-list-sys-ip +++ b/bin/v-list-sys-ip @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition ip=$1 IP=$ip format=${2-shell} diff --git a/bin/v-list-sys-ips b/bin/v-list-sys-ips index 869fa02d4..4ab16179b 100755 --- a/bin/v-list-sys-ips +++ b/bin/v-list-sys-ips @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition format=${1-shell} # Includes diff --git a/bin/v-list-sys-languages b/bin/v-list-sys-languages index 685bafc3f..e3459fc7e 100755 --- a/bin/v-list-sys-languages +++ b/bin/v-list-sys-languages @@ -10,7 +10,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition format=${1-shell} # Includes diff --git a/bin/v-list-sys-mail-status b/bin/v-list-sys-mail-status index 802f24bec..fcf5fbc4b 100755 --- a/bin/v-list-sys-mail-status +++ b/bin/v-list-sys-mail-status @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition #format=${1-shell} # Includes diff --git a/bin/v-list-sys-memory-status b/bin/v-list-sys-memory-status index f6a8e0773..25b7ebff6 100755 --- a/bin/v-list-sys-memory-status +++ b/bin/v-list-sys-memory-status @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition #format=${1-shell} # Includes diff --git a/bin/v-list-sys-network-status b/bin/v-list-sys-network-status index 2050da575..8414f8009 100755 --- a/bin/v-list-sys-network-status +++ b/bin/v-list-sys-network-status @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition #format=${1-shell} # Includes diff --git a/bin/v-list-sys-services b/bin/v-list-sys-services index 168575fae..8e08d1755 100755 --- a/bin/v-list-sys-services +++ b/bin/v-list-sys-services @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition format=${1-shell} # Includes diff --git a/bin/v-list-sys-shells b/bin/v-list-sys-shells index 091e7d8e8..be43a16e3 100755 --- a/bin/v-list-sys-shells +++ b/bin/v-list-sys-shells @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition format=${1-shell} # Includes diff --git a/bin/v-list-sys-users b/bin/v-list-sys-users index 3bae74183..16be8d658 100755 --- a/bin/v-list-sys-users +++ b/bin/v-list-sys-users @@ -10,7 +10,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition format=${1-shell} # Includes diff --git a/bin/v-list-sys-vesta-autoupdate b/bin/v-list-sys-vesta-autoupdate index ca64646c2..ba89029f2 100755 --- a/bin/v-list-sys-vesta-autoupdate +++ b/bin/v-list-sys-vesta-autoupdate @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user='admin' format=${1-shell} diff --git a/bin/v-list-sys-vesta-updates b/bin/v-list-sys-vesta-updates index 12db31ac0..48f7ac05e 100755 --- a/bin/v-list-sys-vesta-updates +++ b/bin/v-list-sys-vesta-updates @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition format=${1-shell} # Includes diff --git a/bin/v-list-sys-web-status b/bin/v-list-sys-web-status index b243437a4..eb58c81ce 100755 --- a/bin/v-list-sys-web-status +++ b/bin/v-list-sys-web-status @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition #format=${1-shell} # Includes diff --git a/bin/v-list-user b/bin/v-list-user index da4e96fd1..eef71883e 100755 --- a/bin/v-list-user +++ b/bin/v-list-user @@ -2,7 +2,7 @@ # info: list system user # options: USER [FORMAT] # -# The function for obtainig the list of all user's parameters. +# The function for obtaining the list of all user's parameters. #----------------------------------------------------------# @@ -12,7 +12,7 @@ # Includes source $VESTA/func/main.sh -# Argument defenition +# Argument definition user=$1 USER="$user" format=${2-shell} diff --git a/bin/v-list-user-backup b/bin/v-list-user-backup index 6fa99af65..e20069172 100755 --- a/bin/v-list-user-backup +++ b/bin/v-list-user-backup @@ -10,7 +10,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 backup=$2 format=${3-shell} diff --git a/bin/v-list-user-backup-exclusions b/bin/v-list-user-backup-exclusions index 87346aaad..a06d101e7 100755 --- a/bin/v-list-user-backup-exclusions +++ b/bin/v-list-user-backup-exclusions @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 format=${2-shell} USER='' diff --git a/bin/v-list-user-backups b/bin/v-list-user-backups index 80ed675be..eb666ab12 100755 --- a/bin/v-list-user-backups +++ b/bin/v-list-user-backups @@ -2,14 +2,14 @@ # info: list user backups # options: USER [FORMAT] # -# The function for obtainig the list of available user backups. +# The function for obtaining the list of available user backups. #----------------------------------------------------------# # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 format=${2-shell} diff --git a/bin/v-list-user-favourites b/bin/v-list-user-favourites index 8e1b8dee3..362d39a13 100755 --- a/bin/v-list-user-favourites +++ b/bin/v-list-user-favourites @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 format=${2-shell} diff --git a/bin/v-list-user-ips b/bin/v-list-user-ips index ec29f00bd..d2b7930ce 100755 --- a/bin/v-list-user-ips +++ b/bin/v-list-user-ips @@ -2,14 +2,14 @@ # info: list user ips # options: USER [FORMAT] # -# The function for obtainig the list of available ip addresses. +# The function for obtaining the list of available ip addresses. #----------------------------------------------------------# # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 format=${2-shell} diff --git a/bin/v-list-user-log b/bin/v-list-user-log index c5fdcc1f7..bcd0f7ce1 100755 --- a/bin/v-list-user-log +++ b/bin/v-list-user-log @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 format=${2-shell} diff --git a/bin/v-list-user-notifications b/bin/v-list-user-notifications index 160cf815c..23cd3f87a 100755 --- a/bin/v-list-user-notifications +++ b/bin/v-list-user-notifications @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 format=${2-shell} diff --git a/bin/v-list-user-ns b/bin/v-list-user-ns index 1da0fe5f1..5c950fa5e 100755 --- a/bin/v-list-user-ns +++ b/bin/v-list-user-ns @@ -2,14 +2,14 @@ # info: list user nameservers # options: USER [FORMAT] # -# Function for obtainig the list of user's DNS servers. +# Function for obtaining the list of user's DNS servers. #----------------------------------------------------------# # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 format=${2-shell} diff --git a/bin/v-list-user-package b/bin/v-list-user-package index df26482a0..38a390f88 100755 --- a/bin/v-list-user-package +++ b/bin/v-list-user-package @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition package=$1 PACKAGE=$package format=${2-shell} diff --git a/bin/v-list-user-packages b/bin/v-list-user-packages index 3e189b01a..4f0523429 100755 --- a/bin/v-list-user-packages +++ b/bin/v-list-user-packages @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition format=${1-shell} # Includes diff --git a/bin/v-list-user-stats b/bin/v-list-user-stats index 8126fa2ea..8b56fcc88 100755 --- a/bin/v-list-user-stats +++ b/bin/v-list-user-stats @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 format=${2-shell} diff --git a/bin/v-list-users b/bin/v-list-users index d0f2ede63..4c65b1051 100755 --- a/bin/v-list-users +++ b/bin/v-list-users @@ -2,14 +2,14 @@ # info: list system users # options: [FORMAT] # -# The function for obtainig the list of all server's users. +# The function for obtaining the list of all server's users. #----------------------------------------------------------# # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition format=${1-shell} # Json function diff --git a/bin/v-list-users-stats b/bin/v-list-users-stats index 5416da7b8..61358ef27 100755 --- a/bin/v-list-users-stats +++ b/bin/v-list-users-stats @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition format=${1-shell} # Includes diff --git a/bin/v-list-web-domain b/bin/v-list-web-domain index fa3b1dea5..13f1fd715 100755 --- a/bin/v-list-web-domain +++ b/bin/v-list-web-domain @@ -10,7 +10,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$2 format=${3-shell} diff --git a/bin/v-list-web-domain-accesslog b/bin/v-list-web-domain-accesslog index b066b2b2c..2d5a6918c 100755 --- a/bin/v-list-web-domain-accesslog +++ b/bin/v-list-web-domain-accesslog @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$2 ttl=${3-70} diff --git a/bin/v-list-web-domain-errorlog b/bin/v-list-web-domain-errorlog index f21b581a3..f1d92d8e7 100755 --- a/bin/v-list-web-domain-errorlog +++ b/bin/v-list-web-domain-errorlog @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$2 ttl=${3-70} diff --git a/bin/v-list-web-domain-ssl b/bin/v-list-web-domain-ssl index a8696572f..4d8b9ab88 100755 --- a/bin/v-list-web-domain-ssl +++ b/bin/v-list-web-domain-ssl @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$2 format=${3-shell} diff --git a/bin/v-list-web-domains b/bin/v-list-web-domains index 059f0e39b..a5cb9113a 100755 --- a/bin/v-list-web-domains +++ b/bin/v-list-web-domains @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 format=${2-shell} diff --git a/bin/v-list-web-domains-alias b/bin/v-list-web-domains-alias index fb8f24514..572cc56ab 100755 --- a/bin/v-list-web-domains-alias +++ b/bin/v-list-web-domains-alias @@ -11,7 +11,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 format=${2-shell} diff --git a/bin/v-list-web-domains-proxy b/bin/v-list-web-domains-proxy index d2fef4133..6e8144864 100755 --- a/bin/v-list-web-domains-proxy +++ b/bin/v-list-web-domains-proxy @@ -11,7 +11,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 format=${2-shell} diff --git a/bin/v-list-web-domains-ssl b/bin/v-list-web-domains-ssl index 6f05bc743..84c58db73 100755 --- a/bin/v-list-web-domains-ssl +++ b/bin/v-list-web-domains-ssl @@ -11,7 +11,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 format=${2-shell} diff --git a/bin/v-list-web-domains-stats b/bin/v-list-web-domains-stats index 52c3eb23a..64e01d53c 100755 --- a/bin/v-list-web-domains-stats +++ b/bin/v-list-web-domains-stats @@ -12,7 +12,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 format=${2-shell} diff --git a/bin/v-list-web-stats b/bin/v-list-web-stats index 33d56c24a..e77889ced 100755 --- a/bin/v-list-web-stats +++ b/bin/v-list-web-stats @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition format=${1-shell} # Includes diff --git a/bin/v-list-web-templates b/bin/v-list-web-templates index e4e472f17..df4576b59 100755 --- a/bin/v-list-web-templates +++ b/bin/v-list-web-templates @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition format=${1-shell} # Includes diff --git a/bin/v-list-web-templates-backend b/bin/v-list-web-templates-backend index dfcfee249..4d520e7be 100755 --- a/bin/v-list-web-templates-backend +++ b/bin/v-list-web-templates-backend @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition format=${1-shell} # Includes diff --git a/bin/v-list-web-templates-proxy b/bin/v-list-web-templates-proxy index 852fee82b..42673592f 100755 --- a/bin/v-list-web-templates-proxy +++ b/bin/v-list-web-templates-proxy @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition format=${1-shell} # Includes diff --git a/bin/v-rebuild-cron-jobs b/bin/v-rebuild-cron-jobs index c4bac3ed8..0d75000eb 100755 --- a/bin/v-rebuild-cron-jobs +++ b/bin/v-rebuild-cron-jobs @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 restart=$2 diff --git a/bin/v-rebuild-databases b/bin/v-rebuild-databases index f3f74cbc6..4d50a09da 100755 --- a/bin/v-rebuild-databases +++ b/bin/v-rebuild-databases @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 # Includes diff --git a/bin/v-rebuild-dns-domain b/bin/v-rebuild-dns-domain index f21fad08b..3e123992f 100755 --- a/bin/v-rebuild-dns-domain +++ b/bin/v-rebuild-dns-domain @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$2 restart=$3 diff --git a/bin/v-rebuild-dns-domains b/bin/v-rebuild-dns-domains index 83c4d6f0c..e3303de62 100755 --- a/bin/v-rebuild-dns-domains +++ b/bin/v-rebuild-dns-domains @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 restart=$2 update_serial=$3 diff --git a/bin/v-rebuild-mail-domains b/bin/v-rebuild-mail-domains index 9faeb29a8..8e101a947 100755 --- a/bin/v-rebuild-mail-domains +++ b/bin/v-rebuild-mail-domains @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 # Includes diff --git a/bin/v-rebuild-user b/bin/v-rebuild-user index 2d57f6ae8..52385694e 100755 --- a/bin/v-rebuild-user +++ b/bin/v-rebuild-user @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 restart=$2 diff --git a/bin/v-rebuild-web-domains b/bin/v-rebuild-web-domains index 1afb36de3..c0fe2a1fc 100755 --- a/bin/v-rebuild-web-domains +++ b/bin/v-rebuild-web-domains @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 restart=$2 diff --git a/bin/v-restart-service b/bin/v-restart-service index 612b3fb6f..d539c1a39 100755 --- a/bin/v-restart-service +++ b/bin/v-restart-service @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition service=$1 # Includes diff --git a/bin/v-restart-system b/bin/v-restart-system index 209794a7a..40767acec 100755 --- a/bin/v-restart-system +++ b/bin/v-restart-system @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition restart=$1 # Includes diff --git a/bin/v-restore-user b/bin/v-restore-user index 33d5cdfe2..a1daaa347 100755 --- a/bin/v-restore-user +++ b/bin/v-restore-user @@ -12,7 +12,7 @@ # Import VESTA variable for cron launch source /etc/profile -# Argument defenition +# Argument definition user=$1 backup=$2 web=$3 diff --git a/bin/v-schedule-user-backup b/bin/v-schedule-user-backup index 41cc3d79b..404f012ed 100755 --- a/bin/v-schedule-user-backup +++ b/bin/v-schedule-user-backup @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 # Includes diff --git a/bin/v-schedule-user-restore b/bin/v-schedule-user-restore index 0aded2148..e91f0cac8 100755 --- a/bin/v-schedule-user-restore +++ b/bin/v-schedule-user-restore @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 backup=$2 web=$3 diff --git a/bin/v-search-domain-owner b/bin/v-search-domain-owner index 453fdfdca..146a0b4c1 100755 --- a/bin/v-search-domain-owner +++ b/bin/v-search-domain-owner @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition domain=$(idn -t --quiet -u "$1" ) type=${2-any} diff --git a/bin/v-search-object b/bin/v-search-object index 3c6ab0d46..a15bc9ed1 100755 --- a/bin/v-search-object +++ b/bin/v-search-object @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition object=$1 format=${2-shell} diff --git a/bin/v-search-user-object b/bin/v-search-user-object index 084b8b01a..28ca2a1e3 100755 --- a/bin/v-search-user-object +++ b/bin/v-search-user-object @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 object=$2 format=${3-shell} diff --git a/bin/v-start-service b/bin/v-start-service index 100b82881..0e5c9b895 100755 --- a/bin/v-start-service +++ b/bin/v-start-service @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition service=$1 # Includes diff --git a/bin/v-stop-service b/bin/v-stop-service index b05f8744d..68f4009ed 100755 --- a/bin/v-stop-service +++ b/bin/v-stop-service @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition service=$1 # Includes diff --git a/bin/v-suspend-cron-job b/bin/v-suspend-cron-job index 19124b80b..78e75da65 100755 --- a/bin/v-suspend-cron-job +++ b/bin/v-suspend-cron-job @@ -9,12 +9,12 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 job=$2 restart=$3 -# Inlcudes +# Includes source $VESTA/func/main.sh source $VESTA/conf/vesta.conf diff --git a/bin/v-suspend-cron-jobs b/bin/v-suspend-cron-jobs index 7de5a1aad..f53facf48 100755 --- a/bin/v-suspend-cron-jobs +++ b/bin/v-suspend-cron-jobs @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 restart=$2 diff --git a/bin/v-suspend-database b/bin/v-suspend-database index 1f7765194..e8348873e 100755 --- a/bin/v-suspend-database +++ b/bin/v-suspend-database @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 database=$2 diff --git a/bin/v-suspend-database-host b/bin/v-suspend-database-host index 7ed06316b..03cdd9de1 100755 --- a/bin/v-suspend-database-host +++ b/bin/v-suspend-database-host @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition type=$1 host=$2 diff --git a/bin/v-suspend-databases b/bin/v-suspend-databases index 53ed4cec3..d1a7104c3 100755 --- a/bin/v-suspend-databases +++ b/bin/v-suspend-databases @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 # Includes diff --git a/bin/v-suspend-dns-domain b/bin/v-suspend-dns-domain index 38eb76d36..be32feb5a 100755 --- a/bin/v-suspend-dns-domain +++ b/bin/v-suspend-dns-domain @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$(idn -t --quiet -u "$2" ) domain_idn=$(idn -t --quiet -a "$domain") diff --git a/bin/v-suspend-dns-domains b/bin/v-suspend-dns-domains index 34d41dcb3..d561495b2 100755 --- a/bin/v-suspend-dns-domains +++ b/bin/v-suspend-dns-domains @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 restart=$2 diff --git a/bin/v-suspend-dns-record b/bin/v-suspend-dns-record index f98025f91..0a68f8ce3 100755 --- a/bin/v-suspend-dns-record +++ b/bin/v-suspend-dns-record @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$(idn -t --quiet -u "$2" ) domain_idn=$(idn -t --quiet -a "$domain") diff --git a/bin/v-suspend-domain b/bin/v-suspend-domain index 35dd89669..fabbb2dec 100755 --- a/bin/v-suspend-domain +++ b/bin/v-suspend-domain @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$2 restart="${3-yes}" diff --git a/bin/v-suspend-firewall-rule b/bin/v-suspend-firewall-rule index a5e2d638e..dffeba716 100755 --- a/bin/v-suspend-firewall-rule +++ b/bin/v-suspend-firewall-rule @@ -9,10 +9,10 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition rule=$1 -# Inlcudes +# Includes source $VESTA/func/main.sh source $VESTA/conf/vesta.conf diff --git a/bin/v-suspend-mail-account b/bin/v-suspend-mail-account index d691d05b2..7ea2bc6a8 100755 --- a/bin/v-suspend-mail-account +++ b/bin/v-suspend-mail-account @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$(idn -t --quiet -u "$2" ) domain=$(echo $domain | tr '[:upper:]' '[:lower:]') diff --git a/bin/v-suspend-mail-accounts b/bin/v-suspend-mail-accounts index 9cc393f20..d8cae620e 100755 --- a/bin/v-suspend-mail-accounts +++ b/bin/v-suspend-mail-accounts @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$(idn -t --quiet -u "$2" ) domain=$(echo $domain | tr '[:upper:]' '[:lower:]') diff --git a/bin/v-suspend-mail-domain b/bin/v-suspend-mail-domain index 02828e5d3..93a1328cb 100755 --- a/bin/v-suspend-mail-domain +++ b/bin/v-suspend-mail-domain @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$(idn -t --quiet -u "$2" ) domain=$(echo $domain | tr '[:upper:]' '[:lower:]') diff --git a/bin/v-suspend-mail-domains b/bin/v-suspend-mail-domains index db52c5d4f..61e2dda84 100755 --- a/bin/v-suspend-mail-domains +++ b/bin/v-suspend-mail-domains @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 # Includes diff --git a/bin/v-suspend-remote-dns-host b/bin/v-suspend-remote-dns-host index b55977c7a..c44e65739 100755 --- a/bin/v-suspend-remote-dns-host +++ b/bin/v-suspend-remote-dns-host @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition host=$1 # Includes diff --git a/bin/v-suspend-user b/bin/v-suspend-user index 99e732271..aba883ac2 100755 --- a/bin/v-suspend-user +++ b/bin/v-suspend-user @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 restart=$2 diff --git a/bin/v-suspend-web-domain b/bin/v-suspend-web-domain index d98ed633f..a7fb6ba0d 100755 --- a/bin/v-suspend-web-domain +++ b/bin/v-suspend-web-domain @@ -11,7 +11,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$(idn -t --quiet -u "$2" ) domain_idn=$(idn -t --quiet -a "$domain") diff --git a/bin/v-suspend-web-domains b/bin/v-suspend-web-domains index 5ff752bf7..0f4c31162 100755 --- a/bin/v-suspend-web-domains +++ b/bin/v-suspend-web-domains @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 restart=$2 diff --git a/bin/v-sync-dns-cluster b/bin/v-sync-dns-cluster index d4a1e00db..811f1bbe0 100755 --- a/bin/v-sync-dns-cluster +++ b/bin/v-sync-dns-cluster @@ -8,7 +8,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition host=$1 # Includes diff --git a/bin/v-unsuspend-cron-job b/bin/v-unsuspend-cron-job index c152d011f..b2fa0f79a 100755 --- a/bin/v-unsuspend-cron-job +++ b/bin/v-unsuspend-cron-job @@ -1,15 +1,15 @@ #!/bin/bash -# info: unuspend cron job +# info: unsuspend cron job # options: USER JOB [RESTART] # -# The function unsuspen certain cron job. +# The function unsuspend certain cron job. #----------------------------------------------------------# # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 job=$2 restart="${3-yes}" diff --git a/bin/v-unsuspend-cron-jobs b/bin/v-unsuspend-cron-jobs index f767ce612..f7b5e876e 100755 --- a/bin/v-unsuspend-cron-jobs +++ b/bin/v-unsuspend-cron-jobs @@ -1,5 +1,5 @@ #!/bin/bash -# info: unuspend sys cron +# info: unsuspend sys cron # options: USER [RESTART] # # The function unsuspends all suspended cron jobs. @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 restart=$2 diff --git a/bin/v-unsuspend-database b/bin/v-unsuspend-database index 5a75ba3be..ea58389c6 100755 --- a/bin/v-unsuspend-database +++ b/bin/v-unsuspend-database @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 database=$2 diff --git a/bin/v-unsuspend-database-host b/bin/v-unsuspend-database-host index 2d2a0dc7c..e9e7b80df 100755 --- a/bin/v-unsuspend-database-host +++ b/bin/v-unsuspend-database-host @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition type=$1 host=$2 diff --git a/bin/v-unsuspend-databases b/bin/v-unsuspend-databases index fcf9dc62e..52d153af2 100755 --- a/bin/v-unsuspend-databases +++ b/bin/v-unsuspend-databases @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 # Includes diff --git a/bin/v-unsuspend-dns-domain b/bin/v-unsuspend-dns-domain index 1e5dcfac9..e7c412849 100755 --- a/bin/v-unsuspend-dns-domain +++ b/bin/v-unsuspend-dns-domain @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$(idn -t --quiet -u "$2" ) domain_idn=$(idn -t --quiet -a "$domain") diff --git a/bin/v-unsuspend-dns-domains b/bin/v-unsuspend-dns-domains index 7d184b4a2..083dc3d34 100755 --- a/bin/v-unsuspend-dns-domains +++ b/bin/v-unsuspend-dns-domains @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 restart=$2 diff --git a/bin/v-unsuspend-dns-record b/bin/v-unsuspend-dns-record index 38c9e58e3..963e9676d 100755 --- a/bin/v-unsuspend-dns-record +++ b/bin/v-unsuspend-dns-record @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$(idn -t --quiet -u "$2" ) domain_idn=$(idn -t --quiet -a "$domain") diff --git a/bin/v-unsuspend-domain b/bin/v-unsuspend-domain index c53a06002..32920c31a 100755 --- a/bin/v-unsuspend-domain +++ b/bin/v-unsuspend-domain @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$2 restart="${3-yes}" diff --git a/bin/v-unsuspend-firewall-rule b/bin/v-unsuspend-firewall-rule index c1c97e2c7..f2d27a48e 100755 --- a/bin/v-unsuspend-firewall-rule +++ b/bin/v-unsuspend-firewall-rule @@ -9,10 +9,10 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition rule=$1 -# Inlcudes +# Includes source $VESTA/func/main.sh source $VESTA/conf/vesta.conf diff --git a/bin/v-unsuspend-mail-account b/bin/v-unsuspend-mail-account index 690f78df1..98936101f 100755 --- a/bin/v-unsuspend-mail-account +++ b/bin/v-unsuspend-mail-account @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$(idn -t --quiet -u "$2" ) domain=$(echo $domain | tr '[:upper:]' '[:lower:]') diff --git a/bin/v-unsuspend-mail-accounts b/bin/v-unsuspend-mail-accounts index 6db20f07e..d78165f6b 100755 --- a/bin/v-unsuspend-mail-accounts +++ b/bin/v-unsuspend-mail-accounts @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$(idn -t --quiet -u "$2" ) domain=$(echo $domain | tr '[:upper:]' '[:lower:]') diff --git a/bin/v-unsuspend-mail-domain b/bin/v-unsuspend-mail-domain index d6167852a..8cf65fa9f 100755 --- a/bin/v-unsuspend-mail-domain +++ b/bin/v-unsuspend-mail-domain @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$(idn -t --quiet -u "$2" ) domain=$(echo $domain | tr '[:upper:]' '[:lower:]') diff --git a/bin/v-unsuspend-mail-domains b/bin/v-unsuspend-mail-domains index 19321a538..30d70a9af 100755 --- a/bin/v-unsuspend-mail-domains +++ b/bin/v-unsuspend-mail-domains @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 # Includes diff --git a/bin/v-unsuspend-remote-dns-host b/bin/v-unsuspend-remote-dns-host index 37e90e6b2..4e0023658 100755 --- a/bin/v-unsuspend-remote-dns-host +++ b/bin/v-unsuspend-remote-dns-host @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition host=$1 # Includes diff --git a/bin/v-unsuspend-user b/bin/v-unsuspend-user index f2a44f5e6..cfba10ab3 100755 --- a/bin/v-unsuspend-user +++ b/bin/v-unsuspend-user @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 restart=$2 diff --git a/bin/v-unsuspend-web-domain b/bin/v-unsuspend-web-domain index f0baea176..61071f0fc 100755 --- a/bin/v-unsuspend-web-domain +++ b/bin/v-unsuspend-web-domain @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$(idn -t --quiet -u "$2" ) domain_idn=$(idn -t --quiet -a "$domain") diff --git a/bin/v-unsuspend-web-domains b/bin/v-unsuspend-web-domains index c5ae0c032..a07ca86aa 100755 --- a/bin/v-unsuspend-web-domains +++ b/bin/v-unsuspend-web-domains @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 restart=$2 diff --git a/bin/v-update-database-disk b/bin/v-update-database-disk index fe0346192..77768c1db 100755 --- a/bin/v-update-database-disk +++ b/bin/v-update-database-disk @@ -2,14 +2,14 @@ # info: update database disk usage # options: USER DATABASE # -# The function recalculates disk usage for speciefic database. +# The function recalculates disk usage for specific database. #----------------------------------------------------------# # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 database=$2 diff --git a/bin/v-update-databases-disk b/bin/v-update-databases-disk index a6ca5b94a..066dde388 100755 --- a/bin/v-update-databases-disk +++ b/bin/v-update-databases-disk @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 # Includes diff --git a/bin/v-update-dns-templates b/bin/v-update-dns-templates index 3d3692c81..a5f4a14b6 100755 --- a/bin/v-update-dns-templates +++ b/bin/v-update-dns-templates @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition restart=$1 # Includes diff --git a/bin/v-update-mail-domain-disk b/bin/v-update-mail-domain-disk index e3c79dcc0..c5bf5ba59 100755 --- a/bin/v-update-mail-domain-disk +++ b/bin/v-update-mail-domain-disk @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$(idn -t --quiet -u "$2" ) domain=$(echo $domain | tr '[:upper:]' '[:lower:]') diff --git a/bin/v-update-mail-domains-disk b/bin/v-update-mail-domains-disk index 49494cd9a..58ad8f04d 100755 --- a/bin/v-update-mail-domains-disk +++ b/bin/v-update-mail-domains-disk @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 # Includes diff --git a/bin/v-update-sys-ip b/bin/v-update-sys-ip index 0c152e600..f995c1af4 100755 --- a/bin/v-update-sys-ip +++ b/bin/v-update-sys-ip @@ -11,7 +11,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=${1-admin} ip_status=${2-shared} diff --git a/bin/v-update-sys-ip-counters b/bin/v-update-sys-ip-counters index bafeed130..dc8c561c5 100755 --- a/bin/v-update-sys-ip-counters +++ b/bin/v-update-sys-ip-counters @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition ip=$1 # Includes diff --git a/bin/v-update-sys-queue b/bin/v-update-sys-queue index 67225e6b9..56842b488 100755 --- a/bin/v-update-sys-queue +++ b/bin/v-update-sys-queue @@ -12,10 +12,10 @@ #----------------------------------------------------------# # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition queue=$1 -# Importing system enviroment as we run this script +# Importing system environment as we run this script # mostly by cron wich not read it by itself source /etc/profile diff --git a/bin/v-update-sys-rrd b/bin/v-update-sys-rrd index 81cc6d64e..f8633aa76 100755 --- a/bin/v-update-sys-rrd +++ b/bin/v-update-sys-rrd @@ -10,7 +10,7 @@ # Variable&Function # #----------------------------------------------------------# -# Importing system enviroment as we run this script +# Importing system environment as we run this script # mostly by cron wich do not read it by itself source /etc/profile @@ -18,7 +18,7 @@ source /etc/profile source $VESTA/func/main.sh source $VESTA/conf/vesta.conf -# Another workaround for cron enviroment +# Another workaround for cron environment PATH="$PATH:$BIN" export PATH diff --git a/bin/v-update-sys-rrd-apache2 b/bin/v-update-sys-rrd-apache2 index bdd0e226b..d03a862de 100755 --- a/bin/v-update-sys-rrd-apache2 +++ b/bin/v-update-sys-rrd-apache2 @@ -1,5 +1,5 @@ #!/bin/bash -# info: update apach2 rrd +# info: update apache2 rrd # options: PERIOD # # The function is for updating apache rrd database and graphic. @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition period=${1-daily} # Includes diff --git a/bin/v-update-sys-rrd-ftp b/bin/v-update-sys-rrd-ftp index 6f9e502e9..ff1a642f6 100755 --- a/bin/v-update-sys-rrd-ftp +++ b/bin/v-update-sys-rrd-ftp @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition period=${1-daily} # Includes diff --git a/bin/v-update-sys-rrd-httpd b/bin/v-update-sys-rrd-httpd index 0a56b9921..4e9af2817 100755 --- a/bin/v-update-sys-rrd-httpd +++ b/bin/v-update-sys-rrd-httpd @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition period=${1-daily} # Includes diff --git a/bin/v-update-sys-rrd-la b/bin/v-update-sys-rrd-la index 9d8b312bd..c6343e3d2 100755 --- a/bin/v-update-sys-rrd-la +++ b/bin/v-update-sys-rrd-la @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition period=${1-daily} # Includes diff --git a/bin/v-update-sys-rrd-mail b/bin/v-update-sys-rrd-mail index 15d70f717..50cd05c34 100755 --- a/bin/v-update-sys-rrd-mail +++ b/bin/v-update-sys-rrd-mail @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition period=${1-daily} # Includes diff --git a/bin/v-update-sys-rrd-mem b/bin/v-update-sys-rrd-mem index 2e767dbfb..e0de66a9a 100755 --- a/bin/v-update-sys-rrd-mem +++ b/bin/v-update-sys-rrd-mem @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition period=${1-daily} # Includes diff --git a/bin/v-update-sys-rrd-mysql b/bin/v-update-sys-rrd-mysql index 8b9056aa8..c045057f9 100755 --- a/bin/v-update-sys-rrd-mysql +++ b/bin/v-update-sys-rrd-mysql @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition period=${1-daily} # Includes diff --git a/bin/v-update-sys-rrd-net b/bin/v-update-sys-rrd-net index 979bff53c..542c00cfd 100755 --- a/bin/v-update-sys-rrd-net +++ b/bin/v-update-sys-rrd-net @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition period=${1-daily} # Includes diff --git a/bin/v-update-sys-rrd-nginx b/bin/v-update-sys-rrd-nginx index b1b0b3e81..85bf30b8c 100755 --- a/bin/v-update-sys-rrd-nginx +++ b/bin/v-update-sys-rrd-nginx @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition period=${1-daily} # Includes diff --git a/bin/v-update-sys-rrd-pgsql b/bin/v-update-sys-rrd-pgsql index aeeb95823..3eeb16ab6 100755 --- a/bin/v-update-sys-rrd-pgsql +++ b/bin/v-update-sys-rrd-pgsql @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition period=${1-daily} # Includes diff --git a/bin/v-update-sys-rrd-ssh b/bin/v-update-sys-rrd-ssh index 44c6d167b..a421b62dd 100755 --- a/bin/v-update-sys-rrd-ssh +++ b/bin/v-update-sys-rrd-ssh @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition period=${1-daily} # Includes diff --git a/bin/v-update-sys-vesta b/bin/v-update-sys-vesta index 8fec0ce73..a03470e9b 100755 --- a/bin/v-update-sys-vesta +++ b/bin/v-update-sys-vesta @@ -10,10 +10,10 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition package=$1 -# Importing system enviroment +# Importing system environment source /etc/profile # Includes @@ -42,7 +42,7 @@ if [ -e "/etc/redhat-release" ]; then # Update vesta package $yum update $package > /dev/null 2>&1 - check_result $? "$pacakge update failed" $E_UPDATE + check_result $? "$package update failed" $E_UPDATE else # Update repo apt-get update -o Dir::Etc::sourcelist="sources.list.d/vesta.list" \ @@ -50,7 +50,7 @@ else # Update vesta package apt-get install $package -qq > /dev/null 2>&1 - check_result $? "$pacakge update failed" $E_UPDATE + check_result $? "$package update failed" $E_UPDATE fi diff --git a/bin/v-update-user-backup-exclusions b/bin/v-update-user-backup-exclusions index 898a1d55b..ed90e9d90 100755 --- a/bin/v-update-user-backup-exclusions +++ b/bin/v-update-user-backup-exclusions @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 vfile=$2 diff --git a/bin/v-update-user-backups b/bin/v-update-user-backups index df2c920d2..6dfe32992 100755 --- a/bin/v-update-user-backups +++ b/bin/v-update-user-backups @@ -13,7 +13,7 @@ source $VESTA/func/main.sh source $VESTA/conf/vesta.conf -# Argument defenition +# Argument definition user=$1 type="${2-$BACKUP_SYSTEM}" diff --git a/bin/v-update-user-counters b/bin/v-update-user-counters index 0805c154c..9fc1ac5e3 100755 --- a/bin/v-update-user-counters +++ b/bin/v-update-user-counters @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 # Includes diff --git a/bin/v-update-user-disk b/bin/v-update-user-disk index d129a94ca..a37f9a389 100755 --- a/bin/v-update-user-disk +++ b/bin/v-update-user-disk @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 # Includes diff --git a/bin/v-update-user-package b/bin/v-update-user-package index 1b524b09e..511c8dbf0 100755 --- a/bin/v-update-user-package +++ b/bin/v-update-user-package @@ -1,15 +1,15 @@ #!/bin/bash # info: update user package -# options: PACAKGE +# options: PACKAGE # -# The function propogates package to connected users. +# The function propagates package to connected users. #----------------------------------------------------------# # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition package=$1 # Includes diff --git a/bin/v-update-user-quota b/bin/v-update-user-quota index 754639b71..9de5f28c7 100755 --- a/bin/v-update-user-quota +++ b/bin/v-update-user-quota @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 # Includes diff --git a/bin/v-update-user-stats b/bin/v-update-user-stats index b6b3c9996..7dc467443 100755 --- a/bin/v-update-user-stats +++ b/bin/v-update-user-stats @@ -9,10 +9,10 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 -# Importing system enviroment as we run this script +# Importing system environment as we run this script # mostly by cron wich not read it by itself source /etc/profile diff --git a/bin/v-update-web-domain-disk b/bin/v-update-web-domain-disk index 6ffdee828..67dcaa8aa 100755 --- a/bin/v-update-web-domain-disk +++ b/bin/v-update-web-domain-disk @@ -2,14 +2,14 @@ # info: update disk usage for domain # options: USER DOMAIN # -# The function recalculates disk usage for speciefic webdomain. +# The function recalculates disk usage for specific webdomain. #----------------------------------------------------------# # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$(idn -t --quiet -u "$2" ) domain_idn=$(idn -t --quiet -a "$domain") diff --git a/bin/v-update-web-domain-stat b/bin/v-update-web-domain-stat index 0443d187b..a89664fb5 100755 --- a/bin/v-update-web-domain-stat +++ b/bin/v-update-web-domain-stat @@ -2,14 +2,14 @@ # info: update domain statistics # options: USER DOMAIN # -# The function runs log analyzer for speciefic webdomain. +# The function runs log analyzer for specific webdomain. #----------------------------------------------------------# # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$(idn -t --quiet -u "$2" ) domain_idn=$(idn -t --quiet -a "$domain") diff --git a/bin/v-update-web-domain-traff b/bin/v-update-web-domain-traff index 47f2ae927..d78e9938f 100755 --- a/bin/v-update-web-domain-traff +++ b/bin/v-update-web-domain-traff @@ -2,14 +2,14 @@ # info: update domain bandwidth usage # options: USER DOMAIN # -# The function recalculates bandwidth usage for speciefic domain. +# The function recalculates bandwidth usage for specific domain. #----------------------------------------------------------# # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$(idn -t --quiet -u "$2" ) domain_idn=$(idn -t --quiet -a "$domain") diff --git a/bin/v-update-web-domains-disk b/bin/v-update-web-domains-disk index 9f8c2a523..ae538997a 100755 --- a/bin/v-update-web-domains-disk +++ b/bin/v-update-web-domains-disk @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 # Includes diff --git a/bin/v-update-web-domains-stat b/bin/v-update-web-domains-stat index 6f2f20f40..1ef2abd83 100755 --- a/bin/v-update-web-domains-stat +++ b/bin/v-update-web-domains-stat @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 # Includes diff --git a/bin/v-update-web-domains-traff b/bin/v-update-web-domains-traff index d8a2e9240..dfeacf780 100755 --- a/bin/v-update-web-domains-traff +++ b/bin/v-update-web-domains-traff @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 # Includes diff --git a/bin/v-update-web-templates b/bin/v-update-web-templates index 7599f7c76..a526e0d4e 100755 --- a/bin/v-update-web-templates +++ b/bin/v-update-web-templates @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition restart=$1 # Includes diff --git a/install/debian/7/fail2ban/filter.d/vesta.conf b/install/debian/7/fail2ban/filter.d/vesta.conf index 69670a56e..36ec10019 100644 --- a/install/debian/7/fail2ban/filter.d/vesta.conf +++ b/install/debian/7/fail2ban/filter.d/vesta.conf @@ -1,4 +1,4 @@ -# Fail2Ban filter for unsuccesfull Vesta authentication attempts +# Fail2Ban filter for unsuccessful Vesta authentication attempts # [INCLUDES] diff --git a/install/debian/8/fail2ban/filter.d/vesta.conf b/install/debian/8/fail2ban/filter.d/vesta.conf index 69670a56e..36ec10019 100644 --- a/install/debian/8/fail2ban/filter.d/vesta.conf +++ b/install/debian/8/fail2ban/filter.d/vesta.conf @@ -1,4 +1,4 @@ -# Fail2Ban filter for unsuccesfull Vesta authentication attempts +# Fail2Ban filter for unsuccessful Vesta authentication attempts # [INCLUDES] diff --git a/install/rhel/5/fail2ban/fail2ban.filter.conf b/install/rhel/5/fail2ban/fail2ban.filter.conf index 69670a56e..36ec10019 100644 --- a/install/rhel/5/fail2ban/fail2ban.filter.conf +++ b/install/rhel/5/fail2ban/fail2ban.filter.conf @@ -1,4 +1,4 @@ -# Fail2Ban filter for unsuccesfull Vesta authentication attempts +# Fail2Ban filter for unsuccessful Vesta authentication attempts # [INCLUDES] diff --git a/install/rhel/6/fail2ban/fail2ban.filter.conf b/install/rhel/6/fail2ban/fail2ban.filter.conf index 69670a56e..36ec10019 100644 --- a/install/rhel/6/fail2ban/fail2ban.filter.conf +++ b/install/rhel/6/fail2ban/fail2ban.filter.conf @@ -1,4 +1,4 @@ -# Fail2Ban filter for unsuccesfull Vesta authentication attempts +# Fail2Ban filter for unsuccessful Vesta authentication attempts # [INCLUDES] diff --git a/install/rhel/7/fail2ban/fail2ban.filter.conf b/install/rhel/7/fail2ban/fail2ban.filter.conf index 69670a56e..36ec10019 100644 --- a/install/rhel/7/fail2ban/fail2ban.filter.conf +++ b/install/rhel/7/fail2ban/fail2ban.filter.conf @@ -1,4 +1,4 @@ -# Fail2Ban filter for unsuccesfull Vesta authentication attempts +# Fail2Ban filter for unsuccessful Vesta authentication attempts # [INCLUDES] diff --git a/install/ubuntu/12.04/fail2ban/filter.d/vesta.conf b/install/ubuntu/12.04/fail2ban/filter.d/vesta.conf index 69670a56e..36ec10019 100644 --- a/install/ubuntu/12.04/fail2ban/filter.d/vesta.conf +++ b/install/ubuntu/12.04/fail2ban/filter.d/vesta.conf @@ -1,4 +1,4 @@ -# Fail2Ban filter for unsuccesfull Vesta authentication attempts +# Fail2Ban filter for unsuccessful Vesta authentication attempts # [INCLUDES] diff --git a/install/ubuntu/12.10/fail2ban/filter.d/vesta.conf b/install/ubuntu/12.10/fail2ban/filter.d/vesta.conf index 69670a56e..36ec10019 100644 --- a/install/ubuntu/12.10/fail2ban/filter.d/vesta.conf +++ b/install/ubuntu/12.10/fail2ban/filter.d/vesta.conf @@ -1,4 +1,4 @@ -# Fail2Ban filter for unsuccesfull Vesta authentication attempts +# Fail2Ban filter for unsuccessful Vesta authentication attempts # [INCLUDES] diff --git a/install/ubuntu/13.04/fail2ban/filter.d/vesta.conf b/install/ubuntu/13.04/fail2ban/filter.d/vesta.conf index 69670a56e..36ec10019 100644 --- a/install/ubuntu/13.04/fail2ban/filter.d/vesta.conf +++ b/install/ubuntu/13.04/fail2ban/filter.d/vesta.conf @@ -1,4 +1,4 @@ -# Fail2Ban filter for unsuccesfull Vesta authentication attempts +# Fail2Ban filter for unsuccessful Vesta authentication attempts # [INCLUDES] diff --git a/install/ubuntu/13.10/fail2ban/filter.d/vesta.conf b/install/ubuntu/13.10/fail2ban/filter.d/vesta.conf index 69670a56e..36ec10019 100644 --- a/install/ubuntu/13.10/fail2ban/filter.d/vesta.conf +++ b/install/ubuntu/13.10/fail2ban/filter.d/vesta.conf @@ -1,4 +1,4 @@ -# Fail2Ban filter for unsuccesfull Vesta authentication attempts +# Fail2Ban filter for unsuccessful Vesta authentication attempts # [INCLUDES] diff --git a/install/ubuntu/14.04/fail2ban/filter.d/vesta.conf b/install/ubuntu/14.04/fail2ban/filter.d/vesta.conf index 69670a56e..36ec10019 100644 --- a/install/ubuntu/14.04/fail2ban/filter.d/vesta.conf +++ b/install/ubuntu/14.04/fail2ban/filter.d/vesta.conf @@ -1,4 +1,4 @@ -# Fail2Ban filter for unsuccesfull Vesta authentication attempts +# Fail2Ban filter for unsuccessful Vesta authentication attempts # [INCLUDES] diff --git a/install/ubuntu/14.10/fail2ban/filter.d/vesta.conf b/install/ubuntu/14.10/fail2ban/filter.d/vesta.conf index 69670a56e..36ec10019 100644 --- a/install/ubuntu/14.10/fail2ban/filter.d/vesta.conf +++ b/install/ubuntu/14.10/fail2ban/filter.d/vesta.conf @@ -1,4 +1,4 @@ -# Fail2Ban filter for unsuccesfull Vesta authentication attempts +# Fail2Ban filter for unsuccessful Vesta authentication attempts # [INCLUDES] diff --git a/install/ubuntu/15.04/fail2ban/filter.d/vesta.conf b/install/ubuntu/15.04/fail2ban/filter.d/vesta.conf index 69670a56e..36ec10019 100644 --- a/install/ubuntu/15.04/fail2ban/filter.d/vesta.conf +++ b/install/ubuntu/15.04/fail2ban/filter.d/vesta.conf @@ -1,4 +1,4 @@ -# Fail2Ban filter for unsuccesfull Vesta authentication attempts +# Fail2Ban filter for unsuccessful Vesta authentication attempts # [INCLUDES] diff --git a/install/vst-install-debian.sh b/install/vst-install-debian.sh index 3baf90102..fea7fbe83 100755 --- a/install/vst-install-debian.sh +++ b/install/vst-install-debian.sh @@ -501,7 +501,7 @@ rm -rf /usr/local/vesta > /dev/null 2>&1 #----------------------------------------------------------# -# Package Exludes # +# Package Excludes # #----------------------------------------------------------# # Excluding packages @@ -626,7 +626,7 @@ chmod 755 /usr/bin/rssh # Configure VESTA # #----------------------------------------------------------# -# Downlading sudo configuration +# Downloading sudo configuration mkdir -p /etc/sudoers.d wget $vestacp/sudo/admin -O /etc/sudoers.d/admin chmod 440 /etc/sudoers.d/admin @@ -642,7 +642,7 @@ source /root/.bash_profile # Configuring logrotate for vesta logs wget $vestacp/logrotate/vesta -O /etc/logrotate.d/vesta -# Buidling directory tree and creating some blank files for vesta +# Building directory tree and creating some blank files for vesta mkdir -p $VESTA/conf $VESTA/log $VESTA/ssl $VESTA/data/ips \ $VESTA/data/queue $VESTA/data/users $VESTA/data/firewall touch $VESTA/data/queue/backup.pipe $VESTA/data/queue/disk.pipe \ From 6ea00614765532fc038cabdd73537b2f778e1d44 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Fri, 6 Nov 2015 22:54:06 +0200 Subject: [PATCH 199/264] error_reporting --- web/edit/server/index.php | 4 +--- web/list/backup/exclusions/index.php | 2 +- web/list/backup/index.php | 2 +- web/list/cron/index.php | 2 +- web/list/db/index.php | 2 +- web/list/directory/index.php | 1 + web/list/dns/index.php | 3 ++- web/list/favorites/index.php | 3 +-- web/list/firewall/banlist/index.php | 2 +- web/list/firewall/index.php | 2 +- web/list/ip/index.php | 3 +-- web/list/mail/index.php | 3 ++- web/list/notifications/index.php | 1 - web/list/package/index.php | 2 +- web/list/rrd/image.php | 2 +- web/list/rrd/index.php | 2 +- web/list/server/index.php | 2 +- web/list/stats/index.php | 2 +- web/list/updates/index.php | 2 +- web/list/web-log/index.php | 2 +- web/list/web/index.php | 3 +-- 21 files changed, 22 insertions(+), 25 deletions(-) diff --git a/web/edit/server/index.php b/web/edit/server/index.php index 849657221..095f4701f 100644 --- a/web/edit/server/index.php +++ b/web/edit/server/index.php @@ -1,8 +1,6 @@ Favorites:
                '; diff --git a/web/list/firewall/banlist/index.php b/web/list/firewall/banlist/index.php index 04843b272..32393229c 100644 --- a/web/list/firewall/banlist/index.php +++ b/web/list/firewall/banlist/index.php @@ -1,5 +1,5 @@ Date: Fri, 6 Nov 2015 23:41:32 +0200 Subject: [PATCH 200/264] timestamp for sprite.png and templates.js --- web/css/file_manager.css | 10 +++++----- web/css/styles.min.css | 30 +++++++++++++++--------------- web/templates/header.html | 4 ++-- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/web/css/file_manager.css b/web/css/file_manager.css index 9d8a2a714..f6c364710 100644 --- a/web/css/file_manager.css +++ b/web/css/file_manager.css @@ -3,7 +3,7 @@ body { margin: 0; padding: 0; } .l-logo { background-color: #7B7B7B; - background-image: url("/images/sprite.png"); + background-image: url("/images/sprite.png?1446554103"); background-position: -117px -57px; background-repeat: no-repeat; border: 9px solid #7B7B7B; @@ -475,7 +475,7 @@ ul.listing { list-style-type: none; padding: 18px 0 0; margin: -4px 0 0 -1px; b } .progress-container .progress-elm .close { - background: rgba(0, 0, 0, 0) url("/images/sprite.png") repeat scroll -428px -487px; + background: rgba(0, 0, 0, 0) url("/images/sprite.png?1446554103") repeat scroll -428px -487px; cursor: pointer; display: inline-block; float: right; @@ -506,7 +506,7 @@ ul.listing { list-style-type: none; padding: 18px 0 0; margin: -4px 0 0 -1px; b } /*W .check-label::before { - background-image: url("/images/sprite.png"); + background-image: url("/images/sprite.png?1446554103"); background-position: -232px -9px; background-repeat: no-repeat; background-size: 450px auto; @@ -659,7 +659,7 @@ input[type="checkbox"] { line-height: 30px; } .shortcuts .close { - background: url("/images/sprite.png") repeat scroll -408px -469px; + background: url("/images/sprite.png?1446554103") repeat scroll -408px -469px; cursor: pointer; display: inline-block; float: right; @@ -716,7 +716,7 @@ input[type="checkbox"] { .l-icon-shortcuts { display: inline-block; vertical-align: middle; - background-image: url("/images/sprite.png"); + background-image: url("/images/sprite.png?1446554103"); width: 35px; height: 35px; background-position: -122px -283px; diff --git a/web/css/styles.min.css b/web/css/styles.min.css index e0c9595f9..c1eddecef 100644 --- a/web/css/styles.min.css +++ b/web/css/styles.min.css @@ -629,7 +629,7 @@ a { left: 0; top: 0; display: inline-block; - background-image: url("/images/sprite.png"); + background-image: url("/images/sprite.png?1446554103"); background-size: 450px auto; background-repeat: no-repeat; background-position: -232px -9px; @@ -656,7 +656,7 @@ input[type="checkbox"] { } .l-logo { - background-image: url("/images/sprite.png"); + background-image: url("/images/sprite.png?1446554103"); background-position: -117px -7px; background-repeat: no-repeat; display: inline-block; @@ -778,7 +778,7 @@ input[type="checkbox"] { } .l-profile__notifications { - background: url("/images/sprite.png") no-repeat scroll -129px -135px; + background: url("/images/sprite.png?1446554103") no-repeat scroll -129px -135px; border-radius: 30px; color: #fff; cursor: pointer; @@ -896,7 +896,7 @@ input[type="checkbox"] { .notification-container .icon.starred { display: inline-block; width: 21px; - background: url("/images/sprite.png") repeat scroll -184px 556px; + background: url("/images/sprite.png?1446554103") repeat scroll -184px 556px; } @@ -1008,7 +1008,7 @@ div.l-content > div.l-separator:nth-of-type(4) { margin-top: 215px; } .l-sort__create-btn { - background-image: url("/images/sprite.png"); + background-image: url("/images/sprite.png?1446554103"); background-position: -331px -107px; background-repeat: no-repeat; bottom: -23px; @@ -1076,7 +1076,7 @@ div.l-content > div.l-separator:nth-of-type(4) { padding: 12px; } .context-menu.sort-order span.name { - background: url("/images/sprite.png") no-repeat scroll -292px -361px rgba(0, 0, 0, 0); + background: url("/images/sprite.png?1446554103") no-repeat scroll -292px -361px rgba(0, 0, 0, 0); display: inline-block; padding: 12px 28px 12px 12px; width: 117px; @@ -1084,7 +1084,7 @@ div.l-content > div.l-separator:nth-of-type(4) { font-weight: bold; } .context-menu.sort-order span.up { - background: url("/images/sprite.png") no-repeat scroll -434px -417px rgba(0, 0, 0, 0); + background: url("/images/sprite.png?1446554103") no-repeat scroll -434px -417px rgba(0, 0, 0, 0); display: inline-block; padding: 12px 14px; width: 16px; @@ -1170,7 +1170,7 @@ div.l-content > div.l-separator:nth-of-type(4) { float: left; width: 30px; height: 30px; - background-image: url("/images/sprite.png"); + background-image: url("/images/sprite.png?1446554103"); background-position: -333px -1px; border: none; } @@ -1191,7 +1191,7 @@ div.l-content > div.l-separator:nth-of-type(4) { float: left; width: 25px; height: 25px; - background-image: url("/images/sprite.png"); + background-image: url("/images/sprite.png?1446554103"); background-position: -333px -37px; border: none; } @@ -1244,7 +1244,7 @@ div.l-content > div.l-separator:nth-of-type(4) { .l-select:after { pointer-events: none; - background-image: url("/images/sprite.png"); + background-image: url("/images/sprite.png?1446554103"); background-position: -245px -175px; width: 7px; height: 4px; @@ -1582,7 +1582,7 @@ div.l-content > div.l-separator:nth-of-type(4) { position: relative; } .actions-panel__col i { - background-image: url("/images/sprite.png"); + background-image: url("/images/sprite.png?1446554103"); background-repeat: no-repeat; display: inline-block; float: right; @@ -2009,7 +2009,7 @@ div.l-content > div.l-separator:nth-of-type(4) { .l-icon-up-arrow, .l-icon-down-arrow, .l-icon-star, .l-icon-to-top, .l-icon-shortcuts, .l-icon-star-orange, .l-icon-star-blue { display: inline-block; vertical-align: middle; - background-image: url("/images/sprite.png"); + background-image: url("/images/sprite.png?1446554103"); } .l-icon-down-arrow { @@ -2367,7 +2367,7 @@ label { margin: 2px 6px 0 0; min-width: 138px; padding: 8px 1px 6px 10px; - background-image: url("/images/sprite.png"); + background-image: url("/images/sprite.png?1446554103"); background-position: -185px -604px; width: 270px; appearance:none; @@ -2780,7 +2780,7 @@ form#vstobjects.suspended { #add-icon { width: 45px; height: 45px; - background-image: url("/images/sprite.png"); + background-image: url("/images/sprite.png?1446554103"); background-position: -378px -107px; background-repeat: no-repeat; display: inline-block; @@ -2919,7 +2919,7 @@ form#vstobjects.suspended { letter-spacing: 3px; } .shortcuts .close { - background: url("/images/sprite.png") repeat scroll -408px -469px; + background: url("/images/sprite.png?1446554103") repeat scroll -408px -469px; cursor: pointer; display: inline-block; float: right; diff --git a/web/templates/header.html b/web/templates/header.html index 863911d42..67de30c49 100644 --- a/web/templates/header.html +++ b/web/templates/header.html @@ -57,8 +57,8 @@ }) - - + + From 16db6f903bed2d97b78aaaa6fbd6e9d0537282ff Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Sat, 7 Nov 2015 00:09:14 +0200 Subject: [PATCH 201/264] removed wrong slash --- web/edit/server/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/edit/server/index.php b/web/edit/server/index.php index 095f4701f..a47056991 100644 --- a/web/edit/server/index.php +++ b/web/edit/server/index.php @@ -1,6 +1,6 @@ Date: Sat, 7 Nov 2015 00:13:41 +0200 Subject: [PATCH 202/264] fixed notification link --- upd/add_notifications.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/upd/add_notifications.sh b/upd/add_notifications.sh index cf8423062..ca2dc49c4 100755 --- a/upd/add_notifications.sh +++ b/upd/add_notifications.sh @@ -3,7 +3,7 @@ if [ ! -e '/usr/local/vesta/data/users/admin/notifications.conf' ]; then /usr/local/vesta/bin/v-add-user-notification admin "File Manager" "Browse, coppy, edit, view, and retrieve all of your web domain files using fully featured File Manager. Plugin is avaiable for purchase." 'filemanager' - /usr/local/vesta/bin/v-add-user-notification admin "Chroot SFTP" "If you want have SFTP accounts that will be used only to transfer files (and not to ssh), you can purchase and enable SFTP Chroot. " + /usr/local/vesta/bin/v-add-user-notification admin "Chroot SFTP" "If you want have SFTP accounts that will be used only to transfer files (and not to ssh), you can purchase and enable SFTP Chroot. " /usr/local/vesta/bin/v-add-user-notification admin "Starred Objects" "Use stars to easily mark certain object as important or to indicate that you need to do something about it later." 'starred' /usr/local/vesta/bin/v-add-user-notification admin "Monitoring Tools" "This module answers common performance, health, usage and monitoring questions. Server -> Show CPU, Memory, Disk usage" /usr/local/vesta/bin/v-add-user-notification admin "Release 0.9.8-15" "New version is cool. A lot of work has been put in the user experience and stability. Check out release notes" From e8431de456031472b9f62d540da3f7a1f0192e47 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Sat, 7 Nov 2015 14:58:27 +0200 Subject: [PATCH 203/264] install notifications --- install/vst-install-debian.sh | 3 +++ install/vst-install-rhel.sh | 3 +++ install/vst-install-ubuntu.sh | 3 +++ 3 files changed, 9 insertions(+) diff --git a/install/vst-install-debian.sh b/install/vst-install-debian.sh index 3baf90102..f867a654a 100755 --- a/install/vst-install-debian.sh +++ b/install/vst-install-debian.sh @@ -1176,6 +1176,9 @@ update-rc.d vesta defaults service vesta start check_result $? "vesta start failed" +# Adding notifications +$VESTA/upd/add_notifications.sh + #----------------------------------------------------------# # Vesta Access Info # diff --git a/install/vst-install-rhel.sh b/install/vst-install-rhel.sh index 5be5787c4..058af598d 100755 --- a/install/vst-install-rhel.sh +++ b/install/vst-install-rhel.sh @@ -1245,6 +1245,9 @@ chkconfig vesta on service vesta start check_result $? "vesta start failed" +# Adding notifications +$VESTA/upd/add_notifications.sh + #----------------------------------------------------------# # Vesta Access Info # diff --git a/install/vst-install-ubuntu.sh b/install/vst-install-ubuntu.sh index ef64440c0..64306f8a5 100755 --- a/install/vst-install-ubuntu.sh +++ b/install/vst-install-ubuntu.sh @@ -1165,6 +1165,9 @@ update-rc.d vesta defaults service vesta start check_result $? "vesta start failed" +# Adding notifications +$VESTA/upd/add_notifications.sh + #----------------------------------------------------------# # Vesta Access Info # From a16af0ec837fa0d1ec72ea34eb0b703a16a25db8 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Sat, 7 Nov 2015 16:35:23 +0200 Subject: [PATCH 204/264] exclude config-version --- bin/v-list-sys-vesta-updates | 12 ++++++------ install/debian/7/dovecot.tar.gz | Bin 3482 -> 3482 bytes install/debian/7/fail2ban.tar.gz | Bin 706 -> 706 bytes install/debian/7/firewall.tar.gz | Bin 537 -> 537 bytes install/debian/7/packages.tar.gz | Bin 555 -> 555 bytes install/debian/7/templates.tar.gz | Bin 12114 -> 12114 bytes install/debian/8/dovecot.tar.gz | Bin 3482 -> 3482 bytes install/debian/8/fail2ban.tar.gz | Bin 706 -> 706 bytes install/debian/8/firewall.tar.gz | Bin 537 -> 537 bytes install/debian/8/packages.tar.gz | Bin 555 -> 555 bytes install/debian/8/templates.tar.gz | Bin 12217 -> 12217 bytes install/rhel/5/dovecot.tar.gz | Bin 474 -> 474 bytes install/rhel/5/fail2ban.tar.gz | Bin 693 -> 693 bytes install/rhel/5/firewall.tar.gz | Bin 537 -> 537 bytes install/rhel/5/packages.tar.gz | Bin 530 -> 530 bytes install/rhel/5/templates.tar.gz | Bin 12051 -> 12051 bytes install/rhel/6/dovecot.tar.gz | Bin 2640 -> 2640 bytes install/rhel/6/fail2ban.tar.gz | Bin 693 -> 693 bytes install/rhel/6/firewall.tar.gz | Bin 537 -> 537 bytes install/rhel/6/packages.tar.gz | Bin 530 -> 530 bytes install/rhel/6/templates.tar.gz | Bin 12051 -> 12051 bytes install/rhel/7/dovecot.tar.gz | Bin 2641 -> 2641 bytes install/rhel/7/fail2ban.tar.gz | Bin 693 -> 693 bytes install/rhel/7/firewall.tar.gz | Bin 537 -> 537 bytes install/rhel/7/packages.tar.gz | Bin 530 -> 530 bytes install/rhel/7/templates.tar.gz | Bin 12248 -> 12248 bytes install/ubuntu/12.04/dovecot.tar.gz | Bin 3440 -> 3440 bytes install/ubuntu/12.04/fail2ban.tar.gz | Bin 708 -> 708 bytes install/ubuntu/12.04/firewall.tar.gz | Bin 531 -> 531 bytes install/ubuntu/12.04/packages.tar.gz | Bin 541 -> 541 bytes install/ubuntu/12.04/templates.tar.gz | Bin 11940 -> 11940 bytes install/ubuntu/12.10/dovecot.tar.gz | Bin 3440 -> 3440 bytes install/ubuntu/12.10/fail2ban.tar.gz | Bin 708 -> 708 bytes install/ubuntu/12.10/firewall.tar.gz | Bin 531 -> 531 bytes install/ubuntu/12.10/packages.tar.gz | Bin 541 -> 541 bytes install/ubuntu/12.10/templates.tar.gz | Bin 11941 -> 11941 bytes install/ubuntu/13.04/dovecot.tar.gz | Bin 3440 -> 3440 bytes install/ubuntu/13.04/fail2ban.tar.gz | Bin 708 -> 708 bytes install/ubuntu/13.04/firewall.tar.gz | Bin 531 -> 531 bytes install/ubuntu/13.04/packages.tar.gz | Bin 541 -> 541 bytes install/ubuntu/13.04/templates.tar.gz | Bin 11941 -> 11941 bytes install/ubuntu/13.10/dovecot.tar.gz | Bin 3440 -> 3440 bytes install/ubuntu/13.10/fail2ban.tar.gz | Bin 708 -> 708 bytes install/ubuntu/13.10/firewall.tar.gz | Bin 531 -> 531 bytes install/ubuntu/13.10/packages.tar.gz | Bin 541 -> 541 bytes install/ubuntu/13.10/templates.tar.gz | Bin 11944 -> 11944 bytes install/ubuntu/14.04/dovecot.tar.gz | Bin 3482 -> 3482 bytes install/ubuntu/14.04/fail2ban.tar.gz | Bin 706 -> 706 bytes install/ubuntu/14.04/firewall.tar.gz | Bin 537 -> 537 bytes install/ubuntu/14.04/packages.tar.gz | Bin 555 -> 555 bytes install/ubuntu/14.04/templates.tar.gz | Bin 12151 -> 12151 bytes install/ubuntu/14.10/dovecot.tar.gz | Bin 3482 -> 3482 bytes install/ubuntu/14.10/fail2ban.tar.gz | Bin 706 -> 706 bytes install/ubuntu/14.10/firewall.tar.gz | Bin 537 -> 537 bytes install/ubuntu/14.10/packages.tar.gz | Bin 555 -> 555 bytes install/ubuntu/14.10/templates.tar.gz | Bin 12152 -> 12152 bytes install/ubuntu/15.04/dovecot.tar.gz | Bin 3482 -> 3482 bytes install/ubuntu/15.04/fail2ban.tar.gz | Bin 706 -> 706 bytes install/ubuntu/15.04/firewall.tar.gz | Bin 537 -> 537 bytes install/ubuntu/15.04/packages.tar.gz | Bin 555 -> 555 bytes install/ubuntu/15.04/templates.tar.gz | Bin 12213 -> 12213 bytes 61 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bin/v-list-sys-vesta-updates b/bin/v-list-sys-vesta-updates index 12db31ac0..fd30da9ee 100755 --- a/bin/v-list-sys-vesta-updates +++ b/bin/v-list-sys-vesta-updates @@ -42,8 +42,8 @@ else dpkg_data=$(dpkg-query -s vesta) pkg_date=$(stat -c "%Y" /var/lib/dpkg/info/vesta.list) ARCH=$(echo "$dpkg_data"|grep Architecture | cut -f 2 -d ' ') - VERSION=$(echo "$dpkg_data"|grep Version |cut -f 2 -d ' '|cut -f 1 -d \-) - RELEASE=$(echo "$dpkg_data"|grep Version |cut -f 2 -d ' '|cut -f 2 -d \-) + VERSION=$(echo "$dpkg_data"|grep ^Version |cut -f 2 -d ' '|cut -f 1 -d \-) + RELEASE=$(echo "$dpkg_data"|grep ^Version |cut -f 2 -d ' '|cut -f 2 -d \-) DATE=$(date -d @$pkg_date +"%F") TIME=$(date -d @$pkg_date +"%T") fi @@ -65,8 +65,8 @@ else dpkg_data=$(dpkg-query -s vesta-php) pkg_date=$(stat -c "%Y" /var/lib/dpkg/info/vesta-php.list) ARCH=$(echo "$dpkg_data"|grep Architecture | cut -f 2 -d ' ') - VERSION=$(echo "$dpkg_data"|grep Version |cut -f 2 -d ' '|cut -f 1 -d \-) - RELEASE=$(echo "$dpkg_data"|grep Version |cut -f 2 -d ' '|cut -f 2 -d \-) + VERSION=$(echo "$dpkg_data"|grep ^Version |cut -f 2 -d ' '|cut -f 1 -d \-) + RELEASE=$(echo "$dpkg_data"|grep ^Version |cut -f 2 -d ' '|cut -f 2 -d \-) DATE=$(date -d @$pkg_date +"%F") TIME=$(date -d @$pkg_date +"%T") fi @@ -89,8 +89,8 @@ else dpkg_data=$(dpkg-query -s vesta-nginx) pkg_date=$(stat -c "%Y" /var/lib/dpkg/info/vesta-nginx.list) ARCH=$(echo "$dpkg_data"|grep Architecture | cut -f 2 -d ' ') - VERSION=$(echo "$dpkg_data"|grep Version |cut -f 2 -d ' '|cut -f 1 -d \-) - RELEASE=$(echo "$dpkg_data"|grep Version |cut -f 2 -d ' '|cut -f 2 -d \-) + VERSION=$(echo "$dpkg_data"|grep ^Version |cut -f 2 -d ' '|cut -f 1 -d \-) + RELEASE=$(echo "$dpkg_data"|grep ^Version |cut -f 2 -d ' '|cut -f 2 -d \-) DATE=$(date -d @$pkg_date +"%F") TIME=$(date -d @$pkg_date +"%T") fi diff --git a/install/debian/7/dovecot.tar.gz b/install/debian/7/dovecot.tar.gz index 4d4676756cb179066421050e1c012e829df8b0e4..91a55bc093d6905896b919e715ef242c36f92168 100644 GIT binary patch delta 16 XcmbOwJxiKhzMF%A^PBBP_Q|{eC$9v! delta 16 XcmbOwJxiKhzMF$#-aMO)?2~x`DXj$b diff --git a/install/debian/7/fail2ban.tar.gz b/install/debian/7/fail2ban.tar.gz index 7a400e6c231cba992866571410b6598f6882da13..a2bf42b72a712b2f3b62b19a855c48a79446d1db 100644 GIT binary patch delta 16 XcmX@adWe->zMF%A^PBBP_T5YXDm(=F delta 16 XcmX@adWe->zMF$#-aMO)?7Nu&EII`> diff --git a/install/debian/7/firewall.tar.gz b/install/debian/7/firewall.tar.gz index 7b8223e0729ecdc1c2c3fb920ae701c07d563f0a..a98e20010cefd94c0707d0c8958caaf9da57b678 100644 GIT binary patch delta 16 XcmbQqGLwZ}zMF%A^PBBPb|EGJBme{a delta 16 XcmbQqGLwZ}zMF$#-aMO)>_SWcCH@3B diff --git a/install/debian/7/packages.tar.gz b/install/debian/7/packages.tar.gz index 32db6df0ad3f28a40a514d648cce3ab79ab8c227..c692568f12fb2569c24adac07ad20b1335db297a 100644 GIT binary patch delta 16 XcmZ3@vYLfmzMF%A^PBBPb`>T7CO`x- delta 16 XcmZ3@vYLfmzMF$#-aMO)>?%wEC_V&k diff --git a/install/debian/7/templates.tar.gz b/install/debian/7/templates.tar.gz index 3421516f63cfb2bf430cedf0d61b555130f5ede1..3da0cec2c3530ff2eb90a4243b809f2bd3d41817 100644 GIT binary patch delta 16 XcmcZzMF%A^PBBP_T5YXDm(=F delta 16 XcmX@adWe->zMF$#-aMO)?7Nu&EII`> diff --git a/install/debian/8/firewall.tar.gz b/install/debian/8/firewall.tar.gz index 7b8223e0729ecdc1c2c3fb920ae701c07d563f0a..a98e20010cefd94c0707d0c8958caaf9da57b678 100644 GIT binary patch delta 16 XcmbQqGLwZ}zMF%A^PBBPb|EGJBme{a delta 16 XcmbQqGLwZ}zMF$#-aMO)>_SWcCH@3B diff --git a/install/debian/8/packages.tar.gz b/install/debian/8/packages.tar.gz index 32db6df0ad3f28a40a514d648cce3ab79ab8c227..c692568f12fb2569c24adac07ad20b1335db297a 100644 GIT binary patch delta 16 XcmZ3@vYLfmzMF%A^PBBPb`>T7CO`x- delta 16 XcmZ3@vYLfmzMF$#-aMO)>?%wEC_V&k diff --git a/install/debian/8/templates.tar.gz b/install/debian/8/templates.tar.gz index 0bd98ba521e4b41635b2282c775ae4032fb4ded6..0f1c99e8797b4f58d0cd091856407e7f1e6862f9 100644 GIT binary patch delta 16 XcmdlPzcZd)zMF%A^PBBP_D%W#Ga&`P delta 16 XcmdlPzcZd)zMF$#-aMO)?3?rfH6I20 diff --git a/install/rhel/5/dovecot.tar.gz b/install/rhel/5/dovecot.tar.gz index 00739401a62f5c27fd5adb479c1d6008e9d612ee..c17fafea87296e6e34194a4991e10a7b11b4b618 100644 GIT binary patch delta 16 Xcmcb`e2bY~zMF%A<(utB_REX_EZ_w< delta 16 Xcmcb`e2bY~zMF$##yp#i?3Wn_SWcCDa5m diff --git a/install/rhel/5/packages.tar.gz b/install/rhel/5/packages.tar.gz index 8aef35a077431424b5d089a98aedad2e5bf60853..da37c520ee899ff77144628200b094c7fe5b9f4b 100644 GIT binary patch delta 16 XcmbQlGKqy5IEg}TQ delta 16 XcmbOnH#v@7zMF$##yp#i>^%AaFBt^^ diff --git a/install/rhel/6/dovecot.tar.gz b/install/rhel/6/dovecot.tar.gz index 9a495429599f0571f01f557df9ead57518b45437..3ce714be0cac0b1434d23f24e37f95b68c13d786 100644 GIT binary patch delta 16 Xcmca0azTV$zMF%A<(utBc26z_SWcCDa5m diff --git a/install/rhel/6/packages.tar.gz b/install/rhel/6/packages.tar.gz index 8aef35a077431424b5d089a98aedad2e5bf60853..da37c520ee899ff77144628200b094c7fe5b9f4b 100644 GIT binary patch delta 16 XcmbQlGKqy5IEg}TQ delta 16 XcmbOnH#v@7zMF$##yp#i>^%AaFBt^^ diff --git a/install/rhel/7/dovecot.tar.gz b/install/rhel/7/dovecot.tar.gz index 39bf10d9eba640ef041813bc944bf710290e3c15..da2560979aef9cec1ddd79bc0fb1216ac89c3e48 100644 GIT binary patch delta 16 Xcmca8a#4g`zMF%A<(utBb}udfETsg; delta 16 Xcmca8a#4g`zMF$##yp#i>|R^|E}R7d diff --git a/install/rhel/7/fail2ban.tar.gz b/install/rhel/7/fail2ban.tar.gz index 0880bf8947ed13bd12809586ca3ae65062960b2c..42dbaba599012020d47efb4011c2ed6a7ca57cbb 100644 GIT binary patch delta 16 XcmdnWx|Nk(zMF%A<(utB_H|4ED0u|U delta 16 XcmdnWx|Nk(zMF$##yp#i?CY2SDsTk| diff --git a/install/rhel/7/firewall.tar.gz b/install/rhel/7/firewall.tar.gz index 9f79d0a5df9fe7e5e3dc8c503d83f9f2b7e79bbc..dcef27e676bd8ef209a59a7deb8ee05215923b7d 100644 GIT binary patch delta 16 XcmbQqGLwZ}zMF%A<(utBb|EGJBi#e{ delta 16 XcmbQqGLwZ}zMF$##yp#i>_SWcCDa5m diff --git a/install/rhel/7/packages.tar.gz b/install/rhel/7/packages.tar.gz index 8aef35a077431424b5d089a98aedad2e5bf60853..da37c520ee899ff77144628200b094c7fe5b9f4b 100644 GIT binary patch delta 16 XcmbQlGKqy=*R`IMoJH diff --git a/install/ubuntu/12.04/dovecot.tar.gz b/install/ubuntu/12.04/dovecot.tar.gz index fe90cd3ea8e44e51f20c48f94dfd596f3342d01a..40d9292b290829293805bffe50bdcb3ceb09e096 100644 GIT binary patch delta 16 Xcmew$^+AeVzMF%A?VIgJ_Do&?F+K$~ delta 16 Xcmew$^+AeVzMF$#_B@-7?3ug(Gdu-x diff --git a/install/ubuntu/12.04/fail2ban.tar.gz b/install/ubuntu/12.04/fail2ban.tar.gz index 9542e273c3a7e4485b7de15a22896decf78420d7..9ea57f7707afd199623ad0ef47e2080854a7186e 100644 GIT binary patch delta 16 XcmX@YdW4l-zMF%A?VIgJ_PtC1DrW@z delta 16 XcmX@YdW4l-zMF$#_B@-7?0cC2EM)~a diff --git a/install/ubuntu/12.04/firewall.tar.gz b/install/ubuntu/12.04/firewall.tar.gz index 2d99cdc39d6528049ad7486f90ecc8399360f1ea..f0625580ce4bec22cd7f54b1098ad89d062c1c57 100644 GIT binary patch delta 16 XcmbQtGMR;4zMF%A?VIgJb{-}GBP#>v delta 16 XcmbQtGMR;4zMF$#_B@-7>^w{WB`E|W diff --git a/install/ubuntu/12.04/packages.tar.gz b/install/ubuntu/12.04/packages.tar.gz index 7513b71900f7ac41e3db5cee0b7338dc924f2858..15e18e83612b7eb00e6bb2d9257d23a09456d69c 100644 GIT binary patch delta 16 XcmbQsGM9y2zMF%A?VIgJb}=RZBx?i( delta 16 XcmbQsGM9y2zMF$#_B@-7>|#s+CTRpg diff --git a/install/ubuntu/12.04/templates.tar.gz b/install/ubuntu/12.04/templates.tar.gz index f914c645e40cad1f8e41c0e863b99ab521e24de4..bdeab7f5b5072258daf4b8806bb0199162d4fe39 100644 GIT binary patch delta 16 XcmZ1yyCjxfzMF%A?VIgJ_PKfhFf#>s delta 16 XcmZ1yyCjxfzMF$#_B@-7>~r-1GBE|T diff --git a/install/ubuntu/12.10/dovecot.tar.gz b/install/ubuntu/12.10/dovecot.tar.gz index fe90cd3ea8e44e51f20c48f94dfd596f3342d01a..40d9292b290829293805bffe50bdcb3ceb09e096 100644 GIT binary patch delta 16 Xcmew$^+AeVzMF%A?VIgJ_Do&?F+K$~ delta 16 Xcmew$^+AeVzMF$#_B@-7?3ug(Gdu-x diff --git a/install/ubuntu/12.10/fail2ban.tar.gz b/install/ubuntu/12.10/fail2ban.tar.gz index 9542e273c3a7e4485b7de15a22896decf78420d7..9ea57f7707afd199623ad0ef47e2080854a7186e 100644 GIT binary patch delta 16 XcmX@YdW4l-zMF%A?VIgJ_PtC1DrW@z delta 16 XcmX@YdW4l-zMF$#_B@-7?0cC2EM)~a diff --git a/install/ubuntu/12.10/firewall.tar.gz b/install/ubuntu/12.10/firewall.tar.gz index 2d99cdc39d6528049ad7486f90ecc8399360f1ea..dce4fe075572b47ef1bf3c52042e52eb735997f1 100644 GIT binary patch delta 16 XcmbQtGMR;4zMF%A{hRGZb{-}GBQgW% delta 16 XcmbQtGMR;4zMF$#_B@-7>^w{WB`E|W diff --git a/install/ubuntu/12.10/packages.tar.gz b/install/ubuntu/12.10/packages.tar.gz index 7513b71900f7ac41e3db5cee0b7338dc924f2858..d17f37f21178cb584f08ae81e1ad821be31905b2 100644 GIT binary patch delta 16 XcmbQsGM9y2zMF%A{hRGZb}=RZByt1> delta 16 XcmbQsGM9y2zMF$#_B@-7>|#s+CTRpg diff --git a/install/ubuntu/12.10/templates.tar.gz b/install/ubuntu/12.10/templates.tar.gz index aa880d8b4d5861a9fb5ad32b5944c6237e7497d0..dfd35e917fd7039d279f2f14429bf6fe81073882 100644 GIT binary patch delta 16 XcmZ1)yEK+vzMF%A{hRGZ_IY{$Fj@tC delta 16 XcmZ1)yEK+vzMF$#_B@-7?DO;hGEoJ$ diff --git a/install/ubuntu/13.04/dovecot.tar.gz b/install/ubuntu/13.04/dovecot.tar.gz index fe90cd3ea8e44e51f20c48f94dfd596f3342d01a..da7a32e6ffbe8e2c610cad1a07baace4e61a833f 100644 GIT binary patch delta 16 Xcmew$^+AeVzMF%A{hRGZ_Do&?F+~M7 delta 16 Xcmew$^+AeVzMF$#_B@-7?3ug(Gdu-x diff --git a/install/ubuntu/13.04/fail2ban.tar.gz b/install/ubuntu/13.04/fail2ban.tar.gz index 9542e273c3a7e4485b7de15a22896decf78420d7..824f879487dcc643d596abaa7f5600db53a92ec6 100644 GIT binary patch delta 16 XcmX@YdW4l-zMF%A{hRGZ_PtC1DsBY* delta 16 XcmX@YdW4l-zMF$#_B@-7?0cC2EM)~a diff --git a/install/ubuntu/13.04/firewall.tar.gz b/install/ubuntu/13.04/firewall.tar.gz index 2d99cdc39d6528049ad7486f90ecc8399360f1ea..dce4fe075572b47ef1bf3c52042e52eb735997f1 100644 GIT binary patch delta 16 XcmbQtGMR;4zMF%A{hRGZb{-}GBQgW% delta 16 XcmbQtGMR;4zMF$#_B@-7>^w{WB`E|W diff --git a/install/ubuntu/13.04/packages.tar.gz b/install/ubuntu/13.04/packages.tar.gz index 7513b71900f7ac41e3db5cee0b7338dc924f2858..d17f37f21178cb584f08ae81e1ad821be31905b2 100644 GIT binary patch delta 16 XcmbQsGM9y2zMF%A{hRGZb}=RZByt1> delta 16 XcmbQsGM9y2zMF$#_B@-7>|#s+CTRpg diff --git a/install/ubuntu/13.04/templates.tar.gz b/install/ubuntu/13.04/templates.tar.gz index f880ced792f4e5d6ce81b03c9d1df96366091c76..5f61577ba30a65958bd029bab47575c540cc5370 100644 GIT binary patch delta 16 XcmZ1)yEK+vzMF%A{hRGZ_IY{$Fj@tC delta 16 XcmZ1)yEK+vzMF$#_B@-7?DO;hGEoJ$ diff --git a/install/ubuntu/13.10/dovecot.tar.gz b/install/ubuntu/13.10/dovecot.tar.gz index fe90cd3ea8e44e51f20c48f94dfd596f3342d01a..da7a32e6ffbe8e2c610cad1a07baace4e61a833f 100644 GIT binary patch delta 16 Xcmew$^+AeVzMF%A{hRGZ_Do&?F+~M7 delta 16 Xcmew$^+AeVzMF$#_B@-7?3ug(Gdu-x diff --git a/install/ubuntu/13.10/fail2ban.tar.gz b/install/ubuntu/13.10/fail2ban.tar.gz index 9542e273c3a7e4485b7de15a22896decf78420d7..824f879487dcc643d596abaa7f5600db53a92ec6 100644 GIT binary patch delta 16 XcmX@YdW4l-zMF%A{hRGZ_PtC1DsBY* delta 16 XcmX@YdW4l-zMF$#_B@-7?0cC2EM)~a diff --git a/install/ubuntu/13.10/firewall.tar.gz b/install/ubuntu/13.10/firewall.tar.gz index 2d99cdc39d6528049ad7486f90ecc8399360f1ea..dce4fe075572b47ef1bf3c52042e52eb735997f1 100644 GIT binary patch delta 16 XcmbQtGMR;4zMF%A{hRGZb{-}GBQgW% delta 16 XcmbQtGMR;4zMF$#_B@-7>^w{WB`E|W diff --git a/install/ubuntu/13.10/packages.tar.gz b/install/ubuntu/13.10/packages.tar.gz index 7513b71900f7ac41e3db5cee0b7338dc924f2858..d17f37f21178cb584f08ae81e1ad821be31905b2 100644 GIT binary patch delta 16 XcmbQsGM9y2zMF%A{hRGZb}=RZByt1> delta 16 XcmbQsGM9y2zMF$#_B@-7>|#s+CTRpg diff --git a/install/ubuntu/13.10/templates.tar.gz b/install/ubuntu/13.10/templates.tar.gz index eac27c8c66ee8c8b394ff9a748e7985d4be13053..82f493f2fe53d0a8d549a557cc9365e6ed02fe87 100644 GIT binary patch delta 16 XcmZ1xyCRldzMF%A{hRGZ_Jw)?FuDbW delta 16 XcmZ1xyCRldzMF$#_B@-7>zMF%A{hRGZ_T5YXDlP=~ delta 16 XcmX@adWe->zMF$#_B@-7?7Nu&EF}dp diff --git a/install/ubuntu/14.04/firewall.tar.gz b/install/ubuntu/14.04/firewall.tar.gz index ef878dc4bcf608dae111361d32a64fb22567248d..3eeeb373dc936d2d7fa14b2985c059ea34546739 100644 GIT binary patch delta 16 XcmbQqGLwZ}zMF%A{hRGZb|EGJBk}|K delta 16 XcmbQqGLwZ}zMF$#_B@-7>_SWcCFuk; diff --git a/install/ubuntu/14.04/packages.tar.gz b/install/ubuntu/14.04/packages.tar.gz index 3eff15094971ed39d1d74d3370322c1f4e3752d9..8bdafde82b251fc4c69ef1605b54cd6d2292f422 100644 GIT binary patch delta 16 XcmZ3@vYLfmzMF%A{hRGZb`>T7CNcyt delta 16 XcmZ3@vYLfmzMF$#_B@-7>?%wEC@BPM diff --git a/install/ubuntu/14.04/templates.tar.gz b/install/ubuntu/14.04/templates.tar.gz index a3b3ac7f364abadf3159205247493cfd075e8309..1308e254cb66e9398235493a98c90cdb0295cf64 100644 GIT binary patch delta 16 Xcmew!_dSkXzMF%A{hRGZ_5ytXIkyG% delta 16 Xcmew!_dSkXzMF$#_B@-7>;?J&JFW&W diff --git a/install/ubuntu/14.10/dovecot.tar.gz b/install/ubuntu/14.10/dovecot.tar.gz index d5e85d89edc6dd604373fef7f3eb917a96423034..e6a75fceda26c8f45e00a5ab11041623f695d642 100644 GIT binary patch delta 16 XcmbOwJxiKhzMF%A{hRGZ_Q|{eC!qwk delta 16 XcmbOwJxiKhzMF$#_B@-7?2~x`DVPND diff --git a/install/ubuntu/14.10/fail2ban.tar.gz b/install/ubuntu/14.10/fail2ban.tar.gz index 94979c51775d6e7d5b8de548b1782f854abc95d5..5d0c7c98012fdaa952af08dae7eaaac77bd792ee 100644 GIT binary patch delta 16 XcmX@adWe->zMF%A{hRGZ_T5YXDlP=~ delta 16 XcmX@adWe->zMF$#_B@-7?7Nu&EF}dp diff --git a/install/ubuntu/14.10/firewall.tar.gz b/install/ubuntu/14.10/firewall.tar.gz index ef878dc4bcf608dae111361d32a64fb22567248d..3eeeb373dc936d2d7fa14b2985c059ea34546739 100644 GIT binary patch delta 16 XcmbQqGLwZ}zMF%A{hRGZb|EGJBk}|K delta 16 XcmbQqGLwZ}zMF$#_B@-7>_SWcCFuk; diff --git a/install/ubuntu/14.10/packages.tar.gz b/install/ubuntu/14.10/packages.tar.gz index 3eff15094971ed39d1d74d3370322c1f4e3752d9..8bdafde82b251fc4c69ef1605b54cd6d2292f422 100644 GIT binary patch delta 16 XcmZ3@vYLfmzMF%A{hRGZb`>T7CNcyt delta 16 XcmZ3@vYLfmzMF$#_B@-7>?%wEC@BPM diff --git a/install/ubuntu/14.10/templates.tar.gz b/install/ubuntu/14.10/templates.tar.gz index 2e4ba5afe872ad215a493eb66656148c4bff7389..9fd8fccbc9359cd53f8c04e9296f12fb21283bee 100644 GIT binary patch delta 16 Xcmewn_aly7zMF%A{hRGZ_CkFCIoAdF delta 16 Xcmewn_aly7zMF$#_B@-7?1lOOJI)3( diff --git a/install/ubuntu/15.04/dovecot.tar.gz b/install/ubuntu/15.04/dovecot.tar.gz index d5e85d89edc6dd604373fef7f3eb917a96423034..e6a75fceda26c8f45e00a5ab11041623f695d642 100644 GIT binary patch delta 16 XcmbOwJxiKhzMF%A{hRGZ_Q|{eC!qwk delta 16 XcmbOwJxiKhzMF$#_B@-7?2~x`DVPND diff --git a/install/ubuntu/15.04/fail2ban.tar.gz b/install/ubuntu/15.04/fail2ban.tar.gz index 94979c51775d6e7d5b8de548b1782f854abc95d5..5d0c7c98012fdaa952af08dae7eaaac77bd792ee 100644 GIT binary patch delta 16 XcmX@adWe->zMF%A{hRGZ_T5YXDlP=~ delta 16 XcmX@adWe->zMF$#_B@-7?7Nu&EF}dp diff --git a/install/ubuntu/15.04/firewall.tar.gz b/install/ubuntu/15.04/firewall.tar.gz index ef878dc4bcf608dae111361d32a64fb22567248d..3eeeb373dc936d2d7fa14b2985c059ea34546739 100644 GIT binary patch delta 16 XcmbQqGLwZ}zMF%A{hRGZb|EGJBk}|K delta 16 XcmbQqGLwZ}zMF$#_B@-7>_SWcCFuk; diff --git a/install/ubuntu/15.04/packages.tar.gz b/install/ubuntu/15.04/packages.tar.gz index 3eff15094971ed39d1d74d3370322c1f4e3752d9..8bdafde82b251fc4c69ef1605b54cd6d2292f422 100644 GIT binary patch delta 16 XcmZ3@vYLfmzMF%A{hRGZb`>T7CNcyt delta 16 XcmZ3@vYLfmzMF$#_B@-7>?%wEC@BPM diff --git a/install/ubuntu/15.04/templates.tar.gz b/install/ubuntu/15.04/templates.tar.gz index bf57d3ccd5b53b5c4913005a4c11e8f15cea1129..0a457066c425828c4fc2aba34790a1788484f214 100644 GIT binary patch delta 16 XcmdlQzcrp+zMF%A{hRGZ_I3IIGLr?d delta 16 XcmdlQzcrp+zMF$#_B@-7?CbOaG>Qf6 From 5564a9a80b12c42bea2d00845eab8767bc7ef101 Mon Sep 17 00:00:00 2001 From: nguyenngocphuongnb Date: Sun, 8 Nov 2015 00:54:37 +0700 Subject: [PATCH 205/264] Remove invalid dot cause translation error --- web/inc/i18n/vi.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/web/inc/i18n/vi.php b/web/inc/i18n/vi.php index f3f224581..71a3b5edf 100644 --- a/web/inc/i18n/vi.php +++ b/web/inc/i18n/vi.php @@ -582,8 +582,7 @@ $LANG['vi'] = array( 'Select Bunch of Files' => 'Select Bunch of Files', 'Append File to the Current Selection' => 'Append File to the Current Selection', 'Select All Files' => 'Select All Files', - 'shortcuts are inspired by magnificent GNU Midnight Commander file manager' =>. - 'shortcuts are inspired by magnificent GNU Midnight Commander file manager', + 'shortcuts are inspired by magnificent GNU Midnight Commander file manager' => 'shortcuts are inspired by magnificent GNU Midnight Commander file manager', 'Licence Key' => 'Licence Key', 'Enter License Key' => 'Enter License Key', From d0cb9c6e07e1d06082b2535438a0bb73a4f499b5 Mon Sep 17 00:00:00 2001 From: nguyenngocphuongnb Date: Sun, 8 Nov 2015 01:25:11 +0700 Subject: [PATCH 206/264] Translate new version strings, re-translate some wrong programing-phrases --- web/inc/i18n/vi.php | 256 ++++++++++++++++++++++---------------------- 1 file changed, 128 insertions(+), 128 deletions(-) diff --git a/web/inc/i18n/vi.php b/web/inc/i18n/vi.php index 71a3b5edf..bff3650bb 100644 --- a/web/inc/i18n/vi.php +++ b/web/inc/i18n/vi.php @@ -53,18 +53,18 @@ $LANG['vi'] = array( 'Submit' => 'Gửi', 'toggle all' => 'chọn cả', - 'apply to selected' => 'thực hiện cho mục đã chọn', - 'rebuild' => 'dựng lại', - 'rebuild web' => 'dựng lại web', - 'rebuild dns' => 'dựng lại dns', - 'rebuild mail' => 'dựng lại mail', - 'rebuild db' => 'dựng lại cơ sở dữ liệu', - 'rebuild cron' => 'dựng lại cron', - 'update counters' => 'cập nhật bộ đếm', - 'suspend' => 'đình chỉ', - 'unsuspend' => 'hủy đình chỉ', - 'delete' => 'xóa', - 'show per user' => 'hiển thị theo người dùng', + 'apply to selected' => 'Hành động', + 'rebuild' => 'Build lại', + 'rebuild web' => 'Build lại web', + 'rebuild dns' => 'Build lại dns', + 'rebuild mail' => 'Build lại mail', + 'rebuild db' => 'Build lại cơ sở dữ liệu', + 'rebuild cron' => 'Build lại cron', + 'update counters' => 'Cập nhật bộ đếm', + 'suspend' => 'Đình chỉ', + 'unsuspend' => 'Hủy đình chỉ', + 'delete' => 'Xóa', + 'show per user' => 'Hiển thị theo người dùng', 'login as' => 'Đăng nhập như', 'logout' => 'thoát', 'edit' => 'sửa', @@ -467,132 +467,132 @@ $LANG['vi'] = array( 'MAIL_RESET_SUBJECT' => 'Khôi phục mật khẩu tại %s', 'PASSWORD_RESET_REQUEST' => "Để thiết lập lại mật khẩu quản trị, vui lòng truy cập vào địa chỉ:\nhttps://%s/reset/?action=confirm&user=%s&code=%s\n\nAlternatively, you may go to https://%s/reset/?action=code&user=%s và nhập mã sau:\n%s\n\nNếu bạn không thực hiện khôi phục mật khẩu, vui lòng bỏ qua email này.\n\n--\nVesta Control Panel\n", - 'Jan' => 'Jan', - 'Feb' => 'Feb', - 'Mar' => 'Mar', - 'Apr' => 'Apr', - 'May' => 'May', - 'Jun' => 'Jun', - 'Jul' => 'Jul', - 'Aug' => 'Aug', - 'Sep' => 'Sep', - 'Oct' => 'Oct', - 'Nov' => 'Nov', - 'Dec' => 'Dec', + 'Jan' => 'Tháng một', + 'Feb' => 'Tháng hai', + 'Mar' => 'Tháng ba', + 'Apr' => 'Tháng tư', + 'May' => 'Tháng 5', + 'Jun' => 'Tháng 6', + 'Jul' => 'Tháng 7', + 'Aug' => 'Tháng 8', + 'Sep' => 'Tháng 9', + 'Oct' => 'Tháng 10', + 'Nov' => 'Tháng 11', + 'Dec' => 'Tháng 12', - 'Configuring Server' => 'Configuring Server', - 'Hostname' => 'Hostname', - 'Time Zone' => 'Time Zone', - 'Default Language' => 'Default Language', - 'FileSystem Disk Quota' => 'FileSystem Disk Quota', + 'Configuring Server' => 'Cài đặt máy chủ', + 'Hostname' => 'Tên miền', + 'Time Zone' => 'Múi giờ', + 'Default Language' => 'Ngôn ngữ mặc đinhk', + 'FileSystem Disk Quota' => 'Hạn mức dung lượng đĩa hệ thống', 'Vesta Control Panel Plugins' => 'Vesta Control Panel Plugins', - 'preview' => 'preview', - 'Reseller Role' => 'Reseller Role', - 'Web Config Editor' => 'Web Config Editor', - 'Template Manager' => 'Template Manager', - 'Backup Migration Manager' => 'Backup Migration Manager', + 'preview' => 'xem trước', + 'Reseller Role' => 'Vai trò đại lý', + 'Web Config Editor' => 'Chỉnh sửa cấu hình web', + 'Template Manager' => 'Quản lý mẫu', + 'Backup Migration Manager' => 'Quản lý tích hợp sao lưu', 'FileManager' => 'FileManager', - 'show: CPU / MEM / NET / DISK' => 'show: CPU / MEM / NET / DISK', + 'show: CPU / MEM / NET / DISK' => 'hiển thị: CPU / MEM / NET / DISK', - 'sort by' => 'sort by', - 'Date' => 'Date', - 'Starred' => 'Starred', - 'Name' => 'Name', + 'sort by' => 'xếp theo', + 'Date' => 'Ngày', + 'Starred' => 'Đánh dấu', + 'Name' => 'Tên', - 'File Manager' => 'File Manager', - 'type' => 'type', - 'size' => 'size', - 'date' => 'date', - 'name' => 'name', - 'Initializing' => 'Initializing', - 'UPLOAD' => 'UPLOAD', - 'NEW FILE' => 'NEW FILE', - 'NEW DIR' => 'NEW DIR', - 'DELETE' => 'DELETE', - 'RENAME' => 'RENAME', - 'COPY' => 'COPY', - 'ARCHIVE' => 'ARCHIVE', - 'EXTRACT' => 'EXTRACT', - 'DOWNLOAD' => 'DOWNLOAD', - 'Hit' => 'Hit', - 'to reload the page' => 'to reload the page', - 'Directory name cannot be empty' => 'Directory name cannot be empty', - 'File name cannot be empty' => 'File name cannot be empty', - 'No file selected' => 'No file selected', - 'No file or folder selected' => 'No file or folder selected', - 'File type not supported' => 'File type not supported', - 'Directory download not available in current version' => 'Directory download not available in current version', - 'Directory not available' => 'Directory not available', - 'Done' => 'Done', - 'Close' => 'Close', - 'Copy' => 'Copy', - 'Cancel' => 'Cancel', - 'Rename' => 'Rename', - 'Delete' => 'Delete', - 'Extract' => 'Extract', - 'Create' => 'Create', - 'Compress' => 'Compress', + 'File Manager' => 'Quản lý tệp', + 'type' => 'loại', + 'size' => 'dung lượng', + 'date' => 'ngày', + 'name' => 'tên', + 'Initializing' => 'Khởi tạo', + 'UPLOAD' => 'Tải lên', + 'NEW FILE' => 'Thêm tệp mới', + 'NEW DIR' => 'Thêm thư mục mới', + 'DELETE' => 'XÓA', + 'RENAME' => 'ĐỔI TÊN', + 'COPY' => 'SAO CHÉP', + 'ARCHIVE' => 'NÉN', + 'EXTRACT' => 'GIẢI NÉN', + 'DOWNLOAD' => 'TẢI VỀ', + 'Hit' => 'Lượt', + 'to reload the page' => 'để tải lại trang', + 'Directory name cannot be empty' => 'Tên thư mục không thể để trống', + 'File name cannot be empty' => 'Tên tệp không thể để trống', + 'No file selected' => 'Không có tệp nào được chọn', + 'No file or folder selected' => 'Không có tệp hoặc thư mục nào được chọn', + 'File type not supported' => 'Loại tệp không được hỗ trợ', + 'Directory download not available in current version' => 'Phiên bản hiện tại không hỗ trợ tải thư mục', + 'Directory not available' => 'Thư mục không sẵn sàng', + 'Done' => 'Xong', + 'Close' => 'Đóng', + 'Copy' => 'Sao chép', + 'Cancel' => 'Hủy', + 'Rename' => 'Đổi tên', + 'Delete' => 'Xóa', + 'Extract' => 'Giải nén', + 'Create' => 'Tạo mới', + 'Compress' => 'Nén', 'OK' => 'OK', - 'Are you sure you want to copy' => 'Are you sure you want to copy', - 'Are you sure you want to delete' => 'Are you sure you want to delete', + 'Are you sure you want to copy' => 'Bạn có chắc chắn muốn sao chép', + 'Are you sure you want to delete' => 'Bạn có chắc chắn muốn xóa', 'into' => 'into', - 'existing files will be replaced' => 'existing files will be replaced', - 'Original name' => 'Original name', - 'File' => 'File', - 'already exists' => 'already exists', - 'Create file' => 'Create file', - 'Create directory' => 'Create directory', + 'existing files will be replaced' => 'tệp tồn tại sẽ được ghi đè', + 'Original name' => 'Tên gốc', + 'File' => 'Tệp', + 'already exists' => 'đã tồn tại', + 'Create file' => 'Tạo tệp', + 'Create directory' => 'Tạo thư mục', - 'Add New object' => 'Add New object', - 'Save Form' => 'Save Form', - 'Cancel saving form' => 'Cancel saving form', - 'Go to USER list' => 'Go to USER list', - 'Go to WEB list' => 'Go to WEB list', - 'Go to DNS list' => 'Go to DNS list', - 'Go to MAIL list' => 'Go to MAIL list', - 'Go to DB list' => 'Go to DB list', - 'Go to CRON list' => 'Go to CRON list', - 'Go to BACKUP list' => 'Go to BACKUP list', - 'Focus on search' => 'Focus on search', - 'Display/Close shortcuts' => 'Display/Close shortcuts', - 'Move backward through top menu' => 'Move backward through top menu', - 'Move forward through top menu' => 'Move forward through top menu', - 'Enter focused element' => 'Enter focused element', + 'Add New object' => 'Thêm đối tượng mới', + 'Save Form' => 'Lưu form', + 'Cancel saving form' => 'Hủy lưu form', + 'Go to USER list' => 'Đi đến danh sách thành viên', + 'Go to WEB list' => 'Đi đến danh sách web', + 'Go to DNS list' => 'Đi đến danh sách dns', + 'Go to MAIL list' => 'Đi đến danh sách mail', + 'Go to DB list' => 'Đi đến danh sách csdl', + 'Go to CRON list' => 'Đi đến danh sách tiến trình tự động', + 'Go to BACKUP list' => 'Đi đến danh sách backup', + 'Focus on search' => 'Focus vào tìm kiếm', + 'Display/Close shortcuts' => 'Hiển thị/Đóng phím tắt', + 'Move backward through top menu' => 'Di chuyển ngược trên Top Menu', + 'Move forward through top menu' => 'Di chuyển xuôi trên Top Menu', + 'Enter focused element' => 'Nhập vào phần tử focus', - 'Upload' => 'Upload', - 'New File' => 'New File', - 'New Folder' => 'New Folder', - 'Download' => 'Download', - 'Rename' => 'Rename', - 'Copy' => 'Copy', - 'Archive' => 'Archive', - 'Delete' => 'Delete', - 'Save File (in text editor)' => 'Save File (in text editor)', - 'Close Popup / Cancel' => 'Close Popup / Cancel', - 'Move Cursor Up' => 'Move Cursor Up', - 'Move Cursor Dow' => 'Move Cursor Dow', - 'Switch to Left Tab' => 'Switch to Left Tab', - 'Switch to Right Tab' => 'Switch to Right Tab', - 'Switch Tab' => 'Switch Tab', - 'Go to the Top of File List' => 'Go to the Top of File List', - 'Go to the Last File' => 'Go to the Last File', - 'Open File/Enter Directory' => 'Open File/Enter Directory', - 'Go to Parent Directory' => 'Go to Parent Directory', - 'Select Current File' => 'Select Current File', - 'Select Bunch of Files' => 'Select Bunch of Files', - 'Append File to the Current Selection' => 'Append File to the Current Selection', - 'Select All Files' => 'Select All Files', + 'Upload' => 'Tải lên', + 'New File' => 'Tạo tệp', + 'New Folder' => 'Tạo thư mục', + 'Download' => 'Tải về', + 'Rename' => 'Đổi tên', + 'Copy' => 'Sao chép', + 'Archive' => 'Lưu trữ', + 'Delete' => 'Xóa', + 'Save File (in text editor)' => 'Lưu tệp (Trong trình chỉnh sửa văn bản)', + 'Close Popup / Cancel' => 'Đóng Popup / Hủy', + 'Move Cursor Up' => 'Di chuyển chuột lên', + 'Move Cursor Dow' => 'Di chuyển chuột xuống', + 'Switch to Left Tab' => 'Chuyển sang tab trái', + 'Switch to Right Tab' => 'Chuyển sang tab phải', + 'Switch Tab' => 'Chuyển đổi Tab', + 'Go to the Top of File List' => 'Lên đầu danh sách tệp', + 'Go to the Last File' => 'Di chuyển đến tệp cuối cùng', + 'Open File/Enter Directory' => 'Mở tệp/Truy cập thư mục', + 'Go to Parent Directory' => 'Về thư mục cha', + 'Select Current File' => 'Chọn tệp hiện tại', + 'Select Bunch of Files' => 'Chọn nhiều tệp', + 'Append File to the Current Selection' => 'Thêm tệp vào lựa chọn hiện tại', + 'Select All Files' => 'Chọn tất cả các tệp', 'shortcuts are inspired by magnificent GNU Midnight Commander file manager' => 'shortcuts are inspired by magnificent GNU Midnight Commander file manager', - 'Licence Key' => 'Licence Key', - 'Enter License Key' => 'Enter License Key', - 'Buy Licence' => 'Buy Licence', - 'Buy Lifetime License' => 'Buy Lifetime License', - 'Disable and Cancel Licence' => 'Disable and Cancel Licence', - 'Licence Activated' => 'Licence Activated', - 'Licence Deactivated' => 'Licence Deactivated', - 'Restrict users so that they cannot use SSH and access only their home directory.' => 'Restrict users so that they cannot use SSH and access only their home directory.', - 'Browse, copy, edit, view, and retrieve all of your web domain files using fully featured File Manager.' => 'Browse, copy, edit, view, and retrieve all of your web domain files using fully featured File Manager.', - 'This is a commercial module, you would need to purchace license key to enable it.' => 'This is a commercial module, you would need to purchace license key to enable it.' + 'Licence Key' => 'Khóa bản quyền', + 'Enter License Key' => 'Nhập Khóa bản quyền', + 'Buy Licence' => 'Mua bản quyền', + 'Buy Lifetime License' => 'Mua bản quyền trọn đời', + 'Disable and Cancel Licence' => 'Vô hiệu hoá và Hủy bỏ Giấy phép Bản Quyền', + 'Licence Activated' => 'Bản quyền đã được kích hoạt', + 'Licence Deactivated' => 'Bản quyền đã bị hủy kích hoạt', + 'Restrict users so that they cannot use SSH and access only their home directory.' => 'Hạn chế người dùng không thể dùng SSH và chỉ có thể truy cập thư mục home của họ.', + 'Browse, copy, edit, view, and retrieve all of your web domain files using fully featured File Manager.' => 'Duyệt tệp, sao chép, chỉnh sửa, xem, và lấy tất cả các tệp tin từ tất cả các tên miền của bạn bằng cách sử dụng trình quản lý tệp tin đầy đủ tính năng.', + 'This is a commercial module, you would need to purchace license key to enable it.' => 'Đây là một module thương mại, bạn sẽ cần phải mua key bản quyền để kích hoạt nó.' ); From e3ca4ba5fe615f8e348fb618591fec42b98b9050 Mon Sep 17 00:00:00 2001 From: nguyenngocphuongnb Date: Sun, 8 Nov 2015 01:27:28 +0700 Subject: [PATCH 207/264] Translation optimization --- web/inc/i18n/vi.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/inc/i18n/vi.php b/web/inc/i18n/vi.php index bff3650bb..8c7292371 100644 --- a/web/inc/i18n/vi.php +++ b/web/inc/i18n/vi.php @@ -456,7 +456,7 @@ $LANG['vi'] = array( 'Database Credentials' => 'Thông tin CSDL', 'DATABASE_READY' => "Tạo thành công CSDL.\n\nDatabase: %s\nNgười dùng: %s\nMật khẩu: %s\n%s\n\n--\nVesta Control Panel\n", - 'forgot password' => 'quên mật khẩu', + 'forgot password' => 'Quên mật khẩu', 'Confirm' => 'Xác nhận', 'New Password' => 'Mật khẩu mới', 'Confirm Password' => 'Xác nhận mật khẩu', From d94a5dee5a3d859959e806641cf10f0b3cb72ff2 Mon Sep 17 00:00:00 2001 From: nguyenngocphuongnb Date: Sun, 8 Nov 2015 02:16:10 +0700 Subject: [PATCH 208/264] Lowercase large string --- web/inc/i18n/vi.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/web/inc/i18n/vi.php b/web/inc/i18n/vi.php index 8c7292371..5b04a74bf 100644 --- a/web/inc/i18n/vi.php +++ b/web/inc/i18n/vi.php @@ -501,19 +501,19 @@ $LANG['vi'] = array( 'File Manager' => 'Quản lý tệp', 'type' => 'loại', - 'size' => 'dung lượng', + 'size' => 'size', 'date' => 'ngày', 'name' => 'tên', 'Initializing' => 'Khởi tạo', 'UPLOAD' => 'Tải lên', 'NEW FILE' => 'Thêm tệp mới', 'NEW DIR' => 'Thêm thư mục mới', - 'DELETE' => 'XÓA', - 'RENAME' => 'ĐỔI TÊN', - 'COPY' => 'SAO CHÉP', - 'ARCHIVE' => 'NÉN', - 'EXTRACT' => 'GIẢI NÉN', - 'DOWNLOAD' => 'TẢI VỀ', + 'DELETE' => 'Xóa', + 'RENAME' => 'Đổi tên', + 'COPY' => 'Sao chép', + 'ARCHIVE' => 'Nén', + 'EXTRACT' => 'Giải nén', + 'DOWNLOAD' => 'Tải về', 'Hit' => 'Lượt', 'to reload the page' => 'để tải lại trang', 'Directory name cannot be empty' => 'Tên thư mục không thể để trống', From 5604a90870d3b0efc3f82f802ef8b3b66e95ce5a Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Sun, 8 Nov 2015 21:27:49 +0200 Subject: [PATCH 209/264] installer update (fail2ban) --- .gitignore | 1 + install/debian/7/dovecot.tar.gz | Bin 3482 -> 3482 bytes install/debian/7/fail2ban.tar.gz | Bin 706 -> 706 bytes install/debian/7/firewall.tar.gz | Bin 537 -> 537 bytes install/debian/7/packages.tar.gz | Bin 555 -> 555 bytes install/debian/7/templates.tar.gz | Bin 12114 -> 12114 bytes install/debian/8/dovecot.tar.gz | Bin 3482 -> 3482 bytes install/debian/8/fail2ban.tar.gz | Bin 706 -> 706 bytes install/debian/8/firewall.tar.gz | Bin 537 -> 537 bytes install/debian/8/packages.tar.gz | Bin 555 -> 555 bytes install/debian/8/templates.tar.gz | Bin 12217 -> 12217 bytes install/rhel/5/dovecot.tar.gz | Bin 474 -> 474 bytes install/rhel/5/fail2ban.tar.gz | Bin 693 -> 693 bytes install/rhel/5/firewall.tar.gz | Bin 537 -> 537 bytes install/rhel/5/packages.tar.gz | Bin 530 -> 530 bytes install/rhel/5/templates.tar.gz | Bin 12051 -> 12051 bytes install/rhel/6/dovecot.tar.gz | Bin 2640 -> 2640 bytes install/rhel/6/fail2ban.tar.gz | Bin 693 -> 693 bytes install/rhel/6/firewall.tar.gz | Bin 537 -> 537 bytes install/rhel/6/packages.tar.gz | Bin 530 -> 530 bytes install/rhel/6/templates.tar.gz | Bin 12051 -> 12051 bytes install/rhel/7/dovecot.tar.gz | Bin 2641 -> 2641 bytes install/rhel/7/fail2ban.tar.gz | Bin 693 -> 693 bytes install/rhel/7/firewall.tar.gz | Bin 537 -> 537 bytes install/rhel/7/packages.tar.gz | Bin 530 -> 530 bytes install/rhel/7/templates.tar.gz | Bin 12248 -> 12248 bytes install/ubuntu/12.04/dovecot.tar.gz | Bin 3440 -> 3440 bytes install/ubuntu/12.04/fail2ban.tar.gz | Bin 708 -> 708 bytes install/ubuntu/12.04/firewall.tar.gz | Bin 531 -> 531 bytes install/ubuntu/12.04/packages.tar.gz | Bin 541 -> 541 bytes install/ubuntu/12.04/templates.tar.gz | Bin 11940 -> 11946 bytes .../12.04/templates/web/apache2/basedir.stpl | 2 +- .../12.04/templates/web/apache2/basedir.tpl | 2 +- .../12.04/templates/web/apache2/default.stpl | 2 +- .../12.04/templates/web/apache2/default.tpl | 2 +- .../12.04/templates/web/apache2/hosting.stpl | 2 +- .../12.04/templates/web/apache2/hosting.tpl | 2 +- .../12.04/templates/web/apache2/phpcgi.stpl | 2 +- .../12.04/templates/web/apache2/phpcgi.tpl | 2 +- .../12.04/templates/web/apache2/phpfcgid.stpl | 2 +- .../12.04/templates/web/apache2/phpfcgid.tpl | 2 +- install/ubuntu/12.10/dovecot.tar.gz | Bin 3440 -> 3440 bytes install/ubuntu/12.10/fail2ban.tar.gz | Bin 708 -> 708 bytes install/ubuntu/12.10/firewall.tar.gz | Bin 531 -> 531 bytes install/ubuntu/12.10/packages.tar.gz | Bin 541 -> 541 bytes install/ubuntu/12.10/templates.tar.gz | Bin 11941 -> 11948 bytes .../12.10/templates/web/apache2/basedir.stpl | 2 +- .../12.10/templates/web/apache2/basedir.tpl | 2 +- .../12.10/templates/web/apache2/default.stpl | 2 +- .../12.10/templates/web/apache2/default.tpl | 2 +- .../12.10/templates/web/apache2/hosting.stpl | 2 +- .../12.10/templates/web/apache2/hosting.tpl | 2 +- .../12.10/templates/web/apache2/phpcgi.stpl | 2 +- .../12.10/templates/web/apache2/phpcgi.tpl | 2 +- .../12.10/templates/web/apache2/phpfcgid.stpl | 2 +- .../12.10/templates/web/apache2/phpfcgid.tpl | 2 +- install/ubuntu/13.04/dovecot.tar.gz | Bin 3440 -> 3440 bytes install/ubuntu/13.04/fail2ban.tar.gz | Bin 708 -> 708 bytes install/ubuntu/13.04/firewall.tar.gz | Bin 531 -> 531 bytes install/ubuntu/13.04/packages.tar.gz | Bin 541 -> 541 bytes install/ubuntu/13.04/templates.tar.gz | Bin 11941 -> 11949 bytes .../13.04/templates/web/apache2/basedir.stpl | 2 +- .../13.04/templates/web/apache2/basedir.tpl | 2 +- .../13.04/templates/web/apache2/default.stpl | 2 +- .../13.04/templates/web/apache2/default.tpl | 2 +- .../13.04/templates/web/apache2/hosting.stpl | 2 +- .../13.04/templates/web/apache2/hosting.tpl | 2 +- .../13.04/templates/web/apache2/phpcgi.stpl | 2 +- .../13.04/templates/web/apache2/phpcgi.tpl | 2 +- .../13.04/templates/web/apache2/phpfcgid.stpl | 2 +- .../13.04/templates/web/apache2/phpfcgid.tpl | 2 +- install/ubuntu/13.10/dovecot.tar.gz | Bin 3440 -> 3440 bytes install/ubuntu/13.10/fail2ban.tar.gz | Bin 708 -> 708 bytes install/ubuntu/13.10/firewall.tar.gz | Bin 531 -> 531 bytes install/ubuntu/13.10/packages.tar.gz | Bin 541 -> 541 bytes install/ubuntu/13.10/templates.tar.gz | Bin 11944 -> 11944 bytes install/ubuntu/14.04/dovecot.tar.gz | Bin 3482 -> 3482 bytes install/ubuntu/14.04/fail2ban.tar.gz | Bin 706 -> 706 bytes install/ubuntu/14.04/firewall.tar.gz | Bin 537 -> 537 bytes install/ubuntu/14.04/packages.tar.gz | Bin 555 -> 555 bytes install/ubuntu/14.04/templates.tar.gz | Bin 12151 -> 12151 bytes install/ubuntu/14.10/dovecot.tar.gz | Bin 3482 -> 3482 bytes install/ubuntu/14.10/fail2ban.tar.gz | Bin 706 -> 706 bytes install/ubuntu/14.10/firewall.tar.gz | Bin 537 -> 537 bytes install/ubuntu/14.10/packages.tar.gz | Bin 555 -> 555 bytes install/ubuntu/14.10/templates.tar.gz | Bin 12152 -> 12152 bytes install/ubuntu/15.04/dovecot.tar.gz | Bin 3482 -> 3482 bytes install/ubuntu/15.04/fail2ban.tar.gz | Bin 706 -> 706 bytes install/ubuntu/15.04/firewall.tar.gz | Bin 537 -> 537 bytes install/ubuntu/15.04/packages.tar.gz | Bin 555 -> 555 bytes install/ubuntu/15.04/templates.tar.gz | Bin 12213 -> 12213 bytes install/vst-install-debian.sh | 4 ++-- install/vst-install-rhel.sh | 4 ++-- install/vst-install-ubuntu.sh | 4 ++-- 94 files changed, 37 insertions(+), 36 deletions(-) diff --git a/.gitignore b/.gitignore index 980bc5b3c..d6ed513fa 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ *.tar *.zip *.gzip +*.gz diff --git a/install/debian/7/dovecot.tar.gz b/install/debian/7/dovecot.tar.gz index 91a55bc093d6905896b919e715ef242c36f92168..64d371a5c2d31804be20e6c6ec4ccc4a4e3c1563 100644 GIT binary patch delta 16 XcmbOwJxiKhzMF%gQOIs1`($1KC8PvR delta 16 XcmbOwJxiKhzMF%A^PBBP_Q|{eC$9v! diff --git a/install/debian/7/fail2ban.tar.gz b/install/debian/7/fail2ban.tar.gz index a2bf42b72a712b2f3b62b19a855c48a79446d1db..79690627865580395155df37826a118119860e6a 100644 GIT binary patch delta 16 XcmX@adWe->zMF%gQOIs1`)(!xC@}<% delta 16 XcmX@adWe->zMF%A^PBBP_T5YXDm(=F diff --git a/install/debian/7/firewall.tar.gz b/install/debian/7/firewall.tar.gz index a98e20010cefd94c0707d0c8958caaf9da57b678..b0f3f81c54b28176fd5cfa98df68e6deb455c8f7 100644 GIT binary patch delta 16 XcmbQqGLwZ}zMF%gQOIs1yATrqA@u{1 delta 16 XcmbQqGLwZ}zMF%A^PBBPb|EGJBme{a diff --git a/install/debian/7/packages.tar.gz b/install/debian/7/packages.tar.gz index c692568f12fb2569c24adac07ad20b1335db297a..5c834ca699884c11a074b1b035086cecd5a35039 100644 GIT binary patch delta 16 XcmZ3@vYLfmzMF%gQOIs1y9yHkBsBxa delta 16 XcmZ3@vYLfmzMF%A^PBBPb`>T7CO`x- diff --git a/install/debian/7/templates.tar.gz b/install/debian/7/templates.tar.gz index 3da0cec2c3530ff2eb90a4243b809f2bd3d41817..0dd30d9d44a14755aeec9eaf69c0ef797505eb77 100644 GIT binary patch delta 16 XcmcZzMF%gQOIs1`)(!xC@}<% delta 16 XcmX@adWe->zMF%A^PBBP_T5YXDm(=F diff --git a/install/debian/8/firewall.tar.gz b/install/debian/8/firewall.tar.gz index a98e20010cefd94c0707d0c8958caaf9da57b678..b0f3f81c54b28176fd5cfa98df68e6deb455c8f7 100644 GIT binary patch delta 16 XcmbQqGLwZ}zMF%gQOIs1yATrqA@u{1 delta 16 XcmbQqGLwZ}zMF%A^PBBPb|EGJBme{a diff --git a/install/debian/8/packages.tar.gz b/install/debian/8/packages.tar.gz index c692568f12fb2569c24adac07ad20b1335db297a..5c834ca699884c11a074b1b035086cecd5a35039 100644 GIT binary patch delta 16 XcmZ3@vYLfmzMF%gQOIs1y9yHkBsBxa delta 16 XcmZ3@vYLfmzMF%A^PBBPb`>T7CO`x- diff --git a/install/debian/8/templates.tar.gz b/install/debian/8/templates.tar.gz index 0f1c99e8797b4f58d0cd091856407e7f1e6862f9..e10686f2e32fdade54f9ee475617212d77aa067e 100644 GIT binary patch delta 16 XcmdlPzcZd)zMF%gQOIs1`zCz=F%|_> delta 16 XcmdlPzcZd)zMF%A^PBBP_D%W#Ga&`P diff --git a/install/rhel/5/dovecot.tar.gz b/install/rhel/5/dovecot.tar.gz index c17fafea87296e6e34194a4991e10a7b11b4b618..4b36a9b9cb45fa8778cf4cfbd825d96812ed6df3 100644 GIT binary patch delta 16 Xcmcb`e2bY~zMF%gPRMQ}`(;J|D&qvs delta 16 Xcmcb`e2bY~zMF%A<(utB_REX_EZ_w< diff --git a/install/rhel/5/fail2ban.tar.gz b/install/rhel/5/fail2ban.tar.gz index 42dbaba599012020d47efb4011c2ed6a7ca57cbb..833b186d64be5345fbbf8e0fb17c210b0a896c09 100644 GIT binary patch delta 16 XcmdnWx|Nk(zMF%gPRMQ}`#L57CVT{B delta 16 XcmdnWx|Nk(zMF%A<(utB_H|4ED0u|U diff --git a/install/rhel/5/firewall.tar.gz b/install/rhel/5/firewall.tar.gz index dcef27e676bd8ef209a59a7deb8ee05215923b7d..1e5578bb04cc75e946549c8abdbdeb6c4a8b5469 100644 GIT binary patch delta 16 XcmbQqGLwZ}zMF%gPRMQ}yATrqA>ad! delta 16 XcmbQqGLwZ}zMF%A<(utBb|EGJBi#e{ diff --git a/install/rhel/5/packages.tar.gz b/install/rhel/5/packages.tar.gz index da37c520ee899ff77144628200b094c7fe5b9f4b..956ebd36671869a07155cfc8c8c664e06c1f6a04 100644 GIT binary patch delta 16 XcmbQlGKqy5IEg}TQ diff --git a/install/rhel/6/dovecot.tar.gz b/install/rhel/6/dovecot.tar.gz index 3ce714be0cac0b1434d23f24e37f95b68c13d786..f3b19a59c3e94f4913b8191ef8ccd6fb23fde9ed 100644 GIT binary patch delta 16 Xcmca0azTV$zMF%gPRMQ}yC)X_Du@JI delta 16 Xcmca0azTV$zMF%A<(utBc26zad! delta 16 XcmbQqGLwZ}zMF%A<(utBb|EGJBi#e{ diff --git a/install/rhel/6/packages.tar.gz b/install/rhel/6/packages.tar.gz index da37c520ee899ff77144628200b094c7fe5b9f4b..956ebd36671869a07155cfc8c8c664e06c1f6a04 100644 GIT binary patch delta 16 XcmbQlGKqy5IEg}TQ diff --git a/install/rhel/7/dovecot.tar.gz b/install/rhel/7/dovecot.tar.gz index da2560979aef9cec1ddd79bc0fb1216ac89c3e48..0b73120fd689d2c5fe381a32bf56049716c0297a 100644 GIT binary patch delta 16 Xcmca8a#4g`zMF%gPRMQ}yB8M#DyRfr delta 16 Xcmca8a#4g`zMF%A<(utBb}udfETsg; diff --git a/install/rhel/7/fail2ban.tar.gz b/install/rhel/7/fail2ban.tar.gz index 42dbaba599012020d47efb4011c2ed6a7ca57cbb..833b186d64be5345fbbf8e0fb17c210b0a896c09 100644 GIT binary patch delta 16 XcmdnWx|Nk(zMF%gPRMQ}`#L57CVT{B delta 16 XcmdnWx|Nk(zMF%A<(utB_H|4ED0u|U diff --git a/install/rhel/7/firewall.tar.gz b/install/rhel/7/firewall.tar.gz index dcef27e676bd8ef209a59a7deb8ee05215923b7d..1e5578bb04cc75e946549c8abdbdeb6c4a8b5469 100644 GIT binary patch delta 16 XcmbQqGLwZ}zMF%gPRMQ}yATrqA>ad! delta 16 XcmbQqGLwZ}zMF%A<(utBb|EGJBi#e{ diff --git a/install/rhel/7/packages.tar.gz b/install/rhel/7/packages.tar.gz index da37c520ee899ff77144628200b094c7fe5b9f4b..956ebd36671869a07155cfc8c8c664e06c1f6a04 100644 GIT binary patch delta 16 XcmbQlGKqyv diff --git a/install/ubuntu/12.04/packages.tar.gz b/install/ubuntu/12.04/packages.tar.gz index 15e18e83612b7eb00e6bb2d9257d23a09456d69c..d5c13c4689c1411c7676186d149ba56ff2454245 100644 GIT binary patch delta 16 XcmbQsGM9y2zMF%gUdV1EyBHGyB4-1e delta 16 XcmbQsGM9y2zMF%A?VIgJb}=RZBx?i( diff --git a/install/ubuntu/12.04/templates.tar.gz b/install/ubuntu/12.04/templates.tar.gz index bdeab7f5b5072258daf4b8806bb0199162d4fe39..44073e7682e489f23714b7263027e8979b46a1a1 100644 GIT binary patch delta 5962 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 diff --git a/install/ubuntu/12.04/templates/web/apache2/basedir.stpl b/install/ubuntu/12.04/templates/web/apache2/basedir.stpl index 3f71e6999..96de57af7 100755 --- a/install/ubuntu/12.04/templates/web/apache2/basedir.stpl +++ b/install/ubuntu/12.04/templates/web/apache2/basedir.stpl @@ -35,7 +35,7 @@ AssignUserID %user% %group% - IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/s%web_system%.%domain%.conf* diff --git a/install/ubuntu/12.04/templates/web/apache2/basedir.tpl b/install/ubuntu/12.04/templates/web/apache2/basedir.tpl index 75daf0e10..07ec38c98 100755 --- a/install/ubuntu/12.04/templates/web/apache2/basedir.tpl +++ b/install/ubuntu/12.04/templates/web/apache2/basedir.tpl @@ -29,7 +29,7 @@ AssignUserID %user% %group% - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/%web_system%.%domain%.conf* diff --git a/install/ubuntu/12.04/templates/web/apache2/default.stpl b/install/ubuntu/12.04/templates/web/apache2/default.stpl index e884a95b9..da523c138 100755 --- a/install/ubuntu/12.04/templates/web/apache2/default.stpl +++ b/install/ubuntu/12.04/templates/web/apache2/default.stpl @@ -34,7 +34,7 @@ AssignUserID %user% %group% - IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/s%web_system%.%domain%.conf* diff --git a/install/ubuntu/12.04/templates/web/apache2/default.tpl b/install/ubuntu/12.04/templates/web/apache2/default.tpl index 073724ce0..b95c1ee38 100755 --- a/install/ubuntu/12.04/templates/web/apache2/default.tpl +++ b/install/ubuntu/12.04/templates/web/apache2/default.tpl @@ -28,7 +28,7 @@ AssignUserID %user% %group% - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/%web_system%.%domain%.conf* diff --git a/install/ubuntu/12.04/templates/web/apache2/hosting.stpl b/install/ubuntu/12.04/templates/web/apache2/hosting.stpl index 7a5d7787f..c1c91e22e 100755 --- a/install/ubuntu/12.04/templates/web/apache2/hosting.stpl +++ b/install/ubuntu/12.04/templates/web/apache2/hosting.stpl @@ -43,7 +43,7 @@ AssignUserID %user% %group% - IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/s%web_system%.%domain%.conf* diff --git a/install/ubuntu/12.04/templates/web/apache2/hosting.tpl b/install/ubuntu/12.04/templates/web/apache2/hosting.tpl index ab844dc74..8f3ec012a 100755 --- a/install/ubuntu/12.04/templates/web/apache2/hosting.tpl +++ b/install/ubuntu/12.04/templates/web/apache2/hosting.tpl @@ -37,7 +37,7 @@ AssignUserID %user% %group% - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/%web_system%.%domain%.conf* diff --git a/install/ubuntu/12.04/templates/web/apache2/phpcgi.stpl b/install/ubuntu/12.04/templates/web/apache2/phpcgi.stpl index aa5137308..58c4baf90 100755 --- a/install/ubuntu/12.04/templates/web/apache2/phpcgi.stpl +++ b/install/ubuntu/12.04/templates/web/apache2/phpcgi.stpl @@ -29,7 +29,7 @@ SSLCertificateKeyFile %ssl_key% %ssl_ca_str%SSLCertificateChainFile %ssl_ca% - IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/s%web_system%.%domain%.conf* diff --git a/install/ubuntu/12.04/templates/web/apache2/phpcgi.tpl b/install/ubuntu/12.04/templates/web/apache2/phpcgi.tpl index a05ff252d..21be2cdd7 100755 --- a/install/ubuntu/12.04/templates/web/apache2/phpcgi.tpl +++ b/install/ubuntu/12.04/templates/web/apache2/phpcgi.tpl @@ -22,7 +22,7 @@ AllowOverride All - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/%web_system%.%domain%.conf* diff --git a/install/ubuntu/12.04/templates/web/apache2/phpfcgid.stpl b/install/ubuntu/12.04/templates/web/apache2/phpfcgid.stpl index 622495756..20a580093 100755 --- a/install/ubuntu/12.04/templates/web/apache2/phpfcgid.stpl +++ b/install/ubuntu/12.04/templates/web/apache2/phpfcgid.stpl @@ -30,7 +30,7 @@ SSLCertificateKeyFile %ssl_key% %ssl_ca_str%SSLCertificateChainFile %ssl_ca% - IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/s%web_system%.%domain%.conf* diff --git a/install/ubuntu/12.04/templates/web/apache2/phpfcgid.tpl b/install/ubuntu/12.04/templates/web/apache2/phpfcgid.tpl index 5c1f16e20..72e7d8d44 100755 --- a/install/ubuntu/12.04/templates/web/apache2/phpfcgid.tpl +++ b/install/ubuntu/12.04/templates/web/apache2/phpfcgid.tpl @@ -22,7 +22,7 @@ AllowOverride All - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/%web_system%.%domain%.conf* diff --git a/install/ubuntu/12.10/dovecot.tar.gz b/install/ubuntu/12.10/dovecot.tar.gz index 40d9292b290829293805bffe50bdcb3ceb09e096..381067f701ad8e6b4cfd971db06d4d8f105dc4ca 100644 GIT binary patch delta 16 Xcmew$^+AeVzMF%gUdV1EdnPXcFFFLv delta 16 Xcmew$^+AeVzMF%A?VIgJ_Do&?F+K$~ diff --git a/install/ubuntu/12.10/fail2ban.tar.gz b/install/ubuntu/12.10/fail2ban.tar.gz index 9ea57f7707afd199623ad0ef47e2080854a7186e..9067be54eb29bff5bbb5f723b8b1847ebcf47cc1 100644 GIT binary patch delta 16 XcmX@YdW4l-zMF%gUdV1E`(7phC}RYY delta 16 XcmX@YdW4l-zMF%A?VIgJ_PtC1DrW@z diff --git a/install/ubuntu/12.10/firewall.tar.gz b/install/ubuntu/12.10/firewall.tar.gz index dce4fe075572b47ef1bf3c52042e52eb735997f1..4fb82efce206fc8eed897eefdeb774c910bccb1a 100644 GIT binary patch delta 16 XcmbQtGMR;4zMF%gUdV1EI}Z~8AtwWU delta 16 XcmbQtGMR;4zMF%A{hRGZb{-}GBQgW% diff --git a/install/ubuntu/12.10/packages.tar.gz b/install/ubuntu/12.10/packages.tar.gz index d17f37f21178cb584f08ae81e1ad821be31905b2..e6c3a06712e86cc0959b243e250e8f1228e2852a 100644 GIT binary patch delta 16 XcmbQsGM9y2zMF%gLC9_+yBHGyB5nhm delta 16 XcmbQsGM9y2zMF%A{hRGZb}=RZByt1> diff --git a/install/ubuntu/12.10/templates.tar.gz b/install/ubuntu/12.10/templates.tar.gz index dfd35e917fd7039d279f2f14429bf6fe81073882..171b0f4ab925f42568389f2ea7aff86af2a5bdd3 100644 GIT binary patch delta 5956 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 delta 5949 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 diff --git a/install/ubuntu/12.10/templates/web/apache2/basedir.stpl b/install/ubuntu/12.10/templates/web/apache2/basedir.stpl index 3f71e6999..96de57af7 100755 --- a/install/ubuntu/12.10/templates/web/apache2/basedir.stpl +++ b/install/ubuntu/12.10/templates/web/apache2/basedir.stpl @@ -35,7 +35,7 @@ AssignUserID %user% %group% - IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/s%web_system%.%domain%.conf* diff --git a/install/ubuntu/12.10/templates/web/apache2/basedir.tpl b/install/ubuntu/12.10/templates/web/apache2/basedir.tpl index 75daf0e10..07ec38c98 100755 --- a/install/ubuntu/12.10/templates/web/apache2/basedir.tpl +++ b/install/ubuntu/12.10/templates/web/apache2/basedir.tpl @@ -29,7 +29,7 @@ AssignUserID %user% %group% - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/%web_system%.%domain%.conf* diff --git a/install/ubuntu/12.10/templates/web/apache2/default.stpl b/install/ubuntu/12.10/templates/web/apache2/default.stpl index e884a95b9..da523c138 100755 --- a/install/ubuntu/12.10/templates/web/apache2/default.stpl +++ b/install/ubuntu/12.10/templates/web/apache2/default.stpl @@ -34,7 +34,7 @@ AssignUserID %user% %group% - IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/s%web_system%.%domain%.conf* diff --git a/install/ubuntu/12.10/templates/web/apache2/default.tpl b/install/ubuntu/12.10/templates/web/apache2/default.tpl index 073724ce0..b95c1ee38 100755 --- a/install/ubuntu/12.10/templates/web/apache2/default.tpl +++ b/install/ubuntu/12.10/templates/web/apache2/default.tpl @@ -28,7 +28,7 @@ AssignUserID %user% %group% - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/%web_system%.%domain%.conf* diff --git a/install/ubuntu/12.10/templates/web/apache2/hosting.stpl b/install/ubuntu/12.10/templates/web/apache2/hosting.stpl index 7a5d7787f..c1c91e22e 100755 --- a/install/ubuntu/12.10/templates/web/apache2/hosting.stpl +++ b/install/ubuntu/12.10/templates/web/apache2/hosting.stpl @@ -43,7 +43,7 @@ AssignUserID %user% %group% - IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/s%web_system%.%domain%.conf* diff --git a/install/ubuntu/12.10/templates/web/apache2/hosting.tpl b/install/ubuntu/12.10/templates/web/apache2/hosting.tpl index ab844dc74..8f3ec012a 100755 --- a/install/ubuntu/12.10/templates/web/apache2/hosting.tpl +++ b/install/ubuntu/12.10/templates/web/apache2/hosting.tpl @@ -37,7 +37,7 @@ AssignUserID %user% %group% - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/%web_system%.%domain%.conf* diff --git a/install/ubuntu/12.10/templates/web/apache2/phpcgi.stpl b/install/ubuntu/12.10/templates/web/apache2/phpcgi.stpl index aa5137308..58c4baf90 100755 --- a/install/ubuntu/12.10/templates/web/apache2/phpcgi.stpl +++ b/install/ubuntu/12.10/templates/web/apache2/phpcgi.stpl @@ -29,7 +29,7 @@ SSLCertificateKeyFile %ssl_key% %ssl_ca_str%SSLCertificateChainFile %ssl_ca% - IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/s%web_system%.%domain%.conf* diff --git a/install/ubuntu/12.10/templates/web/apache2/phpcgi.tpl b/install/ubuntu/12.10/templates/web/apache2/phpcgi.tpl index a05ff252d..21be2cdd7 100755 --- a/install/ubuntu/12.10/templates/web/apache2/phpcgi.tpl +++ b/install/ubuntu/12.10/templates/web/apache2/phpcgi.tpl @@ -22,7 +22,7 @@ AllowOverride All - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/%web_system%.%domain%.conf* diff --git a/install/ubuntu/12.10/templates/web/apache2/phpfcgid.stpl b/install/ubuntu/12.10/templates/web/apache2/phpfcgid.stpl index 622495756..20a580093 100755 --- a/install/ubuntu/12.10/templates/web/apache2/phpfcgid.stpl +++ b/install/ubuntu/12.10/templates/web/apache2/phpfcgid.stpl @@ -30,7 +30,7 @@ SSLCertificateKeyFile %ssl_key% %ssl_ca_str%SSLCertificateChainFile %ssl_ca% - IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/s%web_system%.%domain%.conf* diff --git a/install/ubuntu/12.10/templates/web/apache2/phpfcgid.tpl b/install/ubuntu/12.10/templates/web/apache2/phpfcgid.tpl index 5c1f16e20..72e7d8d44 100755 --- a/install/ubuntu/12.10/templates/web/apache2/phpfcgid.tpl +++ b/install/ubuntu/12.10/templates/web/apache2/phpfcgid.tpl @@ -22,7 +22,7 @@ AllowOverride All - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/%web_system%.%domain%.conf* diff --git a/install/ubuntu/13.04/dovecot.tar.gz b/install/ubuntu/13.04/dovecot.tar.gz index da7a32e6ffbe8e2c610cad1a07baace4e61a833f..09914f981c89375a89804d3ec915695257b50133 100644 GIT binary patch delta 16 Xcmew$^+AeVzMF%gLC9_+dnPXcFF^#% delta 16 Xcmew$^+AeVzMF%A{hRGZ_Do&?F+~M7 diff --git a/install/ubuntu/13.04/fail2ban.tar.gz b/install/ubuntu/13.04/fail2ban.tar.gz index 824f879487dcc643d596abaa7f5600db53a92ec6..93832ed883c530f121170bd086a59e920a2df7fb 100644 GIT binary patch delta 16 XcmX@YdW4l-zMF%gLC9_+`(7phC~5?g delta 16 XcmX@YdW4l-zMF%A{hRGZ_PtC1DsBY* diff --git a/install/ubuntu/13.04/firewall.tar.gz b/install/ubuntu/13.04/firewall.tar.gz index dce4fe075572b47ef1bf3c52042e52eb735997f1..5f2614a9f8b6f24daa681ab5908a4d41c66856d5 100644 GIT binary patch delta 16 XcmbQtGMR;4zMF%gLC9_+I}Z~8Aua=c delta 16 XcmbQtGMR;4zMF%A{hRGZb{-}GBQgW% diff --git a/install/ubuntu/13.04/packages.tar.gz b/install/ubuntu/13.04/packages.tar.gz index d17f37f21178cb584f08ae81e1ad821be31905b2..e6c3a06712e86cc0959b243e250e8f1228e2852a 100644 GIT binary patch delta 16 XcmbQsGM9y2zMF%gLC9_+yBHGyB5nhm delta 16 XcmbQsGM9y2zMF%A{hRGZb}=RZByt1> diff --git a/install/ubuntu/13.04/templates.tar.gz b/install/ubuntu/13.04/templates.tar.gz index 5f61577ba30a65958bd029bab47575c540cc5370..c2ee87db62f17c1e0c0b3570da034799e21151cf 100644 GIT binary patch delta 5956 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 mB^ooZf22x6e&i7 z*6yU!tO=z?C^Z6JI4sovzFF4TP#!z}bFE&jCiTB+t0DBiJV5w=yc++HyB`Gn^PS=h z-6uH?SmR99nV2SOGF)PGVY*!%m=sFi%B4XG7tAe3r*38^%RlL3kSW~nOuqU)21#D| z4&&~A_r~@=%B7#-72rj`+s1c)dj@^Azbo*6ck~?u#ZeO#Z9ZQ}_SMHF5uME+FK;*CPKt z?*oRrwDdA0SRvxYam9yHLMRhL*-M4H`F}jj0=UfoLvG1Q`(Lvm{C{(Q0U`eh`R|G4 zKjB;=oJ;OhmvAl-&LzURL^ziSjZSEE0#*Zy@BbRR{W0wQzN-Tky{{U$%>G|V-Tx)a zBK~haAoRc2qW}Gf^_<_Z8eH89xx$kEa7%i2m!Hy*zS_YPW_cmR2_f#4!Q%Ljbf8QO z?~(8Ss5YvNl>cwDBILh+JV1Q^ndAMhLdFu_3MnKZ774NF>EKTM|8ehstu|Yg)cp^2 zasNXukemI-eZxXPeg+^RVF(E$g(M`57b{`7k1b-{HU3NW5#ztKvf{sp^PgNm=>H=A zOT48{q$h%f-{X!>wosb1bffp93qSVqg%Od4j+8)R{+T5TaCu8 z{J-8z#{X!vnj-#NF0h3EGhhDup8!0T;d@S);(VQ-SIpoo#_JE_(EPmv_CUzU^XzuH zoDzx>1=t4}{IiUIjjXIb`zC_Ojq##vq{VUy!?gVB-vz(2>$se;Zr>40wX7>01bm>O zI0ogs{XpRw^&%eSO)#@8r z0X*Dmv%DN@sC#$78V$>LXz}t-CskLByT0BN{>6~R|5xPp7s3+$kGFj$`G2z}?EksI zo%sK~c>lBD&jJ3u*q2~Wf<3)V_H=jtw21!arT@v5T7v#JAyv@-JV5Awcjhl{jMOB? zB)+E~z+_y1!DXHymsvRXZ-Uj_>WTDvbfLEhasIDN@d6RIyxKOF@PGC@&j0Hm0{o3M zR@;qic;oy(d;U%3dS%-Ga{V7CJE8yAs>1(27udvuyRE_|-tn`=_`s&8dj{Rw=1YOV zQqYHte{7a{4#(nWki<~T;RKJXrEki$!V{&fke3dBCZ@`Gk2(TG`cv}E*0byqYo`=& zsSXJ^cgd!XZfPZ#8dUX4*NQQrNIMd83Xb zS1RigxwIUOIvuGZ5tSN-Yb&a54#Q_#(KP=V%R9lKXj_~5ct~7F?MNUfStZ*XN+5`M z9qF2X!YfEyFg{uYdtflgs@dt^V9C!D( zk3a8rq+k%C$U4vMk1f+1t@GY$aGL3|6HdGyRYHtI#r1fJ3@p5wk{_;e{N9yrV;Rf3 zn%H|daDIQcnSzcT{Yo#-t?h|7LK^~_L$nL%w|in5v!L?{JN(?oNj9x z#{8fRx9d(9!;;MnqZZ*j*0tK_eQ7G8SCum*#+F)YwFA_lS1XE6K6<+#R+fes3ZLv6V9j#3>@44jZ*s) zsO}T{WWc+jtE^(2C~m^!W1r<@$VVR6A-twsZIvqUpUe_*oVJHBY-|89h1cqTKb+A4 zbsQMVPX;u82n}Nn&W2wbe~8x-q=XM)l`x{GAV2YXRM#cnT%sCid>HBj^35I+^zS1e zZIH_`yn$*F2QqKQ263kYsqh6|2Jr66uBBm()k=lbDs?}jcNAvGq}r&!oK z(xaxUdoai_v=?WG*{L{Z+on2yvK;>W?+MIUxa*;ne{M(t9?P2-V~_ZQy?(IVPSNj; zdj7~HQLTx0J7zEu(YC%S4#pKbg7u5x!C)oqqWLF$hLStf;R`#Z!61T?6DFSm1sVkbWf5+m55mB1=GyWn`|B+fe4qC5;hTIC9~D zn;#EM=#Hrvup_Tv!TSS4x#Glj0`6D7zDS42xDU;J-Sbm0DL~@u4cdtzVk+uG5k%PR z&_)uGrN$B2qD&!wveY=@e03y|!<;BOuEi84F1tiWPtx_B_(tjoR=DhvxPC?ycfK4$ z^oEZ;&x#h{6e_d8JS#S4NTp$grA7_Y;~kGI`6PCjmB8nlAp;vTqPUDMgqYO;lO_AT z*wY=?gH_8Ht-nF`3}wjHB4huMz#dLaB>6Iub#`quCZe2whKPkW-HE+aT5mYQp*r)msPbWI$BfO(G1L`)Sl(Dzn8(>3zw%gH(Ue^u&@C)@mY8nZ+5Y)ph z3D~coL$BO88sGo!#I-@3eh%kdaD?8W&W2(jg8MO--4D0edeRXtKe&vKl9*$3iUc&3j5)TT%)r;cR~OC&I7kskN6 zWdt>>+ePJ@czBe?JEFR7#2o<7=E+|JXsC#CY+J6|HybDvTTXke#bAT5?13`Yjagf9 zbOl}nt12pnJ~Z1Z#SU!DzkVOd(Heh^*7)(`c58cYgNzktsGDuls@ONAg8xO!SIJ+0 z9G|T1>^8fNop=|B--me{q*}p7Si+Q<9@_9`hPFWr>Otp4c8yn?epkPOqCp2<8%^UIeuBf=W+?%VXW4C1!}pxGpy}5uX=7fa(gvmE zYCdi?Psdj9|6fsK#me8`?xX+Js!ielnG0mhKM(BJciHu2t7zkY$LGJ% zLi?YX|Hp@A^S=sBV43`1k(1y5wpzmen-9DK`9JUrBmXzn6nC^iy4D!w@Sc_QS zU}6*ePa*!tl>V(}>>ecy)C$Gvl<=OH?yV41R;>^;qY6QTK}sQLuz!S1o`*~xtnG+U z9uu`UVLdx^5N;;simuuv)f$(7rL9wIN*#EE%NhBy+dJRhEGt_Jzb~tP!7N5G0U8YElPX@yLAM(aFUrD(K4ECO;Rtjxsfh z8a0$z8$E8G`UM0$2yWm1D^vgOqyIHp6`}v-0ZZn8B?m$G(Er%{3;O?m_#pH@q5lc} zPw0O_|9hLTg#WKX{rhqKPi{49!v7-|5c=QShK&86ygBQ^ZTz_Y*KAaT{+A2fVgBot z+QT%!W%^%DPR0Liw#4~gF7OKUKXh6SRKGpTxzsg{KAGb8hcyAMj+mB5Mha*Kc6h-7 z@hoz!gVN`LZuop$0OenQE5Zj*=$n{nZza{q@X8e_qKPV7n`L{e5bCI~|KdJ_kxiKG zAb4R8EXSLez;}$<2Qs_co)Mmcj{tYz|3P@Cd$+Na|5vN2^S_GF|8jv>!2dBSS-}4z z{`R4}z4$OdNCiSF$XhCaT^W}OGFSX<62gMLL)t$HNnmAgC;h*F{{A$iK#s?(`V*= zz#}fDV;2;8#e+YT?-11d@rWAZgCLg&b>E?iIwG1yUABKH-Zn}Ub2hdd`hi#uOvLPx z65V4TBz^<(O~x>P23jd>3r%pUViF|mP;`j*!VMg2%$i;B&UoQ0zArX1vMJ4!zc`iOXILtI7Pb@!1I}asF?Q>_%~5k5~H*;E$jG z)LPBDIRD85Zkd1AQm^Q$B0%Bz<<_}&QVia|8Kz$|JC8q zpqz=x*F%U=!d2m8l@z>|muh|0(D9OEyg@O%MY%BH*G%%uy9-0dn%MKlpayGdMzQ?V z0GWjwDirK7{MKe5a_K5Ol*YOV!=BU_rf&8@&~RuZqZ(9^ z%#bUE0yVFH|FeJ6J3rn&+Wjx2y$c>#&gu5~KBkr@F5Z)_Dn|JdgckP5e!w4wcz$%s z@Vv1dJntNw#gld;I8QtOx9oq@D#Gua_J1vP|4XAK3;*9-U@b}j*5dniEwORe<^)2c z*JX2J7=<7)xtrIrxAR(TKd)tO=(Wrpy>{!CUb}sNPe1kOK7Y7n|F1Lz^s@cmNS^=5 zO}Qrae=d;8|3gmR4sv<8!xiv;!Ox!;B<}yUF-A%C$?yNHHEZJjk6a*o{zsPU>E>`n z5ulgMf349--TzmuHU<6912(_tjyF*Z78W5R!mWRz$ItAJlM$a;o*%yn4gKbDJ%YZi z0nH|V>lDxpo*rB!dWJ!d=b?^y8D?5zQK3j#9qL6Oz~w~|eghm<+ArtFeOgqEV?+!2 z;e~%7m@q57)|=29s-k=RXU64tNwUs(9)GDWEH7((XbtZXVflU)L_#RU9o?ZSS~?^1HMi@sP*Nu_*N(1He43ws;PwvB@UX?9@GDF`Vdo_-`Na?S;gaG3 zei#Qoe%Xb=?0!C&8~#UjU%@5R=b;}bHU`e<1CQ-%x|5hLszdgXn@3h#Q%gd(Y$~7q?%K zL5dzJ>ZCXbcKmza03NQOt<;KIvP+k(vsB&5PFprL`xtO6yg1A*S|Vv)DoiT) zyK5I!YIsF6Ncch>eK6}XnVguG8De&+@(oRxPRX={!5arHUcM_2E46Lf1Zj>sl5W zW!a3#x&$Vms41S}uYjPTtwg)JcNJ}M8&>|%L|T2Ylhs1BB9`D2C{C~x;+q)?|3gl;Sb6~Q&b&UM0yu*Q6gL9 zU9`r6%ECXf%G&I2Dj%p7ab$e`M@pu z-=ph(LiKx5s^5=jenQ6+I-bz+9LZXoW@&IA~ zzqb(h)?~m8^MAIHe>I}vHj9Z&I4LS}m7YZP{t$B$?T;?`xde&xzVUVF?JK5cfTka- zXI`|-%5G(g8jmT)JZB4k?prc|zH!Lr|Gqe#kNu}wNuB=-|L?p&*nfom=NZ|5;>vt% zk>tjmh4L-f_nU#m{681}ziO>fOZk5{g#TYIAoPDB1iTRczvmzu_;2>SHTO3oy9nFE zgJGfle>Lj=GX5_&Q~n=~X00Lke;y$8e_{H6I`#jR+xTCA3Vthp{U5+cYOC=8UgrPX ztflCGOXz?3Kz{zelHU|Gbh>|f*6l<*Zw&piKyQ%g5SABt=IpD&|p@kfgV9LAr;3@qiH&{2rM)uhG$X+5TUJ2)NAtli~kc ztBUxqxqz_$2qEx)dHR3cChuCdza-DrTC;2$e_>1#WiYOdfs*@ zVa0j=u!R5TasDH>T1wCh!dXzl1}VaOe`IKmh^- e2oNAZfB*pk1PBlyK!AW1!2bgl7+PZhfC2zGm;$!| diff --git a/install/ubuntu/13.04/templates/web/apache2/basedir.stpl b/install/ubuntu/13.04/templates/web/apache2/basedir.stpl index 3f71e6999..96de57af7 100755 --- a/install/ubuntu/13.04/templates/web/apache2/basedir.stpl +++ b/install/ubuntu/13.04/templates/web/apache2/basedir.stpl @@ -35,7 +35,7 @@ AssignUserID %user% %group% - IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/s%web_system%.%domain%.conf* diff --git a/install/ubuntu/13.04/templates/web/apache2/basedir.tpl b/install/ubuntu/13.04/templates/web/apache2/basedir.tpl index 75daf0e10..07ec38c98 100755 --- a/install/ubuntu/13.04/templates/web/apache2/basedir.tpl +++ b/install/ubuntu/13.04/templates/web/apache2/basedir.tpl @@ -29,7 +29,7 @@ AssignUserID %user% %group% - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/%web_system%.%domain%.conf* diff --git a/install/ubuntu/13.04/templates/web/apache2/default.stpl b/install/ubuntu/13.04/templates/web/apache2/default.stpl index e884a95b9..da523c138 100755 --- a/install/ubuntu/13.04/templates/web/apache2/default.stpl +++ b/install/ubuntu/13.04/templates/web/apache2/default.stpl @@ -34,7 +34,7 @@ AssignUserID %user% %group% - IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/s%web_system%.%domain%.conf* diff --git a/install/ubuntu/13.04/templates/web/apache2/default.tpl b/install/ubuntu/13.04/templates/web/apache2/default.tpl index 073724ce0..b95c1ee38 100755 --- a/install/ubuntu/13.04/templates/web/apache2/default.tpl +++ b/install/ubuntu/13.04/templates/web/apache2/default.tpl @@ -28,7 +28,7 @@ AssignUserID %user% %group% - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/%web_system%.%domain%.conf* diff --git a/install/ubuntu/13.04/templates/web/apache2/hosting.stpl b/install/ubuntu/13.04/templates/web/apache2/hosting.stpl index 7a5d7787f..c1c91e22e 100755 --- a/install/ubuntu/13.04/templates/web/apache2/hosting.stpl +++ b/install/ubuntu/13.04/templates/web/apache2/hosting.stpl @@ -43,7 +43,7 @@ AssignUserID %user% %group% - IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/s%web_system%.%domain%.conf* diff --git a/install/ubuntu/13.04/templates/web/apache2/hosting.tpl b/install/ubuntu/13.04/templates/web/apache2/hosting.tpl index ab844dc74..8f3ec012a 100755 --- a/install/ubuntu/13.04/templates/web/apache2/hosting.tpl +++ b/install/ubuntu/13.04/templates/web/apache2/hosting.tpl @@ -37,7 +37,7 @@ AssignUserID %user% %group% - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/%web_system%.%domain%.conf* diff --git a/install/ubuntu/13.04/templates/web/apache2/phpcgi.stpl b/install/ubuntu/13.04/templates/web/apache2/phpcgi.stpl index aa5137308..58c4baf90 100755 --- a/install/ubuntu/13.04/templates/web/apache2/phpcgi.stpl +++ b/install/ubuntu/13.04/templates/web/apache2/phpcgi.stpl @@ -29,7 +29,7 @@ SSLCertificateKeyFile %ssl_key% %ssl_ca_str%SSLCertificateChainFile %ssl_ca% - IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/s%web_system%.%domain%.conf* diff --git a/install/ubuntu/13.04/templates/web/apache2/phpcgi.tpl b/install/ubuntu/13.04/templates/web/apache2/phpcgi.tpl index a05ff252d..21be2cdd7 100755 --- a/install/ubuntu/13.04/templates/web/apache2/phpcgi.tpl +++ b/install/ubuntu/13.04/templates/web/apache2/phpcgi.tpl @@ -22,7 +22,7 @@ AllowOverride All - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/%web_system%.%domain%.conf* diff --git a/install/ubuntu/13.04/templates/web/apache2/phpfcgid.stpl b/install/ubuntu/13.04/templates/web/apache2/phpfcgid.stpl index 622495756..20a580093 100755 --- a/install/ubuntu/13.04/templates/web/apache2/phpfcgid.stpl +++ b/install/ubuntu/13.04/templates/web/apache2/phpfcgid.stpl @@ -30,7 +30,7 @@ SSLCertificateKeyFile %ssl_key% %ssl_ca_str%SSLCertificateChainFile %ssl_ca% - IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/s%web_system%.%domain%.conf* diff --git a/install/ubuntu/13.04/templates/web/apache2/phpfcgid.tpl b/install/ubuntu/13.04/templates/web/apache2/phpfcgid.tpl index 5c1f16e20..72e7d8d44 100755 --- a/install/ubuntu/13.04/templates/web/apache2/phpfcgid.tpl +++ b/install/ubuntu/13.04/templates/web/apache2/phpfcgid.tpl @@ -22,7 +22,7 @@ AllowOverride All - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/%web_system%.%domain%.conf* diff --git a/install/ubuntu/13.10/dovecot.tar.gz b/install/ubuntu/13.10/dovecot.tar.gz index da7a32e6ffbe8e2c610cad1a07baace4e61a833f..09914f981c89375a89804d3ec915695257b50133 100644 GIT binary patch delta 16 Xcmew$^+AeVzMF%gLC9_+dnPXcFF^#% delta 16 Xcmew$^+AeVzMF%A{hRGZ_Do&?F+~M7 diff --git a/install/ubuntu/13.10/fail2ban.tar.gz b/install/ubuntu/13.10/fail2ban.tar.gz index 824f879487dcc643d596abaa7f5600db53a92ec6..93832ed883c530f121170bd086a59e920a2df7fb 100644 GIT binary patch delta 16 XcmX@YdW4l-zMF%gLC9_+`(7phC~5?g delta 16 XcmX@YdW4l-zMF%A{hRGZ_PtC1DsBY* diff --git a/install/ubuntu/13.10/firewall.tar.gz b/install/ubuntu/13.10/firewall.tar.gz index dce4fe075572b47ef1bf3c52042e52eb735997f1..5f2614a9f8b6f24daa681ab5908a4d41c66856d5 100644 GIT binary patch delta 16 XcmbQtGMR;4zMF%gLC9_+I}Z~8Aua=c delta 16 XcmbQtGMR;4zMF%A{hRGZb{-}GBQgW% diff --git a/install/ubuntu/13.10/packages.tar.gz b/install/ubuntu/13.10/packages.tar.gz index d17f37f21178cb584f08ae81e1ad821be31905b2..e6c3a06712e86cc0959b243e250e8f1228e2852a 100644 GIT binary patch delta 16 XcmbQsGM9y2zMF%gLC9_+yBHGyB5nhm delta 16 XcmbQsGM9y2zMF%A{hRGZb}=RZByt1> diff --git a/install/ubuntu/13.10/templates.tar.gz b/install/ubuntu/13.10/templates.tar.gz index 82f493f2fe53d0a8d549a557cc9365e6ed02fe87..9d61eafe072546abdbb09a73e75953aef918e5e6 100644 GIT binary patch delta 16 XcmZ1xyCRldzMF%gLC9_+`$9bcF17_5 delta 16 XcmZ1xyCRldzMF%A{hRGZ_Jw)?FuDbW diff --git a/install/ubuntu/14.04/dovecot.tar.gz b/install/ubuntu/14.04/dovecot.tar.gz index e6a75fceda26c8f45e00a5ab11041623f695d642..83d540fcd31eec5049a880aaaac73743dc4c899e 100644 GIT binary patch delta 16 XcmbOwJxiKhzMF%gLC9_+`($1KC7lFJ delta 16 XcmbOwJxiKhzMF%A{hRGZ_Q|{eC!qwk diff --git a/install/ubuntu/14.04/fail2ban.tar.gz b/install/ubuntu/14.04/fail2ban.tar.gz index 5d0c7c98012fdaa952af08dae7eaaac77bd792ee..9618e3881c5e7c5e7cd4a2f4fc5ed1ad1b1564f8 100644 GIT binary patch delta 16 XcmX@adWe->zMF%gLC9_+`)(!xC@KVv delta 16 XcmX@adWe->zMF%A{hRGZ_T5YXDlP=~ diff --git a/install/ubuntu/14.04/firewall.tar.gz b/install/ubuntu/14.04/firewall.tar.gz index 3eeeb373dc936d2d7fa14b2985c059ea34546739..5011ce37d6e58eb300fadcf871dc67b9068bd48f 100644 GIT binary patch delta 16 XcmbQqGLwZ}zMF%gLC9_+yATrqA?^c^ delta 16 XcmbQqGLwZ}zMF%A{hRGZb|EGJBk}|K diff --git a/install/ubuntu/14.04/packages.tar.gz b/install/ubuntu/14.04/packages.tar.gz index 8bdafde82b251fc4c69ef1605b54cd6d2292f422..4838e33cc5fc7322e3830568c34b74be03a1d7e0 100644 GIT binary patch delta 16 XcmZ3@vYLfmzMF%gLC9_+y9yHkBrXHS delta 16 XcmZ3@vYLfmzMF%A{hRGZb`>T7CNcyt diff --git a/install/ubuntu/14.04/templates.tar.gz b/install/ubuntu/14.04/templates.tar.gz index 1308e254cb66e9398235493a98c90cdb0295cf64..e405fd768018ab123fbe19583a0206d3b9572009 100644 GIT binary patch delta 16 Xcmew!_dSkXzMF%gLC9_+dx1UxH?swc delta 16 Xcmew!_dSkXzMF%A{hRGZ_5ytXIkyG% diff --git a/install/ubuntu/14.10/dovecot.tar.gz b/install/ubuntu/14.10/dovecot.tar.gz index e6a75fceda26c8f45e00a5ab11041623f695d642..83d540fcd31eec5049a880aaaac73743dc4c899e 100644 GIT binary patch delta 16 XcmbOwJxiKhzMF%gLC9_+`($1KC7lFJ delta 16 XcmbOwJxiKhzMF%A{hRGZ_Q|{eC!qwk diff --git a/install/ubuntu/14.10/fail2ban.tar.gz b/install/ubuntu/14.10/fail2ban.tar.gz index 5d0c7c98012fdaa952af08dae7eaaac77bd792ee..9618e3881c5e7c5e7cd4a2f4fc5ed1ad1b1564f8 100644 GIT binary patch delta 16 XcmX@adWe->zMF%gLC9_+`)(!xC@KVv delta 16 XcmX@adWe->zMF%A{hRGZ_T5YXDlP=~ diff --git a/install/ubuntu/14.10/firewall.tar.gz b/install/ubuntu/14.10/firewall.tar.gz index 3eeeb373dc936d2d7fa14b2985c059ea34546739..5011ce37d6e58eb300fadcf871dc67b9068bd48f 100644 GIT binary patch delta 16 XcmbQqGLwZ}zMF%gLC9_+yATrqA?^c^ delta 16 XcmbQqGLwZ}zMF%A{hRGZb|EGJBk}|K diff --git a/install/ubuntu/14.10/packages.tar.gz b/install/ubuntu/14.10/packages.tar.gz index 8bdafde82b251fc4c69ef1605b54cd6d2292f422..4838e33cc5fc7322e3830568c34b74be03a1d7e0 100644 GIT binary patch delta 16 XcmZ3@vYLfmzMF%gLC9_+y9yHkBrXHS delta 16 XcmZ3@vYLfmzMF%A{hRGZb`>T7CNcyt diff --git a/install/ubuntu/14.10/templates.tar.gz b/install/ubuntu/14.10/templates.tar.gz index 9fd8fccbc9359cd53f8c04e9296f12fb21283bee..f5b9cb13bc30c66e047ee78bb811cff71398b361 100644 GIT binary patch delta 16 Xcmewn_aly7zMF%gLC9_+d!ar6H`4`< delta 16 Xcmewn_aly7zMF%A{hRGZ_CkFCIoAdF diff --git a/install/ubuntu/15.04/dovecot.tar.gz b/install/ubuntu/15.04/dovecot.tar.gz index e6a75fceda26c8f45e00a5ab11041623f695d642..83d540fcd31eec5049a880aaaac73743dc4c899e 100644 GIT binary patch delta 16 XcmbOwJxiKhzMF%gLC9_+`($1KC7lFJ delta 16 XcmbOwJxiKhzMF%A{hRGZ_Q|{eC!qwk diff --git a/install/ubuntu/15.04/fail2ban.tar.gz b/install/ubuntu/15.04/fail2ban.tar.gz index 5d0c7c98012fdaa952af08dae7eaaac77bd792ee..9618e3881c5e7c5e7cd4a2f4fc5ed1ad1b1564f8 100644 GIT binary patch delta 16 XcmX@adWe->zMF%gLC9_+`)(!xC@KVv delta 16 XcmX@adWe->zMF%A{hRGZ_T5YXDlP=~ diff --git a/install/ubuntu/15.04/firewall.tar.gz b/install/ubuntu/15.04/firewall.tar.gz index 3eeeb373dc936d2d7fa14b2985c059ea34546739..5011ce37d6e58eb300fadcf871dc67b9068bd48f 100644 GIT binary patch delta 16 XcmbQqGLwZ}zMF%gLC9_+yATrqA?^c^ delta 16 XcmbQqGLwZ}zMF%A{hRGZb|EGJBk}|K diff --git a/install/ubuntu/15.04/packages.tar.gz b/install/ubuntu/15.04/packages.tar.gz index 8bdafde82b251fc4c69ef1605b54cd6d2292f422..4838e33cc5fc7322e3830568c34b74be03a1d7e0 100644 GIT binary patch delta 16 XcmZ3@vYLfmzMF%gLC9_+y9yHkBrXHS delta 16 XcmZ3@vYLfmzMF%A{hRGZb`>T7CNcyt diff --git a/install/ubuntu/15.04/templates.tar.gz b/install/ubuntu/15.04/templates.tar.gz index 0a457066c425828c4fc2aba34790a1788484f214..d96e3cf2b8fe06f69607cd9dd69dcac9cde9d26c 100644 GIT binary patch delta 16 XcmdlQzcrp+zMF%gLC9_+`#OC9FpmXC delta 16 XcmdlQzcrp+zMF%A{hRGZ_I3IIGLr?d diff --git a/install/vst-install-debian.sh b/install/vst-install-debian.sh index f867a654a..7dc3a3b7c 100755 --- a/install/vst-install-debian.sh +++ b/install/vst-install-debian.sh @@ -1074,12 +1074,12 @@ if [ "$fail2ban" = 'yes' ]; then rm -f fail2ban.tar.gz if [ "$dovecot" = 'no' ]; then fline=$(cat /etc/fail2ban/jail.local |grep -n dovecot-iptables -A 2) - fline=$(echo "$fline" |tail -n1 |cut -f 1 -d -) + fline=$(echo "$fline" |grep enabled |tail -n1 |cut -f 1 -d -) sed -i "${fline}s/true/false/" /etc/fail2ban/jail.local fi if [ "$exim" = 'no' ]; then fline=$(cat /etc/fail2ban/jail.local |grep -n exim-iptables -A 2) - fline=$(echo "$fline" |tail -n1 |cut -f 1 -d -) + fline=$(echo "$fline" |grep enabled |tail -n1 |cut -f 1 -d -) sed -i "${fline}s/true/false/" /etc/fail2ban/jail.local fi update-rc.d fail2ban defaults diff --git a/install/vst-install-rhel.sh b/install/vst-install-rhel.sh index 058af598d..818baf56c 100755 --- a/install/vst-install-rhel.sh +++ b/install/vst-install-rhel.sh @@ -1143,12 +1143,12 @@ if [ "$fail2ban" = 'yes' ]; then rm -f fail2ban.tar.gz if [ "$dovecot" = 'no' ]; then fline=$(cat /etc/fail2ban/jail.local |grep -n dovecot-iptables -A 2) - fline=$(echo "$fline" |tail -n1 |cut -f 1 -d -) + fline=$(echo "$fline" |grep enabled |tail -n1 |cut -f 1 -d -) sed -i "${fline}s/true/false/" /etc/fail2ban/jail.local fi if [ "$exim" = 'no' ]; then fline=$(cat /etc/fail2ban/jail.local |grep -n exim-iptables -A 2) - fline=$(echo "$fline" |tail -n1 |cut -f 1 -d -) + fline=$(echo "$fline" |grep enabled |tail -n1 |cut -f 1 -d -) sed -i "${fline}s/true/false/" /etc/fail2ban/jail.local fi chkconfig fail2ban on diff --git a/install/vst-install-ubuntu.sh b/install/vst-install-ubuntu.sh index 64306f8a5..194196d66 100755 --- a/install/vst-install-ubuntu.sh +++ b/install/vst-install-ubuntu.sh @@ -1063,12 +1063,12 @@ if [ "$fail2ban" = 'yes' ]; then rm -f fail2ban.tar.gz if [ "$dovecot" = 'no' ]; then fline=$(cat /etc/fail2ban/jail.local |grep -n dovecot-iptables -A 2) - fline=$(echo "$fline" |tail -n1 |cut -f 1 -d -) + fline=$(echo "$fline" |grep enabled |tail -n1 |cut -f 1 -d -) sed -i "${fline}s/true/false/" /etc/fail2ban/jail.local fi if [ "$exim" = 'no' ]; then fline=$(cat /etc/fail2ban/jail.local |grep -n exim-iptables -A 2) - fline=$(echo "$fline" |tail -n1 |cut -f 1 -d -) + fline=$(echo "$fline" |grep enabled |tail -n1 |cut -f 1 -d -) sed -i "${fline}s/true/false/" /etc/fail2ban/jail.local fi update-rc.d fail2ban defaults From 196d7024cbf5f096d8b5e4f6ab0500b8b068a8d1 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Sun, 8 Nov 2015 21:37:07 +0200 Subject: [PATCH 210/264] added cron as dep package to installer --- install/debian/7/dovecot.tar.gz | Bin 3482 -> 3482 bytes install/debian/7/fail2ban.tar.gz | Bin 706 -> 706 bytes install/debian/7/firewall.tar.gz | Bin 537 -> 537 bytes install/debian/7/packages.tar.gz | Bin 555 -> 555 bytes install/debian/7/templates.tar.gz | Bin 12114 -> 12114 bytes install/debian/8/dovecot.tar.gz | Bin 3482 -> 3482 bytes install/debian/8/fail2ban.tar.gz | Bin 706 -> 706 bytes install/debian/8/firewall.tar.gz | Bin 537 -> 537 bytes install/debian/8/packages.tar.gz | Bin 555 -> 555 bytes install/debian/8/templates.tar.gz | Bin 12217 -> 12217 bytes install/rhel/5/dovecot.tar.gz | Bin 474 -> 474 bytes install/rhel/5/fail2ban.tar.gz | Bin 693 -> 693 bytes install/rhel/5/firewall.tar.gz | Bin 537 -> 537 bytes install/rhel/5/packages.tar.gz | Bin 530 -> 530 bytes install/rhel/5/templates.tar.gz | Bin 12051 -> 12051 bytes install/rhel/6/dovecot.tar.gz | Bin 2640 -> 2640 bytes install/rhel/6/fail2ban.tar.gz | Bin 693 -> 693 bytes install/rhel/6/firewall.tar.gz | Bin 537 -> 537 bytes install/rhel/6/packages.tar.gz | Bin 530 -> 530 bytes install/rhel/6/templates.tar.gz | Bin 12051 -> 12051 bytes install/rhel/7/dovecot.tar.gz | Bin 2641 -> 2641 bytes install/rhel/7/fail2ban.tar.gz | Bin 693 -> 693 bytes install/rhel/7/firewall.tar.gz | Bin 537 -> 537 bytes install/rhel/7/packages.tar.gz | Bin 530 -> 530 bytes install/rhel/7/templates.tar.gz | Bin 12248 -> 12248 bytes install/ubuntu/12.04/dovecot.tar.gz | Bin 3440 -> 3440 bytes install/ubuntu/12.04/fail2ban.tar.gz | Bin 708 -> 708 bytes install/ubuntu/12.04/firewall.tar.gz | Bin 531 -> 531 bytes install/ubuntu/12.04/packages.tar.gz | Bin 541 -> 541 bytes install/ubuntu/12.04/templates.tar.gz | Bin 11946 -> 11946 bytes install/ubuntu/12.10/dovecot.tar.gz | Bin 3440 -> 3440 bytes install/ubuntu/12.10/fail2ban.tar.gz | Bin 708 -> 708 bytes install/ubuntu/12.10/firewall.tar.gz | Bin 531 -> 531 bytes install/ubuntu/12.10/packages.tar.gz | Bin 541 -> 541 bytes install/ubuntu/12.10/templates.tar.gz | Bin 11948 -> 11948 bytes install/ubuntu/13.04/dovecot.tar.gz | Bin 3440 -> 3440 bytes install/ubuntu/13.04/fail2ban.tar.gz | Bin 708 -> 708 bytes install/ubuntu/13.04/firewall.tar.gz | Bin 531 -> 531 bytes install/ubuntu/13.04/packages.tar.gz | Bin 541 -> 541 bytes install/ubuntu/13.04/templates.tar.gz | Bin 11949 -> 11949 bytes install/ubuntu/13.10/dovecot.tar.gz | Bin 3440 -> 3440 bytes install/ubuntu/13.10/fail2ban.tar.gz | Bin 708 -> 708 bytes install/ubuntu/13.10/firewall.tar.gz | Bin 531 -> 531 bytes install/ubuntu/13.10/packages.tar.gz | Bin 541 -> 541 bytes install/ubuntu/13.10/templates.tar.gz | Bin 11944 -> 11944 bytes install/ubuntu/14.04/dovecot.tar.gz | Bin 3482 -> 3482 bytes install/ubuntu/14.04/fail2ban.tar.gz | Bin 706 -> 706 bytes install/ubuntu/14.04/firewall.tar.gz | Bin 537 -> 537 bytes install/ubuntu/14.04/packages.tar.gz | Bin 555 -> 555 bytes install/ubuntu/14.04/templates.tar.gz | Bin 12151 -> 12151 bytes install/ubuntu/14.10/dovecot.tar.gz | Bin 3482 -> 3482 bytes install/ubuntu/14.10/fail2ban.tar.gz | Bin 706 -> 706 bytes install/ubuntu/14.10/firewall.tar.gz | Bin 537 -> 537 bytes install/ubuntu/14.10/packages.tar.gz | Bin 555 -> 555 bytes install/ubuntu/14.10/templates.tar.gz | Bin 12152 -> 12152 bytes install/ubuntu/15.04/dovecot.tar.gz | Bin 3482 -> 3482 bytes install/ubuntu/15.04/fail2ban.tar.gz | Bin 706 -> 706 bytes install/ubuntu/15.04/firewall.tar.gz | Bin 537 -> 537 bytes install/ubuntu/15.04/packages.tar.gz | Bin 555 -> 555 bytes install/ubuntu/15.04/templates.tar.gz | Bin 12213 -> 12213 bytes install/vst-install-debian.sh | 4 ++-- install/vst-install-ubuntu.sh | 2 +- 62 files changed, 3 insertions(+), 3 deletions(-) diff --git a/install/debian/7/dovecot.tar.gz b/install/debian/7/dovecot.tar.gz index 64d371a5c2d31804be20e6c6ec4ccc4a4e3c1563..1786ee5f3b2d19e9acfb1afa0ca784559a2ed497 100644 GIT binary patch delta 16 XcmbOwJxiKhzMF#~aFP8+_Q|{eC%FW! delta 16 XcmbOwJxiKhzMF%gQOIs1`($1KC8PvR diff --git a/install/debian/7/fail2ban.tar.gz b/install/debian/7/fail2ban.tar.gz index 79690627865580395155df37826a118119860e6a..6bc3366067007520baab5647b8e692a511d501ae 100644 GIT binary patch delta 16 XcmX@adWe->zMF#~aFP8+_T5YXDnzMF%gQOIs1`)(!xC@}<% diff --git a/install/debian/7/firewall.tar.gz b/install/debian/7/firewall.tar.gz index b0f3f81c54b28176fd5cfa98df68e6deb455c8f7..351fbb718b6dd2bf29a3c4c65f8031751f202bc9 100644 GIT binary patch delta 16 XcmbQqGLwZ}zMF#~aFP8+b|EGJBnkua delta 16 XcmbQqGLwZ}zMF%gQOIs1yATrqA@u{1 diff --git a/install/debian/7/packages.tar.gz b/install/debian/7/packages.tar.gz index 5c834ca699884c11a074b1b035086cecd5a35039..9e7a95cf78b4bfd8338033cd33603eab903f78b8 100644 GIT binary patch delta 16 XcmZ3@vYLfmzMF#~aFP8+b`>T7CQ1Y- delta 16 XcmZ3@vYLfmzMF%gQOIs1y9yHkBsBxa diff --git a/install/debian/7/templates.tar.gz b/install/debian/7/templates.tar.gz index 0dd30d9d44a14755aeec9eaf69c0ef797505eb77..38c5c55997313255431af7fd143029ed2b73f72b 100644 GIT binary patch delta 16 XcmcZzMF#~aFP8+_T5YXDnzMF%gQOIs1`)(!xC@}<% diff --git a/install/debian/8/firewall.tar.gz b/install/debian/8/firewall.tar.gz index b0f3f81c54b28176fd5cfa98df68e6deb455c8f7..351fbb718b6dd2bf29a3c4c65f8031751f202bc9 100644 GIT binary patch delta 16 XcmbQqGLwZ}zMF#~aFP8+b|EGJBnkua delta 16 XcmbQqGLwZ}zMF%gQOIs1yATrqA@u{1 diff --git a/install/debian/8/packages.tar.gz b/install/debian/8/packages.tar.gz index 5c834ca699884c11a074b1b035086cecd5a35039..9e7a95cf78b4bfd8338033cd33603eab903f78b8 100644 GIT binary patch delta 16 XcmZ3@vYLfmzMF#~aFP8+b`>T7CQ1Y- delta 16 XcmZ3@vYLfmzMF%gQOIs1y9yHkBsBxa diff --git a/install/debian/8/templates.tar.gz b/install/debian/8/templates.tar.gz index e10686f2e32fdade54f9ee475617212d77aa067e..a3e35ecda655e95028c9f6174fc301bea86049a5 100644 GIT binary patch delta 16 XcmdlPzcZd)zMF#~aFP8+_D%W#Gb;tP delta 16 XcmdlPzcZd)zMF%gQOIs1`zCz=F%|_> diff --git a/install/rhel/5/dovecot.tar.gz b/install/rhel/5/dovecot.tar.gz index 4b36a9b9cb45fa8778cf4cfbd825d96812ed6df3..4e87f598c2ef263136cc5ff123732f89610bb92b 100644 GIT binary patch delta 16 Xcmcb`e2bY~zMF%=bCLZ<_REX_EY$@n delta 16 Xcmcb`e2bY~zMF%gPRMQ}`(;J|D&qvs diff --git a/install/rhel/5/fail2ban.tar.gz b/install/rhel/5/fail2ban.tar.gz index 833b186d64be5345fbbf8e0fb17c210b0a896c09..c0d5d11fb75fe5619879f97586ed96f157d293d9 100644 GIT binary patch delta 16 XcmdnWx|Nk(zMF%=bCLZ<_H|4EC~gG6 delta 16 XcmdnWx|Nk(zMF%gPRMQ}`#L57CVT{B diff --git a/install/rhel/5/firewall.tar.gz b/install/rhel/5/firewall.tar.gz index 1e5578bb04cc75e946549c8abdbdeb6c4a8b5469..a2ee9c8402a53ed75453efcfec8ace36a9b40163 100644 GIT binary patch delta 16 XcmbQqGLwZ}zMF%=bCLZad! diff --git a/install/rhel/5/packages.tar.gz b/install/rhel/5/packages.tar.gz index 956ebd36671869a07155cfc8c8c664e06c1f6a04..93283512909c51281a0d92f804172d12da585eb3 100644 GIT binary patch delta 16 XcmbQlGKqy5IEf)m2 delta 16 XcmbOnH#v@7zMF%gPRMQ}JC8m9Dad! diff --git a/install/rhel/6/packages.tar.gz b/install/rhel/6/packages.tar.gz index 956ebd36671869a07155cfc8c8c664e06c1f6a04..93283512909c51281a0d92f804172d12da585eb3 100644 GIT binary patch delta 16 XcmbQlGKqy5IEf)m2 delta 16 XcmbOnH#v@7zMF%gPRMQ}JC8m9Dad! diff --git a/install/rhel/7/packages.tar.gz b/install/rhel/7/packages.tar.gz index 956ebd36671869a07155cfc8c8c664e06c1f6a04..93283512909c51281a0d92f804172d12da585eb3 100644 GIT binary patch delta 16 XcmbQlGKqyzMF%=cai-@_T5YXDk=o) delta 16 XcmX@adWe->zMF%gLC9_+`)(!xC@KVv diff --git a/install/ubuntu/14.04/firewall.tar.gz b/install/ubuntu/14.04/firewall.tar.gz index 5011ce37d6e58eb300fadcf871dc67b9068bd48f..e5b82af6fdaa4f262c271ae73ec16f0886f2e70c 100644 GIT binary patch delta 16 XcmbQqGLwZ}zMF%=cai-@b|EGJBklw4 delta 16 XcmbQqGLwZ}zMF%gLC9_+yATrqA?^c^ diff --git a/install/ubuntu/14.04/packages.tar.gz b/install/ubuntu/14.04/packages.tar.gz index 4838e33cc5fc7322e3830568c34b74be03a1d7e0..f5678a747ee8816cab557bcbf5a18a5d1539760a 100644 GIT binary patch delta 16 XcmZ3@vYLfmzMF%=cai-@b`>T7CN2ad delta 16 XcmZ3@vYLfmzMF%gLC9_+y9yHkBrXHS diff --git a/install/ubuntu/14.04/templates.tar.gz b/install/ubuntu/14.04/templates.tar.gz index e405fd768018ab123fbe19583a0206d3b9572009..83ce1c2a18d84d0f7d7bbe8996b9bdd79585f7f5 100644 GIT binary patch delta 16 Xcmew!_dSkXzMF%=cai-@_5ytXIkN@n delta 16 Xcmew!_dSkXzMF%gLC9_+dx1UxH?swc diff --git a/install/ubuntu/14.10/dovecot.tar.gz b/install/ubuntu/14.10/dovecot.tar.gz index 83d540fcd31eec5049a880aaaac73743dc4c899e..f67e7eeb272cbc64e5ffa0f2d10ca3c6e8626706 100644 GIT binary patch delta 16 XcmbOwJxiKhzMF%=cai-@_Q|{eC!GYU delta 16 XcmbOwJxiKhzMF%gLC9_+`($1KC7lFJ diff --git a/install/ubuntu/14.10/fail2ban.tar.gz b/install/ubuntu/14.10/fail2ban.tar.gz index 9618e3881c5e7c5e7cd4a2f4fc5ed1ad1b1564f8..f3d8012d20c7652c7f239fad7d9a5f1d651a02ec 100644 GIT binary patch delta 16 XcmX@adWe->zMF%=cai-@_T5YXDk=o) delta 16 XcmX@adWe->zMF%gLC9_+`)(!xC@KVv diff --git a/install/ubuntu/14.10/firewall.tar.gz b/install/ubuntu/14.10/firewall.tar.gz index 5011ce37d6e58eb300fadcf871dc67b9068bd48f..e5b82af6fdaa4f262c271ae73ec16f0886f2e70c 100644 GIT binary patch delta 16 XcmbQqGLwZ}zMF%=cai-@b|EGJBklw4 delta 16 XcmbQqGLwZ}zMF%gLC9_+yATrqA?^c^ diff --git a/install/ubuntu/14.10/packages.tar.gz b/install/ubuntu/14.10/packages.tar.gz index 4838e33cc5fc7322e3830568c34b74be03a1d7e0..f5678a747ee8816cab557bcbf5a18a5d1539760a 100644 GIT binary patch delta 16 XcmZ3@vYLfmzMF%=cai-@b`>T7CN2ad delta 16 XcmZ3@vYLfmzMF%gLC9_+y9yHkBrXHS diff --git a/install/ubuntu/14.10/templates.tar.gz b/install/ubuntu/14.10/templates.tar.gz index f5b9cb13bc30c66e047ee78bb811cff71398b361..d7df70e4a8935b890d62383f4f62871c9de7dc3b 100644 GIT binary patch delta 16 Xcmewn_aly7zMF%=cai-@_CkFCInxE~ delta 16 Xcmewn_aly7zMF%gLC9_+d!ar6H`4`< diff --git a/install/ubuntu/15.04/dovecot.tar.gz b/install/ubuntu/15.04/dovecot.tar.gz index 83d540fcd31eec5049a880aaaac73743dc4c899e..f67e7eeb272cbc64e5ffa0f2d10ca3c6e8626706 100644 GIT binary patch delta 16 XcmbOwJxiKhzMF%=cai-@_Q|{eC!GYU delta 16 XcmbOwJxiKhzMF%gLC9_+`($1KC7lFJ diff --git a/install/ubuntu/15.04/fail2ban.tar.gz b/install/ubuntu/15.04/fail2ban.tar.gz index 9618e3881c5e7c5e7cd4a2f4fc5ed1ad1b1564f8..f3d8012d20c7652c7f239fad7d9a5f1d651a02ec 100644 GIT binary patch delta 16 XcmX@adWe->zMF%=cai-@_T5YXDk=o) delta 16 XcmX@adWe->zMF%gLC9_+`)(!xC@KVv diff --git a/install/ubuntu/15.04/firewall.tar.gz b/install/ubuntu/15.04/firewall.tar.gz index 5011ce37d6e58eb300fadcf871dc67b9068bd48f..e5b82af6fdaa4f262c271ae73ec16f0886f2e70c 100644 GIT binary patch delta 16 XcmbQqGLwZ}zMF%=cai-@b|EGJBklw4 delta 16 XcmbQqGLwZ}zMF%gLC9_+yATrqA?^c^ diff --git a/install/ubuntu/15.04/packages.tar.gz b/install/ubuntu/15.04/packages.tar.gz index 4838e33cc5fc7322e3830568c34b74be03a1d7e0..f5678a747ee8816cab557bcbf5a18a5d1539760a 100644 GIT binary patch delta 16 XcmZ3@vYLfmzMF%=cai-@b`>T7CN2ad delta 16 XcmZ3@vYLfmzMF%gLC9_+y9yHkBrXHS diff --git a/install/ubuntu/15.04/templates.tar.gz b/install/ubuntu/15.04/templates.tar.gz index d96e3cf2b8fe06f69607cd9dd69dcac9cde9d26c..5e6e47db8c7b6859386618daf96771e7e13f3006 100644 GIT binary patch delta 16 XcmdlQzcrp+zMF%=cai-@_I3IIGLHqN delta 16 XcmdlQzcrp+zMF%gLC9_+`#OC9FpmXC diff --git a/install/vst-install-debian.sh b/install/vst-install-debian.sh index 7dc3a3b7c..9e454c4e7 100755 --- a/install/vst-install-debian.sh +++ b/install/vst-install-debian.sh @@ -28,7 +28,7 @@ if [ "$release" -eq 8 ]; then mysql-client postgresql postgresql-contrib phppgadmin phpMyAdmin mc flex whois rssh git idn zip sudo bc ftp lsof ntpdate rrdtool quota e2fslibs bsdutils e2fsprogs curl imagemagick fail2ban dnsutils - bsdmainutils vesta vesta-nginx vesta-php" + bsdmainutils cron vesta vesta-nginx vesta-php" else software="nginx apache2 apache2-utils apache2.2-common apache2-suexec-custom libapache2-mod-ruid2 libapache2-mod-rpaf @@ -40,7 +40,7 @@ else mysql-client postgresql postgresql-contrib phppgadmin phpMyAdmin mc flex whois rssh git idn zip sudo bc ftp lsof ntpdate rrdtool quota e2fslibs bsdutils e2fsprogs curl imagemagick fail2ban dnsutils - bsdmainutils vesta vesta-nginx vesta-php" + bsdmainutils cron vesta vesta-nginx vesta-php" fi # Defining help function diff --git a/install/vst-install-ubuntu.sh b/install/vst-install-ubuntu.sh index 194196d66..258f944ab 100755 --- a/install/vst-install-ubuntu.sh +++ b/install/vst-install-ubuntu.sh @@ -26,7 +26,7 @@ software="nginx apache2 apache2-utils apache2.2-common mysql-client postgresql postgresql-contrib phppgadmin phpMyAdmin mc flex whois rssh git idn zip sudo bc ftp lsof ntpdate rrdtool quota e2fslibs bsdutils e2fsprogs curl imagemagick fail2ban dnsutils - bsdmainutils vesta vesta-nginx vesta-php" + bsdmainutils cron vesta vesta-nginx vesta-php" # Defining help function help() { From 24d8fca9298d35e8908cf2ad157f34dbbb8ada49 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Sun, 8 Nov 2015 21:38:52 +0200 Subject: [PATCH 211/264] Start using .gitignore --- install/debian/7/dovecot.tar.gz | Bin 3482 -> 0 bytes install/debian/7/fail2ban.tar.gz | Bin 706 -> 0 bytes install/debian/7/firewall.tar.gz | Bin 537 -> 0 bytes install/debian/7/packages.tar.gz | Bin 555 -> 0 bytes install/debian/7/templates.tar.gz | Bin 12114 -> 0 bytes install/debian/8/dovecot.tar.gz | Bin 3482 -> 0 bytes install/debian/8/fail2ban.tar.gz | Bin 706 -> 0 bytes install/debian/8/firewall.tar.gz | Bin 537 -> 0 bytes install/debian/8/packages.tar.gz | Bin 555 -> 0 bytes install/debian/8/templates.tar.gz | Bin 12217 -> 0 bytes install/rhel/5/dovecot.tar.gz | Bin 474 -> 0 bytes install/rhel/5/fail2ban.tar.gz | Bin 693 -> 0 bytes install/rhel/5/firewall.tar.gz | Bin 537 -> 0 bytes install/rhel/5/packages.tar.gz | Bin 530 -> 0 bytes install/rhel/5/templates.tar.gz | Bin 12051 -> 0 bytes install/rhel/5/wsgi/httpd.tar.gz | Bin 1311 -> 0 bytes install/rhel/6/dovecot.tar.gz | Bin 2640 -> 0 bytes install/rhel/6/fail2ban.tar.gz | Bin 693 -> 0 bytes install/rhel/6/firewall.tar.gz | Bin 537 -> 0 bytes install/rhel/6/packages.tar.gz | Bin 530 -> 0 bytes install/rhel/6/templates.tar.gz | Bin 12051 -> 0 bytes install/rhel/6/wsgi/httpd.tar.gz | Bin 1311 -> 0 bytes install/rhel/7/dovecot.tar.gz | Bin 2641 -> 0 bytes install/rhel/7/fail2ban.tar.gz | Bin 693 -> 0 bytes install/rhel/7/firewall.tar.gz | Bin 537 -> 0 bytes install/rhel/7/packages.tar.gz | Bin 530 -> 0 bytes install/rhel/7/templates.tar.gz | Bin 12248 -> 0 bytes install/rhel/7/wsgi/httpd.tar.gz | Bin 1311 -> 0 bytes install/ubuntu/12.04/dovecot.tar.gz | Bin 3440 -> 0 bytes install/ubuntu/12.04/fail2ban.tar.gz | Bin 708 -> 0 bytes install/ubuntu/12.04/firewall.tar.gz | Bin 531 -> 0 bytes install/ubuntu/12.04/packages.tar.gz | Bin 541 -> 0 bytes install/ubuntu/12.04/templates.tar.gz | Bin 11946 -> 0 bytes install/ubuntu/12.10/dovecot.tar.gz | Bin 3440 -> 0 bytes install/ubuntu/12.10/fail2ban.tar.gz | Bin 708 -> 0 bytes install/ubuntu/12.10/firewall.tar.gz | Bin 531 -> 0 bytes install/ubuntu/12.10/packages.tar.gz | Bin 541 -> 0 bytes install/ubuntu/12.10/templates.tar.gz | Bin 11948 -> 0 bytes install/ubuntu/13.04/dovecot.tar.gz | Bin 3440 -> 0 bytes install/ubuntu/13.04/fail2ban.tar.gz | Bin 708 -> 0 bytes install/ubuntu/13.04/firewall.tar.gz | Bin 531 -> 0 bytes install/ubuntu/13.04/packages.tar.gz | Bin 541 -> 0 bytes install/ubuntu/13.04/templates.tar.gz | Bin 11949 -> 0 bytes install/ubuntu/13.10/dovecot.tar.gz | Bin 3440 -> 0 bytes install/ubuntu/13.10/fail2ban.tar.gz | Bin 708 -> 0 bytes install/ubuntu/13.10/firewall.tar.gz | Bin 531 -> 0 bytes install/ubuntu/13.10/packages.tar.gz | Bin 541 -> 0 bytes install/ubuntu/13.10/templates.tar.gz | Bin 11944 -> 0 bytes install/ubuntu/14.04/dovecot.tar.gz | Bin 3482 -> 0 bytes install/ubuntu/14.04/fail2ban.tar.gz | Bin 706 -> 0 bytes install/ubuntu/14.04/firewall.tar.gz | Bin 537 -> 0 bytes install/ubuntu/14.04/packages.tar.gz | Bin 555 -> 0 bytes install/ubuntu/14.04/templates.tar.gz | Bin 12151 -> 0 bytes install/ubuntu/14.10/dovecot.tar.gz | Bin 3482 -> 0 bytes install/ubuntu/14.10/fail2ban.tar.gz | Bin 706 -> 0 bytes install/ubuntu/14.10/firewall.tar.gz | Bin 537 -> 0 bytes install/ubuntu/14.10/packages.tar.gz | Bin 555 -> 0 bytes install/ubuntu/14.10/templates.tar.gz | Bin 12152 -> 0 bytes install/ubuntu/15.04/dovecot.tar.gz | Bin 3482 -> 0 bytes install/ubuntu/15.04/fail2ban.tar.gz | Bin 706 -> 0 bytes install/ubuntu/15.04/firewall.tar.gz | Bin 537 -> 0 bytes install/ubuntu/15.04/packages.tar.gz | Bin 555 -> 0 bytes install/ubuntu/15.04/templates.tar.gz | Bin 12213 -> 0 bytes 63 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 install/debian/7/dovecot.tar.gz delete mode 100644 install/debian/7/fail2ban.tar.gz delete mode 100644 install/debian/7/firewall.tar.gz delete mode 100644 install/debian/7/packages.tar.gz delete mode 100644 install/debian/7/templates.tar.gz delete mode 100644 install/debian/8/dovecot.tar.gz delete mode 100644 install/debian/8/fail2ban.tar.gz delete mode 100644 install/debian/8/firewall.tar.gz delete mode 100644 install/debian/8/packages.tar.gz delete mode 100644 install/debian/8/templates.tar.gz delete mode 100644 install/rhel/5/dovecot.tar.gz delete mode 100644 install/rhel/5/fail2ban.tar.gz delete mode 100644 install/rhel/5/firewall.tar.gz delete mode 100644 install/rhel/5/packages.tar.gz delete mode 100644 install/rhel/5/templates.tar.gz delete mode 100644 install/rhel/5/wsgi/httpd.tar.gz delete mode 100644 install/rhel/6/dovecot.tar.gz delete mode 100644 install/rhel/6/fail2ban.tar.gz delete mode 100644 install/rhel/6/firewall.tar.gz delete mode 100644 install/rhel/6/packages.tar.gz delete mode 100644 install/rhel/6/templates.tar.gz delete mode 100644 install/rhel/6/wsgi/httpd.tar.gz delete mode 100644 install/rhel/7/dovecot.tar.gz delete mode 100644 install/rhel/7/fail2ban.tar.gz delete mode 100644 install/rhel/7/firewall.tar.gz delete mode 100644 install/rhel/7/packages.tar.gz delete mode 100644 install/rhel/7/templates.tar.gz delete mode 100644 install/rhel/7/wsgi/httpd.tar.gz delete mode 100644 install/ubuntu/12.04/dovecot.tar.gz delete mode 100644 install/ubuntu/12.04/fail2ban.tar.gz delete mode 100644 install/ubuntu/12.04/firewall.tar.gz delete mode 100644 install/ubuntu/12.04/packages.tar.gz delete mode 100644 install/ubuntu/12.04/templates.tar.gz delete mode 100644 install/ubuntu/12.10/dovecot.tar.gz delete mode 100644 install/ubuntu/12.10/fail2ban.tar.gz delete mode 100644 install/ubuntu/12.10/firewall.tar.gz delete mode 100644 install/ubuntu/12.10/packages.tar.gz delete mode 100644 install/ubuntu/12.10/templates.tar.gz delete mode 100644 install/ubuntu/13.04/dovecot.tar.gz delete mode 100644 install/ubuntu/13.04/fail2ban.tar.gz delete mode 100644 install/ubuntu/13.04/firewall.tar.gz delete mode 100644 install/ubuntu/13.04/packages.tar.gz delete mode 100644 install/ubuntu/13.04/templates.tar.gz delete mode 100644 install/ubuntu/13.10/dovecot.tar.gz delete mode 100644 install/ubuntu/13.10/fail2ban.tar.gz delete mode 100644 install/ubuntu/13.10/firewall.tar.gz delete mode 100644 install/ubuntu/13.10/packages.tar.gz delete mode 100644 install/ubuntu/13.10/templates.tar.gz delete mode 100644 install/ubuntu/14.04/dovecot.tar.gz delete mode 100644 install/ubuntu/14.04/fail2ban.tar.gz delete mode 100644 install/ubuntu/14.04/firewall.tar.gz delete mode 100644 install/ubuntu/14.04/packages.tar.gz delete mode 100644 install/ubuntu/14.04/templates.tar.gz delete mode 100644 install/ubuntu/14.10/dovecot.tar.gz delete mode 100644 install/ubuntu/14.10/fail2ban.tar.gz delete mode 100644 install/ubuntu/14.10/firewall.tar.gz delete mode 100644 install/ubuntu/14.10/packages.tar.gz delete mode 100644 install/ubuntu/14.10/templates.tar.gz delete mode 100644 install/ubuntu/15.04/dovecot.tar.gz delete mode 100644 install/ubuntu/15.04/fail2ban.tar.gz delete mode 100644 install/ubuntu/15.04/firewall.tar.gz delete mode 100644 install/ubuntu/15.04/packages.tar.gz delete mode 100644 install/ubuntu/15.04/templates.tar.gz diff --git a/install/debian/7/dovecot.tar.gz b/install/debian/7/dovecot.tar.gz deleted file mode 100644 index 1786ee5f3b2d19e9acfb1afa0ca784559a2ed497..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3482 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 t{`ccQHkod6)bjt;dBsP; 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 diff --git a/install/debian/8/dovecot.tar.gz b/install/debian/8/dovecot.tar.gz deleted file mode 100644 index 1786ee5f3b2d19e9acfb1afa0ca784559a2ed497..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3482 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

                %domain%

                + +

                403

                +

                Forbidden

                +
                + Unfortunately, you do not have permission to view this +
                + + + diff --git a/install/ubuntu/15.10/templates/web/skel/document_errors/404.html b/install/ubuntu/15.10/templates/web/skel/document_errors/404.html new file mode 100755 index 000000000..2cee77084 --- /dev/null +++ b/install/ubuntu/15.10/templates/web/skel/document_errors/404.html @@ -0,0 +1,28 @@ + + + 404 — Not Found + + + + + + +

                %domain%

                +

                404

                +

                Page Not Found

                +
                + It seems that the page you were trying to reach does not exist anymore, or maybe it has just moved. + You can start again from the home or go back to previous page. +
                + + diff --git a/install/ubuntu/15.10/templates/web/skel/document_errors/50x.html b/install/ubuntu/15.10/templates/web/skel/document_errors/50x.html new file mode 100755 index 000000000..85ba648b7 --- /dev/null +++ b/install/ubuntu/15.10/templates/web/skel/document_errors/50x.html @@ -0,0 +1,29 @@ + + + 500 — Internal Sever Error + + + + + + +

                %domain%

                + +

                500

                +

                Internal Server Error

                +
                + Sorry, something went wrong :( +
                + + + diff --git a/install/ubuntu/15.10/templates/web/skel/public_html/index.html b/install/ubuntu/15.10/templates/web/skel/public_html/index.html new file mode 100755 index 000000000..4f5bb7244 --- /dev/null +++ b/install/ubuntu/15.10/templates/web/skel/public_html/index.html @@ -0,0 +1,26 @@ + + + %domain% — Coming Soon + + + + + + +

                %domain%

                + + + + + diff --git a/install/ubuntu/15.10/templates/web/skel/public_html/robots.txt b/install/ubuntu/15.10/templates/web/skel/public_html/robots.txt new file mode 100755 index 000000000..00ee83dcf --- /dev/null +++ b/install/ubuntu/15.10/templates/web/skel/public_html/robots.txt @@ -0,0 +1,3 @@ +# vestacp autogenerated robots.txt +User-agent: * +Crawl-delay: 10 diff --git a/install/ubuntu/15.10/templates/web/skel/public_shtml/index.html b/install/ubuntu/15.10/templates/web/skel/public_shtml/index.html new file mode 100755 index 000000000..4f5bb7244 --- /dev/null +++ b/install/ubuntu/15.10/templates/web/skel/public_shtml/index.html @@ -0,0 +1,26 @@ + + + %domain% — Coming Soon + + + + + + +

                %domain%

                + + + + + diff --git a/install/ubuntu/15.10/templates/web/skel/public_shtml/robots.txt b/install/ubuntu/15.10/templates/web/skel/public_shtml/robots.txt new file mode 100755 index 000000000..00ee83dcf --- /dev/null +++ b/install/ubuntu/15.10/templates/web/skel/public_shtml/robots.txt @@ -0,0 +1,3 @@ +# vestacp autogenerated robots.txt +User-agent: * +Crawl-delay: 10 diff --git a/install/ubuntu/15.10/templates/web/suspend/.htaccess b/install/ubuntu/15.10/templates/web/suspend/.htaccess new file mode 100755 index 000000000..5a6df83fb --- /dev/null +++ b/install/ubuntu/15.10/templates/web/suspend/.htaccess @@ -0,0 +1,2 @@ +ErrorDocument 403 /index.html +ErrorDocument 404 /index.html diff --git a/install/ubuntu/15.10/templates/web/suspend/index.html b/install/ubuntu/15.10/templates/web/suspend/index.html new file mode 100755 index 000000000..9d4fa67b3 --- /dev/null +++ b/install/ubuntu/15.10/templates/web/suspend/index.html @@ -0,0 +1,27 @@ + + + SUSPEND + + + + + + +

                SUSPEND

                +

                This site has been suspended

                +
                + Please contact technical support departament. +
                + + + diff --git a/install/ubuntu/15.10/templates/web/webalizer/webalizer.tpl b/install/ubuntu/15.10/templates/web/webalizer/webalizer.tpl new file mode 100755 index 000000000..068adcfb9 --- /dev/null +++ b/install/ubuntu/15.10/templates/web/webalizer/webalizer.tpl @@ -0,0 +1,110 @@ +HostName %domain_idn% +LogFile /var/log/%web_system%/domains/%domain%.log +OutputDir %home%/%user%/web/%domain%/stats +HistoryName %home%/%user%/web/%domain%/stats/%domain%.hist +Incremental yes +IncrementalName %home%/%user%/web/%domain%/stats/%domain%.current +PageType htm* +PageType cgi +PageType php +PageType shtml +DNSCache /var/lib/webalizer/dns_cache.db +DNSChildren 10 +Quiet yes +FoldSeqErr yes +IndexAlias index.php +HideURL *.gif +HideURL *.GIF +HideURL *.jpg +HideURL *.JPG +HideURL *.png +HideURL *.PNG +HideURL *.ra +SearchEngine abcsearch. terms= +SearchEngine alexa. q= +SearchEngine alltheweb. q= +SearchEngine alltheweb. query= +SearchEngine alot. q= +SearchEngine altavista. q= +SearchEngine aolsearch. query= +SearchEngine aport.ru r= +SearchEngine ask. q= +SearchEngine atlas.cz q= +SearchEngine bbc. q= +SearchEngine bing. q= +SearchEngine blingo. q= +SearchEngine blogs.yandex.ru text= +SearchEngine btopenworld query= +SearchEngine buscador.ya.com q= +SearchEngine busca. q= +SearchEngine business. query= +SearchEngine centrum.cz q= +SearchEngine chiff. q= +SearchEngine clusty. query= +SearchEngine comcast. q= +SearchEngine crawler. q= +SearchEngine cuil. q= +SearchEngine dmoz. search= +SearchEngine dogpile.com q= +SearchEngine dpxml qkw= +SearchEngine eureka. searchword= +SearchEngine euroseek. string= +SearchEngine exalead. q= +SearchEngine excite search= +SearchEngine ezilon. q= +SearchEngine fastbrowsersearch. q= +SearchEngine feedster.com q= +SearchEngine fireball.de q= +SearchEngine fireball. keyword= +SearchEngine freeserve. q= +SearchEngine gigablast. q= +SearchEngine gogo.ru q= +SearchEngine go.mail.ru q= +SearchEngine google. q= +SearchEngine hakia. q= +SearchEngine hotbot. query= +SearchEngine infoseek. qt= +SearchEngine iwon searchfor= +SearchEngine ixquick.com query= +SearchEngine joeant. keywords= +SearchEngine jyxo.cz s= +SearchEngine looksmart. key= +SearchEngine lycos. query= +SearchEngine mamma. q= +SearchEngine metacrawler q= +SearchEngine msn. MT= +SearchEngine msxml qkw= +SearchEngine mysearch. searchfor= +SearchEngine mywebsearch. searchfor= +SearchEngine netscape. q= +SearchEngine nigma.ru q= +SearchEngine northernlight. qr= +SearchEngine ntlworld. q= +SearchEngine orange. q= +SearchEngine overture. Keywords= +SearchEngine punto.ru text= +SearchEngine rambler. keyword= +SearchEngine search.aol. q= +SearchEngine search.babylon. q= +SearchEngine search.centrum. phrase= +SearchEngine search.conduit. q= +SearchEngine search.earthlink q= +SearchEngine search.icq. q= +SearchEngine search.live.com q= +SearchEngine search.rambler.ru words= +SearchEngine search.winamp. q= +SearchEngine searchy. q= +SearchEngine seznam.cz w= +SearchEngine snap. query= +SearchEngine teoma. q= +SearchEngine teradex.com q= +SearchEngine ukplus key= +SearchEngine verizon. q= +SearchEngine virginmedia. q= +SearchEngine voila. rdata= +SearchEngine webcrawler searchText= +SearchEngine web.search.naver. query= +SearchEngine wisenut q= +SearchEngine yahoo. p= +SearchEngine yandex. text= +SearchEngine yodao. q= diff --git a/install/ubuntu/15.10/vsftpd/vsftpd.conf b/install/ubuntu/15.10/vsftpd/vsftpd.conf new file mode 100644 index 000000000..0902899e7 --- /dev/null +++ b/install/ubuntu/15.10/vsftpd/vsftpd.conf @@ -0,0 +1,24 @@ +anonymous_enable=NO +local_enable=YES +write_enable=YES +local_umask=002 +anon_upload_enable=NO +dirmessage_enable=YES +xferlog_enable=YES +connect_from_port_20=YES +xferlog_std_format=YES +dual_log_enable=YES +chroot_local_user=YES +listen=YES +pam_service_name=vsftpd +userlist_enable=NO +tcp_wrappers=YES +force_dot_files=YES +ascii_upload_enable=YES +ascii_download_enable=YES +#allow_writable_chroot=YES +allow_writeable_chroot=YES +seccomp_sandbox=NO +pasv_enable=YES +pasv_max_port=12100 +pasv_min_port=12000 From 49739b5c4e019f2b8ca167f0bb172c710919ee39 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Sun, 8 Nov 2015 22:02:23 +0200 Subject: [PATCH 213/264] Fix for lscpu on OpenVZ --- web/list/server/index.php | 36 ++++++++++++------------------------ 1 file changed, 12 insertions(+), 24 deletions(-) diff --git a/web/list/server/index.php b/web/list/server/index.php index 6a251d323..7db575457 100644 --- a/web/list/server/index.php +++ b/web/list/server/index.php @@ -16,10 +16,8 @@ if (isset($_GET['cpu'])) { $TAB = 'CPU'; include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_server_info.html'); exec (VESTA_CMD.'v-list-sys-cpu-status', $output, $return_var); - if ($return_var == 0 ) { - foreach($output as $file) { - echo $file . "\n"; - } + foreach($output as $file) { + echo $file . "\n"; } echo " \n\n\n"; exit(); @@ -30,10 +28,8 @@ if (isset($_GET['mem'])) { $TAB = 'MEMORY'; include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_server_info.html'); exec (VESTA_CMD.'v-list-sys-memory-status', $output, $return_var); - if ($return_var == 0 ) { - foreach($output as $file) { - echo $file . "\n"; - } + foreach($output as $file) { + echo $file . "\n"; } echo " \n\n\n"; exit(); @@ -44,10 +40,8 @@ if (isset($_GET['disk'])) { $TAB = 'MEMORY'; include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_server_info.html'); exec (VESTA_CMD.'v-list-sys-disk-status', $output, $return_var); - if ($return_var == 0 ) { - foreach($output as $file) { - echo $file . "\n"; - } + foreach($output as $file) { + echo $file . "\n"; } echo " \n\n\n"; exit(); @@ -58,10 +52,8 @@ if (isset($_GET['net'])) { $TAB = 'MEMORY'; include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_server_info.html'); exec (VESTA_CMD.'v-list-sys-network-status', $output, $return_var); - if ($return_var == 0 ) { - foreach($output as $file) { - echo $file . "\n"; - } + foreach($output as $file) { + echo $file . "\n"; } echo " \n\n\n"; exit(); @@ -72,10 +64,8 @@ if (isset($_GET['web'])) { $TAB = 'WEB'; include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_server_info.html'); exec (VESTA_CMD.'v-list-sys-web-status', $output, $return_var); - if ($return_var == 0 ) { - foreach($output as $file) { - echo $file . "\n"; - } + foreach($output as $file) { + echo $file . "\n"; } echo " \n\n\n"; exit(); @@ -87,10 +77,8 @@ if (isset($_GET['dns'])) { $TAB = 'DNS'; include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_server_info.html'); exec (VESTA_CMD.'v-list-sys-dns-status', $output, $return_var); - if ($return_var == 0 ) { - foreach($output as $file) { - echo $file . "\n"; - } + foreach($output as $file) { + echo $file . "\n"; } echo " \n\n\n"; exit(); From cef9e16578ae0aa357528d79e737dd91a8e53c71 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Mon, 9 Nov 2015 16:50:52 +0200 Subject: [PATCH 214/264] chkconfig firewalld off --- install/vst-install-rhel.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/install/vst-install-rhel.sh b/install/vst-install-rhel.sh index 818baf56c..a39b481ee 100755 --- a/install/vst-install-rhel.sh +++ b/install/vst-install-rhel.sh @@ -792,6 +792,7 @@ cp templates/web/skel/public_html/index.html /var/www/html/ sed -i 's/%domain%/It worked!/g' /var/www/html/index.html # Downloading firewall rules +chkconfig firewalld off >/dev/null 2>&1 wget $vestacp/firewall.tar.gz -O firewall.tar.gz tar -xzf firewall.tar.gz rm -f firewall.tar.gz From 7b23de9d756349a148cb04ce559058733ac3858d Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Mon, 9 Nov 2015 23:52:29 +0200 Subject: [PATCH 215/264] nginx repo url update --- install/vst-install-ubuntu.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/vst-install-ubuntu.sh b/install/vst-install-ubuntu.sh index 258f944ab..8a17a3ba5 100755 --- a/install/vst-install-ubuntu.sh +++ b/install/vst-install-ubuntu.sh @@ -403,7 +403,7 @@ check_result $? 'apt-get upgrade failed' # Installing nginx repo apt=/etc/apt/sources.list.d -echo "deb http://nginx.org/packages/debian/ $codename nginx" > $apt/nginx.list +echo "deb http://nginx.org/packages/ubuntu/ $codename nginx" > $apt/nginx.list wget http://nginx.org/keys/nginx_signing.key -O /tmp/nginx_signing.key apt-key add /tmp/nginx_signing.key From bcfe1eead4ed3b3cc6d89b91840be40923517812 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Wed, 11 Nov 2015 21:53:07 +0200 Subject: [PATCH 216/264] fix for fm sudo usage --- install/debian/7/sudo/admin | 1 + install/debian/8/sudo/admin | 1 + install/rhel/5/sudo/admin | 1 + install/rhel/6/sudo/admin | 1 + install/rhel/7/sudo/admin | 1 + install/ubuntu/12.04/sudo/admin | 1 + install/ubuntu/12.10/sudo/admin | 1 + install/ubuntu/13.04/sudo/admin | 1 + install/ubuntu/13.10/sudo/admin | 1 + install/ubuntu/14.04/sudo/admin | 1 + install/ubuntu/14.10/sudo/admin | 1 + install/ubuntu/15.04/sudo/admin | 1 + install/ubuntu/15.10/sudo/admin | 1 + upd/add_sudo.sh | 1 + 14 files changed, 14 insertions(+) diff --git a/install/debian/7/sudo/admin b/install/debian/7/sudo/admin index 47e16098c..4226bdd49 100644 --- a/install/debian/7/sudo/admin +++ b/install/debian/7/sudo/admin @@ -2,6 +2,7 @@ Defaults env_keep="VESTA" Defaults:admin !syslog Defaults:admin !requiretty +Defaults:root !requiretty admin ALL=(ALL) ALL admin ALL=NOPASSWD:/usr/local/vesta/bin/* diff --git a/install/debian/8/sudo/admin b/install/debian/8/sudo/admin index 47e16098c..4226bdd49 100644 --- a/install/debian/8/sudo/admin +++ b/install/debian/8/sudo/admin @@ -2,6 +2,7 @@ Defaults env_keep="VESTA" Defaults:admin !syslog Defaults:admin !requiretty +Defaults:root !requiretty admin ALL=(ALL) ALL admin ALL=NOPASSWD:/usr/local/vesta/bin/* diff --git a/install/rhel/5/sudo/admin b/install/rhel/5/sudo/admin index 47e16098c..4226bdd49 100644 --- a/install/rhel/5/sudo/admin +++ b/install/rhel/5/sudo/admin @@ -2,6 +2,7 @@ Defaults env_keep="VESTA" Defaults:admin !syslog Defaults:admin !requiretty +Defaults:root !requiretty admin ALL=(ALL) ALL admin ALL=NOPASSWD:/usr/local/vesta/bin/* diff --git a/install/rhel/6/sudo/admin b/install/rhel/6/sudo/admin index 47e16098c..4226bdd49 100644 --- a/install/rhel/6/sudo/admin +++ b/install/rhel/6/sudo/admin @@ -2,6 +2,7 @@ Defaults env_keep="VESTA" Defaults:admin !syslog Defaults:admin !requiretty +Defaults:root !requiretty admin ALL=(ALL) ALL admin ALL=NOPASSWD:/usr/local/vesta/bin/* diff --git a/install/rhel/7/sudo/admin b/install/rhel/7/sudo/admin index 47e16098c..4226bdd49 100644 --- a/install/rhel/7/sudo/admin +++ b/install/rhel/7/sudo/admin @@ -2,6 +2,7 @@ Defaults env_keep="VESTA" Defaults:admin !syslog Defaults:admin !requiretty +Defaults:root !requiretty admin ALL=(ALL) ALL admin ALL=NOPASSWD:/usr/local/vesta/bin/* diff --git a/install/ubuntu/12.04/sudo/admin b/install/ubuntu/12.04/sudo/admin index 47e16098c..4226bdd49 100644 --- a/install/ubuntu/12.04/sudo/admin +++ b/install/ubuntu/12.04/sudo/admin @@ -2,6 +2,7 @@ Defaults env_keep="VESTA" Defaults:admin !syslog Defaults:admin !requiretty +Defaults:root !requiretty admin ALL=(ALL) ALL admin ALL=NOPASSWD:/usr/local/vesta/bin/* diff --git a/install/ubuntu/12.10/sudo/admin b/install/ubuntu/12.10/sudo/admin index 47e16098c..4226bdd49 100644 --- a/install/ubuntu/12.10/sudo/admin +++ b/install/ubuntu/12.10/sudo/admin @@ -2,6 +2,7 @@ Defaults env_keep="VESTA" Defaults:admin !syslog Defaults:admin !requiretty +Defaults:root !requiretty admin ALL=(ALL) ALL admin ALL=NOPASSWD:/usr/local/vesta/bin/* diff --git a/install/ubuntu/13.04/sudo/admin b/install/ubuntu/13.04/sudo/admin index 47e16098c..4226bdd49 100644 --- a/install/ubuntu/13.04/sudo/admin +++ b/install/ubuntu/13.04/sudo/admin @@ -2,6 +2,7 @@ Defaults env_keep="VESTA" Defaults:admin !syslog Defaults:admin !requiretty +Defaults:root !requiretty admin ALL=(ALL) ALL admin ALL=NOPASSWD:/usr/local/vesta/bin/* diff --git a/install/ubuntu/13.10/sudo/admin b/install/ubuntu/13.10/sudo/admin index 47e16098c..4226bdd49 100644 --- a/install/ubuntu/13.10/sudo/admin +++ b/install/ubuntu/13.10/sudo/admin @@ -2,6 +2,7 @@ Defaults env_keep="VESTA" Defaults:admin !syslog Defaults:admin !requiretty +Defaults:root !requiretty admin ALL=(ALL) ALL admin ALL=NOPASSWD:/usr/local/vesta/bin/* diff --git a/install/ubuntu/14.04/sudo/admin b/install/ubuntu/14.04/sudo/admin index 47e16098c..4226bdd49 100644 --- a/install/ubuntu/14.04/sudo/admin +++ b/install/ubuntu/14.04/sudo/admin @@ -2,6 +2,7 @@ Defaults env_keep="VESTA" Defaults:admin !syslog Defaults:admin !requiretty +Defaults:root !requiretty admin ALL=(ALL) ALL admin ALL=NOPASSWD:/usr/local/vesta/bin/* diff --git a/install/ubuntu/14.10/sudo/admin b/install/ubuntu/14.10/sudo/admin index 47e16098c..4226bdd49 100644 --- a/install/ubuntu/14.10/sudo/admin +++ b/install/ubuntu/14.10/sudo/admin @@ -2,6 +2,7 @@ Defaults env_keep="VESTA" Defaults:admin !syslog Defaults:admin !requiretty +Defaults:root !requiretty admin ALL=(ALL) ALL admin ALL=NOPASSWD:/usr/local/vesta/bin/* diff --git a/install/ubuntu/15.04/sudo/admin b/install/ubuntu/15.04/sudo/admin index 47e16098c..4226bdd49 100644 --- a/install/ubuntu/15.04/sudo/admin +++ b/install/ubuntu/15.04/sudo/admin @@ -2,6 +2,7 @@ Defaults env_keep="VESTA" Defaults:admin !syslog Defaults:admin !requiretty +Defaults:root !requiretty admin ALL=(ALL) ALL admin ALL=NOPASSWD:/usr/local/vesta/bin/* diff --git a/install/ubuntu/15.10/sudo/admin b/install/ubuntu/15.10/sudo/admin index 47e16098c..4226bdd49 100644 --- a/install/ubuntu/15.10/sudo/admin +++ b/install/ubuntu/15.10/sudo/admin @@ -2,6 +2,7 @@ Defaults env_keep="VESTA" Defaults:admin !syslog Defaults:admin !requiretty +Defaults:root !requiretty admin ALL=(ALL) ALL admin ALL=NOPASSWD:/usr/local/vesta/bin/* diff --git a/upd/add_sudo.sh b/upd/add_sudo.sh index 92518a03e..d65ee9d7c 100755 --- a/upd/add_sudo.sh +++ b/upd/add_sudo.sh @@ -10,6 +10,7 @@ if [ ! -e '/etc/sudoers.d/admin' ]; then echo 'Defaults env_keep="VESTA"' >> /etc/sudoers.d/admin echo 'Defaults:admin !syslog' >> /etc/sudoers.d/admin echo 'Defaults:admin !requiretty' >> /etc/sudoers.d/admin + echo 'Defaults:root !requiretty' >> /etc/sudoers.d/admin echo '' >> /etc/sudoers.d/admin echo 'admin ALL=(ALL) ALL' >> /etc/sudoers.d/admin echo 'admin ALL=NOPASSWD:/usr/local/vesta/bin/*' >> /etc/sudoers.d/admin From 877f51010bd47e2bbb9db9848491c4514094713d Mon Sep 17 00:00:00 2001 From: Pavel Galkin Date: Sun, 15 Nov 2015 19:55:54 +0300 Subject: [PATCH 217/264] TW translation fix There is unnecessary code " '重置密碼請點擊連結:\nhttps://%s/reset/?action=confirm&user=%s&code=%s\n\n或者您可以到 https://%s/reset/?action=code&user=%s 輸入密碼重設代碼:\n%s\n\n如果您沒有要求重設密碼，請忽略此郵件\n\n—\nVesta Control Panel\n', ); - - - Date: Tue, 17 Nov 2015 04:37:41 -0500 Subject: [PATCH 218/264] Duplicate session_start --- web/list/user/index.php | 1 - 1 file changed, 1 deletion(-) diff --git a/web/list/user/index.php b/web/list/user/index.php index 129a78c4a..f360fe036 100644 --- a/web/list/user/index.php +++ b/web/list/user/index.php @@ -1,6 +1,5 @@ Date: Tue, 17 Nov 2015 04:40:05 -0500 Subject: [PATCH 219/264] Duplicate session_start --- web/list/log/index.php | 1 - 1 file changed, 1 deletion(-) diff --git a/web/list/log/index.php b/web/list/log/index.php index c0e226e45..0d3f3b8bd 100644 --- a/web/list/log/index.php +++ b/web/list/log/index.php @@ -1,7 +1,6 @@ Date: Sun, 22 Nov 2015 23:58:50 +0900 Subject: [PATCH 220/264] Added / Improved some Japanese translations. --- web/inc/i18n/ja.php | 294 ++++++++++++++++++++++---------------------- 1 file changed, 147 insertions(+), 147 deletions(-) diff --git a/web/inc/i18n/ja.php b/web/inc/i18n/ja.php index fba1c3abe..222e415b9 100644 --- a/web/inc/i18n/ja.php +++ b/web/inc/i18n/ja.php @@ -27,7 +27,7 @@ $LANG['ja'] = array( 'Add User' => 'ユーザーを追加', 'Add Domain' => 'ドメインを追加', - 'Add Web Domain' => 'Webドメインを追加', + 'Add Web Domain' => 'ウェブドメインを追加', 'Add DNS Domain' => 'DNSドメインを追加', 'Add DNS Record' => 'DNSレコードを追加', 'Add Mail Domain' => 'メールドメインを追加', @@ -71,9 +71,9 @@ $LANG['ja'] = array( 'edit' => '編集', 'open webstats' => 'ウェブ統計を開く', 'view logs' => 'ログを表示', - 'list records' => '%sつのレコード', + 'list records' => '%s個のレコード', 'add record' => 'レコードを追加', - 'list accounts' => '%sつのアカウント', + 'list accounts' => '%s個のアカウント', 'add account' => 'アカウントを追加', 'open webmail' => 'ウェブメールを開く', 'list fail2ban' => 'fail2banリスト', @@ -86,7 +86,7 @@ $LANG['ja'] = array( 'restart' => '再起動', 'update' => '更新', 'generate' => '生成', - 'Generate CSR' => 'CSRを生成', + 'Generate CSR' => '証明書署名要求を生成', 'reread IP' => 'IPアドレスを再読み込み', 'enable autoupdate' => '自動更新を有効化', 'disable autoupdate' => '自動更新を無効化', @@ -114,7 +114,7 @@ $LANG['ja'] = array( 'Adding IP address' => 'IPアドレスの追加', 'Editing IP Address' => 'IPアドレスの編集', 'Editing Backup Exclusions' => 'バックアップ除外設定の編集', - 'Generating CSR' => 'CSRの生成', + 'Generating CSR' => '証明書署名要求の生成', 'Listing' => 'リスト中：', 'Search Results' => '検索結果', 'Adding Firewall Rule' => 'ファイアウォールの規則の追加', @@ -155,9 +155,9 @@ $LANG['ja'] = array( 'Backend Template' => 'バックエンド テンプレート', 'Proxy Template' =>'プロキシ テンプレート', 'DNS Template' => 'DNSテンプレート', - 'Web Domains' => 'Webドメイン', + 'Web Domains' => 'ウェブドメイン', 'SSL Domains' => 'SSLドメイン', - 'Web Aliases' => 'Webエイリアス', + 'Web Aliases' => 'ウェブエイリアス', 'per domain' => 'ドメインごと', 'DNS Domains' => 'DNSドメイン', 'DNS Domains' => 'DNSドメイン', @@ -177,7 +177,7 @@ $LANG['ja'] = array( 'Proxy Support' => 'プロキシのサポート', 'Proxy Extensions' => 'プロキシ対象拡張子', 'Web Statistics' => 'ウェブアクセス統計', - 'Additional FTP Account' => '追加のFTP', + 'Additional FTP Account' => '追加のFTPアカウント', 'SOA' => 'SOA', 'TTL' => 'TTL', 'Expire' => '有効期限', @@ -196,7 +196,7 @@ $LANG['ja'] = array( 'Host' => 'ホスト', 'Charset' => '文字セット', 'Min' => '分', - 'Hour' => '時間', + 'Hour' => '時', 'Day' => '日', 'Month' => '月', 'Day of week' => '曜日', @@ -247,9 +247,9 @@ $LANG['ja'] = array( 'Language' => '言語', 'First Name' => '名', 'Last Name' => '姓', - 'Send login credentials to email address' => 'ログイン認証資格をメールアドレスに送信', - 'Default Template' => 'デフォルトテンプレート', - 'Default Name Servers' => 'デフォルトネームサーバー', + 'Send login credentials to email address' => 'ログイン情報をメールアドレスに送信', + 'Default Template' => '規定のテンプレート', + 'Default Name Servers' => '規定のネームサーバー', 'Domain' => 'ドメイン', 'DNS Support' => 'DNSのサポート', 'Mail Support' => 'メールのサポート', @@ -258,16 +258,16 @@ $LANG['ja'] = array( 'SSL Certificate' => 'SSL証明書', 'SSL Key' => 'SSL鍵', 'SSL Certificate Authority / Intermediate' => 'SSL認証局', - 'SSL CSR' => 'SSL CSR', + 'SSL CSR' => 'SSL証明書署名要求', 'optional' => '任意', 'internal' => '内部', 'Statistics Authorization' => '統計の認証', 'Statistics Auth' => '統計の認証', 'Account' => 'アカウント', 'Prefix will be automaticaly added to username' => 'ユーザー名には接頭辞 %s が自動的に付加されます', - 'Send FTP credentials to email' => 'FTP認証資格をメールアドレスに送信', + 'Send FTP credentials to email' => 'FTPログイン情報をメールアドレスに送信', 'Expiration Date' => '有効期限', - 'YYYY-MM-DD' => 'YYYY/MM/DD', + 'YYYY-MM-DD' => 'YYYY-MM-DD', 'Name servers' => 'ネームサーバー', 'Record' => 'レコード', 'IP or Value' => 'IPアドレスまたは値', @@ -297,7 +297,7 @@ $LANG['ja'] = array( 'mail accounts' => 'メールアカウント', 'accounts' => 'アカウント', 'databases' => 'データベース', - 'cron jobs' => 'cronジョブ', + 'cron jobs' => 'Cronジョブ', 'backups' => 'バックアップ', 'quota' => '割り当て量', 'day of week' => '曜日', @@ -337,7 +337,7 @@ $LANG['ja'] = array( 'Download ErrorLog' => 'ErrorLogをダウンロード', 'Country' => '国', '2 letter code' => '2レターコード', - 'State / Province' => '都道府県', + 'State / Province' => '州 / 都道府県', 'City / Locality' => '市区町村', 'Organization' => '組織', 'Action' => 'アクション', @@ -347,41 +347,41 @@ $LANG['ja'] = array( 'Banlist' => 'BANリスト', 'ranges are acceptable' => '範囲指定が可能です', 'CIDR format is supported' => 'CIDRフォーマットが使用できます', - 'Add one more Name Server' => 'Add one more Name Server', + 'Add one more Name Server' => 'ネームサーバーを追加', 'unlimited' => '無制限', - '1 account' => '1つのアカウント', - '%s accounts' => '%sつのアカウント', - '1 domain' => '1つのドメイン', - '%s domains' => '%sつのドメイン', - '1 record' => '1つのレコード', - '%s records' => '%sつのレコード', - '1 mail account' => '1つのメールアカウント', - '%s mail accounts' => '%sつのメールアカウント', - '1 database' => '1つのデータベース', - '%s databases' => '%sつのデータベース', - '1 cron job' => '1つのcronジョブ', - '%s cron jobs' => '%sつのcronジョブ', - '1 archive' => '1つのアーカイブ', - '%s archives' => '%sつのアーカイブ', - '1 package' => '1つのパッケージ', - '%s packages' => '%sつのパッケージ', - '1 IP address' => '1つのIPアドレス', - '%s IP addresses' => '%sつのIPアドレス', + '1 account' => '1個のアカウント', + '%s accounts' => '%s個のアカウント', + '1 domain' => '1個のドメイン', + '%s domains' => '%s個のドメイン', + '1 record' => '1個のレコード', + '%s records' => '%s個のレコード', + '1 mail account' => '1個のメールアカウント', + '%s mail accounts' => '%s個のメールアカウント', + '1 database' => '1個のデータベース', + '%s databases' => '%s個のデータベース', + '1 cron job' => '1個のCronジョブ', + '%s cron jobs' => '%s個のCronジョブ', + '1 archive' => '1個のアーカイブ', + '%s archives' => '%s個のアーカイブ', + '1 package' => '1個のパッケージ', + '%s packages' => '%s個のパッケージ', + '1 IP address' => '1個のIPアドレス', + '%s IP addresses' => '%s個のIPアドレス', '1 month' => '1ヶ月', '%s months' => '%sヶ月', - '1 log record' => '1つのログレコード', - '%s log records' => '%sつのログレコード', - '1 object' => '1つのオブジェクト', - '%s objects' => '%sつのオブジェクト', + '1 log record' => '1個のログレコード', + '%s log records' => '%s個のログレコード', + '1 object' => '1個のオブジェクト', + '%s objects' => '%s個のオブジェクト', 'no exclusions' => '除外しない', - '1 rule' => '1つの規則', - '%s rules' => '%sつの規則', + '1 rule' => '1個の規則', + '%s rules' => '%s個の規則', 'There are no currently banned IP' => '現在BANされているIPはありません', 'USER_CREATED_OK' => 'ユーザー %s は正常に作成されました', 'WEB_DOMAIN_CREATED_OK' => 'ドメイン %s は正常に作成されました', - 'DNS_DOMAIN_CREATED_OK' => 'DNS ドメイン %s は正常に作成されました', + 'DNS_DOMAIN_CREATED_OK' => 'DNSドメイン %s は正常に作成されました', 'DNS_RECORD_CREATED_OK' => 'レコード %s.%s は正常に作成されました', 'MAIL_DOMAIN_CREATED_OK' => 'メールドメイン %s は正常に作成されました', 'MAIL_ACCOUNT_CREATED_OK' => 'メールアカウント %s@%s は正常に作成されました', @@ -393,8 +393,8 @@ $LANG['ja'] = array( 'RULE_CREATED_OK' => '規則は正常に作成されました', 'Autoupdate has been successfully enabled' => '自動更新が有効化されました', 'Autoupdate has been successfully disabled' => '自動更新が無効化されました', - 'Cronjob email reporting has been successfully enabled' => 'Cronjobのメール報告が有効化されました', - 'Cronjob email reporting has been successfully disabled' => 'Cronjobのメール報告が無効化されました', + 'Cronjob email reporting has been successfully enabled' => 'Cronジョブのメール報告が有効化されました', + 'Cronjob email reporting has been successfully disabled' => 'Cronジョブのメール報告が無効化されました', 'Changes has been saved.' => '変更が保存されました', 'Confirmation' => '確認', 'DELETE_USER_CONFIRMATION' => 'ユーザー %s を削除してもよろしいですか？', @@ -423,7 +423,7 @@ $LANG['ja'] = array( 'SUSPEND_RULE_CONFIRMATION' => '規則 #%s を停止してもよろしいですか？', 'UNSUSPEND_RULE_CONFIRMATION' => '規則 %s の停止を解除してもよろしいですか？', 'LEAVE_PAGE_CONFIRMATION' => 'ページを離れてもよろしいですか？', - 'RESTART_CONFIRMATION' => '%s を再起動させてもよろしいですか？', + 'RESTART_CONFIRMATION' => '%s を再起動してもよろしいですか？', 'Welcome' => 'ようこそ', 'LOGGED_IN_AS' => '%s としてログインしました', 'Error' => 'エラー', @@ -435,7 +435,7 @@ $LANG['ja'] = array( 'Password is too short.' => 'パスワードが短すぎます（少なくとも6文字必要です）', 'Error code:' => 'エラーコード： %s', 'SERVICE_ACTION_FAILED' => '"%s" "%s" に失敗しました', - 'IP address is in use' => 'IPアドレスはすでに使われています', + 'IP address is in use' => 'IPアドレスは既に使われています', 'BACKUP_SCHEDULED' => 'タスクがキューに追加されました　バックアップのダウンロードの準備が完了するとメールによる通知が送信されます', 'BACKUP_EXISTS' => '現在バックアップが実行中です　バックアップが完了するまでお待ちください', 'RESTORE_SCHEDULED' => 'タスクがキューに追加されました　復元が完了するとメールによる通知が送信されます', @@ -444,21 +444,21 @@ $LANG['ja'] = array( 'WEB_EXCLUSIONS' => "ドメイン名を一行ずつ入力してください すべてのドメインを除外するには*を使用してください 特定のディレクトリを除外するには次の形式を用いてください： domain.com:public_html/cache:public_html/tmp", 'DNS_EXCLUSIONS' => "ドメイン名を一行ずつ入力してください すべてのドメインを除外するには*を使用してください", 'MAIL_EXCLUSIONS' => "ドメイン名を一行ずつ入力してください すべてのドメインを除外するには*を使用してください 特定のアカウントを除外するには次の形式を用いてください： domain.com:info:support:postmaster", - 'DB_EXCLUSIONS' => "データベース名をフルで一行ずつ入力してください すべてのデータベースを除外するには*を使用してください", + 'DB_EXCLUSIONS' => "完全なデータベース名を一行ずつ入力してください すべてのデータベースを除外するには*を使用してください", 'CRON_EXCLUSIONS' => "すべてのジョブを除外するには*を使用してください", 'USER_EXCLUSIONS' => "ディレクトリ名を一行ずつ入力してください すべてのディレクトリを除外するには*を使用してください", - 'Welcome to Vesta Control Panel' => 'Vesta Control Panel へようこそ', + 'Welcome to Vesta Control Panel' => 'Vesta Control Panel にようこそ', 'MAIL_FROM' => 'Vesta Control Panel ', - 'GREETINGS_GORDON_FREEMAN' => "こんにちは %s %s さん\n", + 'GREETINGS_GORDON_FREEMAN' => "こんにちは、 %s %s さん\n", 'GREETINGS' => "こんにちは\n", - 'ACCOUNT_READY' => "アカウントは正常に作成され、使用する準備ができました\n\nhttps://%s/login/\ユーザー名： %s\nパスワード： %s\n\n--\nVesta Control Panel\n", + 'ACCOUNT_READY' => "アカウントは正常に作成され、使用する準備ができました\n\nhttps://%s/login/\nユーザー名： %s\nパスワード： %s\n\n--\nVesta Control Panel\n", - 'FTP login credentials' => 'FTPログイン認証資格', - 'FTP_ACCOUNT_READY' => "FTPアカウントは正常に作成され、使用する準備ができました\n\ホスト名： %s\ユーザー名： %s_%s\nパスワード： %s\n\n--\nVesta Control Panel\n", + 'FTP login credentials' => 'FTPログイン情報', + 'FTP_ACCOUNT_READY' => "FTPアカウントは正常に作成され、使用する準備ができました\n\nホスト名： %s\nユーザー名： %s_%s\nパスワード： %s\n\n--\nVesta Control Panel\n", - 'Database Credentials' => 'データベース認証資格', - 'DATABASE_READY' => "データベースは正常に作成されました.\n\nデータベース： %s\nユーザー： %s\nパスワード： %s\n%s\n\n--\nVesta Control Panel\n", + 'Database Credentials' => 'データベースログイン情報', + 'DATABASE_READY' => "データベースは正常に作成されました\n\nデータベース名： %s\nユーザー名： %s\nパスワード： %s\n%s\n\n--\nVesta Control Panel\n", 'forgot password' => 'パスワードを忘れた場合', 'Confirm' => '確認', @@ -487,7 +487,7 @@ $LANG['ja'] = array( 'Configuring Server' => 'サーバー設定', 'Hostname' => 'ホスト名', 'Time Zone' => 'タイムゾーン', - 'Default Language' => 'デフォルトの言語', + 'Default Language' => '規定の言語', 'FileSystem Disk Quota ' => 'ディスク割り当て量', 'Vesta Control Panel Plugins' => 'Vesta Control Panel プラグイン', 'preview' => 'プレビュー', @@ -496,108 +496,108 @@ $LANG['ja'] = array( 'Template Manager' => 'テンプレートマネージャー', 'Backup Migration Manager' => 'バックアップ移行マネージャー', 'FileManager' => 'ファイルマネージャー', - 'show: CPU / MEM / NET / DISK' => 'show: CPU / MEM / NET / DISK', + 'show: CPU / MEM / NET / DISK' => '表示: CPU / MEM / NET / DISK', 'sort by' => 'ソート', 'Date' => '日付', 'Starred' => 'スター付き', 'Name' => '名前', - 'File Manager' => 'File Manager', - 'type' => 'type', - 'size' => 'size', - 'date' => 'date', - 'name' => 'name', - 'Initializing' => 'Initializing', - 'UPLOAD' => 'UPLOAD', - 'NEW FILE' => 'NEW FILE', - 'NEW DIR' => 'NEW DIR', - 'DELETE' => 'DELETE', - 'RENAME' => 'RENAME', - 'COPY' => 'COPY', - 'ARCHIVE' => 'ARCHIVE', - 'EXTRACT' => 'EXTRACT', - 'DOWNLOAD' => 'DOWNLOAD', - 'Hit' => 'Hit', - 'to reload the page' => 'to reload the page', - 'Directory name cannot be empty' => 'Directory name cannot be empty', - 'File name cannot be empty' => 'File name cannot be empty', - 'No file selected' => 'No file selected', - 'No file or folder selected' => 'No file or folder selected', - 'File type not supported' => 'File type not supported', - 'Directory download not available in current version' => 'Directory download not available in current version', - 'Directory not available' => 'Directory not available', - 'Done' => 'Done', - 'Close' => 'Close', - 'Copy' => 'Copy', - 'Cancel' => 'Cancel', - 'Rename' => 'Rename', - 'Delete' => 'Delete', - 'Extract' => 'Extract', - 'Create' => 'Create', - 'Compress' => 'Compress', + 'File Manager' => 'ファイルマネージャー', + 'type' => '種類', + 'size' => '容量', + 'date' => '日付', + 'name' => '名前', + 'Initializing' => '初期化中', + 'UPLOAD' => 'アップロード', + 'NEW FILE' => '新規ファイル', + 'NEW DIR' => '新規ディレクトリ', + 'DELETE' => '削除', + 'RENAME' => '名前の変更', + 'COPY' => 'コピー', + 'ARCHIVE' => 'アーカイブ', + 'EXTRACT' => '展開', + 'DOWNLOAD' => 'ダウンロード', + 'Hit' => '', + 'to reload the page' => 'を押すとページを再読み込みします', + 'Directory name cannot be empty' => 'ディレクトリ名を入力してください', + 'File name cannot be empty' => 'ファイル名を入力してください', + 'No file selected' => 'ファイルが選択されていません', + 'No file or folder selected' => 'ファイルやフォルダが選択されていません', + 'File type not supported' => 'サポートされていないファイル形式です', + 'Directory download not available in current version' => '現在のバージョンではディレクトリのダウンロードはできません', + 'Directory not available' => 'ディレクトリが使用できません', + 'Done' => '完了', + 'Close' => '閉じる', + 'Copy' => 'コピー', + 'Cancel' => 'キャンセル', + 'Rename' => '名前を変更', + 'Delete' => '削除', + 'Extract' => '展開', + 'Create' => '作成', + 'Compress' => '圧縮', 'OK' => 'OK', - 'Are you sure you want to copy' => 'Are you sure you want to copy', - 'Are you sure you want to delete' => 'Are you sure you want to delete', - 'into' => 'into', - 'existing files will be replaced' => 'existing files will be replaced', - 'Original name' => 'Original name', - 'File' => 'File', - 'already exists' => 'already exists', - 'Create file' => 'Create file', - 'Create directory' => 'Create directory', + 'Are you sure you want to copy' => '次のファイルをコピーしてもよろしいですか', + 'Are you sure you want to delete' => '次のファイルを削除してもよろしいですか', + 'into' => 'から', + 'existing files will be replaced' => '既に存在するファイルは置き換えられます', + 'Original name' => '元の名前', + 'File' => 'ファイル', + 'already exists' => 'は既に存在します', + 'Create file' => 'ファイルの作成', + 'Create directory' => 'ディレクトリの作成', - 'Add New object' => 'Add New object', - 'Save Form' => 'Save Form', - 'Cancel saving form' => 'Cancel saving form', - 'Go to USER list' => 'Go to USER list', - 'Go to WEB list' => 'Go to WEB list', - 'Go to DNS list' => 'Go to DNS list', - 'Go to MAIL list' => 'Go to MAIL list', - 'Go to DB list' => 'Go to DB list', - 'Go to CRON list' => 'Go to CRON list', - 'Go to BACKUP list' => 'Go to BACKUP list', - 'Focus on search' => 'Focus on search', - 'Display/Close shortcuts' => 'Display/Close shortcuts', - 'Move backward through top menu' => 'Move backward through top menu', - 'Move forward through top menu' => 'Move forward through top menu', - 'Enter focused element' => 'Enter focused element', + 'Add New object' => '新しい項目を追加する', + 'Save Form' => '変更を保存する', + 'Cancel saving form' => '変更を破棄する', + 'Go to USER list' => 'ユーザーの一覧に移動', + 'Go to WEB list' => 'ウェブの一覧に移動', + 'Go to DNS list' => 'DNSの一覧に移動', + 'Go to MAIL list' => 'メールの一覧に移動', + 'Go to DB list' => 'データベースの一覧に移動', + 'Go to CRON list' => 'CRONの一覧に移動', + 'Go to BACKUP list' => 'バックアップの一覧に移動', + 'Focus on search' => '検索欄にフォーカスする', + 'Display/Close shortcuts' => 'ショートカットの表示を切り替える', + 'Move backward through top menu' => '上部のメニューにおいて後方の項目に移動します', + 'Move forward through top menu' => '上部のメニューにおいて前方の項目に移動します', + 'Enter focused element' => 'フォーカスされた項目に入ります', - 'Upload' => 'Upload', - 'New File' => 'New File', - 'New Folder' => 'New Folder', - 'Download' => 'Download', - 'Rename' => 'Rename', - 'Copy' => 'Copy', - 'Archive' => 'Archive', - 'Delete' => 'Delete', - 'Save File (in text editor)' => 'Save File (in text editor)', - 'Close Popup / Cancel' => 'Close Popup / Cancel', - 'Move Cursor Up' => 'Move Cursor Up', - 'Move Cursor Dow' => 'Move Cursor Dow', - 'Switch to Left Tab' => 'Switch to Left Tab', - 'Switch to Right Tab' => 'Switch to Right Tab', - 'Switch Tab' => 'Switch Tab', - 'Go to the Top of File List' => 'Go to the Top of File List', - 'Go to the Last File' => 'Go to the Last File', - 'Open File/Enter Directory' => 'Open File/Enter Directory', - 'Go to Parent Directory' => 'Go to Parent Directory', - 'Select Current File' => 'Select Current File', - 'Select Bunch of Files' => 'Select Bunch of Files', - 'Append File to the Current Selection' => 'Append File to the Current Selection', - 'Select All Files' => 'Select All Files', + 'Upload' => 'アップロード', + 'New File' => 'ファイルの作成', + 'New Folder' => 'フォルダの作成', + 'Download' => 'ダウンロード', + 'Rename' => '名前の変更', + 'Copy' => 'コピー', + 'Archive' => 'アーカイブ', + 'Delete' => '削除', + 'Save File (in text editor)' => 'ファイルを保存（テキストエディタ上で）', + 'Close Popup / Cancel' => 'ポップアップを閉じる / キャンセルする', + 'Move Cursor Up' => 'カーソルを上に移動する', + 'Move Cursor Dow' => 'カーソルを下に移動する', + 'Switch to Left Tab' => '左のタブに切り替える', + 'Switch to Right Tab' => '右のタブに切り替える', + 'Switch Tab' => 'タブを切り替える', + 'Go to the Top of File List' => 'ファイルリストの先頭に移動する', + 'Go to the Last File' => '最後のファイルに移動する', + 'Open File/Enter Directory' => 'ファイルを開く / ディレクトリに入る', + 'Go to Parent Directory' => '親ディレクトリに移動する', + 'Select Current File' => '現在のファイルを選択する', + 'Select Bunch of Files' => '複数のファイルを選択する', + 'Append File to the Current Selection' => '現在の場所にファイルを追加する', + 'Select All Files' => 'すべてのファイルを選択する', 'shortcuts are inspired by magnificent GNU Midnight Commander file manager' => 'shortcuts are inspired by magnificent GNU Midnight Commander file manager', - 'Licence Key' => 'Licence Key', - 'Enter License Key' => 'Enter License Key', - 'Buy Licence' => 'Buy Licence', - 'Buy Lifetime License' => 'Buy Lifetime License', - 'Disable and Cancel Licence' => 'Disable and Cancel Licence', - 'Licence Activated' => 'Licence Activated', - 'Licence Deactivated' => 'Licence Deactivated', - 'Restrict users so that they cannot use SSH and access only their home directory.' => 'Restrict users so that they cannot use SSH and access only their home directory.', - 'Browse, copy, edit, view, and retrieve all of your web domain files using fully featured File Manager.' => 'Browse, copy, edit, view, and retrieve all of your web domain files using fully featured File Manager.', - 'This is a commercial module, you would need to purchace license key to enable it.' => 'This is a commercial module, you would need to purchace license key to enable it.' + 'Licence Key' => 'ライセンスキー', + 'Enter License Key' => 'ライセンスキーを入力', + 'Buy Licence' => 'ライセンスを購入', + 'Buy Lifetime License' => '永久ライセンスを購入', + 'Disable and Cancel Licence' => 'ライセンスをキャンセルして無効化する', + 'Licence Activated' => 'ライセンスが有効化されました', + 'Licence Deactivated' => 'ライセンスが無効化されました', + 'Restrict users so that they cannot use SSH and access only their home directory.' => 'ユーザーによるSSHの使用を禁止し、各自のホームディレクトリにのみアクセスできるように制限します', + 'Browse, copy, edit, view, and retrieve all of your web domain files using fully featured File Manager.' => '高機能なファイルマネージャーを用いてウェブ上のファイルを閲覧、コピー、編集、表示、復旧できます', + 'This is a commercial module, you would need to purchace license key to enable it.' => 'これは有償の機能で、有効化するにはライセンスキーを購入する必要があります' ); \ No newline at end of file From e1613be90cfbeadd7cda3406df23559fe4ca2693 Mon Sep 17 00:00:00 2001 From: Flat Date: Mon, 23 Nov 2015 11:25:28 +0900 Subject: [PATCH 221/264] [LANG-JA] Some improvements. --- web/inc/i18n/ja.php | 50 ++++++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/web/inc/i18n/ja.php b/web/inc/i18n/ja.php index 222e415b9..7f664cb15 100644 --- a/web/inc/i18n/ja.php +++ b/web/inc/i18n/ja.php @@ -62,8 +62,8 @@ $LANG['ja'] = array( 'rebuild db' => 'データベースを再構築', 'rebuild cron' => 'Cronを再構築', 'update counters' => 'カウンタを更新', - 'suspend' => '停止', - 'unsuspend' => '停止解除', + 'suspend' => '凍結', + 'unsuspend' => '凍結解除', 'delete' => '削除', 'show per user' => 'ユーザー別', 'login as' => '次のユーザーとしてログイン：', @@ -122,8 +122,8 @@ $LANG['ja'] = array( 'Adding IP Address to Banlist' => 'BANリストへのIPアドレスの追加', 'active' => 'アクティブ', - 'spnd' => '停止中', - 'suspended' => '停止中', + 'spnd' => '凍結中', + 'suspended' => '凍結中', 'running' => '実行中', 'stopped' => '停止中', 'outdated' => '旧版', @@ -239,7 +239,7 @@ $LANG['ja'] = array( 'Release' => 'リリース', 'Architecture' => 'アーキテクチャ', 'Object' => 'オブジェクト', - 'Owner' => '使用者', + 'Owner' => '所有者', 'Username' => 'ユーザー名', 'Password' => 'パスワード', 'Email' => 'メールアドレス', @@ -398,30 +398,30 @@ $LANG['ja'] = array( 'Changes has been saved.' => '変更が保存されました', 'Confirmation' => '確認', 'DELETE_USER_CONFIRMATION' => 'ユーザー %s を削除してもよろしいですか？', - 'SUSPEND_USER_CONFIRMATION' => 'ユーザー %s を停止してもよろしいですか？', - 'UNSUSPEND_USER_CONFIRMATION' => 'ユーザー %s の停止を解除してもよろしいですか？', + 'SUSPEND_USER_CONFIRMATION' => 'ユーザー %s を凍結してもよろしいですか？', + 'UNSUSPEND_USER_CONFIRMATION' => 'ユーザー %s の凍結を解除してもよろしいですか？', 'DELETE_DOMAIN_CONFIRMATION' => 'ドメイン %s を削除してもよろしいですか？', - 'SUSPEND_DOMAIN_CONFIRMATION' => 'ドメイン %s を停止してもよろしいですか？', - 'UNSUSPEND_DOMAIN_CONFIRMATION' => 'ドメイン %s の停止を解除してもよろしいですか？', + 'SUSPEND_DOMAIN_CONFIRMATION' => 'ドメイン %s を凍結してもよろしいですか？', + 'UNSUSPEND_DOMAIN_CONFIRMATION' => 'ドメイン %s の凍結を解除してもよろしいですか？', 'DELETE_RECORD_CONFIRMATION' => 'レコード %s を削除してもよろしいですか？', - 'SUSPEND_RECORD_CONFIRMATION' => 'レコード %s を停止してもよろしいですか？', - 'UNSUSPEND_RECORD_CONFIRMATION' => 'レコード %s の停止を解除してもよろしいですか？', + 'SUSPEND_RECORD_CONFIRMATION' => 'レコード %s を凍結してもよろしいですか？', + 'UNSUSPEND_RECORD_CONFIRMATION' => 'レコード %s の凍結を解除してもよろしいですか？', 'DELETE_MAIL_ACCOUNT_CONFIRMATION' => 'メールアカウント %s を削除してもよろしいですか？', - 'SUSPEND_MAIL_ACCOUNT_CONFIRMATION' => 'メールアカウント %s を停止してもよろしいですか？', - 'UNSUSPEND_MAIL_ACCOUNT_CONFIRMATION' => 'メールアカウント %s の停止を解除してもよろしいですか？', + 'SUSPEND_MAIL_ACCOUNT_CONFIRMATION' => 'メールアカウント %s を凍結してもよろしいですか？', + 'UNSUSPEND_MAIL_ACCOUNT_CONFIRMATION' => 'メールアカウント %s の凍結を解除してもよろしいですか？', 'DELETE_DATABASE_CONFIRMATION' => 'データベース %s を削除してもよろしいですか？', - 'SUSPEND_DATABASE_CONFIRMATION' => 'データベース %s を停止してもよろしいですか？', - 'UNSUSPEND_DATABASE_CONFIRMATION' => 'データベース %s の停止を解除してもよろしいですか？', + 'SUSPEND_DATABASE_CONFIRMATION' => 'データベース %s を凍結してもよろしいですか？', + 'UNSUSPEND_DATABASE_CONFIRMATION' => 'データベース %s の凍結を解除してもよろしいですか？', 'DELETE_CRON_CONFIRMATION' => 'Cronジョブを削除してもよろしいですか？', - 'SUSPEND_CRON_CONFIRMATION' => 'Cronジョブを停止してもよろしいですか？', - 'UNSUSPEND_CRON_CONFIRMATION' => 'Cronジョブの停止を解除してもよろしいですか？', + 'SUSPEND_CRON_CONFIRMATION' => 'Cronジョブを凍結してもよろしいですか？', + 'UNSUSPEND_CRON_CONFIRMATION' => 'Cronジョブの凍結を解除してもよろしいですか？', 'DELETE_BACKUP_CONFIRMATION' => 'バックアップ %s を削除してもよろしいですか？', 'DELETE_EXCLUSION_CONFIRMATION' => 'バックアップ除外設定 %s を削除してもよろしいですか？', 'DELETE_PACKAGE_CONFIRMATION' => 'パッケージ %s を削除してもよろしいですか？', 'DELETE_IP_CONFIRMATION' => 'IPアドレス %s を削除してもよろしいですか？', 'DELETE_RULE_CONFIRMATION' => '規則 #%s を削除してもよろしいですか？', - 'SUSPEND_RULE_CONFIRMATION' => '規則 #%s を停止してもよろしいですか？', - 'UNSUSPEND_RULE_CONFIRMATION' => '規則 %s の停止を解除してもよろしいですか？', + 'SUSPEND_RULE_CONFIRMATION' => '規則 #%s を凍結してもよろしいですか？', + 'UNSUSPEND_RULE_CONFIRMATION' => '規則 %s の凍結を解除してもよろしいですか？', 'LEAVE_PAGE_CONFIRMATION' => 'ページを離れてもよろしいですか？', 'RESTART_CONFIRMATION' => '%s を再起動してもよろしいですか？', 'Welcome' => 'ようこそ', @@ -436,7 +436,7 @@ $LANG['ja'] = array( 'Error code:' => 'エラーコード： %s', 'SERVICE_ACTION_FAILED' => '"%s" "%s" に失敗しました', 'IP address is in use' => 'IPアドレスは既に使われています', - 'BACKUP_SCHEDULED' => 'タスクがキューに追加されました　バックアップのダウンロードの準備が完了するとメールによる通知が送信されます', + 'BACKUP_SCHEDULED' => 'タスクがキューに追加されました　バックアップがダウンロード可能になると、メールによる通知が送信されます', 'BACKUP_EXISTS' => '現在バックアップが実行中です　バックアップが完了するまでお待ちください', 'RESTORE_SCHEDULED' => 'タスクがキューに追加されました　復元が完了するとメールによる通知が送信されます', 'RESTORE_EXISTS' => '現在復元作業が実行中です　再度操作を行う前に復元作業が完了するまでお待ちください', @@ -571,7 +571,7 @@ $LANG['ja'] = array( 'Copy' => 'コピー', 'Archive' => 'アーカイブ', 'Delete' => '削除', - 'Save File (in text editor)' => 'ファイルを保存（テキストエディタ上で）', + 'Save File (in text editor)' => 'ファイルの保存（テキストエディタ上で）', 'Close Popup / Cancel' => 'ポップアップを閉じる / キャンセルする', 'Move Cursor Up' => 'カーソルを上に移動する', 'Move Cursor Dow' => 'カーソルを下に移動する', @@ -582,9 +582,9 @@ $LANG['ja'] = array( 'Go to the Last File' => '最後のファイルに移動する', 'Open File/Enter Directory' => 'ファイルを開く / ディレクトリに入る', 'Go to Parent Directory' => '親ディレクトリに移動する', - 'Select Current File' => '現在のファイルを選択する', - 'Select Bunch of Files' => '複数のファイルを選択する', - 'Append File to the Current Selection' => '現在の場所にファイルを追加する', + 'Select Current File' => 'ファイルを選択する', + 'Select Bunch of Files' => 'ファイルを範囲選択する', + 'Append File to the Current Selection' => 'ファイルを追加選択する', 'Select All Files' => 'すべてのファイルを選択する', 'shortcuts are inspired by magnificent GNU Midnight Commander file manager' => 'shortcuts are inspired by magnificent GNU Midnight Commander file manager', @@ -600,4 +600,4 @@ $LANG['ja'] = array( 'Browse, copy, edit, view, and retrieve all of your web domain files using fully featured File Manager.' => '高機能なファイルマネージャーを用いてウェブ上のファイルを閲覧、コピー、編集、表示、復旧できます', 'This is a commercial module, you would need to purchace license key to enable it.' => 'これは有償の機能で、有効化するにはライセンスキーを購入する必要があります' -); \ No newline at end of file +); From 735fc1fc7acc4b5f5485ddbefd7ebe06cbd19fc6 Mon Sep 17 00:00:00 2001 From: Flat Date: Mon, 23 Nov 2015 16:24:14 +0900 Subject: [PATCH 222/264] Fix #502 --- bin/v-change-user-language | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/bin/v-change-user-language b/bin/v-change-user-language index c6e7b0cbf..c8da05641 100755 --- a/bin/v-change-user-language +++ b/bin/v-change-user-language @@ -19,9 +19,14 @@ source $VESTA/conf/vesta.conf is_language_valid() { - if [ ! -e "$VESTA/web/inc/i18n/$language.php" ]; then - echo "Error: language $language not exist" - log_event "$E_NOTEXIST $EVENT" + if ! [[ "$1" =~ ^[[:alnum:]_-]+$ ]]; then + echo "Error: language $1 not valid" + log_event "$E_INVALID" "$EVENT" + exit $E_INVALID + fi + if [ ! -e "$VESTA/web/inc/i18n/$1.php" ]; then + echo "Error: language $1 not exist" + log_event "$E_NOTEXIST" "$EVENT" exit $E_NOTEXIST fi } From dbeba76fa96b5d09b4b972077edd2f825b315e75 Mon Sep 17 00:00:00 2001 From: Flat Date: Mon, 23 Nov 2015 16:42:21 +0900 Subject: [PATCH 223/264] Improve grammar. --- bin/v-change-user-language | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/v-change-user-language b/bin/v-change-user-language index c8da05641..82e8945ae 100755 --- a/bin/v-change-user-language +++ b/bin/v-change-user-language @@ -20,12 +20,12 @@ source $VESTA/conf/vesta.conf is_language_valid() { if ! [[ "$1" =~ ^[[:alnum:]_-]+$ ]]; then - echo "Error: language $1 not valid" + echo "Error: language $1 is not valid" log_event "$E_INVALID" "$EVENT" exit $E_INVALID fi if [ ! -e "$VESTA/web/inc/i18n/$1.php" ]; then - echo "Error: language $1 not exist" + echo "Error: language $1 doesn't exist" log_event "$E_NOTEXIST" "$EVENT" exit $E_NOTEXIST fi From 9ba1c686d56967532261f12d62350a35de32442b Mon Sep 17 00:00:00 2001 From: Flat Date: Mon, 23 Nov 2015 16:50:58 +0900 Subject: [PATCH 224/264] Use soft-tabs. --- bin/v-change-user-language | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/v-change-user-language b/bin/v-change-user-language index 82e8945ae..800b61a8e 100755 --- a/bin/v-change-user-language +++ b/bin/v-change-user-language @@ -19,7 +19,7 @@ source $VESTA/conf/vesta.conf is_language_valid() { - if ! [[ "$1" =~ ^[[:alnum:]_-]+$ ]]; then + if ! [[ "$1" =~ ^[[:alnum:]_-]+$ ]]; then echo "Error: language $1 is not valid" log_event "$E_INVALID" "$EVENT" exit $E_INVALID From 05b76fefb290b442847ed2ac3e9eb61869392419 Mon Sep 17 00:00:00 2001 From: Flat Date: Mon, 23 Nov 2015 18:40:36 +0900 Subject: [PATCH 225/264] Split duplicated functions into web/inc/i18n.php --- web/inc/i18n.php | 47 +++++++++++++++++++++++++++++++++++++++++++ web/inc/main.php | 50 ++-------------------------------------------- web/js/i18n.js.php | 42 +++----------------------------------- 3 files changed, 52 insertions(+), 87 deletions(-) create mode 100644 web/inc/i18n.php diff --git a/web/inc/i18n.php b/web/inc/i18n.php new file mode 100644 index 000000000..5e4f71c19 --- /dev/null +++ b/web/inc/i18n.php @@ -0,0 +1,47 @@ +1) { + $args[0] = $text; + return call_user_func_array("sprintf",$args); + } else { + return $text; + } +} + +/** + * Translates string by a given key in first parameter to current session language. Works like sprintf + * @global array $LANG Associative array of language pharses + * @return string Translated string + * @see _translate() + */ +function __() { + $args = func_get_args(); + array_unshift($args,$_SESSION['language']); + return call_user_func_array("_translate",$args); +} diff --git a/web/inc/main.php b/web/inc/main.php index 68fbe272a..91e380ff2 100644 --- a/web/inc/main.php +++ b/web/inc/main.php @@ -1,6 +1,8 @@ 1) { - $args[0] = $text; - return call_user_func_array("sprintf",$args); - } else { - return $text; - } -} - define('VESTA_CMD', '/usr/bin/sudo /usr/local/vesta/bin/'); $i = 0; diff --git a/web/js/i18n.js.php b/web/js/i18n.js.php index d84c95801..c3429d402 100644 --- a/web/js/i18n.js.php +++ b/web/js/i18n.js.php @@ -1,47 +1,11 @@ 1) { - $args[0] = $text; - return call_user_func_array("sprintf",$args); - } else { - return $text; - } - } -} - -if (!function_exists('__')) { - function __() { - $args = func_get_args(); - array_unshift($args,$_SESSION['language']); - return call_user_func_array("_translate",$args); - } -} ?> App.i18n.ARE_YOU_SURE = ''; From 2bd84f00f933e3701ccb94700e1b268451bcb649 Mon Sep 17 00:00:00 2001 From: Flat Date: Mon, 23 Nov 2015 19:46:38 +0900 Subject: [PATCH 226/264] Detect user language --- web/inc/i18n.php | 65 ++++++++++++++++++++++++++++++ web/js/i18n.js.php | 2 +- web/login/index.php | 4 +- web/reset/index.php | 10 +---- web/templates/admin/edit_user.html | 2 +- web/templates/user/edit_user.html | 2 +- 6 files changed, 72 insertions(+), 13 deletions(-) diff --git a/web/inc/i18n.php b/web/inc/i18n.php index 5e4f71c19..5971dc3d8 100644 --- a/web/inc/i18n.php +++ b/web/inc/i18n.php @@ -45,3 +45,68 @@ function __() { array_unshift($args,$_SESSION['language']); return call_user_func_array("_translate",$args); } + +/** + * Detects user language from Accept-Language HTTP header. + * @param string Fallback language (default: 'en') + * @return string Language code (such as 'en' and 'ja') + */ +function detect_user_language($fallback='en') { + static $user_lang = ''; + + // Already detected + if (!empty($user_lang)) return $user_lang; + + // Check if Accept-Language header is available + if (!isset($_SERVER) || + !isset($_SERVER['HTTP_ACCEPT_LANGUAGE']) || + !is_string($_SERVER['HTTP_ACCEPT_LANGUAGE']) + ) { + // Store result for reusing + $user_lang = $fallback; + return $user_lang; + } + + // Sort Accept-Language by `q` value + $accept_langs = explode(',', preg_replace('/\s/', '', strtolower($_SERVER['HTTP_ACCEPT_LANGUAGE']))); + $accept_langs_sorted = []; + foreach ($accept_langs as $lang) { + $div = explode(';q=', $lang, 2); + if (count($div) < 2) { + // `q` value was not specfied + // -> Set default `q` value (1) + $div[] = '1'; + } + list($code, $q) = $div; + if (preg_match('/^[\w\-]+$/', $code)) { + // Acceptable language code + $accept_langs_sorted[$code] = (double)$q; + } + } + arsort($accept_langs_sorted); + + // List lanugages + exec (VESTA_CMD."v-list-sys-languages json", $output, $return_var); + $languages = json_decode(implode('', $output), true); + unset($output); + + // Find best matching language + foreach ($accept_langs_sorted as $user_lang => $dummy) { + $decision = ''; + foreach ($languages as $prov_lang) { + if (strlen($decision) > strlen($prov_lang)) continue; + if (strpos($user_lang, $prov_lang) !== false) { + $decision = $prov_lang; + } + } + if (!empty($decision)) { + // Store result for reusing + $user_lang = $decision; + return $user_lang; + } + } + + // Store result for reusing + $user_lang = $fallback; + return $user_lang; +} \ No newline at end of file diff --git a/web/js/i18n.js.php b/web/js/i18n.js.php index c3429d402..34f52f188 100644 --- a/web/js/i18n.js.php +++ b/web/js/i18n.js.php @@ -4,7 +4,7 @@ session_start(); require_once($_SERVER['DOCUMENT_ROOT'].'/inc/i18n.php'); if (empty($_SESSION['language'])) { - $_SESSION['language'] = 'en'; + $_SESSION['language'] = detect_user_language(); } ?> diff --git a/web/login/index.php b/web/login/index.php index 06617e2f4..f084ae174 100644 --- a/web/login/index.php +++ b/web/login/index.php @@ -93,8 +93,8 @@ foreach ($sys_arr as $key => $value) { $_SESSION[$key] = $value; } -// Set default language -if (empty($_SESSION['language'])) $_SESSION['language']='en'; +// Detect language +if (empty($_SESSION['language'])) $_SESSION['language'] = detect_user_language(); require_once($_SERVER['DOCUMENT_ROOT'].'/inc/i18n/'.$_SESSION['language'].'.php'); require_once('../templates/header.html'); diff --git a/web/reset/index.php b/web/reset/index.php index f84fb38da..abde3c145 100644 --- a/web/reset/index.php +++ b/web/reset/index.php @@ -74,14 +74,8 @@ if ((!empty($_POST['user'])) && (!empty($_POST['code'])) && (!empty($_POST['pass } } -// Set system language -exec (VESTA_CMD . "v-list-sys-config json", $output, $return_var); -$data = json_decode(implode('', $output), true); -if (!empty( $data['config']['LANGUAGE'])) { - $_SESSION['language'] = $data['config']['LANGUAGE']; -} else { - $_SESSION['language'] = 'en'; -} +// Detect language +if (empty($_SESSION['language'])) $_SESSION['language'] = detect_user_language(); if (empty($_GET['action'])) { require_once '../templates/header.html'; diff --git a/web/templates/admin/edit_user.html b/web/templates/admin/edit_user.html index 894a8a2cc..8717ce3f6 100644 --- a/web/templates/admin/edit_user.html +++ b/web/templates/admin/edit_user.html @@ -125,7 +125,7 @@ if (( $value == $v_language ) || ( $svalue == $v_language)){ echo 'selected' ; } - if (( $value == 'en' ) && (empty($v_language))){ + if (( $value == detect_user_language() ) && (empty($v_language))){ echo 'selected' ; } echo ">".htmlentities($value)."\n"; diff --git a/web/templates/user/edit_user.html b/web/templates/user/edit_user.html index d42998a41..66600bd95 100644 --- a/web/templates/user/edit_user.html +++ b/web/templates/user/edit_user.html @@ -104,7 +104,7 @@ if (( $value == $v_language ) || ( $svalue == $v_language)){ echo 'selected' ; } - if (( $value == 'en' ) && (empty($v_language))){ + if (( $value == detect_user_language() ) && (empty($v_language))){ echo 'selected' ; } echo ">".htmlentities($value)."\n"; From e3c1b17e3194063e7a36d5a1ce319da1979ce80a Mon Sep 17 00:00:00 2001 From: Flat Date: Mon, 23 Nov 2015 19:55:16 +0900 Subject: [PATCH 227/264] Fix minor typo. --- web/edit/user/index.php | 2 +- web/inc/i18n.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/edit/user/index.php b/web/edit/user/index.php index 5d04769fe..c0ea9cd5c 100644 --- a/web/edit/user/index.php +++ b/web/edit/user/index.php @@ -62,7 +62,7 @@ exec (VESTA_CMD."v-list-user-packages json", $output, $return_var); $packages = json_decode(implode('', $output), true); unset($output); -// List lanugages +// List languages exec (VESTA_CMD."v-list-sys-languages json", $output, $return_var); $languages = json_decode(implode('', $output), true); unset($output); diff --git a/web/inc/i18n.php b/web/inc/i18n.php index 5971dc3d8..1dab4cae4 100644 --- a/web/inc/i18n.php +++ b/web/inc/i18n.php @@ -85,7 +85,7 @@ function detect_user_language($fallback='en') { } arsort($accept_langs_sorted); - // List lanugages + // List languages exec (VESTA_CMD."v-list-sys-languages json", $output, $return_var); $languages = json_decode(implode('', $output), true); unset($output); From dac0b5c6861968d51bae60e79fd6b7f340fe4afd Mon Sep 17 00:00:00 2001 From: Flat Date: Mon, 23 Nov 2015 23:37:01 +0900 Subject: [PATCH 228/264] Strict backup filename check. --- web/download/backup/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/download/backup/index.php b/web/download/backup/index.php index fd5ed69c9..49f9afa40 100644 --- a/web/download/backup/index.php +++ b/web/download/backup/index.php @@ -13,7 +13,7 @@ if ($_SESSION['user'] == 'admin') { } if ((!empty($_SESSION['user'])) && ($_SESSION['user'] != 'admin')) { - if (preg_match("/^".$user."/i", $backup)) { + if (strpos($backup, $user.'.') === 0) { header('Content-type: application/gzip'); header("Content-Disposition: attachment; filename=\"".$backup."\";" ); header("X-Accel-Redirect: /backup/" . $backup); From 4df23adb13dc833c12963a88982b8922c1de37a9 Mon Sep 17 00:00:00 2001 From: System Void Date: Tue, 24 Nov 2015 07:48:50 +0000 Subject: [PATCH 229/264] +backup directory check, -closing PHP tag. I added a backup directory check (as of now, you can download fake backups). I also removed the closing PHP tag that isn't needed. --- web/download/backup/index.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/web/download/backup/index.php b/web/download/backup/index.php index fd5ed69c9..cbfd95a76 100644 --- a/web/download/backup/index.php +++ b/web/download/backup/index.php @@ -5,6 +5,11 @@ session_start(); include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); $backup = $_GET['backup']; +// Check if the backup exists +if (!file_exists($backup)) { + exit(0); +} + // Data if ($_SESSION['user'] == 'admin') { header('Content-type: application/gzip'); @@ -19,5 +24,3 @@ if ((!empty($_SESSION['user'])) && ($_SESSION['user'] != 'admin')) { header("X-Accel-Redirect: /backup/" . $backup); } } - -?> From 5d54f3bdc130f9ad94849f570413a57dd9520ac8 Mon Sep 17 00:00:00 2001 From: System Void Date: Tue, 24 Nov 2015 08:01:24 +0000 Subject: [PATCH 230/264] Update index.php --- web/api/index.php | 48 +++++++++++++++++------------------------------ 1 file changed, 17 insertions(+), 31 deletions(-) diff --git a/web/api/index.php b/web/api/index.php index 97f082594..32886446d 100644 --- a/web/api/index.php +++ b/web/api/index.php @@ -31,39 +31,25 @@ if (isset($_POST['user']) || isset($_POST['hash'])) { echo 'Error: authentication failed'; exit; } - - // Prepare arguments - if (isset($_POST['cmd'])) $cmd = escapeshellarg($_POST['cmd']); - if (isset($_POST['arg1'])) $arg1 = escapeshellarg($_POST['arg1']); - if (isset($_POST['arg2'])) $arg2 = escapeshellarg($_POST['arg2']); - if (isset($_POST['arg3'])) $arg3 = escapeshellarg($_POST['arg3']); - if (isset($_POST['arg4'])) $arg4 = escapeshellarg($_POST['arg4']); - if (isset($_POST['arg5'])) $arg5 = escapeshellarg($_POST['arg5']); - if (isset($_POST['arg6'])) $arg6 = escapeshellarg($_POST['arg6']); - if (isset($_POST['arg7'])) $arg7 = escapeshellarg($_POST['arg7']); - if (isset($_POST['arg8'])) $arg8 = escapeshellarg($_POST['arg8']); - if (isset($_POST['arg9'])) $arg9 = escapeshellarg($_POST['arg9']); + + // Prepare for iteration + $args = []; + $i = 0; + + // Loop through args until there isn't another. + while (true) + { + $i++; + if (!empty($_POST['arg' . $i])) + { + $args[] = $_POST['arg' . $i]; + continue; + } + break; + } // Build query - $cmdquery = VESTA_CMD.$cmd." "; - if(!empty($arg1)){ - $cmdquery = $cmdquery.$arg1." "; } - if(!empty($arg2)){ - $cmdquery = $cmdquery.$arg2." "; } - if(!empty($arg3)){ - $cmdquery = $cmdquery.$arg3." "; } - if(!empty($arg4)){ - $cmdquery = $cmdquery.$arg4." "; } - if(!empty($arg5)){ - $cmdquery = $cmdquery.$arg5." "; } - if(!empty($arg6)){ - $cmdquery = $cmdquery.$arg6." "; } - if(!empty($arg7)){ - $cmdquery = $cmdquery.$arg7." "; } - if(!empty($arg8)){ - $cmdquery = $cmdquery.$arg8." "; } - if(!empty($arg9)){ - $cmdquery = $cmdquery.$arg9; } + $cmdquery = VESTA_CMD . $cmd . " " . implode(" ", $args); // Check command if ($cmd == "'v-make-tmp-file'") { From 6e13036780c9888e4ae912bab12cca4c806ac1cc Mon Sep 17 00:00:00 2001 From: Flat Date: Sun, 29 Nov 2015 17:19:10 +0900 Subject: [PATCH 231/264] :lock: Fix OS command injection vulnerability. --- web/add/web/index.php | 2 +- web/edit/cron/index.php | 1 + web/edit/mail/index.php | 4 ++-- web/edit/web/index.php | 6 +++--- web/login/index.php | 2 +- web/search/index.php | 2 +- 6 files changed, 9 insertions(+), 8 deletions(-) diff --git a/web/add/web/index.php b/web/add/web/index.php index 612ae547b..fb8d212d9 100644 --- a/web/add/web/index.php +++ b/web/add/web/index.php @@ -272,7 +272,7 @@ if (!empty($_POST['ok'])) { $fp = fopen($v_ftp_password, "w"); fwrite($fp, $v_ftp_user_data['v_ftp_password']."\n"); fclose($fp); - exec (VESTA_CMD."v-add-web-domain-ftp ".$user." ".$v_domain." ".$v_ftp_username." ".$v_ftp_password . " " . $v_ftp_path, $output, $return_var); + exec (VESTA_CMD."v-add-web-domain-ftp ".$user." ".$v_domain." ".$v_ftp_user." ".$v_ftp_password . " " . $v_ftp_path, $output, $return_var); check_return_code($return_var,$output); unset($output); unlink($v_ftp_password); diff --git a/web/edit/cron/index.php b/web/edit/cron/index.php index d78b4eb6e..8c309f70f 100644 --- a/web/edit/cron/index.php +++ b/web/edit/cron/index.php @@ -53,6 +53,7 @@ if (!empty($_POST['save'])) { } $v_username = $user; + $v_job = escapeshellarg($_GET['job']); $v_min = escapeshellarg($_POST['v_min']); $v_hour = escapeshellarg($_POST['v_hour']); $v_day = escapeshellarg($_POST['v_day']); diff --git a/web/edit/mail/index.php b/web/edit/mail/index.php index 1010b07f8..28d4da9b5 100644 --- a/web/edit/mail/index.php +++ b/web/edit/mail/index.php @@ -233,7 +233,7 @@ if ((!empty($_POST['save'])) && (!empty($_GET['domain'])) && (!empty($_GET['acco $result = array_diff($aliases, $valiases); foreach ($result as $alias) { if ((empty($_SESSION['error_msg'])) && (!empty($alias))) { - exec (VESTA_CMD."v-add-mail-account-alias ".$v_username." ".$v_domain." ".$v_account." '".$alias."'", $output, $return_var); + exec (VESTA_CMD."v-add-mail-account-alias ".$v_username." ".$v_domain." ".$v_account." ".escapeshellarg($alias), $output, $return_var); check_return_code($return_var,$output); unset($output); } @@ -259,7 +259,7 @@ if ((!empty($_POST['save'])) && (!empty($_GET['domain'])) && (!empty($_GET['acco $result = array_diff($fwd, $vfwd); foreach ($result as $forward) { if ((empty($_SESSION['error_msg'])) && (!empty($forward))) { - exec (VESTA_CMD."v-add-mail-account-forward ".$v_username." ".$v_domain." ".$v_account." '".$forward."'", $output, $return_var); + exec (VESTA_CMD."v-add-mail-account-forward ".$v_username." ".$v_domain." ".$v_account." ".escapeshellarg($forward), $output, $return_var); check_return_code($return_var,$output); unset($output); } diff --git a/web/edit/web/index.php b/web/edit/web/index.php index c0d1f6f80..e28aa713a 100644 --- a/web/edit/web/index.php +++ b/web/edit/web/index.php @@ -188,14 +188,14 @@ if (!empty($_POST['save'])) { $restart_web = 'yes'; $restart_proxy = 'yes'; $v_template = escapeshellarg($_POST['v_template']); - exec (VESTA_CMD."v-add-web-domain-alias ".$v_username." ".$v_domain." '".$alias."' 'no'", $output, $return_var); + exec (VESTA_CMD."v-add-web-domain-alias ".$v_username." ".$v_domain." ".escapeshellarg($alias)." 'no'", $output, $return_var); check_return_code($return_var,$output); unset($output); if (empty($_SESSION['error_msg'])) { exec (VESTA_CMD."v-list-dns-domain ".$v_username." ".$v_domain, $output, $return_var); unset($output); if ($return_var == 0) { - exec (VESTA_CMD."v-add-dns-on-web-alias ".$v_username." ".$alias." ".$v_ip." no", $output, $return_var); + exec (VESTA_CMD."v-add-dns-on-web-alias ".$v_username." ".escapeshellarg($alias)." ".$v_ip." no", $output, $return_var); check_return_code($return_var,$output); unset($output); $restart_dns = 'yes'; @@ -520,7 +520,7 @@ if (!empty($_POST['save'])) { $fp = fopen($v_ftp_password, "w"); fwrite($fp, $v_ftp_user_data['v_ftp_password']."\n"); fclose($fp); - exec (VESTA_CMD."v-add-web-domain-ftp ".$v_username." ".$v_domain." ".$v_ftp_username." ".$v_ftp_password . " " . $v_ftp_path, $output, $return_var); + exec (VESTA_CMD."v-add-web-domain-ftp ".$v_username." ".$v_domain." ".$v_ftp_user." ".$v_ftp_password . " " . $v_ftp_path, $output, $return_var); check_return_code($return_var,$output); if ((!empty($v_ftp_user_data['v_ftp_email'])) && (empty($_SESSION['error_msg']))) { $to = $v_ftp_user_data['v_ftp_email']; diff --git a/web/login/index.php b/web/login/index.php index f084ae174..253b8ac91 100644 --- a/web/login/index.php +++ b/web/login/index.php @@ -44,7 +44,7 @@ if (isset($_POST['user']) && isset($_POST['password'])) { fclose($fp); // Check user & password - exec(VESTA_CMD ."v-check-user-password ".$v_user." ".$v_password." '".$_SERVER["REMOTE_ADDR"]."'", $output, $return_var); + exec(VESTA_CMD ."v-check-user-password ".$v_user." ".$v_password." ".escapeshellarg($_SERVER['REMOTE_ADDR']), $output, $return_var); unset($output); // Remove tmp file diff --git a/web/search/index.php b/web/search/index.php index fc5ffd069..e885cd7a5 100644 --- a/web/search/index.php +++ b/web/search/index.php @@ -28,8 +28,8 @@ $lang = 'ru_RU.utf8'; //setlocale(LC_ALL, $lang); // Data +$q = escapeshellarg($q); if ($_SESSION['user'] == 'admin') { - $q = escapeshellarg($q); exec (VESTA_CMD."v-search-object ".$q." json", $output, $return_var); $data = json_decode(implode('', $output), true); include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_search.html'); From 6052df956c92c1c8073bd14300407a864840c3cf Mon Sep 17 00:00:00 2001 From: myrevery Date: Wed, 2 Dec 2015 03:25:50 +0800 Subject: [PATCH 232/264] Replace cn.php This is the new version completely from scratch. Huge change, more than 100% of the translated degree. Complete and extremely accurate Chinese localization translation. Tip: Add some new keywords to improve the quality of translation. --- web/inc/i18n/cn.php | 1153 ++++++++++++++++++++++--------------------- 1 file changed, 592 insertions(+), 561 deletions(-) diff --git a/web/inc/i18n/cn.php b/web/inc/i18n/cn.php index 34c321f23..aa9a55c4d 100644 --- a/web/inc/i18n/cn.php +++ b/web/inc/i18n/cn.php @@ -1,603 +1,634 @@ '预设方案', - 'IP' => 'IP管理', - 'Graphs' => '流量统计', - 'Statistics' => '统计分析', - 'Log' => '日志', - 'Server' => '服务器', - 'Services' => '系统服务', - 'Firewall' => '防火牆', - 'Updates' => '更新升级', - 'Log in' => '登录', - 'Log out' => '退出', + 'Packages' => '预设方案', + 'IP' => 'IP 地址', + 'Graphs' => '资源图表', + 'Statistics' => '统计信息', + 'Log' => '系统日志', + 'Server' => '服务器', + 'Services' => '系统服务', + 'Firewall' => '防火墙', + 'Updates' => '系统更新', + 'Log in' => '登录', + 'Log out' => '登出', - 'USER' => '用户管理', - 'WEB' => '网站管理 ', - 'DNS' => 'DNS管理', - 'MAIL' => '邮箱管理', - 'DB' => '数据库', - 'CRON' => '计划任务', - 'BACKUP' => '备份管理', + 'USER' => '用户账户', + 'WEB' => 'Web 服务', + 'DNS' => 'DNS 服务', + 'MAIL' => '邮箱服务', + 'DB' => '数据库', + 'CRON' => '定时任务', + 'BACKUP' => '数据备份', - 'Add User' => '添加用户', - 'Add Domain' => '添加域名', + 'Add User' => '添加用户', + 'Add Domain' => '添加域名', 'Add Web Domain' => '添加网站域名', - 'Add DNS Domain' => '添加DNS域名', - 'Add DNS Record' => '添加DNS记录', - 'Add Mail Domain' => '添加邮箱域名', - 'Add Mail Account' => '添加邮箱账户', - 'Add Database' => '添加数据库', - 'Add Cron Job' => '添加定时任务', - 'Create Backup' => '创建备份', - 'Configure' => '要配置', - 'Restore All' => '恢复所有', - 'Add Package' => '增加预设方案', - 'Add IP' => '添加IP', - 'Add Rule' => '添加規則', - 'Ban IP Address' => '潘基文的IP地址', - 'Search' => '搜索', - 'Add one more FTP Account' => '增加一個FTP賬號', - 'Overall Statistics' => '总体统计', - 'Daily' => '日', - 'Weekly' => '周', - 'Monthly' => '月', - 'Yearly' => '年', - 'Add' => '增加', - 'Back' => '返回', - 'Save' => '保存', - 'Submit' => '提交', + 'Add DNS Domain' => '添加DNS域名', + 'Add DNS Record' => '添加DNS记录', + 'Add Mail Domain' => '添加邮箱域名', + 'Add Mail Account' => '添加邮箱账户', + 'Add Database' => '添加数据库', + 'Add Cron Job' => '添加定时任务', + 'Create Backup' => '创建备份', + 'Configure' => '配置', + 'Restore All' => '全部恢复', + 'Add Package' => '添加方案', + 'Add IP' => '添加IP地址', + 'Add Rule' => '添加规则', + 'Ban IP Address' => '封锁IP地址', + 'Search' => '搜索', + 'Add one more FTP Account' => '增加一个FTP账户', + 'Overall Statistics' => '整体统计信息', + 'Daily' => '按天', + 'Weekly' => '按周', + 'Monthly' => '按月', + 'Yearly' => '按年', + 'Add' => '添加', + 'Back' => '返回', + 'Save' => '保存', + 'Submit' => '提交', - 'toggle all' => '批量执行', - 'apply to selected' => '应用到已选择', - 'rebuild' => '重建', - 'rebuild web' => '重建网站', - 'rebuild dns' => '重建DNS', - 'rebuild mail' => '重建邮箱', - 'rebuild db' => '重建数据库', - 'rebuild cron' => '重建定时任务', - 'update counters' => '更新计数器', - 'suspend' => '暂停', - 'unsuspend' => '解除暂停', - 'delete' => '删除', - 'show per user' => '显示每个用户', - 'login as' => '登录为', - 'logout' => '退出', - 'edit' => '修改', - 'open webstats' => '打开webstats', - 'view logs' => '查看日志', - 'list records' => '列表 %s 记录', - 'add record' => '增加记录', - 'list accounts' => '列表 %s 账户', - 'add account' => '添加账户', - 'open webmail' => '打开网页邮箱', - 'list fail2ban' => 'fail2ban的名單', - 'open %s' => '打开 %s', - 'download' => '下载', - 'restore' => '恢复', - 'configure restore settings' => '配置欢迎设置', - 'stop' => '停止', - 'start' => '开始', - 'restart' => '重启', - 'update' => '更新', - 'generate' => '生成', + 'toggle all' => '批量操作', + 'apply to selected' => '应用于选中项的操作', + 'rebuild' => '重建', + 'rebuild web' => '重建网站', + 'rebuild dns' => '重建DNS', + 'rebuild mail' => '重建邮箱', + 'rebuild db' => '重建数据库', + 'rebuild cron' => '重建定时任务', + 'update counters' => '更新计数器', + 'suspend' => '暂停', + 'unsuspend' => '解除暂停', + 'delete' => '删除', + 'show per user' => '按用户显示', + 'login as' => '登录至账户', + 'logout' => '登出', + 'edit' => '编辑', + 'open webstats' => '打开网站统计', + 'view logs' => '查看日志', + 'list records' => '列出 %s 条记录', + 'add record' => '添加记录', + 'list accounts' => '列出 %s 个账户', + 'add account' => '添加账户', + 'open webmail' => '打开网页邮箱', + 'list fail2ban' => 'fail2ban 封锁名单', + 'open %s' => '打开 %s', + 'download' => '下载', + 'restore' => '恢复', + 'configure restore settings' => '配置恢复设置', + 'stop' => '停止', + 'start' => '启动', + 'restart' => '重新启动', + 'update' => '更新', + 'generate' => '生成', 'Generate CSR' => '生成CSR', 'reread IP' => '重新读取IP', 'enable autoupdate' => '启用自动更新', - 'disable autoupdate' => '禁用自动更新', - 'turn on notifications' => '開啟通知', - 'turn off notifications' => '關閉通知', + 'disable autoupdate' => '停用自动更新', + 'turn on notifications' => '启用通知', + 'turn off notifications' => '停用通知', - 'Adding User' => '添加用户', - 'Editing User' => '修改用过', - 'Adding Domain' => '添加域名', - 'Editing Domain' => '修改域名', - 'Adding DNS Domain' => '添加DNS域名', - 'Editing DNS Domain' => '修改DNS域名', - 'Adding DNS Record' => '添加DNS记录', - 'Editing DNS Record' => '修改DNS记录', - 'Adding Mail Domain' => '添加邮局域名', - 'Editing Mail Domain' => '修改邮局域名', - 'Adding Mail Account' => '添加邮箱账户', - 'Editing Mail Account' => '修改邮箱账户', - 'Adding database' => '添加数据', - 'Editing Cron Job' => '修改定时任务', - 'Adding Cron Job' => '添加定时任务', - 'Editing Database' => '修改数据库', - 'Adding Package' => '添加预设方案', - 'Editing Package' => '修改预设方案', - 'Adding IP address' => '添加IP地址', - 'Editing IP Address' => '修改IP地址', - 'Editing Backup Exclusions' => '编辑排除', - 'Generating CSR' => '生成的CSR', - 'Listing' => '列表', - 'Search Results' => '搜索结果', - 'Adding Firewall Rule' => '添加防火牆規則', - 'Editing Firewall Rule' => '編輯防火牆規則', - 'Adding IP Address to Banlist' => '添加IP地址黑名單', + 'Adding User' => '添加用户', + 'Editing User' => '编辑用户', + 'Adding Domain' => '添加域名', + 'Editing Domain' => '编辑域名', + 'Adding DNS Domain' => '添加DNS域名', + 'Editing DNS Domain' => '编辑DNS域名', + 'Adding DNS Record' => '添加DNS记录', + 'Editing DNS Record' => '编辑DNS记录', + 'Adding Mail Domain' => '添加邮箱域名', + 'Editing Mail Domain' => '编辑邮箱域名', + 'Adding Mail Account' => '添加邮箱账户', + 'Editing Mail Account' => '编辑邮箱账户', + 'Adding database' => '添加数据库', + 'Editing Cron Job' => '编辑定时任务', + 'Adding Cron Job' => '添加定时任务', + 'Editing Database' => '编辑数据库', + 'Adding Package' => '添加方案', + 'Editing Package' => '编辑方案', + 'Adding IP address' => '添加IP地址', + 'Editing IP Address' => '编辑IP地址', + 'Editing Backup Exclusions' => '配置备份排除项目', + 'Generating CSR' => '生成CSR', + 'Listing' => '列出', + 'Search Results' => '搜索结果', + 'Adding Firewall Rule' => '添加防火墙规则', + 'Editing Firewall Rule' => '编辑防火墙规则', + 'Adding IP Address to Banlist' => '添加IP至封锁名单', - 'active' => '活跃', - 'spnd' => '暂停', - 'suspended' => '暂停', - 'running' => '运行', - 'stopped' => '停止', - 'outdated' => '过期', - 'updated' => '更新', + 'active' => '正常', + 'spnd' => '暂停', + 'suspended' => '已暂停', + 'running' => '运行中', + 'stopped' => '已停止', + 'outdated' => '可升级新版本', + 'updated' => '已是最新版本', - 'yes' => '是', - 'no' => '否', - 'none' => 'none', - 'pb' => 'PB', - 'tb' => 'TB', - 'gb' => 'GB', - 'mb' => 'MB', - 'minute' => '分钟', - 'hour' => '小时', - 'day' => '天', - 'days' => '天', - 'hours' => '小时', - 'minutes' => '分', - 'month' => '月', - 'package' => '预设方案', - 'Bandwidth' => '流量', - 'Disk' => '硬盘', - 'Web' => '网页', - 'Mail' => '邮箱', - 'Databases' => '数据库', - 'User Directories' => '用户目录', - 'Template' => '模板', - 'Web Template' => 'Web模板', - 'Backend Template' => 'Backend模板', - 'Proxy Template' =>'Proxy模板', - 'DNS Template' => 'DNS模板', - 'Web Domains' => '网站域名', - 'SSL Domains' => 'SSL域名', - 'Web Aliases' => '网站别名', - 'per domain' => '个域名', - 'DNS Domains' => 'DNS域名', - 'DNS Domains' => 'DNS域名', - 'DNS records' => 'DNS记录' , - 'Name Servers' => 'Name Servers', - 'Mail Domains' => '邮局域名', - 'Mail Accounts' => '邮箱账户', - 'Cron Jobs' => '定时任务', - 'SSH Access' => 'SSH权限', - 'IP Addresses' => 'IP地址', - 'Backups' => '备份', - 'Backup System' => '备份系统', - 'backup exclusions' => '排除', - 'template' => '模板', - 'SSL Support' => 'SSL支持', - 'SSL Home Directory' => 'SSL主目录', - 'Proxy Support' => 'Proxy代理支持', - 'Proxy Extensions' => 'Proxy扩展', - 'Web Statistics' => 'Web统计', - 'Additional FTP Account' => '其他FTP账户', - 'SOA' => 'SOA', - 'TTL' => 'TTL', - 'Expire' => '过期', - 'Records' => '记录', - 'Catchall email' => '综合概括邮件', - 'AntiVirus Support' => '反病毒支持', - 'AntiSpam Support' => '反垃圾支持', - 'DKIM Support' => 'DKIM支持', - 'Accounts' => '账户', - 'Quota' => '配额', - 'Autoreply' => '自动回复', - 'Forward to' => '转发到', - 'Do not store forwarded mail' => '不保存转发邮件', - 'database' => '数据库', - 'User' => '用户', - 'Host' => '主机', - 'Charset' => '字符集编码', - 'Min' => '分钟', - 'Hour' => '小时', - 'Day' => '天', - 'Month' => '月', - 'Day of week' => '星期几', - 'local' => '本地', - 'Run Time' => '运行时间', - 'Backup Size' => '备份大小', - 'SYS' => 'SYS', - 'Domains' => '域名', - 'Status' => '状态', - 'shared' => '共享', - 'dedicated' => '独立', + 'yes' => '是', + 'no' => '否', + 'none' => '无', + 'pb' => 'PB', + 'tb' => 'TB', + 'gb' => 'GB', + 'mb' => 'MB', + 'minute' => '分钟', + 'hour' => '小时', + 'day' => '天', + 'days' => '天', + 'hours' => '小时', + 'minutes' => '分钟', + 'month' => '月', + 'package' => '方案', + 'Bandwidth' => '流量', + 'Disk' => '磁盘空间', + 'Web' => '网站', + 'Mail' => '邮箱', + 'Databases' => '数据库', + 'User Directories' => '用户目录', + 'Template' => '模板', + 'Web Template' => 'Web模板', + 'Proxy Template' => '代理模板', + 'DNS Template' => 'DNS模板', + 'Web Domains' => '网站域名', + 'SSL Domains' => 'SSL域名', + 'Web Aliases' => '网站别名', + 'per domain' => '每域名', + 'DNS domains' => 'DNS域名', + 'DNS Domains' => 'DNS域名', + 'DNS records' => 'DNS记录' , + 'Name Servers' => 'DNS服务器', + 'Mail Domains' => '邮箱域名', + 'Mail Accounts' => '邮箱账户', + 'Cron Jobs' => '定时任务', + 'SSH Access' => 'SSH权限', + 'IP Addresses' => 'IP地址', + 'Backups' => '备份', + 'Backup System' => '备份系统', + 'backup exclusions' => '备份排除项目', + 'template' => '模板', + 'SSL Support' => 'SSL支持', + 'SSL Home Directory' => 'SSL主目录', + 'Proxy Support' => '代理支持', + 'Proxy Extensions' => '代理扩展名', + 'Proxy Extentions' => '代理扩展名', + 'Web Statistics' => '网站统计', + 'Additional FTP Account' => '额外的FTP账户', + 'SOA' => 'SOA', + 'TTL' => 'TTL', + 'Expire' => '过期', + 'Records' => '记录', + 'Catchall email' => '收取未知邮件的邮箱', + 'AntiVirus Support' => '防病毒支持', + 'AntiSpam Support' => '防垃圾邮件支持', + 'DKIM Support' => 'DKIM支持', + 'Accounts' => '账户', + 'Quota' => '配额', + 'Autoreply' => '自动回复', + 'Forward to' => '转发到', + 'Do not store forwarded mail' => '不保留已转发的邮件', + 'database' => '数据库', + 'User' => '用户', + 'Host' => '主机', + 'Charset' => '编码', + 'Min' => '分钟', + 'Hour' => '小时', + 'Day' => '天', + 'Month' => '月', + 'Day of week' => '星期几', + 'local' => '本地', + 'Run Time' => '运行时间', + 'Backup Size' => '备份大小', + 'SYS' => 'SYS', + 'Domains' => '域名', + 'Status' => '状态', + 'shared' => '共享', + 'dedicated' => '独立', 'Owner' => '归属', - 'Users' => '用户', - 'Load Average' => '平均负载', - 'Memory Usage' => '内存使用', - 'HTTPD Usage' => 'apache使用', - 'NGINX Usage' => 'nginx使用', - 'MySQL Usage on localhost' => '本地Mysql使用', - 'PostgreSQL Usage on localhost' => '本地PostgreSQL使用', - 'Bandwidth Usage eth0' => 'eth0流量使用', - 'FTP Usage' => 'FTP使用', - 'SSH Usage' => 'SSH使用', - 'reverse proxy' => '反向代理', - 'web server' => '网页服务器', - 'dns server' => 'dns服务器', - 'mail server' => '邮件服务器', - 'pop/imap server' => 'pop/imap服务器', - 'email antivirus' => '邮件杀毒', - 'email antispam' => '反垃圾邮件', - 'database server' => '数据库服务器', - 'ftp server' => 'FTP服务器', - 'job scheduler' => '定时调度', - 'CPU' => '处理器', - 'Memory' => '内存', - 'Uptime' => '在线时间', - 'core package' => '核心方案', - 'php interpreter' => 'php 解释器', - 'internal web server' => '内网网页服务器', - 'Version' => '版本', - 'Release' => '发布', - 'Architecture' => 'Architecture', - 'Object' => '兑现', - 'Owner' => '归属', - 'Username' => '用户名', - 'Password' => '密码', - 'Email' => '邮箱', - 'Package' => '预设方案', - 'Language' => '语言', - 'First Name' => '姓', - 'Last Name' => '名', - 'Send login credentials to email address' => '发送登录凭据到电子邮件地址', - 'Default Template' => '默认模板', - 'Default Name Servers' => '默认NS服务器', - 'Domain' => '域名', - 'DNS Support' => 'DNS支持', - 'Mail Support' => 'Mail支持', - 'Advanced options' => '高级选项', - 'Aliases' => '别名', - 'SSL Certificate' => 'SSL证书', - 'SSL Key' => 'SSL Key', - 'SSL Certificate Authority / Intermediate' => 'SSL证书颁发机构 / 中级', + 'Users' => '用户', + 'Load Average' => '平均负载', + 'LoadAverage' => '平均负载', + 'Memory Usage' => '内存用量', + 'HTTPD Usage' => 'Apache用量', + 'APACHE2 Usage' => 'Apache2用量', + 'NGINX Usage' => 'NGINX用量', + 'MySQL Usage on localhost' => 'MySQL用量 (localhost)', + 'PostgreSQL Usage on localhost' => 'PostgreSQL用量 (localhost)', + 'Bandwidth Usage eth0' => '网络流量 (eth0)', + 'Bandwidth Usage eth1' => '网络流量 (eth1)', + 'Bandwidth Usage eth2' => '网络流量 (eth2)', + 'Exim Usage' => 'Exim用量', + 'FTP Usage' => 'FTP用量', + 'SSH Usage' => 'SSH用量', + 'reverse proxy' => '反向代理', + 'web server' => 'Web服务', + 'dns server' => 'DNS服务', + 'mail server' => '邮箱服务', + 'pop/imap server' => 'POP/IMAP服务', + 'email antivirus' => '邮箱防病毒', + 'email antispam' => '防垃圾邮件', + 'database server' => '数据库服务', + 'ftp server' => 'FTP服务', + 'job scheduler' => '执行定时任务', + 'firewall' => '防火墙', + 'brute-force monitor' => '监控暴力破解', + 'CPU' => 'CPU', + 'Memory' => '内存', + 'Uptime' => '已运行时间', + 'core package' => '核心系统', + 'php interpreter' => 'PHP解释器', + 'internal web server' => '内部Web服务', + 'Version' => '版本', + 'Release' => '发布号', + 'Architecture' => '架构', + 'Object' => '对象', + 'Owner' => '归属', + 'Username' => '用户名称', + 'Password' => '密码', + 'Email' => '电子邮箱', + 'Package' => '方案', + 'Language' => '语言', + 'First Name' => '名字', + 'Last Name' => '姓氏', + 'Send login credentials to email address' => '将登录信息发送到邮箱', + 'Default Template' => '默认模板', + 'Default Name Servers' => '默认DNS服务器', + 'Domain' => '域名', + 'DNS Support' => 'DNS支持', + 'Mail Support' => '邮箱支持', + 'Advanced options' => '高级选项', + 'Aliases' => '别名', + 'SSL Certificate' => 'SSL证书', + 'SSL Key' => 'SSL密钥', + 'SSL Certificate Authority / Intermediate' => 'SSL签发机构 / 中级', 'SSL CSR' => 'SSL CSR', - 'optional' => '可选', + 'optional' => '可选', 'internal' => '内部', - 'Statistics Authorization' => '统计授权', - 'Statistics Auth' => '统计验证', - 'Account' => '账户', - 'Prefix will be automaticaly added to username' => '前缀 %s 会自动添加到用户名', - 'Send FTP credentials to email' => '发送FTP凭证到邮箱', - 'Expiration Date' => '到期日期', - 'YYYY-MM-DD' => 'YYYY-MM-DD', - 'Name servers' => 'NS服务器', - 'Record' => '记录', - 'IP or Value' => 'IP或值', - 'Priority' => '优先级', + 'Statistics Authorization' => '统计授权', + 'Statistics Auth' => '统计验证', + 'Account' => '账户', + 'Prefix will be automaticaly added to username' => '前缀 %s 将会自动加入用户名称', + 'Send FTP credentials to email' => '将FTP登录信息发送到邮箱', + 'Expiration Date' => '到期日期', + 'YYYY-MM-DD' => 'YYYY-MM-DD', + 'Name servers' => 'DNS服务器', + 'Record' => '记录', + 'IP or Value' => 'IP或值', + 'Priority' => '优先级', 'Record Number' => '记录编号', - 'in megabytes' => '以MB为单位', - 'Message' => '信息', - 'use local-part' => '使用本地部分', - 'one or more email addresses' => '一个或者更多邮箱地址', - 'Prefix will be automaticaly added to database name and database user' => '前缀 %s 会自动增加到数据库用户名', - 'Database' => '数据库', - 'Type' => '类型', - 'Minute' => '分钟', - 'Command' => '命令', - 'Package Name' => '方案名称', - 'Netmask' => '子网掩码', - 'Interface' => '接口', - 'Shared' => '共享', - 'Assigned user' => '分配用户', - 'Assigned domain' => '分配域名', - 'NAT IP association' => 'NAT IP association', - 'shell' => '脚本', - 'web domains' => '网站域名', - 'web aliases' => '网站别名', - 'dns records' => 'dns记录', - 'mail domains' => '邮局域名', - 'mail accounts' => '邮箱账户', - 'accounts' => '账户', - 'databases' => '数据库', - 'cron jobs' => '定时任务', - 'backups' => '备份', - 'quota' => '配额', - 'day of week' => '星期几', - 'cmd' => 'cmd', - 'users' => '用户', - 'domains' => '域名', - 'aliases' => '别名', - 'records' => '记录', - 'jobs' => '定时任务', - 'username' => '用户名', - 'password' => '密码', - 'type' => '类型', - 'charset' => '字符集编码', - 'domain' => '域名', - 'ip' => 'ip', - 'ip address' => 'IP地址', - 'IP address' => 'IP 地址', - 'netmask' => '子网掩码', - 'interface' => '网络接口', - 'assigned user' => '分配用户', - 'ns1' => 'ns1', - 'ns2' => 'ns2', - 'user' => '用户', - 'email' => '邮箱', - 'first name' => '姓', - 'last name' => '名', - 'account' => '账户', - 'ssl certificate' => 'ssl证书', - 'ssl key' => 'ssl密匙', - 'stats user password' => '统计用户密码', - 'stats username' => '统计用户名', - 'stats password' => '统计密码', - 'ftp user password' => 'ftp用户密码', - 'ftp user' => 'ftp用户', - 'Last 70 lines of %s.%s.log' => '最后70行 %s.%s.日志', + 'in megabytes' => '以MB为单位', + 'Message' => '信息', + 'use local-part' => '使用本地部分', + 'one or more email addresses' => '一个或更多邮箱地址', + 'Prefix will be automaticaly added to database name and database user' => '前缀 %s 将会自动加入数据库名称及用户名称', + 'Database' => '数据库', + 'Type' => '类型', + 'Minute' => '分钟', + 'Command' => '指令', + 'Package Name' => '方案名称', + 'Netmask' => '子网掩码', + 'Interface' => '网络接口', + 'Shared' => '共享', + 'Assigned user' => '指定用户', + 'Assigned domain' => '指定域名', + 'NAT IP association' => 'NAT IP 连接', + 'shell' => '脚本', + 'web domains' => '网站域名', + 'web aliases' => '网站别名', + 'dns records' => 'DNS记录', + 'mail domains' => '邮箱域名', + 'mail accounts' => '邮箱账户', + 'accounts' => '账户', + 'databases' => '数据库', + 'cron jobs' => '定时任务', + 'backups' => '备份', + 'quota' => '配额', + 'day of week' => '星期几', + 'cmd' => '指令', + 'users' => '用户', + 'domains' => '域名', + 'aliases' => '别名', + 'records' => '记录', + 'jobs' => '任务', + 'username' => '用户名称', + 'password' => '密码', + 'type' => '类型', + 'charset' => '编码', + 'domain' => '域名', + 'ip' => 'IP', + 'ip address' => 'IP地址', + 'IP address' => 'IP地址', + 'IP Address' => 'IP地址', + 'netmask' => '子网掩码', + 'interface' => '网络接口', + 'assigned user' => '指定用户', + 'ns1' => 'ns1', + 'ns2' => 'ns2', + 'user' => '用户', + 'email' => '邮箱', + 'first name' => '名字', + 'last name' => '姓氏', + 'account' => '账户', + 'ssl certificate' => 'SSL证书', + 'ssl key' => 'SSL密钥', + 'stats user password' => '统计用户账户密码', + 'stats username' => '统计用户名称', + 'stats password' => '统计密码', + 'ftp user password' => 'FTP用户账户密码', + 'ftp user' => 'FTP用户', + 'Last 70 lines of %s.%s.log' => '最后70行的 %s.%s.日志', 'Download AccessLog' => '下载访问日志', 'Download ErrorLog' => '下载错误日志', - 'Country' => '国家‘', - '2 letter code' => '2位短码：例如中国是CN/美国是US', - 'State / Province' => '州/省', - 'City / Locality' => '市/地区', + 'Country' => '国家', + '2 letter code' => '2位国家简码 (中国为CN / 美国为US)', + 'State / Province' => '州 / 省', + 'City / Locality' => '市 / 地区', 'Organization' => '组织名称', - 'Action' => '動作', - 'Protocol' => '協議', - 'Port' => '港口', - 'Comment' => '評論', - 'Banlist' => '黑名單', - 'ranges are acceptable' => '範圍是可以接受的', + 'Action' => '操作', + 'Protocol' => '协议', + 'Port' => '端口', + 'Comment' => '备注', + 'Banlist' => '需封锁', + 'ranges are acceptable' => '可使用范围 (如: 21-22)', 'CIDR format is supported' => '支持CIDR格式', - 'Add one more Name Server' => 'Add one more Name Server', + 'CDIR format is supported' => '支持CIDR格式', + 'Add one more Name Server' => '增加一个DNS服务器', - 'unlimited' => 'unlimited', - '1 account' => '1 账户', - '%s accounts' => '%s 账户', - '1 domain' => '1 域名', - '%s domains' => '%s 域名', - '1 record' => '1 记录', - '%s records' => '%s 记录', - '1 mail account' => '1 邮箱账户', - '%s mail accounts' => '%s 邮箱账户', - '1 database' => '1 数据库', - '%s databases' => '%s 数据库', - '1 cron job' => '1 定时任务', - '%s cron jobs' => '%s 定时任务', - '1 archive' => '1 档案', - '%s archives' => '%s 档案', - '1 package' => '1 预设方案', - '%s packages' => '%s 预设方案', - '1 IP address' => '1 IP地址', - '%s IP addresses' => '%s IP地址', - '1 month' => '1 月', - '%s months' => '%s 月', - '1 log record' => '1 日志记录', - '%s log records' => '%s 日志记录', - '1 object' => '1 对象', - '%s objects' => '%s 对象', - 'no exclusions' => '不排除', - '1 rule' => '1規則', - '%s rules' => '%s 規則', - 'There are currently banned IP' => '目前尚無禁止的IP地址', + 'unlimited' => '无限', + '1 account' => '1 个账户', + '%s accounts' => '%s 个账户', + '1 domain' => '1 个域名', + '%s domains' => '%s 个域名', + '1 record' => '1 条记录', + '%s records' => '%s 条记录', + '1 mail account' => '1 个邮箱账户', + '%s mail accounts' => '%s 个邮箱账户', + '1 database' => '1 个数据库', + '%s databases' => '%s 个数据库', + '1 cron job' => '1 个任务', + '%s cron jobs' => '%s 个任务', + '1 archive' => '1 个存档', + '%s archives' => '%s 个存档', + '1 package' => '1 个方案', + '%s packages' => '%s 个方案', + '1 IP address' => '1 个IP地址', + '%s IP addresses' => '%s 个IP地址', + '1 month' => '1 个月', + '%s months' => '%s 个月', + '1 log record' => '1 条日志记录', + '%s log records' => '%s 条日志记录', + '1 object' => '1 个对象', + '%s objects' => '%s 个对象', + 'no exclusions' => '未排除', + '1 rule' => '1 条规则', + '%s rules' => '%s 条规则', + '1 items' => '1 个项目', + '%s items' => '%s 个项目', + 'There are no currently banned IP' => '目前没有已暂停的IP地址', - 'USER_CREATED_OK' => 'User %s 已创建成功', - 'WEB_DOMAIN_CREATED_OK' => 'Domain %s 已创建成功.', - 'DNS_DOMAIN_CREATED_OK' => 'DNS domain %s 已创建成功.', - 'DNS_RECORD_CREATED_OK' => 'Record %s.%s 已创建成功.', - 'MAIL_DOMAIN_CREATED_OK' => 'Mail domain %s 已创建成功.', - 'MAIL_ACCOUNT_CREATED_OK' => 'Mail account %s@%s 已创建成功', - 'DATABASE_CREATED_OK' => 'Database %s 已创建成功', - 'CRON_CREATED_OK' => 'Cron job 已创建成功.', - 'IP_CREATED_OK' => 'IP address %s 已创建成功.', - 'PACKAGE_CREATED_OK' => 'Package %s 已创建成功.', - 'SSL_GENERATED_OK' => '证书已成功生成.', - 'RULE_CREATED_OK' => '規則已成功創建', - 'Autoupdate has been successfully enabled' => 'Autoupdate has been successfully enabled', - 'Autoupdate has been successfully disabled' => 'Autoupdate has been successfully disabled', - 'Cronjob email reporting has been successfully enabled' => '的cronjob電子郵件報告已成功啟用', - 'Cronjob email reporting has been successfully disabled' => '的cronjob電子郵件報告已成功關閉', - 'Changes has been saved.' => '更改已保存.', - 'Confirmation' => 'Confirmation', - 'DELETE_USER_CONFIRMATION' => '您确定删除用户 %s?', - 'SUSPEND_USER_CONFIRMATION' => '你确定暂停用户 %s?', - 'UNSUSPEND_USER_CONFIRMATION' => '您确定解除暂停用户 %s?', - 'DELETE_DOMAIN_CONFIRMATION' => '您确定删除域名 %s?', - 'SUSPEND_DOMAIN_CONFIRMATION' => '你确定暂停域名 %s?', - 'UNSUSPEND_DOMAIN_CONFIRMATION' => '你确定解除暂停域名 %s?', - 'DELETE_RECORD_CONFIRMATION' => '你确定删除记录 %s?', - 'SUSPEND_RECORD_CONFIRMATION' => '你确定暂停记录 %s?', - 'UNSUSPEND_RECORD_CONFIRMATION' => '你确定解除暂停记录 %s?', - 'DELETE_MAIL_ACCOUNT_CONFIRMATION' => '你确定删除 %s?', - 'SUSPEND_MAIL_ACCOUNT_CONFIRMATION' => '你确定暂停 %s?', - 'UNSUSPEND_MAIL_ACCOUNT_CONFIRMATION' => '你确定解除暂停 %s?', - 'DELETE_DATABASE_CONFIRMATION' => '你确定删除数据库 %s?', - 'SUSPEND_DATABASE_CONFIRMATION' => '你确定暂停数据 %s?', - 'UNSUSPEND_DATABASE_CONFIRMATION' => '你确定解除暂停数据库 %s?', - 'DELETE_CRON_CONFIRMATION' => '你确定删除定时任务?', - 'SUSPEND_CRON_CONFIRMATION' => '你确定暂停定时任务?', - 'UNSUSPEND_CRON_CONFIRMATION' => '你确定解除暂停定时任务?', - 'DELETE_BACKUP_CONFIRMATION' => '你确定删除 %s 备份?', - 'DELETE_EXCLUSION_CONFIRMATION' => 'Are you sure to delete %s exclusion?', - 'DELETE_PACKAGE_CONFIRMATION' => '你确定删除方案 %s?', - 'DELETE_IP_CONFIRMATION' => '你确定删除IP地址 %s?', - 'DELETE_RULE_CONFIRMATION' => '您確定要刪除規則 #%s?', - 'SUSPEND_RULE_CONFIRMATION' => '您確定要暫停規則 #%s?', - 'UNSUSPEND_RULE_CONFIRMATION' => '您確定要取消掛起規則 #%s?', - 'LEAVE_PAGE_CONFIRMATION' => 'Leave Page?', - 'RESTART_CONFIRMATION' => 'Are you sure you want to restart %s?', - 'Welcome' => '欢迎光临', - 'LOGGED_IN_AS' => '以用户身份 %s 登录', - 'Error' => '错误', - 'Invalid username or password' => '无效账号或密码', - 'Invalid username or code' => '无效账户或者验证码', - 'Passwords not match' => '密码不正确', - 'Please enter valid email address.' => '请输入有效的邮箱.', - 'Field "%s" can not be blank.' => '字段 "%s" 不能为空.', - 'Password is too short.' => '密码太短 (最少为6位数大小写字母+数字)', - 'Error code:' => '错误代码: %s', - 'SERVICE_ACTION_FAILED' => '"%s" "%s" 字段', - 'IP address is in use' => 'IP地址已被使用', - 'BACKUP_SCHEDULED' => '任务已经被添加到队列中。当备份完成将会电子邮件通知您.', - 'BACKUP_EXISTS' => '现有的备份已在运行,请等待该备份完成.', - 'RESTORE_SCHEDULED' => '任务已经被添加到队列中。当备份完成将会电子邮件通知您.', - 'RESTORE_EXISTS' => '现有的修复工作已在执行，请等待完成后再执行.', + 'USER_CREATED_OK' => '用户 %s 已添加成功', + 'WEB_DOMAIN_CREATED_OK' => '网站域名 %s 已添加成功', + 'DNS_DOMAIN_CREATED_OK' => 'DNS域名 %s 已添加成功', + 'DNS_RECORD_CREATED_OK' => '记录 %s.%s 已添加成功', + 'MAIL_DOMAIN_CREATED_OK' => '邮箱域名 %s 已添加成功', + 'MAIL_ACCOUNT_CREATED_OK' => '邮箱账户 %s@%s 已添加成功', + 'DATABASE_CREATED_OK' => '数据库 %s 已添加成功', + 'CRON_CREATED_OK' => '定时任务已添加成功', + 'IP_CREATED_OK' => 'IP地址 %s 已添加成功', + 'PACKAGE_CREATED_OK' => '方案 %s 已添加成功', + 'SSL_GENERATED_OK' => 'SSL证书已生成', + 'RULE_CREATED_OK' => '规则已创建成功', + 'Autoupdate has been successfully enabled' => '自动更新已成功启用', + 'Autoupdate has been successfully disabled' => '自动更新已成功关闭', + 'Cronjob email reporting has been successfully enabled' => '定时任务的电子邮件报告已成功启用', + 'Cronjob email reporting has been successfully disabled' => '定时任务的电子邮件报告已成功关闭', + 'Changes has been saved.' => '已保存更改', + 'Confirmation' => '确认', + 'DELETE_USER_CONFIRMATION' => '确定要删除用户 %s 吗?', + 'SUSPEND_USER_CONFIRMATION' => '确定要暂停用户 %s 吗?', + 'UNSUSPEND_USER_CONFIRMATION' => '确定要解除暂停用户 %s 吗?', + 'DELETE_DOMAIN_CONFIRMATION' => '确定要删除域名 %s 吗?', + 'SUSPEND_DOMAIN_CONFIRMATION' => '确定要暂停域名 %s 吗?', + 'UNSUSPEND_DOMAIN_CONFIRMATION' => '确定要解除暂停域名 %s 吗?', + 'DELETE_RECORD_CONFIRMATION' => '确定要删除记录 %s 吗?', + 'SUSPEND_RECORD_CONFIRMATION' => '确定要暂停记录 %s 吗?', + 'UNSUSPEND_RECORD_CONFIRMATION' => '确定要解除暂停记录 %s 吗?', + 'DELETE_MAIL_ACCOUNT_CONFIRMATION' => '确定要删除 %s 吗?', + 'SUSPEND_MAIL_ACCOUNT_CONFIRMATION' => '确定要暂停 %s 吗?', + 'UNSUSPEND_MAIL_ACCOUNT_CONFIRMATION' => '确定要解除暂停 %s 吗?', + 'DELETE_DATABASE_CONFIRMATION' => '确定要删除数据库 %s 吗?', + 'SUSPEND_DATABASE_CONFIRMATION' => '确定要暂停数据库 %s 吗?', + 'UNSUSPEND_DATABASE_CONFIRMATION' => '确定要解除暂停数据库 %s 吗?', + 'DELETE_CRON_CONFIRMATION' => '确定要删除定时任务吗?', + 'SUSPEND_CRON_CONFIRMATION' => '确定要暂停定时任务吗?', + 'UNSUSPEND_CRON_CONFIRMATION' => '确定要解除暂停定时任务吗?', + 'DELETE_BACKUP_CONFIRMATION' => '确定要删除 %s 备份吗?', + 'DELETE_EXCLUSION_CONFIRMATION' => '确定要删除 %s 例外吗?', + 'DELETE_PACKAGE_CONFIRMATION' => '确定要删除方案 %s 吗?', + 'DELETE_IP_CONFIRMATION' => '确定要删除IP地址 %s 吗?', + 'DELETE_RULE_CONFIRMATION' => '确定要删除规则 #%s 吗?', + 'SUSPEND_RULE_CONFIRMATION' => '确定要暂停规则 #%s 吗?', + 'UNSUSPEND_RULE_CONFIRMATION' => '确定要解除暂停规则 #%s 吗?', + 'LEAVE_PAGE_CONFIRMATION' => '确定要离开当前页吗?', + 'RESTART_CONFIRMATION' => '确定要重新启动 %s 吗?', + 'Welcome' => '欢迎', + 'LOGGED_IN_AS' => '以用户身份 %s 登录', + 'Error' => '错误', + 'Invalid username or password' => '无效的用户名称或密码', + 'Invalid username or code' => '无效的用户名称或验证码.', + 'Passwords not match' => '密码错误', + 'Please enter valid email address.' => '请输入正确的邮箱', + 'Field "%s" can not be blank.' => '"%s" 不能为空', + 'Password is too short.' => '密码太短 (至少为6个数字+字母)', + 'Error code:' => '错误代码: %s', + 'SERVICE_ACTION_FAILED' => '"%s" "%s" 失败', + 'IP address is in use' => 'IP地址在使用中', + 'BACKUP_SCHEDULED' => '您的要求已加入队列中，备份完成后会以电子邮件通知您 ', + 'BACKUP_EXISTS' => '已经有一个备份正在执行，请等待备份完成后再操作', + 'RESTORE_SCHEDULED' => '您的要求已加入队列中，恢复完成后会以电子邮件通知您', + 'RESTORE_EXISTS' => '已经有一个恢复正在执行，请等待恢复完成后再操作', - 'WEB_EXCLUSIONS' => "Type domain name, one per line. To exclude all domains use *. To exclude specific dirs use following format: domain.com:public_html/cache:public_html/tmp", - 'DNS_EXCLUSIONS' => "Type domain name, one per line. To exclude all domains use *", - 'MAIL_EXCLUSIONS' => "Type domain name, one per line. To exclude all domains use *. To exclude specific accounts use following format: domain.com:info:support:postmaster", - 'DB_EXCLUSIONS' => "Type full database name, one per line. To exclude all databases use *", - 'CRON_EXCLUSIONS' => "To exclude all jobs use *", - 'USER_EXCLUSIONS' => "Type directory name, one per line. To exlude all dirs use *", + 'WEB_EXCLUSIONS' => "输入域名，每行一个。要排除所有域名请使用 *。要排除特定目录使用以下格式: domain.com:public_html/cache:public_html/tmp", + 'DNS_EXCLUSIONS' => "输入域名，每行一个。要排除所有域名请使用 *", + 'MAIL_EXCLUSIONS' => "输入域名，每行一个。要排除所有域名请使用 *。要排除特定帐户使用以下格式: domain.com:info:support:postmaster", + 'DB_EXCLUSIONS' => "输入完整数据库名称，每行一个。要排除所有数据库请使用 *", + 'CRON_EXCLUSIONS' => "要排除所有任务请使用 *", + 'USER_EXCLUSIONS' => "输入目录名称，每行一个。要排除所有目录请使用 *", - 'Welcome to Vesta Control Panel' => '欢迎来到Vesta管理面板', - 'MAIL_FROM' => 'Vesta管理面板 ', + 'Welcome to Vesta Control Panel' => '欢迎来到 Vesta 管理系统', + 'MAIL_FROM' => 'Vesta 管理系统 ', 'GREETINGS_GORDON_FREEMAN' => "您好, %s %s,\n", 'GREETINGS' => "您好,\n", - 'ACCOUNT_READY' => "您的帐户已创建可以使用.\n\nhttps://%s/login/\n用户名: %s\n密码: %s\n\n", + 'ACCOUNT_READY' => "您的账户已创建成功，并可以开始使用了！\n\nhttps://%s/login/\n用户名称: %s\n密码: %s\n\n--\nVesta Control Panel\n", - 'FTP login credentials' => 'FTP登录资料', - 'FTP_ACCOUNT_READY' => "FTP帐户已创建可以使用.\n\n主机名: %s\n用户名: %s_%s\n密码: %s\n\n", + 'FTP login credentials' => 'FTP 登录信息', + 'FTP_ACCOUNT_READY' => "FTP账户已创建成功，并可以开始使用了！\n\n主机名称: %s\n用户名称: %s_%s\n密码: %s\n\n--\nVesta Control Panel\n", - 'Database Credentials' => '数据库账户资料', - 'DATABASE_READY' => "数据库已创建成功.\n\n数据库名: %s\n用户: %s\n密码: %s\n%s\n\n", + 'Database Credentials' => "数据库登录信息", + 'DATABASE_READY' => "数据库已添加成功！\n\n数据库名称: %s\n用户名称: %s\n密码: %s\n%s\n\n--\nVesta Control Panel\n", - 'forgot password' => '忘记密码', - 'Confirm' => '确认', - 'New Password' => '新密码', - 'Confirm Password' => '确认密码', - 'Reset' => '重置', - 'Reset Code' => '重置代码', - 'RESET_NOTICE' => '', - 'RESET_CODE_SENT' => '密码重置代码已发送到您的邮箱
                ', - 'MAIL_RESET_SUBJECT' => '密码重置在 %s', - 'PASSWORD_RESET_REQUEST' => "重置面板密码请点击链接:\nhttps://%s/reset/?action=confirm&user=%s&code=%s\n\n或者您可以到 https://%s/reset/?action=code&user=%s 输入重置验证代码:\n%s\n\n如果您没有要求重设密码，请忽略此消息.", + 'forgot password' => '忘记密码', + 'Confirm' => '确认', + 'New Password' => '新密码', + 'Confirm Password' => '确认密码', + 'Reset' => '重置', + 'Reset Code' => '重置代码', + 'RESET_NOTICE' => '', + 'RESET_CODE_SENT' => '密码重置代码已发送到您的邮箱
                ', + 'MAIL_RESET_SUBJECT' => '密码重置在 %s', + 'PASSWORD_RESET_REQUEST' => '重置密码请点击链接:\nhttps://%s/reset/?action=confirm&user=%s&code=%s\n\n或者您可以到 https://%s/reset/?action=code&user=%s 输入密码重置代码:\n%s\n\n如果您没有要求重置密码，请忽略此邮件\n\n--\nVesta Control Panel\n', - 'Jan' => 'Jan', - 'Feb' => 'Feb', - 'Mar' => 'Mar', - 'Apr' => 'Apr', - 'May' => 'May', - 'Jun' => 'Jun', - 'Jul' => 'Jul', - 'Aug' => 'Aug', - 'Sep' => 'Sep', - 'Oct' => 'Oct', - 'Nov' => 'Nov', - 'Dec' => 'Dec', + 'Jan' => '01月', + 'Feb' => '02月', + 'Mar' => '03月', + 'Apr' => '04月', + 'May' => '05月', + 'Jun' => '06月', + 'Jul' => '07月', + 'Aug' => '08月', + 'Sep' => '09月', + 'Oct' => '10月', + 'Nov' => '11月', + 'Dec' => '12月', - 'Configuring Server' => 'Configuring Server', - 'Hostname' => 'Hostname', - 'Time Zone' => 'Time Zone', - 'Default Language' => 'Default Language', - 'FileSystem Disk Quota' => 'FileSystem Disk Quota', - 'Vesta Control Panel Plugins' => 'Vesta Control Panel Plugins', - 'preview' => 'preview', - 'Reseller Role' => 'Reseller Role', - 'Web Config Editor' => 'Web Config Editor', - 'Template Manager' => 'Template Manager', - 'Backup Migration Manager' => 'Backup Migration Manager', - 'FileManager' => 'FileManager', - 'show: CPU / MEM / NET / DISK' => 'show: CPU / MEM / NET / DISK', + 'Configuring Server' => '配置服务器', + 'Hostname' => '主机名称', + 'Time Zone' => '时区', + 'Default Language' => '默认语言', + 'FileSystem Disk Quota' => '文件系统磁盘配额', + 'Vesta Control Panel Plugins' => 'Vesta 管理系统的插件', + 'Proxy Server' => '代理服务器', + 'Web Server' => 'Web服务器', + 'DNS Server' => 'DNS服务器', + 'DNS Cluster' => 'DNS集群', + 'MAIL Server' => '邮箱服务器', + 'Antivirus' => '防病毒引擎', + 'AntiSpam' => '防垃圾邮件', + 'Webmail URL' => '设置网页邮箱网址', + 'MySQL Support' => 'MySQL 支持', + 'phpMyAdmin URL' => '设置 phpMyAdmin 网址', + 'Maximum Number Of Databases' => '数据库最大数量', + 'Current Number Of Databases' => '数据库当前数量', + 'PostgreSQL Support' => 'PostgreSQL 支持', + 'Local backup' => '本地备份', + 'Compression level' => '压缩级别', + 'Directory' => '目录', + 'Remote backup' => '远程备份', + 'preview' => '预览', + 'Reseller Role' => '作为经销商', + 'Web Config Editor' => '网络配置编辑器', + 'Template Manager' => '模板管理', + 'Backup Migration Manager' => '备份迁移管理', + 'FileManager' => '文件管理', + 'show: CPU / MEM / NET / DISK' => '显示: CPU / MEM / NET / DISK', + 'MEMORY' => '内存', + 'DISK' => '磁盘', + 'NETWORK' => '网络', - 'sort by' => 'sort by', - 'Date' => 'Date', - 'Starred' => 'Starred', - 'Name' => 'Name', + 'sort by' => '排序方式', + 'Date' => '日期', + 'Starred' => '星标', + 'Name' => '名称', - 'File Manager' => 'File Manager', - 'type' => 'type', - 'size' => 'size', - 'date' => 'date', - 'name' => 'name', - 'Initializing' => 'Initializing', - 'UPLOAD' => 'UPLOAD', - 'NEW FILE' => 'NEW FILE', - 'NEW DIR' => 'NEW DIR', - 'DELETE' => 'DELETE', - 'RENAME' => 'RENAME', - 'COPY' => 'COPY', - 'ARCHIVE' => 'ARCHIVE', - 'EXTRACT' => 'EXTRACT', - 'DOWNLOAD' => 'DOWNLOAD', - 'Hit' => 'Hit', - 'to reload the page' => 'to reload the page', - 'Directory name cannot be empty' => 'Directory name cannot be empty', - 'File name cannot be empty' => 'File name cannot be empty', - 'No file selected' => 'No file selected', - 'No file or folder selected' => 'No file or folder selected', - 'File type not supported' => 'File type not supported', - 'Directory download not available in current version' => 'Directory download not available in current version', - 'Directory not available' => 'Directory not available', - 'Done' => 'Done', - 'Close' => 'Close', - 'Copy' => 'Copy', - 'Cancel' => 'Cancel', - 'Rename' => 'Rename', - 'Delete' => 'Delete', - 'Extract' => 'Extract', - 'Create' => 'Create', - 'Compress' => 'Compress', + 'File Manager' => '文件管理', + 'type' => '类型', + 'size' => '大小', + 'date' => '日期', + 'name' => '名称', + 'Initializing' => '初始化中', + 'UPLOAD' => '上传', + 'NEW FILE' => '新建文件', + 'NEW DIR' => '新建目录', + 'DELETE' => '删除', + 'RENAME' => '重命名', + 'COPY' => '复制', + 'ARCHIVE' => '存档', + 'EXTRACT' => '提取', + 'DOWNLOAD' => '下载', + 'Hit' => '再次按下', + 'to reload the page' => '键则刷新此页面', + 'Directory name cannot be empty' => '目录名称不能为空', + 'File name cannot be empty' => '文件名称不能为空', + 'No file selected' => '没有文件被选中', + 'No file or folder selected' => '没有文件或目录被选中', + 'File type not supported' => '不支持的文件类型', + 'Directory download not available in current version' => '目录下载在当前版本中不可用', + 'Directory not available' => '目录不可用', + 'Done' => '完成', + 'Close' => '关闭', + 'Copy' => '复制', + 'Cancel' => '取消', + 'Rename' => '重命名', + 'Delete' => '删除', + 'Extract' => '提取', + 'Create' => '创建', + 'Compress' => '压缩', 'OK' => 'OK', - 'Are you sure you want to copy' => 'Are you sure you want to copy', - 'Are you sure you want to delete' => 'Are you sure you want to delete', - 'into' => 'into', - 'existing files will be replaced' => 'existing files will be replaced', - 'Original name' => 'Original name', - 'File' => 'File', - 'already exists' => 'already exists', - 'Create file' => 'Create file', - 'Create directory' => 'Create directory', + 'Are you sure you want to copy' => '你确定要复制', + 'Are you sure you want to delete' => '你确定要删除', + 'into' => '到', + 'existing files will be replaced' => '现有文件将被替换', + 'Original name' => '原有名称', + 'File' => '文件', + 'already exists' => '已经存在', + 'Create file' => '创建文件', + 'Create directory' => '创建目录', - 'Add New object' => 'Add New object', - 'Save Form' => 'Save Form', - 'Cancel saving form' => 'Cancel saving form', - 'Go to USER list' => 'Go to USER list', - 'Go to WEB list' => 'Go to WEB list', - 'Go to DNS list' => 'Go to DNS list', - 'Go to MAIL list' => 'Go to MAIL list', - 'Go to DB list' => 'Go to DB list', - 'Go to CRON list' => 'Go to CRON list', - 'Go to BACKUP list' => 'Go to BACKUP list', - 'Focus on search' => 'Focus on search', - 'Display/Close shortcuts' => 'Display/Close shortcuts', - 'Move backward through top menu' => 'Move backward through top menu', - 'Move forward through top menu' => 'Move forward through top menu', - 'Enter focused element' => 'Enter focused element', - 'Upload' => 'Upload', - 'New File' => 'New File', - 'New Folder' => 'New Folder', - 'Download' => 'Download', - 'Rename' => 'Rename', - 'Copy' => 'Copy', - 'Archive' => 'Archive', - 'Delete' => 'Delete', - 'Save File (in text editor)' => 'Save File (in text editor)', - 'Close Popup / Cancel' => 'Close Popup / Cancel', - 'Move Cursor Up' => 'Move Cursor Up', - 'Move Cursor Dow' => 'Move Cursor Dow', - 'Switch to Left Tab' => 'Switch to Left Tab', - 'Switch to Right Tab' => 'Switch to Right Tab', - 'Switch Tab' => 'Switch Tab', - 'Go to the Top of File List' => 'Go to the Top of File List', - 'Go to the Last File' => 'Go to the Last File', - 'Open File/Enter Directory' => 'Open File/Enter Directory', - 'Go to Parent Directory' => 'Go to Parent Directory', - 'Select Current File' => 'Select Current File', - 'Select Bunch of Files' => 'Select Bunch of Files', - 'Append File to the Current Selection' => 'Append File to the Current Selection', - 'Select All Files' => 'Select All Files', - 'shortcuts are inspired by magnificent GNU Midnight Commander file manager' => - 'shortcuts are inspired by magnificent GNU Midnight Commander file manager', + 'Add New object' => '添加新对象', + 'Save Form' => '保存表单', + 'Cancel saving form' => '取消保存表单', + 'Go to USER list' => '转到用户账户', + 'Go to WEB list' => '转到Web服务', + 'Go to DNS list' => '转到DNS服务', + 'Go to MAIL list' => '转到邮箱服务', + 'Go to DB list' => '转到数据库', + 'Go to CRON list' => '转到定时任务', + 'Go to BACKUP list' => '转到数据备份', + 'Focus on search' => '光标定位到搜索栏', + 'Display/Close shortcuts' => '显示/关闭 快捷键', + 'Move backward through top menu' => '在顶部菜单栏向前定位光标', + 'Move forward through top menu' => '在顶部菜单栏向后定位光标', + 'Enter focused element' => '转到被光标定位的菜单项', - 'Licence Key' => 'Licence Key', - 'Enter License Key' => 'Enter License Key', - 'Buy Licence' => 'Buy Licence', - 'Buy Lifetime License' => 'Buy Lifetime License', - 'Disable and Cancel Licence' => 'Disable and Cancel Licence', - 'Licence Activated' => 'Licence Activated', - 'Licence Deactivated' => 'Licence Deactivated', - 'Restrict users so that they cannot use SSH and access only their home directory.' => 'Restrict users so that they cannot use SSH and access only their home directory.', - 'Browse, copy, edit, view, and retrieve all of your web domain files using fully featured File Manager.' => 'Browse, copy, edit, view, and retrieve all of your web domain files using fully featured File Manager.', - 'This is a commercial module, you would need to purchace license key to enable it.' => 'This is a commercial module, you would need to purchace license key to enable it.' + 'Upload' => '上传', + 'New File' => '新建文件', + 'New Folder' => '新建目录', + 'Download' => '下载', + 'Rename' => '重命名', + 'Copy' => '复制', + 'Archive' => '存档', + 'Delete' => '删除', + 'Save File (in text editor)' => '保存文件 (在文本编辑器内)', + 'Close Popup / Cancel' => '关闭弹窗 / 取消', + 'Move Cursor Up' => '上移光标', + 'Move Cursor Down' => '下移光标', + 'Switch to Left Tab' => '切换到左标签', + 'Switch to Right Tab' => '切换到右标签', + 'Switch Tab' => '切换标签', + 'Go to the Top of the File List' => '转至文件列表顶部', + 'Go to the Last File' => '转至最后一个文件', + 'Open File / Enter Directory' => '打开文件 / 进入目录', + 'Go to Parent Directory' => '转至父目录', + 'Select Current File' => '选中当前文件', + 'Select Bunch of Files' => '选择多个文件', + 'Add File to the Current Selection' => '将文件添加到当前选中区内', + 'Select All Files' => '选择所有文件', + 'shortcuts are inspired by magnificent GNU Midnight Commander file manager' => '快捷键的灵感来自旖旎的 GNU Midnight Commander 文件管理器', -); \ No newline at end of file + 'Licence Key' => '许可密匙', + 'Enter License Key' => '输入许可密匙', + 'Buy Licence' => '购买许可', + 'Buy Lifetime License' => '购买终身许可', + 'Disable and Cancel Licence' => '停用并取消许可', + 'Licence Activated' => '许可已激活', + 'Licence Deactivated' => '许可已停用', + 'Restrict users so that they cannot use SSH and access only their home directory.' => '限制用户，使他们不能使用 SSH 只能访问自己的主目录。', + 'Browse, copy, edit, view, and retrieve all of your web domain files using fully featured File Manager.' => '功能全面的文件管理器，浏览，复制，编辑，查看和检索你的 Web 文件。', + 'This is a commercial module, you would need to purchace license key to enable it.' => '这是商业模块，你需要购买许可密匙来启用它。' + +); From 8e951ac72e22cb482a2e2ff0aea04389f1e11fa3 Mon Sep 17 00:00:00 2001 From: Flat Date: Wed, 2 Dec 2015 21:24:34 +0900 Subject: [PATCH 233/264] :lock: :recycle: Implement secure `exec` wrapper functions. --- web/add/cron/autoupdate/index.php | 7 +- web/add/cron/index.php | 19 +- web/add/cron/reports/index.php | 7 +- web/add/db/index.php | 52 ++--- web/add/dns/index.php | 65 +++--- web/add/favorite/index.php | 12 +- web/add/firewall/banlist/index.php | 9 +- web/add/firewall/index.php | 20 +- web/add/ip/index.php | 32 ++- web/add/mail/index.php | 62 +++--- web/add/package/index.php | 152 +++++++------- web/add/user/index.php | 38 ++-- web/add/web/index.php | 108 ++++------ web/api/index.php | 55 ++--- web/bulk/backup/exclusions/index.php | 3 +- web/bulk/backup/index.php | 5 +- web/bulk/cron/index.php | 23 +- web/bulk/db/index.php | 5 +- web/bulk/dns/index.php | 13 +- web/bulk/firewall/banlist/index.php | 13 +- web/bulk/firewall/index.php | 5 +- web/bulk/ip/index.php | 15 +- web/bulk/mail/index.php | 11 +- web/bulk/package/index.php | 5 +- web/bulk/restore/index.php | 31 ++- web/bulk/service/index.php | 8 +- web/bulk/user/index.php | 11 +- web/bulk/vesta/index.php | 5 +- web/bulk/web/index.php | 13 +- web/delete/backup/exclusion/index.php | 11 +- web/delete/backup/index.php | 13 +- web/delete/cron/autoupdate/index.php | 3 +- web/delete/cron/index.php | 13 +- web/delete/cron/reports/index.php | 3 +- web/delete/db/index.php | 13 +- web/delete/dns/index.php | 27 +-- web/delete/favorite/index.php | 9 +- web/delete/firewall/banlist/index.php | 12 +- web/delete/firewall/index.php | 10 +- web/delete/ip/index.php | 11 +- web/delete/mail/index.php | 26 +-- web/delete/notification/index.php | 18 +- web/delete/package/index.php | 10 +- web/delete/user/index.php | 10 +- web/delete/web/index.php | 13 +- web/download/file/index.php | 8 +- web/download/web-log/index.php | 16 +- web/edit/backup/exclusions/index.php | 15 +- web/edit/cron/index.php | 45 ++-- web/edit/db/index.php | 41 ++-- web/edit/dns/index.php | 95 +++------ web/edit/file/index.php | 14 +- web/edit/firewall/index.php | 39 +--- web/edit/ip/index.php | 48 ++--- web/edit/mail/index.php | 131 ++++-------- web/edit/package/index.php | 58 +++--- web/edit/server/index.php | 237 ++++++++------------- web/edit/user/index.php | 128 +++++------- web/edit/web/index.php | 290 ++++++++++---------------- web/file_manager/fm_api.php | 12 +- web/file_manager/fm_core.php | 199 +++++++----------- web/generate/ssl/index.php | 31 +-- web/inc/exec.php | 85 ++++++++ web/inc/i18n.php | 27 +-- web/inc/mail-wrapper.php | 9 +- web/inc/main.php | 44 ++-- web/list/backup/exclusions/index.php | 5 +- web/list/backup/index.php | 14 +- web/list/cron/index.php | 7 +- web/list/db/index.php | 5 +- web/list/directory/index.php | 9 +- web/list/dns/index.php | 10 +- web/list/favorites/index.php | 10 +- web/list/firewall/banlist/index.php | 5 +- web/list/firewall/index.php | 5 +- web/list/ip/index.php | 5 +- web/list/log/index.php | 5 +- web/list/mail/index.php | 10 +- web/list/notifications/index.php | 18 +- web/list/package/index.php | 5 +- web/list/rrd/index.php | 5 +- web/list/server/index.php | 80 +++---- web/list/stats/index.php | 22 +- web/list/updates/index.php | 11 +- web/list/user/index.php | 12 +- web/list/web-log/index.php | 11 +- web/list/web/index.php | 6 +- web/login/index.php | 25 +-- web/reset/index.php | 34 ++- web/reset/mail/index.php | 18 +- web/restart/service/index.php | 11 +- web/restart/system/index.php | 4 +- web/schedule/backup/index.php | 22 +- web/schedule/restore/index.php | 33 ++- web/search/index.php | 13 +- web/start/service/index.php | 11 +- web/stop/service/index.php | 12 +- web/suspend/cron/index.php | 16 +- web/suspend/db/index.php | 12 +- web/suspend/dns/index.php | 26 +-- web/suspend/firewall/index.php | 12 +- web/suspend/mail/index.php | 32 ++- web/suspend/user/index.php | 10 +- web/suspend/web/index.php | 14 +- web/templates/admin/edit_package.html | 2 +- web/unsuspend/cron/index.php | 16 +- web/unsuspend/db/index.php | 21 +- web/unsuspend/dns/index.php | 40 ++-- web/unsuspend/firewall/index.php | 12 +- web/unsuspend/mail/index.php | 40 ++-- web/unsuspend/user/index.php | 12 +- web/unsuspend/web/index.php | 21 +- web/update/vesta/index.php | 11 +- web/upload/UploadHandler.php | 5 +- web/view/file/index.php | 8 +- 115 files changed, 1345 insertions(+), 1986 deletions(-) create mode 100644 web/inc/exec.php diff --git a/web/add/cron/autoupdate/index.php b/web/add/cron/autoupdate/index.php index 53d50c059..bc7db99dd 100644 --- a/web/add/cron/autoupdate/index.php +++ b/web/add/cron/autoupdate/index.php @@ -3,13 +3,12 @@ error_reporting(NULL); ob_start(); session_start(); -include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); +include($_SERVER['DOCUMENT_ROOT'].'/inc/main.php'); if ($_SESSION['user'] == 'admin') { - exec (VESTA_CMD."v-add-cron-vesta-autoupdate", $output, $return_var); + v_exec('v-add-cron-vesta-autoupdate', [], false); $_SESSION['error_msg'] = __('Autoupdate has been successfully enabled'); - unset($output); } -header("Location: /list/updates/"); +header('Location: /list/updates/'); exit; diff --git a/web/add/cron/index.php b/web/add/cron/index.php index 62cae8f1c..c78881877 100644 --- a/web/add/cron/index.php +++ b/web/add/cron/index.php @@ -13,7 +13,7 @@ if (!empty($_POST['ok'])) { // Check token if ((!isset($_POST['token'])) || ($_SESSION['token'] != $_POST['token'])) { header('location: /login/'); - exit(); + exit; } // Check empty fields @@ -35,18 +35,16 @@ if (!empty($_POST['ok'])) { } // Protect input - $v_min = escapeshellarg($_POST['v_min']); - $v_hour = escapeshellarg($_POST['v_hour']); - $v_day = escapeshellarg($_POST['v_day']); - $v_month = escapeshellarg($_POST['v_month']); - $v_wday = escapeshellarg($_POST['v_wday']); - $v_cmd = escapeshellarg($_POST['v_cmd']); + $v_min = $_POST['v_min']; + $v_hour = $_POST['v_hour']; + $v_day = $_POST['v_day']; + $v_month = $_POST['v_month']; + $v_wday = $_POST['v_wday']; + $v_cmd = $_POST['v_cmd']; // Add cron job if (empty($_SESSION['error_msg'])) { - exec (VESTA_CMD."v-add-cron-job ".$user." ".$v_min." ".$v_hour." ".$v_day." ".$v_month." ".$v_wday." ".$v_cmd, $output, $return_var); - check_return_code($return_var,$output); - unset($output); + v_exec('v-add-cron-job', [$user, $v_min, $v_hour, $v_day, $v_month, $v_wday, $v_cmd]); } // Flush field values on success @@ -58,7 +56,6 @@ if (!empty($_POST['ok'])) { unset($v_month); unset($v_wday); unset($v_cmd); - unset($output); } } diff --git a/web/add/cron/reports/index.php b/web/add/cron/reports/index.php index 4b0424e32..f3f31db95 100644 --- a/web/add/cron/reports/index.php +++ b/web/add/cron/reports/index.php @@ -3,11 +3,10 @@ error_reporting(NULL); ob_start(); session_start(); -include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); +include($_SERVER['DOCUMENT_ROOT'].'/inc/main.php'); -exec (VESTA_CMD."v-add-cron-reports ".$user, $output, $return_var); +v_exec('v-add-cron-reports', [$user], false); $_SESSION['error_msg'] = __('Cronjob email reporting has been successfully enabled'); -unset($output); -header("Location: /list/cron/"); +header('Location: /list/cron/'); exit; diff --git a/web/add/db/index.php b/web/add/db/index.php index c206eb13c..2a328f515 100644 --- a/web/add/db/index.php +++ b/web/add/db/index.php @@ -12,7 +12,7 @@ if (!empty($_POST['ok'])) { // Check token if ((!isset($_POST['token'])) || ($_SESSION['token'] != $_POST['token'])) { header('location: /login/'); - exit(); + exit; } // Check empty fields @@ -30,7 +30,7 @@ if (!empty($_POST['ok'])) { $error_msg = $error_msg.", ".$error; } } - $_SESSION['error_msg'] = __('Field "%s" can not be blank.',$error_msg); + $_SESSION['error_msg'] = __('Field "%s" can not be blank.', $error_msg); } // Validate email @@ -43,12 +43,11 @@ if (!empty($_POST['ok'])) { // Check password length if (empty($_SESSION['error_msg'])) { $pw_len = strlen($_POST['v_password']); - if ($pw_len < 6 ) $_SESSION['error_msg'] = __('Password is too short.',$error_msg); + if ($pw_len < 6) $_SESSION['error_msg'] = __('Password is too short.', $error_msg); } - // Protect input - $v_database = escapeshellarg($_POST['v_database']); - $v_dbuser = escapeshellarg($_POST['v_dbuser']); + $v_database = $_POST['v_database']; + $v_dbuser = $_POST['v_dbuser']; $v_type = $_POST['v_type']; $v_charset = $_POST['v_charset']; $v_host = $_POST['v_host']; @@ -56,32 +55,24 @@ if (!empty($_POST['ok'])) { // Add database if (empty($_SESSION['error_msg'])) { - $v_type = escapeshellarg($_POST['v_type']); - $v_charset = escapeshellarg($_POST['v_charset']); - $v_host = escapeshellarg($_POST['v_host']); - $v_password = tempnam("/tmp","vst"); - $fp = fopen($v_password, "w"); + $v_password = tempnam('/tmp', 'vst'); + $fp = fopen($v_password, 'w'); fwrite($fp, $_POST['v_password']."\n"); fclose($fp); - exec (VESTA_CMD."v-add-database ".$user." ".$v_database." ".$v_dbuser." ".$v_password." ".$v_type." ".$v_host." ".$v_charset, $output, $return_var); - check_return_code($return_var,$output); - unset($output); + v_exec('v-add-database', [$user, $v_database, $v_dbuser, $v_password, $v_type, $v_host, $v_charset]); unlink($v_password); - $v_password = escapeshellarg($_POST['v_password']); - $v_type = $_POST['v_type']; - $v_host = $_POST['v_host']; - $v_charset = $_POST['v_charset']; + $v_password = $_POST['v_password']; } // Get database manager url if (empty($_SESSION['error_msg'])) { - list($http_host, $port) = explode(':', $_SERVER["HTTP_HOST"] . ":"); + list($http_host, $port) = explode(':', $_SERVER['HTTP_HOST'] . ':'); if ($_POST['v_host'] != 'localhost' ) $http_host = $_POST['v_host']; - if ($_POST['v_type'] == 'mysql') $db_admin = "phpMyAdmin"; - if ($_POST['v_type'] == 'mysql') $db_admin_link = "http://".$http_host."/phpmyadmin/"; + if ($_POST['v_type'] == 'mysql') $db_admin = 'phpMyAdmin'; + if ($_POST['v_type'] == 'mysql') $db_admin_link = "http://$http_host/phpmyadmin/"; if (($_POST['v_type'] == 'mysql') && (!empty($_SESSION['DB_PMA_URL']))) $db_admin_link = $_SESSION['DB_PMA_URL']; - if ($_POST['v_type'] == 'pgsql') $db_admin = "phpPgAdmin"; - if ($_POST['v_type'] == 'pgsql') $db_admin_link = "http://".$http_host."/phppgadmin/"; + if ($_POST['v_type'] == 'pgsql') $db_admin = 'phpPgAdmin'; + if ($_POST['v_type'] == 'pgsql') $db_admin_link = "http://$http_host/phppgadmin/"; if (($_POST['v_type'] == 'pgsql') && (!empty($_SESSION['DB_PGA_URL']))) $db_admin_link = $_SESSION['DB_PGA_URL']; } @@ -90,15 +81,15 @@ if (!empty($_POST['ok'])) { $to = $v_db_email; $subject = __("Database Credentials"); $hostname = exec('hostname'); - $from = __('MAIL_FROM',$hostname); - $mailtext = __('DATABASE_READY',$user."_".$_POST['v_database'],$user."_".$_POST['v_dbuser'],$_POST['v_password'],$db_admin_link); + $from = __('MAIL_FROM', $hostname); + $mailtext = __('DATABASE_READY', $user.'_'.$_POST['v_database'], $user.'_'.$_POST['v_dbuser'], $_POST['v_password'], $db_admin_link); send_email($to, $subject, $mailtext, $from); } // Flush field values on success if (empty($_SESSION['error_msg'])) { - $_SESSION['ok_msg'] = __('DATABASE_CREATED_OK',htmlentities($user)."_".htmlentities($_POST['v_database']),htmlentities($user)."_".htmlentities($_POST['v_database'])); - $_SESSION['ok_msg'] .= " / " . __('open %s',$db_admin) . ""; + $_SESSION['ok_msg'] = __('DATABASE_CREATED_OK', htmlentities($user.'_'.$_POST['v_database']), htmlentities($user.'_'.$_POST['v_database'])); + $_SESSION['ok_msg'] .= " / " . __('open %s', $db_admin) . ''; unset($v_database); unset($v_dbuser); unset($v_password); @@ -117,16 +108,15 @@ top_panel($user,$TAB); $v_db_email = $panel[$user]['CONTACT']; // List avaiable database types -$db_types = split(",",$_SESSION['DB_SYSTEM']); +$db_types = explode(',', $_SESSION['DB_SYSTEM']); // List available database servers $db_hosts = array(); foreach ($db_types as $db_type ) { - exec (VESTA_CMD."v-list-database-hosts ".$db_type." 'json'", $output, $return_var); - $db_hosts_tmp = json_decode(implode('', $output), true); + v_exec('v-list-database-hosts', [$db_type, 'json'], false, $output); + $db_hosts_tmp = json_decode($output, true); $db_hosts = array_merge($db_hosts, $db_hosts_tmp); unset($db_hosts_tmp); - unset($output); } // Display body diff --git a/web/add/dns/index.php b/web/add/dns/index.php index 629e2ec57..086ca5d7e 100644 --- a/web/add/dns/index.php +++ b/web/add/dns/index.php @@ -13,7 +13,7 @@ if (!empty($_POST['ok'])) { // Check token if ((!isset($_POST['token'])) || ($_SESSION['token'] != $_POST['token'])) { header('location: /login/'); - exit(); + exit; } // Check empty fields @@ -32,56 +32,47 @@ if (!empty($_POST['ok'])) { // Protect input $v_domain = preg_replace("/^www./i", "", $_POST['v_domain']); - $v_domain = escapeshellarg($v_domain); $v_domain = strtolower($v_domain); - $v_ip = escapeshellarg($_POST['v_ip']); - if (!empty($_POST['v_ns1'])) $v_ns1 = escapeshellarg($_POST['v_ns1']); - if (!empty($_POST['v_ns2'])) $v_ns2 = escapeshellarg($_POST['v_ns2']); - if (!empty($_POST['v_ns3'])) $v_ns3 = escapeshellarg($_POST['v_ns3']); - if (!empty($_POST['v_ns4'])) $v_ns4 = escapeshellarg($_POST['v_ns4']); - if (!empty($_POST['v_ns5'])) $v_ns5 = escapeshellarg($_POST['v_ns5']); - if (!empty($_POST['v_ns6'])) $v_ns6 = escapeshellarg($_POST['v_ns6']); - if (!empty($_POST['v_ns7'])) $v_ns7 = escapeshellarg($_POST['v_ns7']); - if (!empty($_POST['v_ns8'])) $v_ns8 = escapeshellarg($_POST['v_ns8']); + $v_ip = $_POST['v_ip']; + if (!empty($_POST['v_ns1'])) $v_ns1 = $_POST['v_ns1']; + if (!empty($_POST['v_ns2'])) $v_ns2 = $_POST['v_ns2']; + if (!empty($_POST['v_ns3'])) $v_ns3 = $_POST['v_ns3']; + if (!empty($_POST['v_ns4'])) $v_ns4 = $_POST['v_ns4']; + if (!empty($_POST['v_ns5'])) $v_ns5 = $_POST['v_ns5']; + if (!empty($_POST['v_ns6'])) $v_ns6 = $_POST['v_ns6']; + if (!empty($_POST['v_ns7'])) $v_ns7 = $_POST['v_ns7']; + if (!empty($_POST['v_ns8'])) $v_ns8 = $_POST['v_ns8']; // Add dns domain if (empty($_SESSION['error_msg'])) { - exec (VESTA_CMD."v-add-dns-domain ".$user." ".$v_domain." ".$v_ip." ".$v_ns1." ".$v_ns2." ".$v_ns3." ".$v_ns4." ".$v_ns5." ".$v_ns6." ".$v_ns7." ".$v_ns8." no", $output, $return_var); - check_return_code($return_var,$output); - unset($output); + v_exec('v-add-dns-domain', [$user, $v_domain, $v_ip, $v_ns1, $v_ns2, $v_ns3, $v_ns4, $v_ns5, $v_ns6, $v_ns7, $v_ns8, 'no']); } // Set expiriation date if (empty($_SESSION['error_msg'])) { if ((!empty($_POST['v_exp'])) && ($_POST['v_exp'] != date('Y-m-d', strtotime('+1 year')))) { - $v_exp = escapeshellarg($_POST['v_exp']); - exec (VESTA_CMD."v-change-dns-domain-exp ".$user." ".$v_domain." ".$v_exp." no", $output, $return_var); - check_return_code($return_var,$output); - unset($output); + $v_exp = $_POST['v_exp']; + v_exec('v-change-dns-domain-exp', [$user, $v_domain, $v_exp, 'no']); } } // Set ttl if (empty($_SESSION['error_msg'])) { if ((!empty($_POST['v_ttl'])) && ($_POST['v_ttl'] != '14400') && (empty($_SESSION['error_msg']))) { - $v_ttl = escapeshellarg($_POST['v_ttl']); - exec (VESTA_CMD."v-change-dns-domain-ttl ".$user." ".$v_domain." ".$v_ttl." no", $output, $return_var); - check_return_code($return_var,$output); - unset($output); + $v_ttl = $_POST['v_ttl']; + v_exec('v-change-dns-domain-ttl', [$user, $v_domain, $v_ttl, 'no']); } } // Restart dns server if (empty($_SESSION['error_msg'])) { - exec (VESTA_CMD."v-restart-dns", $output, $return_var); - check_return_code($return_var,$output); - unset($output); + v_exec('v-restart-dns'); } // Flush field values on success if (empty($_SESSION['error_msg'])) { - $_SESSION['ok_msg'] = __('DNS_DOMAIN_CREATED_OK',htmlentities($_POST[v_domain]),htmlentities($_POST[v_domain])); + $_SESSION['ok_msg'] = __('DNS_DOMAIN_CREATED_OK', htmlentities($_POST[v_domain]), htmlentities($_POST[v_domain])); unset($v_domain); } } @@ -93,7 +84,7 @@ if (!empty($_POST['ok_rec'])) { // Check token if ((!isset($_POST['token'])) || ($_SESSION['token'] != $_POST['token'])) { header('location: /login/'); - exit(); + exit; } // Check empty fields @@ -113,18 +104,15 @@ if (!empty($_POST['ok_rec'])) { } // Protect input - $v_domain = escapeshellarg($_POST['v_domain']); - $v_rec = escapeshellarg($_POST['v_rec']); - $v_type = escapeshellarg($_POST['v_type']); - $v_val = escapeshellarg($_POST['v_val']); - $v_priority = escapeshellarg($_POST['v_priority']); + $v_domain = $_POST['v_domain']; + $v_rec = $_POST['v_rec']; + $v_type = $_POST['v_type']; + $v_val = $_POST['v_val']; + $v_priority = $_POST['v_priority']; // Add dns record if (empty($_SESSION['error_msg'])) { - exec (VESTA_CMD."v-add-dns-record ".$user." ".$v_domain." ".$v_rec." ".$v_type." ".$v_val." ".$v_priority, $output, $return_var); - check_return_code($return_var,$output); - unset($output); - $v_type = $_POST['v_type']; + v_exec('v-add-dns-record', [$user, $v_domain, $v_rec, $v_type, $v_val, $v_priority]); } // Flush field values on success @@ -159,8 +147,8 @@ if (empty($_GET['domain'])) { if (empty($v_ttl)) $v_ttl = 14400; if (empty($v_exp)) $v_exp = date('Y-m-d', strtotime('+1 year')); if (empty($v_ns1)) { - exec (VESTA_CMD."v-list-user-ns ".$user." json", $output, $return_var); - $nameservers = json_decode(implode('', $output), true); + v_exec('v-list-user-ns', [$user, 'json'], false, $output); + $nameservers = json_decode($output, true); $v_ns1 = str_replace("'", "", $nameservers[0]); $v_ns2 = str_replace("'", "", $nameservers[1]); $v_ns3 = str_replace("'", "", $nameservers[2]); @@ -169,7 +157,6 @@ if (empty($_GET['domain'])) { $v_ns6 = str_replace("'", "", $nameservers[5]); $v_ns7 = str_replace("'", "", $nameservers[6]); $v_ns8 = str_replace("'", "", $nameservers[7]); - unset($output); } include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/add_dns.html'); } diff --git a/web/add/favorite/index.php b/web/add/favorite/index.php index e9f2e828d..9987ecc9c 100644 --- a/web/add/favorite/index.php +++ b/web/add/favorite/index.php @@ -9,15 +9,13 @@ include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); // Check token // if ((!isset($_POST['token'])) || ($_SESSION['token'] != $_POST['token'])) { // header('location: /login/'); -// exit(); +// exit; // } - // Protect input - $v_section = escapeshellarg($_REQUEST['v_section']); - $v_unit_id = escapeshellarg($_REQUEST['v_unit_id']); + $v_section = $_REQUEST['v_section']; + $v_unit_id = $_REQUEST['v_unit_id']; - $_SESSION['favourites'][strtoupper($_REQUEST['v_section'])][$_REQUEST['v_unit_id']] = 1; + $_SESSION['favourites'][strtoupper((string)$v_section)][(string)$v_unit_id] = 1; - exec (VESTA_CMD."v-add-user-favourites ".$_SESSION['user']." ".$v_section." ".$v_unit_id, $output, $return_var); -// check_return_code($return_var,$output); + v_exec('v-add-user-favourites', [$_SESSION['user'], $v_section, $v_unit_id], false/*true*/); ?> \ No newline at end of file diff --git a/web/add/firewall/banlist/index.php b/web/add/firewall/banlist/index.php index f0e97042a..e95324bf3 100644 --- a/web/add/firewall/banlist/index.php +++ b/web/add/firewall/banlist/index.php @@ -31,15 +31,12 @@ if (!empty($_POST['ok'])) { $_SESSION['error_msg'] = __('Field "%s" can not be blank.',$error_msg); } - // Protect input - $v_chain = escapeshellarg($_POST['v_chain']); - $v_ip = escapeshellarg($_POST['v_ip']); + $v_chain = $_POST['v_chain']; + $v_ip = $_POST['v_ip']; // Add firewall ban if (empty($_SESSION['error_msg'])) { - exec (VESTA_CMD."v-add-firewall-ban ".$v_ip." ".$v_chain, $output, $return_var); - check_return_code($return_var,$output); - unset($output); + v_exec('v-add-firewall-ban', [$v_ip, $v_chain]); } // Flush field values on success diff --git a/web/add/firewall/index.php b/web/add/firewall/index.php index caae650ce..e6ead5a16 100644 --- a/web/add/firewall/index.php +++ b/web/add/firewall/index.php @@ -20,7 +20,7 @@ if (!empty($_POST['ok'])) { // Check token if ((!isset($_POST['token'])) || ($_SESSION['token'] != $_POST['token'])) { header('location: /login/'); - exit(); + exit; } // Check empty fields @@ -39,21 +39,17 @@ if (!empty($_POST['ok'])) { $_SESSION['error_msg'] = __('Field "%s" can not be blank.',$error_msg); } - // Protect input - $v_action = escapeshellarg($_POST['v_action']); - $v_protocol = escapeshellarg($_POST['v_protocol']); - $v_port = str_replace(" ",",", $_POST['v_port']); + $v_action = $_POST['v_action']; + $v_protocol = $_POST['v_protocol']; + $v_port = str_replace(' ', ',', $_POST['v_port']); $v_port = preg_replace('/\,+/', ',', $v_port); - $v_port = trim($v_port, ","); - $v_port = escapeshellarg($v_port); - $v_ip = escapeshellarg($_POST['v_ip']); - $v_comment = escapeshellarg($_POST['v_comment']); + $v_port = trim($v_port, ','); + $v_ip = $_POST['v_ip']; + $v_comment = $_POST['v_comment']; // Add firewall rule if (empty($_SESSION['error_msg'])) { - exec (VESTA_CMD."v-add-firewall-rule ".$v_action." ".$v_ip." ".$v_port." ".$v_protocol." ".$v_comment, $output, $return_var); - check_return_code($return_var,$output); - unset($output); + v_exec('v-add-firewall-rule', [$v_action, $v_ip, $v_port, $v_protocol, $v_comment]); } // Flush field values on success diff --git a/web/add/ip/index.php b/web/add/ip/index.php index 5f48a081d..5ac006801 100644 --- a/web/add/ip/index.php +++ b/web/add/ip/index.php @@ -19,7 +19,7 @@ if (!empty($_POST['ok'])) { // Check token if ((!isset($_POST['token'])) || ($_SESSION['token'] != $_POST['token'])) { header('location: /login/'); - exit(); + exit; } // Check empty fields @@ -38,13 +38,12 @@ if (!empty($_POST['ok'])) { $_SESSION['error_msg'] = __('Field "%s" can not be blank.',$error_msg); } - // Protect input - $v_ip = escapeshellarg($_POST['v_ip']); - $v_netmask = escapeshellarg($_POST['v_netmask']); - $v_name = escapeshellarg($_POST['v_name']); - $v_nat = escapeshellarg($_POST['v_nat']); - $v_interface = escapeshellarg($_POST['v_interface']); - $v_owner = escapeshellarg($_POST['v_owner']); + $v_ip = $_POST['v_ip']; + $v_netmask = $_POST['v_netmask']; + $v_name = $_POST['v_name']; + $v_nat = $_POST['v_nat']; + $v_interface = $_POST['v_interface']; + $v_owner = $_POST['v_owner']; $v_shared = $_POST['v_shared']; // Check shared checkmark @@ -53,16 +52,11 @@ if (!empty($_POST['ok'])) { } else { $ip_status = 'dedicated'; $v_dedicated = 'yes'; - } // Add IP if (empty($_SESSION['error_msg'])) { - exec (VESTA_CMD."v-add-sys-ip ".$v_ip." ".$v_netmask." ".$v_interface." ".$v_owner." '".$ip_status."' ".$v_name." ".$v_nat, $output, $return_var); - check_return_code($return_var,$output); - unset($output); - $v_owner = $_POST['v_owner']; - $v_interface = $_POST['v_interface']; + v_exec('v-add-sys-ip', [$v_ip, $v_netmask, $v_interface, $v_owner, $ip_status, $v_name, $v_nat]); } // Flush field values on success @@ -82,14 +76,12 @@ include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html'); top_panel($user,$TAB); // List network interfaces -exec (VESTA_CMD."v-list-sys-interfaces 'json'", $output, $return_var); -$interfaces = json_decode(implode('', $output), true); -unset($output); +v_exec('v-list-sys-interfaces', ['json'], false, $output); +$interfaces = json_decode($output, true); // List users -exec (VESTA_CMD."v-list-sys-users 'json'", $output, $return_var); -$users = json_decode(implode('', $output), true); -unset($output); +v_exec('v-list-sys-users', ['json'], false, $output); +$users = json_decode($output, true); // Display body include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/add_ip.html'); diff --git a/web/add/mail/index.php b/web/add/mail/index.php index 12adde125..5ae28a38c 100644 --- a/web/add/mail/index.php +++ b/web/add/mail/index.php @@ -14,7 +14,7 @@ if (!empty($_POST['ok'])) { // Check token if ((!isset($_POST['token'])) || ($_SESSION['token'] != $_POST['token'])) { header('location: /login/'); - exit(); + exit; } // Check empty fields @@ -53,19 +53,16 @@ if (!empty($_POST['ok'])) { // Set domain name to lowercase and remove www prefix $v_domain = preg_replace("/^www./i", "", $_POST['v_domain']); - $v_domain = escapeshellarg($v_domain); $v_domain = strtolower($v_domain); // Add mail domain if (empty($_SESSION['error_msg'])) { - exec (VESTA_CMD."v-add-mail-domain ".$user." ".$v_domain." ".$v_antispam." ".$v_antivirus." ".$v_dkim, $output, $return_var); - check_return_code($return_var,$output); - unset($output); + v_exec('v-add-mail-domain', [$user, $v_domain, $v_antispam, $v_antivirus, $v_dkim]); } // Flush field values on success if (empty($_SESSION['error_msg'])) { - $_SESSION['ok_msg'] = __('MAIL_DOMAIN_CREATED_OK',htmlentities($_POST['v_domain']),htmlentities($_POST['v_domain'])); + $_SESSION['ok_msg'] = __('MAIL_DOMAIN_CREATED_OK', htmlentities($_POST['v_domain']), htmlentities($_POST['v_domain'])); unset($v_domain); } } @@ -77,7 +74,7 @@ if (!empty($_POST['ok_acc'])) { // Check token if ((!isset($_POST['token'])) || ($_SESSION['token'] != $_POST['token'])) { header('location: /login/'); - exit(); + exit; } // Check empty fields @@ -92,17 +89,16 @@ if (!empty($_POST['ok_acc'])) { $error_msg = $error_msg.", ".$error; } } - $_SESSION['error_msg'] = __('Field "%s" can not be blank.',$error_msg); + $_SESSION['error_msg'] = __('Field "%s" can not be blank.', $error_msg); } // Protect input - $v_domain = escapeshellarg($_POST['v_domain']); - $v_domain = strtolower($v_domain); - $v_account = escapeshellarg($_POST['v_account']); - $v_quota = escapeshellarg($_POST['v_quota']); + $v_domain = strtolower($_POST['v_domain']); + $v_account = $_POST['v_account']; + $v_quota = $_POST['v_quota']; $v_aliases = $_POST['v_aliases']; $v_fwd = $_POST['v_fwd']; - if (empty($_POST['v_quota'])) $v_quota = 0; + if (empty($_POST['v_quota'])) $v_quota = '0'; if ((!empty($_POST['v_quota'])) || (!empty($_POST['v_aliases'])) || (!empty($_POST['v_fwd'])) ) $v_adv = 'yes'; // Add Mail Account @@ -111,65 +107,55 @@ if (!empty($_POST['ok_acc'])) { $fp = fopen($v_password, "w"); fwrite($fp, $_POST['v_password']."\n"); fclose($fp); - exec (VESTA_CMD."v-add-mail-account ".$user." ".$v_domain." ".$v_account." ".$v_password." ".$v_quota, $output, $return_var); - check_return_code($return_var,$output); - unset($output); + v_exec('v-add-mail-account', [$user, $v_domain, $v_account, $v_password, $v_quota]); unlink($v_password); - $v_password = escapeshellarg($_POST['v_password']); + $v_password = $_POST['v_password']; } // Add Aliases if ((!empty($_POST['v_aliases'])) && (empty($_SESSION['error_msg']))) { - $valiases = preg_replace("/\n/", " ", $_POST['v_aliases']); - $valiases = preg_replace("/,/", " ", $valiases); + $valiases = preg_replace('/\n/', ' ', $_POST['v_aliases']); + $valiases = preg_replace('/,/', ' ', $valiases); $valiases = preg_replace('/\s+/', ' ',$valiases); $valiases = trim($valiases); - $aliases = explode(" ", $valiases); + $aliases = explode(' ', $valiases); foreach ($aliases as $alias) { - $alias = escapeshellarg($alias); if (empty($_SESSION['error_msg'])) { - exec (VESTA_CMD."v-add-mail-account-alias ".$user." ".$v_domain." ".$v_account." ".$alias, $output, $return_var); - check_return_code($return_var,$output); - unset($output); + v_exec('v-add-mail-account-alias', [$user, $v_domain, $v_account, $alias]); } } } // Add Forwarders if ((!empty($_POST['v_fwd'])) && (empty($_SESSION['error_msg']))) { - $vfwd = preg_replace("/\n/", " ", $_POST['v_fwd']); - $vfwd = preg_replace("/,/", " ", $vfwd); + $vfwd = preg_replace('/\n/', ' ', $_POST['v_fwd']); + $vfwd = preg_replace('/,/', ' ', $vfwd); $vfwd = preg_replace('/\s+/', ' ',$vfwd); $vfwd = trim($vfwd); - $fwd = explode(" ", $vfwd); + $fwd = explode(' ', $vfwd); foreach ($fwd as $forward) { - $forward = escapeshellarg($forward); if (empty($_SESSION['error_msg'])) { - exec (VESTA_CMD."v-add-mail-account-forward ".$user." ".$v_domain." ".$v_account." ".$forward, $output, $return_var); - check_return_code($return_var,$output); - unset($output); + v_exec('v-add-mail-account-forward', [$user, $v_domain, $v_account, $forward]); } } } // Add fwd_only flag if ((!empty($_POST['v_fwd_only'])) && (empty($_SESSION['error_msg']))) { - exec (VESTA_CMD."v-add-mail-account-fwd-only ".$user." ".$v_domain." ".$v_account, $output, $return_var); - check_return_code($return_var,$output); - unset($output); + v_exec('v-add-mail-account-fwd-only', [$user, $v_domain, $v_account]); } // Get webmail url if (empty($_SESSION['error_msg'])) { - list($http_host, $port) = explode(':', $_SERVER["HTTP_HOST"].":"); - $webmail = "http://".$http_host."/webmail/"; + list($http_host, $port) = explode(':', $_SERVER['HTTP_HOST'].':'); + $webmail = "http://$http_host/webmail/"; if (!empty($_SESSION['MAIL_URL'])) $webmail = $_SESSION['MAIL_URL']; } // Flush field values on success if (empty($_SESSION['error_msg'])) { - $_SESSION['ok_msg'] = __('MAIL_ACCOUNT_CREATED_OK',htmlentities(strtolower($_POST['v_account'])),htmlentities($_POST[v_domain]),htmlentities(strtolower($_POST['v_account'])),htmlentities($_POST[v_domain])); - $_SESSION['ok_msg'] .= " / " . __('open webmail') . ""; + $_SESSION['ok_msg'] = __('MAIL_ACCOUNT_CREATED_OK', htmlentities(strtolower($_POST['v_account'])), htmlentities($_POST['v_domain']), htmlentities(strtolower($_POST['v_account'])), htmlentities($_POST['v_domain'])); + $_SESSION['ok_msg'] .= " / " . __('open webmail') . ''; unset($v_account); unset($v_password); unset($v_password); diff --git a/web/add/package/index.php b/web/add/package/index.php index f620b4711..f93e1b03e 100644 --- a/web/add/package/index.php +++ b/web/add/package/index.php @@ -19,7 +19,7 @@ if (!empty($_POST['ok'])) { // Check token if ((!isset($_POST['token'])) || ($_SESSION['token'] != $_POST['token'])) { header('location: /login/'); - exit(); + exit; } // Check empty fields @@ -57,24 +57,23 @@ if (!empty($_POST['ok'])) { $_SESSION['error_msg'] = __('Field "%s" can not be blank.',$error_msg); } - // Protect input - $v_package = escapeshellarg($_POST['v_package']); - $v_web_template = escapeshellarg($_POST['v_web_template']); - $v_backend_template = escapeshellarg($_POST['v_backend_template']); - $v_proxy_template = escapeshellarg($_POST['v_proxy_template']); - $v_dns_template = escapeshellarg($_POST['v_dns_template']); - $v_shell = escapeshellarg($_POST['v_shell']); - $v_web_domains = escapeshellarg($_POST['v_web_domains']); - $v_web_aliases = escapeshellarg($_POST['v_web_aliases']); - $v_dns_domains = escapeshellarg($_POST['v_dns_domains']); - $v_dns_records = escapeshellarg($_POST['v_dns_records']); - $v_mail_domains = escapeshellarg($_POST['v_mail_domains']); - $v_mail_accounts = escapeshellarg($_POST['v_mail_accounts']); - $v_databases = escapeshellarg($_POST['v_databases']); - $v_cron_jobs = escapeshellarg($_POST['v_cron_jobs']); - $v_backups = escapeshellarg($_POST['v_backups']); - $v_disk_quota = escapeshellarg($_POST['v_disk_quota']); - $v_bandwidth = escapeshellarg($_POST['v_bandwidth']); + $v_package = $_POST['v_package']; + $v_web_template = $_POST['v_web_template']; + $v_backend_template = $_POST['v_backend_template']; + $v_proxy_template = $_POST['v_proxy_template']; + $v_dns_template = $_POST['v_dns_template']; + $v_shell = $_POST['v_shell']; + $v_web_domains = $_POST['v_web_domains']; + $v_web_aliases = $_POST['v_web_aliases']; + $v_dns_domains = $_POST['v_dns_domains']; + $v_dns_records = $_POST['v_dns_records']; + $v_mail_domains = $_POST['v_mail_domains']; + $v_mail_accounts = $_POST['v_mail_accounts']; + $v_databases = $_POST['v_databases']; + $v_cron_jobs = $_POST['v_cron_jobs']; + $v_backups = $_POST['v_backups']; + $v_disk_quota = $_POST['v_disk_quota']; + $v_bandwidth = $_POST['v_bandwidth']; $v_ns1 = trim($_POST['v_ns1'], '.'); $v_ns2 = trim($_POST['v_ns2'], '.'); $v_ns3 = trim($_POST['v_ns3'], '.'); @@ -90,43 +89,46 @@ if (!empty($_POST['ok'])) { if (!empty($v_ns6)) $v_ns .= ",".$v_ns6; if (!empty($v_ns7)) $v_ns .= ",".$v_ns7; if (!empty($v_ns8)) $v_ns .= ",".$v_ns8; - $v_ns = escapeshellarg($v_ns); - $v_time = escapeshellarg(date('H:i:s')); - $v_date = escapeshellarg(date('Y-m-d')); + $v_time = date('H:i:s'); + $v_date = date('Y-m-d'); // Create temporary dir if (empty($_SESSION['error_msg'])) { - exec ('mktemp -d', $output, $return_var); + exec('mktemp -d', $output, $return_var); $tmpdir = $output[0]; - check_return_code($return_var,$output); + check_return_code($return_var, $output); unset($output); } // Create package file if (empty($_SESSION['error_msg'])) { - $pkg = "WEB_TEMPLATE=".$v_web_template."\n"; - if (!empty($_SESSION['WEB_BACKEND'])) { - $pkg .= "BACKEND_TEMPLATE=".$v_backend_template."\n"; + $a_pkg = [ + 'WEB_TEMPLATE' => $v_web_template, + 'BACKEND_TEMPLATE' => !empty($_SESSION['WEB_BACKEND']) ? $v_backend_template : null, + 'PROXY_TEMPLATE' => !empty($_SESSION['PROXY_SYSTEM']) ? $v_proxy_template : null, + 'DNS_TEMPLATE' => $v_dns_template, + 'WEB_DOMAINS' => $v_web_domains, + 'WEB_ALIASES' => $v_web_aliases, + 'DNS_DOMAINS' => $v_dns_domains, + 'DNS_RECORDS' => $v_dns_records, + 'MAIL_DOMAINS' => $v_mail_domains, + 'MAIL_ACCOUNTS' => $v_mail_accounts, + 'DATABASES' => $v_databases, + 'CRON_JOBS' => $v_cron_jobs, + 'DISK_QUOTA' => $v_disk_quota, + 'BANDWIDTH' => $v_bandwidth, + 'NS' => $v_ns, + 'SHELL' => $v_shell, + 'BACKUPS' => $v_backups, + 'TIME' => $v_time, + 'DATE' => $v_date, + ]; + + $pkg = ''; + foreach ($a_pkg as $key => $value) { + if (is_null($value)) continue; + $pkg .= $key . '=' . escapeshellarg($value) . "\n"; } - if (!empty($_SESSION['PROXY_SYSTEM'])) { - $pkg .= "PROXY_TEMPLATE=".$v_proxy_template."\n"; - } - $pkg .= "DNS_TEMPLATE=".$v_dns_template."\n"; - $pkg .= "WEB_DOMAINS=".$v_web_domains."\n"; - $pkg .= "WEB_ALIASES=".$v_web_aliases."\n"; - $pkg .= "DNS_DOMAINS=".$v_dns_domains."\n"; - $pkg .= "DNS_RECORDS=".$v_dns_records."\n"; - $pkg .= "MAIL_DOMAINS=".$v_mail_domains."\n"; - $pkg .= "MAIL_ACCOUNTS=".$v_mail_accounts."\n"; - $pkg .= "DATABASES=".$v_databases."\n"; - $pkg .= "CRON_JOBS=".$v_cron_jobs."\n"; - $pkg .= "DISK_QUOTA=".$v_disk_quota."\n"; - $pkg .= "BANDWIDTH=".$v_bandwidth."\n"; - $pkg .= "NS=".$v_ns."\n"; - $pkg .= "SHELL=".$v_shell."\n"; - $pkg .= "BACKUPS=".$v_backups."\n"; - $pkg .= "TIME=".$v_time."\n"; - $pkg .= "DATE=".$v_date."\n"; $fp = fopen($tmpdir."/".$_POST['v_package'].".pkg", 'w'); fwrite($fp, $pkg); @@ -135,18 +137,15 @@ if (!empty($_POST['ok'])) { // Add new package if (empty($_SESSION['error_msg'])) { - exec (VESTA_CMD."v-add-user-package ".$tmpdir." ".$v_package, $output, $return_var); - check_return_code($return_var,$output); - unset($output); + v_exec('v-add-user-package', [$tmpdir, $v_package]); } - // Remove tmpdir - exec ('rm -rf '.$tmpdir, $output, $return_var); - unset($output); + // Remove tmpdir + safe_exec('rm', ['-rf', $tmpdir]); // Flush field values on success if (empty($_SESSION['error_msg'])) { - $_SESSION['ok_msg'] = __('PACKAGE_CREATED_OK',htmlentities($_POST['v_package']),htmlentities($_POST['v_package'])); + $_SESSION['ok_msg'] = __('PACKAGE_CREATED_OK', htmlentities($_POST['v_package']), htmlentities($_POST['v_package'])); unset($v_package); } @@ -160,33 +159,28 @@ include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html'); top_panel($user,$TAB); // List web temmplates -exec (VESTA_CMD."v-list-web-templates json", $output, $return_var); -$web_templates = json_decode(implode('', $output), true); -unset($output); +v_exec('v-list-web-templates', ['json'], false, $output); +$web_templates = json_decode($output, true); // List web templates for backend if (!empty($_SESSION['WEB_BACKEND'])) { - exec (VESTA_CMD."v-list-web-templates-backend json", $output, $return_var); - $backend_templates = json_decode(implode('', $output), true); - unset($output); + v_exec('v-list-web-templates-backend', ['json'], false, $output); + $backend_templates = json_decode($output, true); } // List web templates for proxy if (!empty($_SESSION['PROXY_SYSTEM'])) { - exec (VESTA_CMD."v-list-web-templates-proxy json", $output, $return_var); - $proxy_templates = json_decode(implode('', $output), true); - unset($output); + v_exec('v-list-web-templates-proxy', ['json'], false, $output); + $proxy_templates = json_decode($output, true); } // List DNS templates -exec (VESTA_CMD."v-list-dns-templates json", $output, $return_var); -$dns_templates = json_decode(implode('', $output), true); -unset($output); +v_exec('v-list-dns-templates', ['json'], false, $output); +$dns_templates = json_decode($output, true); // List system shells -exec (VESTA_CMD."v-list-sys-shells json", $output, $return_var); -$shells = json_decode(implode('', $output), true); -unset($output); +v_exec('v-list-sys-shells', ['json'], false, $output); +$shells = json_decode($output, true); // Set default values if (empty($v_web_template)) $v_web_template = 'default'; @@ -194,17 +188,17 @@ if (empty($v_backend_template)) $v_backend_template = 'default'; if (empty($v_proxy_template)) $v_proxy_template = 'default'; if (empty($v_dns_template)) $v_dns_template = 'default'; if (empty($v_shell)) $v_shell = 'nologin'; -if (empty($v_web_domains)) $v_web_domains = "'1'"; -if (empty($v_web_aliases)) $v_web_aliases = "'1'"; -if (empty($v_dns_domains)) $v_dns_domains = "'1'"; -if (empty($v_dns_records)) $v_dns_records = "'1'"; -if (empty($v_mail_domains)) $v_mail_domains = "'1'"; -if (empty($v_mail_accounts)) $v_mail_accounts = "'1'"; -if (empty($v_databases)) $v_databases = "'1'"; -if (empty($v_cron_jobs)) $v_cron_jobs = "'1'"; -if (empty($v_backups)) $v_backups = "'1'"; -if (empty($v_disk_quota)) $v_disk_quota = "'1000'"; -if (empty($v_bandwidth)) $v_bandwidth = "'1000'"; +if (empty($v_web_domains)) $v_web_domains = '1'; +if (empty($v_web_aliases)) $v_web_aliases = '1'; +if (empty($v_dns_domains)) $v_dns_domains = '1'; +if (empty($v_dns_records)) $v_dns_records = '1'; +if (empty($v_mail_domains)) $v_mail_domains = '1'; +if (empty($v_mail_accounts)) $v_mail_accounts = '1'; +if (empty($v_databases)) $v_databases = '1'; +if (empty($v_cron_jobs)) $v_cron_jobs = '1'; +if (empty($v_backups)) $v_backups = '1'; +if (empty($v_disk_quota)) $v_disk_quota = '1000'; +if (empty($v_bandwidth)) $v_bandwidth = '1000'; if (empty($v_ns1)) $v_ns1 = 'ns1.example.ltd'; if (empty($v_ns2)) $v_ns2 = 'ns2.example.ltd'; diff --git a/web/add/user/index.php b/web/add/user/index.php index 26de10209..434dd6746 100644 --- a/web/add/user/index.php +++ b/web/add/user/index.php @@ -19,7 +19,7 @@ if (!empty($_POST['ok'])) { // Check token if ((!isset($_POST['token'])) || ($_SESSION['token'] != $_POST['token'])) { header('location: /login/'); - exit(); + exit; } // Check empty fields @@ -48,16 +48,15 @@ if (!empty($_POST['ok'])) { // Check password length if (empty($_SESSION['error_msg'])) { $pw_len = strlen($_POST['v_password']); - if ($pw_len < 6 ) $_SESSION['error_msg'] = __('Password is too short.',$error_msg); + if ($pw_len < 6) $_SESSION['error_msg'] = __('Password is too short.', $error_msg); } - // Protect input - $v_username = escapeshellarg($_POST['v_username']); - $v_email = escapeshellarg($_POST['v_email']); - $v_package = escapeshellarg($_POST['v_package']); - $v_language = escapeshellarg($_POST['v_language']); - $v_fname = escapeshellarg($_POST['v_fname']); - $v_lname = escapeshellarg($_POST['v_lname']); + $v_username = $_POST['v_username']; + $v_email = $_POST['v_email']; + $v_package = $_POST['v_package']; + $v_language = $_POST['v_language']; + $v_fname = $_POST['v_fname']; + $v_lname = $_POST['v_lname']; $v_notify = $_POST['v_notify']; @@ -67,18 +66,14 @@ if (!empty($_POST['ok'])) { $fp = fopen($v_password, "w"); fwrite($fp, $_POST['v_password']."\n"); fclose($fp); - exec (VESTA_CMD."v-add-user ".$v_username." ".$v_password." ".$v_email." ".$v_package." ".$v_fname." ".$v_lname, $output, $return_var); - check_return_code($return_var,$output); - unset($output); + v_exec('v-add-user', [$v_username, $v_password, $v_email, $v_package, $v_fname, $v_lname]); unlink($v_password); - $v_password = escapeshellarg($_POST['v_password']); + $v_password = $_POST['v_password']; } // Set language if (empty($_SESSION['error_msg'])) { - exec (VESTA_CMD."v-change-user-language ".$v_username." ".$v_language, $output, $return_var); - check_return_code($return_var,$output); - unset($output); + v_exec('v-change-user-language', [$v_username, $v_language]); } // Send email to the new user @@ -86,7 +81,6 @@ if (!empty($_POST['ok'])) { $to = $_POST['v_notify']; $subject = _translate($_POST['v_language'],"Welcome to Vesta Control Panel"); $hostname = exec('hostname'); - unset($output); $from = _translate($_POST['v_language'],'MAIL_FROM',$hostname); if (!empty($_POST['v_fname'])) { $mailtext = _translate($_POST['v_language'],'GREETINGS_GORDON_FREEMAN',$_POST['v_fname'],$_POST['v_lname']); @@ -118,15 +112,13 @@ include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html'); top_panel($user,$TAB); // List hosting packages -exec (VESTA_CMD."v-list-user-packages json", $output, $return_var); +$return_var = v_exec('v-list-user-packages', ['json'], false, $output); check_error($return_var); -$data = json_decode(implode('', $output), true); -unset($output); +$data = json_decode($output, true); // List languages -exec (VESTA_CMD."v-list-sys-languages json", $output, $return_var); -$languages = json_decode(implode('', $output), true); -unset($output); +v_exec('v-list-sys-languages', ['json'], false, $output); +$languages = json_decode($output, true); // Display body include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/add_user.html'); diff --git a/web/add/web/index.php b/web/add/web/index.php index fb8d212d9..faa88d182 100644 --- a/web/add/web/index.php +++ b/web/add/web/index.php @@ -13,7 +13,7 @@ if (!empty($_POST['ok'])) { // Check token if ((!isset($_POST['token'])) || ($_SESSION['token'] != $_POST['token'])) { header('location: /login/'); - exit(); + exit; } // Check for empty fields @@ -42,11 +42,10 @@ if (!empty($_POST['ok'])) { // Set domain to lowercase and remove www prefix $v_domain = preg_replace("/^www\./i", "", $_POST['v_domain']); - $v_domain = escapeshellarg($v_domain); $v_domain = strtolower($v_domain); // Define domain ip address - $v_ip = escapeshellarg($_POST['v_ip']); + $v_ip = $_POST['v_ip']; // Define domain aliases $v_aliases = $_POST['v_aliases']; @@ -54,11 +53,10 @@ if (!empty($_POST['ok'])) { $aliases = preg_replace("/\r/", ",", $aliases); $aliases = preg_replace("/\t/", ",", $aliases); $aliases = preg_replace("/ /", ",", $aliases); - $aliases_arr = explode(",", $aliases); + $aliases_arr = explode(',', $aliases); $aliases_arr = array_unique($aliases_arr); $aliases_arr = array_filter($aliases_arr); - $aliases = implode(",",$aliases_arr); - $aliases = escapeshellarg($aliases); + $aliases = implode(',', $aliases_arr); // Define proxy extentions $v_proxy_ext = $_POST['v_proxy_ext']; @@ -66,11 +64,10 @@ if (!empty($_POST['ok'])) { $proxy_ext = preg_replace("/\r/", ",", $proxy_ext); $proxy_ext = preg_replace("/\t/", ",", $proxy_ext); $proxy_ext = preg_replace("/ /", ",", $proxy_ext); - $proxy_ext_arr = explode(",", $proxy_ext); + $proxy_ext_arr = explode(',', $proxy_ext); $proxy_ext_arr = array_unique($proxy_ext_arr); $proxy_ext_arr = array_filter($proxy_ext_arr); - $proxy_ext = implode(",",$proxy_ext_arr); - $proxy_ext = escapeshellarg($proxy_ext); + $proxy_ext = implode(',', $proxy_ext_arr); // Define other options $v_elog = $_POST['v_elog']; @@ -79,7 +76,7 @@ if (!empty($_POST['ok'])) { $v_ssl_key = $_POST['v_ssl_key']; $v_ssl_ca = $_POST['v_ssl_ca']; $v_ssl_home = $data[$v_domain]['SSL_HOME']; - $v_stats = escapeshellarg($_POST['v_stats']); + $v_stats = $_POST['v_stats']; $v_stats_user = $data[$v_domain]['STATS_USER']; $v_stats_password = $data[$v_domain]['STATS_PASSWORD']; $v_ftp = $_POST['v_ftp']; @@ -104,44 +101,32 @@ if (!empty($_POST['ok'])) { // Add web domain if (empty($_SESSION['error_msg'])) { - exec (VESTA_CMD."v-add-web-domain ".$user." ".$v_domain." ".$v_ip." 'no' ".$aliases." ".$proxy_ext, $output, $return_var); - check_return_code($return_var,$output); - unset($output); + v_exec('v-add-web-domain', [$user, $v_domain, $v_ip, 'no', $aliases, $proxy_ext]); $domain_added = empty($_SESSION['error_msg']); } // Add DNS domain if (($_POST['v_dns'] == 'on') && (empty($_SESSION['error_msg']))) { - exec (VESTA_CMD."v-add-dns-domain ".$user." ".$v_domain." ".$v_ip, $output, $return_var); - check_return_code($return_var,$output); - unset($output); + v_exec('v-add-dns-domain', [$user, $v_domain, $v_ip]); } // Add DNS for domain aliases if (($_POST['v_dns'] == 'on') && (empty($_SESSION['error_msg']))) { foreach ($aliases_arr as $alias) { - if ($alias != "www.".$_POST['v_domain']) { - $alias = escapeshellarg($alias); - exec (VESTA_CMD."v-add-dns-on-web-alias ".$user." ".$alias." ".$v_ip." 'no'", $output, $return_var); - check_return_code($return_var,$output); - unset($output); + if ($alias != 'www.' . $_POST['v_domain']) { + v_exec('v-add-dns-on-web-alias', [$user, $alias, $v_ip, 'no']); } } } // Add mail domain if (($_POST['v_mail'] == 'on') && (empty($_SESSION['error_msg']))) { - exec (VESTA_CMD."v-add-mail-domain ".$user." ".$v_domain, $output, $return_var); - check_return_code($return_var,$output); - unset($output); + v_exec('v-add-mail-domain', [$user, $v_domain]); } // Delete proxy support if ((!empty($_SESSION['PROXY_SYSTEM'])) && ($_POST['v_proxy'] == 'off') && (empty($_SESSION['error_msg']))) { - $ext = escapeshellarg($ext); - exec (VESTA_CMD."v-delete-web-domain-proxy ".$user." ".$v_domain." 'no'", $output, $return_var); - check_return_code($return_var,$output); - unset($output); + v_exec('v-delete-web-domain-proxy', [$user, $v_domain, 'no']); } // Add SSL certificates @@ -174,60 +159,46 @@ if (!empty($_POST['ok'])) { fclose($fp); } - $v_ssl_home = escapeshellarg($_POST['v_ssl_home']); - exec (VESTA_CMD."v-add-web-domain-ssl ".$user." ".$v_domain." ".$tmpdir." ".$v_ssl_home." 'no'", $output, $return_var); - check_return_code($return_var,$output); - unset($output); + $v_ssl_home = $_POST['v_ssl_home']; + v_exec('v-add-web-domain-ssl', [$user, $v_domain, $tmpdir, $v_ssl_home, 'no']); } // Add web stats if ((!empty($_POST['v_stats'])) && ($_POST['v_stats'] != 'none' ) && (empty($_SESSION['error_msg']))) { - $v_stats = escapeshellarg($_POST['v_stats']); - exec (VESTA_CMD."v-add-web-domain-stats ".$user." ".$v_domain." ".$v_stats, $output, $return_var); - check_return_code($return_var,$output); - unset($output); + $v_stats = $_POST['v_stats']; + v_exec('v-add-web-domain-stats', [$user, $v_domain, $v_stats]); } // Add web stats password if ((!empty($_POST['v_stats_user'])) && (empty($_SESSION['error_msg']))) { - $v_stats_user = escapeshellarg($_POST['v_stats_user']); + $v_stats_user = $_POST['v_stats_user']; $v_stats_password = tempnam("/tmp","vst"); $fp = fopen($v_stats_password, "w"); fwrite($fp, $_POST['v_stats_password']."\n"); fclose($fp); - exec (VESTA_CMD."v-add-web-domain-stats-user ".$user." ".$v_domain." ".$v_stats_user." ".$v_stats_password, $output, $return_var); - check_return_code($return_var,$output); - unset($output); + v_exec('v-add-web-domain-stats-user', [$user, $v_domain, $v_stats_user, $v_stats_password]); unlink($v_stats_password); - $v_stats_password = escapeshellarg($_POST['v_stats_password']); + $v_stats_password = $_POST['v_stats_password']; } // Restart DNS server if (($_POST['v_dns'] == 'on') && (empty($_SESSION['error_msg']))) { - exec (VESTA_CMD."v-restart-dns", $output, $return_var); - check_return_code($return_var,$output); - unset($output); + v_exec('v-restart-dns'); } // Restart web server if (empty($_SESSION['error_msg'])) { - exec (VESTA_CMD."v-restart-web", $output, $return_var); - check_return_code($return_var,$output); - unset($output); + v_exec('v-restart-web'); } // Restart backend server //if ((!empty($_SESSION['WEB_BACKEND'])) && (empty($_SESSION['error_msg']))) { - // exec (VESTA_CMD."v-restart-web-backend", $output, $return_var); - // check_return_code($return_var,$output); - // unset($output); + // v_exec('v-restart-backend'); //} // Restart proxy server if ((!empty($_SESSION['PROXY_SYSTEM'])) && ($_POST['v_proxy'] == 'on') && (empty($_SESSION['error_msg']))) { - exec (VESTA_CMD."v-restart-proxy", $output, $return_var); - check_return_code($return_var,$output); - unset($output); + v_exec('v-restart-proxy'); } // Add FTP @@ -265,22 +236,19 @@ if (!empty($_POST['ok'])) { $v_ftp_user_data['v_ftp_user'] = preg_replace("/^".$user."_/i", "", $v_ftp_user_data['v_ftp_user']); $v_ftp_username = $v_ftp_user_data['v_ftp_user']; $v_ftp_username_full = $user . '_' . $v_ftp_user_data['v_ftp_user']; - $v_ftp_user = escapeshellarg($v_ftp_user_data['v_ftp_user']); if ($domain_added) { - $v_ftp_path = escapeshellarg(trim($v_ftp_user_data['v_ftp_path'])); + $v_ftp_path = trim($v_ftp_user_data['v_ftp_path']); $v_ftp_password = tempnam("/tmp","vst"); $fp = fopen($v_ftp_password, "w"); fwrite($fp, $v_ftp_user_data['v_ftp_password']."\n"); fclose($fp); - exec (VESTA_CMD."v-add-web-domain-ftp ".$user." ".$v_domain." ".$v_ftp_user." ".$v_ftp_password . " " . $v_ftp_path, $output, $return_var); - check_return_code($return_var,$output); - unset($output); + v_exec('v-add-web-domain-ftp', [$user, $v_domain, $v_ftp_username, $v_ftp_password, $v_ftp_path]); unlink($v_ftp_password); if ((!empty($v_ftp_user_data['v_ftp_email'])) && (empty($_SESSION['error_msg']))) { $to = $v_ftp_user_data['v_ftp_email']; - $subject = __("FTP login credentials"); - $from = __('MAIL_FROM',$_POST['v_domain']); - $mailtext = __('FTP_ACCOUNT_READY',$_POST['v_domain'],$user,$v_ftp_user_data['v_ftp_user'],$v_ftp_user_data['v_ftp_password']); + $subject = __('FTP login credentials'); + $from = __('MAIL_FROM', $_POST['v_domain']); + $mailtext = __('FTP_ACCOUNT_READY', $_POST['v_domain'], $user, $v_ftp_username, $v_ftp_user_data['v_ftp_password']); send_email($to, $subject, $mailtext, $from); unset($v_ftp_email); } @@ -289,13 +257,13 @@ if (!empty($_POST['ok'])) { } if ($return_var == 0) { - $v_ftp_password = "••••••••"; + $v_ftp_password = '••••••••'; $v_ftp_user_data['is_new'] = 0; } else { $v_ftp_user_data['is_new'] = 1; } - $v_ftp_username = preg_replace("/^".$user."_/", "", $v_ftp_user_data['v_ftp_user']); + $v_ftp_username = preg_replace("/^{$user}_/", '', $v_ftp_user_data['v_ftp_user']); $v_ftp_users_updated[] = array( 'is_new' => $v_ftp_user_data['is_new'], 'v_ftp_user' => $return_var == 0 ? $v_ftp_username_full : $v_ftp_username, @@ -311,8 +279,8 @@ if (!empty($_POST['ok'])) { if (!empty($_SESSION['error_msg']) && $domain_added) { $_SESSION['ok_msg'] = __('WEB_DOMAIN_CREATED_OK',htmlentities($_POST[v_domain]),htmlentities($_POST[v_domain])); $_SESSION['flash_error_msg'] = $_SESSION['error_msg']; - $url = '/edit/web/?domain='.strtolower(preg_replace("/^www\./i", "", $_POST['v_domain'])); - header('Location: ' . $url); + $url = '/edit/web/?domain=' . strtolower(preg_replace('/^www\./i', '', $_POST['v_domain'])); + header("Location: $url"); exit; } } @@ -344,14 +312,12 @@ $v_ftp_user_prepath = $panel[$user]['HOME'] . "/web"; $v_ftp_email = $panel[$user]['CONTACT']; // List IP addresses -exec (VESTA_CMD."v-list-user-ips ".$user." json", $output, $return_var); -$ips = json_decode(implode('', $output), true); -unset($output); +v_exec('v-list-user-ips', [$user, 'json'], false, $output); +$ips = json_decode($output, true); // List web stat engines -exec (VESTA_CMD."v-list-web-stats json", $output, $return_var); -$stats = json_decode(implode('', $output), true); -unset($output); +v_exec('v-list-web-stats', ['json'], false, $output); +$stats = json_decode($output, true); // Display body include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/add_web.html'); diff --git a/web/api/index.php b/web/api/index.php index 97f082594..928f950df 100644 --- a/web/api/index.php +++ b/web/api/index.php @@ -2,7 +2,6 @@ define('VESTA_CMD', '/usr/bin/sudo /usr/local/vesta/bin/'); if (isset($_POST['user']) || isset($_POST['hash'])) { - // Authentication $auth_code = 1; if (empty($_POST['hash'])) { @@ -12,18 +11,18 @@ if (isset($_POST['user']) || isset($_POST['hash'])) { exit; } - $v_user = escapeshellarg($_POST['user']); + $v_user = $_POST['user']; $v_password = tempnam("/tmp","vst"); $fp = fopen($v_password, "w"); fwrite($fp, $_POST['password']."\n"); fclose($fp); - $v_ip_addr = escapeshellarg($_SERVER["REMOTE_ADDR"]); - exec(VESTA_CMD ."v-check-user-password ".$v_user." ".$v_password." '".$v_ip_addr."'", $output, $auth_code); + $v_ip_addr = $_SERVER['REMOTE_ADDR']; + $auth_code = v_exec('v-check-user-password', [$v_user, $v_password, $v_ip_addr], false); unlink($v_password); } else { $key = '/usr/local/vesta/data/keys/' . basename($_POST['hash']); if (file_exists($key) && is_file($key)) { - $auth_code = '0'; + $auth_code = 0; } } @@ -33,37 +32,17 @@ if (isset($_POST['user']) || isset($_POST['hash'])) { } // Prepare arguments - if (isset($_POST['cmd'])) $cmd = escapeshellarg($_POST['cmd']); - if (isset($_POST['arg1'])) $arg1 = escapeshellarg($_POST['arg1']); - if (isset($_POST['arg2'])) $arg2 = escapeshellarg($_POST['arg2']); - if (isset($_POST['arg3'])) $arg3 = escapeshellarg($_POST['arg3']); - if (isset($_POST['arg4'])) $arg4 = escapeshellarg($_POST['arg4']); - if (isset($_POST['arg5'])) $arg5 = escapeshellarg($_POST['arg5']); - if (isset($_POST['arg6'])) $arg6 = escapeshellarg($_POST['arg6']); - if (isset($_POST['arg7'])) $arg7 = escapeshellarg($_POST['arg7']); - if (isset($_POST['arg8'])) $arg8 = escapeshellarg($_POST['arg8']); - if (isset($_POST['arg9'])) $arg9 = escapeshellarg($_POST['arg9']); - - // Build query - $cmdquery = VESTA_CMD.$cmd." "; - if(!empty($arg1)){ - $cmdquery = $cmdquery.$arg1." "; } - if(!empty($arg2)){ - $cmdquery = $cmdquery.$arg2." "; } - if(!empty($arg3)){ - $cmdquery = $cmdquery.$arg3." "; } - if(!empty($arg4)){ - $cmdquery = $cmdquery.$arg4." "; } - if(!empty($arg5)){ - $cmdquery = $cmdquery.$arg5." "; } - if(!empty($arg6)){ - $cmdquery = $cmdquery.$arg6." "; } - if(!empty($arg7)){ - $cmdquery = $cmdquery.$arg7." "; } - if(!empty($arg8)){ - $cmdquery = $cmdquery.$arg8." "; } - if(!empty($arg9)){ - $cmdquery = $cmdquery.$arg9; } + $args = []; + if (isset($_POST['cmd'])) $cmd = $_POST['cmd']; + if (isset($_POST['arg1'])) $args[] = $_POST['arg1']; + if (isset($_POST['arg2'])) $args[] = $_POST['arg2']; + if (isset($_POST['arg3'])) $args[] = $_POST['arg3']; + if (isset($_POST['arg4'])) $args[] = $_POST['arg4']; + if (isset($_POST['arg5'])) $args[] = $_POST['arg5']; + if (isset($_POST['arg6'])) $args[] = $_POST['arg6']; + if (isset($_POST['arg7'])) $args[] = $_POST['arg7']; + if (isset($_POST['arg8'])) $args[] = $_POST['arg8']; + if (isset($_POST['arg9'])) $args[] = $_POST['arg9']; // Check command if ($cmd == "'v-make-tmp-file'") { @@ -74,7 +53,7 @@ if (isset($_POST['user']) || isset($_POST['hash'])) { $return_var = 0; } else { // Run normal cmd query - exec ($cmdquery, $output, $return_var); + $return_var = v_exec($cmd, $args, false, $output); } if ((!empty($_POST['returncode'])) && ($_POST['returncode'] == 'yes')) { @@ -83,7 +62,7 @@ if (isset($_POST['user']) || isset($_POST['hash'])) { if (($return_var == 0) && (empty($output))) { echo "OK"; } else { - echo implode("\n",$output)."\n"; + echo $output . "\n"; } } } diff --git a/web/bulk/backup/exclusions/index.php b/web/bulk/backup/exclusions/index.php index 4d0e43933..56e412617 100644 --- a/web/bulk/backup/exclusions/index.php +++ b/web/bulk/backup/exclusions/index.php @@ -16,8 +16,7 @@ switch ($action) { } foreach ($backup as $value) { - $value = escapeshellarg($value); - exec (VESTA_CMD.$cmd." ".$user." ".$value, $output, $return_var); + v_exec($cmd, [$user, $value], false); } header("Location: /list/backup/exclusions"); diff --git a/web/bulk/backup/index.php b/web/bulk/backup/index.php index f191dfe2a..6c0095520 100644 --- a/web/bulk/backup/index.php +++ b/web/bulk/backup/index.php @@ -12,7 +12,7 @@ $action = $_POST['action']; // Check token if ((!isset($_POST['token'])) || ($_SESSION['token'] != $_POST['token'])) { header('location: /login/'); - exit(); + exit; } switch ($action) { @@ -22,8 +22,7 @@ switch ($action) { } foreach ($backup as $value) { - $value = escapeshellarg($value); - exec (VESTA_CMD.$cmd." ".$user." ".$value, $output, $return_var); + v_exec($cmd, [$user, $value], false); } header("Location: /list/backup/"); diff --git a/web/bulk/cron/index.php b/web/bulk/cron/index.php index 0beb49083..191ad3c83 100644 --- a/web/bulk/cron/index.php +++ b/web/bulk/cron/index.php @@ -9,7 +9,7 @@ include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); // Check token if ((!isset($_POST['token'])) || ($_SESSION['token'] != $_POST['token'])) { header('location: /login/'); - exit(); + exit; } $job = $_POST['job']; @@ -24,19 +24,15 @@ if ($_SESSION['user'] == 'admin') { case 'unsuspend': $cmd='v-unsuspend-cron-job'; break; case 'delete-cron-reports': $cmd='v-delete-cron-reports'; - exec (VESTA_CMD.$cmd." ".$user, $output, $return_var); + v_exec($cmd, [$user], false); $_SESSION['error_msg'] = __('Cronjob email reporting has been successfully diabled'); - unset($output); header("Location: /list/cron/"); exit; - break; case 'add-cron-reports': $cmd='v-add-cron-reports'; - exec (VESTA_CMD.$cmd." ".$user, $output, $return_var); + v_exec($cmd, [$user], false); $_SESSION['error_msg'] = __('Cronjob email reporting has been successfully enabled'); - unset($output); header("Location: /list/cron/"); exit; - break; default: header("Location: /list/cron/"); exit; } } else { @@ -44,31 +40,26 @@ if ($_SESSION['user'] == 'admin') { case 'delete': $cmd='v-delete-cron-job'; break; case 'delete-cron-reports': $cmd='v-delete-cron-reports'; - exec (VESTA_CMD.$cmd." ".$user, $output, $return_var); + v_exec($cmd, [$user], false); $_SESSION['error_msg'] = __('Cronjob email reporting has been successfully diabled'); - unset($output); header("Location: /list/cron/"); exit; - break; case 'add-cron-reports': $cmd='v-add-cron-reports'; - exec (VESTA_CMD.$cmd." ".$user, $output, $return_var); + v_exec($cmd, [$user], false); $_SESSION['error_msg'] = __('Cronjob email reporting has been successfully enabled'); - unset($output); header("Location: /list/cron/"); exit; - break; default: header("Location: /list/cron/"); exit; } } foreach ($job as $value) { - $value = escapeshellarg($value); - exec (VESTA_CMD.$cmd." ".$user." ".$value." no", $output, $return_var); + v_exec($cmd, [$user, $value, 'no'], false); $restart = 'yes'; } if (!empty($restart)) { - exec (VESTA_CMD."v-restart-cron", $output, $return_var); + v_exec('v-restart-cron', [], false); } header("Location: /list/cron/"); diff --git a/web/bulk/db/index.php b/web/bulk/db/index.php index 15361be4b..c9e1f55a0 100644 --- a/web/bulk/db/index.php +++ b/web/bulk/db/index.php @@ -9,7 +9,7 @@ include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); // Check token if ((!isset($_POST['token'])) || ($_SESSION['token'] != $_POST['token'])) { header('location: /login/'); - exit(); + exit; } $database = $_POST['database']; @@ -34,8 +34,7 @@ if ($_SESSION['user'] == 'admin') { } foreach ($database as $value) { - $value = escapeshellarg($value); - exec (VESTA_CMD.$cmd." ".$user." ".$value, $output, $return_var); + v_exec($cmd, [$user, $value], false); } header("Location: /list/db/"); diff --git a/web/bulk/dns/index.php b/web/bulk/dns/index.php index d7fe0a292..81ba40bb4 100644 --- a/web/bulk/dns/index.php +++ b/web/bulk/dns/index.php @@ -9,7 +9,7 @@ include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); // Check token if ((!isset($_POST['token'])) || ($_SESSION['token'] != $_POST['token'])) { header('location: /login/'); - exit(); + exit; } $domain = $_POST['domain']; @@ -58,25 +58,22 @@ if ($_SESSION['user'] == 'admin') { if (empty($record)) { foreach ($domain as $value) { // DNS - $value = escapeshellarg($value); - exec (VESTA_CMD.$cmd." ".$user." ".$value." no", $output, $return_var); + v_exec($cmd, [$user, $value, 'no'], false); $restart = 'yes'; } } else { foreach ($record as $value) { // DNS Record - $value = escapeshellarg($value); - $dom = escapeshellarg($domain); - exec (VESTA_CMD.$cmd." ".$user." ".$dom." ".$value." no", $output, $return_var); + v_exec($cmd, [$user, $domain, $value, 'no'], false); $restart = 'yes'; } } if (!empty($restart)) { - exec (VESTA_CMD."v-restart-dns", $output, $return_var); + v_exec('v-restart-dns', [], false); } -if (empty($record)) { +if (empty($record)) { header("Location: /list/dns/"); exit; } else { diff --git a/web/bulk/firewall/banlist/index.php b/web/bulk/firewall/banlist/index.php index fe7308a53..b61652ee4 100644 --- a/web/bulk/firewall/banlist/index.php +++ b/web/bulk/firewall/banlist/index.php @@ -10,7 +10,7 @@ include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); // Check token if ((!isset($_POST['token'])) || ($_SESSION['token'] != $_POST['token'])) { header('location: /login/'); - exit(); + exit; } // Check user @@ -22,10 +22,7 @@ if ($_SESSION['user'] != 'admin') { $ipchain = $_POST['ipchain']; /*if (!empty($_POST['ipchain'])) { $ipchain = $_POST['ipchain']; - list($ip,$chain) = split(":",$ipchain); - $v_ip = escapeshellarg($ip); - $v_chain = escapeshellarg($chain); - + list($ip, $chain) = explode(':', $ipchain); }*/ $action = $_POST['action']; @@ -37,10 +34,8 @@ switch ($action) { } foreach ($ipchain as $value) { - list($ip,$chain) = split(":",$value); - $v_ip = escapeshellarg($ip); - $v_chain = escapeshellarg($chain); - exec (VESTA_CMD.$cmd." ".$v_ip." ".$v_chain, $output, $return_var); + list($ip, $chain) = explode(':', $value); + v_exec($cmd, [$ip, $chain], false); } header("Location: /list/firewall/banlist"); diff --git a/web/bulk/firewall/index.php b/web/bulk/firewall/index.php index 6f076cb81..32c6b5e30 100644 --- a/web/bulk/firewall/index.php +++ b/web/bulk/firewall/index.php @@ -10,7 +10,7 @@ include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); // Check token if ((!isset($_POST['token'])) || ($_SESSION['token'] != $_POST['token'])) { header('location: /login/'); - exit(); + exit; } // Check user @@ -34,8 +34,7 @@ switch ($action) { } foreach ($rule as $value) { - $value = escapeshellarg($value); - exec (VESTA_CMD.$cmd." ".$value, $output, $return_var); + v_exec($cmd, [$value], false); $restart = 'yes'; } diff --git a/web/bulk/ip/index.php b/web/bulk/ip/index.php index 4f1705403..5fd779ff1 100644 --- a/web/bulk/ip/index.php +++ b/web/bulk/ip/index.php @@ -9,7 +9,7 @@ include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); // Check token if ((!isset($_POST['token'])) || ($_SESSION['token'] != $_POST['token'])) { header('location: /login/'); - exit(); + exit; } $ip = $_POST['ip']; @@ -17,11 +17,11 @@ $action = $_POST['action']; if ($_SESSION['user'] == 'admin') { switch ($action) { - case 'reread IP': exec(VESTA_CMD."v-update-sys-ip", $output, $return_var); - header("Location: /list/ip/"); - exit; - break; - case 'delete': $cmd='v-delete-sys-ip'; + case 'reread IP': $cmd = 'v-update-sys-ip'; + v_exec($cmd, [], false); + header('Location: /list/ip/'); + exit; + case 'delete': $cmd = 'v-delete-sys-ip'; break; default: header("Location: /list/ip/"); exit; } @@ -31,8 +31,7 @@ if ($_SESSION['user'] == 'admin') { } foreach ($ip as $value) { - $value = escapeshellarg($value); - exec (VESTA_CMD.$cmd." ".$value, $output, $return_var); + v_exec($cmd, [$value], false); } header("Location: /list/ip/"); diff --git a/web/bulk/mail/index.php b/web/bulk/mail/index.php index c526c9e0e..21cb0a6b5 100644 --- a/web/bulk/mail/index.php +++ b/web/bulk/mail/index.php @@ -9,7 +9,7 @@ include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); // Check token if ((!isset($_POST['token'])) || ($_SESSION['token'] != $_POST['token'])) { header('location: /login/'); - exit(); + exit; } $domain = $_POST['domain']; @@ -58,21 +58,18 @@ if ($_SESSION['user'] == 'admin') { if (empty($account)) { foreach ($domain as $value) { // Mail - $value = escapeshellarg($value); - exec (VESTA_CMD.$cmd." ".$user." ".$value, $output, $return_var); + v_exec($cmd, [$user, $value], false); $restart = 'yes'; } } else { foreach ($account as $value) { // Mail Account - $value = escapeshellarg($value); - $dom = escapeshellarg($domain); - exec (VESTA_CMD.$cmd." ".$user." ".$dom." ".$value, $output, $return_var); + v_exec($cmd, [$user, $domain, $value], false); $restart = 'yes'; } } -if (empty($account)) { +if (empty($account)) { header("Location: /list/mail/"); exit; } else { diff --git a/web/bulk/package/index.php b/web/bulk/package/index.php index 32e36e936..95eef7bb2 100644 --- a/web/bulk/package/index.php +++ b/web/bulk/package/index.php @@ -9,7 +9,7 @@ include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); // Check token if ((!isset($_POST['token'])) || ($_SESSION['token'] != $_POST['token'])) { header('location: /login/'); - exit(); + exit; } $package = $_POST['package']; @@ -27,8 +27,7 @@ if ($_SESSION['user'] == 'admin') { } foreach ($package as $value) { - $value = escapeshellarg($value); - exec (VESTA_CMD.$cmd." ".$value, $output, $return_var); + v_exec($cmd, [$value], false); $restart = 'yes'; } diff --git a/web/bulk/restore/index.php b/web/bulk/restore/index.php index 3bc048414..c3dd7b360 100644 --- a/web/bulk/restore/index.php +++ b/web/bulk/restore/index.php @@ -9,11 +9,11 @@ include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); // Check token if ((!isset($_POST['token'])) || ($_SESSION['token'] != $_POST['token'])) { header('location: /login/'); - exit(); + exit; } $action = $_POST['action']; -$backup = escapeshellarg($_POST['backup']); +$backup = $_POST['backup']; $web = 'no'; $dns = 'no'; @@ -22,25 +22,22 @@ $db = 'no'; $cron = 'no'; $udir = 'no'; -if (!empty($_POST['web'])) $web = escapeshellarg(implode(",",$_POST['web'])); -if (!empty($_POST['dns'])) $dns = escapeshellarg(implode(",",$_POST['dns'])); -if (!empty($_POST['mail'])) $mail = escapeshellarg(implode(",",$_POST['mail'])); -if (!empty($_POST['db'])) $db = escapeshellarg(implode(",",$_POST['db'])); +if (!empty($_POST['web'])) $web = implode(',', $_POST['web']); +if (!empty($_POST['dns'])) $dns = implode(',', $_POST['dns']); +if (!empty($_POST['mail'])) $mail = implode(',', $_POST['mail']); +if (!empty($_POST['db'])) $db = implode(',', $_POST['db']); if (!empty($_POST['cron'])) $cron = 'yes'; -if (!empty($_POST['udir'])) $udir = escapeshellarg(implode(",",$_POST['udir'])); +if (!empty($_POST['udir'])) $udir = implode(',', $_POST['udir']); if ($action == 'restore') { - exec (VESTA_CMD."v-schedule-user-restore ".$user." ".$backup." ".$web." ".$dns." ".$mail." ".$db." ".$cron." ".$udir, $output, $return_var); - if ($return_var == 0) { - $_SESSION['error_msg'] = __('RESTORE_SCHEDULED'); - } else { - $_SESSION['error_msg'] = implode('
                ', $output); - if (empty($_SESSION['error_msg'])) { - $_SESSION['error_msg'] = __('Error: vesta did not return any output.'); - } - if ($return_var == 4) { + $return_var = v_exec('v-schedule-user-restore', [$user, $backup, $web, $dns, $mail, $db, $cron, $udir]); + switch ($return_var) { + case 0: + $_SESSION['error_msg'] = __('RESTORE_SCHEDULED'); + break; + case 4: $_SESSION['error_msg'] = __('RESTORE_EXISTS'); - } + break; } } diff --git a/web/bulk/service/index.php b/web/bulk/service/index.php index 70ce660c7..8ed4fca23 100644 --- a/web/bulk/service/index.php +++ b/web/bulk/service/index.php @@ -9,7 +9,7 @@ include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); // Check token if ((!isset($_POST['token'])) || ($_SESSION['token'] != $_POST['token'])) { header('location: /login/'); - exit(); + exit; } $service = $_POST['service']; @@ -27,16 +27,14 @@ if ($_SESSION['user'] == 'admin') { } if ((!empty($_POST['system'])) && ($action == 'restart')) { - exec (VESTA_CMD."v-restart-system yes", $output, $return_var); + v_exec('v-restart-system', ['yes'], false); $_SESSION['error_srv'] = 'The system is going down for reboot NOW!'; - unset($output); header("Location: /list/server/"); exit; } foreach ($service as $value) { - $value = escapeshellarg($value); - exec (VESTA_CMD.$cmd." ".$value, $output, $return_var); + v_exec($cmd, [$value], false); } } diff --git a/web/bulk/user/index.php b/web/bulk/user/index.php index 5d42fbfd9..28c9459e1 100644 --- a/web/bulk/user/index.php +++ b/web/bulk/user/index.php @@ -9,7 +9,7 @@ include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); // Check token if ((!isset($_POST['token'])) || ($_SESSION['token'] != $_POST['token'])) { header('location: /login/'); - exit(); + exit; } $user = $_POST['user']; @@ -48,15 +48,14 @@ if ($_SESSION['user'] == 'admin') { } foreach ($user as $value) { - $value = escapeshellarg($value); - exec (VESTA_CMD.$cmd." ".$value." ".$restart, $output, $return_var); + v_exec($cmd, [$value, $restart], false); $changes = 'yes'; } if ((!empty($restart)) && (!empty($changes))) { - exec (VESTA_CMD."v-restart-web", $output, $return_var); - exec (VESTA_CMD."v-restart-dns", $output, $return_var); - exec (VESTA_CMD."v-restart-cron", $output, $return_var); + v_exec('v-restart-web', [], false); + v_exec('v-restart-dns', [], false); + v_exec('v-restart-cron', [], false); } header("Location: /list/user/"); diff --git a/web/bulk/vesta/index.php b/web/bulk/vesta/index.php index c909f83e3..3ab537485 100644 --- a/web/bulk/vesta/index.php +++ b/web/bulk/vesta/index.php @@ -9,7 +9,7 @@ include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); // Check token if ((!isset($_POST['token'])) || ($_SESSION['token'] != $_POST['token'])) { header('location: /login/'); - exit(); + exit; } @@ -23,8 +23,7 @@ if ($_SESSION['user'] == 'admin') { default: header("Location: /list/updates/"); exit; } foreach ($pkg as $value) { - $value = escapeshellarg($value); - exec (VESTA_CMD.$cmd." ".$value, $output, $return_var); + v_exec($cmd, [$value], false); } } diff --git a/web/bulk/web/index.php b/web/bulk/web/index.php index 4a661a1ff..1b7673b41 100644 --- a/web/bulk/web/index.php +++ b/web/bulk/web/index.php @@ -9,7 +9,7 @@ include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); // Check token if ((!isset($_POST['token'])) || ($_SESSION['token'] != $_POST['token'])) { header('location: /login/'); - exit(); + exit; } $domain = $_POST['domain']; @@ -34,15 +34,14 @@ if ($_SESSION['user'] == 'admin') { } foreach ($domain as $value) { - $value = escapeshellarg($value); - exec (VESTA_CMD.$cmd." ".$user." ".$value." no", $output, $return_var); - $restart='yes'; + v_exec($cmd, [$user, $value, 'no'], false); + $restart = 'yes'; } if (isset($restart)) { - exec (VESTA_CMD."v-restart-web", $output, $return_var); - exec (VESTA_CMD."v-restart-proxy", $output, $return_var); - exec (VESTA_CMD."v-restart-dns", $output, $return_var); + v_exec('v-restart-web', [], false); + v_exec('v-restart-proxy', [], false); + v_exec('v-restart-dns', [], false); } header("Location: /list/web/"); diff --git a/web/delete/backup/exclusion/index.php b/web/delete/backup/exclusion/index.php index 29ad3bd58..5e3d9cf30 100644 --- a/web/delete/backup/exclusion/index.php +++ b/web/delete/backup/exclusion/index.php @@ -6,20 +6,17 @@ session_start(); include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); if (($_SESSION['user'] == 'admin') && (!empty($_GET['user']))) { - $user=$_GET['user']; + $user = $_GET['user']; } if (!empty($_GET['system'])) { - $v_username = escapeshellarg($user); - $v_system = escapeshellarg($_GET['system']); - exec (VESTA_CMD."v-delete-user-backup-exclusions ".$v_username." ".$v_system, $output, $return_var); + $v_system = $_GET['system']; + v_exec('v-delete-user-backup-exclusions', [$user, $v_system]); } -check_return_code($return_var,$output); -unset($output); $back = $_SESSION['back']; if (!empty($back)) { - header("Location: ".$back); + header("Location: $back"); exit; } diff --git a/web/delete/backup/index.php b/web/delete/backup/index.php index 33f492268..9546a3361 100644 --- a/web/delete/backup/index.php +++ b/web/delete/backup/index.php @@ -6,26 +6,23 @@ session_start(); include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); if (($_SESSION['user'] == 'admin') && (!empty($_GET['user']))) { - $user=$_GET['user']; + $user = $_GET['user']; } // Check token if ((!isset($_GET['token'])) || ($_SESSION['token'] != $_GET['token'])) { header('location: /login/'); - exit(); + exit; } if (!empty($_GET['backup'])) { - $v_username = escapeshellarg($user); - $v_backup = escapeshellarg($_GET['backup']); - exec (VESTA_CMD."v-delete-user-backup ".$v_username." ".$v_backup, $output, $return_var); + $v_backup = $_GET['backup']; + v_exec('v-delete-user-backup', [$user, $v_backup]); } -check_return_code($return_var,$output); -unset($output); $back = $_SESSION['back']; if (!empty($back)) { - header("Location: ".$back); + header("Location: $back"); exit; } diff --git a/web/delete/cron/autoupdate/index.php b/web/delete/cron/autoupdate/index.php index ad670ef03..11ea356cb 100644 --- a/web/delete/cron/autoupdate/index.php +++ b/web/delete/cron/autoupdate/index.php @@ -6,9 +6,8 @@ session_start(); include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); if ($_SESSION['user'] == 'admin') { - exec (VESTA_CMD."v-delete-cron-vesta-autoupdate", $output, $return_var); + v_exec('v-delete-cron-vesta-autoupdate', [], false); $_SESSION['error_msg'] = __('Autoupdate has been successfully disabled'); - unset($output); } header("Location: /list/updates/"); diff --git a/web/delete/cron/index.php b/web/delete/cron/index.php index d4ca20263..eff4ca06c 100644 --- a/web/delete/cron/index.php +++ b/web/delete/cron/index.php @@ -6,26 +6,23 @@ session_start(); include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); if (($_SESSION['user'] == 'admin') && (!empty($_GET['user']))) { - $user=$_GET['user']; + $user = $_GET['user']; } // Check token if ((!isset($_GET['token'])) || ($_SESSION['token'] != $_GET['token'])) { header('location: /login/'); - exit(); + exit; } if (!empty($_GET['job'])) { - $v_username = escapeshellarg($user); - $v_job = escapeshellarg($_GET['job']); - exec (VESTA_CMD."v-delete-cron-job ".$v_username." ".$v_job, $output, $return_var); + $v_job = $_GET['job']; + v_exec('v-delete-cron-job', [$user, $v_job]); } -check_return_code($return_var,$output); -unset($output); $back = $_SESSION['back']; if (!empty($back)) { - header("Location: ".$back); + header("Location: $back"); exit; } diff --git a/web/delete/cron/reports/index.php b/web/delete/cron/reports/index.php index af7df20f2..1025f70e6 100644 --- a/web/delete/cron/reports/index.php +++ b/web/delete/cron/reports/index.php @@ -5,9 +5,8 @@ ob_start(); session_start(); include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); -exec (VESTA_CMD."v-delete-cron-reports ".$user, $output, $return_var); +v_exec('v-delete-cron-reports', [$user], false); $_SESSION['error_msg'] = __('Cronjob email reporting has been successfully disabled'); -unset($output); header("Location: /list/cron/"); exit; diff --git a/web/delete/db/index.php b/web/delete/db/index.php index f2088ad2b..fa3f50460 100644 --- a/web/delete/db/index.php +++ b/web/delete/db/index.php @@ -6,26 +6,23 @@ session_start(); include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); if (($_SESSION['user'] == 'admin') && (!empty($_GET['user']))) { - $user=$_GET['user']; + $user = $_GET['user']; } // Check token if ((!isset($_GET['token'])) || ($_SESSION['token'] != $_GET['token'])) { header('location: /login/'); - exit(); + exit; } if (!empty($_GET['database'])) { - $v_username = escapeshellarg($user); - $v_database = escapeshellarg($_GET['database']); - exec (VESTA_CMD."v-delete-database ".$v_username." ".$v_database, $output, $return_var); + $v_database = $_GET['database']; + v_exec('v-delete-database', [$user, $v_database]); } -check_return_code($return_var,$output); -unset($output); $back = $_SESSION['back']; if (!empty($back)) { - header("Location: ".$back); + header("Location: $back"); exit; } diff --git a/web/delete/dns/index.php b/web/delete/dns/index.php index 7069d0c89..b89f52735 100644 --- a/web/delete/dns/index.php +++ b/web/delete/dns/index.php @@ -7,26 +7,23 @@ include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); // Delete as someone else? if (($_SESSION['user'] == 'admin') && (!empty($_GET['user']))) { - $user=$_GET['user']; + $user = $_GET['user']; } // Check token if ((!isset($_GET['token'])) || ($_SESSION['token'] != $_GET['token'])) { header('location: /login/'); - exit(); + exit; } // DNS domain if ((!empty($_GET['domain'])) && (empty($_GET['record_id']))) { - $v_username = escapeshellarg($user); - $v_domain = escapeshellarg($_GET['domain']); - exec (VESTA_CMD."v-delete-dns-domain ".$v_username." ".$v_domain, $output, $return_var); - check_return_code($return_var,$output); - unset($output); + $v_domain = $_GET['domain']; + v_exec('v-delete-dns-domain', [$user, $v_domain]); $back = $_SESSION['back']; if (!empty($back)) { - header("Location: ".$back); + header("Location: $back"); exit; } header("Location: /list/dns/"); @@ -35,15 +32,13 @@ if ((!empty($_GET['domain'])) && (empty($_GET['record_id']))) { // DNS record if ((!empty($_GET['domain'])) && (!empty($_GET['record_id']))) { - $v_username = escapeshellarg($user); - $v_domain = escapeshellarg($_GET['domain']); - $v_record_id = escapeshellarg($_GET['record_id']); - exec (VESTA_CMD."v-delete-dns-record ".$v_username." ".$v_domain." ".$v_record_id, $output, $return_var); - check_return_code($return_var,$output); - unset($output); + $v_domain = $_GET['domain']; + $v_record_id = $_GET['record_id']; + v_exec('v-delete-dns-record', [$user, $v_domain, $v_record_id]); + $back = $_SESSION['back']; if (!empty($back)) { - header("Location: ".$back); + header("Location: $back"); exit; } header("Location: /list/dns/?domain=".$_GET['domain']); @@ -52,7 +47,7 @@ if ((!empty($_GET['domain'])) && (!empty($_GET['record_id']))) { $back = $_SESSION['back']; if (!empty($back)) { - header("Location: ".$back); + header("Location: $back"); exit; } diff --git a/web/delete/favorite/index.php b/web/delete/favorite/index.php index 9f471b9bd..059e8a1e6 100644 --- a/web/delete/favorite/index.php +++ b/web/delete/favorite/index.php @@ -5,11 +5,10 @@ include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); - unset($_SESSION['favourites'][strtoupper($_REQUEST['v_section'])][$_REQUEST['v_unit_id']]); + $v_section = $_REQUEST['v_section']; + $v_unit_id = $_REQUEST['v_unit_id']; - $v_section = escapeshellarg($_REQUEST['v_section']); - $v_unit_id = escapeshellarg($_REQUEST['v_unit_id']); + unset($_SESSION['favourites'][strtoupper((string)$v_section)][(string)$v_unit_id]); - exec (VESTA_CMD."v-delete-user-favourites ".$_SESSION['user']." ".$v_section." ".$v_unit_id, $output, $return_var); -// check_return_code($return_var,$output); + v_exec('v-delete-user-favourites', [$_SESSION['user'], $v_section, $v_unit_id], false/*true*/); ?> \ No newline at end of file diff --git a/web/delete/firewall/banlist/index.php b/web/delete/firewall/banlist/index.php index 7b30edd59..c45c81d1b 100644 --- a/web/delete/firewall/banlist/index.php +++ b/web/delete/firewall/banlist/index.php @@ -16,20 +16,18 @@ if ($_SESSION['user'] != 'admin') { // Check token if ((!isset($_GET['token'])) || ($_SESSION['token'] != $_GET['token'])) { header('location: /login/'); - exit(); + exit; } if ((!empty($_GET['ip'])) && (!empty($_GET['chain']))) { - $v_ip = escapeshellarg($_GET['ip']); - $v_chain = escapeshellarg($_GET['chain']); - exec (VESTA_CMD."v-delete-firewall-ban ".$v_ip." ".$v_chain, $output, $return_var); + $v_ip = $_GET['ip']; + $v_chain = $_GET['chain']; + v_exec('v-delete-firewall-ban', [$v_ip, $v_chain]); } -check_return_code($return_var,$output); -unset($output); $back = $_SESSION['back']; if (!empty($back)) { - header("Location: ".$back); + header("Location: $back"); exit; } diff --git a/web/delete/firewall/index.php b/web/delete/firewall/index.php index b6b38f0c6..ef0211554 100644 --- a/web/delete/firewall/index.php +++ b/web/delete/firewall/index.php @@ -16,19 +16,17 @@ if ($_SESSION['user'] != 'admin') { // Check token if ((!isset($_GET['token'])) || ($_SESSION['token'] != $_GET['token'])) { header('location: /login/'); - exit(); + exit; } if (!empty($_GET['rule'])) { - $v_rule = escapeshellarg($_GET['rule']); - exec (VESTA_CMD."v-delete-firewall-rule ".$v_rule, $output, $return_var); + $v_rule = $_GET['rule']; + v_exec('v-delete-firewall-rule', [$v_rule]); } -check_return_code($return_var,$output); -unset($output); $back = $_SESSION['back']; if (!empty($back)) { - header("Location: ".$back); + header("Location: $back"); exit; } diff --git a/web/delete/ip/index.php b/web/delete/ip/index.php index f8bcd994d..b45ef15a8 100644 --- a/web/delete/ip/index.php +++ b/web/delete/ip/index.php @@ -8,22 +8,19 @@ include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); // Check token if ((!isset($_GET['token'])) || ($_SESSION['token'] != $_GET['token'])) { header('location: /login/'); - exit(); + exit; } if ($_SESSION['user'] == 'admin') { if (!empty($_GET['ip'])) { - $v_ip = escapeshellarg($_GET['ip']); - exec (VESTA_CMD."v-delete-sys-ip ".$v_ip, $output, $return_var); + $v_ip = $_GET['ip']; + v_exec('v-delete-sys-ip', [$v_ip]); } - check_return_code($return_var,$output); - unset($output); - } $back = $_SESSION['back']; if (!empty($back)) { - header("Location: ".$back); + header("Location: $back"); exit; } diff --git a/web/delete/mail/index.php b/web/delete/mail/index.php index 8a3d87f82..1446ac349 100644 --- a/web/delete/mail/index.php +++ b/web/delete/mail/index.php @@ -7,25 +7,22 @@ include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); // Delete as someone else? if (($_SESSION['user'] == 'admin') && (!empty($_GET['user']))) { - $user=$_GET['user']; + $user = $_GET['user']; } // Check token if ((!isset($_GET['token'])) || ($_SESSION['token'] != $_GET['token'])) { header('location: /login/'); - exit(); + exit; } // Mail domain if ((!empty($_GET['domain'])) && (empty($_GET['account']))) { - $v_username = escapeshellarg($user); - $v_domain = escapeshellarg($_GET['domain']); - exec (VESTA_CMD."v-delete-mail-domain ".$v_username." ".$v_domain, $output, $return_var); - check_return_code($return_var,$output); - unset($output); + $v_domain = $_GET['domain']; + v_exec('v-delete-mail-domain', [$user, $v_domain]); $back = $_SESSION['back']; if (!empty($back)) { - header("Location: ".$back); + header("Location: $back"); exit; } header("Location: /list/mail/"); @@ -34,15 +31,12 @@ if ((!empty($_GET['domain'])) && (empty($_GET['account']))) { // Mail account if ((!empty($_GET['domain'])) && (!empty($_GET['account']))) { - $v_username = escapeshellarg($user); - $v_domain = escapeshellarg($_GET['domain']); - $v_account = escapeshellarg($_GET['account']); - exec (VESTA_CMD."v-delete-mail-account ".$v_username." ".$v_domain." ".$v_account, $output, $return_var); - check_return_code($return_var,$output); - unset($output); + $v_domain = $_GET['domain']; + $v_account = $_GET['account']; + v_exec('v-delete-mail-account', [$user, $v_domain, $v_account]); $back = $_SESSION['back']; if (!empty($back)) { - header("Location: ".$back); + header("Location: $back"); exit; } header("Location: /list/mail/?domain=".$_GET['domain']); @@ -51,7 +45,7 @@ if ((!empty($_GET['domain'])) && (!empty($_GET['account']))) { $back = $_SESSION['back']; if (!empty($back)) { - header("Location: ".$back); + header("Location: $back"); exit; } diff --git a/web/delete/notification/index.php b/web/delete/notification/index.php index fa3a14f10..982a37132 100644 --- a/web/delete/notification/index.php +++ b/web/delete/notification/index.php @@ -8,23 +8,17 @@ include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); // Check token if ((!isset($_GET['token'])) || ($_SESSION['token'] != $_GET['token'])) { header('location: /login/'); - exit(); + exit; } if($_GET['delete'] == 1){ - $v_username = escapeshellarg($user); - $v_id = escapeshellarg((int)$_GET['notification_id']); - exec (VESTA_CMD."v-delete-user-notification ".$v_username." ".$v_id, $output, $return_var); - check_return_code($return_var,$output); - unset($output); + $v_id = (string)((int)$_GET['notification_id']); + v_exec('v-delete-user-notification', [$user, $v_id]); } else { - $v_username = escapeshellarg($user); - $v_id = escapeshellarg((int)$_GET['notification_id']); - echo VESTA_CMD."v-acknowledge-user-notification ".$v_username." ".$v_id; - exec (VESTA_CMD."v-acknowledge-user-notification ".$v_username." ".$v_id, $output, $return_var); - check_return_code($return_var,$output); - unset($output); + $v_id = (string)((int)$_GET['notification_id']); + //echo VESTA_CMD."v-acknowledge-user-notification ".$v_username." ".$v_id; + v_exec('v-acknowledge-user-notification', [$user, $v_id]); } exit; diff --git a/web/delete/package/index.php b/web/delete/package/index.php index 1058f495d..78f45000a 100644 --- a/web/delete/package/index.php +++ b/web/delete/package/index.php @@ -8,21 +8,19 @@ include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); // Check token if ((!isset($_GET['token'])) || ($_SESSION['token'] != $_GET['token'])) { header('location: /login/'); - exit(); + exit; } if ($_SESSION['user'] == 'admin') { if (!empty($_GET['package'])) { - $v_package = escapeshellarg($_GET['package']); - exec (VESTA_CMD."v-delete-user-package ".$v_package, $output, $return_var); + $v_package = $_GET['package']; + v_exec('v-delete-user-package', [$v_package]); } - check_return_code($return_var,$output); - unset($output); } $back = $_SESSION['back']; if (!empty($back)) { - header("Location: ".$back); + header("Location: $back"); exit; } diff --git a/web/delete/user/index.php b/web/delete/user/index.php index 8e20b4c63..cdd19a669 100644 --- a/web/delete/user/index.php +++ b/web/delete/user/index.php @@ -8,22 +8,20 @@ include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); // Check token if ((!isset($_GET['token'])) || ($_SESSION['token'] != $_GET['token'])) { header('location: /login/'); - exit(); + exit; } if ($_SESSION['user'] == 'admin') { if (!empty($_GET['user'])) { - $v_username = escapeshellarg($_GET['user']); - exec (VESTA_CMD."v-delete-user ".$v_username, $output, $return_var); + $v_username = $_GET['user']; + v_exec('v-delete-user', [$v_username]); } - check_return_code($return_var,$output); unset($_SESSION['look']); - unset($output); } $back = $_SESSION['back']; if (!empty($back)) { - header("Location: ".$back); + header("Location: $back"); exit; } diff --git a/web/delete/web/index.php b/web/delete/web/index.php index ecf6f415c..199a89523 100644 --- a/web/delete/web/index.php +++ b/web/delete/web/index.php @@ -8,25 +8,22 @@ include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); // Check token if ((!isset($_GET['token'])) || ($_SESSION['token'] != $_GET['token'])) { header('location: /login/'); - exit(); + exit; } // Delete as someone else? if (($_SESSION['user'] == 'admin') && (!empty($_GET['user']))) { - $user=$_GET['user']; + $user = $_GET['user']; } if (!empty($_GET['domain'])) { - $v_username = escapeshellarg($user); - $v_domain = escapeshellarg($_GET['domain']); - exec (VESTA_CMD."v-delete-domain ".$v_username." ".$v_domain, $output, $return_var); - check_return_code($return_var,$output); - unset($output); + $v_domain = $_GET['domain']; + v_exec('v-delete-domain', [$user, $v_domain]); } $back = $_SESSION['back']; if (!empty($back)) { - header("Location: ".$back); + header("Location: $back"); exit; } diff --git a/web/download/file/index.php b/web/download/file/index.php index 5322185b1..662387e14 100644 --- a/web/download/file/index.php +++ b/web/download/file/index.php @@ -8,7 +8,7 @@ if ((!isset($_SESSION['FILEMANAGER_KEY'])) || (empty($_SESSION['FILEMANAGER_KEY' $user = $_SESSION['user']; if (($_SESSION['user'] == 'admin') && (!empty($_SESSION['look']))) { - $user=$_SESSION['look']; + $user = $_SESSION['look']; } if (!empty($_REQUEST['path'])) { @@ -16,10 +16,10 @@ if (!empty($_REQUEST['path'])) { header("Content-type: application/octet-stream"); header("Content-Transfer-Encoding: binary"); header("Content-disposition: attachment;filename=".basename($path)); - passthru (VESTA_CMD . "v-open-fs-file " . $user . " " . escapeshellarg($path)); + // TODO: Implement `v_passthru`? + passthru(VESTA_CMD.'v-open-fs-file '.build_shell_args([$user, $path])); exit; -} -else { +} else { die('File not found'); } diff --git a/web/download/web-log/index.php b/web/download/web-log/index.php index 79b5601cd..8ebbc9dbb 100644 --- a/web/download/web-log/index.php +++ b/web/download/web-log/index.php @@ -3,26 +3,20 @@ error_reporting(NULL); session_start(); include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); + $v_domain = $_GET['domain']; -$v_domain = escapeshellarg($_GET['domain']); if ($_GET['type'] == 'access') $type = 'access'; if ($_GET['type'] == 'error') $type = 'error'; header("Cache-Control: public"); header("Content-Description: File Transfer"); header("Content-Disposition: attachment; filename=".$_GET['domain'].".".$type."-log.txt"); -header("Content-Type: application/octet-stream; "); +header("Content-Type: application/octet-stream"); header("Content-Transfer-Encoding: binary"); -$v_domain = escapeshellarg($_GET['domain']); -if ($_GET['type'] == 'access') $type = 'access'; -if ($_GET['type'] == 'error') $type = 'error'; - -exec (VESTA_CMD."v-list-web-domain-".$type."log $user ".$v_domain." 5000", $output, $return_var); -if ($return_var == 0 ) { - foreach($output as $file) { - echo $file . "\n"; - } +$return_var = v_exec("v-list-web-domain-{$type}log", [$user, $v_domain, '5000'], false, $output); +if ($return_var == 0) { + echo $output . "\n"; } ?> diff --git a/web/edit/backup/exclusions/index.php b/web/edit/backup/exclusions/index.php index 8bac32c16..75a2bf78a 100644 --- a/web/edit/backup/exclusions/index.php +++ b/web/edit/backup/exclusions/index.php @@ -9,14 +9,12 @@ include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); // Edit as someone else? if (($_SESSION['user'] == 'admin') && (!empty($_GET['user']))) { - $user=escapeshellarg($_GET['user']); + $user = $_GET['user']; } // List backup exclustions -exec (VESTA_CMD."v-list-user-backup-exclusions ".$user." 'json'", $output, $return_var); -check_return_code($return_var,$output); -$data = json_decode(implode('', $output), true); -unset($output); +v_exec('v-list-user-backup-exclusions', [$user, 'json'], true, $output); +$data = json_decode($output, true); // Parse web $v_username = $user; @@ -70,9 +68,10 @@ if (!empty($_POST['save'])) { // Check token if ((!isset($_POST['token'])) || ($_SESSION['token'] != $_POST['token'])) { header('location: /login/'); - exit(); + exit; } + // TODO: Use array? $v_web = $_POST['v_web']; $v_web_tmp = str_replace("\r\n", ",", $_POST['v_web']); $v_web_tmp = rtrim($v_web_tmp, ","); @@ -112,9 +111,7 @@ if (!empty($_POST['save'])) { unset($mktemp_output); // Save changes - exec (VESTA_CMD."v-update-user-backup-exclusions ".$user." ".$tmp, $output, $return_var); - check_return_code($return_var,$output); - unset($output); + v_exec('v-update-user-backup-exclusions', [$user, $tmp]); // Set success message if (empty($_SESSION['error_msg'])) { diff --git a/web/edit/cron/index.php b/web/edit/cron/index.php index 8c309f70f..557ea8b03 100644 --- a/web/edit/cron/index.php +++ b/web/edit/cron/index.php @@ -9,7 +9,7 @@ include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); // Edit as someone else? if (($_SESSION['user'] == 'admin') && (!empty($_GET['user']))) { - $user=escapeshellarg($_GET['user']); + $user = $_GET['user']; } // Check job id @@ -18,16 +18,14 @@ if (empty($_GET['job'])) { exit; } -// List cron job -$v_job = escapeshellarg($_GET['job']); -exec (VESTA_CMD."v-list-cron-job ".$user." ".$v_job." 'json'", $output, $return_var); -check_return_code($return_var,$output); -$data = json_decode(implode('', $output), true); -unset($output); - -// Parse cron job $v_username = $user; $v_job = $_GET['job']; + +// List cron job +v_exec('v-list-cron-job', [$user, $v_job, 'json'], true, $output); +$data = json_decode($output, true); + +// Parse cron job $v_min = $data[$v_job]['MIN']; $v_hour = $data[$v_job]['HOUR']; $v_day = $data[$v_job]['DAY']; @@ -37,36 +35,25 @@ $v_cmd = $data[$v_job]['CMD']; $v_date = $data[$v_job]['DATE']; $v_time = $data[$v_job]['TIME']; $v_suspended = $data[$v_job]['SUSPENDED']; -if ( $v_suspended == 'yes' ) { - $v_status = 'suspended'; -} else { - $v_status = 'active'; -} +$v_status = $v_suspended == 'yes' ? 'suspended' : 'active'; // Check POST request if (!empty($_POST['save'])) { - // Check token if ((!isset($_POST['token'])) || ($_SESSION['token'] != $_POST['token'])) { header('location: /login/'); - exit(); + exit; } - $v_username = $user; - $v_job = escapeshellarg($_GET['job']); - $v_min = escapeshellarg($_POST['v_min']); - $v_hour = escapeshellarg($_POST['v_hour']); - $v_day = escapeshellarg($_POST['v_day']); - $v_month = escapeshellarg($_POST['v_month']); - $v_wday = escapeshellarg($_POST['v_wday']); - $v_cmd = escapeshellarg($_POST['v_cmd']); + $v_min = $_POST['v_min']; + $v_hour = $_POST['v_hour']; + $v_day = $_POST['v_day']; + $v_month = $_POST['v_month']; + $v_wday = $_POST['v_wday']; + $v_cmd = $_POST['v_cmd']; // Save changes - exec (VESTA_CMD."v-change-cron-job ".$v_username." ".$v_job." ".$v_min." ".$v_hour." ".$v_day." ".$v_month." ".$v_wday." ".$v_cmd, $output, $return_var); - check_return_code($return_var,$output); - unset($output); - - $v_cmd = $_POST['v_cmd']; + v_exec('v-change-cron-job', [$v_username, $v_job, $v_min, $v_hour, $v_day, $v_month, $v_wday, $v_cmd]); // Set success message if (empty($_SESSION['error_msg'])) { diff --git a/web/edit/db/index.php b/web/edit/db/index.php index 29d358f80..4a2377d10 100644 --- a/web/edit/db/index.php +++ b/web/edit/db/index.php @@ -21,51 +21,40 @@ if (empty($_GET['database'])) { // Edit as someone else? if (($_SESSION['user'] == 'admin') && (!empty($_GET['user']))) { - $user=escapeshellarg($_GET['user']); + $user = $_GET['user']; } -// List datbase -$v_database = escapeshellarg($_GET['database']); -exec (VESTA_CMD."v-list-database ".$user." ".$v_database." 'json'", $output, $return_var); -check_return_code($return_var,$output); -$data = json_decode(implode('', $output), true); -unset($output); - -// Parse database $v_username = $user; $v_database = $_GET['database']; + +// List datbase +v_exec('v-list-database', [$user, $v_database, 'json'], true, $output); +$data = json_decode($output, true); + +// Parse database $v_dbuser = $data[$v_database]['DBUSER']; -$v_password = ""; +$v_password = ''; $v_host = $data[$v_database]['HOST']; $v_type = $data[$v_database]['TYPE']; $v_charset = $data[$v_database]['CHARSET']; $v_date = $data[$v_database]['DATE']; $v_time = $data[$v_database]['TIME']; $v_suspended = $data[$v_database]['SUSPENDED']; -if ( $v_suspended == 'yes' ) { - $v_status = 'suspended'; -} else { - $v_status = 'active'; -} +$v_status = $v_suspended == 'yes' ? 'suspended' : 'active'; // Check POST request if (!empty($_POST['save'])) { - $v_username = $user; - // Check token if ((!isset($_POST['token'])) || ($_SESSION['token'] != $_POST['token'])) { header('location: /login/'); - exit(); + exit; } // Change database user if (($v_dbuser != $_POST['v_dbuser']) && (empty($_SESSION['error_msg']))) { $v_dbuser = preg_replace("/^".$user."_/", "", $_POST['v_dbuser']); - $v_dbuser = escapeshellarg($v_dbuser); - exec (VESTA_CMD."v-change-database-user ".$v_username." ".$v_database." ".$v_dbuser, $output, $return_var); - check_return_code($return_var,$output); - unset($output); - $v_dbuser = $user."_".preg_replace("/^".$user."_/", "", $_POST['v_dbuser']); + v_exec('v-change-database-user', [$v_username, $v_database, $v_dbuser]); + $v_dbuser = $user . '_' . $v_dbuser; } // Change database password @@ -74,11 +63,9 @@ if (!empty($_POST['save'])) { $fp = fopen($v_password, "w"); fwrite($fp, $_POST['v_password']."\n"); fclose($fp); - exec (VESTA_CMD."v-change-database-password ".$v_username." ".$v_database." ".$v_password, $output, $return_var); - check_return_code($return_var,$output); - unset($output); + v_exec('v-change-database-password', [$v_username, $v_database, $v_password]); unlink($v_password); - $v_password = escapeshellarg($_POST['v_password']); + $v_password = $_POST['v_password']; } // Set success message diff --git a/web/edit/dns/index.php b/web/edit/dns/index.php index 6ceac64a5..f9c2a6111 100644 --- a/web/edit/dns/index.php +++ b/web/edit/dns/index.php @@ -15,20 +15,18 @@ if (empty($_GET['domain'])) { // Edit as someone else? if (($_SESSION['user'] == 'admin') && (!empty($_GET['user']))) { - $user=escapeshellarg($_GET['user']); + $user = $_GET['user']; } +$v_username = $user; // List dns domain if ((!empty($_GET['domain'])) && (empty($_GET['record_id']))) { - $v_domain = escapeshellarg($_GET['domain']); - exec (VESTA_CMD."v-list-dns-domain ".$user." ".$v_domain." json", $output, $return_var); - check_return_code($return_var,$output); - $data = json_decode(implode('', $output), true); - unset($output); + $v_domain = $_GET['domain']; + + v_exec('v-list-dns-domain', [$user, $v_domain, 'json'], true, $output); + $data = json_decode($output, true); // Parse dns domain - $v_username = $user; - $v_domain = $_GET['domain']; $v_ip = $data[$v_domain]['IP']; $v_template = $data[$v_domain]['TPL']; $v_ttl = $data[$v_domain]['TTL']; @@ -44,24 +42,19 @@ if ((!empty($_GET['domain'])) && (empty($_GET['record_id']))) { } // List dns templates - exec (VESTA_CMD."v-list-dns-templates json", $output, $return_var); - $templates = json_decode(implode('', $output), true); - unset($output); + v_exec('v-list-dns-templates', ['json'], false, $output); + $templates = json_decode($output, true); } // List dns record if ((!empty($_GET['domain'])) && (!empty($_GET['record_id']))) { - $v_domain = escapeshellarg($_GET['domain']); - $v_record_id = escapeshellarg($_GET['record_id']); - exec (VESTA_CMD."v-list-dns-records ".$user." ".$v_domain." 'json'", $output, $return_var); - check_return_code($return_var,$output); - $data = json_decode(implode('', $output), true); - unset($output); - - // Parse dns record - $v_username = $user; $v_domain = $_GET['domain']; $v_record_id = $_GET['record_id']; + + v_exec('v-list-dns-records', [$user, $v_domain, 'json'], true, $output); + $data = json_decode($output, true); + + // Parse dns record $v_rec = $data[$v_record_id]['RECORD']; $v_type = $data[$v_record_id]['TYPE']; $v_val = $data[$v_record_id]['VALUE']; @@ -78,63 +71,51 @@ if ((!empty($_GET['domain'])) && (!empty($_GET['record_id']))) { // Check POST request for dns domain if ((!empty($_POST['save'])) && (!empty($_GET['domain'])) && (empty($_GET['record_id']))) { - $v_domain = escapeshellarg($_POST['v_domain']); + $v_domain = $_POST['v_domain']; // Check token if ((!isset($_POST['token'])) || ($_SESSION['token'] != $_POST['token'])) { header('location: /login/'); - exit(); + exit; } // Change domain IP if (($v_ip != $_POST['v_ip']) && (empty($_SESSION['error_msg']))) { - $v_ip = escapeshellarg($_POST['v_ip']); - exec (VESTA_CMD."v-change-dns-domain-ip ".$v_username." ".$v_domain." ".$v_ip." 'no'", $output, $return_var); - check_return_code($return_var,$output); + $v_ip = $_POST['v_ip']; + v_exec('v-change-dns-domain-ip', [$v_username, $v_domain, $v_ip, 'no']); $restart_dns = 'yes'; - unset($output); } // Change domain template if (($v_template != $_POST['v_template']) && (empty($_SESSION['error_msg']))) { - $v_template = escapeshellarg($_POST['v_template']); - exec (VESTA_CMD."v-change-dns-domain-tpl ".$v_username." ".$v_domain." ".$v_template." 'no'", $output, $return_var); - check_return_code($return_var,$output); - unset($output); + $v_template = $_POST['v_template']; + v_exec('v-change-dns-domain-tpl', [$v_username, $v_domain, $v_template, 'no']); $restart_dns = 'yes'; } // Change SOA record if (($v_soa != $_POST['v_soa']) && (empty($_SESSION['error_msg']))) { - $v_soa = escapeshellarg($_POST['v_soa']); - exec (VESTA_CMD."v-change-dns-domain-soa ".$v_username." ".$v_domain." ".$v_soa." 'no'", $output, $return_var); - check_return_code($return_var,$output); - unset($output); + $v_soa = $_POST['v_soa']; + v_exec('v-change-dns-domain-soa', [$v_username, $v_domain, $v_soa, 'no']); $restart_dns = 'yes'; } // Change expiriation date if (($v_exp != $_POST['v_exp']) && (empty($_SESSION['error_msg']))) { - $v_exp = escapeshellarg($_POST['v_exp']); - exec (VESTA_CMD."v-change-dns-domain-exp ".$v_username." ".$v_domain." ".$v_exp." 'no'", $output, $return_var); - check_return_code($return_var,$output); - unset($output); + $v_exp = $_POST['v_exp']; + v_exec('v-change-dns-domain-exp', [$v_username, $v_domain, $v_exp, 'no']); } // Change domain ttl if (($v_ttl != $_POST['v_ttl']) && (empty($_SESSION['error_msg']))) { - $v_ttl = escapeshellarg($_POST['v_ttl']); - exec (VESTA_CMD."v-change-dns-domain-ttl ".$v_username." ".$v_domain." ".$v_ttl." 'no'", $output, $return_var); - check_return_code($return_var,$output); - unset($output); + $v_ttl = $_POST['v_ttl']; + v_exec('v-change-dns-domain-ttl', [$v_username, $v_domain, $v_ttl, 'no']); $restart_dns = 'yes'; } // Restart dns server if (!empty($restart_dns) && (empty($_SESSION['error_msg']))) { - exec (VESTA_CMD."v-restart-dns", $output, $return_var); - check_return_code($return_var,$output); - unset($output); + v_exec('v-restart-dns'); } // Set success message @@ -149,38 +130,30 @@ if ((!empty($_POST['save'])) && (!empty($_GET['domain'])) && (!empty($_GET['reco // Check token if ((!isset($_POST['token'])) || ($_SESSION['token'] != $_POST['token'])) { header('location: /login/'); - exit(); + exit; } - // Protect input - $v_domain = escapeshellarg($_POST['v_domain']); - $v_record_id = escapeshellarg($_POST['v_record_id']); + $v_domain = $_POST['v_domain']; + $v_record_id = $_POST['v_record_id']; // Change dns record if (($v_val != $_POST['v_val']) || ($v_priority != $_POST['v_priority']) && (empty($_SESSION['error_msg']))) { - $v_val = escapeshellarg($_POST['v_val']); - $v_priority = escapeshellarg($_POST['v_priority']); - exec (VESTA_CMD."v-change-dns-record ".$v_username." ".$v_domain." ".$v_record_id." ".$v_val." ".$v_priority, $output, $return_var); - check_return_code($return_var,$output); $v_val = $_POST['v_val']; - unset($output); + $v_priority = $_POST['v_priority']; + v_exec('v-change-dns-record', [$v_username, $v_domain, $v_record_id, $v_val, $v_priority]); $restart_dns = 'yes'; } // Change dns record id if (($_GET['record_id'] != $_POST['v_record_id']) && (empty($_SESSION['error_msg']))) { - $v_old_record_id = escapeshellarg($_GET['record_id']); - exec (VESTA_CMD."v-change-dns-record-id ".$v_username." ".$v_domain." ".$v_old_record_id." ".$v_record_id, $output, $return_var); - check_return_code($return_var,$output); - unset($output); + $v_old_record_id = $_GET['record_id']; + v_exec('v-change-dns-record-id', [$v_username, $v_domain, $v_old_record_id, $v_record_id]); $restart_dns = 'yes'; } // Restart dns server if (!empty($restart_dns) && (empty($_SESSION['error_msg']))) { - exec (VESTA_CMD."v-restart-dns", $output, $return_var); - check_return_code($return_var,$output); - unset($output); + v_exec('v-restart-dns'); } // Set success message diff --git a/web/edit/file/index.php b/web/edit/file/index.php index 6f7474c94..f26c2d3c8 100644 --- a/web/edit/file/index.php +++ b/web/edit/file/index.php @@ -31,24 +31,22 @@ if (($_SESSION['user'] == 'admin') && (!empty($_SESSION['look']))) { -Error while saving file

                '); exit; @@ -58,12 +56,12 @@ if (($_SESSION['user'] == 'admin') && (!empty($_SESSION['look']))) { } } - exec (VESTA_CMD . "v-open-fs-file {$user} ".escapeshellarg($path), $content, $return_var); + $return_var = v_exec('v-open-fs-file', [$user, $path], false, $content); if ($return_var != 0) { print 'Error while opening file'; // todo: handle this more styled exit; } - $content = implode("\n", $content)."\n"; + $content = $content . "\n"; } else { $content = ''; } diff --git a/web/edit/firewall/index.php b/web/edit/firewall/index.php index 44346d09a..79de0e3e2 100644 --- a/web/edit/firewall/index.php +++ b/web/edit/firewall/index.php @@ -20,15 +20,13 @@ if (empty($_GET['rule'])) { exit; } +$v_rule = $_GET['rule']; + // List rule -$v_rule = escapeshellarg($_GET['rule']); -exec (VESTA_CMD."v-list-firewall-rule ".$v_rule." 'json'", $output, $return_var); -check_return_code($return_var,$output); -$data = json_decode(implode('', $output), true); -unset($output); +v_exec('v-list-firewall-rule', [$v_rule, 'json'], true, $output); +$data = json_decode($output, true); // Parse rule -$v_rule = $_GET['rule']; $v_action = $data[$v_rule]['ACTION']; $v_protocol = $data[$v_rule]['PROTOCOL']; $v_port = $data[$v_rule]['PORT']; @@ -37,37 +35,17 @@ $v_comment = $data[$v_rule]['COMMENT']; $v_date = $data[$v_rule]['DATE']; $v_time = $data[$v_rule]['TIME']; $v_suspended = $data[$v_rule]['SUSPENDED']; -if ( $v_suspended == 'yes' ) { - $v_status = 'suspended'; -} else { - $v_status = 'active'; -} +$v_status = $v_suspended == 'yes' ? 'suspended' : 'active'; // Check POST request if (!empty($_POST['save'])) { - // Check token if ((!isset($_POST['token'])) || ($_SESSION['token'] != $_POST['token'])) { header('location: /login/'); - exit(); + exit; } - $v_rule = escapeshellarg($_GET['rule']); - $v_action = escapeshellarg($_POST['v_action']); - $v_protocol = escapeshellarg($_POST['v_protocol']); - $v_port = str_replace(" ",",", $_POST['v_port']); - $v_port = preg_replace('/\,+/', ',', $v_port); - $v_port = trim($v_port, ","); - $v_port = escapeshellarg($v_port); - $v_ip = escapeshellarg($_POST['v_ip']); - $v_comment = escapeshellarg($_POST['v_comment']); - - // Change Status - exec (VESTA_CMD."v-change-firewall-rule ".$v_rule." ".$v_action." ".$v_ip." ".$v_port." ".$v_protocol." ".$v_comment, $output, $return_var); - check_return_code($return_var,$output); - unset($output); - - $v_rule = $_GET['v_rule']; + $v_rule = $_GET['rule']; $v_action = $_POST['v_action']; $v_protocol = $_POST['v_protocol']; $v_port = str_replace(" ",",", $_POST['v_port']); @@ -76,6 +54,9 @@ if (!empty($_POST['save'])) { $v_ip = $_POST['v_ip']; $v_comment = $_POST['v_comment']; + // Change Status + v_exec('v-change-firewall-rule', [$v_rule, $v_action, $v_ip, $v_port, $v_protocol, $v_comment]); + // Set success message if (empty($_SESSION['error_msg'])) { $_SESSION['ok_msg'] = __('Changes has been saved.'); diff --git a/web/edit/ip/index.php b/web/edit/ip/index.php index bec1ae58f..8427c3e12 100644 --- a/web/edit/ip/index.php +++ b/web/edit/ip/index.php @@ -19,16 +19,14 @@ if (empty($_GET['ip'])) { exit; } -// List ip -$v_ip = escapeshellarg($_GET['ip']); -exec (VESTA_CMD."v-list-sys-ip ".$v_ip." 'json'", $output, $return_var); -check_return_code($return_var,$output); -$data = json_decode(implode('', $output), true); -unset($output); - -// Parse ip $v_username = $user; $v_ip = $_GET['ip']; + +// List ip +v_exec('v-list-sys-ip', [$v_ip, 'json'], true, $output); +$data = json_decode($output, true); + +// Parse ip $v_netmask = $data[$v_ip]['NETMASK']; $v_interace = $data[$v_ip]['INTERFACE']; $v_name = $data[$v_ip]['NAME']; @@ -46,51 +44,39 @@ if ( $v_suspended == 'yes' ) { } // List users -exec (VESTA_CMD."v-list-sys-users 'json'", $output, $return_var); -$users = json_decode(implode('', $output), true); -unset($output); +v_exec('v-list-sys-users', ['json'], false, $output); +$users = json_decode($output, true); // Check POST request if (!empty($_POST['save'])) { - $v_ip = escapeshellarg($_POST['v_ip']); + $v_ip = $_POST['v_ip']; // Change Status if (($v_ipstatus == 'shared') && (empty($_POST['v_shared'])) && (empty($_SESSION['error_msg']))) { - exec (VESTA_CMD."v-change-sys-ip-status ".$v_ip." 'dedicated'", $output, $return_var); - check_return_code($return_var,$output); - unset($output); - $v_dedicated = 'yes'; + v_exec('v-change-sys-ip-status', [$v_ip, 'dedicated']); + $v_dedicated = 'yes'; } if (($v_ipstatus == 'dedicated') && (!empty($_POST['v_shared'])) && (empty($_SESSION['error_msg']))) { - exec (VESTA_CMD."v-change-sys-ip-status ".$v_ip." 'shared'", $output, $return_var); - check_return_code($return_var,$output); - unset($output); + v_exec('v-change-sys-ip-status', [$v_ip, 'shared']); unset($v_dedicated); } // Change owner if (($v_owner != $_POST['v_owner']) && (empty($_SESSION['error_msg']))) { - $v_owner = escapeshellarg($_POST['v_owner']); - exec (VESTA_CMD."v-change-sys-ip-owner ".$v_ip." ".$v_owner, $output, $return_var); - check_return_code($return_var,$output); $v_owner = $_POST['v_owner']; - unset($output); + v_exec('v-change-sys-ip-owner', [$v_ip, $v_owner]); } // Change associated domain if (($v_name != $_POST['v_name']) && (empty($_SESSION['error_msg']))) { - $v_name = escapeshellarg($_POST['v_name']); - exec (VESTA_CMD."v-change-sys-ip-name ".$v_ip." ".$v_name, $output, $return_var); - check_return_code($return_var,$output); - unset($output); + $v_name = $_POST['v_name']; + v_exec('v-change-sys-ip-name', [$v_ip, $v_name]); } // Change NAT address if (($v_nat != $_POST['v_nat']) && (empty($_SESSION['error_msg']))) { - $v_nat = escapeshellarg($_POST['v_nat']); - exec (VESTA_CMD."v-change-sys-ip-nat ".$v_ip." ".$v_nat, $output, $return_var); - check_return_code($return_var,$output); - unset($output); + $v_nat = $_POST['v_nat']; + v_exec('v-change-sys-ip-nat', [$v_ip, $v_nat]); } // Set success message diff --git a/web/edit/mail/index.php b/web/edit/mail/index.php index 28d4da9b5..6598db903 100644 --- a/web/edit/mail/index.php +++ b/web/edit/mail/index.php @@ -21,19 +21,18 @@ if (empty($_GET['domain'])) { // Edit as someone else? if (($_SESSION['user'] == 'admin') && (!empty($_GET['user']))) { - $user=escapeshellarg($_GET['user']); + $user = $_GET['user']; } $v_username = $user; // List mail domain if ((!empty($_GET['domain'])) && (empty($_GET['account']))) { - $v_domain = escapeshellarg($_GET['domain']); - exec (VESTA_CMD."v-list-mail-domain ".$user." ".$v_domain." json", $output, $return_var); - $data = json_decode(implode('', $output), true); - unset($output); + $v_domain = $_GET['domain']; + + v_exec('v-list-mail-domain', [$user, $v_domain, 'json'], false, $output); + $data = json_decode($output, true); // Parse domain - $v_domain = $_GET['domain']; $v_antispam = $data[$v_domain]['ANTISPAM']; $v_antivirus = $data[$v_domain]['ANTIVIRUS']; $v_dkim = $data[$v_domain]['DKIM']; @@ -50,17 +49,14 @@ if ((!empty($_GET['domain'])) && (empty($_GET['account']))) { // List mail account if ((!empty($_GET['domain'])) && (!empty($_GET['account']))) { - $v_domain = escapeshellarg($_GET['domain']); - $v_account = escapeshellarg($_GET['account']); - exec (VESTA_CMD."v-list-mail-account ".$user." ".$v_domain." ".$v_account." 'json'", $output, $return_var); - $data = json_decode(implode('', $output), true); - unset($output); - - // Parse mail account - $v_username = $user; $v_domain = $_GET['domain']; $v_account = $_GET['account']; - $v_password = ""; + + v_exec('v-list-mail-account', [$user, $v_domain, $v_account, 'json'], false, $output); + $data = json_decode($output, true); + + // Parse mail account + $v_password = ''; $v_aliases = str_replace(',', "\n", $data[$v_account]['ALIAS']); $valiases = explode(",", $data[$v_account]['ALIAS']); $v_fwd = str_replace(',', "\n", $data[$v_account]['FWD']); @@ -79,9 +75,8 @@ if ((!empty($_GET['domain'])) && (!empty($_GET['account']))) { // Parse autoreply if ( $v_autoreply == 'yes' ) { - exec (VESTA_CMD."v-list-mail-account-autoreply ".$user." '".$v_domain."' '".$v_account."' json", $output, $return_var); - $autoreply_str = json_decode(implode('', $output), true); - unset($output); + v_exec('v-list-mail-account-autoreply', [$user, $v_domain, $v_account, 'json'], false, $output); + $autoreply_str = json_decode($output, true); $v_autoreply_message = $autoreply_str[$v_account]['MSG']; } } @@ -89,86 +84,68 @@ if ((!empty($_GET['domain'])) && (!empty($_GET['account']))) { // Check POST request for mail domain if ((!empty($_POST['save'])) && (!empty($_GET['domain'])) && (empty($_GET['account']))) { - $v_domain = escapeshellarg($_POST['v_domain']); + $v_domain = $_POST['v_domain']; // Check token if ((!isset($_POST['token'])) || ($_SESSION['token'] != $_POST['token'])) { header('location: /login/'); - exit(); + exit; } // Delete antispam if (($v_antispam == 'yes') && (empty($_POST['v_antispam'])) && (empty($_SESSION['error_msg']))) { - exec (VESTA_CMD."v-delete-mail-domain-antispam ".$v_username." ".$v_domain, $output, $return_var); - check_return_code($return_var,$output); + v_exec('v-delete-mail-domain-antispam', [$v_username, $v_domain]); $v_antispam = 'no'; - unset($output); } // Add antispam if (($v_antispam == 'no') && (!empty($_POST['v_antispam'])) && (empty($_SESSION['error_msg']))) { - exec (VESTA_CMD."v-add-mail-domain-antispam ".$v_username." ".$v_domain, $output, $return_var); - check_return_code($return_var,$output); + v_exec('v-add-mail-domain-antispam', [$v_username, $v_domain]); $v_antispam = 'yes'; - unset($output); } // Delete antivirus if (($v_antivirus == 'yes') && (empty($_POST['v_antivirus'])) && (empty($_SESSION['error_msg']))) { - exec (VESTA_CMD."v-delete-mail-domain-antivirus ".$v_username." ".$v_domain, $output, $return_var); - check_return_code($return_var,$output); + v_exec('v-delete-mail-domain-antivirus', [$v_username, $v_domain]); $v_antivirus = 'no'; - unset($output); } // Add antivirs if (($v_antivirus == 'no') && (!empty($_POST['v_antivirus'])) && (empty($_SESSION['error_msg']))) { - exec (VESTA_CMD."v-add-mail-domain-antivirus ".$v_username." ".$v_domain, $output, $return_var); - check_return_code($return_var,$output); + v_exec('v-add-mail-domain-antivirus', [$v_username, $v_domain]); $v_antivirus = 'yes'; - unset($output); } // Delete DKIM if (($v_dkim == 'yes') && (empty($_POST['v_dkim'])) && (empty($_SESSION['error_msg']))) { - exec (VESTA_CMD."v-delete-mail-domain-dkim ".$v_username." ".$v_domain, $output, $return_var); - check_return_code($return_var,$output); + v_exec('v-delete-mail-domain-dkim', [$v_username, $v_domain]); $v_dkim = 'no'; - unset($output); } // Add DKIM if (($v_dkim == 'no') && (!empty($_POST['v_dkim'])) && (empty($_SESSION['error_msg']))) { - exec (VESTA_CMD."v-add-mail-domain-dkim ".$v_username." ".$v_domain, $output, $return_var); - check_return_code($return_var,$output); + v_exec('v-add-mail-domain-dkim', [$v_username, $v_domain]); $v_dkim = 'yes'; - unset($output); } // Delete catchall if ((!empty($v_catchall)) && (empty($_POST['v_catchall'])) && (empty($_SESSION['error_msg']))) { - exec (VESTA_CMD."v-delete-mail-domain-catchall ".$v_username." ".$v_domain, $output, $return_var); - check_return_code($return_var,$output); + v_exec('v-delete-mail-domain-catchall', [$v_username, $v_domain]); $v_catchall = ''; - unset($output); } // Change catchall address if ((!empty($v_catchall)) && (!empty($_POST['v_catchall'])) && (empty($_SESSION['error_msg']))) { if ($v_catchall != $_POST['v_catchall']) { - $v_catchall = escapeshellarg($_POST['v_catchall']); - exec (VESTA_CMD."v-change-mail-domain-catchall ".$v_username." ".$v_domain." ".$v_catchall, $output, $return_var); - check_return_code($return_var,$output); - unset($output); + $v_catchall = $_POST['v_catchall']; + v_exec('v-change-mail-domain-catchall', [$v_username, $v_domain, $v_catchall]); } } // Add catchall if ((empty($v_catchall)) && (!empty($_POST['v_catchall'])) && (empty($_SESSION['error_msg']))) { - $v_catchall = escapeshellarg($_POST['v_catchall']); - exec (VESTA_CMD."v-add-mail-domain-catchall ".$v_username." ".$v_domain." ".$v_catchall, $output, $return_var); - check_return_code($return_var,$output); - unset($output); + $v_catchall = $_POST['v_catchall']; + v_exec('v-add-mail-domain-catchall', [$v_username, $v_domain, $v_catchall]); } // Set success message @@ -183,11 +160,11 @@ if ((!empty($_POST['save'])) && (!empty($_GET['domain'])) && (!empty($_GET['acco // Check token if ((!isset($_POST['token'])) || ($_SESSION['token'] != $_POST['token'])) { header('location: /login/'); - exit(); + exit; } - $v_domain = escapeshellarg($_POST['v_domain']); - $v_account = escapeshellarg($_POST['v_account']); + $v_domain = $_POST['v_domain']; + $v_account = $_POST['v_account']; // Change password if ((!empty($_POST['v_password'])) && (empty($_SESSION['error_msg']))) { @@ -195,23 +172,19 @@ if ((!empty($_POST['save'])) && (!empty($_GET['domain'])) && (!empty($_GET['acco $fp = fopen($v_password, "w"); fwrite($fp, $_POST['v_password']."\n"); fclose($fp); - exec (VESTA_CMD."v-change-mail-account-password ".$v_username." ".$v_domain." ".$v_account." ".$v_password, $output, $return_var); - check_return_code($return_var,$output); - unset($output); + v_exec('v-change-mail-account-password', [$v_username, $v_domain, $v_account, $v_password]); unlink($v_password); - $v_password = escapeshellarg($_POST['v_password']);; + $v_password = $_POST['v_password']; } // Change quota if (($v_quota != $_POST['v_quota']) && (empty($_SESSION['error_msg']))) { if (empty($_POST['v_quota'])) { - $v_quota = 0; + $v_quota = '0'; } else { - $v_quota = escapeshellarg($_POST['v_quota']); + $v_quota = $_POST['v_quota']; } - exec (VESTA_CMD."v-change-mail-account-quota ".$v_username." ".$v_domain." ".$v_account." ".$v_quota, $output, $return_var); - check_return_code($return_var,$output); - unset($output); + v_exec('v-change-mail-account-quota', [$v_username, $v_domain, $v_account, $v_quota]); } // Change account aliases @@ -225,17 +198,13 @@ if ((!empty($_POST['save'])) && (!empty($_GET['domain'])) && (!empty($_GET['acco $result = array_diff($valiases, $aliases); foreach ($result as $alias) { if ((empty($_SESSION['error_msg'])) && (!empty($alias))) { - exec (VESTA_CMD."v-delete-mail-account-alias ".$v_username." ".$v_domain." ".$v_account." '".$alias."'", $output, $return_var); - check_return_code($return_var,$output); - unset($output); + v_exec('v-delete-mail-account-alias', [$v_username, $v_domain, $v_account, $alias]); } } $result = array_diff($aliases, $valiases); foreach ($result as $alias) { if ((empty($_SESSION['error_msg'])) && (!empty($alias))) { - exec (VESTA_CMD."v-add-mail-account-alias ".$v_username." ".$v_domain." ".$v_account." ".escapeshellarg($alias), $output, $return_var); - check_return_code($return_var,$output); - unset($output); + v_exec('v-add-mail-account-alias', [$v_username, $v_domain, $v_account, $alias]); } } } @@ -251,56 +220,42 @@ if ((!empty($_POST['save'])) && (!empty($_GET['domain'])) && (!empty($_GET['acco $result = array_diff($vfwd, $fwd); foreach ($result as $forward) { if ((empty($_SESSION['error_msg'])) && (!empty($forward))) { - exec (VESTA_CMD."v-delete-mail-account-forward ".$v_username." ".$v_domain." ".$v_account." '".$forward."'", $output, $return_var); - check_return_code($return_var,$output); - unset($output); + v_exec('v-delete-mail-account-forward', [$v_username, $v_domain, $v_account, $forward]); } } $result = array_diff($fwd, $vfwd); foreach ($result as $forward) { if ((empty($_SESSION['error_msg'])) && (!empty($forward))) { - exec (VESTA_CMD."v-add-mail-account-forward ".$v_username." ".$v_domain." ".$v_account." ".escapeshellarg($forward), $output, $return_var); - check_return_code($return_var,$output); - unset($output); + v_exec('v-add-mail-account-forward', [$v_username, $v_domain, $v_account, $forward]); } } } // Delete FWD_ONLY flag if (($v_fwd_only == 'yes') && (empty($_POST['v_fwd_only'])) && (empty($_SESSION['error_msg']))) { - exec (VESTA_CMD."v-delete-mail-account-fwd-only ".$v_username." ".$v_domain." ".$v_account, $output, $return_var); - check_return_code($return_var,$output); - unset($output); + v_exec('v-delete-mail-account-fwd-only', [$v_username, $v_domain, $v_account]); $v_fwd_only = ''; } // Add FWD_ONLY flag if (($v_fwd_only != 'yes') && (!empty($_POST['v_fwd_only'])) && (empty($_SESSION['error_msg']))) { - exec (VESTA_CMD."v-add-mail-account-fwd-only ".$v_username." ".$v_domain." ".$v_account, $output, $return_var); - check_return_code($return_var,$output); - unset($output); + v_exec('v-add-mail-account-fwd-only', [$v_username, $v_domain, $v_account]); $v_fwd_only = 'yes'; } // Delete autoreply if (($v_autoreply == 'yes') && (empty($_POST['v_autoreply'])) && (empty($_SESSION['error_msg']))) { - exec (VESTA_CMD."v-delete-mail-account-autoreply ".$v_username." ".$v_domain." ".$v_account, $output, $return_var); - check_return_code($return_var,$output); - unset($output); + v_exec('v-delete-mail-account-autoreply', [$v_username, $v_domain, $v_account]); $v_autoreply = 'no'; $v_autoreply_message = ''; } // Add autoreply if ((!empty($_POST['v_autoreply'])) && (empty($_SESSION['error_msg']))) { - if ( $v_autoreply_message != str_replace("\r\n", "\n", $_POST['v_autoreply_message'])) { + if ($v_autoreply_message != str_replace("\r\n", "\n", $_POST['v_autoreply_message'])) { $v_autoreply_message = str_replace("\r\n", "\n", $_POST['v_autoreply_message']); - $v_autoreply_message = escapeshellarg($v_autoreply_message); - exec (VESTA_CMD."v-add-mail-account-autoreply ".$v_username." ".$v_domain." ".$v_account." ".$v_autoreply_message, $output, $return_var); - check_return_code($return_var,$output); - unset($output); + v_exec('v-add-mail-account-autoreply', [$v_username, $v_domain, $v_account, $v_autoreply_message]); $v_autoreply = 'yes'; - $v_autoreply_message = $_POST['v_autoreply_message']; } } diff --git a/web/edit/package/index.php b/web/edit/package/index.php index e8ecaf686..2e60abf16 100644 --- a/web/edit/package/index.php +++ b/web/edit/package/index.php @@ -21,14 +21,13 @@ if (empty($_GET['package'])) { } +$v_package = $_GET['package']; + // List package -$v_package = escapeshellarg($_GET['package']); -exec (VESTA_CMD."v-list-user-package ".$v_package." 'json'", $output, $return_var); -$data = json_decode(implode('', $output), true); -unset($output); +v_exec('v-list-user-package', [$v_package, 'json'], false, $output); +$data = json_decode($output, true); // Parse package -$v_package = $_GET['package']; $v_web_template = $data[$v_package]['WEB_TEMPLATE']; $v_backend_template = $data[$v_package]['BACKEND_TEMPLATE']; $v_proxy_template = $data[$v_package]['PROXY_TEMPLATE']; @@ -45,7 +44,7 @@ $v_disk_quota = $data[$v_package]['DISK_QUOTA']; $v_bandwidth = $data[$v_package]['BANDWIDTH']; $v_shell = $data[$v_package]['SHELL']; $v_ns = $data[$v_package]['NS']; -$nameservers = explode(", ", $v_ns); +$nameservers = explode(', ', $v_ns); $v_ns1 = $nameservers[0]; $v_ns2 = $nameservers[1]; $v_ns3 = $nameservers[2]; @@ -57,45 +56,39 @@ $v_ns8 = $nameservers[7]; $v_backups = $data[$v_package]['BACKUPS']; $v_date = $data[$v_package]['DATE']; $v_time = $data[$v_package]['TIME']; -$v_status = 'active'; +$v_status = 'active'; // List web templates -exec (VESTA_CMD."v-list-web-templates json", $output, $return_var); -$web_templates = json_decode(implode('', $output), true); -unset($output); +v_exec('v-list-web-templates', ['json'], false, $output); +$web_templates = json_decode($output, true); // List backend templates if (!empty($_SESSION['WEB_BACKEND'])) { - exec (VESTA_CMD."v-list-web-templates-backend json", $output, $return_var); - $backend_templates = json_decode(implode('', $output), true); - unset($output); + v_exec('v-list-web-templates-backend', ['json'], false, $output); + $backend_templates = json_decode($output, true); } // List proxy templates if (!empty($_SESSION['PROXY_SYSTEM'])) { - exec (VESTA_CMD."v-list-web-templates-proxy json", $output, $return_var); - $proxy_templates = json_decode(implode('', $output), true); - unset($output); + v_exec('v-list-web-templates-proxy', ['json'], false, $output); + $proxy_templates = json_decode($output, true); } // List dns templates -exec (VESTA_CMD."v-list-dns-templates json", $output, $return_var); -$dns_templates = json_decode(implode('', $output), true); -unset($output); +v_exec('v-list-dns-templates', ['json'], false, $output); +$dns_templates = json_decode($output, true); // List shels -exec (VESTA_CMD."v-list-sys-shells json", $output, $return_var); -$shells = json_decode(implode('', $output), true); -unset($output); +v_exec('v-list-sys-shells', ['json'], false, $output); +$shells = json_decode($output, true); // Check POST request if (!empty($_POST['save'])) { - // Check token if ((!isset($_POST['token'])) || ($_SESSION['token'] != $_POST['token'])) { header('location: /login/'); - exit(); + exit; } // Check empty fields @@ -133,8 +126,10 @@ if (!empty($_POST['save'])) { $_SESSION['error_msg'] = __('Field "%s" can not be blank.',$error_msg); } + $v_package = $_POST['v_package']; + // Protect input - $v_package = escapeshellarg($_POST['v_package']); + // TODO: Use array? $v_web_template = escapeshellarg($_POST['v_web_template']); if (!empty($_SESSION['WEB_BACKEND'])) { $v_backend_template = escapeshellarg($_POST['v_backend_template']); @@ -199,23 +194,18 @@ if (!empty($_POST['save'])) { $pkg .= "BACKUPS=".$v_backups."\n"; $pkg .= "TIME=".$v_time."\n"; $pkg .= "DATE=".$v_date."\n"; - $fp = fopen($tmpdir."/".$_POST['v_package'].".pkg", 'w'); + $fp = fopen("$tmpdir/$v_package.pkg", 'w'); fwrite($fp, $pkg); fclose($fp); // Save changes - exec (VESTA_CMD."v-add-user-package ".$tmpdir." ".$v_package." 'yes'", $output, $return_var); - check_return_code($return_var,$output); - unset($output); + v_exec('v-add-user-package', [$tmpdir, $v_package, 'yes']); // Remove temporary dir - exec ('rm -rf '.$tmpdir, $output, $return_var); - unset($output); + safe_exec('rm', ['-rf', $tmpdir]); // Propogate new package - exec (VESTA_CMD."v-update-user-package ".$v_package." 'json'", $output, $return_var); - check_return_code($return_var,$output); - unset($output); + v_exec('v-update-user-package', [$v_package, 'json']); // Set success message if (empty($_SESSION['error_msg'])) { diff --git a/web/edit/server/index.php b/web/edit/server/index.php index a47056991..1e26b4a97 100644 --- a/web/edit/server/index.php +++ b/web/edit/server/index.php @@ -16,9 +16,8 @@ $v_hostname = exec('hostname'); // List available timezones and get current one $v_timezones = list_timezones(); -exec (VESTA_CMD."v-get-sys-timezone", $output, $return_var); -$v_timezone = $output[0]; -unset($output); +v_exec('v-get-sys-timezone', [], false, $output); +$v_timezone = strtok($output, "\n"); if ($v_timezone == 'Etc/UTC' ) $v_timezone = 'UTC'; if ($v_timezone == 'Pacific/Honolulu' ) $v_timezone = 'HAST'; if ($v_timezone == 'US/Aleutian' ) $v_timezone = 'HADT'; @@ -34,51 +33,40 @@ if ($v_timezone == 'America/Puerto_Rico' ) $v_timezone = 'AST'; if ($v_timezone == 'America/Halifax' ) $v_timezone = 'ADT'; // List supported languages -exec (VESTA_CMD."v-list-sys-languages json", $output, $return_var); -$languages = json_decode(implode('', $output), true); -unset($output); +v_exec('v-list-sys-languages', ['json'], false, $output); +$languages = json_decode($output, true); // List dns cluster hosts -exec (VESTA_CMD."v-list-remote-dns-hosts json", $output, $return_var); -$dns_cluster = json_decode(implode('', $output), true); -unset($output); -foreach ($dns_cluster as $key => $value) { - $v_dns_cluster = 'yes'; -} +v_exec('v-list-remote-dns-hosts', ['json'], false, $output); +$dns_cluster = json_decode($output, true); +if (count($dns_cluster) >= 1) $v_dns_cluster = 'yes'; // List MySQL hosts -exec (VESTA_CMD."v-list-database-hosts mysql json", $output, $return_var); -$v_mysql_hosts = json_decode(implode('', $output), true); -unset($output); -foreach ($v_mysql_hosts as $key => $value) { - $v_mysql = 'yes'; -} +v_exec('v-list-database-hosts', ['mysql', 'json'], false, $output); +$v_mysql_hosts = json_decode($output, true); +if (count($v_mysql_hosts) >= 1) $v_mysql = 'yes'; // List PostgreSQL hosts -exec (VESTA_CMD."v-list-database-hosts pgsql json", $output, $return_var); -$v_pgsql_hosts = json_decode(implode('', $output), true); -unset($output); -foreach ($v_pgsql_hosts as $key => $value) { - $v_psql = 'yes'; -} +v_exec('v-list-database-hosts', ['pgsql', 'json'], false, $output); +$v_pgsql_hosts = json_decode($output, true); +if (count($v_pgsql_hosts) >= 1) $v_psql = 'yes'; // List backup settings -$v_backup_dir = "/backup"; +$v_backup_dir = '/backup'; if (!empty($_SESSION['BACKUP'])) $v_backup_dir = $_SESSION['BACKUP']; $v_backup_gzip = '5'; if (!empty($_SESSION['BACKUP_GZIP'])) $v_backup_gzip = $_SESSION['BACKUP_GZIP']; -$backup_types = split(",",$_SESSION['BACKUP_SYSTEM']); +$backup_types = explode(',', $_SESSION['BACKUP_SYSTEM']); foreach ($backup_types as $backup_type) { if ($backup_type == 'local') { $v_backup = 'yes'; } else { - exec (VESTA_CMD."v-list-backup-host ".$backup_type. " json", $output, $return_var); - $v_remote_backup = json_decode(implode('', $output), true); - unset($output); + v_exec('v-list-backup-host', [$backup_type, 'json'], false, $output); + $v_remote_backup = json_decode($output, true); $v_backup_host = $v_remote_backup[$backup_type]['HOST']; $v_backup_type = $v_remote_backup[$backup_type]['TYPE']; $v_backup_username = $v_remote_backup[$backup_type]['USERNAME']; - $v_backup_password = ""; + $v_backup_password = ''; $v_backup_port = $v_remote_backup[$backup_type]['PORT']; $v_backup_bpath = $v_remote_backup[$backup_type]['BPATH']; } @@ -86,19 +74,16 @@ foreach ($backup_types as $backup_type) { // Check POST request if (!empty($_POST['save'])) { - // Check token if ((!isset($_POST['token'])) || ($_SESSION['token'] != $_POST['token'])) { header('location: /login/'); - exit(); + exit; } // Change hostname if ((!empty($_POST['v_hostname'])) && ($v_hostname != $_POST['v_hostname'])) { - exec (VESTA_CMD."v-change-sys-hostname ".escapeshellarg($_POST['v_hostname']), $output, $return_var); - check_return_code($return_var,$output); - unset($output); $v_hostname = $_POST['v_hostname']; + v_exec('v-change-sys-hostname', [$v_hostname]); } // Change timezone @@ -120,10 +105,8 @@ if (!empty($_POST['save'])) { if ($v_tz == 'ADT' ) $v_tz = 'America/Halifax'; if ($v_timezone != $v_tz) { - exec (VESTA_CMD."v-change-sys-timezone ".escapeshellarg($v_tz), $output, $return_var); - check_return_code($return_var,$output); $v_timezone = $v_tz; - unset($output); + v_exec('v-change-sys-timezone', [$v_timezone]); } } } @@ -131,9 +114,7 @@ if (!empty($_POST['save'])) { // Change default language if (empty($_SESSION['error_msg'])) { if ((!empty($_POST['v_language'])) && ($_SESSION['LANGUAGE'] != $_POST['v_language'])) { - exec (VESTA_CMD."v-change-sys-language ".escapeshellarg($_POST['v_language']), $output, $return_var); - check_return_code($return_var,$output); - unset($output); + v_exec('v-change-sys-language', [$_POST['v_language']]); if (empty($_SESSION['error_msg'])) $_SESSION['LANGUAGE'] = $_POST['v_language']; } } @@ -142,14 +123,10 @@ if (!empty($_POST['save'])) { if (empty($_SESSION['error_msg'])) { if ((!empty($_POST['v_quota'])) && ($_SESSION['DISK_QUOTA'] != $_POST['v_quota'])) { if($_POST['v_quota'] == 'yes') { - exec (VESTA_CMD."v-add-sys-quota", $output, $return_var); - check_return_code($return_var,$output); - unset($output); + v_exec('v-add-sys-quota'); if (empty($_SESSION['error_msg'])) $_SESSION['DISK_QUOTA'] = 'yes'; } else { - exec (VESTA_CMD."v-delete-sys-quota", $output, $return_var); - check_return_code($return_var,$output); - unset($output); + v_exec('v-delete-sys-quota'); if (empty($_SESSION['error_msg'])) $_SESSION['DISK_QUOTA'] = 'no'; } } @@ -161,14 +138,10 @@ if (!empty($_POST['save'])) { if ($_SESSION['FIREWALL_SYSTEM'] != 'iptables') $v_firewall = 'no'; if ((!empty($_POST['v_firewall'])) && ($v_firewall != $_POST['v_firewall'])) { if($_POST['v_firewall'] == 'yes') { - exec (VESTA_CMD."v-add-sys-firewall", $output, $return_var); - check_return_code($return_var,$output); - unset($output); + v_exec('v-add-sys-firewall'); if (empty($_SESSION['error_msg'])) $_SESSION['FIREWALL_SYSTEM'] = 'iptables'; } else { - exec (VESTA_CMD."v-delete-sys-firewall", $output, $return_var); - check_return_code($return_var,$output); - unset($output); + v_exec('v-delete-sys-firewall'); if (empty($_SESSION['error_msg'])) $_SESSION['FIREWALL_SYSTEM'] = ''; } } @@ -177,9 +150,7 @@ if (!empty($_POST['save'])) { // Update mysql pasword if (empty($_SESSION['error_msg'])) { if (!empty($_POST['v_mysql_password'])) { - exec (VESTA_CMD."v-change-database-host-password mysql localhost root '".escapeshellarg($_POST['v_mysql_password'])."'", $output, $return_var); - check_return_code($return_var,$output); - unset($output); + v_exec('v-change-database-host-password', ['mysql', 'localhost', 'root', $_POST['v_mysql_password']]); $v_db_adv = 'yes'; } } @@ -188,9 +159,7 @@ if (!empty($_POST['save'])) { // Update webmail url if (empty($_SESSION['error_msg'])) { if ($_POST['v_mail_url'] != $_SESSION['MAIL_URL']) { - exec (VESTA_CMD."v-change-sys-config-value MAIL_URL '".escapeshellarg($_POST['v_mail_url'])."'", $output, $return_var); - check_return_code($return_var,$output); - unset($output); + v_exec('v-change-sys-config-value', ['MAIL_URL', $_POST['v_mail_url']]); $v_mail_adv = 'yes'; } } @@ -198,9 +167,7 @@ if (!empty($_POST['save'])) { // Update phpMyAdmin url if (empty($_SESSION['error_msg'])) { if ($_POST['v_mysql_url'] != $_SESSION['DB_PMA_URL']) { - exec (VESTA_CMD."v-change-sys-config-value DB_PMA_URL '".escapeshellarg($_POST['v_mysql_url'])."'", $output, $return_var); - check_return_code($return_var,$output); - unset($output); + v_exec('v-change-sys-config-value', ['DB_PMA_URL', $_POST['v_mysql_url']]); $v_db_adv = 'yes'; } } @@ -208,19 +175,15 @@ if (!empty($_POST['save'])) { // Update phpPgAdmin url if (empty($_SESSION['error_msg'])) { if ($_POST['v_psql_url'] != $_SESSION['DB_PGA_URL']) { - exec (VESTA_CMD."v-change-sys-config-value DB_PGA_URL '".escapeshellarg($_POST['v_pgsql_url'])."'", $output, $return_var); - check_return_code($return_var,$output); - unset($output); + v_exec('v-change-sys-config-value', ['DB_PGA_URL', $_POST['v_pgsql_url']]); $v_db_adv = 'yes'; } } // Disable local backup if (empty($_SESSION['error_msg'])) { - if (($_POST['v_backup'] == 'no') && ($v_backup == 'yes' )) { - exec (VESTA_CMD."v-delete-backup-host local", $output, $return_var); - check_return_code($return_var,$output); - unset($output); + if (($_POST['v_backup'] == 'no') && ($v_backup == 'yes')) { + v_exec('v-delete-backup-host', ['local']); if (empty($_SESSION['error_msg'])) $v_backup = 'no'; $v_backup_adv = 'yes'; } @@ -229,9 +192,7 @@ if (!empty($_POST['save'])) { // Enable local backups if (empty($_SESSION['error_msg'])) { if (($_POST['v_backup'] == 'yes') && ($v_backup != 'yes' )) { - exec (VESTA_CMD."v-add-backup-host local", $output, $return_var); - check_return_code($return_var,$output); - unset($output); + v_exec('v-add-backup-host', ['local']); if (empty($_SESSION['error_msg'])) $v_backup = 'yes'; $v_backup_adv = 'yes'; } @@ -241,9 +202,7 @@ if (!empty($_POST['save'])) { // Change backup gzip level if (empty($_SESSION['error_msg'])) { if ($_POST['v_backup_gzip'] != $v_backup_gzip ) { - exec (VESTA_CMD."v-change-sys-config-value BACKUP_GZIP ".escapeshellarg($_POST['v_backup_gzip']), $output, $return_var); - check_return_code($return_var,$output); - unset($output); + v_exec('v-change-sys-config-value', ['BACKUP_GZIP', $_POST['v_backup_gzip']]); if (empty($_SESSION['error_msg'])) $v_backup_gzip = $_POST['v_backup_gzip']; $v_backup_adv = 'yes'; } @@ -252,9 +211,7 @@ if (!empty($_POST['save'])) { // Change backup path if (empty($_SESSION['error_msg'])) { if ($_POST['v_backup_dir'] != $v_backup_dir ) { - exec (VESTA_CMD."v-change-sys-config-value BACKUP ".escapeshellarg($_POST['v_backup_dir']), $output, $return_var); - check_return_code($return_var,$output); - unset($output); + v_exec('v-change-sys-config-value', ['BACKUP', $_POST['v_backup_dir']]); if (empty($_SESSION['error_msg'])) $v_backup_dir = $_POST['v_backup_dir']; $v_backup_adv = 'yes'; } @@ -263,19 +220,12 @@ if (!empty($_POST['save'])) { // Add remote backup host if (empty($_SESSION['error_msg'])) { if ((!empty($_POST['v_backup_host'])) && (empty($v_backup_host))) { - $v_backup_host = escapeshellarg($_POST['v_backup_host']); - $v_backup_type = escapeshellarg($_POST['v_backup_type']); - $v_backup_username = escapeshellarg($_POST['v_backup_username']); - $v_backup_password = escapeshellarg($_POST['v_backup_password']); - $v_backup_bpath = escapeshellarg($_POST['v_backup_bpath']); - exec (VESTA_CMD."v-add-backup-host '". $v_backup_type ."' '". $v_backup_host ."' '". $v_backup_username ."' '". $v_backup_password ."' '". $v_backup_bpath ."'", $output, $return_var); - check_return_code($return_var,$output); - unset($output); - if (empty($_SESSION['error_msg'])) $v_backup_host = $_POST['v_backup_host']; - if (empty($_SESSION['error_msg'])) $v_backup_type = $_POST['v_backup_type']; - if (empty($_SESSION['error_msg'])) $v_backup_username = $_POST['v_backup_username']; - if (empty($_SESSION['error_msg'])) $v_backup_password = $_POST['v_backup_password']; - if (empty($_SESSION['error_msg'])) $v_backup_bpath = $_POST['v_backup_bpath']; + $v_backup_host = $_POST['v_backup_host']; + $v_backup_type = $_POST['v_backup_type']; + $v_backup_username = $_POST['v_backup_username']; + $v_backup_password = $_POST['v_backup_password']; + $v_backup_bpath = $_POST['v_backup_bpath']; + v_exec('v-add-backup-host', [$v_backup_type, $v_backup_host, $v_backup_username, $v_backup_password, $v_backup_bpath]); $v_backup_new = 'yes'; $v_backup_adv = 'yes'; $v_backup_remote_adv = 'yes'; @@ -285,22 +235,14 @@ if (!empty($_POST['save'])) { // Change remote backup host type if (empty($_SESSION['error_msg'])) { if ((!empty($_POST['v_backup_host'])) && ($_POST['v_backup_type'] != $v_backup_type)) { - exec (VESTA_CMD."v-delete-backup-host '". $v_backup_type ."'", $output, $return_var); - unset($output); + v_exec('v-delete-backup-host', [$v_backup_type], false); - $v_backup_host = escapeshellarg($_POST['v_backup_host']); - $v_backup_type = escapeshellarg($_POST['v_backup_type']); - $v_backup_username = escapeshellarg($_POST['v_backup_username']); - $v_backup_password = escapeshellarg($_POST['v_backup_password']); - $v_backup_bpath = escapeshellarg($_POST['v_backup_bpath']); - exec (VESTA_CMD."v-add-backup-host '". $v_backup_type ."' '". $v_backup_host ."' '". $v_backup_username ."' '". $v_backup_password ."' '". $v_backup_bpath ."'", $output, $return_var); - check_return_code($return_var,$output); - unset($output); - if (empty($_SESSION['error_msg'])) $v_backup_host = $_POST['v_backup_host']; - if (empty($_SESSION['error_msg'])) $v_backup_type = $_POST['v_backup_type']; - if (empty($_SESSION['error_msg'])) $v_backup_username = $_POST['v_backup_username']; - if (empty($_SESSION['error_msg'])) $v_backup_password = $_POST['v_backup_password']; - if (empty($_SESSION['error_msg'])) $v_backup_bpath = $_POST['v_backup_bpath']; + $v_backup_host = $_POST['v_backup_host']; + $v_backup_type = $_POST['v_backup_type']; + $v_backup_username = $_POST['v_backup_username']; + $v_backup_password = $_POST['v_backup_password']; + $v_backup_bpath = $_POST['v_backup_bpath']; + v_exec('v-add-backup-host', [$v_backup_type, $v_backup_host, $v_backup_username, $v_backup_password, $v_backup_bpath]); $v_backup_adv = 'yes'; $v_backup_remote_adv = 'yes'; } @@ -310,19 +252,12 @@ if (!empty($_POST['save'])) { if (empty($_SESSION['error_msg'])) { if ((!empty($_POST['v_backup_host'])) && ($_POST['v_backup_type'] == $v_backup_type) && (!isset($v_backup_new))) { if (($_POST['v_backup_host'] != $v_backup_host) || ($_POST['v_backup_username'] != $v_backup_username) || ($_POST['v_backup_password'] || $v_backup_password) || ($_POST['v_backup_bpath'] == $v_backup_bpath)){ - $v_backup_host = escapeshellarg($_POST['v_backup_host']); - $v_backup_type = escapeshellarg($_POST['v_backup_type']); - $v_backup_username = escapeshellarg($_POST['v_backup_username']); - $v_backup_password = escapeshellarg($_POST['v_backup_password']); - $v_backup_bpath = escapeshellarg($_POST['v_backup_bpath']); - exec (VESTA_CMD."v-add-backup-host '". $v_backup_type ."' '". $v_backup_host ."' '". $v_backup_username ."' '". $v_backup_password ."' '". $v_backup_bpath ."'", $output, $return_var); - check_return_code($return_var,$output); - unset($output); - if (empty($_SESSION['error_msg'])) $v_backup_host = $_POST['v_backup_host']; - if (empty($_SESSION['error_msg'])) $v_backup_type = $_POST['v_backup_type']; - if (empty($_SESSION['error_msg'])) $v_backup_username = $_POST['v_backup_username']; - if (empty($_SESSION['error_msg'])) $v_backup_password = $_POST['v_backup_password']; - if (empty($_SESSION['error_msg'])) $v_backup_bpath = $_POST['v_backup_bpath']; + $v_backup_host = $_POST['v_backup_host']; + $v_backup_type = $_POST['v_backup_type']; + $v_backup_username = $_POST['v_backup_username']; + $v_backup_password = $_POST['v_backup_password']; + $v_backup_bpath = $_POST['v_backup_bpath']; + v_exec('v-add-backup-host', [$v_backup_type, $v_backup_host, $v_backup_username, $v_backup_password, $v_backup_bpath]); $v_backup_adv = 'yes'; $v_backup_remote_adv = 'yes'; } @@ -333,14 +268,14 @@ if (!empty($_POST['save'])) { // Delete remote backup host if (empty($_SESSION['error_msg'])) { if ((empty($_POST['v_backup_host'])) && (!empty($v_backup_host))) { - exec (VESTA_CMD."v-delete-backup-host '". $v_backup_type ."'", $output, $return_var); - check_return_code($return_var,$output); - unset($output); - if (empty($_SESSION['error_msg'])) $v_backup_host = ''; - if (empty($_SESSION['error_msg'])) $v_backup_type = ''; - if (empty($_SESSION['error_msg'])) $v_backup_username = ''; - if (empty($_SESSION['error_msg'])) $v_backup_password = ''; - if (empty($_SESSION['error_msg'])) $v_backup_bpath = ''; + v_exec('v-delete-backup-host', [$v_backup_type]); + if (empty($_SESSION['error_msg'])) { + $v_backup_host = ''; + $v_backup_type = ''; + $v_backup_username = ''; + $v_backup_password = ''; + $v_backup_bpath = ''; + } $v_backup_adv = ''; $v_backup_remote_adv = ''; } @@ -351,29 +286,25 @@ if (!empty($_POST['save'])) { $_SESSION['ok_msg'] = __('Changes has been saved.'); } - // activating sftp licence + // Activate sftp licence if (empty($_SESSION['error_msg'])) { - if($_SESSION['SFTPJAIL_KEY'] != $_POST['v_sftp_licence'] && $_POST['v_sftp'] == 'yes'){ + if ($_SESSION['SFTPJAIL_KEY'] != $_POST['v_sftp_licence'] && $_POST['v_sftp'] == 'yes') { $module = 'sftpjail'; - $licence_key = escapeshellarg($_POST['v_sftp_licence']); - exec (VESTA_CMD."v-activate-vesta-license ".$module." ".$licence_key, $output, $return_var); - check_return_code($return_var,$output); - unset($output); + $licence_key = $_POST['v_sftp_licence']; + v_exec('v-activate-vesta-license', [$module, $licence_key]); if (empty($_SESSION['error_msg'])) { $_SESSION['ok_msg'] = __('Licence Activated'); - $_SESSION['SFTPJAIL_KEY'] = $_POST['v_sftp_licence']; + $_SESSION['SFTPJAIL_KEY'] = $licence_key; } } } - // cancel sftp licence + // Cancel sftp licence if (empty($_SESSION['error_msg'])) { - if($_POST['v_sftp'] == 'cancel' && $_SESSION['SFTPJAIL_KEY']){ + if ($_POST['v_sftp'] == 'cancel' && $_SESSION['SFTPJAIL_KEY']) { $module = 'sftpjail'; - $licence_key = escapeshellarg($_SESSION['SFTPJAIL_KEY']); - exec (VESTA_CMD."v-deactivate-vesta-license ".$module." ".$licence_key, $output, $return_var); - check_return_code($return_var,$output); - unset($output); + $licence_key = $_SESSION['SFTPJAIL_KEY']; + v_exec('v-deactivate-vesta-license', [$module, $licence_key]); if (empty($_SESSION['error_msg'])) { $_SESSION['ok_msg'] = __('Licence Deactivated'); unset($_SESSION['SFTPJAIL_KEY']); @@ -382,29 +313,25 @@ if (!empty($_POST['save'])) { } - // activating filemanager licence + // Activate filemanager licence if (empty($_SESSION['error_msg'])) { - if($_SESSION['FILEMANAGER_KEY'] != $_POST['v_filemanager_licence'] && $_POST['v_filemanager'] == 'yes'){ + if ($_SESSION['FILEMANAGER_KEY'] != $_POST['v_filemanager_licence'] && $_POST['v_filemanager'] == 'yes') { $module = 'filemanager'; - $licence_key = escapeshellarg($_POST['v_filemanager_licence']); - exec (VESTA_CMD."v-activate-vesta-license ".$module." ".$licence_key, $output, $return_var); - check_return_code($return_var,$output); - unset($output); + $licence_key = $_POST['v_filemanager_licence']; + v_exec('v-activate-vesta-license', [$module, $licence_key]); if (empty($_SESSION['error_msg'])) { $_SESSION['ok_msg'] = __('Licence Activated'); - $_SESSION['FILEMANAGER_KEY'] = $_POST['v_filemanager_licence']; + $_SESSION['FILEMANAGER_KEY'] = $licence_key; } } } - // cancel filemanager licence + // Cancel filemanager licence if (empty($_SESSION['error_msg'])) { - if($_POST['v_filemanager'] == 'cancel' && $_SESSION['FILEMANAGER_KEY']){ + if ($_POST['v_filemanager'] == 'cancel' && $_SESSION['FILEMANAGER_KEY']) { $module = 'filemanager'; - $licence_key = escapeshellarg($_SESSION['FILEMANAGER_KEY']); - exec (VESTA_CMD."v-deactivate-vesta-license ".$module." ".$licence_key, $output, $return_var); - check_return_code($return_var,$output); - unset($output); + $licence_key = $_SESSION['FILEMANAGER_KEY']; + v_exec('v-deactivate-vesta-license', [$module, $licence_key]); if (empty($_SESSION['error_msg'])) { $_SESSION['ok_msg'] = __('Licence Deactivated'); unset($_SESSION['FILEMANAGER_KEY']); @@ -414,8 +341,8 @@ if (!empty($_POST['save'])) { } // Check system configuration -exec (VESTA_CMD . "v-list-sys-config json", $output, $return_var); -$data = json_decode(implode('', $output), true); +v_exec('v-list-sys-config', ['json'], false, $output); +$data = json_decode($output, true); $sys_arr = $data['config']; foreach ($sys_arr as $key => $value) { $_SESSION[$key] = $value; diff --git a/web/edit/user/index.php b/web/edit/user/index.php index c0ea9cd5c..9dd2784d6 100644 --- a/web/edit/user/index.php +++ b/web/edit/user/index.php @@ -16,21 +16,18 @@ if (empty($_GET['user'])) { // Edit as someone else? if (($_SESSION['user'] == 'admin') && (!empty($_GET['user']))) { - $user=$_GET['user']; - $v_username=$_GET['user']; + $user = $_GET['user']; } else { - $user=$_SESSION['user']; - $v_username=$_SESSION['user']; + $user = $_SESSION['user']; } +$v_username = $user; // List user -exec (VESTA_CMD."v-list-user ".escapeshellarg($v_username)." json", $output, $return_var); -check_return_code($return_var,$output); -$data = json_decode(implode('', $output), true); -unset($output); +v_exec('v-list-user', [$v_username, 'json'], true, $output); +$data = json_decode($output, true); // Parse user -$v_password = ""; +$v_password = ''; $v_email = $data[$v_username]['CONTACT']; $v_package = $data[$v_username]['PACKAGE']; $v_language = $data[$v_username]['LANGUAGE']; @@ -38,7 +35,7 @@ $v_fname = $data[$v_username]['FNAME']; $v_lname = $data[$v_username]['LNAME']; $v_shell = $data[$v_username]['SHELL']; $v_ns = $data[$v_username]['NS']; -$nameservers = explode(", ", $v_ns); +$nameservers = explode(', ', $v_ns); $v_ns1 = $nameservers[0]; $v_ns2 = $nameservers[1]; $v_ns3 = $nameservers[2]; @@ -58,29 +55,25 @@ $v_time = $data[$v_username]['TIME']; $v_date = $data[$v_username]['DATE']; // List packages -exec (VESTA_CMD."v-list-user-packages json", $output, $return_var); -$packages = json_decode(implode('', $output), true); -unset($output); +v_exec('v-list-user-packages', ['json'], false, $output); +$packages = json_decode($output, true); // List languages -exec (VESTA_CMD."v-list-sys-languages json", $output, $return_var); -$languages = json_decode(implode('', $output), true); -unset($output); +v_exec('v-list-sys-languages', ['json'], false, $output); +$languages = json_decode($output, true); // List shells -exec (VESTA_CMD."v-list-sys-shells json", $output, $return_var); -$shells = json_decode(implode('', $output), true); -unset($output); +v_exec('v-list-sys-shells', ['json'], false, $output); +$shells = json_decode($output, true); // Are you admin? // Check POST request if (!empty($_POST['save'])) { - // Check token if ((!isset($_POST['token'])) || ($_SESSION['token'] != $_POST['token'])) { header('location: /login/'); - exit(); + exit; } // Change password @@ -89,38 +82,34 @@ if (!empty($_POST['save'])) { $fp = fopen($v_password, "w"); fwrite($fp, $_POST['v_password']."\n"); fclose($fp); - exec (VESTA_CMD."v-change-user-password ".escapeshellarg($v_username)." ".$v_password, $output, $return_var); - check_return_code($return_var,$output); - unset($output); + v_exec('v-change-user-password', [$v_username, $v_password]); unlink($v_password); - $v_password = escapeshellarg($_POST['v_password']); + $v_password = $_POST['v_password']; } // Change package (admin only) if (($v_package != $_POST['v_package']) && ($_SESSION['user'] == 'admin') && (empty($_SESSION['error_msg']))) { - $v_package = escapeshellarg($_POST['v_package']); - exec (VESTA_CMD."v-change-user-package ".escapeshellarg($v_username)." ".$v_package, $output, $return_var); - check_return_code($return_var,$output); - unset($output); + $v_package = $_POST['v_package']; + v_exec('v-change-user-package', [$v_username, $v_package]); } // Change language if (($v_language != $_POST['v_language']) && (empty($_SESSION['error_msg']))) { - $v_language = escapeshellarg($_POST['v_language']); - exec (VESTA_CMD."v-change-user-language ".escapeshellarg($v_username)." ".$v_language, $output, $return_var); - check_return_code($return_var,$output); + $v_language = $_POST['v_language']; + v_exec('v-change-user-language', [$v_username, $v_language]); if (empty($_SESSION['error_msg'])) { - if ((empty($_GET['user'])) || ($_GET['user'] == $_SESSION['user'])) $_SESSION['language'] = $_POST['v_language']; + if ((empty($_GET['user'])) || ($_GET['user'] == $_SESSION['user'])) { + $_SESSION['language'] = $_POST['v_language']; + } } - unset($output); } // Change shell (admin only) - if (($v_shell != $_POST['v_shell']) && ($_SESSION['user'] == 'admin') && (empty($_SESSION['error_msg']))) { - $v_shell = escapeshellarg($_POST['v_shell']); - exec (VESTA_CMD."v-change-user-shell ".escapeshellarg($v_username)." ".$v_shell, $output, $return_var); - check_return_code($return_var,$output); - unset($output); + if ($_SESSION['user'] == 'admin') { + if (($v_shell != $_POST['v_shell']) && (empty($_SESSION['error_msg']))) { + $v_shell = $_POST['v_shell']; + v_exec('v-change-user-shell', [$v_username, $v_shell]); + } } // Change contact email @@ -128,54 +117,37 @@ if (!empty($_POST['save'])) { if (!filter_var($_POST['v_email'], FILTER_VALIDATE_EMAIL)) { $_SESSION['error_msg'] = __('Please enter valid email address.'); } else { - $v_email = escapeshellarg($_POST['v_email']); - exec (VESTA_CMD."v-change-user-contact ".escapeshellarg($v_username)." ".$v_email, $output, $return_var); - check_return_code($return_var,$output); - unset($output); + $v_email = $_POST['v_email']; + v_exec('v-change-user-contact', [$v_username, $v_email]); } } // Change full name - if (($v_fname != $_POST['v_fname']) || ($v_lname != $_POST['v_lname']) && (empty($_SESSION['error_msg']))) { - $v_fname = escapeshellarg($_POST['v_fname']); - $v_lname = escapeshellarg($_POST['v_lname']); - exec (VESTA_CMD."v-change-user-name ".escapeshellarg($v_username)." ".$v_fname." ".$v_lname, $output, $return_var); - check_return_code($return_var,$output); - unset($output); + if ((($v_fname != $_POST['v_fname']) || ($v_lname != $_POST['v_lname'])) && (empty($_SESSION['error_msg']))) { $v_fname = $_POST['v_fname']; $v_lname = $_POST['v_lname']; + v_exec('v-change-user-name', [$v_username, $v_fname, $v_lname]); } // Change NameServers - if (($v_ns1 != $_POST['v_ns1']) || ($v_ns2 != $_POST['v_ns2']) || ($v_ns3 != $_POST['v_ns3']) || ($v_ns4 != $_POST['v_ns4']) || ($v_ns5 != $_POST['v_ns5']) - || ($v_ns6 != $_POST['v_ns6']) || ($v_ns7 != $_POST['v_ns7']) || ($v_ns8 != $_POST['v_ns8']) && (empty($_SESSION['error_msg']))) { - $v_ns1 = escapeshellarg($_POST['v_ns1']); - $v_ns2 = escapeshellarg($_POST['v_ns2']); - $v_ns3 = escapeshellarg($_POST['v_ns3']); - $v_ns4 = escapeshellarg($_POST['v_ns4']); - $v_ns5 = escapeshellarg($_POST['v_ns5']); - $v_ns6 = escapeshellarg($_POST['v_ns6']); - $v_ns7 = escapeshellarg($_POST['v_ns7']); - $v_ns8 = escapeshellarg($_POST['v_ns8']); - $ns_cmd = VESTA_CMD."v-change-user-ns ".escapeshellarg($v_username)." ".$v_ns1." ".$v_ns2; - if (!empty($_POST['v_ns3'])) $ns_cmd = $ns_cmd." ".$v_ns3; - if (!empty($_POST['v_ns4'])) $ns_cmd = $ns_cmd." ".$v_ns4; - if (!empty($_POST['v_ns5'])) $ns_cmd = $ns_cmd." ".$v_ns5; - if (!empty($_POST['v_ns6'])) $ns_cmd = $ns_cmd." ".$v_ns6; - if (!empty($_POST['v_ns7'])) $ns_cmd = $ns_cmd." ".$v_ns7; - if (!empty($_POST['v_ns8'])) $ns_cmd = $ns_cmd." ".$v_ns8; - exec ($ns_cmd, $output, $return_var); - check_return_code($return_var,$output); - unset($output); - - $v_ns1 = str_replace("'","", $v_ns1); - $v_ns2 = str_replace("'","", $v_ns2); - $v_ns3 = str_replace("'","", $v_ns3); - $v_ns4 = str_replace("'","", $v_ns4); - $v_ns5 = str_replace("'","", $v_ns5); - $v_ns6 = str_replace("'","", $v_ns6); - $v_ns7 = str_replace("'","", $v_ns7); - $v_ns8 = str_replace("'","", $v_ns8); + if ((($v_ns1 != $_POST['v_ns1']) || ($v_ns2 != $_POST['v_ns2']) || ($v_ns3 != $_POST['v_ns3']) || ($v_ns4 != $_POST['v_ns4']) || ($v_ns5 != $_POST['v_ns5']) + || ($v_ns6 != $_POST['v_ns6']) || ($v_ns7 != $_POST['v_ns7']) || ($v_ns8 != $_POST['v_ns8'])) && (empty($_SESSION['error_msg']))) { + $v_ns1 = $_POST['v_ns1']; + $v_ns2 = $_POST['v_ns2']; + $v_ns3 = $_POST['v_ns3']; + $v_ns4 = $_POST['v_ns4']; + $v_ns5 = $_POST['v_ns5']; + $v_ns6 = $_POST['v_ns6']; + $v_ns7 = $_POST['v_ns7']; + $v_ns8 = $_POST['v_ns8']; + $ns_args = [$v_username, $v_ns1, $v_ns2]; + if (!empty($_POST['v_ns3'])) $ns_args[] = $v_ns3; + if (!empty($_POST['v_ns4'])) $ns_args[] = $v_ns4; + if (!empty($_POST['v_ns5'])) $ns_args[] = $v_ns5; + if (!empty($_POST['v_ns6'])) $ns_args[] = $v_ns6; + if (!empty($_POST['v_ns7'])) $ns_args[] = $v_ns7; + if (!empty($_POST['v_ns8'])) $ns_args[] = $v_ns8; + v_exec('v-change-user-ns', $ns_args); } // Set success message diff --git a/web/edit/web/index.php b/web/edit/web/index.php index e28aa713a..7fab12440 100644 --- a/web/edit/web/index.php +++ b/web/edit/web/index.php @@ -16,18 +16,17 @@ if (empty($_GET['domain'])) { // Edit as someone else? if (($_SESSION['user'] == 'admin') && (!empty($_GET['user']))) { - $user=escapeshellarg($_GET['user']); + $user = $_GET['user']; } -// List domain -$v_domain = escapeshellarg($_GET['domain']); -exec (VESTA_CMD."v-list-web-domain ".$user." ".$v_domain." json", $output, $return_var); -$data = json_decode(implode('', $output), true); -unset($output); - -// Parse domain $v_username = $user; $v_domain = $_GET['domain']; + +// List domain +v_exec('v-list-web-domain', [$user, $v_domain, 'json'], false, $output); +$data = json_decode($output, true); + +// Parse domain $v_ip = $data[$v_domain]['IP']; $v_template = $data[$v_domain]['TPL']; $v_aliases = str_replace(',', "\n", $data[$v_domain]['ALIAS']); @@ -36,10 +35,9 @@ $v_tpl = $data[$v_domain]['IP']; $v_cgi = $data[$v_domain]['CGI']; $v_elog = $data[$v_domain]['ELOG']; $v_ssl = $data[$v_domain]['SSL']; -if ( $v_ssl == 'yes' ) { - exec (VESTA_CMD."v-list-web-domain-ssl ".$user." '".$v_domain."' json", $output, $return_var); - $ssl_str = json_decode(implode('', $output), true); - unset($output); +if ($v_ssl == 'yes') { + v_exec('v-list-web-domain-ssl', [$user, $v_domain, 'json'], false, $output); + $ssl_str = json_decode($output, true); $v_ssl_crt = $ssl_str[$v_domain]['CRT']; $v_ssl_key = $ssl_str[$v_domain]['KEY']; $v_ssl_ca = $ssl_str[$v_domain]['CA']; @@ -51,10 +49,10 @@ $v_proxy_template = $data[$v_domain]['PROXY']; $v_proxy_ext = str_replace(',', ', ', $data[$v_domain]['PROXY_EXT']); $v_stats = $data[$v_domain]['STATS']; $v_stats_user = $data[$v_domain]['STATS_USER']; -if (!empty($v_stats_user)) $v_stats_password = ""; +if (!empty($v_stats_user)) $v_stats_password = ''; $v_ftp_user = $data[$v_domain]['FTP_USER']; $v_ftp_path = $data[$v_domain]['FTP_PATH']; -if (!empty($v_ftp_user)) $v_ftp_password = ""; +if (!empty($v_ftp_user)) $v_ftp_password = ''; $v_ftp_user_prepath = $data[$v_domain]['DOCUMENT_ROOT']; $v_ftp_user_prepath = str_replace('/public_html', '', $v_ftp_user_prepath, $occurance = 1); $v_ftp_email = $panel[$user]['CONTACT']; @@ -68,87 +66,78 @@ $v_time = $data[$v_domain]['TIME']; $v_date = $data[$v_domain]['DATE']; // List ip addresses -exec (VESTA_CMD."v-list-user-ips ".$user." json", $output, $return_var); -$ips = json_decode(implode('', $output), true); -unset($output); +v_exec('v-list-user-ips', [$user, 'json'], false, $output); +$ips = json_decode($output, true); // List web templates -exec (VESTA_CMD."v-list-web-templates json", $output, $return_var); -$templates = json_decode(implode('', $output), true); -unset($output); +v_exec('v-list-web-templates', ['json'], false, $output); +$templates = json_decode($output, true); // List backend templates if (!empty($_SESSION['WEB_BACKEND'])) { - exec (VESTA_CMD."v-list-web-templates-backend json", $output, $return_var); - $backend_templates = json_decode(implode('', $output), true); - unset($output); + v_exec('v-list-web-templates-backend', ['json'], false, $output); + $backend_templates = json_decode($output, true); } // List proxy templates if (!empty($_SESSION['PROXY_SYSTEM'])) { - exec (VESTA_CMD."v-list-web-templates-proxy json", $output, $return_var); - $proxy_templates = json_decode(implode('', $output), true); - unset($output); + v_exec('v-list-web-templates-proxy', ['json'], false, $output); + $proxy_templates = json_decode($output, true); } // List web stat engines -exec (VESTA_CMD."v-list-web-stats json", $output, $return_var); -$stats = json_decode(implode('', $output), true); -unset($output); +v_exec('v-list-web-stats', ['json'], false, $output); +$stats = json_decode($output, true); // Check POST request if (!empty($_POST['save'])) { - $v_domain = escapeshellarg($_POST['v_domain']); + $v_domain = $_POST['v_domain']; // Check token if ((!isset($_POST['token'])) || ($_SESSION['token'] != $_POST['token'])) { header('location: /login/'); - exit(); + exit; } - // Change web domain IP - if (($v_ip != $_POST['v_ip']) && (empty($_SESSION['error_msg']))) { - $v_ip = escapeshellarg($_POST['v_ip']); - exec (VESTA_CMD."v-change-web-domain-ip ".$v_username." ".$v_domain." ".$v_ip." 'no'", $output, $return_var); - check_return_code($return_var,$output); - $restart_web = 'yes'; - $restart_proxy = 'yes'; - unset($output); - } + // IP has been changed + if ($v_ip != $_POST['v_ip']) { + $v_ip = $_POST['v_ip']; - // Chane dns domain IP - if (($v_ip != $_POST['v_ip']) && (empty($_SESSION['error_msg']))) { - exec (VESTA_CMD."v-list-dns-domain ".$v_username." ".$v_domain." json", $output, $return_var); - unset($output); - if ($return_var == 0 ) { - exec (VESTA_CMD."v-change-dns-domain-ip ".$v_username." ".$v_domain." ".$v_ip." 'no'", $output, $return_var); - check_return_code($return_var,$output); - unset($output); - $restart_dns = 'yes'; + // Change web domain IP + if (empty($_SESSION['error_msg'])) { + v_exec('v-change-web-domain-ip', [$v_username, $v_domain, $v_ip, 'no']); + $restart_web = 'yes'; + $restart_proxy = 'yes'; } - } - // Change dns ip for each alias - if (($v_ip != $_POST['v_ip']) && (empty($_SESSION['error_msg']))) { - foreach($valiases as $v_alias ){ - exec (VESTA_CMD."v-list-dns-domain ".$v_username." '".$v_alias."' json", $output, $return_var); - unset($output); - if ($return_var == 0 ) { - exec (VESTA_CMD."v-change-dns-domain-ip ".$v_username." '".$v_alias."' ".$v_ip, $output, $return_var); - check_return_code($return_var,$output); - unset($output); + // Chane dns domain IP + if (empty($_SESSION['error_msg'])) { + $return_var = v_exec('v-list-dns-domain', [$v_username, $v_domain, 'json'], false); + if ($return_var == 0) { + v_exec('v-change-dns-domain-ip', [$v_username, $v_domain, $v_ip, 'no']); $restart_dns = 'yes'; } } + + // Change dns ip for each alias + if (empty($_SESSION['error_msg'])) { + foreach ($valiases as $v_alias) { + $return_var = v_exec('v-list-dns-domain', [$v_username, $v_alias, 'json'], false); + if ($return_var == 0) { + v_exe ('v-change-dns-domain-ip', [$v_username, $v_alias, $v_ip]); + $restart_dns = 'yes'; + } + } + } } // Change template (admin only) - if (($v_template != $_POST['v_template']) && ( $_SESSION['user'] == 'admin') && (empty($_SESSION['error_msg']))) { - $v_template = escapeshellarg($_POST['v_template']); - exec (VESTA_CMD."v-change-web-domain-tpl ".$v_username." ".$v_domain." ".$v_template." 'no'", $output, $return_var); - check_return_code($return_var,$output); - unset($output); - $restart_web = 'yes'; + if ($_SESSION['user'] == 'admin') { + if (($v_template != $_POST['v_template']) && (empty($_SESSION['error_msg']))) { + $v_template = $_POST['v_template']; + v_exec('v-change-web-domain-tpl', [$v_username, $v_domain, $v_template, 'no']); + $restart_web = 'yes'; + } } // Change aliases @@ -164,18 +153,12 @@ if (!empty($_POST['save'])) { if ((empty($_SESSION['error_msg'])) && (!empty($alias))) { $restart_web = 'yes'; $restart_proxy = 'yes'; - $v_template = escapeshellarg($_POST['v_template']); - exec (VESTA_CMD."v-delete-web-domain-alias ".$v_username." ".$v_domain." '".$alias."' 'no'", $output, $return_var); - check_return_code($return_var,$output); - unset($output); - + $v_template = $_POST['v_template']; + v_exec('v-delete-web-domain-alias', [$v_username, $v_domain, $alias, 'no']); if (empty($_SESSION['error_msg'])) { - exec (VESTA_CMD."v-list-dns-domain ".$v_username." ".$v_domain, $output, $return_var); - unset($output); + $return_var = v_exec('v-list-dns-domain', [$v_username, $v_domain], false); if ($return_var == 0) { - exec (VESTA_CMD."v-delete-dns-on-web-alias ".$v_username." ".$v_domain." '".$alias."' 'no'", $output, $return_var); - check_return_code($return_var,$output); - unset($output); + v_exec('v-delete-dns-on-web-alias', [$v_username, $v_domain, $alias, 'no']); $restart_dns = 'yes'; } } @@ -187,17 +170,12 @@ if (!empty($_POST['save'])) { if ((empty($_SESSION['error_msg'])) && (!empty($alias))) { $restart_web = 'yes'; $restart_proxy = 'yes'; - $v_template = escapeshellarg($_POST['v_template']); - exec (VESTA_CMD."v-add-web-domain-alias ".$v_username." ".$v_domain." ".escapeshellarg($alias)." 'no'", $output, $return_var); - check_return_code($return_var,$output); - unset($output); + $v_template = $_POST['v_template']; + v_exec('v-add-web-domain-alias', [$v_username, $v_domain, $alias, 'no']); if (empty($_SESSION['error_msg'])) { - exec (VESTA_CMD."v-list-dns-domain ".$v_username." ".$v_domain, $output, $return_var); - unset($output); + $return_var = v_exec('v-list-dns-domain', [$v_username, $v_domain], false); if ($return_var == 0) { - exec (VESTA_CMD."v-add-dns-on-web-alias ".$v_username." ".escapeshellarg($alias)." ".$v_ip." no", $output, $return_var); - check_return_code($return_var,$output); - unset($output); + v_exec('v-add-dns-on-web-alias', [$v_username, $alias, $v_ip, 'no']); $restart_dns = 'yes'; } } @@ -205,19 +183,17 @@ if (!empty($_POST['save'])) { } } - // Change backend template - if ((!empty($_SESSION['WEB_BACKEND'])) && ( $v_backend_template != $_POST['v_backend_template']) && ( $_SESSION['user'] == 'admin') && (empty($_SESSION['error_msg']))) { + // Change backend template (admin only) + if ($_SESSION['user'] == 'admin') { + if ((!empty($_SESSION['WEB_BACKEND'])) && ($v_backend_template != $_POST['v_backend_template']) && (empty($_SESSION['error_msg']))) { $v_backend_template = $_POST['v_backend_template']; - exec (VESTA_CMD."v-change-web-domain-backend-tpl ".$v_username." ".$v_domain." ".escapeshellarg($v_backend_template), $output, $return_var); - check_return_code($return_var,$output); - unset($output); + v_exec('v-change-web-domain-backend-tpl', [$v_username, $v_domain, $v_backend_template]); + } } // Delete proxy support if ((!empty($_SESSION['PROXY_SYSTEM'])) && (!empty($v_proxy)) && (empty($_POST['v_proxy'])) && (empty($_SESSION['error_msg']))) { - exec (VESTA_CMD."v-delete-web-domain-proxy ".$v_username." ".$v_domain." 'no'", $output, $return_var); - check_return_code($return_var,$output); - unset($output); + v_exec('v-delete-web-domain-proxy', [$v_username, $v_domain, 'no']); unset($v_proxy); $restart_proxy = 'yes'; } @@ -229,13 +205,11 @@ if (!empty($_POST['save'])) { $ext = preg_replace('/\s+/', ' ',$ext); $ext = trim($ext); $ext = str_replace(' ', ", ", $ext); - if (( $v_proxy_template != $_POST['v_proxy_template']) || ($v_proxy_ext != $ext)) { + if (($v_proxy_template != $_POST['v_proxy_template']) || ($v_proxy_ext != $ext)) { $ext = str_replace(', ', ",", $ext); if (!empty($_POST['v_proxy_template'])) $v_proxy_template = $_POST['v_proxy_template']; - exec (VESTA_CMD."v-change-web-domain-proxy-tpl ".$v_username." ".$v_domain." ".escapeshellarg($v_proxy_template)." ".escapeshellarg($ext)." 'no'", $output, $return_var); - check_return_code($return_var,$output); + v_exec('v-change-web-domain-proxy-tpl', [$v_username, $v_domain, $v_proxy_template, $ext, 'no']); $v_proxy_ext = str_replace(',', ', ', $ext); - unset($output); $restart_proxy = 'yes'; } } @@ -251,17 +225,13 @@ if (!empty($_POST['save'])) { $ext = str_replace(' ', ",", $ext); $v_proxy_ext = str_replace(',', ', ', $ext); } - exec (VESTA_CMD."v-add-web-domain-proxy ".$v_username." ".$v_domain." ".escapeshellarg($v_proxy_template)." ".escapeshellarg($ext)." 'no'", $output, $return_var); - check_return_code($return_var,$output); - unset($output); + v_exec('v-add-web-domain-proxy', [$v_username, $v_domain, $v_proxy_template, $ext, 'no']); $restart_proxy = 'yes'; } // Delete SSL certificate - if (( $v_ssl == 'yes' ) && (empty($_POST['v_ssl'])) && (empty($_SESSION['error_msg']))) { - exec (VESTA_CMD."v-delete-web-domain-ssl ".$v_username." ".$v_domain." 'no'", $output, $return_var); - check_return_code($return_var,$output); - unset($output); + if (($v_ssl == 'yes') && (empty($_POST['v_ssl'])) && (empty($_SESSION['error_msg']))) { + v_exec('v-delete-web-domain-ssl', [$v_username, $v_domain, 'no']); $v_ssl = 'no'; $restart_web = 'yes'; $restart_proxy = 'yes'; @@ -297,9 +267,7 @@ if (!empty($_POST['save'])) { fclose($fp); } - exec (VESTA_CMD."v-change-web-domain-sslcert ".$user." ".$v_domain." ".$tmpdir." 'no'", $output, $return_var); - check_return_code($return_var,$output); - unset($output); + v_exec('v-change-web-domain-sslcert', [$user, $v_domain, $tmpdir, 'no']); $restart_web = 'yes'; $restart_proxy = 'yes'; $v_ssl_crt = $_POST['v_ssl_crt']; @@ -328,7 +296,6 @@ if (!empty($_POST['save'])) { if ((!empty($_POST['v_ssl'])) && (empty($_POST['v_ssl_crt']))) $errors[] = 'ssl certificate'; if ((!empty($_POST['v_ssl'])) && (empty($_POST['v_ssl_key']))) $errors[] = 'ssl key'; if ((!empty($_POST['v_ssl'])) && (empty($_POST['v_ssl_home']))) $errors[] = 'ssl home'; - $v_ssl_home = escapeshellarg($_POST['v_ssl_home']); if (!empty($errors[0])) { foreach ($errors as $i => $error) { if ( $i == 0 ) { @@ -337,41 +304,41 @@ if (!empty($_POST['save'])) { $error_msg = $error_msg.", ".$error; } } - $_SESSION['error_msg'] = __('Field "%s" can not be blank.',$error_msg); + $_SESSION['error_msg'] = __('Field "%s" can not be blank.', $error_msg); } else { - exec ('mktemp -d', $mktemp_output, $return_var); + $v_ssl_home = $_POST['v_ssl_home']; + $v_ssl_crt = str_replace("\r\n", "\n", $_POST['v_ssl_crt']); + $v_ssl_key = str_replace("\r\n", "\n", $_POST['v_ssl_key']); + $v_ssl_ca = str_replace("\r\n", "\n", $_POST['v_ssl_ca']); + + exec('mktemp -d', $mktemp_output, $return_var); $tmpdir = $mktemp_output[0]; // Certificate if (!empty($_POST['v_ssl_crt'])) { $fp = fopen($tmpdir."/".$_POST['v_domain'].".crt", 'w'); - fwrite($fp, str_replace("\r\n", "\n", $_POST['v_ssl_crt'])); + fwrite($fp, $v_ssl_crt); fclose($fp); } // Key if (!empty($_POST['v_ssl_key'])) { $fp = fopen($tmpdir."/".$_POST['v_domain'].".key", 'w'); - fwrite($fp, str_replace("\r\n", "\n", $_POST['v_ssl_key'])); + fwrite($fp, $v_ssl_key); fclose($fp); } // CA if (!empty($_POST['v_ssl_ca'])) { $fp = fopen($tmpdir."/".$_POST['v_domain'].".ca", 'w'); - fwrite($fp, str_replace("\r\n", "\n", $_POST['v_ssl_ca'])); + fwrite($fp, $v_ssl_ca); fclose($fp); } - exec (VESTA_CMD."v-add-web-domain-ssl ".$user." ".$v_domain." ".$tmpdir." ".$v_ssl_home." 'no'", $output, $return_var); - check_return_code($return_var,$output); - unset($output); + + v_exec('v-add-web-domain-ssl', [$user, $v_domain, $tmpdir, $v_ssl_home, 'no']); $v_ssl = 'yes'; $restart_web = 'yes'; $restart_proxy = 'yes'; - $v_ssl_crt = $_POST['v_ssl_crt']; - $v_ssl_key = $_POST['v_ssl_key']; - $v_ssl_ca = $_POST['v_ssl_ca']; - $v_ssl_home = $_POST['v_ssl_home']; // Cleanup certificate tempfiles if (!empty($_POST['v_ssl_crt'])) { @@ -391,47 +358,36 @@ if (!empty($_POST['save'])) { } // Change document root for ssl domain - if (( $v_ssl == 'yes') && (!empty($_POST['v_ssl'])) && (empty($_SESSION['error_msg']))) { - if ( $v_ssl_home != $_POST['v_ssl_home'] ) { - $v_ssl_home = escapeshellarg($_POST['v_ssl_home']); - exec (VESTA_CMD."v-change-web-domain-sslhome ".$user." ".$v_domain." ".$v_ssl_home." 'no'", $output, $return_var); - check_return_code($return_var,$output); + if (($v_ssl == 'yes') && (!empty($_POST['v_ssl'])) && (empty($_SESSION['error_msg']))) { + if ($v_ssl_home != $_POST['v_ssl_home']) { $v_ssl_home = $_POST['v_ssl_home']; - unset($output); + v_exec('v-change-web-domain-sslhome', [$user, $v_domain, $v_ssl_home, 'no']); } } // Delete web stats if ((!empty($v_stats)) && ($_POST['v_stats'] == 'none') && (empty($_SESSION['error_msg']))) { - exec (VESTA_CMD."v-delete-web-domain-stats ".$v_username." ".$v_domain, $output, $return_var); - check_return_code($return_var,$output); - unset($output); $v_stats = ''; + v_exec('v-delete-web-domain-stats', [$v_username, $v_domain]); } // Change web stats engine if ((!empty($v_stats)) && ($_POST['v_stats'] != $v_stats) && (empty($_SESSION['error_msg']))) { - $v_stats = escapeshellarg($_POST['v_stats']); - exec (VESTA_CMD."v-change-web-domain-stats ".$v_username." ".$v_domain." ".$v_stats, $output, $return_var); - check_return_code($return_var,$output); - unset($output); + $v_stats = $_POST['v_stats']; + v_exec('v-change-web-domain-stats', [$v_username, $v_domain, $v_stats]); } // Add web stats if ((empty($v_stats)) && ($_POST['v_stats'] != 'none') && (empty($_SESSION['error_msg']))) { - $v_stats = escapeshellarg($_POST['v_stats']); - exec (VESTA_CMD."v-add-web-domain-stats ".$v_username." ".$v_domain." ".$v_stats, $output, $return_var); - check_return_code($return_var,$output); - unset($output); + $v_stats = $_POST['v_stats']; + v_exec('v-add-web-domain-stats', [$v_username, $v_domain, $v_stats]); } // Delete web stats authorization if ((!empty($v_stats_user)) && (empty($_POST['v_stats_auth'])) && (empty($_SESSION['error_msg']))) { - exec (VESTA_CMD."v-delete-web-domain-stats-user ".$v_username." ".$v_domain, $output, $return_var); - check_return_code($return_var,$output); - unset($output); $v_stats_user = ''; $v_stats_password = ''; + v_exec('v-delete-web-domain-stats-user', [$v_username, $v_domain]); } // Change web stats user or password @@ -447,16 +403,14 @@ if (!empty($_POST['save'])) { } $_SESSION['error_msg'] = __('Field "%s" can not be blank.',$error_msg); } else { - $v_stats_user = escapeshellarg($_POST['v_stats_user']); + $v_stats_user = $_POST['v_stats_user']; $v_stats_password = tempnam("/tmp","vst"); $fp = fopen($v_stats_password, "w"); fwrite($fp, $_POST['v_stats_password']."\n"); fclose($fp); - exec (VESTA_CMD."v-add-web-domain-stats-user ".$v_username." ".$v_domain." ".$v_stats_user." ".$v_stats_password, $output, $return_var); - check_return_code($return_var,$output); - unset($output); + v_exec('v-add-web-domain-stats-user', [$v_username, $v_domain, $v_stats_user, $v_stats_password]); unlink($v_stats_password); - $v_stats_password = escapeshellarg($_POST['v_stats_password']); + $v_stats_password = $_POST['v_stats_password']; } } @@ -474,16 +428,14 @@ if (!empty($_POST['save'])) { $_SESSION['error_msg'] = __('Field "%s" can not be blank.',$error_msg); } if (($v_stats_user != $_POST['v_stats_user']) || (!empty($_POST['v_stats_password'])) && (empty($_SESSION['error_msg']))) { - $v_stats_user = escapeshellarg($_POST['v_stats_user']); + $v_stats_user = $_POST['v_stats_user']; $v_stats_password = tempnam("/tmp","vst"); $fp = fopen($v_stats_password, "w"); fwrite($fp, $_POST['v_stats_password']."\n"); fclose($fp); - exec (VESTA_CMD."v-add-web-domain-stats-user ".$v_username." ".$v_domain." ".$v_stats_user." ".$v_stats_password, $output, $return_var); - check_return_code($return_var,$output); - unset($output); + v_exec('v-add-web-domain-stats-user', [$v_username, $v_domain, $v_stats_user, $v_stats_password]); unlink($v_stats_password); - $v_stats_password = escapeshellarg($_POST['v_stats_password']); + $v_stats_password = $_POST['v_stats_password']; } } @@ -513,15 +465,13 @@ if (!empty($_POST['save'])) { // Add ftp account $v_ftp_username = $v_ftp_user_data['v_ftp_user']; $v_ftp_username_full = $user . '_' . $v_ftp_user_data['v_ftp_user']; - $v_ftp_user = escapeshellarg($v_ftp_username); - $v_ftp_path = escapeshellarg(trim($v_ftp_user_data['v_ftp_path'])); + $v_ftp_path = trim($v_ftp_user_data['v_ftp_path']); if (empty($_SESSION['error_msg'])) { $v_ftp_password = tempnam("/tmp","vst"); $fp = fopen($v_ftp_password, "w"); fwrite($fp, $v_ftp_user_data['v_ftp_password']."\n"); fclose($fp); - exec (VESTA_CMD."v-add-web-domain-ftp ".$v_username." ".$v_domain." ".$v_ftp_user." ".$v_ftp_password . " " . $v_ftp_path, $output, $return_var); - check_return_code($return_var,$output); + v_exec('v-add-web-domain-ftp', [$v_username, $v_domain, $v_ftp_username, $v_ftp_password, $v_ftp_path]); if ((!empty($v_ftp_user_data['v_ftp_email'])) && (empty($_SESSION['error_msg']))) { $to = $v_ftp_user_data['v_ftp_email']; $subject = __("FTP login credentials"); @@ -531,16 +481,14 @@ if (!empty($_POST['save'])) { send_email($to, $subject, $mailtext, $from); unset($v_ftp_email); } - unset($output); unlink($v_ftp_password); - $v_ftp_password = escapeshellarg($v_ftp_user_data['v_ftp_password']); + $v_ftp_password = $v_ftp_user_data['v_ftp_password']; } if ($return_var == 0) { - $v_ftp_password = ""; + $v_ftp_password = ''; $v_ftp_user_data['is_new'] = 0; - } - else { + } else { $v_ftp_user_data['is_new'] = 1; } @@ -559,10 +507,7 @@ if (!empty($_POST['save'])) { // Delete FTP account if ($v_ftp_user_data['delete'] == 1) { $v_ftp_username = $user . '_' . $v_ftp_user_data['v_ftp_user']; - exec (VESTA_CMD."v-delete-web-domain-ftp ".$v_username." ".$v_domain." ".$v_ftp_username, $output, $return_var); - check_return_code($return_var,$output); - unset($output); - + v_exec('v-delete-web-domain-ftp', [$v_username, $v_domain, $v_ftp_username]); continue; } @@ -581,10 +526,9 @@ if (!empty($_POST['save'])) { // Change FTP account path $v_ftp_username = $user . '_' . $v_ftp_user_data['v_ftp_user']; //preg_replace("/^".$user."_/", "", $v_ftp_user_data['v_ftp_user']); - $v_ftp_username = escapeshellarg($v_ftp_username); //if (!empty($v_ftp_user_data['v_ftp_path'])) { - $v_ftp_path = escapeshellarg(trim($v_ftp_user_data['v_ftp_path'])); - exec (VESTA_CMD."v-change-web-domain-ftp-path ".$v_username." ".$v_domain." ".$v_ftp_username." ".$v_ftp_path, $output, $return_var); + $v_ftp_path = trim($v_ftp_user_data['v_ftp_path']); + v_exec('v-change-web-domain-ftp-path', [$v_username, $v_domain, $v_ftp_username, $v_ftp_path]); //} // Change FTP account password @@ -593,7 +537,7 @@ if (!empty($_POST['save'])) { $fp = fopen($v_ftp_password, "w"); fwrite($fp, $v_ftp_user_data['v_ftp_password']."\n"); fclose($fp); - exec (VESTA_CMD."v-change-web-domain-ftp-password ".$v_username." ".$v_domain." ".$v_ftp_username." ".$v_ftp_password, $output, $return_var); + v_exec('v-change-web-domain-ftp-password', [$v_username, $v_domain, $v_ftp_username, $v_ftp_password]); unlink($v_ftp_password); $to = $v_ftp_user_data['v_ftp_email']; @@ -604,8 +548,6 @@ if (!empty($_POST['save'])) { send_email($to, $subject, $mailtext, $from); unset($v_ftp_email); } - check_return_code($return_var, $output); - unset($output); $v_ftp_users_updated[] = array( 'is_new' => 0, @@ -621,23 +563,17 @@ if (!empty($_POST['save'])) { // Restart web server if (!empty($restart_web) && (empty($_SESSION['error_msg']))) { - exec (VESTA_CMD."v-restart-web", $output, $return_var); - check_return_code($return_var,$output); - unset($output); + v_exec('v-restart-web'); } // Restart proxy server if ((!empty($_SESSION['PROXY_SYSTEM'])) && !empty($restart_proxy) && (empty($_SESSION['error_msg']))) { - exec (VESTA_CMD."v-restart-proxy", $output, $return_var); - check_return_code($return_var,$output); - unset($output); + v_exec('v-restart-proxy'); } // Restart dns server if (!empty($restart_dns) && (empty($_SESSION['error_msg']))) { - exec (VESTA_CMD."v-restart-dns", $output, $return_var); - check_return_code($return_var,$output); - unset($output); + v_exec('v-restart-dns'); } // Set success message diff --git a/web/file_manager/fm_api.php b/web/file_manager/fm_api.php index f4629794f..8d7837ffb 100644 --- a/web/file_manager/fm_api.php +++ b/web/file_manager/fm_api.php @@ -10,13 +10,12 @@ include($_SERVER['DOCUMENT_ROOT']."/file_manager/fm_core.php"); // todo: set in session? if (empty($panel)) { - $command = VESTA_CMD."v-list-user '".$user."' 'json'"; - exec ($command, $output, $return_var); - if ( $return_var > 0 ) { + $return_var = v_exec('v-list-user', [$user, 'json'], false, $output); + if ($return_var > 0) { header("Location: /error/"); exit; } - $panel = json_decode(implode('', $output), true); + $panel = json_decode($output, true); } $fm = new FileManager($user); @@ -31,27 +30,23 @@ switch ($_REQUEST['action']) { break; case 'check_file_type': $dir = $_REQUEST['dir']; - print json_encode($fm->checkFileType($dir)); break; case 'rename_file': $dir = $_REQUEST['dir']; $item = $_REQUEST['item']; $target_name = $_REQUEST['target_name']; - print json_encode($fm->renameFile($dir, $item, $target_name)); break; case 'rename_directory': $dir = $_REQUEST['dir']; $item = $_REQUEST['item']; $target_name = $_REQUEST['target_name']; - print json_encode($fm->renameDirectory($dir, $item, $target_name)); break; case 'delete_files': $dir = $_REQUEST['dir']; $item = $_REQUEST['item']; - print json_encode($fm->deleteItem($dir, $item)); break; case 'create_file': @@ -64,7 +59,6 @@ switch ($_REQUEST['action']) { $dirname = $_REQUEST['dirname']; print json_encode($fm->createDir($dir, $dirname)); break; - case 'open_file': $dir = $_REQUEST['dir']; print json_encode($fm->open_file($dir)); diff --git a/web/file_manager/fm_core.php b/web/file_manager/fm_core.php index 724368989..fc0660d27 100644 --- a/web/file_manager/fm_core.php +++ b/web/file_manager/fm_core.php @@ -1,7 +1,9 @@ 0, @@ -13,26 +15,45 @@ class FileManager { 'SIZE' => 6, 'NAME' => 7 ); - + protected $user = null; public $ROOT_DIR = null; - + + + static function v_exec($command, array $arguments=[], $checkReturn=true, &$output=null) { + $output = ''; + $return_var = v_exec($command, $arguments, false, $output); + return $checkReturn ? self::check_return_code($return_var, explode("\n", $output)) : null; + } + + static function check_return_code($return_var, $output) { + if ($return_var != 0) { + $error = implode('
                ', $output); + return $error; + //if (empty($error)) $error = __('Error code:',$return_var); + //$_SESSION['error_msg'] = $error; + } + + return null; + } + + public function setRootDir($root = null) { if (null != $root) { - $root = realpath($root); + $root = realpath($root); } $this->ROOT_DIR = $root; } - + public function __construct($user) { $this->user = $user; } - + /*public function init() { $path = !empty($_REQUEST['dir']) ? $_REQUEST['dir'] : ''; $start_url = !empty($path) ? $this->ROOT_DIR . '/' . $path : $this->ROOT_DIR; $listing = $this->getDirectoryListing($path); - + return $data = array( 'result' => true, 'ROOT_DIR' => $this->ROOT_DIR, @@ -41,55 +62,52 @@ class FileManager { 'listing' => $listing ); }*/ - + public function checkFileType($dir) { $dir = $this->formatFullPath($dir); - exec(VESTA_CMD . "v-get-fs-file-type {$this->user} {$dir}", $output, $return_var); - $error = self::check_return_code($return_var, $output); + + $error = self::v_exec('v-get-fs-file-type', [$this->user, $dir]); + if (empty($error)) { return array( 'result' => true, 'data' => implode('', $output) ); - } - else { + } else { return array( 'result' => false, 'message' => $error ); } } - + public function formatFullPath($path_part = '') { if (substr($path_part, 0, strlen($this->ROOT_DIR)) === $this->ROOT_DIR) { $path = $path_part; - } - else { + } else { $path = $this->ROOT_DIR . '/' . $path_part; } //var_dump($path);die(); //$path = str_replace(' ', '\ ', $path); - return escapeshellarg($path); + return $path; } - + function deleteItem($dir, $item) { $dir = $this->formatFullPath($item); - exec (VESTA_CMD . "v-delete-fs-directory {$this->user} {$dir}", $output, $return_var); - $error = self::check_return_code($return_var, $output); - + $error = self::v_exec('v-delete-fs-directory', [$this->user, $dir]); + if (empty($error)) { return array( 'result' => true ); - } - else { + } else { return array( 'result' => false, 'message' => $error ); } - + /*if (is_readable($item)) { unlink($item); } @@ -103,100 +121,76 @@ class FileManager { 'result' => true );*/ } - + function copyFile($item, $dir, $target_dir, $filename) { $src = $this->formatFullPath($item); $dst = $this->formatFullPath($target_dir); - - exec (VESTA_CMD . "v-copy-fs-file {$this->user} {$src} {$dst}", $output, $return_var); - $error = self::check_return_code($return_var, $output); - + $error = self::v_exec('v-copy-fs-file', [$this->user, $src, $dst]); + if (empty($error)) { return array( 'result' => true ); - } - else { + } else { return array( 'result' => false, 'message' => $error ); } } - - + + function copyDirectory($item, $dir, $target_dir, $filename) { $src = $this->formatFullPath($item); $dst = $this->formatFullPath($target_dir); - - exec (VESTA_CMD . "v-copy-fs-directory {$this->user} {$src} {$dst}", $output, $return_var); + $error = self::v_exec('v-copy-fs-directory', [$this->user, $src, $dst]); - $error = self::check_return_code($return_var, $output); - if (empty($error)) { return array( 'result' => true ); - } - else { + } else { return array( 'result' => false, 'message' => $error ); } } - - static function check_return_code($return_var, $output) { - if ($return_var != 0) { - $error = implode('
                ', $output); - return $error; - //if (empty($error)) $error = __('Error code:',$return_var); - //$_SESSION['error_msg'] = $error; - } - - return null; - } - + function createFile($dir, $filename) { $dir = $this->formatFullPath($dir . '/' . $filename); - exec (VESTA_CMD . "v-add-fs-file {$this->user} {$dir}", $output, $return_var); + $error = self::v_exec('v-add-fs-file', [$this->user, $dir]); - $error = self::check_return_code($return_var, $output); - if (empty($error)) { return array( 'result' => true ); - } - else { + } else { return array( 'result' => false, 'message' => $error ); } } - + function packItem($item, $dir, $target_dir, $filename) { $item = $this->formatFullPath($item); $dst_item = $this->formatFullPath($target_dir); - $dst_item = str_replace('.tar.gz', '', $dst_item); - + //$item = str_replace($dir . '/', '', $item); //var_dump(VESTA_CMD . "v-add-fs-archive {$this->user} {$dst_item} {$item}");die(); - exec (VESTA_CMD . "v-add-fs-archive {$this->user} {$dst_item} {$item}", $output, $return_var); - $error = self::check_return_code($return_var, $output); - + $error = self::v_exec('v-add-fs-archive', [$this->user, $dst_item, $item]); + if (empty($error)) { return array( 'result' => true ); - } - else { + } else { return array( 'result' => false, 'message' => $error @@ -205,83 +199,58 @@ class FileManager { } function backupItem($item) { - $src_item = $this->formatFullPath($item); - $dst_item_name = $item . '~' . date('Ymd_His'); - $dst_item = $this->formatFullPath($dst_item_name); //print VESTA_CMD . "v-add-fs-archive {$this->user} {$item} {$dst_item}";die(); - exec (VESTA_CMD . "v-copy-fs-file {$this->user} {$src_item} {$dst_item}", $output, $return_var); - $error = self::check_return_code($return_var, $output); - + $error = self::v_exec('v-copy-fs-file', [$this->user, $src_item, $dst_item]); + if (empty($error)) { return array( 'result' => true, 'filename' => $dst_item_name ); - } - else { - return array( - 'result' => false, - 'message' => $error - ); - } - - $error = self::check_return_code($return_var, $output); - - if (empty($error)) { - return array( - 'result' => true - ); - } - else { + } else { return array( 'result' => false, 'message' => $error ); } } - + function unpackItem($item, $dir, $target_dir, $filename) { $item = $this->formatFullPath($item); $dst_item = $this->formatFullPath($target_dir); - exec (VESTA_CMD . "v-extract-fs-archive {$this->user} {$item} {$dst_item}", $output, $return_var); + $error = self::v_exec('v-extract-fs-archive', [$this->user, $item, $dst_item]); - $error = self::check_return_code($return_var, $output); - if (empty($error)) { return array( 'result' => true ); - } - else { + } else { return array( 'result' => false, 'message' => $error ); } } - + function renameFile($dir, $item, $target_name) { $item = $this->formatFullPath($dir . '/' . $item); $dst_item = $this->formatFullPath($dir . '/' . $target_name); - -// var_dump(VESTA_CMD . "v-move-fs-file {$this->user} {$item} {$dst_item}");die(); - exec (VESTA_CMD . "v-move-fs-file {$this->user} {$item} {$dst_item}", $output, $return_var); +//var_dump(VESTA_CMD . "v-move-fs-file {$this->user} {$item} {$dst_item}");die(); + + $error = self::v_exec('v-move-fs-file', [$this->user, $item, $dst_item]); - $error = self::check_return_code($return_var, $output); - if (empty($error)) { return array( 'result' => true ); - } - else { + } else { return array( 'result' => false, 'message' => $error @@ -298,51 +267,43 @@ class FileManager { ); } + $error = self::v_exec('v-move-fs-directory', [$this->user, $item, $dst_item]); - exec (VESTA_CMD . "v-move-fs-directory {$this->user} {$item} {$dst_item}", $output, $return_var); - - $error = self::check_return_code($return_var, $output); - if (empty($error)) { return array( 'result' => true ); - } - else { + } else { return array( 'result' => false, 'message' => $error ); } } - + function createDir($dir, $dirname) { $dir = $this->formatFullPath($dir . '/' . $dirname); - exec (VESTA_CMD . "v-add-fs-directory {$this->user} {$dir}", $output, $return_var); + $error = self::v_exec('v-add-fs-directory', [$this->user, $dir]); - $error = self::check_return_code($return_var, $output); - if (empty($error)) { return array( 'result' => true ); - } - else { + } else { return array( 'result' => false, 'message' => $error ); } } - + function getDirectoryListing($dir = '') { $dir = $this->formatFullPath($dir); - exec (VESTA_CMD . "v-list-fs-directory {$this->user} {$dir}", $output, $return_var); - - return $this->parseListing($output); + self::v_exec('v-list-fs-directory', [$this->user, $dir], false, $output); + return $this->parseListing(explode("\n", $output)); } - + public function ls($dir = '') { $listing = $this->getDirectoryListing($dir); @@ -351,7 +312,7 @@ class FileManager { 'listing' => $listing ); } - + public function open_file($dir = '') { $listing = $this->getDirectoryListing($dir); @@ -360,7 +321,7 @@ class FileManager { 'listing' => $listing ); } - + public function parseListing($raw) { $data = array(); foreach ($raw as $o) { @@ -376,7 +337,7 @@ class FileManager { 'name' => $info[$this->info_positions['NAME']] ); } - + return $data; } diff --git a/web/generate/ssl/index.php b/web/generate/ssl/index.php index 5ccc2f295..3439f71f4 100644 --- a/web/generate/ssl/index.php +++ b/web/generate/ssl/index.php @@ -31,7 +31,7 @@ $_SESSION['back'] = ''; if (!isset($_POST['generate'])) { include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/generate_ssl.html'); include($_SERVER['DOCUMENT_ROOT'].'/templates/footer.html'); - exit(); + exit; } // Check input @@ -41,6 +41,7 @@ if (empty($_POST['v_state'])) $errors[] = __('domain'); if (empty($_POST['v_locality'])) $errors[] = __('city'); if (empty($_POST['v_org'])) $errors[] = __('organization'); if (empty($_POST['v_email'])) $errors[] = __('email'); + $v_domain = $_POST['v_domain']; $v_email = $_POST['v_email']; $v_country = $_POST['v_country']; @@ -61,44 +62,24 @@ if (!empty($errors[0])) { include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/generate_ssl.html'); include($_SERVER['DOCUMENT_ROOT'].'/templates/footer.html'); unset($_SESSION['error_msg']); - exit(); + exit; } -// Protect input -$v_domain = escapeshellarg($_POST['v_domain']); -$v_email = escapeshellarg($_POST['v_email']); -$v_country = escapeshellarg($_POST['v_country']); -$v_state = escapeshellarg($_POST['v_state']); -$v_locality = escapeshellarg($_POST['v_locality']); -$v_org = escapeshellarg($_POST['v_org']); - -exec (VESTA_CMD."v-generate-ssl-cert ".$v_domain." ".$v_email." ".$v_country." ".$v_state." ".$v_locality." ".$v_org." IT json", $output, $return_var); - -// Revert to raw values -$v_domain = $_POST['v_domain']; -$v_email = $_POST['v_email']; -$v_country = $_POST['v_country']; -$v_state = $_POST['v_state']; -$v_locality = $_POST['v_locality']; -$v_org = $_POST['v_org']; +$return_var = v_exec('v-generate-ssl-cert', [$v_domain, $v_email, $v_country, $v_state, $v_locality, $v_org, 'IT', 'json'], true, $output); // Check return code if ($return_var != 0) { - $error = implode('
                ', $output); - if (empty($error)) $error = __('Error code:',$return_var); - $_SESSION['error_msg'] = $error; include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/generate_ssl.html'); include($_SERVER['DOCUMENT_ROOT'].'/templates/footer.html'); unset($_SESSION['error_msg']); - exit(); + exit; } // OK message $_SESSION['ok_msg'] = __('SSL_GENERATED_OK'); // Parse output -$data = json_decode(implode('', $output), true); -unset($output); +$data = json_decode($output, true); $v_crt = $data[$v_domain]['CRT']; $v_key = $data[$v_domain]['KEY']; $v_csr = $data[$v_domain]['CSR']; diff --git a/web/inc/exec.php b/web/inc/exec.php new file mode 100644 index 000000000..0c2d9618a --- /dev/null +++ b/web/inc/exec.php @@ -0,0 +1,85 @@ + 0) { + header('Location: /error/'); + exit; + } +} + +function check_return_code($return_var, $output) { + if ($return_var != 0) { + $error = implode('
                ', $output); + if (empty($error)) $error = __('Error code:', $return_var); + $_SESSION['error_msg'] = $error; + } +} + +/** + * Build shell command arguments from a string array. + * @param string[] $arguments Unescaped command line arguments. (eg. ['-a', "b'c"], default: []) + * @return string Escaped arguments. + */ +function build_shell_args($arguments=[]) { + $ret = []; + // Convert $arguments to an array + if (!is_array($arguments)) $arguments = !is_null($arguments) ? [$arguments] : []; + foreach ($arguments as $arg) { + // Convert $arg to a string if $arg is an array (for an argument like this: ?abc[def]=ghi) + if (is_array($arg)) $arg = implode('', $arg); + // Convert $arg to a string (just in case) + if (!is_string($arg)) $arg = (string)$arg; + // Append the argument + $ret[] = escapeshellarg($arg); + } + return implode(' ', $ret); +} + +/** + * Execute a command. + * @param string $command Command to execute. (eg. ls) + * @param string[] $arguments (optional) Unescaped command line arguments. (eg. ['-a', '/'], default: []) + * @param string &$output (optional) Variable to contain output from the command. + * @return int Exit code (return status) of the executed command. + */ +function safe_exec($command, $arguments=[], &$output=null) { + $cmd = build_shell_args($command); + $arg = build_shell_args($arguments); + if (!empty($arg)) { + $cmd .= ' ' . $arg; + } + // Execute + exec($cmd, $rawOutput, $status); + $output = implode("\n", $rawOutput); + return $status; +} + +/** + * Execute a vesta command line APIs (VESTA_CMD/v-*). + * (Wrapper function of `safe_exec`.) + * @see safe_exec + * @param string $command Command to execute. (eg. v-search-object) + * @param string[] $arguments (optional) Unescaped command line arguments. (eg. ["We've", 'json'], default: []) + * @param bool $checkReturn (optional) If this set to true, check_return_code will be called after the command executes. (default: true) + * @param string &$output (optional) Variable to contain output from the command. + * @return int Exit code (return status) of the executed command. + */ +function v_exec($command, $arguments=[], $checkReturn=true, &$output=null) { + // Check command + if (preg_match('#^\.*$|/#', $command)) return -1; + // Convert $arguments to an array + if (!is_array($arguments)) $arguments = !is_null($arguments) ? [$arguments] : []; + // Execute + $status = safe_exec([SUDO_CMD, VESTA_BIN_DIR.$command], $arguments, $output); + if ($checkReturn) { + check_return_code($status, explode("\n", $output)); + } + return $status; +} diff --git a/web/inc/i18n.php b/web/inc/i18n.php index 1dab4cae4..92c3b991d 100644 --- a/web/inc/i18n.php +++ b/web/inc/i18n.php @@ -1,6 +1,8 @@ 1) { + if (count($args) > 1) { $args[0] = $text; - return call_user_func_array("sprintf",$args); + return call_user_func_array('sprintf', $args); } else { return $text; } @@ -42,8 +44,8 @@ function _translate() { */ function __() { $args = func_get_args(); - array_unshift($args,$_SESSION['language']); - return call_user_func_array("_translate",$args); + array_unshift($args, $_SESSION['language']); + return call_user_func_array('_translate', $args); } /** @@ -86,16 +88,15 @@ function detect_user_language($fallback='en') { arsort($accept_langs_sorted); // List languages - exec (VESTA_CMD."v-list-sys-languages json", $output, $return_var); - $languages = json_decode(implode('', $output), true); - unset($output); + v_exec('v-list-sys-languages', ['json'], false, $output); + $languages = json_decode($output, true); // Find best matching language - foreach ($accept_langs_sorted as $user_lang => $dummy) { + foreach ($accept_langs_sorted as $req_lang => $dummy) { $decision = ''; foreach ($languages as $prov_lang) { if (strlen($decision) > strlen($prov_lang)) continue; - if (strpos($user_lang, $prov_lang) !== false) { + if (stripos($req_lang, $prov_lang) !== false) { $decision = $prov_lang; } } @@ -109,4 +110,4 @@ function detect_user_language($fallback='en') { // Store result for reusing $user_lang = $fallback; return $user_lang; -} \ No newline at end of file +} diff --git a/web/inc/mail-wrapper.php b/web/inc/mail-wrapper.php index a8c48a09e..1c47979cb 100755 --- a/web/inc/mail-wrapper.php +++ b/web/inc/mail-wrapper.php @@ -8,14 +8,15 @@ if (empty($argv[1])) { $options = getopt("s:f:"); +require_once(__DIR__.'/exec.php'); -define('NO_AUTH_REQUIRED',true); +define('NO_AUTH_REQUIRED', true); include("/usr/local/vesta/web/inc/main.php"); // Set system language -exec (VESTA_CMD . "v-list-sys-config json", $output, $return_var); -$data = json_decode(implode('', $output), true); -if (!empty( $data['config']['LANGUAGE'])) { +v_exec('v-list-sys-config', ['json'], false, $output); +$data = json_decode($output, true); +if (!empty($data['config']['LANGUAGE'])) { $_SESSION['language'] = $data['config']['LANGUAGE']; } else { $_SESSION['language'] = 'en'; diff --git a/web/inc/main.php b/web/inc/main.php index 91e380ff2..3c197c4b9 100644 --- a/web/inc/main.php +++ b/web/inc/main.php @@ -1,7 +1,8 @@ $favourite){ @@ -71,7 +70,7 @@ function get_favourites(){ $items = explode(',', $favourite); foreach($items as $item){ - if($item) + if ($item) $favourites[$key][trim($item)] = 1; } } @@ -79,34 +78,15 @@ function get_favourites(){ $_SESSION['favourites'] = $favourites; } - - -function check_error($return_var) { - if ( $return_var > 0 ) { - header("Location: /error/"); - exit; - } -} - -function check_return_code($return_var,$output) { - if ($return_var != 0) { - $error = implode('
                ', $output); - if (empty($error)) $error = __('Error code:',$return_var); - $_SESSION['error_msg'] = $error; - } -} - function top_panel($user, $TAB) { global $panel; - $command = VESTA_CMD."v-list-user '".$user."' 'json'"; - exec ($command, $output, $return_var); - if ( $return_var > 0 ) { - header("Location: /error/"); + $return_var = v_exec('v-list-user', [$user, 'json'], false, $output); + if ($return_var > 0) { + header('Location: /error/'); exit; } - $panel = json_decode(implode('', $output), true); - unset($output); - if ( $user == 'admin' ) { + $panel = json_decode($output, true); + if ($user == 'admin') { include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/panel.html'); } else { include($_SERVER['DOCUMENT_ROOT'].'/templates/user/panel.html'); diff --git a/web/list/backup/exclusions/index.php b/web/list/backup/exclusions/index.php index d03e98614..919c03b1c 100644 --- a/web/list/backup/exclusions/index.php +++ b/web/list/backup/exclusions/index.php @@ -12,9 +12,8 @@ include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html'); top_panel($user,$TAB); // Data -exec (VESTA_CMD."v-list-user-backup-exclusions $user json", $output, $return_var); -$data = json_decode(implode('', $output), true); -unset($output); +v_exec('v-list-user-backup-exclusions', [$user, 'json'], false, $output); +$data = json_decode($output, true); include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_backup_exclusions.html'); // Back uri diff --git a/web/list/backup/index.php b/web/list/backup/index.php index a79205724..ccb7a947b 100644 --- a/web/list/backup/index.php +++ b/web/list/backup/index.php @@ -13,16 +13,14 @@ top_panel($user,$TAB); // Data if (empty($_GET['backup'])){ - exec (VESTA_CMD."v-list-user-backups $user json", $output, $return_var); - $data = json_decode(implode('', $output), true); - $data = array_reverse($data,true); - unset($output); + v_exec('v-list-user-backups', [$user, 'json'], false, $output); + $data = json_decode($output, true); + $data = array_reverse($data, true); include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_backup.html'); } else { - exec (VESTA_CMD."v-list-user-backup $user '".escapeshellarg($_GET['backup'])."' json", $output, $return_var); - $data = json_decode(implode('', $output), true); - $data = array_reverse($data,true); - unset($output); + v_exec('v-list-user-backup', [$user, $_GET['backup'], 'json'], false, $output); + $data = json_decode($output, true); + $data = array_reverse($data, true); include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_backup_detail.html'); } diff --git a/web/list/cron/index.php b/web/list/cron/index.php index 19f66379c..303154c02 100644 --- a/web/list/cron/index.php +++ b/web/list/cron/index.php @@ -13,10 +13,9 @@ include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html'); top_panel($user,$TAB); // Data -exec (VESTA_CMD."v-list-cron-jobs $user json", $output, $return_var); -$data = json_decode(implode('', $output), true); -$data = array_reverse($data,true); -unset($output); +v_exec('v-list-cron-jobs', [$user, 'json'], false, $output); +$data = json_decode($output, true); +$data = array_reverse($data, true); if ($_SESSION['user'] == 'admin') { include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_cron.html'); diff --git a/web/list/db/index.php b/web/list/db/index.php index 4262b61fd..beb775811 100644 --- a/web/list/db/index.php +++ b/web/list/db/index.php @@ -12,10 +12,9 @@ include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html'); top_panel($user,$TAB); // Data -exec (VESTA_CMD."v-list-databases $user json", $output, $return_var); -$data = json_decode(implode('', $output), true); +v_exec('v-list-databases', [$user, 'json'], false, $output); +$data = json_decode($output, true); $data = array_reverse($data, true); -unset($output); if ($_SESSION['user'] == 'admin') { include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_db.html'); diff --git a/web/list/directory/index.php b/web/list/directory/index.php index 737e19db3..a50a90929 100644 --- a/web/list/directory/index.php +++ b/web/list/directory/index.php @@ -11,17 +11,16 @@ if ((!isset($_SESSION['FILEMANAGER_KEY'])) || (empty($_SESSION['FILEMANAGER_KEY' // Check login_as feature if (($_SESSION['user'] == 'admin') && (!empty($_SESSION['look']))) { - $user=$_SESSION['look']; + $user = $_SESSION['look']; } if (empty($panel)) { - $command = VESTA_CMD."v-list-user '".$user."' 'json'"; - exec ($command, $output, $return_var); - if ( $return_var > 0 ) { + $return_var = v_exec('v-list-user', [$user, 'json'], false, $output); + if ($return_var > 0) { header("Location: /error/"); exit; } - $panel = json_decode(implode('', $output), true); + $panel = json_decode($output, true); } $path_a = !empty($_REQUEST['dir_a']) ? $_REQUEST['dir_a'] : ''; diff --git a/web/list/dns/index.php b/web/list/dns/index.php index 0b9951a7a..4f4af1896 100644 --- a/web/list/dns/index.php +++ b/web/list/dns/index.php @@ -14,20 +14,18 @@ top_panel($user,$TAB); // Data if (empty($_GET['domain'])){ - exec (VESTA_CMD."v-list-dns-domains $user json", $output, $return_var); - $data = json_decode(implode('', $output), true); + v_exec('v-list-dns-domains', [$user, 'json'], false, $output); + $data = json_decode($output, true); $data = array_reverse($data, true); - unset($output); if ($_SESSION['user'] == 'admin') { include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_dns.html'); } else { include($_SERVER['DOCUMENT_ROOT'].'/templates/user/list_dns.html'); } } else { - exec (VESTA_CMD."v-list-dns-records '".$user."' '".escapeshellarg($_GET['domain'])."' 'json'", $output, $return_var); - $data = json_decode(implode('', $output), true); + v_exec('v-list-dns-records', [$user, $_GET['domain'], 'json'], false, $output); + $data = json_decode($output, true); $data = array_reverse($data, true); - unset($output); if ($_SESSION['user'] == 'admin') { include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_dns_rec.html'); } else { diff --git a/web/list/favorites/index.php b/web/list/favorites/index.php index 0ddc4c0b0..04ef3e149 100644 --- a/web/list/favorites/index.php +++ b/web/list/favorites/index.php @@ -5,20 +5,20 @@ error_reporting(NULL); echo '
                Favorites:
                '; // Data - exec (VESTA_CMD."v-list-user-favourites ".$_SESSION['user']." json", $output, $return_var); + v_exec('v-list-user-favourites', [$_SESSION['user'], 'json'], false, $output); -// print_r(implode('', $output)); +// print_r($output); // $json = '{ "Favourites": { "USER": "", "WEB": "bulletfarm.com", "DNS": "", "MAIL": "", "DB": "", "CRON": "", "BACKUP": "", "IP": "", "PACKAGE": "", "FIREWALL": ""}}'; // $data = json_decode($json, true); - $data = json_decode(implode('', $output).'}', true); - $data = array_reverse($data,true); + $data = json_decode($output.'}', true); + $data = array_reverse($data, true); print_r($data); // $data = array_reverse($data,true); -// $data = json_decode(implode('', $output), true); +// $data = json_decode($output, true); ?> \ No newline at end of file diff --git a/web/list/firewall/banlist/index.php b/web/list/firewall/banlist/index.php index 32393229c..55c743cb8 100644 --- a/web/list/firewall/banlist/index.php +++ b/web/list/firewall/banlist/index.php @@ -19,10 +19,9 @@ include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html'); top_panel($user,$TAB); // Data -exec (VESTA_CMD."v-list-firewall-ban json", $output, $return_var); -$data = json_decode(implode('', $output), true); +v_exec('v-list-firewall-ban', ['json'], false, $output); +$data = json_decode($output, true); $data = array_reverse($data, true); -unset($output); include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_firewall_banlist.html'); // Back uri diff --git a/web/list/firewall/index.php b/web/list/firewall/index.php index 62b8cbfdd..7363eef85 100644 --- a/web/list/firewall/index.php +++ b/web/list/firewall/index.php @@ -19,10 +19,9 @@ include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html'); top_panel($user,$TAB); // Data -exec (VESTA_CMD."v-list-firewall json", $output, $return_var); -$data = json_decode(implode('', $output), true); +v_exec('v-list-firewall', ['json'], false, $output); +$data = json_decode($output, true); $data = array_reverse($data, true); -unset($output); include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_firewall.html'); // Back uri diff --git a/web/list/ip/index.php b/web/list/ip/index.php index 510da61aa..1f019cc8b 100644 --- a/web/list/ip/index.php +++ b/web/list/ip/index.php @@ -13,10 +13,9 @@ top_panel($user,$TAB); // Data if ($_SESSION['user'] == 'admin') { - exec (VESTA_CMD."v-list-sys-ips json", $output, $return_var); - $data = json_decode(implode('', $output), true); + v_exec('v-list-sys-ips', ['json'], false, $output); + $data = json_decode($output, true); $data = array_reverse($data, true); - unset($output); include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_ip.html'); } diff --git a/web/list/log/index.php b/web/list/log/index.php index c0e226e45..916e74da0 100644 --- a/web/list/log/index.php +++ b/web/list/log/index.php @@ -12,11 +12,10 @@ include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html'); top_panel($user,$TAB); // Data -exec (VESTA_CMD."v-list-user-log $user json", $output, $return_var); +$return_var = v_exec('v-list-user-log', [$user, 'json'], false, $output); check_error($return_var); -$data = json_decode(implode('', $output), true); +$data = json_decode($output, true); $data = array_reverse($data); -unset($output); include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_log.html'); diff --git a/web/list/mail/index.php b/web/list/mail/index.php index 6555ccbae..1b2748c06 100644 --- a/web/list/mail/index.php +++ b/web/list/mail/index.php @@ -14,20 +14,18 @@ top_panel($user,$TAB); // Data if (empty($_GET['domain'])){ - exec (VESTA_CMD."v-list-mail-domains $user json", $output, $return_var); - $data = json_decode(implode('', $output), true); + v_exec('v-list-mail-domains', [$user, 'json'], false, $output); + $data = json_decode($output, true); $data = array_reverse($data, true); - unset($output); if ($_SESSION['user'] == 'admin') { include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_mail.html'); } else { include($_SERVER['DOCUMENT_ROOT'].'/templates/user/list_mail.html'); } } else { - exec (VESTA_CMD."v-list-mail-accounts '".$user."' '".escapeshellarg($_GET['domain'])."' json", $output, $return_var); - $data = json_decode(implode('', $output), true); + v_exec('v-list-mail-accounts', [$user, $_GET['domain'], 'json'], false, $output); + $data = json_decode($output, true); $data = array_reverse($data, true); - unset($output); if ($_SESSION['user'] == 'admin') { include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_mail_acc.html'); } else { diff --git a/web/list/notifications/index.php b/web/list/notifications/index.php index 1b6a0d1c5..870debd98 100644 --- a/web/list/notifications/index.php +++ b/web/list/notifications/index.php @@ -5,17 +5,17 @@ error_reporting(NULL); include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); -if($_REQUEST['ajax'] == 1){ +if ($_REQUEST['ajax'] == 1) { // Data - exec (VESTA_CMD."v-list-user-notifications $user json", $output, $return_var); - $data = json_decode(implode('', $output), true); - $data = array_reverse($data,true); - foreach($data as $key => $note){ + v_exec('v-list-user-notifications', [$user, 'json'], false, $output); + $data = json_decode($output, true); + $data = array_reverse($data, true); + foreach ($data as $key => $note) { $note['ID'] = $key; $data[$key] = $note; } echo json_encode($data); - exit(); + exit; } @@ -28,9 +28,9 @@ include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html'); top_panel($user,$TAB); // Data -exec (VESTA_CMD."v-list-user-notifications $user json", $output, $return_var); -$data = json_decode(implode('', $output), true); -$data = array_reverse($data,true); +v_exec('v-list-user-notifications', [$user, 'json'], false, $output); +$data = json_decode($output, true); +$data = array_reverse($data, true); if ($_SESSION['user'] == 'admin') { include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_notifications.html'); } else { diff --git a/web/list/package/index.php b/web/list/package/index.php index 61e44c179..c2aa5dd25 100644 --- a/web/list/package/index.php +++ b/web/list/package/index.php @@ -18,9 +18,8 @@ include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html'); top_panel($user,$TAB); // Data -exec (VESTA_CMD."v-list-user-packages json", $output, $return_var); -$data = json_decode(implode('', $output), true); -unset($output); +v_exec('v-list-user-packages', ['json'], false, $output); +$data = json_decode($output, true); include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_packages.html'); // Back uri diff --git a/web/list/rrd/index.php b/web/list/rrd/index.php index 725a584e9..3ccb727a0 100644 --- a/web/list/rrd/index.php +++ b/web/list/rrd/index.php @@ -13,9 +13,8 @@ top_panel($user,$TAB); // Data if ($_SESSION['user'] == 'admin') { - exec (VESTA_CMD."v-list-sys-rrd json", $output, $return_var); - $data = json_decode(implode('', $output), true); - unset($output); + v_exec('v-list-sys-rrd', ['json'], false, $output); + $data = json_decode($output, true); include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_rrd.html'); } diff --git a/web/list/server/index.php b/web/list/server/index.php index 7db575457..1a0ef3c2f 100644 --- a/web/list/server/index.php +++ b/web/list/server/index.php @@ -15,60 +15,50 @@ if ($_SESSION['user'] != 'admin') { if (isset($_GET['cpu'])) { $TAB = 'CPU'; include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_server_info.html'); - exec (VESTA_CMD.'v-list-sys-cpu-status', $output, $return_var); - foreach($output as $file) { - echo $file . "\n"; - } + v_exec('v-list-sys-cpu-status', [], false, $output); + echo $output . "\n"; echo " \n\n\n"; - exit(); + exit; } // Memory info if (isset($_GET['mem'])) { $TAB = 'MEMORY'; include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_server_info.html'); - exec (VESTA_CMD.'v-list-sys-memory-status', $output, $return_var); - foreach($output as $file) { - echo $file . "\n"; - } + v_exec('v-list-sys-memory-status', [], false, $output); + echo $output . "\n"; echo " \n\n\n"; - exit(); + exit; } // Disk info if (isset($_GET['disk'])) { $TAB = 'MEMORY'; include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_server_info.html'); - exec (VESTA_CMD.'v-list-sys-disk-status', $output, $return_var); - foreach($output as $file) { - echo $file . "\n"; - } + v_exec('v-list-sys-disk-status', [], false, $output); + echo $output . "\n"; echo " \n\n\n"; - exit(); + exit; } // Network info if (isset($_GET['net'])) { $TAB = 'MEMORY'; include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_server_info.html'); - exec (VESTA_CMD.'v-list-sys-network-status', $output, $return_var); - foreach($output as $file) { - echo $file . "\n"; - } + v_exec('v-list-sys-network-status', [], false, $output); + echo $output . "\n"; echo " \n\n\n"; - exit(); + exit; } // Web info if (isset($_GET['web'])) { $TAB = 'WEB'; include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_server_info.html'); - exec (VESTA_CMD.'v-list-sys-web-status', $output, $return_var); - foreach($output as $file) { - echo $file . "\n"; - } + v_exec('v-list-sys-web-status', [], false, $output); + echo $output . "\n"; echo " \n\n\n"; - exit(); + exit; } @@ -76,40 +66,34 @@ if (isset($_GET['web'])) { if (isset($_GET['dns'])) { $TAB = 'DNS'; include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_server_info.html'); - exec (VESTA_CMD.'v-list-sys-dns-status', $output, $return_var); - foreach($output as $file) { - echo $file . "\n"; - } + $return_var = v_exec('v-list-sys-dns-status', [], false, $output); + echo $output . "\n"; echo " \n\n\n"; - exit(); + exit; } // Mail info if (isset($_GET['mail'])) { $TAB = 'MAIL'; include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_server_info.html'); - exec (VESTA_CMD.'v-list-sys-mail-status', $output, $return_var); - if ($return_var == 0 ) { - foreach($output as $file) { - echo $file . "\n"; - } + $return_var = v_exec('v-list-sys-mail-status', [], false, $output); + if ($return_var == 0) { + echo $output . "\n"; } echo " \n\n\n"; - exit(); + exit; } // DB info if (isset($_GET['db'])) { $TAB = 'DB'; include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_server_info.html'); - exec (VESTA_CMD.'v-list-sys-db-status', $output, $return_var); - if ($return_var == 0 ) { - foreach($output as $file) { - echo $file . "\n"; - } + $return_var = v_exec('v-list-sys-db-status', [], false, $output); + if ($return_var == 0) { + echo $output . "\n"; } echo " \n\n\n"; - exit(); + exit; } @@ -120,12 +104,12 @@ include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html'); top_panel($user,$TAB); // Data -exec (VESTA_CMD."v-list-sys-info json", $output, $return_var); -$sys = json_decode(implode('', $output), true); -unset($output); -exec (VESTA_CMD."v-list-sys-services json", $output, $return_var); -$data = json_decode(implode('', $output), true); -unset($output); +v_exec('v-list-sys-info', ['json'], false, $output); +$sys = json_decode($output, true); + +v_exec('v-list-sys-services', ['json'], false, $output); +$data = json_decode($output, true); + include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_services.html'); // Back uri diff --git a/web/list/stats/index.php b/web/list/stats/index.php index ac97d4f22..86aebe5eb 100644 --- a/web/list/stats/index.php +++ b/web/list/stats/index.php @@ -14,28 +14,24 @@ top_panel($user,$TAB); // Data if ($user == 'admin') { if (empty($_GET['user'])) { - exec (VESTA_CMD."v-list-users-stats json", $output, $return_var); - $data = json_decode(implode('', $output), true); + v_exec('v-list-users-stats', ['json'], false, $output); + $data = json_decode($output, true); $data = array_reverse($data, true); - unset($output); } else { - $v_user = escapeshellarg($_GET['user']); - exec (VESTA_CMD."v-list-user-stats $v_user json", $output, $return_var); - $data = json_decode(implode('', $output), true); + $v_user = $_GET['user']; + v_exec('v-list-user-stats', [$v_user, 'json'], false, $output); + $data = json_decode($output, true); $data = array_reverse($data, true); - unset($output); } - exec (VESTA_CMD."v-list-sys-users 'json'", $output, $return_var); - $users = json_decode(implode('', $output), true); - unset($output); + v_exec('v-list-sys-users', ['json'], false, $output); + $users = json_decode($output, true); include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_stats.html'); } else { - exec (VESTA_CMD."v-list-user-stats $user json", $output, $return_var); - $data = json_decode(implode('', $output), true); + v_exec('v-list-user-stats', [$user, 'json'], false, $output); + $data = json_decode($output, true); $data = array_reverse($data, true); - unset($output); include($_SERVER['DOCUMENT_ROOT'].'/templates/user/list_stats.html'); } diff --git a/web/list/updates/index.php b/web/list/updates/index.php index f2c553087..be09791fb 100644 --- a/web/list/updates/index.php +++ b/web/list/updates/index.php @@ -13,12 +13,11 @@ top_panel($user,$TAB); // Data if ($_SESSION['user'] == 'admin') { - exec (VESTA_CMD."v-list-sys-vesta-updates json", $output, $return_var); - $data = json_decode(implode('', $output), true); - unset($output); - exec (VESTA_CMD."v-list-sys-vesta-autoupdate plain", $output, $return_var); - $autoupdate = $output['0']; - unset($output); + v_exec('v-list-sys-vesta-updates', ['json'], false, $output); + $data = json_decode($output, true); + + v_exec('v-list-sys-vesta-autoupdate', ['plain'], false, $output); + $autoupdate = strtok($output, "\n"); include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_updates.html'); } diff --git a/web/list/user/index.php b/web/list/user/index.php index 129a78c4a..9313fbee0 100644 --- a/web/list/user/index.php +++ b/web/list/user/index.php @@ -15,17 +15,17 @@ top_panel($user,$TAB); // Data if ($_SESSION['user'] == 'admin') { if ($user == 'admin') { - exec (VESTA_CMD . "v-list-users json", $output, $return_var); + v_exec('v-list-users', ['json'], false, $output); } else { - exec (VESTA_CMD . "v-list-user ".$user." json", $output, $return_var); + v_exec('v-list-user', [$user, 'json'], false, $output); } - $data = json_decode(implode('', $output), true); - $data = array_reverse($data,true); + $data = json_decode($output, true); + $data = array_reverse($data, true); display_error_block(); include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_user.html'); } else { - exec (VESTA_CMD . "v-list-user ".$user." json", $output, $return_var); - $data = json_decode(implode('', $output), true); + v_exec('v-list-user', [$user, 'json'], false, $output); + $data = json_decode($output, true); display_error_block(); include($_SERVER['DOCUMENT_ROOT'].'/templates/user/list_user.html'); } diff --git a/web/list/web-log/index.php b/web/list/web-log/index.php index 9859cedac..025f783c7 100644 --- a/web/list/web-log/index.php +++ b/web/list/web-log/index.php @@ -7,15 +7,14 @@ include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); // Header include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_weblog.html'); -$v_domain = escapeshellarg($_GET['domain']); +$v_domain = $_GET['domain']; if ($_GET['type'] == 'access') $type = 'access'; if ($_GET['type'] == 'error') $type = 'error'; -exec (VESTA_CMD."v-list-web-domain-".$type."log $user ".$v_domain, $output, $return_var); +$return_var = v_exec("v-list-web-domain-{$type}log", [$user, $v_domain], false, $output); -if ($return_var == 0 ) { - foreach($output as $file) { - echo $file . "\n"; - } +if ($return_var == 0) { + print $output . "\n"; } + echo " \n\n\n"; \ No newline at end of file diff --git a/web/list/web/index.php b/web/list/web/index.php index 52b0c78e4..6d140ad5b 100644 --- a/web/list/web/index.php +++ b/web/list/web/index.php @@ -12,9 +12,9 @@ include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html'); top_panel($user,$TAB); // Data -exec (VESTA_CMD."v-list-web-domains $user json", $output, $return_var); -$data = json_decode(implode('', $output), true); -$data = array_reverse($data,true); +v_exec('v-list-web-domains', [$user, 'json'], false, $output); +$data = json_decode($output, true); +$data = array_reverse($data, true); if ($_SESSION['user'] == 'admin') { include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_web.html'); } else { diff --git a/web/login/index.php b/web/login/index.php index 253b8ac91..97fa7ef1c 100644 --- a/web/login/index.php +++ b/web/login/index.php @@ -21,9 +21,9 @@ if (isset($_GET['logout'])) { // Login as someone else if (isset($_SESSION['user'])) { if ($_SESSION['user'] == 'admin' && !empty($_GET['loginas'])) { - exec (VESTA_CMD . "v-list-user ".escapeshellarg($_GET['loginas'])." json", $output, $return_var); - if ( $return_var == 0 ) { - $data = json_decode(implode('', $output), true); + $return_var = v_exec('v-list-user', [$_GET['loginas'], 'json'], false, $output); + if ($return_var == 0) { + $data = json_decode($output, true); reset($data); $_SESSION['look'] = key($data); $_SESSION['look_alert'] = 'yes'; @@ -35,7 +35,7 @@ if (isset($_SESSION['user'])) { // Basic auth if (isset($_POST['user']) && isset($_POST['password'])) { - $v_user = escapeshellarg($_POST['user']); + $v_user = $_POST['user']; // Send password via tmp file $v_password = exec('mktemp -p /tmp'); @@ -44,24 +44,21 @@ if (isset($_POST['user']) && isset($_POST['password'])) { fclose($fp); // Check user & password - exec(VESTA_CMD ."v-check-user-password ".$v_user." ".$v_password." ".escapeshellarg($_SERVER['REMOTE_ADDR']), $output, $return_var); - unset($output); + $return_var = v_exec('v-check-user-password', [$v_user, $v_password, $_SERVER['REMOTE_ADDR']]); // Remove tmp file unlink($v_password); // Check API answer - if ( $return_var > 0 ) { + if ($return_var > 0) { $ERROR = "".__('Invalid username or password').""; - } else { - // Make root admin user if ($_POST['user'] == 'root') $v_user = 'admin'; // Get user speciefic parameters - exec (VESTA_CMD . "v-list-user ".$v_user." json", $output, $return_var); - $data = json_decode(implode('', $output), true); + v_exec('v-list-user', [$v_user, 'json'], false, $output); + $data = json_decode($output, true); // Define session user $_SESSION['user'] = key($data); @@ -75,7 +72,7 @@ if (isset($_POST['user']) && isset($_POST['password'])) { // Redirect request to control panel interface if (!empty($_SESSION['request_uri'])) { - header("Location: ".$_SESSION['request_uri']); + header('Location: '.$_SESSION['request_uri']); unset($_SESSION['request_uri']); exit; } else { @@ -86,8 +83,8 @@ if (isset($_POST['user']) && isset($_POST['password'])) { } // Check system configuration -exec (VESTA_CMD . "v-list-sys-config json", $output, $return_var); -$data = json_decode(implode('', $output), true); +v_exec('v-list-sys-config', ['json'], false, $output); +$data = json_decode($output, true); $sys_arr = $data['config']; foreach ($sys_arr as $key => $value) { $_SESSION[$key] = $value; diff --git a/web/reset/index.php b/web/reset/index.php index abde3c145..96e9c0ff1 100644 --- a/web/reset/index.php +++ b/web/reset/index.php @@ -11,28 +11,25 @@ if (isset($_SESSION['user'])) { include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); if ((!empty($_POST['user'])) && (empty($_POST['code']))) { - $v_user = escapeshellarg($_POST['user']); $user = $_POST['user']; - $cmd="/usr/bin/sudo /usr/local/vesta/bin/v-list-user"; - exec ($cmd." ".$v_user." json", $output, $return_var); - if ( $return_var == 0 ) { - $data = json_decode(implode('', $output), true); + $return_var = v_exec('v-list-user', [$user, 'json'], false, $output); + if ($return_var == 0) { + $data = json_decode($output, true); $rkey = $data[$user]['RKEY']; $fname = $data[$user]['FNAME']; $lname = $data[$user]['LNAME']; $contact = $data[$user]['CONTACT']; $to = $data[$user]['CONTACT']; - $subject = __('MAIL_RESET_SUBJECT',date("Y-m-d H:i:s")); + $subject = __('MAIL_RESET_SUBJECT', date('Y-m-d H:i:s')); $hostname = exec('hostname'); - $from = __('MAIL_FROM',$hostname); - if (!empty($fname)) { - $mailtext = __('GREETINGS_GORDON_FREEMAN',$fname,$lname); + $from = __('MAIL_FROM', $hostname); + if (!empty($fname) || !empty($lname)) { + $mailtext = __('GREETINGS_GORDON_FREEMAN', $fname, $lname); } else { $mailtext = __('GREETINGS'); } - $mailtext .= __('PASSWORD_RESET_REQUEST',$_SERVER['HTTP_HOST'],$user,$rkey,$_SERVER['HTTP_HOST'],$user,$rkey); + $mailtext .= __('PASSWORD_RESET_REQUEST', $_SERVER['HTTP_HOST'], $user, $rkey, $_SERVER['HTTP_HOST'], $user, $rkey); if (!empty($rkey)) send_email($to, $subject, $mailtext, $from); - unset($output); } header("Location: /reset/?action=code&user=".$_POST['user']); @@ -40,23 +37,20 @@ if ((!empty($_POST['user'])) && (empty($_POST['code']))) { } if ((!empty($_POST['user'])) && (!empty($_POST['code'])) && (!empty($_POST['password'])) ) { - if ( $_POST['password'] == $_POST['password_confirm'] ) { - $v_user = escapeshellarg($_POST['user']); + if ($_POST['password'] == $_POST['password_confirm']) { $user = $_POST['user']; - $cmd="/usr/bin/sudo /usr/local/vesta/bin/v-list-user"; - exec ($cmd." ".$v_user." json", $output, $return_var); - if ( $return_var == 0 ) { - $data = json_decode(implode('', $output), true); + $return_var = v_exec('v-list-user', [$user, 'json'], false, $output); + if ($return_var == 0) { + $data = json_decode($output, true); $rkey = $data[$user]['RKEY']; if ($rkey == $_POST['code']) { $v_password = tempnam("/tmp","vst"); $fp = fopen($v_password, "w"); fwrite($fp, $_POST['password']."\n"); fclose($fp); - $cmd="/usr/bin/sudo /usr/local/vesta/bin/v-change-user-password"; - exec ($cmd." ".$v_user." ".$v_password, $output, $return_var); + $return_var = v_exec('v-change-user-password', [$user, $v_password], false); unlink($v_password); - if ( $return_var > 0 ) { + if ($return_var > 0) { $ERROR = "".__('An internal error occurred').""; } else { $_SESSION['user'] = $_POST['user']; diff --git a/web/reset/mail/index.php b/web/reset/mail/index.php index 9315d0418..dafb745cc 100644 --- a/web/reset/mail/index.php +++ b/web/reset/mail/index.php @@ -102,25 +102,21 @@ function to64 ($v, $n) // Check arguments if ((!empty($_POST['email'])) && (!empty($_POST['password'])) && (!empty($_POST['new']))) { list($v_account, $v_domain) = explode('@', $_POST['email']); - $v_domain = escapeshellarg($v_domain); - $v_account = escapeshellarg($v_account); $v_password = $_POST['password']; // Get domain owner - exec (VESTA_CMD."v-search-domain-owner ".$v_domain." 'mail'", $output, $return_var); + $return_var = v_exec('v-search-domain-owner', [$v_domain, 'mail'], false, $output); if ($return_var == 0) { - $v_user = $output[0]; + $v_user = strtok($output, "\n"); } - unset($output); // Get current md5 hash if (!empty($v_user)) { - exec (VESTA_CMD."v-get-mail-account-value '".$v_user."' ".$v_domain." ".$v_account." 'md5'", $output, $return_var); + $return_var = v_exec('v-get-mail-account-value', [$v_user, $v_domain, $v_account, 'md5'], false, $output); if ($return_var == 0) { - $v_hash = $output[0]; + $v_hash = strtok($output, "\n"); } } - unset($output); // Compare hashes if (!empty($v_hash)) { @@ -129,14 +125,14 @@ if ((!empty($_POST['email'])) && (!empty($_POST['password'])) && (!empty($_POST[ $n_hash = '{MD5}'.$n_hash; // Change password - if ( $v_hash == $n_hash ) { + if ($v_hash == $n_hash) { $v_new_password = tempnam("/tmp","vst"); $fp = fopen($v_new_password, "w"); fwrite($fp, $_POST['new']."\n"); fclose($fp); - exec (VESTA_CMD."v-change-mail-account-password '".$v_user."' ".$v_domain." ".$v_account." ".$v_new_password, $output, $return_var); + $return_var = v_exec('v-change-mail-account-password', [$v_user, $v_domain, $v_account, $v_new_password], false, $output); if ($return_var == 0) { - echo "ok"; + echo 'ok'; exit; } } diff --git a/web/restart/service/index.php b/web/restart/service/index.php index 5f42e5e5d..8952fcc0f 100644 --- a/web/restart/service/index.php +++ b/web/restart/service/index.php @@ -8,18 +8,17 @@ include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); if ($_SESSION['user'] == 'admin') { if (!empty($_GET['srv'])) { if ($_GET['srv'] == 'iptables') { - exec (VESTA_CMD."v-update-firewall", $output, $return_var); + $return_var = v_exec('v-update-firewall', [], false, $output); } else { - $v_service = escapeshellarg($_GET['srv']); - exec (VESTA_CMD."v-restart-service ".$v_service, $output, $return_var); + $v_service = $_GET['srv']; + $return_var = v_exec('v-restart-service', [$v_service], false, $output); } } if ($return_var != 0) { $error = implode('
                ', $output); - if (empty($error)) $error = __('SERVICE_ACTION_FAILED',__('restart'),$v_service); - $_SESSION['error_msg'] = $error; + if (empty($error)) $error = __('SERVICE_ACTION_FAILED', __('restart'), htmlentities($_GET['srv'])); + $_SESSION['error_msg'] = $error; } - unset($output); } header("Location: /list/server/"); diff --git a/web/restart/system/index.php b/web/restart/system/index.php index 4facc5a5a..b4b624171 100644 --- a/web/restart/system/index.php +++ b/web/restart/system/index.php @@ -3,14 +3,14 @@ error_reporting(NULL); ob_start(); session_start(); + include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); if ($_SESSION['user'] == 'admin') { if (!empty($_GET['hostname'])) { - exec (VESTA_CMD."v-restart-system yes", $output, $return_var); + v_exec('v-restart-system', ['yes'], false); $_SESSION['error_msg'] = 'The system is going down for reboot NOW!'; } - unset($output); } header("Location: /list/server/"); diff --git a/web/schedule/backup/index.php b/web/schedule/backup/index.php index 67c7b44ff..c69a57935 100644 --- a/web/schedule/backup/index.php +++ b/web/schedule/backup/index.php @@ -5,21 +5,15 @@ ob_start(); session_start(); include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); -$v_username = escapeshellarg($user); -exec (VESTA_CMD."v-schedule-user-backup ".$v_username, $output, $return_var); -if ($return_var == 0) { - $_SESSION['error_msg'] = __('BACKUP_SCHEDULED'); -} else { - $_SESSION['error_msg'] = implode('
                ', $output); - if (empty($_SESSION['error_msg'])) { - $_SESSION['error_msg'] = __('Error: vesta did not return any output.'); - } - - if ($return_var == 4) { +$return_var = v_exec('v-schedule-user-backup', [$user]); +switch ($return_var) { + case 0: + $_SESSION['error_msg'] = __('BACKUP_SCHEDULED'); + break; + case 4: $_SESSION['error_msg'] = __('BACKUP_EXISTS'); - } - + break; } -unset($output); + header("Location: /list/backup/"); exit; diff --git a/web/schedule/restore/index.php b/web/schedule/restore/index.php index ce7d5d03d..452ac103a 100644 --- a/web/schedule/restore/index.php +++ b/web/schedule/restore/index.php @@ -6,7 +6,7 @@ session_start(); include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); -$backup = escapeshellarg($_GET['backup']); +$backup = $_GET['backup']; $web = 'no'; $dns = 'no'; @@ -15,30 +15,27 @@ $db = 'no'; $cron = 'no'; $udir = 'no'; -if ($_GET['type'] == 'web') $web = escapeshellarg($_GET['object']); -if ($_GET['type'] == 'dns') $dns = escapeshellarg($_GET['object']); -if ($_GET['type'] == 'mail') $mail = escapeshellarg($_GET['object']); -if ($_GET['type'] == 'db') $db = escapeshellarg($_GET['object']); +if ($_GET['type'] == 'web') $web = $_GET['object']; +if ($_GET['type'] == 'dns') $dns = $_GET['object']; +if ($_GET['type'] == 'mail') $mail = $_GET['object']; +if ($_GET['type'] == 'db') $db = $_GET['object']; if ($_GET['type'] == 'cron') $cron = 'yes'; -if ($_GET['type'] == 'udir') $udir = escapeshellarg($_GET['object']); +if ($_GET['type'] == 'udir') $udir = $_GET['object']; if (!empty($_GET['type'])) { - $restore_cmd = VESTA_CMD."v-schedule-user-restore ".$user." ".$backup." ".$web." ".$dns." ".$mail." ".$db." ".$cron." ".$udir; + $restore_args = [$user, $backup, $web, $dns, $mail, $db, $cron, $udir]; } else { - $restore_cmd = VESTA_CMD."v-schedule-user-restore ".$user." ".$backup; + $restore_args = [$user, $backup]; } -exec ($restore_cmd, $output, $return_var); -if ($return_var == 0) { - $_SESSION['error_msg'] = __('RESTORE_SCHEDULED'); -} else { - $_SESSION['error_msg'] = implode('
                ', $output); - if (empty($_SESSION['error_msg'])) { - $_SESSION['error_msg'] = __('Error: vesta did not return any output.'); - } - if ($return_var == 4) { +$return_var = v_exec('v-schedule-user-restore', $restore_args); +switch ($return_var) { + case 0: + $_SESSION['error_msg'] = __('RESTORE_SCHEDULED'); + break; + case 4: $_SESSION['error_msg'] = __('RESTORE_EXISTS'); - } + break; } header("Location: /list/backup/?backup=" . $_GET['backup']); diff --git a/web/search/index.php b/web/search/index.php index e885cd7a5..f0870e52a 100644 --- a/web/search/index.php +++ b/web/search/index.php @@ -9,9 +9,9 @@ include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); // Check query $q = $_GET['q']; if (empty($q)) { - $back=getenv("HTTP_REFERER"); + $back = getenv('HTTP_REFERER'); if (!empty($back)) { - header("Location: ".$back); + header("Location: $back"); exit; } header("Location: /"); @@ -28,14 +28,13 @@ $lang = 'ru_RU.utf8'; //setlocale(LC_ALL, $lang); // Data -$q = escapeshellarg($q); if ($_SESSION['user'] == 'admin') { - exec (VESTA_CMD."v-search-object ".$q." json", $output, $return_var); - $data = json_decode(implode('', $output), true); + v_exec('v-search-object', [$q, 'json'], false, $output); + $data = json_decode($output, true); include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_search.html'); } else { - exec (VESTA_CMD."v-search-user-object ".$user." ".$q." json", $output, $return_var); - $data = json_decode(implode('', $output), true); + v_exec('v-search-user-object', [$user, $q, 'json'], false, $output); + $data = json_decode($output, true); include($_SERVER['DOCUMENT_ROOT'].'/templates/user/list_search.html'); } diff --git a/web/start/service/index.php b/web/start/service/index.php index 943019c4f..d2f7230c5 100644 --- a/web/start/service/index.php +++ b/web/start/service/index.php @@ -8,18 +8,17 @@ include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); if ($_SESSION['user'] == 'admin') { if (!empty($_GET['srv'])) { if ($_GET['srv'] == 'iptables') { - exec (VESTA_CMD."v-update-firewall", $output, $return_var); + $return_var = v_exec('v-update-firewall', [], false, $output); } else { - $v_service = escapeshellarg($_GET['srv']); - exec (VESTA_CMD."v-start-service ".$v_service, $output, $return_var); + $v_service = $_GET['srv']; + $return_var = v_exec('v-start-service', [$v_service], false, $output); } } if ($return_var != 0) { $error = implode('
                ', $output); - if (empty($error)) $error = __('SERVICE_ACTION_FAILED',__('start'),$v_service);; - $_SESSION['error_srv'] = $error; + if (empty($error)) $error = __('SERVICE_ACTION_FAILED', __('start'), htmlentities($_GET['srv'])); + $_SESSION['error_srv'] = $error; } - unset($output); } header("Location: /list/server/"); diff --git a/web/stop/service/index.php b/web/stop/service/index.php index a151dc6d8..1221d4e5b 100644 --- a/web/stop/service/index.php +++ b/web/stop/service/index.php @@ -8,18 +8,18 @@ include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); if ($_SESSION['user'] == 'admin') { if (!empty($_GET['srv'])) { if ($_GET['srv'] == 'iptables') { - exec (VESTA_CMD."v-stop-firewall", $output, $return_var); + $return_var = v_exec('v-stop-firewall', [], false, $output); } else { - $v_service = escapeshellarg($_GET['srv']); - exec (VESTA_CMD."v-stop-service ".$v_service, $output, $return_var); + $v_service = $_GET['srv']; + $return_var = v_exec('v-stop-service', [$v_service], false, $output); } } if ($return_var != 0) { $error = implode('
                ', $output); - if (empty($error)) $error = __('SERVICE_ACTION_FAILED',__('stop'),$v_service); - $_SESSION['error_srv'] = $error; + if (empty($error)) $error = __('SERVICE_ACTION_FAILED', __('stop'), htmlentities($_GET['srv'])); + $_SESSION['error_srv'] = $error; } - unset($output); + } header("Location: /list/server/"); diff --git a/web/suspend/cron/index.php b/web/suspend/cron/index.php index 3bf40a615..c1183fd7f 100644 --- a/web/suspend/cron/index.php +++ b/web/suspend/cron/index.php @@ -8,7 +8,7 @@ include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); // Check token if ((!isset($_GET['token'])) || ($_SESSION['token'] != $_GET['token'])) { header('location: /login/'); - exit(); + exit; } // Check user @@ -16,20 +16,20 @@ if ($_SESSION['user'] != 'admin') { header("Location: /list/user"); exit; } + if (!empty($_GET['user'])) { - $user=$_GET['user']; + $user = $_GET['user']; } + if (!empty($_GET['job'])) { - $v_username = escapeshellarg($user); - $v_job = escapeshellarg($_GET['job']); - exec (VESTA_CMD."v-suspend-cron-job ".$v_username." ".$v_job, $output, $return_var); + $v_username = $user; + $v_job = $_GET['job']; + v_exec('v-suspend-cron-job', [$v_username, $v_job]); } -check_return_code($return_var,$output); -unset($output); $back = $_SESSION['back']; if (!empty($back)) { - header("Location: ".$back); + header("Location: $back"); exit; } diff --git a/web/suspend/db/index.php b/web/suspend/db/index.php index a335a5b41..07a007c83 100644 --- a/web/suspend/db/index.php +++ b/web/suspend/db/index.php @@ -8,7 +8,7 @@ include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); // Check token if ((!isset($_GET['token'])) || ($_SESSION['token'] != $_GET['token'])) { header('location: /login/'); - exit(); + exit; } // Check user @@ -22,16 +22,14 @@ if (!empty($_GET['user'])) { } if (!empty($_GET['database'])) { - $v_username = escapeshellarg($user); - $v_database = escapeshellarg($_GET['database']); - exec (VESTA_CMD."v-suspend-database ".$v_username." ".$v_database, $output, $return_var); + $v_username = $user; + $v_database = $_GET['database']; + v_exec('v-suspend-database', [$v_username, $v_database]); } -check_return_code($return_var,$output); -unset($output); $back = $_SESSION['back']; if (!empty($back)) { - header("Location: ".$back); + header("Location: $back"); exit; } diff --git a/web/suspend/dns/index.php b/web/suspend/dns/index.php index 300672f51..2c0c3a8b1 100644 --- a/web/suspend/dns/index.php +++ b/web/suspend/dns/index.php @@ -8,7 +8,7 @@ include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); // Check token if ((!isset($_GET['token'])) || ($_SESSION['token'] != $_GET['token'])) { header('location: /login/'); - exit(); + exit; } // Check user @@ -23,14 +23,12 @@ if (!empty($_GET['user'])) { // DNS domain if ((!empty($_GET['domain'])) && (empty($_GET['record_id']))) { - $v_username = escapeshellarg($user); - $v_domain = escapeshellarg($_GET['domain']); - exec (VESTA_CMD."v-suspend-dns-domain ".$v_username." ".$v_domain, $output, $return_var); - check_return_code($return_var,$output); - unset($output); + $v_username = $user; + $v_domain = $_GET['domain']; + v_exec('v-suspend-dns-domain', [$v_username, $v_domain]); $back = $_SESSION['back']; if (!empty($back)) { - header("Location: ".$back); + header("Location: $back"); exit; } header("Location: /list/dns/"); @@ -39,15 +37,13 @@ if ((!empty($_GET['domain'])) && (empty($_GET['record_id']))) { // DNS record if ((!empty($_GET['domain'])) && (!empty($_GET['record_id']))) { - $v_username = escapeshellarg($user); - $v_domain = escapeshellarg($_GET['domain']); - $v_record_id = escapeshellarg($_GET['record_id']); - exec (VESTA_CMD."v-suspend-dns-record ".$v_username." ".$v_domain." ".$v_record_id, $output, $return_var); - check_return_code($return_var,$output); - unset($output); + $v_username = $user; + $v_domain = $_GET['domain']; + $v_record_id = $_GET['record_id']; + v_exec('v-suspend-dns-record', [$v_username, $v_domain, $v_record_id]); $back = $_SESSION['back']; if (!empty($back)) { - header("Location: ".$back); + header("Location: $back"); exit; } header("Location: /list/dns/?domain=".$_GET['domain']); @@ -56,7 +52,7 @@ if ((!empty($_GET['domain'])) && (!empty($_GET['record_id']))) { $back = $_SESSION['back']; if (!empty($back)) { - header("Location: ".$back); + header("Location: $back"); exit; } diff --git a/web/suspend/firewall/index.php b/web/suspend/firewall/index.php index 40f8adaf3..1a2bf7dd4 100644 --- a/web/suspend/firewall/index.php +++ b/web/suspend/firewall/index.php @@ -8,7 +8,7 @@ include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); // Check token if ((!isset($_GET['token'])) || ($_SESSION['token'] != $_GET['token'])) { header('location: /login/'); - exit(); + exit; } // Check user @@ -18,15 +18,13 @@ if ($_SESSION['user'] != 'admin') { } if (!empty($_GET['rule'])) { - $v_rule = escapeshellarg($_GET['rule']); - exec (VESTA_CMD."v-suspend-firewall-rule ".$v_rule, $output, $return_var); + $v_rule = $_GET['rule']; + v_exec('v-suspend-firewall-rule', [$v_rule]); } -check_return_code($return_var,$output); -unset($output); -$back=getenv("HTTP_REFERER"); +$back = getenv('HTTP_REFERER'); if (!empty($back)) { - header("Location: ".$back); + header("Location: $back"); exit; } diff --git a/web/suspend/mail/index.php b/web/suspend/mail/index.php index e96bde2e8..1686ff3bf 100644 --- a/web/suspend/mail/index.php +++ b/web/suspend/mail/index.php @@ -8,7 +8,7 @@ include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); // Check token if ((!isset($_GET['token'])) || ($_SESSION['token'] != $_GET['token'])) { header('location: /login/'); - exit(); + exit; } // Check user @@ -18,19 +18,17 @@ if ($_SESSION['user'] != 'admin') { } if (!empty($_GET['user'])) { - $user=$_GET['user']; + $user = $_GET['user']; } // Mail domain if ((!empty($_GET['domain'])) && (empty($_GET['account']))) { - $v_username = escapeshellarg($user); - $v_domain = escapeshellarg($_GET['domain']); - exec (VESTA_CMD."v-suspend-mail-domain ".$v_username." ".$v_domain, $output, $return_var); - check_return_code($return_var,$output); - unset($output); - $back=getenv("HTTP_REFERER"); + $v_username = $user; + $v_domain = $_GET['domain']; + v_exec('v-suspend-mail-domain', [$v_username, $v_domain]); + $back = getenv('HTTP_REFERER'); if (!empty($back)) { - header("Location: ".$back); + header("Location: $back"); exit; } header("Location: /list/mail/"); @@ -39,15 +37,13 @@ if ((!empty($_GET['domain'])) && (empty($_GET['account']))) { // Mail account if ((!empty($_GET['domain'])) && (!empty($_GET['account']))) { - $v_username = escapeshellarg($user); - $v_domain = escapeshellarg($_GET['domain']); - $v_account = escapeshellarg($_GET['account']); - exec (VESTA_CMD."v-suspend-mail-account ".$v_username." ".$v_domain." ".$v_account, $output, $return_var); - check_return_code($return_var,$output); - unset($output); + $v_username = $user; + $v_domain = $_GET['domain']; + $v_account = $_GET['account']; + v_exec('v-suspend-mail-account', [$v_username, $v_domain, $v_account]); $back = $_SESSION['back']; - if (!empty($back)) { - header("Location: ".$back); + if (!empty($back)) { + header("Location: $back"); exit; } header("Location: /list/mail/?domain=".$_GET['domain']); @@ -56,7 +52,7 @@ if ((!empty($_GET['domain'])) && (!empty($_GET['account']))) { $back = $_SESSION['back']; if (!empty($back)) { - header("Location: ".$back); + header("Location: $back"); exit; } diff --git a/web/suspend/user/index.php b/web/suspend/user/index.php index 8f355941f..91137bbbc 100644 --- a/web/suspend/user/index.php +++ b/web/suspend/user/index.php @@ -8,7 +8,7 @@ include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); // Check token if ((!isset($_GET['token'])) || ($_SESSION['token'] != $_GET['token'])) { header('location: /login/'); - exit(); + exit; } // Check user @@ -18,15 +18,13 @@ if ($_SESSION['user'] != 'admin') { } if (!empty($_GET['user'])) { - $v_username = escapeshellarg($_GET['user']); - exec (VESTA_CMD."v-suspend-user ".$v_username, $output, $return_var); + $v_username = $_GET['user']; + v_exec('v-suspend-user', [$v_username]); } -check_return_code($return_var,$output); -unset($output); $back = $_SESSION['back']; if (!empty($back)) { - header("Location: ".$back); + header("Location: $back"); exit; } diff --git a/web/suspend/web/index.php b/web/suspend/web/index.php index 23ae3cda3..cd9858cba 100644 --- a/web/suspend/web/index.php +++ b/web/suspend/web/index.php @@ -8,7 +8,7 @@ include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); // Check token if ((!isset($_GET['token'])) || ($_SESSION['token'] != $_GET['token'])) { header('location: /login/'); - exit(); + exit; } // Check user @@ -18,21 +18,19 @@ if ($_SESSION['user'] != 'admin') { } if (!empty($_GET['user'])) { - $user=$_GET['user']; + $user = $_GET['user']; } if (!empty($_GET['domain'])) { - $v_username = escapeshellarg($user); - $v_domain = escapeshellarg($_GET['domain']); - exec (VESTA_CMD."v-suspend-domain ".$v_username." ".$v_domain, $output, $return_var); + $v_username = $user; + $v_domain = $_GET['domain']; + v_exec('v-suspend-domain', [$v_username, $v_domain]); } -check_return_code($return_var,$output); -unset($output); $back = $_SESSION['back']; if (!empty($back)) { - header("Location: ".$back); + header("Location: $back"); exit; } diff --git a/web/templates/admin/edit_package.html b/web/templates/admin/edit_package.html index 6082af056..7ce1c37a5 100644 --- a/web/templates/admin/edit_package.html +++ b/web/templates/admin/edit_package.html @@ -22,7 +22,7 @@
                ', $output); - if (empty($error)) $error = __('Error: vesta did not return any output.'); - $_SESSION['error_msg'] = $error; - } - unset($output); - $back=getenv("HTTP_REFERER"); + $v_username = $user; + $v_domain = $_GET['domain']; + v_exec('v-unsuspend-dns-domain', [$v_username, $v_domain]); + $back = getenv('HTTP_REFERER'); if (!empty($back)) { - header("Location: ".$back); + header("Location: $back"); exit; } header("Location: /list/dns/"); @@ -43,28 +37,22 @@ if ((!empty($_GET['domain'])) && (empty($_GET['record_id']))) { // DNS record if ((!empty($_GET['domain'])) && (!empty($_GET['record_id']))) { - $v_username = escapeshellarg($user); - $v_domain = escapeshellarg($_GET['domain']); - $v_record_id = escapeshellarg($_GET['record_id']); - exec (VESTA_CMD."v-unsuspend-dns-record ".$v_username." ".$v_domain." ".$v_record_id, $output, $return_var); - if ($return_var != 0) { - $error = implode('
                ', $output); - if (empty($error)) $error = __('Error: vesta did not return any output.'); - $_SESSION['error_msg'] = $error; - } - unset($output); - $back=getenv("HTTP_REFERER"); + $v_username = $user; + $v_domain = $_GET['domain']; + $v_record_id = $_GET['record_id']; + v_exec('v-unsuspend-dns-record', [$v_username, $v_domain, $v_record_id]); + $back = getenv('HTTP_REFERER'); if (!empty($back)) { - header("Location: ".$back); + header("Location: $back"); exit; } header("Location: /list/dns/?domain=".$_GET['domain']); exit; } -$back=getenv("HTTP_REFERER"); +$back = getenv('HTTP_REFERER'); if (!empty($back)) { - header("Location: ".$back); + header("Location: $back"); exit; } diff --git a/web/unsuspend/firewall/index.php b/web/unsuspend/firewall/index.php index ec3843e9f..66191893e 100644 --- a/web/unsuspend/firewall/index.php +++ b/web/unsuspend/firewall/index.php @@ -8,7 +8,7 @@ include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); // Check token if ((!isset($_GET['token'])) || ($_SESSION['token'] != $_GET['token'])) { header('location: /login/'); - exit(); + exit; } // Check user @@ -18,15 +18,13 @@ if ($_SESSION['user'] != 'admin') { } if (!empty($_GET['rule'])) { - $v_rule = escapeshellarg($_GET['rule']); - exec (VESTA_CMD."v-unsuspend-firewall-rule ".$v_rule, $output, $return_var); + $v_rule = $_GET['rule']; + v_exec('v-unsuspend-firewall-rule', [$v_rule]); } -check_return_code($return_var,$output); -unset($output); -$back=getenv("HTTP_REFERER"); +$back = getenv('HTTP_REFERER'); if (!empty($back)) { - header("Location: ".$back); + header("Location: $back"); exit; } diff --git a/web/unsuspend/mail/index.php b/web/unsuspend/mail/index.php index 158cb73ca..e4bc667f2 100644 --- a/web/unsuspend/mail/index.php +++ b/web/unsuspend/mail/index.php @@ -8,7 +8,7 @@ include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); // Check token if ((!isset($_GET['token'])) || ($_SESSION['token'] != $_GET['token'])) { header('location: /login/'); - exit(); + exit; } // Check user @@ -23,18 +23,12 @@ if (!empty($_GET['user'])) { // Mail domain if ((!empty($_GET['domain'])) && (empty($_GET['account']))) { - $v_username = escapeshellarg($user); - $v_domain = escapeshellarg($_GET['domain']); - exec (VESTA_CMD."v-unsuspend-mail-domain ".$v_username." ".$v_domain, $output, $return_var); - if ($return_var != 0) { - $error = implode('
                ', $output); - if (empty($error)) $error = __('Error: vesta did not return any output.'); - $_SESSION['error_msg'] = $error; - } - unset($output); - $back=getenv("HTTP_REFERER"); + $v_username = $user; + $v_domain = $_GET['domain']; + v_exec('v-unsuspend-mail-domain', [$v_username, $v_domain]); + $back = getenv('HTTP_REFERER'); if (!empty($back)) { - header("Location: ".$back); + header("Location: $back"); exit; } header("Location: /list/mail/"); @@ -43,28 +37,22 @@ if ((!empty($_GET['domain'])) && (empty($_GET['account']))) { // Mail account if ((!empty($_GET['domain'])) && (!empty($_GET['account']))) { - $v_username = escapeshellarg($user); - $v_domain = escapeshellarg($_GET['domain']); - $v_account = escapeshellarg($_GET['account']); - exec (VESTA_CMD."v-unsuspend-mail-account ".$v_username." ".$v_domain." ".$v_account, $output, $return_var); - if ($return_var != 0) { - $error = implode('
                ', $output); - if (empty($error)) $error = __('Error: vesta did not return any output.'); - $_SESSION['error_msg'] = $error; - } - unset($output); - $back=getenv("HTTP_REFERER"); + $v_username = $user; + $v_domain = $_GET['domain']; + $v_account = $_GET['account']; + v_exec('v-unsuspend-mail-account', [$v_username, $v_domain, $v_account]); + $back = getenv('HTTP_REFERER'); if (!empty($back)) { - header("Location: ".$back); + header("Location: $back"); exit; } header("Location: /list/mail/?domain=".$_GET['domain']); exit; } -$back=getenv("HTTP_REFERER"); +$back = getenv('HTTP_REFERER'); if (!empty($back)) { - header("Location: ".$back); + header("Location: $back"); exit; } diff --git a/web/unsuspend/user/index.php b/web/unsuspend/user/index.php index 7aff155e6..61b525994 100644 --- a/web/unsuspend/user/index.php +++ b/web/unsuspend/user/index.php @@ -9,7 +9,7 @@ include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); // Check token if ((!isset($_GET['token'])) || ($_SESSION['token'] != $_GET['token'])) { header('location: /login/'); - exit(); + exit; } // Check user @@ -19,15 +19,13 @@ if ($_SESSION['user'] != 'admin') { } if (!empty($_GET['user'])) { - $v_username = escapeshellarg($_GET['user']); - exec (VESTA_CMD."v-unsuspend-user ".$v_username, $output, $return_var); + $v_username = $_GET['user']; + v_exec('v-unsuspend-user', [$v_username]); } -check_return_code($return_var,$output); -unset($output); -$back=getenv("HTTP_REFERER"); +$back = getenv('HTTP_REFERER'); if (!empty($back)) { - header("Location: ".$back); + header("Location: $back"); exit; } diff --git a/web/unsuspend/web/index.php b/web/unsuspend/web/index.php index 760cc169e..3bee314dc 100644 --- a/web/unsuspend/web/index.php +++ b/web/unsuspend/web/index.php @@ -8,7 +8,7 @@ include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); // Check token if ((!isset($_GET['token'])) || ($_SESSION['token'] != $_GET['token'])) { header('location: /login/'); - exit(); + exit; } // Check user @@ -17,19 +17,18 @@ if ($_SESSION['user'] != 'admin') { exit; } if (!empty($_GET['user'])) { - $user=$_GET['user']; + $user = $_GET['user']; } -if (!empty($_GET['domain'])) { - $v_username = escapeshellarg($user); - $v_domain = escapeshellarg($_GET['domain']); - exec (VESTA_CMD."v-unsuspend-domain ".$v_username." ".$v_domain, $output, $return_var); -} -check_return_code($return_var,$output); -unset($output); -$back=getenv("HTTP_REFERER"); +if (!empty($_GET['domain'])) { + $v_username = $user; + $v_domain = $_GET['domain']; + v_exec('v-unsuspend-domain', [$v_username, $v_domain]); +} + +$back = getenv('HTTP_REFERER'); if (!empty($back)) { - header("Location: ".$back); + header("Location: $back"); exit; } diff --git a/web/update/vesta/index.php b/web/update/vesta/index.php index a025c7bf0..0120ccaa8 100644 --- a/web/update/vesta/index.php +++ b/web/update/vesta/index.php @@ -7,16 +7,9 @@ include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); if ($_SESSION['user'] == 'admin') { if (!empty($_GET['pkg'])) { - $v_pkg = escapeshellarg($_GET['pkg']); - exec (VESTA_CMD."v-update-sys-vesta ".$v_pkg, $output, $return_var); + $v_pkg = $_GET['pkg']; + v_exec('v-update-sys-vesta', [$v_pkg]); } - - if ($return_var != 0) { - $error = implode('
                ', $output); - if (empty($error)) $error = 'Error: '.$v_pkg.' update failed'; - $_SESSION['error_msg'] = $error; - } - unset($output); } header("Location: /list/updates/"); diff --git a/web/upload/UploadHandler.php b/web/upload/UploadHandler.php index 7db8bc414..c9328be75 100755 --- a/web/upload/UploadHandler.php +++ b/web/upload/UploadHandler.php @@ -2,6 +2,7 @@ //session_start(); +require_once(__DIR__.'/../inc/exec.php'); include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); // Check login_as feature @@ -1104,9 +1105,7 @@ class UploadHandler } else { chmod($uploaded_file, 0644); //move_uploaded_file($uploaded_file, $file_path); - exec (VESTA_CMD . "v-copy-fs-file ". USERNAME ." {$uploaded_file} {$file_path}", $output, $return_var); - - $error = check_return_code($return_var, $output); + $return_var = v_exec('v-copy-fs-file', [USERNAME, $uploaded_file, $file_path]); if ($return_var != 0) { //var_dump(VESTA_CMD . "v-copy-fs-file {$user} {$fn} {$path}"); //var_dump($path); diff --git a/web/view/file/index.php b/web/view/file/index.php index 6605607c6..375b9a6b7 100644 --- a/web/view/file/index.php +++ b/web/view/file/index.php @@ -1,4 +1,4 @@ - Date: Thu, 3 Dec 2015 03:00:06 +0200 Subject: [PATCH 234/264] Update v-add-sys-quota - Supports journaled quotas (version 2 quota) - Journaled quotas have the advantage that even after a crash no quota check is required - Quotacheck on reboot --- bin/v-add-sys-quota | 47 ++++++++++++++++++++++++++------------------- 1 file changed, 27 insertions(+), 20 deletions(-) diff --git a/bin/v-add-sys-quota b/bin/v-add-sys-quota index 10432a608..b831e7bfe 100755 --- a/bin/v-add-sys-quota +++ b/bin/v-add-sys-quota @@ -1,12 +1,12 @@ #!/bin/bash # info: add system quota -# opions: NONE +# options: NONE # # The script enables filesystem quota on /home patition #----------------------------------------------------------# -# Variable&Function # +# Variable & Function # #----------------------------------------------------------# # Includes @@ -19,7 +19,8 @@ source $VESTA/conf/vesta.conf #----------------------------------------------------------# # Checking quota package -if [ ! -e "/usr/sbin/setquota" ]; then +quota=$(which --skip-alias --skip-functions quota 2>/dev/null) +if [ $? -ne 0 ]; then if [ -e "/etc/redhat-release" ]; then yum -y install quota >/dev/null 2>&1 check_result $? "quota package installation failed" $E_UPDATE @@ -35,34 +36,40 @@ fi # Action # #----------------------------------------------------------# -# Adding usrquota option on /home partition -mnt=$(df -P /home |awk '{print $6}' |tail -n1) -lnr=$(cat -n /etc/fstab |awk '{print $1,$3}' |grep "$mnt$" |cut -f 1 -d ' ') -options=$(sed -n ${lnr}p /etc/fstab |awk '{print $4}') -if [ -z "$(echo $options |grep usrquota)" ]; then - sed -i "$lnr s/$options/$options,usrquota/" /etc/fstab +# Adding group and user quota on /home partition +mnt=$(df -P /home | awk '{print $6}' | tail -n1) +lnr=$(cat -n /etc/fstab | awk '{print $1,$3}' | grep "$mnt$" | cut -f 1 -d ' ') +opt=$(sed -n ${lnr}p /etc/fstab | awk '{print $4}') +fnd='usrquota\|grpquota\|usrjquota=aquota.user\|grpjquota=aquota.group\|jqfmt=vfsv0' +if [ $(echo $opt | tr ',' '\n' | grep -x $fnd | wc -l) -ne 5 ]; then + old=$(echo $(echo $opt | tr ',' '\n' | grep -v 'usrquota\|grpquota\|usrjquota=\|grpjquota=\|jqfmt=') | tr ' ' ',') + new='usrquota,grpquota,usrjquota=aquota.user,grpjquota=aquota.group,jqfmt=vfsv0' + sed -i "$lnr s/$opt/$old,$new/" /etc/fstab mount -o remount $mnt fi -# Adding aquota.user file -if [ ! -e "$mnt/aquota.user" ]; then - quotacheck -cu $mnt >/dev/null 2>&1 +# Adding v2 group and user quota index +if [ ! -e "$mnt/aquota.user" ] || [ ! -e "$mnt/aquota.group" ]; then + quotaoff $mnt + quotacheck -cug $mnt >/dev/null 2>&1 + quotacheck -aug >/dev/null 2>&1 fi -# Building fs quota index -quotacheck -um $mnt +# Adding quotacheck on reboot +touch /forcequotacheck -# Adding weekly cron job -echo "quotacheck -um $mnt" > /etc/cron.daily/quotacheck +# Adding cron job +echo '#!/bin/bash' > /etc/cron.daily/quotacheck +echo 'touch /forcequotacheck' >> /etc/cron.daily/quotacheck chmod a+x /etc/cron.daily/quotacheck -# Enabling fs quota -if [ ! -z "$(quotaon -pa|grep " $mnt "|grep user|grep 'off')" ]; then +# Enabling group and user quota +if [ ! -z "$(quotaon -pa | grep " $mnt " | grep 'user\|group' | grep 'is off')" ]; then quotaon $mnt - check_result $? "quota can't be enabled in $mtn" $E_DISK + check_result $? "quota can't be enabled in $mnt" $E_DISK fi -# Updating DISK_QUOTA value +# Updating vesta.conf value if [ -z "$(grep DISK_QUOTA $VESTA/conf/vesta.conf)" ]; then echo "DISK_QUOTA='yes'" >> $VESTA/conf/vesta.conf else From 04f497d9329a17eaaed2685190435cd7400b4caa Mon Sep 17 00:00:00 2001 From: Ionescu Bogdan Date: Thu, 3 Dec 2015 03:08:36 +0200 Subject: [PATCH 235/264] Update v-delete-sys-quota - minor updates - see: v-add-sys-quota --- bin/v-delete-sys-quota | 39 ++++++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/bin/v-delete-sys-quota b/bin/v-delete-sys-quota index 13f23e9c8..61d18faa2 100755 --- a/bin/v-delete-sys-quota +++ b/bin/v-delete-sys-quota @@ -1,12 +1,12 @@ #!/bin/bash # info: delete system quota -# opions: NONE +# options: NONE # # The script disables filesystem quota on /home patition #----------------------------------------------------------# -# Variable&Function # +# Variable & Function # #----------------------------------------------------------# # Includes @@ -23,29 +23,34 @@ source $VESTA/conf/vesta.conf # Action # #----------------------------------------------------------# -# Deleting usrquota on /home partition -mnt=$(df -P /home |awk '{print $6}' |tail -n1) -lnr=$(cat -n /etc/fstab |awk '{print $1,$3}' |grep "$mnt$" |cut -f 1 -d ' ') -options=$(sed -n ${lnr}p /etc/fstab |awk '{print $4}') -if [ ! -z "$(echo $options |grep usrquota)" ]; then - sed -i "$lnr s/,usrquota//" /etc/fstab +# Deleting group and user quota on /home partition +mnt=$(df -P /home | awk '{print $6}' | tail -n1) +lnr=$(cat -n /etc/fstab | awk '{print $1,$3}' | grep "$mnt$" | cut -f 1 -d ' ') +opt=$(sed -n ${lnr}p /etc/fstab | awk '{print $4}') +fnd='usrquota\|grpquota\|usrjquota=\|grpjquota=\|jqfmt=' +if [ ! -z "$(echo $opt | grep $fnd)" ]; then + rep=$(echo $(echo $opt | tr ',' '\n' | grep -v $fnd) | tr ' ' ',') + sed -i "$lnr s/$opt/$rep/" /etc/fstab mount -o remount $mnt fi -# Disabling fs quota -if [ -z "$(quotaon -pa|grep " $mnt "|grep user|grep 'off')" ]; then - quotaoff $mnt +# Disabling group and user quota +quotaoff=$(which --skip-alias --skip-functions quotaoff 2>/dev/null) +if [ $? -eq 0 ]; then + if [ ! -z "$(quotaon -pa | grep " $mnt " | grep 'user\|group' | grep 'is on')" ]; then + $quotaoff $mnt + fi fi -# Deleting quota index -if [ -e "$mnt/aquota.user" ]; then - rm $mnt/aquota.user -fi +# Deleting v1 + v2 group and user quota index +for idx in $(echo 'quota.user quota.group aquota.user aquota.group'); do + [ -e "$mnt/$idx" ] && rm -f $mnt/$idx +done -# Deleting weekly cron job +# Deleting cron job rm -f /etc/cron.daily/quotacheck -# Updating DISK_QUOTA value +# Updating vesta.conf value if [ -z "$(grep DISK_QUOTA $VESTA/conf/vesta.conf)" ]; then echo "DISK_QUOTA='no'" >> $VESTA/conf/vesta.conf else From 4ede636e7369e309131aeb6079ddb3ccd9c6023c Mon Sep 17 00:00:00 2001 From: Olexandr Loskutov Date: Thu, 3 Dec 2015 22:53:01 +0200 Subject: [PATCH 236/264] Update vst-install-rhel.sh hotfix installer --- install/vst-install-rhel.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/vst-install-rhel.sh b/install/vst-install-rhel.sh index a39b481ee..593043fbb 100755 --- a/install/vst-install-rhel.sh +++ b/install/vst-install-rhel.sh @@ -876,7 +876,7 @@ fi if [ "$phpfpm" = 'yes' ]; then wget $vestacp/php-fpm/www.conf -O /etc/php-fpm.d/www.conf - chkconfig nginx on + chkconfig php-fpm on service php-fpm start check_result $? "php-fpm start failed" fi From 438f1714361a92c5ea80950da49ca7b20db4e560 Mon Sep 17 00:00:00 2001 From: Olexandr Loskutov Date: Fri, 4 Dec 2015 08:07:56 +0200 Subject: [PATCH 237/264] Update ua.php Full translate for current version VestaCP --- web/inc/i18n/ua.php | 212 ++++++++++++++++++++++---------------------- 1 file changed, 106 insertions(+), 106 deletions(-) diff --git a/web/inc/i18n/ua.php b/web/inc/i18n/ua.php index 35fa19f1e..876e9647f 100644 --- a/web/inc/i18n/ua.php +++ b/web/inc/i18n/ua.php @@ -320,8 +320,8 @@ $LANG['ua'] = array( 'netmask' => 'маска підмережі', 'interface' => 'інтерфейс', 'assigned user' => 'призначений користувач', - 'ns1' => 'сервер імен #1', - 'ns2' => 'сервер імен #2', + 'ns1' => 'сервер імен №1', + 'ns2' => 'сервер імен №2', 'user' => 'користувач', 'email' => 'пошта', 'first name' => 'Ім\'я', @@ -349,7 +349,7 @@ $LANG['ua'] = array( 'Banlist' => 'Чорний список', 'ranges are acceptable' => 'дозволені діапазони', 'CIDR format is supported' => 'формат CIDR підтримується', - 'Add one more Name Server' => 'Add one more Name Server', + 'Add one more Name Server' => 'Додати ще один сервер імен', 'unlimited' => 'безлімітний', '1 account' => ' 1 акаунт', @@ -424,7 +424,7 @@ $LANG['ua'] = array( 'DELETE_RULE_CONFIRMATION' => 'Ви впевнені, що хочете видалити правило #%s?', 'SUSPEND_RULE_CONFIRMATION' => 'Ви впевнені, що хочете заблокувати правило #%s?', 'UNSUSPEND_RULE_CONFIRMATION' => 'Ви впевнені, що хочете розблокувати правило #%s?', - 'LEAVE_PAGE_CONFIRMATION' => 'Leave Page?', + 'LEAVE_PAGE_CONFIRMATION' => 'Покинути сторінку?', 'RESTART_CONFIRMATION' => 'Ви впевнені, що хочете перезапустити %s?', 'Welcome' => 'Ласкаво просимо', 'LOGGED_IN_AS' => 'Ви увійшли як користувач %s', @@ -486,120 +486,120 @@ $LANG['ua'] = array( 'Nov' => 'Лист', 'Dec' => 'Груд', - 'Configuring Server' => 'Налаштування Серверу', + 'Configuring Server' => 'Налаштування серверу', 'Hostname' => 'Ім\'я хоста', 'Time Zone' => 'Часовий Пояс', 'Default Language' => 'Мова за замовчуванням', - 'FileSystem Disk Quota' => 'FileSystem Disk Quota', + 'FileSystem Disk Quota' => 'Дискова квота файлової системи', 'Vesta Control Panel Plugins' => 'Плагіни Vesta Control Panel', 'preview' => 'прев\'ю', 'Reseller Role' => 'Реселер', - 'Web Config Editor' => 'Веб Редактор Конфігів', - 'Template Manager' => 'Менеджер Шаблонів', - 'Backup Migration Manager' => 'Менеджер Міграції Бекапів', - 'FileManager' => 'Файл Менеджер', + 'Web Config Editor' => 'Редактор веб конфігів', + 'Template Manager' => 'Менеджер шаблонів', + 'Backup Migration Manager' => 'Менеджер міграції бекапів', + 'FileManager' => 'Файловий менеджер', 'show: CPU / MEM / NET / DISK' => 'show: CPU / MEM / NET / DISK', - 'sort by' => 'sort by', - 'Date' => 'Date', - 'Starred' => 'Starred', - 'Name' => 'Name', + 'sort by' => 'сортуваня', + 'Date' => 'Дата', + 'Starred' => 'Обране', + 'Name' => 'Ім\'я', - 'File Manager' => 'File Manager', - 'type' => 'type', - 'size' => 'size', - 'date' => 'date', - 'name' => 'name', - 'Initializing' => 'Initializing', - 'UPLOAD' => 'UPLOAD', - 'NEW FILE' => 'NEW FILE', - 'NEW DIR' => 'NEW DIR', - 'DELETE' => 'DELETE', - 'RENAME' => 'RENAME', - 'COPY' => 'COPY', - 'ARCHIVE' => 'ARCHIVE', - 'EXTRACT' => 'EXTRACT', - 'DOWNLOAD' => 'DOWNLOAD', - 'Hit' => 'Hit', - 'to reload the page' => 'to reload the page', - 'Directory name cannot be empty' => 'Directory name cannot be empty', - 'File name cannot be empty' => 'File name cannot be empty', - 'No file selected' => 'No file selected', - 'No file or folder selected' => 'No file or folder selected', - 'File type not supported' => 'File type not supported', - 'Directory download not available in current version' => 'Directory download not available in current version', - 'Directory not available' => 'Directory not available', - 'Done' => 'Done', - 'Close' => 'Close', - 'Copy' => 'Copy', - 'Cancel' => 'Cancel', - 'Rename' => 'Rename', - 'Delete' => 'Delete', - 'Extract' => 'Extract', - 'Create' => 'Create', - 'Compress' => 'Compress', + 'File Manager' => 'Файловий менеджер', + 'type' => 'тип', + 'size' => 'розмір', + 'date' => 'дата', + 'name' => 'ім\'я', + 'Initializing' => 'Ініціалізація', + 'UPLOAD' => 'ВИВАНТАЖИТИ', + 'NEW FILE' => 'НОВИЙ ФАЙЛ', + 'NEW DIR' => 'НОВА ТЕКА', + 'DELETE' => 'ВИДАЛИТИ', + 'RENAME' => 'ПЕРЕЙМЕНУВАТИ', + 'COPY' => 'КОПІЮВАТИ', + 'ARCHIVE' => 'АРХІВУВАТИ', + 'EXTRACT' => 'РОЗПАКУВАТИ', + 'DOWNLOAD' => 'ЗАВАНТАЖИТИ', + 'Hit' => 'Натиснути', + 'to reload the page' => 'щоб перезавантажити сторінку', + 'Directory name cannot be empty' => 'Ім\'я теки не може бути порожнім ', + 'File name cannot be empty' => 'Ім\'я файлу не може бути порожнім', + 'No file selected' => 'Файл не обрано', + 'No file or folder selected' => 'Файл чи теку не обрано', + 'File type not supported' => 'Тип файлу не підтримується', + 'Directory download not available in current version' => 'Завантаження тек не доступне в поточній версії', + 'Directory not available' => 'Тека не доступна', + 'Done' => 'Виконано', + 'Close' => 'Закрити', + 'Copy' => 'Копіювати', + 'Cancel' => 'Відмінити', + 'Rename' => 'Перейменувати', + 'Delete' => 'Видалити', + 'Extract' => 'Розпакувати', + 'Create' => 'Створити', + 'Compress' => 'Стиснути', 'OK' => 'OK', - 'Are you sure you want to copy' => 'Are you sure you want to copy', - 'Are you sure you want to delete' => 'Are you sure you want to delete', - 'into' => 'into', - 'existing files will be replaced' => 'existing files will be replaced', - 'Original name' => 'Original name', - 'File' => 'File', - 'already exists' => 'already exists', - 'Create file' => 'Create file', - 'Create directory' => 'Create directory', + 'Are you sure you want to copy' => 'Ви впевнені, що хочете скопіювати', + 'Are you sure you want to delete' => 'Ви впевнені, що хочете видалити', + 'into' => 'до', + 'existing files will be replaced' => 'існуючі файли будуть перезаписані', + 'Original name' => 'Справжнє ім\'я', + 'File' => 'Файл', + 'already exists' => 'вже існує', + 'Create file' => 'Створити файл', + 'Create directory' => 'Створити теку', - 'Add New object' => 'Add New object', - 'Save Form' => 'Save Form', - 'Cancel saving form' => 'Cancel saving form', - 'Go to USER list' => 'Go to USER list', - 'Go to WEB list' => 'Go to WEB list', - 'Go to DNS list' => 'Go to DNS list', - 'Go to MAIL list' => 'Go to MAIL list', - 'Go to DB list' => 'Go to DB list', - 'Go to CRON list' => 'Go to CRON list', - 'Go to BACKUP list' => 'Go to BACKUP list', - 'Focus on search' => 'Focus on search', - 'Display/Close shortcuts' => 'Display/Close shortcuts', - 'Move backward through top menu' => 'Move backward through top menu', - 'Move forward through top menu' => 'Move forward through top menu', - 'Enter focused element' => 'Enter focused element', + 'Add New object' => 'Додати Новий Об\'єкт', + 'Save Form' => 'Зберегти форму', + 'Cancel saving form' => 'Відмінити збереження форми', + 'Go to USER list' => 'Перейти до USER', + 'Go to WEB list' => 'Перейти до WEB', + 'Go to DNS list' => 'Перейти до DNS', + 'Go to MAIL list' => 'Перейти до MAIL', + 'Go to DB list' => 'Перейти до DB', + 'Go to CRON list' => 'Перейти до CRON', + 'Go to BACKUP list' => 'Перейти до BACKUP', + 'Focus on search' => 'Фокус на пошуку', + 'Display/Close shortcuts' => 'Показати/Приховати скорочення', + 'Move backward through top menu' => 'Фокус на попередній пункт меню', + 'Move forward through top menu' => 'Фокус на наступний пункт меню', + 'Enter focused element' => 'Перейти до активного пункту меню', - 'Upload' => 'Upload', - 'New File' => 'New File', - 'New Folder' => 'New Folder', - 'Download' => 'Download', - 'Rename' => 'Rename', - 'Copy' => 'Copy', - 'Archive' => 'Archive', - 'Delete' => 'Delete', - 'Save File (in text editor)' => 'Save File (in text editor)', - 'Close Popup / Cancel' => 'Close Popup / Cancel', - 'Move Cursor Up' => 'Move Cursor Up', - 'Move Cursor Dow' => 'Move Cursor Dow', - 'Switch to Left Tab' => 'Switch to Left Tab', - 'Switch to Right Tab' => 'Switch to Right Tab', - 'Switch Tab' => 'Switch Tab', - 'Go to the Top of File List' => 'Go to the Top of File List', - 'Go to the Last File' => 'Go to the Last File', - 'Open File/Enter Directory' => 'Open File/Enter Directory', - 'Go to Parent Directory' => 'Go to Parent Directory', - 'Select Current File' => 'Select Current File', - 'Select Bunch of Files' => 'Select Bunch of Files', - 'Append File to the Current Selection' => 'Append File to the Current Selection', - 'Select All Files' => 'Select All Files', + 'Upload' => 'Відвантажити', + 'New File' => 'Новий файл', + 'New Folder' => 'Нова тека', + 'Download' => 'Завантажити', + 'Rename' => 'Перейменувати', + 'Copy' => 'Копіювати', + 'Archive' => 'Архівувати', + 'Delete' => 'Видалити', + 'Save File (in text editor)' => 'Зберегти файл (у текстовому редакторі)', + 'Close Popup / Cancel' => 'Приховати підказки / Відмінити', + 'Move Cursor Up' => 'Перемістити курсор догори', + 'Move Cursor Dow' => 'Перемістити курсор донизу', + 'Switch to Left Tab' => 'Перейти до лівої панелі', + 'Switch to Right Tab' => 'Перейти до правої панелі', + 'Switch Tab' => 'Перехід до панелі', + 'Go to the Top of File List' => 'Перейти до початку списку файлів', + 'Go to the Last File' => 'Перейти до останнього файлу', + 'Open File/Enter Directory' => 'Відкрити файл/Перейти до теки', + 'Go to Parent Directory' => 'Перейти до батьківської теки', + 'Select Current File' => 'Обрати поточний файл', + 'Select Bunch of Files' => 'Обрати групу файлів', + 'Append File to the Current Selection' => 'Додати файл до поточного вибору', + 'Select All Files' => 'Обрати всі файл', 'shortcuts are inspired by magnificent GNU Midnight Commander file manager' => - 'shortcuts are inspired by magnificent GNU Midnight Commander file manager', + 'скорочення запозичені у чудового GNU файлового менеджера Midnight Commander', - 'Licence Key' => 'Licence Key', - 'Enter License Key' => 'Enter License Key', - 'Buy Licence' => 'Buy Licence', - 'Buy Lifetime License' => 'Buy Lifetime License', - 'Disable and Cancel Licence' => 'Disable and Cancel Licence', - 'Licence Activated' => 'Licence Activated', - 'Licence Deactivated' => 'Licence Deactivated', - 'Restrict users so that they cannot use SSH and access only their home directory.' => 'Restrict users so that they cannot use SSH and access only their home directory.', - 'Browse, copy, edit, view, and retrieve all of your web domain files using fully featured File Manager.' => 'Browse, copy, edit, view, and retrieve all of your web domain files using fully featured File Manager.', - 'This is a commercial module, you would need to purchace license key to enable it.' => 'This is a commercial module, you would need to purchace license key to enable it.' + 'Licence Key' => 'Ліцензійний ключ', + 'Enter License Key' => 'Ввести ліцензійний ключ', + 'Buy Licence' => 'Прибдати ліцензію', + 'Buy Lifetime License' => 'Придбати вічну ліцензію', + 'Disable and Cancel Licence' => 'Відключити і відмінити ліцензію', + 'Licence Activated' => 'Ліцензію активовано', + 'Licence Deactivated' => 'Ліцензію декативовано', + 'Restrict users so that they cannot use SSH and access only their home directory.' => 'Обмежити користувачів так, що вони не можуть використовувати SSH і матимуть доступ тільки до домашньої директорії.', + 'Browse, copy, edit, view, and retrieve all of your web domain files using fully featured File Manager.' => 'Переглядайте, копіюйте, редагуйте, переглядайте і відновлюйте всі файли веб-доменів за допомогою повнофункціонального файлового менеджеру.', + 'This is a commercial module, you would need to purchace license key to enable it.' => 'Це комерційний модуль, вам потрібно буде придбати ліцензійний ключ, щоб включити його.' -); \ No newline at end of file +); From 36784316c6d7ba32da02cf4387d76a4b3921f337 Mon Sep 17 00:00:00 2001 From: Ionescu Bogdan Date: Fri, 4 Dec 2015 20:50:53 +0200 Subject: [PATCH 238/264] Update ro.php The correct translation for romanian language. --- web/inc/i18n/ro.php | 591 ++++++++++++++++++++++---------------------- 1 file changed, 297 insertions(+), 294 deletions(-) diff --git a/web/inc/i18n/ro.php b/web/inc/i18n/ro.php index 7040ddf94..a5fe034b3 100644 --- a/web/inc/i18n/ro.php +++ b/web/inc/i18n/ro.php @@ -3,49 +3,49 @@ * Vesta language file * skid (skid@vestacp.com) * bbl (sergiu.badan@gmail.com) + * Ionescu Bogdan | https://github.com/ionescu-bogdan */ $LANG['ro'] = array( - 'Packages' => 'Pachete', - 'IP' => 'IP', - 'Graphs' => 'Graficele', + 'IP' => 'IP-uri', + 'Graphs' => 'Grafice', 'Statistics' => 'Statistică', - 'Log' => 'Log', + 'Log' => 'Jurnal', 'Server' => 'Server', 'Services' => 'Servicii', 'Firewall' => 'Firewall', 'Updates' => 'Actualizări', - 'Log in' => 'Log in', - 'Log out' => 'Log out', + 'Log in' => 'Login', # Translation is `Autentificare`, but also `Login` is corect + 'Log out' => 'Logout', # Translation is `Ieșire`, but also `Logout` is corect - 'USER' => 'USER', + 'USER' => 'CONT', # Translation is `UTILIZATOR`, but it is too long 'WEB' => 'WEB', 'DNS' => 'DNS', - 'MAIL' => 'MAIL', - 'DB' => 'DB', + 'MAIL' => 'E-MAIL', + 'DB' => 'BD', 'CRON' => 'CRON', 'BACKUP' => 'BACKUP', - 'Add User' => 'Adăugare utilizator', - 'Add Domain' => 'Adăugare domeniu', - 'Add Web Domain' => 'Adăugare domeniu', - 'Add DNS Domain' => 'Adăugare domeniu', - 'Add DNS Record' => 'Adăugare', - 'Add Mail Domain' => 'Adăugare domeniu', - 'Add Mail Account' => 'Adăugare countul', - 'Add Database' => 'Adăugare BD', - 'Add Cron Job' => 'Adăugare sarcină', - 'Create Backup' => 'Creare un backup', + 'Add User' => 'Adăugare Utilizator', + 'Add Domain' => 'Adăugare Domeniu', + 'Add Web Domain' => 'Adăugare Domeniu WEB', + 'Add DNS Domain' => 'Adăugare Domeniu DNS', + 'Add DNS Record' => 'Adăugare Înregistrare DNS', + 'Add Mail Domain' => 'Adăugare Domeniu E-MAIL', + 'Add Mail Account' => 'Adăugare Cont de e-mail', + 'Add Database' => 'Adăugare Baza de Date', + 'Add Cron Job' => 'Adăugare Sarcină', + 'Create Backup' => 'Creare Backup', 'Configure' => 'Configurare', - 'Restore All' => 'Restaurare toate', - 'Add Package' => 'Adăugare pachet', + 'Restore All' => 'Restaurează Tot', + 'Add Package' => 'Adăugare Pachet', 'Add IP' => 'Adăugare IP', - 'Add Rule' => 'Adăugare regulă', - 'Ban IP Address' => 'Blocare IP', + 'Add Rule' => 'Adăugare Regulă', + 'Ban IP Address' => 'Blocare Adresă IP', 'Search' => 'Сăutare', - 'Add one more FTP Account' => 'Inca un FTP count', - 'Overall Statistics' => 'Statistică rezumativă', + 'Add one more FTP Account' => 'Adaugă încă un cont FTP', + 'Overall Statistics' => 'Statistică Generală', 'Daily' => 'Zilnic', 'Weekly' => 'Săptămânal', 'Monthly' => 'Lunar', @@ -56,89 +56,89 @@ $LANG['ro'] = array( 'Submit' => 'OK', 'toggle all' => 'selectează toate', - 'apply to selected' => 'aplică la selectat', - 'rebuild' => 'reconstrui', - 'rebuild web' => 'reconstrui WEB', - 'rebuild dns' => 'reconstrui DNS', - 'rebuild mail' => 'reconstrui MAIL', - 'rebuild db' => 'reconstrui DB', - 'rebuild cron' => 'reconstrui CRON', - 'update counters' => 'actualizeze contoare', + 'apply to selected' => 'aplică la selecție', + 'rebuild' => 'reconstruire', + 'rebuild web' => 'reconstruire WEB', + 'rebuild dns' => 'reconstruire DNS', + 'rebuild mail' => 'reconstruire MAIL', + 'rebuild db' => 'reconstruire DB', + 'rebuild cron' => 'reconstruire CRON', + 'update counters' => 'actualizare contoare', 'suspend' => 'suspendare', - 'unsuspend' => 'unsuspendeze', + 'unsuspend' => 'activare', 'delete' => 'ștergere', - 'show per user' => 'arata pentru utilizator', + 'show per user' => 'arată pentru utilizator', 'login as' => 'intră ca', 'logout' => 'logout', 'edit' => 'editare', - 'open webstats' => 'deschide raportul de analiză', - 'view logs' => 'vizualiza loguri', + 'open webstats' => 'vizualizare statistica', + 'view logs' => 'vizualizare jurnale', 'list records' => 'arată inregistrarile: %s', 'add record' => 'adaugă înregistrare', 'list accounts' => 'arata conturi: %s', - 'add account' => 'adaugă contul', + 'add account' => 'adaugă cont', 'open webmail' => 'deschide webmail', - 'list fail2ban' => 'arată fail2ban', + 'list fail2ban' => 'afișare fail2ban', 'open %s' => 'deschide %s', - 'download' => 'descărca', - 'restore' => 'restabili', + 'download' => 'descarcă', + 'restore' => 'restabilește', 'configure restore settings' => 'configurare parametri de restaurare', 'stop' => 'oprește', 'start' => 'pornește', 'restart' => 'repornește', - 'update' => 'actualiza', + 'update' => 'actualizează', 'generate' => 'generează', - 'Generate CSR' => 'Genera cere CSR', + 'Generate CSR' => 'Generează CSR', 'reread IP' => 'recitește IP', - 'enable autoupdate' => 'activa autoupdate', - 'disable autoupdate' => 'deactiva autoupdate', - 'turn on notifications' => 'activa notificarea', - 'turn off notifications' => 'deactiva notificarea', + 'enable autoupdate' => 'activează actualizarea automată', + 'disable autoupdate' => 'dezactivează actualizarea automată', + 'turn on notifications' => 'activează notificarile', + 'turn off notifications' => 'dezactivează notificarile', - 'Adding User' => 'Adăugare utilizator', - 'Editing User' => 'Editare utilizator', - 'Adding Domain' => 'Adăugare domeniu', - 'Editing Domain' => 'Editare domeniu', - 'Adding DNS Domain' => 'Adăugare domeniu DNS', - 'Editing DNS Domain' => 'Editare domeniu DNS', - 'Adding DNS Record' => 'Adăugare de înregistrare DNS', - 'Editing DNS Record' => 'Editare de înregistrare DNS', - 'Adding Mail Domain' => 'Adăugare domeniu poștal', - 'Editing Mail Domain' => 'Editare domeniu poștal', - 'Adding Mail Account' => 'Adăugare contul de poștă electronică', - 'Editing Mail Account' => 'Editare contul de poștă electronică', - 'Adding database' => 'Adăugare baze de date', - 'Editing Database' => 'Editare baze de date', - 'Adding Cron Job' => 'Adăugare sarcina cron', - 'Editing Cron Job' => 'Editare sarcina cron', - 'Adding Package' => 'Adăugare pachetul', - 'Editing Package' => 'Editare pachetul', - 'Adding IP address' => 'Adăugare adresă IP', - 'Editing IP Address' => 'Editare adresă IP', - 'Editing Backup Exclusions' => 'Editare excluderi', + 'Adding User' => 'Adăugare Utilizator', + 'Editing User' => 'Editare Utilizator', + 'Adding Domain' => 'Adăugare Domeniu', + 'Editing Domain' => 'Editare Domeniu', + 'Adding DNS Domain' => 'Adăugare Domeniu DNS', + 'Editing DNS Domain' => 'Editare Domeniu DNS', + 'Adding DNS Record' => 'Adăugare Înregistrare DNS', + 'Editing DNS Record' => 'Editare Înregistrare DNS', + 'Adding Mail Domain' => 'Adăugare Domeniu E-MAIL', + 'Editing Mail Domain' => 'Editare Domeniu E-MAIL', + 'Adding Mail Account' => 'Adăugare Cont de E-mail', + 'Editing Mail Account' => 'Editare Cont de E-mail', + 'Adding database' => 'Adăugare Baze de Date', + 'Editing Database' => 'Editare Baze de Date', + 'Adding Cron Job' => 'Adăugare Sarcină', + 'Editing Cron Job' => 'Editare Sarcină', + 'Adding Package' => 'Adăugare Pachet', + 'Editing Package' => 'Editare Pachet', + 'Adding IP address' => 'Adăugare Adresă IP', + 'Editing IP Address' => 'Editare Adresă IP', + 'Editing Backup Exclusions' => 'Editare Excluderi din Backup', 'Generating CSR' => 'Generare CSR', 'Listing' => 'Vizualizare', - 'Search Results' => 'Rezultatele căutării', - 'Adding Firewall Rule' => 'Adăugare regulă', - 'Editing Firewall Rule' => 'Editare regulă', - 'Adding IP Address to Banlist' => 'Blocarea IP', + 'Search Results' => 'Rezultate Căutări', + 'Adding Firewall Rule' => 'Adăugare Regulă', + 'Editing Firewall Rule' => 'Editare Regulă', + 'Adding IP Address to Banlist' => 'Adăugare Adresă IP în Listă', 'active' => 'activ', 'spnd' => 'suspendat', 'suspended' => 'suspendat', 'running' => 'rulează', 'stopped' => 'oprit', - 'outdated' => 'depășit', + 'outdated' => 'învechit', 'updated' => 'actualizat', 'yes' => 'da', 'no' => 'nu', 'none' => 'nu', - 'pb' => 'pb', - 'tb' => 'tb', - 'gb' => 'gb', - 'mb' => 'mb', - 'minute' => 'minuta', + 'pb' => 'Pb', + 'tb' => 'Tb', + 'gb' => 'Gb', + 'mb' => 'Mb', + 'minute' => 'minute', 'hour' => 'oră', 'day' => 'zi', 'days' => 'zile', @@ -146,57 +146,57 @@ $LANG['ro'] = array( 'minutes' => 'minute', 'month' => 'lună', 'package' => 'pachet', - 'Bandwidth' => 'Trafic', - 'Disk' => 'Disk', + 'Bandwidth' => 'Trafic Rețea', + 'Disk' => 'Spațiu Disc', 'Web' => 'Web', - 'Mail' => 'Poștă', + 'Mail' => 'E-mail', 'Databases' => 'Baze de date', 'User Directories' => 'Fișiere', 'Template' => 'Șablon', - 'Web Template' => 'Șablonul Web', - 'Backend Template' => 'Șablonul Backend', - 'Proxy Template' => 'Șablonul Proxy', - 'DNS Template' => 'Șablonul DNS', - 'Web Domains' => 'Domenii web', + 'Web Template' => 'Șablon WEB', + 'Backend Template' => 'Șablon BACKEND', + 'Proxy Template' => 'Șablon PROXY', + 'DNS Template' => 'Șablon DNS', + 'Web Domains' => 'Domenii WEB', 'SSL Domains' => 'Domenii SSL', - 'Web Aliases' => 'Aliasuri web', + 'Web Aliases' => 'Aliasuri WEB', 'per domain' => 'per domeniu', - 'DNS Domains' => 'Domenii DNS', + 'DNS domains' => 'Domenii DNS', 'DNS Domains' => 'Domenii DNS', 'DNS records' => 'Înregistrări DNS', 'Name Servers' => 'Servere NS', - 'Mail Domains' => 'Domenii de poștă', - 'Mail Accounts' => 'Conturi de poștă', - 'Cron Jobs' => 'Sarcini cron', + 'Mail Domains' => 'Domenii E-MAIL', + 'Mail Accounts' => 'Conturi de e-mail', + 'Cron Jobs' => 'Sarcini CRON', 'SSH Access' => 'Acces SSH', 'IP Addresses' => 'Adrese IP', - 'Backups' => 'Copii de rezervă', + 'Backups' => 'BACKUP-uri', 'Backup System' => 'Sistem de backup', 'backup exclusions' => 'excluderi', 'template' => 'șablon', - 'SSL Support' => 'Support SSL', - 'SSL Home Directory' => 'Mapa SSL', - 'Proxy Support' => 'Support Proxy', + 'SSL Support' => 'Suport SSL', + 'SSL Home Directory' => 'Director Rădăcină SSL', + 'Proxy Support' => 'Suport PROXY', 'Proxy Extensions' => 'Extensii Proxy', - 'Web Statistics' => 'Statistici web', + 'Web Statistics' => 'Statistică WEB', 'Additional FTP Account' => 'Cont suplimentar FTP', 'SOA' => 'SOA', 'TTL' => 'TTL', 'Expire' => 'Expiră', - 'Records' => 'DNS înregistrări', - 'Catchall email' => 'E-mail catchall', - 'AntiVirus Support' => 'Antivirus', - 'AntiSpam Support' => 'Antispam', - 'DKIM Support' => 'DKIM', + 'Records' => 'Înregistrări', + 'Catchall email' => 'Adresă implicită (catchall)', + 'AntiVirus Support' => 'Suport Antivirus', + 'AntiSpam Support' => 'Suport Antispam', + 'DKIM Support' => 'Suport DKIM', 'Accounts' => 'Conturi', - 'Quota' => 'cotă', + 'Quota' => 'Spațiu Disc', 'Autoreply' => 'Răspuns automat', - 'Forward to' => 'Forward', - 'Do not store forwarded mail' => 'A nu se salva mesajele redirecționate', + 'Forward to' => 'Redirectare către', + 'Do not store forwarded mail' => 'Redirectare fără stocare email', 'database' => 'baza de date', 'User' => 'Utilizator', 'Host' => 'Host', - 'Charset' => 'Setul de caractere', + 'Charset' => 'Set de caractere', 'Min' => 'Min', 'Hour' => 'Oră', 'Day' => 'Zi', @@ -204,41 +204,45 @@ $LANG['ro'] = array( 'Day of week' => 'Ziua săptămânii', 'local' => 'local', 'Run Time' => 'Executat în', - 'Backup Size' => 'Mărime de backup', + 'Backup Size' => 'Mărime Backup', 'SYS' => 'Sistem', 'Domains' => 'Domenii', - 'Status' => 'Starea', - 'shared' => 'comună', + 'Status' => 'Stare', + 'shared' => 'comun', 'dedicated' => 'dedicat', 'Owner' => 'Proprietar', 'Users' => 'Utilizatori', - 'Load Average' => 'Load Average', - 'Memory Usage' => 'Utilizare de memorie', - 'HTTPD Usage' => 'HTTPD', - 'NGINX Usage' => 'Proxy', - 'MySQL Usage on localhost' => 'MySQL', - 'PostgreSQL Usage on localhost' => 'PostgreSQL', - 'Bandwidth Usage eth0' => 'Utilizare rețelei eth0', - 'FTP Usage' => 'FTP ', - 'SSH Usage' => 'SSH', + 'Load Average' => 'Medie Încărcare', + 'Memory Usage' => 'Utilizare RAM', + 'HTTPD Usage' => 'Utilizare HTTPD', + 'NGINX Usage' => 'Utilizare NGINX', + 'MySQL Usage on localhost' => 'Utilizare MySQL (localhost)', + 'PostgreSQL Usage on localhost' => 'Utilizare PostgreSQL (localhost)', + 'Bandwidth Usage eth0' => 'Utilizare Rețea eth0', + 'Bandwidth Usage eth1' => 'Utilizare Rețea eth1', + 'Bandwidth Usage eth2' => 'Utilizare Rețea eth2', + 'Bandwidth Usage eth3' => 'Utilizare Rețea eth3', + 'FTP Usage' => 'Utilizare FTP ', + 'SSH Usage' => 'Utilizare SSH', + 'Exim Usage' => 'Utilizare Exim', 'reverse proxy' => 'proxy inversă', 'web server' => 'server web', 'dns server' => 'server dns', - 'mail server' => 'serverul de poștă', + 'mail server' => 'server e-mail', 'pop/imap server' => 'server pop/imap', - 'email antivirus' => 'e-mail antivirus', - 'email antispam' => 'e-mail antispam', - 'database server' => 'server de baze de date', + 'email antivirus' => 'antivirus e-mail', + 'email antispam' => 'antispam e-mail', + 'database server' => 'server baze de date', 'ftp server' => 'server ftp', - 'job scheduler' => 'job scheduler', + 'job scheduler' => 'sarcină programată', 'CPU' => 'CPU', - 'Memory' => 'Memorie', - 'Uptime' => 'Uptime', - 'core package' => 'pachetul de bază', - 'php interpreter' => 'php interpret', - 'internal web server' => 'serverul web intern', + 'Memory' => 'RAM', + 'Uptime' => 'UPTIME', + 'core package' => 'pachet bază', + 'php interpreter' => 'interpretor php', + 'internal web server' => 'server web intern', 'Version' => 'Versiune', - 'Release' => 'Release', + 'Release' => 'Lansare', 'Architecture' => 'Arhitectură', 'Object' => 'Obiect', 'Owner' => 'Proprietar', @@ -247,279 +251,279 @@ $LANG['ro'] = array( 'Email' => 'E-mail', 'Package' => 'Pachet', 'Language' => 'Limbă', - 'First Name' => 'Nume', - 'Last Name' => 'Prenume', - 'Send login credentials to email address' => 'Trimite datele de autentificare la adresa', + 'First Name' => 'Prenume', + 'Last Name' => 'Nume', + 'Send login credentials to email address' => 'Trimite datele de autentificare la adresa de e-mail', 'Default Template' => 'Șablon implicit', - 'Default Name Servers' => 'Serverele NS', + 'Default Name Servers' => 'Serverele NS implicite', 'Domain' => 'Domeniu', - 'DNS Support' => 'Support DNS', - 'Mail Support' => 'Support E-mail', + 'DNS Support' => 'Suport DNS', + 'Mail Support' => 'Suport E-MAIL', 'Advanced options' => 'Opțiuni avansate', 'Aliases' => 'Aliasuri', 'SSL Certificate' => 'Certificat SSL', 'SSL Key' => 'Cheia SSL', - 'SSL Certificate Authority / Intermediate' => 'SSL Intermediar / Certificate Authority', + 'SSL Certificate Authority / Intermediate' => 'SSL Certificate Authority / Intermediar', 'SSL CSR' => 'Cerere CSR', 'optional' => 'opțional', 'internal' => 'intern', - 'Statistics Authorization' => 'Autorizarea statistici', - 'Statistics Auth' => 'Autorizarea statistici', + 'Statistics Authorization' => 'Autorizare pt. Statistică', + 'Statistics Auth' => 'Autorizare pt. Statistică', 'Account' => 'Cont', - 'Prefix will be automaticaly added to username' => 'Prefix %s va fi adăugat automat la numele de utilizator', - 'Send FTP credentials to email' => 'Trimite datele FTP la e-mail', - 'Expiration Date' => 'Data de expirare', - 'YYYY-MM-DD' => 'AAAA-LL-ZZ', + 'Prefix will be automaticaly added to username' => 'Prefixul %s va fi adăugat automat la numele de utilizator', + 'Send FTP credentials to email' => 'Trimite datele FTP la adresa de e-mail', + 'Expiration Date' => 'Data de Expirare', + 'YYYY-MM-DD' => 'YYYY-MM-DD', 'Name servers' => 'Server NS', - 'Record' => 'Înregistrare / Subdomeniu', - 'IP or Value' => 'IP adresa sau valoare', + 'Record' => 'Înregistrare', + 'IP or Value' => 'IP sau Valoare', 'Priority' => 'Prioritate', - 'Record Number' => 'Numărul de înregistrare', - 'in megabytes' => 'în mb.', + 'Record Number' => 'Număr Înregistrare', + 'in megabytes' => 'în Mb', 'Message' => 'Mesaj', 'use local-part' => 'doar nume de cont înainte de @', 'one or more email addresses' => 'una sau mai multe adrese de e-mail', - 'Prefix will be automaticaly added to database name and database user' => 'Prefix %s va fi adăugat automat la numele bazei de date si utilizatorul', + 'Prefix will be automaticaly added to database name and database user' => 'Prefixul %s va fi adăugat automat la numele bazei de date si la utilizator', 'Database' => 'Baza de date', 'Type' => 'Tip', 'Minute' => 'Minut', 'Command' => 'Comandă', - 'Package Name' => 'Denumire pachetului', - 'Netmask' => 'Masca de rețea', + 'Package Name' => 'Nume Pachet', + 'Netmask' => 'Masca rețea', 'Interface' => 'Interfață', - 'Shared' => 'Comună', + 'Shared' => 'Comun', 'Assigned user' => 'Utilizator asignat', 'Assigned domain' => 'Domeniu asignat', 'NAT IP association' => 'Asociere IP NAT', - 'shell' => 'access ssh', + 'shell' => 'shell', 'web domains' => 'domenii web', 'web aliases' => 'aliasuri web', 'dns records' => 'înregistrări dns', - 'mail domains' => 'domenii de poștă', - 'mail accounts' => 'conturi de poștă', + 'mail domains' => 'domenii e-mail', + 'mail accounts' => 'conturi e-mail', 'accounts' => 'conturi', 'databases' => 'baze de date', 'cron jobs' => 'sarcini cron', - 'backups' => 'copii de rezervă', + 'backups' => 'backup-uri', 'quota' => 'cotă', 'day of week' => 'ziua săptămânii', 'cmd' => 'comandă', - 'users' => 'utilizatorii', + 'users' => 'utilizatori', 'domains' => 'domenii', 'aliases' => 'aliasuri', 'records' => 'înregistrări', - 'jobs' => 'sarcinile', + 'jobs' => 'sarcini', 'username' => 'utilizator', 'password' => 'parolă', 'type' => 'tip', - 'charset' => 'setul de caractere', + 'charset' => 'set de caractere', 'domain' => 'domeniu', 'ip' => 'IP', - 'ip address' => 'IP adresa', - 'IP address' => 'IP adresa', - 'netmask' => 'masca de rețea', - 'interface' => 'interfața', + 'ip address' => 'adresa ip', + 'IP address' => 'Adresa IP', + 'netmask' => 'masca rețea', + 'interface' => 'interfață', 'assigned user' => 'utilizator asignat', 'ns1' => 'ns1', 'ns2' => 'ns2', 'user' => 'utilizator', 'email' => 'e-mail', - 'first name' => 'nume', - 'last name' => 'prenume', + 'first name' => 'prenume', # In Romanian language `first name` is `last name` + 'last name' => 'nume', # In Romanian language `last name` is `first name` 'account' => 'cont', 'ssl certificate' => 'certificat SSL', 'ssl key' => 'cheia SSL', - 'stats user password' => 'parola de utilizator statistici', - 'stats username' => 'nume de utilizator statistici', - 'stats password' => 'parola de utilizator statistici', - 'ftp user password' => 'parola de FTP', - 'ftp user' => 'cont FTP', - 'Last 70 lines of %s.%s.log' => 'Ultimele 70 linii de %s.%s.log', + 'stats user password' => 'parola de utilizator pt. statistici', + 'stats username' => 'nume de utilizator pt. statistici', + 'stats password' => 'parola de utilizator pt. statistici', + 'ftp user password' => 'parola de utilizator pt. FTP', + 'ftp user' => 'utilizator FTP', + 'Last 70 lines of %s.%s.log' => 'Ultimele 70 de linii ale %s.%s.log', 'Download AccessLog' => 'Descarcă AccessLog', 'Download ErrorLog' => 'Descarcă ErrorLog', 'Country' => 'Țară', '2 letter code' => 'cod de 2 litere', - 'State / Province' => 'Județ', + 'State / Province' => 'Stat / Provincie / Județ', 'City / Locality' => 'Oraș / Localitate', 'Organization' => 'Organizație', 'Action' => 'Acțiune', 'Protocol' => 'Protocol', 'Port' => 'Port', 'Comment' => 'Comentariu', - 'Banlist' => 'Banlist', - 'ranges are acceptable' => 'intervale sunt acceptabile', - 'CIDR format is supported' => 'format CIDR este suportat', - 'Add one more Name Server' => 'Add one more Name Server', + 'Banlist' => 'Blocare', + 'ranges are acceptable' => 'intervalele sunt acceptate', + 'CIDR format is supported' => 'formatul CIDR este suportat', + 'Add one more Name Server' => 'Adaugă unul sau mai multe servere NS', - 'unlimited' => 'unlimited', + 'unlimited' => 'nelimitat', '1 account' => '1 utilizator', '%s accounts' => '%s utilizatori', '1 domain' => '1 domeniu', '%s domains' => '%s domenii', - '1 record' => '1 înregistra', + '1 record' => '1 înregistrare', '%s records' => '%s înregistrări', - '1 mail account' => '1 cont de poștă', - '%s mail accounts' => '%s conturi de poștă', - '1 database' => '1 baza de date', + '1 mail account' => '1 cont de e-mail', + '%s mail accounts' => '%s conturi de e-mail', + '1 database' => '1 bază de date', '%s databases' => '%s baze de date', '1 cron job' => '1 sarcină', '%s cron jobs' => '%s sarcini', - '1 archive' => '1 arhiva', + '1 archive' => '1 arhivă', '%s archives' => '%s arhive', '1 package' => '1 pachet', '%s packages' => '%s pachete', - '1 IP address' => '1 IP adresa', - '%s IP addresses' => '%s IP adrese', - '1 month' => '1 luna', + '1 IP address' => '1 adresă IP', + '%s IP addresses' => '%s adrese IP', + '1 month' => '1 lună', '%s months' => '%s luni', - '1 log record' => '1 înregistra', + '1 log record' => '1 înregistrare', '%s log records' => '%s înregistrări', '1 object' => '1 obiect', '%s objects' => '%s obiecte', - 'no exclusions' => 'nu există excluderi', + 'no exclusions' => 'nu sunt excluderi', '1 rule' => '1 regulă', '%s rules' => '%s reguli', - 'There are no currently banned IP' => 'La moment nu există IP interzise', + 'There are no currently banned IP' => 'Nu sunt IP-uri blocate în prezent', - 'USER_CREATED_OK' => 'Utilizator %s a fost creat cu succes', - 'WEB_DOMAIN_CREATED_OK' => 'Domeniu %s a fost creat cu succes.', - 'DNS_DOMAIN_CREATED_OK' => 'Domeniu %s a fost creat cu succes.', - 'DNS_RECORD_CREATED_OK' => 'Înregistrare %s.%s a fost creată cu succes.', - 'MAIL_DOMAIN_CREATED_OK' => 'Domeniu %s a fost creat cu succes.', - 'MAIL_ACCOUNT_CREATED_OK' => 'Contul de poștă %s@%s a fost creat cu succes', - 'DATABASE_CREATED_OK' => 'Baza de date %s a fost creată cu succes', + 'USER_CREATED_OK' => 'Utilizatorul %s a fost creat cu succes.', + 'WEB_DOMAIN_CREATED_OK' => 'Domeniul %s a fost creat cu succes.', + 'DNS_DOMAIN_CREATED_OK' => 'Domeniul %s a fost creat cu succes.', + 'DNS_RECORD_CREATED_OK' => 'Înregistrarea %s.%s a fost creată cu succes.', + 'MAIL_DOMAIN_CREATED_OK' => 'Domeniul %s a fost creat cu succes.', + 'MAIL_ACCOUNT_CREATED_OK' => 'Contul de e-mail %s@%s a fost creat cu succes.', + 'DATABASE_CREATED_OK' => 'Baza de date %s a fost creată cu succes.', 'CRON_CREATED_OK' => 'Sarcina a fost creată cu succes.', - 'IP_CREATED_OK' => '"IP adresa %s a fost creată cu succes.', - 'PACKAGE_CREATED_OK' => 'Pachet %s a fost creat cu succes.', - 'SSL_GENERATED_OK' => 'SSL certificat a fost generat cu succes.', - 'RULE_CREATED_OK' => 'Regula a fost creata cu succes.', - 'Autoupdate has been successfully enabled' => 'Autoupdate a fost activat cu succes', - 'Autoupdate has been successfully disabled' => 'Autoupdate a fost deactivat cu success', - 'Cronjob email reporting has been successfully enabled' => 'Raportare cron a fost activată cu succes', - 'Cronjob email reporting has been successfully disabled' => 'Raportare cron a fost deactivată cu succes', + 'IP_CREATED_OK' => 'Adresa IP %s a fost creată cu succes.', + 'PACKAGE_CREATED_OK' => 'Pachetul %s a fost creat cu succes.', + 'SSL_GENERATED_OK' => 'Certificatul SSL a fost generat cu succes.', + 'RULE_CREATED_OK' => 'Regula a fost creată cu succes.', + 'Autoupdate has been successfully enabled' => 'Actualizarea automată a fost activată cu succes.', + 'Autoupdate has been successfully disabled' => 'Actualizarea automată a fost deactivată cu success.', + 'Cronjob email reporting has been successfully enabled' => 'Notificarea prin e-mail a fost activată cu succes.', + 'Cronjob email reporting has been successfully disabled' => 'Notificarea prin e-mail a fost deactivată cu succes.', 'Changes has been saved.' => 'Modificările au fost salvate.', 'Confirmation' => 'Confirmare', - 'DELETE_USER_CONFIRMATION' => 'Ești sigur că dorești să ștergi %s?', - 'SUSPEND_USER_CONFIRMATION' => 'Ești sigur că dorești să suspendezi %s?', - 'UNSUSPEND_USER_CONFIRMATION' => 'Ești sigur că dorești să unsuspendezi %s?', - 'DELETE_DOMAIN_CONFIRMATION' => 'Ești sigur că dorești să ștergi %s?', - 'SUSPEND_DOMAIN_CONFIRMATION' => 'Ești sigur că dorești să suspendezi %s?', - 'UNSUSPEND_DOMAIN_CONFIRMATION' => 'Ești sigur că dorești să unsuspendezi %s?', + 'DELETE_USER_CONFIRMATION' => 'Ești sigur că dorești să ștergi utilizatorul %s?', + 'SUSPEND_USER_CONFIRMATION' => 'Ești sigur că dorești să suspenzi utilizatorul %s?', + 'UNSUSPEND_USER_CONFIRMATION' => 'Ești sigur că dorești să activezi utilizatorul %s?', + 'DELETE_DOMAIN_CONFIRMATION' => 'Ești sigur că dorești să ștergi domeniul %s?', + 'SUSPEND_DOMAIN_CONFIRMATION' => 'Ești sigur că dorești să suspenzi domeniul %s?', + 'UNSUSPEND_DOMAIN_CONFIRMATION' => 'Ești sigur că dorești să activezi domeniul %s?', 'DELETE_RECORD_CONFIRMATION' => 'Ești sigur că dorești să ștergi înregistrea %s?', - 'SUSPEND_RECORD_CONFIRMATION' => 'Ești sigur că dorești să suspendezi înregistrea %s?', - 'UNSUSPEND_RECORD_CONFIRMATION' => 'Ești sigur că dorești să unsuspendezi înregistrea %s?', - 'DELETE_MAIL_ACCOUNT_CONFIRMATION' => 'Ești sigur că dorești să ștergi %s?', - 'SUSPEND_MAIL_ACCOUNT_CONFIRMATION' => 'Ești sigur că dorești să suspendezi %s?', - 'UNSUSPEND_MAIL_ACCOUNT_CONFIRMATION' => 'Ești sigur că dorești să unsuspendezi %s?', - 'DELETE_DATABASE_CONFIRMATION' => 'Ești sigur că dorești să ștergi %s?', - 'SUSPEND_DATABASE_CONFIRMATION' => 'Ești sigur că dorești să suspendezi %s?', - 'UNSUSPEND_DATABASE_CONFIRMATION' => 'Ești sigur că dorești să unsuspendezi %s?', - 'DELETE_CRON_CONFIRMATION' => 'Ești sigur că dorești să ștergi sarcina?', - 'SUSPEND_CRON_CONFIRMATION' => 'Ești sigur că dorești să suspendezi sarcina?', - 'UNSUSPEND_CRON_CONFIRMATION' => 'Ești sigur că dorești să unsuspendezi sarcina?', - 'DELETE_BACKUP_CONFIRMATION' => 'Ești sigur că dorești să ștergi %s?', - 'DELETE_EXCLUSION_CONFIRMATION' => 'Ești sigur că dorești să ștergi excludere %s?', - 'DELETE_PACKAGE_CONFIRMATION' => 'Ești sigur că dorești să ștergi %s', - 'DELETE_IP_CONFIRMATION' => 'Ești sigur că dorești să șterge IP %s?', - 'DELETE_RULE_CONFIRMATION' => 'Ești sigur că dorești să ștergi regulă #%s?', - 'SUSPEND_RULE_CONFIRMATION' => 'Ești sigur că dorești să suspendezi regulă #%s?', - 'UNSUSPEND_RULE_CONFIRMATION' => 'Ești sigur că dorești să unsuspendezi regulă #%s?', - 'LEAVE_PAGE_CONFIRMATION' => 'Leave Page?', + 'SUSPEND_RECORD_CONFIRMATION' => 'Ești sigur că dorești să suspenzi înregistrea %s?', + 'UNSUSPEND_RECORD_CONFIRMATION' => 'Ești sigur că dorești să activezi înregistrea %s?', + 'DELETE_MAIL_ACCOUNT_CONFIRMATION' => 'Ești sigur că dorești să ștergi contul de e-mail %s?', + 'SUSPEND_MAIL_ACCOUNT_CONFIRMATION' => 'Ești sigur că dorești să suspenzi contul de e-mail %s?', + 'UNSUSPEND_MAIL_ACCOUNT_CONFIRMATION' => 'Ești sigur că dorești să activezi contul de e-mail %s?', + 'DELETE_DATABASE_CONFIRMATION' => 'Ești sigur că dorești să ștergi contul de e-mail %s?', + 'SUSPEND_DATABASE_CONFIRMATION' => 'Ești sigur că dorești să suspenzi baza de date %s?', + 'UNSUSPEND_DATABASE_CONFIRMATION' => 'Ești sigur că dorești să activezi baza de date %s?', + 'DELETE_CRON_CONFIRMATION' => 'Ești sigur că dorești să ștergi această sarcina?', + 'SUSPEND_CRON_CONFIRMATION' => 'Ești sigur că dorești să suspenzi această sarcina?', + 'UNSUSPEND_CRON_CONFIRMATION' => 'Ești sigur că dorești să activezi această sarcina?', + 'DELETE_BACKUP_CONFIRMATION' => 'Ești sigur că dorești să ștergi backup-ul %s?', + 'DELETE_EXCLUSION_CONFIRMATION' => 'Ești sigur că dorești să ștergi excluderea %s?', + 'DELETE_PACKAGE_CONFIRMATION' => 'Ești sigur că dorești să ștergi pachetul %s', + 'DELETE_IP_CONFIRMATION' => 'Ești sigur că dorești să ștergi IP-ul %s?', + 'DELETE_RULE_CONFIRMATION' => 'Ești sigur că dorești să ștergi regula #%s?', + 'SUSPEND_RULE_CONFIRMATION' => 'Ești sigur că dorești să suspenzi regula #%s?', + 'UNSUSPEND_RULE_CONFIRMATION' => 'Ești sigur că dorești să activezi regula #%s?', + 'LEAVE_PAGE_CONFIRMATION' => 'Părăsești pagina?', 'RESTART_CONFIRMATION' => 'Ești sigur că dorești să restartezi %s?', - 'Welcome' => 'Bun venit', - 'LOGGED_IN_AS' => 'Ai intrat ca utilizator %s', + 'Welcome' => 'Bine ai venit', + 'LOGGED_IN_AS' => 'Te-ai autentificat ca utilizatorul %s', 'Error' => 'Eroare', - 'Invalid username or password' => 'Numele de utilizator sau parola greșita', - 'Invalid username or code' => 'Numele de utilizator sau cod greșit', - 'Passwords not match' => 'Parolele nu corespunde', - 'Please enter valid email address.' => 'Introduceti adresa de e-mail validă.', - 'Field "%s" can not be blank.' => 'Cîmp "%s" nu poate fi gol.', - 'Password is too short.' => 'Parola este prea scurt. Utilizați minim 6 de simboluri.', + 'Invalid username or password' => 'Numele de utilizator sau parola este greșită', + 'Invalid username or code' => 'Numele de utilizator sau codul este greșit', + 'Passwords not match' => 'Parolele nu corespund', + 'Please enter valid email address.' => 'Introduceți o adresă de e-mail validă.', + 'Field "%s" can not be blank.' => 'Câmpul "%s" nu poate fi gol.', + 'Password is too short.' => 'Parola este prea scurtă. Utilizați minimum 6 caractere.', 'Error code:' => 'Cod de eroare: %s', 'SERVICE_ACTION_FAILED' => '"%s" "%s" failed', - 'IP address is in use' => 'IP adresa este utilizat', - 'BACKUP_SCHEDULED' => 'Sarcina a fost adăugata la coadă. Veți primi o notificare la e-mail atunci cand backupul va fi complet.', - 'BACKUP_EXISTS' => 'Backup este în progres, vă rugăm să așteptați.', - 'RESTORE_SCHEDULED' => 'Sarcina a fost adăugata la coadă. Veți primi o notificare la e-mail atunci cand backupul va fi restaurat.', - 'RESTORE_EXISTS' => 'Restabilirea este în progres, vă rugăm să așteptați.', + 'IP address is in use' => 'Adresa IP este utilizată', + 'BACKUP_SCHEDULED' => 'Sarcina a fost adăugata la coadă. Vei primi o notificare prin e-mail atunci când backup-ul va fi gata pentru descărcare.', + 'BACKUP_EXISTS' => 'Un backup este în progres. Te rog să aștepți finalizarea acestuia.', + 'RESTORE_SCHEDULED' => 'Sarcina a fost adăugata la coadă. Veți primi o notificare prin e-mail atunci cand restaurarea va fi gata.', + 'RESTORE_EXISTS' => 'O restaurare este în progres. Te rog să aștepți finalizarea acesteia.', - 'WEB_EXCLUSIONS' => "Adauga domeniu câte unul pe linie. Pentru a exclude toate domeniile bagă *. Format pentru a exclude directoare specifice: domain.com:public_html/cache:public_html/tmp", - 'DNS_EXCLUSIONS' => "Adauga domeniu câte unul pe linie. Pentru a exclude toate domeniile bagă *", - 'MAIL_EXCLUSIONS' => "Adauga domeniu câte unul pe linie. Pentru a exclude toate domeniile bagă *. Format pentru a exclude conturile specifice: domain.com:info:support:postmaster", - 'DB_EXCLUSIONS' => "Adauga câte o baza pe linie. Pentru a exclude toate baze bagă *", - 'CRON_EXCLUSIONS' => "Pentru a exclude toate sarcinile bagă *", - 'USER_EXCLUSIONS' => "Adauga câte o directoria pe linie. Pentru a exclude toate bagă *", + 'WEB_EXCLUSIONS' => "Adaugă un domeniu pe linie. Pentru a exclude toate domeniile folosește *. Pentru a exclude dosare specifice completează în formatul: domain.com:public_html/cache:public_html/tmp", + 'DNS_EXCLUSIONS' => "Adaugă un domeniu pe linie. Pentru a exclude toate domeniile folosește *.", + 'MAIL_EXCLUSIONS' => "Adaugă un domeniu pe linie. Pentru a exclude toate domeniile folosește *. Pentru a exclude conturile specifice completează în formatul: domain.com:info:support:postmaster", + 'DB_EXCLUSIONS' => "Adaugă o bază de date pe linie. Pentru a exclude toate bazele de date folosește *.", + 'CRON_EXCLUSIONS' => "Pentru a exclude toate sarcinile folosește *.", + 'USER_EXCLUSIONS' => "Adaugă un dosar pe linie. Pentru a exclude toate dosarele folosește *.", - 'Welcome to Vesta Control Panel' => 'Bine ați venit la panoul de control Vesta', + 'Welcome to Vesta Control Panel' => 'Bine ai venit la panoul de control Vesta', 'MAIL_FROM' => 'Vesta Control Panel ', 'GREETINGS_GORDON_FREEMAN' => "Salut, %s %s,\n", 'GREETINGS' => "Salut,\n", - 'ACCOUNT_READY' => "Contul dvs.este gata.\n\nhttps://%s/login/\nUtilizator: %s\nParolă: %s\n\n--\nPanoul de control Vesta\n", + 'ACCOUNT_READY' => "Contul tău a fost creat și este gata pentru utilizare.\n\nhttps://%s/login/\nUtilizator: %s\nParolă: %s\n\n--\nPanoul de control Vesta\n", 'FTP login credentials' => 'Datele de autentificare FTP', - 'FTP_ACCOUNT_READY' => "Contul FTP dvs. este gata.\n\nHost: %s\nUtilizator: %s_%s\nParolă: %s\n\n--\nPanoul de control Vesta\n", + 'FTP_ACCOUNT_READY' => "Contul FTP a fost creat și este gata pentru utilizare.\n\nHost: %s\nUtilizator: %s_%s\nParolă: %s\n\n--\nPanoul de control Vesta\n", - 'Database Credentials' => 'Datele de autentificare bazei de date', - 'DATABASE_READY' => "Baza de date dvs. este gata.\n\nBD: %s\nUtilizator: %s\nParolă: %s\n%s\n\n--\nPanoul de control Vesta\n", + 'Database Credentials' => 'Datele de autentificare baza de date', + 'DATABASE_READY' => "Baza de date a fost creată și este gata pentru utilizare.\n\nBD: %s\nUtilizator: %s\nParolă: %s\n%s\n\n--\nPanoul de control Vesta\n", - 'forgot password' => 'uitat parola', - 'Confirm' => 'Confirma', + 'forgot password' => 'am uitat parola', + 'Confirm' => 'Confirmare', 'New Password' => 'Noua parolă', - 'Confirm Password' => 'Repetarea parolei', - 'Reset' => 'Reseta', + 'Confirm Password' => 'Repetare parolă', + 'Reset' => 'Resetare', 'Reset Code' => 'Cod de resetare', 'RESET_NOTICE' => '', - 'RESET_CODE_SENT' => 'Cod de resetare a fost trimis la email dvs..
                ', - 'MAIL_RESET_SUBJECT' => 'Schimbarea parolei %s', - 'PASSWORD_RESET_REQUEST'=>"Pentru a shimba parolei, vă rugăm faceți clic aici:\nhttps://%s/reset/?action=confirm&user=%s&code=%s\n\n\n\nDacă nu ați solicitat o procedură de resetarea parolei, vă rugăm să ignorați această scrisoare.\n\n--\nPanoul de control Vesta\n", + 'RESET_CODE_SENT' => 'Codul de resetare a fost trimis la adresa ta de e-mail.
                ', + 'MAIL_RESET_SUBJECT' => 'Schimbare parola %s', + 'PASSWORD_RESET_REQUEST'=>"Pentru schimbarea parolei, te rog să urmezi link-ul:\nhttps://%s/reset/?action=confirm&user=%s&code=%s\n\n\n\nDacă nu ai solicitat resetarea parolei, ignoră acest mesaj.\n\n--\nPanoul de control Vesta\n", - 'Jan' => 'Jan', + 'Jan' => 'Ian', 'Feb' => 'Feb', 'Mar' => 'Mar', 'Apr' => 'Apr', - 'May' => 'May', - 'Jun' => 'Jun', - 'Jul' => 'Jul', + 'May' => 'Mai', + 'Jun' => 'Iun', + 'Jul' => 'Iul', 'Aug' => 'Aug', 'Sep' => 'Sep', 'Oct' => 'Oct', - 'Nov' => 'Nov', + 'Nov' => 'Noi', 'Dec' => 'Dec', - 'Configuring Server' => 'Configuring Server', - 'Hostname' => 'Hostname', - 'Time Zone' => 'Time Zone', - 'Default Language' => 'Default Language', - 'FileSystem Disk Quota' => 'FileSystem Disk Quota', - 'Vesta Control Panel Plugins' => 'Vesta Control Panel Plugins', - 'preview' => 'preview', - 'Reseller Role' => 'Reseller Role', - 'Web Config Editor' => 'Web Config Editor', - 'Template Manager' => 'Template Manager', - 'Backup Migration Manager' => 'Backup Migration Manager', - 'FileManager' => 'FileManager', - 'show: CPU / MEM / NET / DISK' => 'show: CPU / MEM / NET / DISK', + 'Configuring Server' => 'Configurare Server', + 'Hostname' => 'Nume Host', + 'Time Zone' => 'Fus Orar', + 'Default Language' => 'Limba Implicită', + 'FileSystem Disk Quota' => 'Cota Spațiu (Disk Quota)', + 'Vesta Control Panel Plugins' => 'VESTA', + 'preview' => 'previzualizare', + 'Reseller Role' => 'Rol de Revânzător', + 'Web Config Editor' => 'Editor Configurare Web', + 'Template Manager' => 'Manager Șabloane', + 'Backup Migration Manager' => 'Manager Migrare Backup', + 'FileManager' => 'Manager Fișiere', + 'show: CPU / MEM / NET / DISK' => 'afișare: CPU / MEM / NET / DISK', - 'sort by' => 'sort by', + 'sort by' => 'sortare după', 'Date' => 'Data', - 'Starred' => 'Starred', - 'Name' => 'Name', + 'Starred' => 'Stea', + 'Name' => 'Nume', - 'File Manager' => 'File Manager', - 'type' => 'type', - 'size' => 'size', - 'date' => 'date', - 'name' => 'name', - 'Initializing' => 'Initializing', - 'UPLOAD' => 'UPLOAD', - 'NEW FILE' => 'NEW FILE', - 'NEW DIR' => 'NEW DIR', - 'DELETE' => 'DELETE', - 'RENAME' => 'RENAME', - 'COPY' => 'COPY', - 'ARCHIVE' => 'ARCHIVE', - 'EXTRACT' => 'EXTRACT', - 'DOWNLOAD' => 'DOWNLOAD', + 'File Manager' => 'Manager Fișiere', + 'type' => 'tip', + 'size' => 'marime', + 'date' => 'dată', + 'name' => 'nume', + 'Initializing' => 'Inițializare', + 'UPLOAD' => 'ÎNCARCĂ', + 'NEW FILE' => 'FIȘIER NOU', + 'NEW DIR' => 'DOSAR NOU', + 'DELETE' => 'ȘTERGE', + 'RENAME' => 'REDENUMEȘTE', + 'COPY' => 'COPIAZĂ', + 'ARCHIVE' => 'ARHIVEAZĂ', + 'EXTRACT' => 'EXTRAGE', + 'DOWNLOAD' => 'DESCARCĂ', 'Hit' => 'Hit', 'to reload the page' => 'to reload the page', 'Directory name cannot be empty' => 'Directory name cannot be empty', @@ -601,5 +605,4 @@ $LANG['ro'] = array( 'Restrict users so that they cannot use SSH and access only their home directory.' => 'Restrict users so that they cannot use SSH and access only their home directory.', 'Browse, copy, edit, view, and retrieve all of your web domain files using fully featured File Manager.' => 'Browse, copy, edit, view, and retrieve all of your web domain files using fully featured File Manager.', 'This is a commercial module, you would need to purchace license key to enable it.' => 'This is a commercial module, you would need to purchace license key to enable it.' - -); \ No newline at end of file +); From 4d233eda308e113e27cabbad70470242c771774e Mon Sep 17 00:00:00 2001 From: Ionescu Bogdan Date: Fri, 4 Dec 2015 22:33:15 +0200 Subject: [PATCH 239/264] Update en.php --- web/inc/i18n/en.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/web/inc/i18n/en.php b/web/inc/i18n/en.php index bd560a0d9..a421ef410 100644 --- a/web/inc/i18n/en.php +++ b/web/inc/i18n/en.php @@ -159,7 +159,7 @@ $LANG['en'] = array( 'SSL Domains' => 'SSL Domains', 'Web Aliases' => 'Web Aliases', 'per domain' => 'per domain', - 'DNS Domains' => 'DNS Domains', + 'DNS domains' => 'DNS Domains', 'DNS Domains' => 'DNS Domains', 'DNS records' => 'DNS records' , 'Name Servers' => 'Name Servers', @@ -219,6 +219,7 @@ $LANG['en'] = array( 'Bandwidth Usage eth0' => 'Bandwidth Usage eth0', 'FTP Usage' => 'FTP Usage', 'SSH Usage' => 'SSH Usage', + 'Exim Usage' => 'Exim Usage', 'reverse proxy' => 'reverse proxy', 'web server' => 'web server', 'dns server' => 'dns server', @@ -602,4 +603,4 @@ $LANG['en'] = array( 'Browse, copy, edit, view, and retrieve all of your web domain files using fully featured File Manager.' => 'Browse, copy, edit, view, and retrieve all of your web domain files using fully featured File Manager.', 'This is a commercial module, you would need to purchace license key to enable it.' => 'This is a commercial module, you would need to purchace license key to enable it.' -); \ No newline at end of file +); From 0e84a0f42e509d5eeb6abafa93e2376915a9ac45 Mon Sep 17 00:00:00 2001 From: Ionescu Bogdan Date: Fri, 4 Dec 2015 22:44:41 +0200 Subject: [PATCH 240/264] Update add_package.html --- web/templates/admin/add_package.html | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/web/templates/admin/add_package.html b/web/templates/admin/add_package.html index ec4e675c3..16dbf5290 100644 --- a/web/templates/admin/add_package.html +++ b/web/templates/admin/add_package.html @@ -302,20 +302,20 @@

                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 diff --git a/install/rhel/5/firewall.tar.gz b/install/rhel/5/firewall.tar.gz deleted file mode 100644 index a2ee9c8402a53ed75453efcfec8ace36a9b40163..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 537 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 diff --git a/install/rhel/5/wsgi/httpd.tar.gz b/install/rhel/5/wsgi/httpd.tar.gz deleted file mode 100644 index b25acd68e8a2a11305b57b3f2f79f7bbf0cb4995..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1311 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 diff --git a/install/rhel/6/firewall.tar.gz b/install/rhel/6/firewall.tar.gz deleted file mode 100644 index a2ee9c8402a53ed75453efcfec8ace36a9b40163..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 537 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 diff --git a/install/rhel/6/wsgi/httpd.tar.gz b/install/rhel/6/wsgi/httpd.tar.gz deleted file mode 100644 index b25acd68e8a2a11305b57b3f2f79f7bbf0cb4995..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1311 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 diff --git a/install/rhel/7/fail2ban.tar.gz b/install/rhel/7/fail2ban.tar.gz deleted file mode 100644 index c0d5d11fb75fe5619879f97586ed96f157d293d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 693 zcmV;m0!sZKiwFQoqCZvu1MQYkZ<{a>$MejmIH?bnCJ`Vd$x9olU0bzM*Huc|mn;ts zn8X_x3MOl%efXV$bWK9iOiDUcyWa~o-1)GN{~ZAnVQb8!)z}|4((Sg3E3$ko#!k!a zxK6j_blryS;LL46dynt*LY^s>0yNS%R-5eJdj3HP=J}rwn%{BI^kNz8EQU^S2NSv` z|IU%!(fMyVZrgTSI{&WQJ!*ixvp3klf1dwgmQ78OC^imxHZr)>10Uc7RGM=m5TW9D zJUB-~-(a2+u`K2@jwd&iEaE5q{?*6`<4MBQR6nw2EVXcMW!%eCZba-Uc ztcVFIO~JmX%hwux4m{$;?*s|puAXOH2w$66V)Tus-U?fF^#(UzWdM_V{=v)jV3 zey1f(BV}504M+e(!gPR diff --git a/install/rhel/7/firewall.tar.gz b/install/rhel/7/firewall.tar.gz deleted file mode 100644 index a2ee9c8402a53ed75453efcfec8ace36a9b40163..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 537 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 SsG){05B~$V=xn|KPyhfFzo5tf diff --git a/install/ubuntu/12.04/fail2ban.tar.gz b/install/ubuntu/12.04/fail2ban.tar.gz deleted file mode 100644 index 26a2652b02742767e14be75973631cd8298b2e4f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 708 zcmV;#0z3U5iwFQsqCZvu1MQbxPunmQhI{Q_aU?E~CZ$c%w7CH!7$A@sAhmGQ^}Fx&>_(U}cZ7MX@pjk>ztbsx70bWHwc~c} zj_2CG<27u@aog<%bl&ir=H!{gDL^9?LawuW?)?WPdWe5SnIvg5e1k-IdHh}9b4~oW z!PEFpiCU3nAb9jz8alvT&s!OPx3e67&u`leuwUx~*72Xme+N!=1{`4yWd=YbQpkCh z2LZ{VoH4l72?02l6T&48u%vc8!DeN+G2V31`KizX6}7|Di+aD5Sis!f^Z1XVpj-z&oq;h?B~ zeP8So1CC>|-|L+Xkt*8+%ZYx~n&Pyj?pwNPsH7UB7|&87(|h%@qx!)#i)0ek>qeMm z3&N%G3hC4Sb-i@yRVPknG_H|en(;npySeIu=(of3i@&OmM74|8iZSI{7Y#x&C4rEe zs8yyf6s)|OrCfZU-LXxVwKCQrTCujrNA*ivc-Dqh`))GX!mxg-w+VeMQCqZKLj z-evS*nfL!P82`-qzirO{Tj6Q^w}1ZcK8e5QJ7)ji3XjhJI^=Ymr{w`(HEUA*7btu6 z;u*eb-FoSyZqa$BTeLbmR!w?Dd24FnFtj3?l3$oHE10NV5%zSCKbX6VWVLrl7?EV{ z0KtR=Kh+2iI}TVJtP425yuRtfZy2W}0qYKSAClZEy$A4J4tJ|D)Z-0jpe^@ka}@YN*~ctkBn}j4ixeI*xIITzELE~X zMI80-cX4E^vDhu5cB3Zq`2edi%;#C}%;tN4|MPCUy>TuF)A&m5ubR{A{+NcWzQq+1~t=fn(O7dD? zuJ@lCy-cd2$Vwfm^YRlV&AO?xGR@M6K6I3{c`>}+54j8>pd^i3y%vnaf-M)^qgT%Y z!Y0rr$NT{cq*>uh*0iy~f%ze@P-lGMpcXGMce%6_ zBQN55wuPE%!I`#DmVZT6%h?v*L<^x@@RX|p-xW$&Y?`8-UlZSEvrdmT%CaeG+04!# zOsxiYxzK%e!3AfQ1N-qWYO$PrUR?l7J-%k9lcIYDgHZUVJww33fwQRvv7FSV`D|%g z5CR`-TCd%;&&P58|LFSN>&$;0^H1kLFdygtzhL~pFnVQZEvA4l1=R0>mtAuFiNKV6 zXe8qiJ%tQexG+9reA_VJ4Wa$iH)$Ki1CZt)8yE$L9v(jT@Hflsi!0%DpbCwl-MOND-hIYIMT`=p zVJaYu6`~3wcEUB)JQroO9gT!-o|nHH_ow_jWpk*160Ni1OTNv=o2O*hXYc~6l)hSj zrjSGMbJg~4$e_`zdRnBb=*+mS~^p{?ExXTEQ>Caish3~CC`qM+! z32s++OFuODb%i8O4bQrFtnj9e@Y%BhkJJ1iO26erIZn&R4_QH)5lIYgY}c*E=4qa+ zGd`7hyPWe!Nn+^Cs_&1nu2jd%x~gk}Fp-fa6IBu~UD@NP{oh1soNVJbdmH{&Y4HCH zH2vql{dJaf{jU?p_|Mw@v$p@N?LX`I&$|AzrvI$zKWq8VI{vev{AUOMk*3p$PPJeB zS7fBhd@s6mWsjrwzeuB!Zvfvf;6GJ5{wo^ze-2Lb|KDu@x*b5b1?cGk`kH`t7tn44 zj_U&k*$9-n5g@uU(XrBO1ST?h>l;Ds|Gt#N+y6KID^#W6|2Y8vhw&flRMi>k`2TKR f1ONa4000000000000000fPab~sIF|O04M+ev^W;p diff --git a/install/ubuntu/12.04/templates.tar.gz b/install/ubuntu/12.04/templates.tar.gz deleted file mode 100644 index 2e431eed7babc92998dd02a8572c49d8708390ad..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 11946 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 WiuC^up(H&3>U(UBTcl7Fr2hjssX|Er diff --git a/install/ubuntu/12.10/dovecot.tar.gz b/install/ubuntu/12.10/dovecot.tar.gz deleted file mode 100644 index 445e31ffdfdf725dab91cf8bd97cef86fdeb5034..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3440 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 SsG){05B~$V=xn|KPyhfFzo5tf diff --git a/install/ubuntu/12.10/fail2ban.tar.gz b/install/ubuntu/12.10/fail2ban.tar.gz deleted file mode 100644 index 26a2652b02742767e14be75973631cd8298b2e4f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 708 zcmV;#0z3U5iwFQsqCZvu1MQbxPunmQhI{Q_aU?E~CZ$c%w7CH!7$A@sAhmGQ^}Fx&>_(U}cZ7MX@pjk>ztbsx70bWHwc~c} zj_2CG<27u@aog<%bl&ir=H!{gDL^9?LawuW?)?WPdWe5SnIvg5e1k-IdHh}9b4~oW z!PEFpiCU3nAb9jz8alvT&s!OPx3e67&u`leuwUx~*72Xme+N!=1{`4yWd=YbQpkCh z2LZ{VoH4l72?02l6T&48u%vc8!DeN+G2V31`KizX6}7|Di+aD5Sis!f^Z1XVpj-z&oq;h?B~ zeP8So1CC>|-|L+Xkt*8+%ZYx~n&Pyj?pwNPsH7UB7|&87(|h%@qx!)#i)0ek>qeMm z3&N%G3hC4Sb-i@yRVPknG_H|en(;npySeIu=(of3i@&OmM74|8iZSI{7Y#x&C4rEe zs8yyf6s)|OrCfZU-LXxVwKCQrTCujrNA*ivc-Dqh`))GX!mxg-w+VeMQCqZKLj z-evS*nfL!P82`-qzirO{Tj6Q^w}1ZcK8e5QJ7)ji3XjhJI^=Ymr{w`(HEUA*7btu6 z;u*eb-FoSyZqa$BTeLbmR!w?Dd24FnFtj3?l3$oHE10NV5%zSCKbX6VWVLrl7?EV{ z0KtR=Kh+2iI}TVJtP425yuRtfZy2W}0qYKSAClZEy$A4J4tJ|D)Z-0jpe^@ka}@YN*~ctkBn}j4ixeI*xIITzELE~X zMI80-cX4E^vDhu5cB3Zq`2edi%;#C}%;tN4|MPCUy>TuF)A&m5ubR{A{+NcWzQq+1~t=fn(O7dD? zuJ@lCy-cd2$Vwfm^YRlV&AO?xGR@M6K6I3{c`>}+54j8>pd^i3y%vnaf-M)^qgT%Y z!Y0rr$NT{cq*>uh*0iy~f%ze@P-lGMpcXGMce%6_ zBQN55wuPE%!I`#DmVZT6%h?v*L<^x@@RX|p-xW$&Y?`8-UlZSEvrdmT%CaeG+04!# zOsxiYxzK%e!3AfQ1N-qWYO$PrUR?l7J-%k9lcIYDgHZUVJww33fwQRvv7FSV`D|%g z5CR`-TCd%;&&P58|LFSN>&$;0^H1kLFdygtzhL~pFnVQZEvA4l1=R0>mtAuFiNKV6 zXe8qiJ%tQexG+9reA_VJ4Wa$iH)$Ki1CZt)8yE$L9v(jT@Hflsi!0%DpbCwl-MOND-hIYIMT`=p zVJaYu6`~3wcEUB)JQroO9gT!-o|nHH_ow_jWpk*160Ni1OTNv=o2O*hXYc~6l)hSj zrjSGMbJg~4$e_`zdRnBb=*+mS~^p{?ExXTEQ>Caish3~CC`qM+! z32s++OFuODb%i8O4bQrFtnj9e@Y%BhkJJ1iO26erIZn&R4_QH)5lIYgY}c*E=4qa+ zGd`7hyPWe!Nn+^Cs_&1nu2jd%x~gk}Fp-fa6IBu~UD@NP{oh1soNVJbdmH{&Y4HCH zH2vql{dJaf{jU?p_|Mw@v$p@N?LX`I&$|AzrvI$zKWq8VI{vev{AUOMk*3p$PPJeB zS7fBhd@s6mWsjrwzeuB!Zvfvf;6GJ5{wo^ze-2Lb|KDu@x*b5b1?cGk`kH`t7tn44 zj_U&k*$9-n5g@uU(XrBO1ST?h>l;Ds|Gt#N+y6KID^#W6|2Y8vhw&flRMi>k`2TKR f1ONa4000000000000000fPab~sIF|O04M+ev^W;p diff --git a/install/ubuntu/12.10/templates.tar.gz b/install/ubuntu/12.10/templates.tar.gz deleted file mode 100644 index d75a44559aa43f5d6e2be6e074d3b2d45efaaa8c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 11948 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 bLc{$a9smdb{|2l90P4F?Ty?kr1i1eJtid$v diff --git a/install/ubuntu/13.04/dovecot.tar.gz b/install/ubuntu/13.04/dovecot.tar.gz deleted file mode 100644 index 445e31ffdfdf725dab91cf8bd97cef86fdeb5034..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3440 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 SsG){05B~$V=xn|KPyhfFzo5tf diff --git a/install/ubuntu/13.04/fail2ban.tar.gz b/install/ubuntu/13.04/fail2ban.tar.gz deleted file mode 100644 index 26a2652b02742767e14be75973631cd8298b2e4f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 708 zcmV;#0z3U5iwFQsqCZvu1MQbxPunmQhI{Q_aU?E~CZ$c%w7CH!7$A@sAhmGQ^}Fx&>_(U}cZ7MX@pjk>ztbsx70bWHwc~c} zj_2CG<27u@aog<%bl&ir=H!{gDL^9?LawuW?)?WPdWe5SnIvg5e1k-IdHh}9b4~oW z!PEFpiCU3nAb9jz8alvT&s!OPx3e67&u`leuwUx~*72Xme+N!=1{`4yWd=YbQpkCh z2LZ{VoH4l72?02l6T&48u%vc8!DeN+G2V31`KizX6}7|Di+aD5Sis!f^Z1XVpj-z&oq;h?B~ zeP8So1CC>|-|L+Xkt*8+%ZYx~n&Pyj?pwNPsH7UB7|&87(|h%@qx!)#i)0ek>qeMm z3&N%G3hC4Sb-i@yRVPknG_H|en(;npySeIu=(of3i@&OmM74|8iZSI{7Y#x&C4rEe zs8yyf6s)|OrCfZU-LXxVwKCQrTCujrNA*ivc-Dqh`))GX!mxg-w+VeMQCqZKLj z-evS*nfL!P82`-qzirO{Tj6Q^w}1ZcK8e5QJ7)ji3XjhJI^=Ymr{w`(HEUA*7btu6 z;u*eb-FoSyZqa$BTeLbmR!w?Dd24FnFtj3?l3$oHE10NV5%zSCKbX6VWVLrl7?EV{ z0KtR=Kh+2iI}TVJtP425yuRtfZy2W}0qYKSAClZEy$A4J4tJ|D)Z-0jpe^@ka}@YN*~ctkBn}j4ixeI*xIITzELE~X zMI80-cX4E^vDhu5cB3Zq`2edi%;#C}%;tN4|MPCUy>TuF)A&m5ubR{A{+NcWzQq+1~t=fn(O7dD? zuJ@lCy-cd2$Vwfm^YRlV&AO?xGR@M6K6I3{c`>}+54j8>pd^i3y%vnaf-M)^qgT%Y z!Y0rr$NT{cq*>uh*0iy~f%ze@P-lGMpcXGMce%6_ zBQN55wuPE%!I`#DmVZT6%h?v*L<^x@@RX|p-xW$&Y?`8-UlZSEvrdmT%CaeG+04!# zOsxiYxzK%e!3AfQ1N-qWYO$PrUR?l7J-%k9lcIYDgHZUVJww33fwQRvv7FSV`D|%g z5CR`-TCd%;&&P58|LFSN>&$;0^H1kLFdygtzhL~pFnVQZEvA4l1=R0>mtAuFiNKV6 zXe8qiJ%tQexG+9reA_VJ4Wa$iH)$Ki1CZt)8yE$L9v(jT@Hflsi!0%DpbCwl-MOND-hIYIMT`=p zVJaYu6`~3wcEUB)JQroO9gT!-o|nHH_ow_jWpk*160Ni1OTNv=o2O*hXYc~6l)hSj zrjSGMbJg~4$e_`zdRnBb=*+mS~^p{?ExXTEQ>Caish3~CC`qM+! z32s++OFuODb%i8O4bQrFtnj9e@Y%BhkJJ1iO26erIZn&R4_QH)5lIYgY}c*E=4qa+ zGd`7hyPWe!Nn+^Cs_&1nu2jd%x~gk}Fp-fa6IBu~UD@NP{oh1soNVJbdmH{&Y4HCH zH2vql{dJaf{jU?p_|Mw@v$p@N?LX`I&$|AzrvI$zKWq8VI{vev{AUOMk*3p$PPJeB zS7fBhd@s6mWsjrwzeuB!Zvfvf;6GJ5{wo^ze-2Lb|KDu@x*b5b1?cGk`kH`t7tn44 zj_U&k*$9-n5g@uU(XrBO1ST?h>l;Ds|Gt#N+y6KID^#W6|2Y8vhw&flRMi>k`2TKR f1ONa4000000000000000fPab~sIF|O04M+ev^W;p diff --git a/install/ubuntu/13.04/templates.tar.gz b/install/ubuntu/13.04/templates.tar.gz deleted file mode 100644 index e2da7175c1b5e6188f1b14b0aaea982d54ad09b9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 11949 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 Qf_eq;m*zSl1R){(AMqnp`2YX_ diff --git a/install/ubuntu/13.10/dovecot.tar.gz b/install/ubuntu/13.10/dovecot.tar.gz deleted file mode 100644 index 445e31ffdfdf725dab91cf8bd97cef86fdeb5034..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3440 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 SsG){05B~$V=xn|KPyhfFzo5tf diff --git a/install/ubuntu/13.10/fail2ban.tar.gz b/install/ubuntu/13.10/fail2ban.tar.gz deleted file mode 100644 index 26a2652b02742767e14be75973631cd8298b2e4f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 708 zcmV;#0z3U5iwFQsqCZvu1MQbxPunmQhI{Q_aU?E~CZ$c%w7CH!7$A@sAhmGQ^}Fx&>_(U}cZ7MX@pjk>ztbsx70bWHwc~c} zj_2CG<27u@aog<%bl&ir=H!{gDL^9?LawuW?)?WPdWe5SnIvg5e1k-IdHh}9b4~oW z!PEFpiCU3nAb9jz8alvT&s!OPx3e67&u`leuwUx~*72Xme+N!=1{`4yWd=YbQpkCh z2LZ{VoH4l72?02l6T&48u%vc8!DeN+G2V31`KizX6}7|Di+aD5Sis!f^Z1XVpj-z&oq;h?B~ zeP8So1CC>|-|L+Xkt*8+%ZYx~n&Pyj?pwNPsH7UB7|&87(|h%@qx!)#i)0ek>qeMm z3&N%G3hC4Sb-i@yRVPknG_H|en(;npySeIu=(of3i@&OmM74|8iZSI{7Y#x&C4rEe zs8yyf6s)|OrCfZU-LXxVwKCQrTCujrNA*ivc-Dqh`))GX!mxg-w+VeMQCqZKLj z-evS*nfL!P82`-qzirO{Tj6Q^w}1ZcK8e5QJ7)ji3XjhJI^=Ymr{w`(HEUA*7btu6 z;u*eb-FoSyZqa$BTeLbmR!w?Dd24FnFtj3?l3$oHE10NV5%zSCKbX6VWVLrl7?EV{ z0KtR=Kh+2iI}TVJtP425yuRtfZy2W}0qYKSAClZEy$A4J4tJ|D)Z-0jpe^@ka}@YN*~ctkBn}j4ixeI*xIITzELE~X zMI80-cX4E^vDhu5cB3Zq`2edi%;#C}%;tN4|MPCUy>TuF)A&m5ubR{A{+NcWzQq+1~t=fn(O7dD? zuJ@lCy-cd2$Vwfm^YRlV&AO?xGR@M6K6I3{c`>}+54j8>pd^i3y%vnaf-M)^qgT%Y z!Y0rr$NT{cq*>uh*0iy~f%ze@P-lGMpcXGMce%6_ zBQN55wuPE%!I`#DmVZT6%h?v*L<^x@@RX|p-xW$&Y?`8-UlZSEvrdmT%CaeG+04!# zOsxiYxzK%e!3AfQ1N-qWYO$PrUR?l7J-%k9lcIYDgHZUVJww33fwQRvv7FSV`D|%g z5CR`-TCd%;&&P58|LFSN>&$;0^H1kLFdygtzhL~pFnVQZEvA4l1=R0>mtAuFiNKV6 zXe8qiJ%tQexG+9reA_VJ4Wa$iH)$Ki1CZt)8yE$L9v(jT@Hflsi!0%DpbCwl-MOND-hIYIMT`=p zVJaYu6`~3wcEUB)JQroO9gT!-o|nHH_ow_jWpk*160Ni1OTNv=o2O*hXYc~6l)hSj zrjSGMbJg~4$e_`zdRnBb=*+mS~^p{?ExXTEQ>Caish3~CC`qM+! z32s++OFuODb%i8O4bQrFtnj9e@Y%BhkJJ1iO26erIZn&R4_QH)5lIYgY}c*E=4qa+ zGd`7hyPWe!Nn+^Cs_&1nu2jd%x~gk}Fp-fa6IBu~UD@NP{oh1soNVJbdmH{&Y4HCH zH2vql{dJaf{jU?p_|Mw@v$p@N?LX`I&$|AzrvI$zKWq8VI{vev{AUOMk*3p$PPJeB zS7fBhd@s6mWsjrwzeuB!Zvfvf;6GJ5{wo^ze-2Lb|KDu@x*b5b1?cGk`kH`t7tn44 zj_U&k*$9-n5g@uU(XrBO1ST?h>l;Ds|Gt#N+y6KID^#W6|2Y8vhw&flRMi>k`2TKR f1ONa4000000000000000fPab~sIF|O04M+ev^W;p diff --git a/install/ubuntu/13.10/templates.tar.gz b/install/ubuntu/13.10/templates.tar.gz deleted file mode 100644 index 841abdbe87a04bba3761261160c6fc49f549e57e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 11944 zcmZ{Jbx_pLA2$usjdTjq9a2Ywf`A|(-GU$`NW&ow(kw$g;nv!pBC0ZXb zd>$b(E|SzPnmNH9n)4T<05(o zfm_&=;vKUu`1Pb0>$YZmc5PYl zc58v?LUUaj^n*n#OsEV3Q;v_hJXgGhKV}2AJ&nr&pSEZkn?&pvCMVSp9IwGFJ$8<~JB}th7jwvl zwS$a-rDMhAsY$hyl4H`Vp~*@o700CSk>8zVmfMW-FYm67mPAw8sbjvD#Ab0jvA>o9 z&ZOOP&rKKv%OEWDu{FeQnOcv1%39w?mkrh3{vhI?z}9L!H+AD;c&OKK=(7DF0{nX| z4GG0JngK$dA!nK7tKl7{FHv4^VnvTAqE9lfD5Fo37;7h>p^B9kG&rThXa30dPpl01 zV`lpgVMkRj-K8rPxGkAe5A3xjFRTR3uYKtxBNdq42|8(@w*i~w30!0O2Q zCMWRH`XA`&*A;W*$HF#^<;x9KmzG9=Y_(1O3TTZ1{`bxiK&x`6l~<9lCF06OY%`q> zAbsrwr&6Wu3SQcQ%xB%{e}zkZujafmr@oCAx`>tSvDf@DdP+L8UY$MFjc3Kn&$6fE zMe&m`#WaJ-RLoWY>`4K|(WN}6l;Cn1%oV=RCG%qTQR_b9Y_kquGZkFhhvUZl803QB z+>}e1>T^K)bhe12^);P(`&qyGweF?oSy9R!;qmd!zHH+ouWFyce)K=)X|p_xWvI>- z#j?387WUBB5+b(H%Z0)&HN?Y5X95qBE`>th8!l{Wh&FKGUZU`R9O2KO=LW>t7ZsVe zodV@~Z_tt7wp$C5%lQ0eBd%*^mx;-2`lRy0kYe_SK{-jOLqc;cD-xTxG7J=`jzZYR3q z$Y2h!BTrgjz0X(MxaF}ZZbI|-=yK3C9XrlnV(7e1`XqB~;iq6aI(9a&o8xD*;~nn#g?Wm)4`9Nkfl&_7RV} zC`RI(rH-*cb_d=HTYQpH!G$q7TZQ!#mqTW9YU=m5iY&?RlmAl`h~;z;tXE zEya?~P;t!N@*lgP`47?Q@zsAl23S`D(b^6in~=UjPbAt=uj{>uBr3F7fF;WRW!C1x znk$6;nk4<1^Y`cNuO054+6cZ&krL1|-+*?ndbTw#woU#+)gk`--69L=LVbZS2)hE7 z<-Cn-B6cFTOSyRh%e{qKhuP}e;_A0n4+i_o>1^n#?6WF@*Msd^$^IxUPeSYi${zG3 zAGd}3Tj_th3S_@Mf4I4g9%#pUx83l%!-92DqwFb<{t~;mIeXkiR(-ag8v_j9>>NV2$(f&%Q9blLO4zPZt6o|y z{28*4V65Vgik4CTyC~g1J9j4kgF>0V?&OCLp*zy$sn31j50yEL)4OXc`drXkj!RAN)@NNh~JW>B>S$)TirzW;TFTJR=~~iWlWFHHSYFG zfrW${@d#>aG!I*jqC=364c#&plJsNKJ(R0zS*D@UyFv ze^KJnFGI_dKHcnnTa2M8!~12Ks>j@*^rL0zY#KtUBGa4*s(!bw;k1_-%Rk*s(G%#7 z$Q1KjzIlb=N-w|PJqnJ%_uhQH*(}?G}J2fX{`J zY2YSmd>m^60@i`hFWfK_^lgew8p0Gb8b9+j3d7)WHVy1C!Vu6lEmpW1 z)KM3r&LQ?PvQu4EwQaP8Gn#m%c7Q#O0R8m+lNC>fE5|4se&E)WCFbqgpSfg_GB)6X zA7%S17l8l~@FnLFVIIhX08^(N1FR@=FQv$BB5HzBX746saQsrk)UP-ws5syx&6pAW z()`WsB)x4StsBMEOE|V$z z5@Ga8`(KLqgK~@)BEnENA5WzXzu96p2&J@eSE(`^tAA(b+ZwwD$VF zyOyC$1%jdp*ie#C4%1L4MW@D`vgR(rg)RUB@gi1nq=8Ex0^DGl{vVP0Uh-pV)K1SV z)n22>&>s8a;wK278}=PuACM=6tdWqMm-QHIOlj(^RXlPN#x>>Ox@~${m-VFEFR*17 z4ZjI(2m%>NrA7XvhVnCeG=Po`@(`xFTil9Cw4n+v|{ z<5KmUy3Dk4;9EGax_R}zmo@#doB)hsbRu+3!PxZC$>XnX_do*62VZQ&^9Bl3+FJHY z_uYaj14}^kd5>g?ffY`{OMT}p(L#ejqRYAdtj-ug9z_xs+-~se!*m$eSj@e@ z=cUE{67?9Jp8#zFvP%5h=e~Sl&o>#=G2^lgsh3(3LZmN#`m0ZeA|H$4utWoI^Iv*I zR`rj)wgW*ZxUP33PnV~Nqqdv#pEC_)NFBo;Fhl}&9`@WDVPTVPZ!1YxP) zF(rtY7izut-4*uueas+;N>lbOI(2uh8w~x^aYpo^Ua*rBCQu;+ zl+keo0W~=Ye!+YfrayP&O0(Mx%qW=YD6p;!Y7raj^m3sd*W&&$N0yJV@;a|V{lsEa z`a9-oem*bu^C^lo34+V8nS_Mxa>t{J2Ds{2g9)`I<-Up;Tv|Rt?l!Mj&!6&SNf5$h z;Wu(Yd)~qqOxo*gnw^|B0YP!7B-+T(H`6lbInujR7MMj|kacFT*pr@}+CdYf+JZ=s zz`BFcfj7F+|H7Q4UOTUqE-q44Ex`80HcT4|dJ~9zvhnnMI^7+QNCwHyA^k<9q#fx5yNO?CVeae`;Afep`>Drx=&77|L$+KoA2w1=iN`24zDt zzoK&4R_<1s4Y>!6lXo@3WVCHquhfYJlI71XWXsRC`K`yK1zUetn;l=)I$GGp5m8BP zDL;JWT9nB%D$w)~3M{i0ndKLpCjPD@$rH?rMd;QZGYeka9J4dMC|Df zL0x6`i9^w%-eSC4=Z;y2Y9+m|fh(0S;4%WHs3T#H z`WC{b=A6Lh6fE=rhW9%WO6ZoZ*%M_@0R|`BS3sOUp!J6B0sIXx(AEtvyBF3|kjt-Z zLuao;tPS3aE3c8py-0G^nD%GnzN<>1*q&Pj}Y>t#|znQX!hmm z8Cpk?_ItLWQEVS>1k>j&8=()6?>^w`u>9NkCC14qHeMRaNE$fQwfUfonG3XDIWpZ` znm2S@BOf%|nE$h6Y!|@#J;EI3O&Oi&FU`G71jGzBSn+mR$J@XC$o=6gK&h$!8gLFr zb-&D;pWc3i%s7u;04WNjKZR5dhMatiN>v0c(@X$0Iiz zl`;P z+gJIJ5-9sXf7=L0Rb#yU`s$1OM**aJ5jM*8Ht5V#Di_dm8HPi2)b_z^WpI9Ki`J8b zcfm|Ag3n2DxUP}VtWFfkL7BFmaq1g&;P%TDM_mM`LAN@MoJ6NaAYm9evj0ene{w<&ZB>y{0!A8Z$vOA z)5^)yZlL(;Vjt7?he!*WNz>yFZd1YK#(+#I4`K7o;eX0er?k!Z&59HWn#Pl$zAwT@ zO&7SfgW&H(`f`lD=a_t(Cul#u0uV9Us{@dz-rVjpSe=;~K>S++7oOx^ba}~gu99&* zgJ&55_(44O^N8-bs{-w}5G}9^46TBVB=88Dxk0!eVRV~t@(5{(n?yZD_S=7J0;$~9 zyJ?Agcf>CyXg*nwE@xS-g+-snmY)&CS1#vPXvJ5?%Ft?MxE`v`?XS0Y@&Y1xVXAZY z480zwMy@H>(^Za*R(PpIdM!=m-%i-|JfqHJhJXKc=?K_w(*xdn)|*523(dyIs1X$d z8{KJQZXqFqhIc#fV80hKw`8X&$r|fUnF29>iXiq}TSU1&CaN^D{0#i09xxsH4$?O= z7CmcWSm!urTRp(Pvhryv@iV21-!_X@??1sfc*7&t z9nQN_xYkAc>a|)Ot@tek3B*Wa$12W-whUtr)1zu7yJ@9Xz$uI?kFQQ!`RBZI-LVkY z-Vypf)a&L$((7afw>X){M8me)jMXRQFv`k(y*&A%7)wvR0~0?3#Mtsc2}On5N6&(H zH`NG*u+dLv4mM#iI3TjS{Z`v6Oz0rqXE7$8H)M>iDpn6izAWy~tft-X26rpA3I5Hx zR%?=2E!eAQ3^y4GGH(BEcrE$w?Yqa+6o%k8Z=jiG!*5g*sbvq=xa+S3z2WGdey|y- z%`v*xjKQ^j}AS?NM}ymp7Q5kmZafByZNc6@X2$=dVZPjZ@Hoq=y*ZX?--CYq3~ z;F6&#LjkJF?9mG-UTp)5n#nr|InD#lO=O}@w)w>Cnk@Fbm0{bEpGPISc3vt0TMuep z`~3rP%HNa2v^ycT?h zRl1U~YQ&}%YaMuXe0AHR9Mf^R?-U2aJ0y{c`3p~tRWcd(e5$jc6;2t|XpqYM!p@kN z@IY<*Z4#?O4LOmv0Tj#`$9f~RI;IjIfDtAbGX8A+IeF>LwBtJn=TVK$)CC~&=K;Z3 z-SC9SEA>Y<&?Uh@4}!pfCKymvk+dmRwE80zyfi-obg-ihjRJFxpH~4dn#xF(^G4xi$Hf%l-eKZ2$7g#b`K7|KXxEwK(>}6+G|6 z4)tIUXq4pM08fed0RJKI18~0n0ND7(DM^wZsTJ#D**<~oj&-a(dLhs~Fwnf_FaQOn zb@pyRB?)6dhd2zXO-6KjXeDxx5-x`3{HnXR`YMO;g;^))lJqP*HSjfJw3Bm#MgiOp zqD{FBE0EJUwo9mC-gdzlvR!IbV4>V#GNQQmqF9s5Q2I&A>rBE+*#lldAQg-BE~@@x zp?z?=q7YJ7A8x03si7eJVw_C`PwjvGIj;zJn9vntj$Hg?osS|)MhIXL2k8Sc&r18i zwh4XUS6k3FgwH;m(&lpe{5y@<#_Xy)JOSmR@CY^v2UDztp{+F9N!dXw;QiM@mHNGg#VAVrdYb;uEjBIFq;?<3}k74>kX^)z_su`g?e(gtOiu zj~e2a)-@Ph5;<$}nQff%m6&0D=%?R8RnjESNH&z-68P0o(e*(*?pQ}-2fhnCP%jDZ1C!C^91PY*#Jv&5 z*NUgUzF^{qp4|!~=-nqBhp5|;l2^L%+lz4HrxWvYZ-5jfISrH-TM5noWDR7r1|zcWsj*vA&aVlF$J zbhMb3D>}rslA0gqNn+`@pIpxI$P_J@#VJwg!ixxd+7KV5p&hXv1lP>{o-0NgIEjWL z)3I@Yc!M3l?I9!x+^L&g@XR)d>X=<2Nj9VOK3qM9Pow!ada}Ziaf`_7t>Biu!`bmu z8yH6bzEIe6&alD8Ak#4ShUMzo#rh&rwdGd09j*P)Yvs{-A|G<^g^9d~>kP@yIBuSp zlAn&kOM4+hI;X;?&qj{owp^Dv6UU+bJyfeE!FQu^woMzEWfb=rUD@k5Q4(tUFnG@Q z7-`aqK`f9J;PC0N6KXvLKE5YC{2GbL4X#igenRpJv9ke@>pk*e3753DNc>yaWAS zZfNM{)Uzd(tO;lj z?c6b~A*%GMV?#TgW4WJK7Y)Ivm;KeX7KffeOk3wV8L~g2A28Uxr|Ka^#y1DB!@v#f zr$9?r&Lhy_4K!>{pdvdK(=D`uWjZwOJ-m>Ok;sD*U^vw%7%9%IHwj3~9fG~~`JH2C z*#_7;%NVa2@M`A zqQ4UR)q4jH@4N)ztLUFl5NYiB$q0#J`ib?4g~XFYkVnW&zrF}*f?wL(2nQF{Lymz?k z@#&!kt8dQl776@L`J`oCGmq-YG}{^U6k-(n@4Tb%dD=6R7;C=4*HfLXsYhEg7yTq$ z1HsL|g8z#n-tkXVpGAo)(4u83HsT#N`&rR69p&lGN=tA=Ps7IDRdxh}O4msGhuozZL}q zY9}QL%Kv@%O1$o?(YhOUl~w-J>9tpJ+i^=sV938PYm{*q<@LC1)t9D=tFdWuruPDq zev1JQ-1vbHH>k#ixoAJTHaKf@;*V~*d9?H2Ejl@CpUh@b*uQIe6S9l$4!{pDZMK)l z@|(Nf;6>oRs~qWTczL%IUm}FNSNlnI{x&j`?7!Uio_(hdEyUw$&jTQvP+Cfy>Q&p0 z6LQzWN~}`)XYdZmZ96omRN;Zwy~(#vDrWtLKiz8Ty3~ zy-})asQf*??a(}nHIUH7psB$I6H5B-=_JBlm>uaa*TYU!@diUv+=2iNax8L!$+rId zaVmHYKO>{jQAIZ{h`SaO^Q;%QF{t%f8Z(yg{par%)QdK%*IHfZ0pnrxB|6$q5sfxF z#QY%6E(TGTJ~NV!JQ|B-PsCarlDn+!MdIkkVudMn&1dsMFt8hlU zxWm38@z`%OPvAZyE(Gu|$@a+fwGe6!~P-ux7AU*|=A~k~%Dj1O{vqqJ}D_9Ha z2T#Lk?bp7WFfo(4Xv6hJ8d-PVHlW1>+;b!#CR6B^9kDeeOBv)D<`Oegi9pu6Sa9T< z@`No{JRSyZ0nvZWsXYy$-J$Y^76ZmJ!E|^S_M0k4(e24Y%a>Amb*{q zx(}vZz07{V1cwiW6VDPb=fLZO+`yn@x(74V!X9#x&tZ&ZZJ`0aVBf2w%Y5}>s}^|E zJa4+!Kd+&S@)FXPkIXU?Q+g1Sb(u7^d|%D7ndwG-wA2RwK>f~cBO9K5fTy)eOIqP&;o?VU0p zRoLp>M~^bGKWvU}Ump4Gt8vYWIPGh4V@<#6ev6RW(;q_fv4+NO9++krzqz==WkpuF z`U$^|K?50wr)a>j^N&|Mo{oMlAu$wo4i?ChSy?V4oyi`AzyezQ66)0!mX5np#_V&Zm^`n&hr z!Y?XOKhF(@%4b1VbVCYD2)%G_sl&DCf3@Ofb>%F2&&!KQ3tW@$@9sRr>Jk4fYIjaO zF_aGm%s*K7k8Et57XfpX@3(+ocs64oqSFPhr90c-_B(?I&?$xIybNG4!uAG=``+Rg z+&nRP1NdXqgUljoM}vVb@mK-zd2+8t`PTWDdzZPXw}$_;I4!Km;9AVc!4zb*-6_K> z{8`-oqm;|s^z&-skNVZbB1O3JA@c8-?Q6lI8o3b~3{_{5+6-h(;+8T}9>mV<`_VPa zujXjdOR9Ap-_d)Aj8enuSEM%9dAN=7_MDhqp`xD#0Q&uiu+GW{7wcbe4ujoYMBZys z9AqAP6-k~AFnE^2@^va$9V(b z)&>4Myr>aH0kDUvz7KwdE&nhHEW+`gfJdfVPyz4)p>+sW0Q|E4Q|b@}#IqYh%URU1 z2VkWle%e?Gk3reEs;J<-=RGM4qHB_lk7cKAFGQ><66w^uf&eE^%)` z9!7*8p)#W_v!b!GzqTJDL{Y2bGSXC4aP6@?y}MDbc)nGKOdtGke)Km%*)!+v!PY*^ z%J|~)YHs*)go3j$ipx05*6%m*ad|DUEgO>fKI4qZ+meuHFe{_WD`p8>sBI;eBsVx7 z#cLCg_b&5mu1f(7eplQ;qbL8vD}ydTkjtE%D~EuKz(F`-7BpSWoBxawp45-tz}Zq~r7FJJ5tA5#EkrzOIU`Rb@q zGyLDf@cOHz7o2WLm-tf^H;Z_KXM)Z6JYd#nyj21iMtA-NUeJLYR7vI7vT3p}6r?}M%};L=S5%xz8OXGaY$C`Nwh(c7|4C2vnlcLbQ-JH(~Nas-~SB?Yk=4bkEH#T?l-Z^M%8SdARo=Zd0Z@k;|cfMKw+rKubz!Is#j01Zuq!1tZ6JJ`ux(B zr^6z@$@BPZGwn83re@h#_{RR@*Ow|x{(nYibwB)&%oJ>;l8v{+1%F=Ag2t3E z$Aw^X9PcK@8nJva=IY;&a2bMRIcR(n*S4-hyJ`jwrLMs4L;v2%n@X&r@`YN&c# zBZ;~e%M4esbI<0Mym>3lUBDD;9>3$IDqxyuL}6xeW8rG^g-k76dC7~tRiC%w=15wq zrzD!W?`})_N?}3v#E6pGb}4446@xv$oHKVD5|m$1t<=`)Md9Q|tB;&iG76|oo>ORK zN!uiQtyxRHGhci7!74K{E>4z{BfX)LFO|y&7UNyh#)06G9#GxL@~I0KV>!jQT75-L8;U~$fwKj>4<=Q>9x2eQ z@5BxTob>x1ps+69r;VbMK!rQM50xA7_JIn6WRkg)R}3{f9n|#4VZXKcX(&&?Ekj_v zmc(1YMWHYOxJI!Apv}aO^EO@hH{d^sV9~-Yv7b>I5}aJ$QgfB=ki_m}XYqWn7L2Hy z&a3Z-XWXTqgGw2H+nF_vjX2x>q>1Mokha4+Hx>%&bQ{_SIwf-A5oJbia{xTxqFrtg z9Ev!gUIK5A_JRELuy`n7&c}2MX2xhI2A~H_w2v*F`eMey(PI1pk);f-RrGl6OGr%A;u}jV2 z_Z5oSKCn_%atKyG1jFP4kVw|8_yO01oq|&l7l+{YrUPMx}@{+7D-lq4OK5U-}+-$zw73Q2xYVzo>($ z@4Dw}%YGl^e`4Uk4awTPt8xr4<9h`2F`a^f??5?-1A?1JJ1g3eQh>Vy>GTHSQi1?% zHL5$Lj(as~TSn|O2~a?w zb}234-Q||#N>&g3?>95tm*gaFajw(H4v<({lEdLVIWwz3ErhRZ_u20VJ%FR51NsZF z`IkQT2L}hk{e#1!BY58L4~9q2*un2fQ~{Z>Tr>7eD`h`5@1gNODFnIveU;3-;P+7j zlK;U&@(1Y;d!PU)e-Qt$k^fV`hWz`zPRxxJ+QSErvc_PH2kjrCet*;chj3kJ z?EeYi`SY#k&)M0<%PVG5;meuynGx2?WNu(&Yb({tDqlsF6L`)p_??Wi*e&x_9P=b# z5m+*dL^8Lb$F5Z@m@_)V=4gl93bqh>#Uho=i$#PD7aF#dV7*~B7i5-Gbtg=l8O2sA zgC{GN2oW%=nC8+5Wushq+rCew#fdOUY%`&?(uS!S zI13Na;4vpLM+cIKi8~LN{o(%Y*4o*VES`cxP_u#yNg{kJRbm*ABDDl+XRteWeq*Lp z%mnvCc6P;h5NKfxZO1OhH>bz!CKNO=;lMXI8jzcE4LE#mM8}B4NGlg2TG1lp5YdQB zWICyDK4Sfzqx3rE;1!JkM8JGJy0J)a8fD;@4Kg!QJYc(lnDH#KxbHktQy!5BCi%R* zYRh8fi2bwv-EBu~0GF>aizkn{WyWgIqhlIoEy+5trv>yC@1`pYveyF0AQm~5$rq@P zE->iKf&OYbiOuak$#);Q$)lF+wv?lB3>v6qfchgG!6z@TUVd|Ses=R7s4yvTPr^;~1C6^YcuuB13ZI8ca*H%Um3xx*#O_W8OE#W$z$IDchR{_Kt(@ewNTZc>T5~xbUzNyEf+yddo_t^UL9^kawk1Av@FoPECug~R0a!Rhg2efAyk;g0uX#cj9@}G=$|AvF z=;PBva5Z2PCBB>jfyPOOOB*grprX> z%b(k6N8DM>J9(S}@0?a*y9oik&{L@c3`~F%*o-H`8x@=`aP*wNd_R73Gn#>4hye!) zD1Z-ptcZ#vwgA+JHe);89Z=)hOx`&w%r|!yidF>VtCSAnbJ)j}c2_%4CFL4cuzHLB z7abO`4I@8@2CZ2pV0toG+pETf$Yj&bEaH_agVy3vf4o#iL=cb|jgl6fU%&Z=^ivkG zzQzJ_jmU>Ruf|9?5qXg{o&trD{F%i$)mqo!8RR)7>rwp<+r%skNS=Jl@_?bUk z)^I=nHzs=A>;HrKfB#^(QUBQ=9QK;~|5E@+8}xDo@fAKze4+8)^mR8gx*I8%Gj08CX4`RjtwZ}vDKkWC) z{Qt0z_J7px?>F}U6o9f0rj*wQ8j=|-aXI;SPyygEY z)jZuAwG!49*6#|)kN3NQf?Gpkx~-t=&|#$xm;9>Demm~Z&Bs40+^_#(Vf9Jte@9^X zVE=uv{r*KLxn@-_`hP_)z_?tlDErkJoOiSFRplDMK)jt|c8Ud`xiR z#&1NCd^zlp(_y-r=PG%1B31^nd4_cexZ=A4p9nG^vVUoA*;#k&vA2i=cL=1$%p_34 z;QleFEA>>k!3}Cv%R1{RaG;PT9Eej!&nhMI!k>X&DSja)d zW-d;tEYNO3JV{nmJ6#U#vC{-n6H4;Kf{BzRy}mxJ2=gNWTFn8^kJq?&o`~VDu}iK^ zb!dSY#U$d!)((6&bHxUv|6S+J*{gHrxYZ__T#AUPB+l9~3};k0wSY;JyG#aA4d?el zq~#iv3)~rR^GYdYrHPf0pw<6n2ekrL&p%hg~LP8DNH z979L|PhNj<{w>vmXF>#dHTHrht73aBHyE~%3R6TUgXs!(vYAdC|BG#0K3hZPiiA@^ zsW`9-*fXQHDpE8T7L*$6HH0&_HcTd+AcA(8yH`~WtED?nplD+)=ONWmsA#5*b;?Eu zSt5VRoS>NuP_Q$=y;qcmoo0LNy~>!+6H=+N3`n@JWQObjGvZVV%?mlA9KpUF zVKpoe#@BKRQkDs=4wTWKtS#x=EnHxI#=P41Klz@8@nUOa$-x(sJgA{yWnN|`R#KgBP1(t^^J31Mw}4Zk z!~<5qF>Cd{e7C^=GB@i)Wg1nc4#!A1aJRMS0AF^e3Y{>i>y(-t0Vq_QMV2Q*ner$n zE1em(`}K$oyuLTw%Q0nZqyKWF`^D(OD<%{cv*>wWedXP;dlT&XQHlu{vyx}Ef?{6K z96)Y@aV#bap`tW|Lr|tTw|T-}sI&_POTJe2-Z4cTo4Q%9WwnEa(F~=D%_@omP6B9^ zOO-(s0akG~SIUJ8Fd$B0E#%4E`67>Gk&!^KuqUuOmni<(n4TS!y#AVr6{htiSf&cCEPLP@YPIXaJ>6h-{1Dq9q>k*60< z%`1n4q)avf$=lHR5b%b4iWTJ`OCu^Z!7;NOBx{4ae)#o7bDWOn>t(bu2lOU=2wiB7q^l zxa-t>aW$zJ1Q#V{SQn>NaJeX)tAXi-uf~9fj@ps;u@x8w;11YDi*`3AZs5v>?Tt`G zDLC_lY+kug?Nrs-NWij0+`+XG=#EykOV4^s)2ejTvfWnN#+!&9wRE>NZ6hHgNQYZ- zn2_O8{#E@EQtUrTf8?(Y_xnFs z0)Eo^Pp^M)RMvk7L+bzR_l8aV=P4kNhLV49Iaq|bvlDual5Se~X#%&>DPG=OlZYP0 z0z;NGF`6tbWb~@%);}O=jIzMJius{7LSx;3G`Mg7Aj&zq^2c)l57~cjzv}-C2U!0- z=p8op|0Dp?o}`>Cz6*DtE`0CiI^n_R#$f;A@S)#-$VYww6jL&P6$E~o7AF(ytO13^-bNbvzZ{S&F z|Ao(g+&8}*ko_Ni!v2T-;{C6~L%RPD;bUX}PXR@H7cHB9;ej^0<$gQ`k6yId@$uG_ z8!^GwLw-rnSyCuWx4QJ_A>;+=P-EQp)CZ*S;c_~P+fG2RCtA zZ;l-jrz_Gv{Oly{Xh}2q)UK{_Wvl@TfZM7>~Qx zc_ax^#^7Ej1mILo2$$5uk_rx3N)kpgK?ev8F0a2{-F44;Lo_1Foxl-zA`Au3(nuL} zNkBQ(jzgp~E+%6#Q&v#@0-cMSUjG>MW8#Apz{HqxM8{l>R2U+(?{)gDEb9Ms<_yD%%LliGEd^;<%>nYr1Kuq#C0T&tf9uNA=QC{a~5|GV;rH1I&^o z;oNwQ^m+fbTsrqE6DKnomPoJ6_z1M!LUl>>+sWnCU)3j~+QqJgm~yR)2ELdQPsnZ5 z3e#5#7GBj{E__TL*tW}B80!$NS=;Vu`O;>drD4^++e|hyET8KAS+9RmI@io-O-k*% zj6N)j{+|cqpE>{A=KQ}Cp2vUp=l}Mz_}gyN?EgFA$@yQ0oQ~5tKj5ooO|t(2d9PkR z!xybvFP+paI!$zoR%geeNslP6O)c#ERzPF&3o~YU6SXTsNB8*Sg}aE>d;5eDNj47P zO^EkXjWFMFz~W$C!R7VsT_1kKI3^KT4{$h7ax3>9z;`)3EXGiex152t?9k|V`5V&B oBdpG1b&!3>-(WBp3?8hvNkvLGGEmHW9!R1+hhN`r``SI^|$t6d-fcCgFOIK|2cTx z(0@?+Iwpkj77jhTk`dl{|JR$_G$f2TQQTx@5t1m5)2bm(wJw`7E^kAU#d)Ro<+=$8 zB~Di9<@)ft(c8Gp^R&>RDl0w_r{2_6S|n)_l82T!O_ukMR{;|N_{2$~M(;Ugu%xRc z^T^e+0B#e|#6y0c`ob*XOIkOPK?79*&_HK=p+PRWJZcaVH3&gHSAyVXA<2i?Dqx}t z2EtvfEXBz3sG6-pPF2CERv|6Fin0>3Rd^FsaOr|4UFj>AOKwq9=gs_@D4Uv1GN_T3 zrX)o@JHJ1*8q8%}`|6T$MlA>S<6qQbHTk@{0G4`uO-(07dj^Got5eV5aMZx))Ph(} zYF&S}m=*-U#!TzAUHg0t^Z!TN?O$j9>zF$E|0jSdod5rV@dHE2mBCs}0d5M&-vcjQ za{Lb8l)N{R@ra&6hAfO5?=e2DpYMjyVd|S?8-@EI%wN_w3hX^Rc=qr&WH<Z}~-x*hFxwJJ6YPUUKNCwUf!ObRU7nY}8uz>YSIYL7|0LRE#ix9ikG4-qzt51F)fxL~{y8Ng z|Cm$8bxK4WGeod5K>aSGoBurj_wHmJy0e96h3<{^7=MnQ(^69xOaH^it`27&bcN+K zjz6=e^Wa9q=p|rzQ!8)}0eNF>gbXZQ+h00|favq;L-rBNw*A#SJltB9OEEAS}IAENY2UX-J>e0-A?q#n`K;MVm# zF*Z;0WRuCM?7P)MK1x%==}i27j7=(zmvxD2f-o5(V@PyOy>@0#qw;?nrE#*0VSxXapzgo??{BiC?SIvAivPUnKX3ZaoBs2b|Ge!#ulvvI{_}?ayyZXd z%YT0K9~mYao6PvZe>z0^Q0_(7&g^Ma{ugOf$_?P_75rzk_5P>e|3x^@`@dZPv@3vi z3D8jkbQJ;3Dxg^goK^?)vJud#5FjQUo0!%Mf$@<1?HfVm{~?wA+y5v2QzkwG!T$>Y t{`ccQHkod6)bjt;d( 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 bMyO0PAG=|rAt52LeM8pXC0R!bLP7dJ-y^|q diff --git a/install/ubuntu/14.10/dovecot.tar.gz b/install/ubuntu/14.10/dovecot.tar.gz deleted file mode 100644 index f67e7eeb272cbc64e5ffa0f2d10ca3c6e8626706..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3482 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 Date: Sun, 8 Nov 2015 21:40:07 +0200 Subject: [PATCH 212/264] Support for Ubuntu 15.10 --- install/ubuntu/15.10/apache2/apache2.conf | 86 ++ install/ubuntu/15.10/apache2/status.conf | 8 + install/ubuntu/15.10/bind/named.conf | 12 + install/ubuntu/15.10/clamav/clamd.conf | 61 ++ install/ubuntu/15.10/deb_signing.key | 30 + .../ubuntu/15.10/dovecot/conf.d/10-auth.conf | 4 + .../15.10/dovecot/conf.d/10-logging.conf | 1 + .../ubuntu/15.10/dovecot/conf.d/10-mail.conf | 4 + .../15.10/dovecot/conf.d/10-master.conf | 29 + .../ubuntu/15.10/dovecot/conf.d/10-ssl.conf | 3 + .../ubuntu/15.10/dovecot/conf.d/20-imap.conf | 58 ++ .../ubuntu/15.10/dovecot/conf.d/20-pop3.conf | 91 ++ .../dovecot/conf.d/auth-passwdfile.conf.ext | 9 + install/ubuntu/15.10/dovecot/dovecot.conf | 4 + install/ubuntu/15.10/exim/dnsbl.conf | 2 + install/ubuntu/15.10/exim/exim4.conf.template | 377 ++++++++ install/ubuntu/15.10/exim/spam-blocks.conf | 0 .../ubuntu/15.10/fail2ban/action.d/vesta.conf | 9 + .../ubuntu/15.10/fail2ban/filter.d/vesta.conf | 10 + install/ubuntu/15.10/fail2ban/jail.local | 39 + install/ubuntu/15.10/firewall/ports.conf | 16 + install/ubuntu/15.10/firewall/rules.conf | 10 + install/ubuntu/15.10/logrotate/apache2 | 19 + install/ubuntu/15.10/logrotate/nginx | 13 + install/ubuntu/15.10/logrotate/vesta | 7 + install/ubuntu/15.10/mysql/my-large.cnf | 42 + install/ubuntu/15.10/mysql/my-medium.cnf | 40 + install/ubuntu/15.10/mysql/my-small.cnf | 40 + install/ubuntu/15.10/nginx/nginx.conf | 124 +++ install/ubuntu/15.10/nginx/phpmyadmin.inc | 15 + install/ubuntu/15.10/nginx/phppgadmin.inc | 11 + install/ubuntu/15.10/nginx/status.conf | 9 + install/ubuntu/15.10/nginx/webmail.inc | 15 + install/ubuntu/15.10/packages/default.pkg | 18 + install/ubuntu/15.10/packages/gainsboro.pkg | 18 + install/ubuntu/15.10/packages/palegreen.pkg | 18 + install/ubuntu/15.10/packages/slategrey.pkg | 18 + install/ubuntu/15.10/pga/config.inc.php | 159 ++++ install/ubuntu/15.10/pga/phppgadmin.conf | 31 + install/ubuntu/15.10/php5-fpm/www.conf | 10 + install/ubuntu/15.10/pma/apache.conf | 42 + install/ubuntu/15.10/pma/config.inc.php | 146 +++ install/ubuntu/15.10/postgresql/pg_hba.conf | 11 + install/ubuntu/15.10/proftpd/proftpd.conf | 32 + install/ubuntu/15.10/roundcube/apache.conf | 40 + install/ubuntu/15.10/roundcube/config.inc.php | 33 + install/ubuntu/15.10/roundcube/db.inc.php | 66 ++ install/ubuntu/15.10/roundcube/main.inc.php | 850 ++++++++++++++++++ install/ubuntu/15.10/roundcube/vesta.php | 62 ++ install/ubuntu/15.10/sudo/admin | 7 + .../ubuntu/15.10/templates/dns/child-ns.tpl | 11 + .../ubuntu/15.10/templates/dns/default.tpl | 15 + install/ubuntu/15.10/templates/dns/gmail.tpl | 14 + .../15.10/templates/web/apache2/basedir.stpl | 41 + .../15.10/templates/web/apache2/basedir.tpl | 35 + .../15.10/templates/web/apache2/default.stpl | 40 + .../15.10/templates/web/apache2/default.tpl | 34 + .../15.10/templates/web/apache2/hosting.stpl | 49 + .../15.10/templates/web/apache2/hosting.tpl | 43 + .../15.10/templates/web/apache2/phpcgi.sh | 16 + .../15.10/templates/web/apache2/phpcgi.stpl | 35 + .../15.10/templates/web/apache2/phpcgi.tpl | 28 + .../15.10/templates/web/apache2/phpfcgid.sh | 22 + .../15.10/templates/web/apache2/phpfcgid.stpl | 36 + .../15.10/templates/web/apache2/phpfcgid.tpl | 28 + .../15.10/templates/web/awstats/awstats.tpl | 133 +++ .../15.10/templates/web/awstats/index.tpl | 10 + .../15.10/templates/web/awstats/nav.tpl | 23 + .../15.10/templates/web/nginx/caching.sh | 12 + .../15.10/templates/web/nginx/caching.stpl | 44 + .../15.10/templates/web/nginx/caching.tpl | 41 + .../15.10/templates/web/nginx/default.stpl | 36 + .../15.10/templates/web/nginx/default.tpl | 33 + .../15.10/templates/web/nginx/hosting.sh | 11 + .../15.10/templates/web/nginx/hosting.stpl | 38 + .../15.10/templates/web/nginx/hosting.tpl | 35 + .../web/nginx/php5-fpm/cms_made_simple.stpl | 51 ++ .../web/nginx/php5-fpm/cms_made_simple.tpl | 47 + .../web/nginx/php5-fpm/codeigniter2.stpl | 56 ++ .../web/nginx/php5-fpm/codeigniter2.tpl | 52 ++ .../web/nginx/php5-fpm/codeigniter3.stpl | 51 ++ .../web/nginx/php5-fpm/codeigniter3.tpl | 47 + .../web/nginx/php5-fpm/datalife_engine.stpl | 122 +++ .../web/nginx/php5-fpm/datalife_engine.tpl | 118 +++ .../templates/web/nginx/php5-fpm/default.stpl | 50 ++ .../templates/web/nginx/php5-fpm/default.tpl | 46 + .../web/nginx/php5-fpm/dokuwiki.stpl | 67 ++ .../templates/web/nginx/php5-fpm/dokuwiki.tpl | 62 ++ .../templates/web/nginx/php5-fpm/drupal.stpl | 101 +++ .../templates/web/nginx/php5-fpm/drupal.tpl | 98 ++ .../templates/web/nginx/php5-fpm/joomla.stpl | 58 ++ .../templates/web/nginx/php5-fpm/joomla.tpl | 54 ++ .../templates/web/nginx/php5-fpm/no-php.stpl | 42 + .../templates/web/nginx/php5-fpm/no-php.tpl | 38 + .../web/nginx/php5-fpm/owncloud.stpl | 80 ++ .../templates/web/nginx/php5-fpm/owncloud.tpl | 76 ++ .../templates/web/nginx/php5-fpm/piwik.stpl | 68 ++ .../templates/web/nginx/php5-fpm/piwik.tpl | 64 ++ .../templates/web/nginx/php5-fpm/pyrocms.stpl | 61 ++ .../templates/web/nginx/php5-fpm/pyrocms.tpl | 57 ++ .../web/nginx/php5-fpm/wordpress.stpl | 50 ++ .../web/nginx/php5-fpm/wordpress.tpl | 46 + .../web/nginx/php5-fpm/wordpress2.stpl | 62 ++ .../web/nginx/php5-fpm/wordpress2.tpl | 58 ++ .../15.10/templates/web/nginx/proxy_ip.tpl | 9 + .../15.10/templates/web/php5-fpm/default.tpl | 18 + .../15.10/templates/web/php5-fpm/no-php.tpl | 13 + .../15.10/templates/web/php5-fpm/socket.tpl | 21 + .../web/skel/document_errors/403.html | 29 + .../web/skel/document_errors/404.html | 28 + .../web/skel/document_errors/50x.html | 29 + .../templates/web/skel/public_html/index.html | 26 + .../templates/web/skel/public_html/robots.txt | 3 + .../web/skel/public_shtml/index.html | 26 + .../web/skel/public_shtml/robots.txt | 3 + .../15.10/templates/web/suspend/.htaccess | 2 + .../15.10/templates/web/suspend/index.html | 27 + .../templates/web/webalizer/webalizer.tpl | 110 +++ install/ubuntu/15.10/vsftpd/vsftpd.conf | 24 + 119 files changed, 5772 insertions(+) create mode 100644 install/ubuntu/15.10/apache2/apache2.conf create mode 100644 install/ubuntu/15.10/apache2/status.conf create mode 100644 install/ubuntu/15.10/bind/named.conf create mode 100644 install/ubuntu/15.10/clamav/clamd.conf create mode 100644 install/ubuntu/15.10/deb_signing.key create mode 100644 install/ubuntu/15.10/dovecot/conf.d/10-auth.conf create mode 100644 install/ubuntu/15.10/dovecot/conf.d/10-logging.conf create mode 100644 install/ubuntu/15.10/dovecot/conf.d/10-mail.conf create mode 100644 install/ubuntu/15.10/dovecot/conf.d/10-master.conf create mode 100644 install/ubuntu/15.10/dovecot/conf.d/10-ssl.conf create mode 100644 install/ubuntu/15.10/dovecot/conf.d/20-imap.conf create mode 100644 install/ubuntu/15.10/dovecot/conf.d/20-pop3.conf create mode 100644 install/ubuntu/15.10/dovecot/conf.d/auth-passwdfile.conf.ext create mode 100644 install/ubuntu/15.10/dovecot/dovecot.conf create mode 100644 install/ubuntu/15.10/exim/dnsbl.conf create mode 100644 install/ubuntu/15.10/exim/exim4.conf.template create mode 100644 install/ubuntu/15.10/exim/spam-blocks.conf create mode 100644 install/ubuntu/15.10/fail2ban/action.d/vesta.conf create mode 100644 install/ubuntu/15.10/fail2ban/filter.d/vesta.conf create mode 100644 install/ubuntu/15.10/fail2ban/jail.local create mode 100644 install/ubuntu/15.10/firewall/ports.conf create mode 100644 install/ubuntu/15.10/firewall/rules.conf create mode 100644 install/ubuntu/15.10/logrotate/apache2 create mode 100644 install/ubuntu/15.10/logrotate/nginx create mode 100644 install/ubuntu/15.10/logrotate/vesta create mode 100644 install/ubuntu/15.10/mysql/my-large.cnf create mode 100644 install/ubuntu/15.10/mysql/my-medium.cnf create mode 100644 install/ubuntu/15.10/mysql/my-small.cnf create mode 100644 install/ubuntu/15.10/nginx/nginx.conf create mode 100644 install/ubuntu/15.10/nginx/phpmyadmin.inc create mode 100644 install/ubuntu/15.10/nginx/phppgadmin.inc create mode 100644 install/ubuntu/15.10/nginx/status.conf create mode 100644 install/ubuntu/15.10/nginx/webmail.inc create mode 100644 install/ubuntu/15.10/packages/default.pkg create mode 100644 install/ubuntu/15.10/packages/gainsboro.pkg create mode 100644 install/ubuntu/15.10/packages/palegreen.pkg create mode 100644 install/ubuntu/15.10/packages/slategrey.pkg create mode 100644 install/ubuntu/15.10/pga/config.inc.php create mode 100644 install/ubuntu/15.10/pga/phppgadmin.conf create mode 100644 install/ubuntu/15.10/php5-fpm/www.conf create mode 100644 install/ubuntu/15.10/pma/apache.conf create mode 100644 install/ubuntu/15.10/pma/config.inc.php create mode 100644 install/ubuntu/15.10/postgresql/pg_hba.conf create mode 100644 install/ubuntu/15.10/proftpd/proftpd.conf create mode 100644 install/ubuntu/15.10/roundcube/apache.conf create mode 100644 install/ubuntu/15.10/roundcube/config.inc.php create mode 100644 install/ubuntu/15.10/roundcube/db.inc.php create mode 100644 install/ubuntu/15.10/roundcube/main.inc.php create mode 100644 install/ubuntu/15.10/roundcube/vesta.php create mode 100644 install/ubuntu/15.10/sudo/admin create mode 100755 install/ubuntu/15.10/templates/dns/child-ns.tpl create mode 100755 install/ubuntu/15.10/templates/dns/default.tpl create mode 100755 install/ubuntu/15.10/templates/dns/gmail.tpl create mode 100755 install/ubuntu/15.10/templates/web/apache2/basedir.stpl create mode 100755 install/ubuntu/15.10/templates/web/apache2/basedir.tpl create mode 100755 install/ubuntu/15.10/templates/web/apache2/default.stpl create mode 100755 install/ubuntu/15.10/templates/web/apache2/default.tpl create mode 100755 install/ubuntu/15.10/templates/web/apache2/hosting.stpl create mode 100755 install/ubuntu/15.10/templates/web/apache2/hosting.tpl create mode 100755 install/ubuntu/15.10/templates/web/apache2/phpcgi.sh create mode 100755 install/ubuntu/15.10/templates/web/apache2/phpcgi.stpl create mode 100755 install/ubuntu/15.10/templates/web/apache2/phpcgi.tpl create mode 100755 install/ubuntu/15.10/templates/web/apache2/phpfcgid.sh create mode 100755 install/ubuntu/15.10/templates/web/apache2/phpfcgid.stpl create mode 100755 install/ubuntu/15.10/templates/web/apache2/phpfcgid.tpl create mode 100755 install/ubuntu/15.10/templates/web/awstats/awstats.tpl create mode 100755 install/ubuntu/15.10/templates/web/awstats/index.tpl create mode 100755 install/ubuntu/15.10/templates/web/awstats/nav.tpl create mode 100755 install/ubuntu/15.10/templates/web/nginx/caching.sh create mode 100755 install/ubuntu/15.10/templates/web/nginx/caching.stpl create mode 100755 install/ubuntu/15.10/templates/web/nginx/caching.tpl create mode 100755 install/ubuntu/15.10/templates/web/nginx/default.stpl create mode 100755 install/ubuntu/15.10/templates/web/nginx/default.tpl create mode 100755 install/ubuntu/15.10/templates/web/nginx/hosting.sh create mode 100755 install/ubuntu/15.10/templates/web/nginx/hosting.stpl create mode 100755 install/ubuntu/15.10/templates/web/nginx/hosting.tpl create mode 100644 install/ubuntu/15.10/templates/web/nginx/php5-fpm/cms_made_simple.stpl create mode 100644 install/ubuntu/15.10/templates/web/nginx/php5-fpm/cms_made_simple.tpl create mode 100644 install/ubuntu/15.10/templates/web/nginx/php5-fpm/codeigniter2.stpl create mode 100644 install/ubuntu/15.10/templates/web/nginx/php5-fpm/codeigniter2.tpl create mode 100644 install/ubuntu/15.10/templates/web/nginx/php5-fpm/codeigniter3.stpl create mode 100644 install/ubuntu/15.10/templates/web/nginx/php5-fpm/codeigniter3.tpl create mode 100644 install/ubuntu/15.10/templates/web/nginx/php5-fpm/datalife_engine.stpl create mode 100644 install/ubuntu/15.10/templates/web/nginx/php5-fpm/datalife_engine.tpl create mode 100644 install/ubuntu/15.10/templates/web/nginx/php5-fpm/default.stpl create mode 100644 install/ubuntu/15.10/templates/web/nginx/php5-fpm/default.tpl create mode 100644 install/ubuntu/15.10/templates/web/nginx/php5-fpm/dokuwiki.stpl create mode 100644 install/ubuntu/15.10/templates/web/nginx/php5-fpm/dokuwiki.tpl create mode 100644 install/ubuntu/15.10/templates/web/nginx/php5-fpm/drupal.stpl create mode 100644 install/ubuntu/15.10/templates/web/nginx/php5-fpm/drupal.tpl create mode 100644 install/ubuntu/15.10/templates/web/nginx/php5-fpm/joomla.stpl create mode 100644 install/ubuntu/15.10/templates/web/nginx/php5-fpm/joomla.tpl create mode 100644 install/ubuntu/15.10/templates/web/nginx/php5-fpm/no-php.stpl create mode 100644 install/ubuntu/15.10/templates/web/nginx/php5-fpm/no-php.tpl create mode 100644 install/ubuntu/15.10/templates/web/nginx/php5-fpm/owncloud.stpl create mode 100644 install/ubuntu/15.10/templates/web/nginx/php5-fpm/owncloud.tpl create mode 100644 install/ubuntu/15.10/templates/web/nginx/php5-fpm/piwik.stpl create mode 100644 install/ubuntu/15.10/templates/web/nginx/php5-fpm/piwik.tpl create mode 100644 install/ubuntu/15.10/templates/web/nginx/php5-fpm/pyrocms.stpl create mode 100644 install/ubuntu/15.10/templates/web/nginx/php5-fpm/pyrocms.tpl create mode 100644 install/ubuntu/15.10/templates/web/nginx/php5-fpm/wordpress.stpl create mode 100644 install/ubuntu/15.10/templates/web/nginx/php5-fpm/wordpress.tpl create mode 100644 install/ubuntu/15.10/templates/web/nginx/php5-fpm/wordpress2.stpl create mode 100644 install/ubuntu/15.10/templates/web/nginx/php5-fpm/wordpress2.tpl create mode 100755 install/ubuntu/15.10/templates/web/nginx/proxy_ip.tpl create mode 100644 install/ubuntu/15.10/templates/web/php5-fpm/default.tpl create mode 100644 install/ubuntu/15.10/templates/web/php5-fpm/no-php.tpl create mode 100644 install/ubuntu/15.10/templates/web/php5-fpm/socket.tpl create mode 100755 install/ubuntu/15.10/templates/web/skel/document_errors/403.html create mode 100755 install/ubuntu/15.10/templates/web/skel/document_errors/404.html create mode 100755 install/ubuntu/15.10/templates/web/skel/document_errors/50x.html create mode 100755 install/ubuntu/15.10/templates/web/skel/public_html/index.html create mode 100755 install/ubuntu/15.10/templates/web/skel/public_html/robots.txt create mode 100755 install/ubuntu/15.10/templates/web/skel/public_shtml/index.html create mode 100755 install/ubuntu/15.10/templates/web/skel/public_shtml/robots.txt create mode 100755 install/ubuntu/15.10/templates/web/suspend/.htaccess create mode 100755 install/ubuntu/15.10/templates/web/suspend/index.html create mode 100755 install/ubuntu/15.10/templates/web/webalizer/webalizer.tpl create mode 100644 install/ubuntu/15.10/vsftpd/vsftpd.conf diff --git a/install/ubuntu/15.10/apache2/apache2.conf b/install/ubuntu/15.10/apache2/apache2.conf new file mode 100644 index 000000000..221780117 --- /dev/null +++ b/install/ubuntu/15.10/apache2/apache2.conf @@ -0,0 +1,86 @@ +# It is split into several files forming the configuration hierarchy outlined +# below, all located in the /etc/apache2/ directory: +# +# /etc/apache2/ +# |-- apache2.conf +# | `-- ports.conf +# |-- mods-enabled +# | |-- *.load +# | `-- *.conf +# |-- conf.d +# | `-- * + +# Global configuration +PidFile ${APACHE_PID_FILE} +Timeout 30 +KeepAlive Off +MaxKeepAliveRequests 100 +KeepAliveTimeout 10 + + + StartServers 8 + MinSpareServers 5 + MaxSpareServers 20 + ServerLimit 256 + MaxClients 200 + MaxRequestsPerChild 4000 + + + + StartServers 2 + MinSpareThreads 25 + MaxSpareThreads 75 + ThreadLimit 64 + ThreadsPerChild 25 + MaxClients 200 + MaxRequestsPerChild 4000 + + + + StartServers 2 + MinSpareThreads 25 + MaxSpareThreads 75 + ThreadLimit 64 + ThreadsPerChild 25 + MaxClients 200 + MaxRequestsPerChild 4000 + + +# These need to be set in /etc/apache2/envvars +User ${APACHE_RUN_USER} +Group ${APACHE_RUN_GROUP} +#User www-data +#Group www-data + +AccessFileName .htaccess + + + Order allow,deny + Deny from all + Satisfy all + + +DefaultType None +HostnameLookups Off + +ErrorLog ${APACHE_LOG_DIR}/error.log +LogLevel warn + +# Include module configuration: +Include mods-enabled/*.load +Include mods-enabled/*.conf + +# Include list of ports to listen on and which to use for name based vhosts +Include ports.conf + +LogFormat "%v:%p %h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" vhost_combined +LogFormat "%h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" combined +LogFormat "%h %l %u %t \"%r\" %>s %O" common +LogFormat "%{Referer}i -> %U" referer +LogFormat "%{User-agent}i" agent +LogFormat "%b" bytes + +Include conf.d/ + +# Include the virtual host configurations: +#Include sites-enabled/ diff --git a/install/ubuntu/15.10/apache2/status.conf b/install/ubuntu/15.10/apache2/status.conf new file mode 100644 index 000000000..da9d96333 --- /dev/null +++ b/install/ubuntu/15.10/apache2/status.conf @@ -0,0 +1,8 @@ +Listen 127.0.0.1:8081 + + SetHandler server-status + Order deny,allow + Deny from all + Allow from 127.0.0.1 + Allow from all + diff --git a/install/ubuntu/15.10/bind/named.conf b/install/ubuntu/15.10/bind/named.conf new file mode 100644 index 000000000..ed6ece885 --- /dev/null +++ b/install/ubuntu/15.10/bind/named.conf @@ -0,0 +1,12 @@ +// This is the primary configuration file for the BIND DNS server named. +// +// Please read /usr/share/doc/bind9/README.Debian.gz for information on the +// structure of BIND configuration files in Debian, *BEFORE* you customize +// this configuration file. +// +// If you are just adding zones, please do that in /etc/bind/named.conf.local + +include "/etc/bind/named.conf.options"; +include "/etc/bind/named.conf.local"; +include "/etc/bind/named.conf.default-zones"; + diff --git a/install/ubuntu/15.10/clamav/clamd.conf b/install/ubuntu/15.10/clamav/clamd.conf new file mode 100644 index 000000000..ea982697a --- /dev/null +++ b/install/ubuntu/15.10/clamav/clamd.conf @@ -0,0 +1,61 @@ +#Automatically Generated by clamav-base postinst +#To reconfigure clamd run #dpkg-reconfigure clamav-base +#Please read /usr/share/doc/clamav-base/README.Debian.gz for details +LocalSocket /var/run/clamav/clamd.ctl +FixStaleSocket true +LocalSocketGroup clamav +LocalSocketMode 666 +# TemporaryDirectory is not set to its default /tmp here to make overriding +# the default with environment variables TMPDIR/TMP/TEMP possible +User clamav +AllowSupplementaryGroups true +ScanMail true +ScanArchive true +ArchiveBlockEncrypted false +MaxDirectoryRecursion 15 +FollowDirectorySymlinks false +FollowFileSymlinks false +ReadTimeout 180 +MaxThreads 12 +MaxConnectionQueueLength 15 +LogSyslog false +LogFacility LOG_LOCAL6 +LogClean false +LogVerbose true +PidFile /var/run/clamav/clamd.pid +DatabaseDirectory /var/lib/clamav +SelfCheck 3600 +Foreground false +Debug false +ScanPE true +ScanOLE2 true +ScanHTML true +DetectBrokenExecutables false +ExitOnOOM false +LeaveTemporaryFiles false +AlgorithmicDetection true +ScanELF true +IdleTimeout 30 +PhishingSignatures true +PhishingScanURLs true +PhishingAlwaysBlockSSLMismatch false +PhishingAlwaysBlockCloak false +DetectPUA false +ScanPartialMessages false +HeuristicScanPrecedence false +StructuredDataDetection false +CommandReadTimeout 5 +SendBufTimeout 200 +MaxQueue 100 +ExtendedDetectionInfo true +OLE2BlockMacros false +StreamMaxLength 25M +LogFile /var/log/clamav/clamav.log +LogTime true +LogFileUnlock false +LogFileMaxSize 0 +Bytecode true +BytecodeSecurity TrustSigned +BytecodeTimeout 60000 +OfficialDatabaseOnly false +CrossFilesystems true diff --git a/install/ubuntu/15.10/deb_signing.key b/install/ubuntu/15.10/deb_signing.key new file mode 100644 index 000000000..2ad2db8bc --- /dev/null +++ b/install/ubuntu/15.10/deb_signing.key @@ -0,0 +1,30 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.12 (GNU/Linux) + +mQENBFJIGbEBCAC8SHOOFo7iDTbnC2GhNZ+uBGCh226Dn1QPoFZNFM/DNakHZ6rD +G3wzr8++eKz4fJual/VLllE2N9XDPuxbozb3LLkcyY1WzJqtIXbXhFGQ/SuIeT+x +QY90XU6t2Ckze2c+zUniAWmJ8GSyVmXOoc9JxAQ1u47wvGXLzrjWXc8u8PNRYXuf +fZplTL+dFu9P0d6lP8FGsV+r9wXvvazpRTz3+H8PKrGCYT55ZQIEdG9Jgamylto2 +oVPFXkwGML+TLw6oeCIBuz2y2vtivphW4MJ3ifQjDj7k3n+DTIxfDFs8lB6VRhhY +2nMHCrcZC6U2mhmXmr6O4s1fu6irBVx05ejPABEBAAG0IFNlcmdoZXkgUm9kaW4g +PHNraWRAdmVzdGFjcC5jb20+iQE4BBMBAgAiBQJSSBmxAhsDBgsJCAcDAgYVCAIJ +CgsEFgIDAQIeAQIXgAAKCRBCxbITCh93FPdqB/93GjV9g+wBfeZYLHQK9MDU2wBb +VloYOJJae6IvYKYQVAJayD3PbHdpxrF8s9e23vdnmb9jKu6jX6oV54EIyqP2HPiN +QYc8wcea+eSHerznBixCtoQh8mtdWGFeN71zU/ig7L5qlOVF/EmxDVZTFUeivFxh +IV6qyBnktQKktE45585yKZyyLtfGoXA54DGK69OtJFh+wdkKEMmUXocMl7wUrxW6 +Cx2CuKeEXEgvwu8mRHQi3S3T9XP456qWEn5dWyMVcP660IzEuZfSJApZusNK7zG3 +WMy0/EuX7xHNY3mcNxTOUN1LsO7iHnhHD9+iKWJo9parGkMZzc92MpjDK/g7uQEN +BFJIGbEBCAC7k5QEA9WQM7E3ceNaeLMrA9lXfuzaNCcySq7ONdVAa5PxzbSKdHvz +QFoL1VFqBTYQ038lbil1XqnoM0zvIfAI3LcpS8sq92El/vPxp6jZh2Ari9Uw7x95 +k2cZMgI67g+zQMGdjVRA155nFQRCgg000xU4F7JA6+WsuLlVUmccsDv7YWJExMtC +YPxiuz5DFu8RALnw4Ckts+dbwsrcvUHhkm9b6RAsdCKjjRpUZjLgdltjH83gUVvt +i1YmdjjsVpt95dtsaG+ad852g/Rk8EdxNMkjPF6HLA67CLADP9wYaj80yPcPtylS +ycvPtcclVeHkFBRVM8xZpQd4iD19MWI1ABEBAAGJAR8EGAECAAkFAlJIGbECGwwA +CgkQQsWyEwofdxQ7tQgAhB0FwTs7L8Qr63DHC2yAnXVxgtTAY1/36CccNXVculyR ++EkLcwahms9AKhz7eQb+Mud+5vH0GRohLp2npgO38CjVUfIP5d+Y6dsthmrkF6p8 +XdV1dVK9vWX+i/YZSw/Mded30Cq4P2Yhq9EaemMT0rtli8lz2NnkZ9dFJZk1lzJC +CZmRpbjSNWqRU4f7qyh21lYk/OC/0XE8fh8CaO23TZ+6gBionoCztwb7NyC9OArN +qYlNnbmh9iNqdblykPS3bkjf34n2xyMgnIehNrM89tk8PY4UfNPhgT1TMD9W3Svq +ynNZvLuF/FIDwDeC1qcfjGbfDn9fXO/lMIIRooQYKQ== +=J2HJ +-----END PGP PUBLIC KEY BLOCK----- diff --git a/install/ubuntu/15.10/dovecot/conf.d/10-auth.conf b/install/ubuntu/15.10/dovecot/conf.d/10-auth.conf new file mode 100644 index 000000000..dfcc83110 --- /dev/null +++ b/install/ubuntu/15.10/dovecot/conf.d/10-auth.conf @@ -0,0 +1,4 @@ +disable_plaintext_auth = no +auth_verbose = yes +auth_mechanisms = plain login +!include auth-passwdfile.conf.ext diff --git a/install/ubuntu/15.10/dovecot/conf.d/10-logging.conf b/install/ubuntu/15.10/dovecot/conf.d/10-logging.conf new file mode 100644 index 000000000..a5f207d51 --- /dev/null +++ b/install/ubuntu/15.10/dovecot/conf.d/10-logging.conf @@ -0,0 +1 @@ +log_path = /var/log/dovecot.log diff --git a/install/ubuntu/15.10/dovecot/conf.d/10-mail.conf b/install/ubuntu/15.10/dovecot/conf.d/10-mail.conf new file mode 100644 index 000000000..55313419e --- /dev/null +++ b/install/ubuntu/15.10/dovecot/conf.d/10-mail.conf @@ -0,0 +1,4 @@ +mail_privileged_group = mail +mail_access_groups = mail +mail_location = maildir:%h/mail/%d/%n +pop3_uidl_format = %08Xu%08Xv diff --git a/install/ubuntu/15.10/dovecot/conf.d/10-master.conf b/install/ubuntu/15.10/dovecot/conf.d/10-master.conf new file mode 100644 index 000000000..a75a9aaa4 --- /dev/null +++ b/install/ubuntu/15.10/dovecot/conf.d/10-master.conf @@ -0,0 +1,29 @@ +service imap-login { + inet_listener imap { + } + inet_listener imaps { + } +} + +service pop3-login { + inet_listener pop3 { + } + inet_listener pop3s { + } +} + + +service imap { +} + +service pop3 { +} + +service auth { + unix_listener auth-client { + group = mail + mode = 0660 + user = dovecot + } + user = dovecot +} diff --git a/install/ubuntu/15.10/dovecot/conf.d/10-ssl.conf b/install/ubuntu/15.10/dovecot/conf.d/10-ssl.conf new file mode 100644 index 000000000..3aaff6eec --- /dev/null +++ b/install/ubuntu/15.10/dovecot/conf.d/10-ssl.conf @@ -0,0 +1,3 @@ +ssl = yes +ssl_cert = = 2.1.4) : %v.%u + # Dovecot v0.99.x : %v.%u + # tpop3d : %Mf + # + # Note that Outlook 2003 seems to have problems with %v.%u format which was + # Dovecot's default, so if you're building a new server it would be a good + # idea to change this. %08Xu%08Xv should be pretty fail-safe. + # + #pop3_uidl_format = %08Xu%08Xv + + # Permanently save UIDLs sent to POP3 clients, so pop3_uidl_format changes + # won't change those UIDLs. Currently this works only with Maildir. + #pop3_save_uidl = no + + # What to do about duplicate UIDLs if they exist? + # allow: Show duplicates to clients. + # rename: Append a temporary -2, -3, etc. counter after the UIDL. + #pop3_uidl_duplicates = allow + + # POP3 logout format string: + # %i - total number of bytes read from client + # %o - total number of bytes sent to client + # %t - number of TOP commands + # %p - number of bytes sent to client as a result of TOP command + # %r - number of RETR commands + # %b - number of bytes sent to client as a result of RETR command + # %d - number of deleted messages + # %m - number of messages (before deletion) + # %s - mailbox size in bytes (before deletion) + # %u - old/new UIDL hash. may help finding out if UIDLs changed unexpectedly + #pop3_logout_format = top=%t/%p, retr=%r/%b, del=%d/%m, size=%s + + # Maximum number of POP3 connections allowed for a user from each IP address. + # NOTE: The username is compared case-sensitively. + #mail_max_userip_connections = 10 + + # Space separated list of plugins to load (default is global mail_plugins). + #mail_plugins = $mail_plugins + + # Workarounds for various client bugs: + # outlook-no-nuls: + # Outlook and Outlook Express hang if mails contain NUL characters. + # This setting replaces them with 0x80 character. + # oe-ns-eoh: + # Outlook Express and Netscape Mail breaks if end of headers-line is + # missing. This option simply sends it if it's missing. + # The list is space-separated. + #pop3_client_workarounds = +} diff --git a/install/ubuntu/15.10/dovecot/conf.d/auth-passwdfile.conf.ext b/install/ubuntu/15.10/dovecot/conf.d/auth-passwdfile.conf.ext new file mode 100644 index 000000000..75e6e1152 --- /dev/null +++ b/install/ubuntu/15.10/dovecot/conf.d/auth-passwdfile.conf.ext @@ -0,0 +1,9 @@ +passdb { + driver = passwd-file + args = scheme=MD5-CRYPT username_format=%n /etc/exim4/domains/%d/passwd +} + +userdb { + driver = passwd-file + args = username_format=%n /etc/exim4/domains/%d/passwd +} diff --git a/install/ubuntu/15.10/dovecot/dovecot.conf b/install/ubuntu/15.10/dovecot/dovecot.conf new file mode 100644 index 000000000..0a8553510 --- /dev/null +++ b/install/ubuntu/15.10/dovecot/dovecot.conf @@ -0,0 +1,4 @@ +protocols = imap pop3 +listen = *, :: +base_dir = /var/run/dovecot/ +!include conf.d/*.conf diff --git a/install/ubuntu/15.10/exim/dnsbl.conf b/install/ubuntu/15.10/exim/dnsbl.conf new file mode 100644 index 000000000..5166b255e --- /dev/null +++ b/install/ubuntu/15.10/exim/dnsbl.conf @@ -0,0 +1,2 @@ +bl.spamcop.net +zen.spamhaus.org diff --git a/install/ubuntu/15.10/exim/exim4.conf.template b/install/ubuntu/15.10/exim/exim4.conf.template new file mode 100644 index 000000000..742f0409e --- /dev/null +++ b/install/ubuntu/15.10/exim/exim4.conf.template @@ -0,0 +1,377 @@ +###################################################################### +# # +# Exim configuration file for Vesta Control Panel # +# # +###################################################################### + +#SPAMASSASSIN = yes +#SPAM_SCORE = 50 +#CLAMD = yes + +domainlist local_domains = dsearch;/etc/exim4/domains/ +domainlist relay_to_domains = dsearch;/etc/exim4/domains/ +hostlist relay_from_hosts = 127.0.0.1 +hostlist whitelist = net-iplsearch;/etc/exim4/white-blocks.conf +hostlist spammers = net-iplsearch;/etc/exim4/spam-blocks.conf +no_local_from_check +untrusted_set_sender = * +acl_smtp_connect = acl_check_spammers +acl_smtp_mail = acl_check_mail +acl_smtp_rcpt = acl_check_rcpt +acl_smtp_data = acl_check_data +acl_smtp_mime = acl_check_mime + +.ifdef SPAMASSASSIN +spamd_address = 127.0.0.1 783 +.endif + +.ifdef CLAMD +av_scanner = clamd: /var/run/clamav/clamd.ctl +.endif + +tls_advertise_hosts = * +tls_certificate = /usr/local/vesta/ssl/certificate.crt +tls_privatekey = /usr/local/vesta/ssl/certificate.key + +daemon_smtp_ports = 25 : 465 : 587 : 2525 +tls_on_connect_ports = 465 +never_users = root +host_lookup = * +rfc1413_hosts = * +rfc1413_query_timeout = 5s +ignore_bounce_errors_after = 2d +timeout_frozen_after = 7d + +DKIM_DOMAIN = ${lc:${domain:$h_from:}} +DKIM_FILE = /etc/exim4/domains/${lc:${domain:$h_from:}}/dkim.pem +DKIM_PRIVATE_KEY = ${if exists{DKIM_FILE}{DKIM_FILE}{0}} + + + +###################################################################### +# ACL CONFIGURATION # +# Specifies access control lists for incoming SMTP mail # +###################################################################### +begin acl + +acl_check_spammers: + accept hosts = +whitelist + + drop message = Your host in blacklist on this server. + log_message = Host in blacklist + hosts = +spammers + + accept + + +acl_check_mail: + deny condition = ${if eq{$sender_helo_name}{}} + message = HELO required before MAIL + + drop message = Helo name contains a ip address (HELO was $sender_helo_name) and not is valid + condition = ${if match{$sender_helo_name}{\N((\d{1,3}[.-]\d{1,3}[.-]\d{1,3}[.-]\d{1,3})|([0-9a-f]{8})|([0-9A-F]{8}))\N}{yes}{no}} + condition = ${if match {${lookup dnsdb{>: defer_never,ptr=$sender_host_address}}\}{$sender_helo_name}{no}{yes}} + delay = 45s + + drop condition = ${if isip{$sender_helo_name}} + message = Access denied - Invalid HELO name (See RFC2821 4.1.3) + + drop condition = ${if eq{[$interface_address]}{$sender_helo_name}} + message = $interface_address is _my_ address + + accept + + +acl_check_rcpt: + accept hosts = : + + deny message = Restricted characters in address + domains = +local_domains + local_parts = ^[.] : ^.*[@%!/|] + + deny message = Restricted characters in address + domains = !+local_domains + local_parts = ^[./|] : ^.*[@%!] : ^.*/\\.\\./ + + require verify = sender + + accept hosts = +relay_from_hosts + control = submission + + accept authenticated = * + control = submission/domain= + + deny message = Rejected because $sender_host_address is in a black list at $dnslist_domain\n$dnslist_text + hosts = !+whitelist + dnslists = ${readfile {/etc/exim4/dnsbl.conf}{:}} + + require message = relay not permitted + domains = +local_domains : +relay_to_domains + + deny message = smtp auth requried + sender_domains = +local_domains + !authenticated = * + + require verify = recipient + +.ifdef CLAMD + warn set acl_m0 = no + + warn condition = ${if exists {/etc/exim4/domains/$domain/antivirus}{yes}{no}} + set acl_m0 = yes +.endif + +.ifdef SPAMASSASSIN + warn set acl_m1 = no + + warn condition = ${if exists {/etc/exim4/domains/$domain/antispam}{yes}{no}} + set acl_m1 = yes +.endif + + accept + + +acl_check_data: +.ifdef CLAMD + deny message = Message contains a virus ($malware_name) and has been rejected + malware = * + condition = ${if eq{$acl_m0}{yes}{yes}{no}} +.endif + +.ifdef SPAMASSASSIN + warn !authenticated = * + hosts = !+relay_from_hosts + condition = ${if < {$message_size}{100K}} + condition = ${if eq{$acl_m1}{yes}{yes}{no}} + spam = nobody:true/defer_ok + add_header = X-Spam-Score: $spam_score_int + add_header = X-Spam-Bar: $spam_bar + add_header = X-Spam-Report: $spam_report + set acl_m2 = $spam_score_int + + warn condition = ${if !eq{$acl_m2}{} {yes}{no}} + condition = ${if >{$acl_m2}{SPAM_SCORE} {yes}{no}} + add_header = X-Spam-Status: Yes + message = SpamAssassin detected spam (from $sender_address to $recipients). +.endif + + accept + + +acl_check_mime: + deny message = Blacklisted file extension detected + condition = ${if match {${lc:$mime_filename}}{\N(\.ade|\.adp|\.bat|\.chm|\.cmd|\.com|\.cpl|\.exe|\.hta|\.ins|\.isp|\.jse|\.lib|\.lnk|\.mde|\.msc|\.msp|\.mst|\.pif|\.scr|\.sct|\.shb|\.sys|\.vb|\.vbe|\.vbs|\.vxd|\.wsc|\.wsf|\.wsh)$\N}{1}{0}} + + accept + + + +###################################################################### +# AUTHENTICATION CONFIGURATION # +###################################################################### +begin authenticators + +dovecot_plain: + driver = dovecot + public_name = PLAIN + server_socket = /var/run/dovecot/auth-client + server_set_id = $auth1 + +dovecot_login: + driver = dovecot + public_name = LOGIN + server_socket = /var/run/dovecot/auth-client + server_set_id = $auth1 + + + +###################################################################### +# ROUTERS CONFIGURATION # +# Specifies how addresses are handled # +###################################################################### +begin routers + +#smarthost: +# driver = manualroute +# domains = ! +local_domains +# transport = remote_smtp +# route_list = * smartrelay.vestacp.com +# no_more +# no_verify + +dnslookup: + driver = dnslookup + domains = !+local_domains + transport = remote_smtp + no_more + +userforward: + driver = redirect + check_local_user + file = $home/.forward + allow_filter + no_verify + no_expn + check_ancestor + file_transport = address_file + pipe_transport = address_pipe + reply_transport = address_reply + +procmail: + driver = accept + check_local_user + require_files = ${local_part}:+${home}/.procmailrc:/usr/bin/procmail + transport = procmail + no_verify + +autoreplay: + driver = accept + require_files = /etc/exim4/domains/$domain/autoreply.${local_part}.msg + condition = ${if exists{/etc/exim4/domains/$domain/autoreply.${local_part}.msg}}{yes}{no}} + retry_use_local_part + transport = userautoreply + unseen + +aliases: + driver = redirect + headers_add = X-redirected: yes + data = ${extract{1}{:}{${lookup{$local_part@$domain}lsearch{/etc/exim4/domains/$domain/aliases}}}} + require_files = /etc/exim4/domains/$domain/aliases + redirect_router = dnslookup + pipe_transport = address_pipe + unseen + +localuser_fwd_only: + driver = accept + transport = devnull + condition = ${if exists{/etc/exim/domains/$domain/fwd_only}{${lookup{$local_part}lsearch{/etc/exim/domains/$domain/fwd_only}{true}{false}}}} + +localuser_spam: + driver = accept + transport = local_spam_delivery + condition = ${if eq {${if match{$h_X-Spam-Status:}{\N^Yes\N}{yes}{no}}} {${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}{yes}{no_such_user}}}} + +localuser: + driver = accept + transport = local_delivery + condition = ${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}{true}{false}} + +catchall: + driver = redirect + headers_add = X-redirected: yes + require_files = /etc/exim4/domains/$domain/aliases + data = ${extract{1}{:}{${lookup{*@$domain}lsearch{/etc/exim4/domains/$domain/aliases}}}} + file_transport = local_delivery + redirect_router = dnslookup + +terminate_alias: + driver = accept + transport = devnull + condition = ${lookup{$local_part@$domain}lsearch{/etc/exim4/domains/$domain/aliases}{true}{false}} + + + +###################################################################### +# TRANSPORTS CONFIGURATION # +###################################################################### +begin transports + +remote_smtp: + driver = smtp + #helo_data = $sender_address_domain + dkim_domain = DKIM_DOMAIN + dkim_selector = mail + dkim_private_key = DKIM_PRIVATE_KEY + dkim_canon = relaxed + dkim_strict = 0 + +procmail: + driver = pipe + command = "/usr/bin/procmail -d $local_part" + return_path_add + delivery_date_add + envelope_to_add + user = $local_part + initgroups + return_output + +local_delivery: + driver = appendfile + maildir_format + maildir_use_size_file + user = ${extract{2}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}} + group = mail + create_directory + directory_mode = 770 + mode = 660 + use_lockfile = no + delivery_date_add + envelope_to_add + return_path_add + directory = "${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}}/mail/$domain/$local_part" + quota = ${extract{6}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}}M + quota_warn_threshold = 75% + +local_spam_delivery: + driver = appendfile + maildir_format + maildir_use_size_file + user = ${extract{2}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}} + group = mail + create_directory + directory_mode = 770 + mode = 660 + use_lockfile = no + delivery_date_add + envelope_to_add + return_path_add + directory = "${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}}/mail/$domain/$local_part/.Spam" + quota = ${extract{6}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}}M + quota_directory = "${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}}/mail/$domain/$local_part" + quota_warn_threshold = 75% + +address_pipe: + driver = pipe + return_output + +address_file: + driver = appendfile + delivery_date_add + envelope_to_add + return_path_add + +address_reply: + driver = autoreply + +userautoreply: + driver = autoreply + file = /etc/exim4/domains/$domain/autoreply.${local_part}.msg + from = "${local_part}@${domain}" + subject = "${if def:h_Subject: {Autoreply: ${quote:${escape:$h_Subject:}}} {Autoreply Message}}" + to = "${sender_address}" + +devnull: + driver = appendfile + file = /dev/null + + + +###################################################################### +# RETRY CONFIGURATION # +###################################################################### +begin retry + +# Address or Domain Error Retries +# ----------------- ----- ------- +* * F,2h,15m; G,16h,1h,1.5; F,4d,6h + + + +###################################################################### +# REWRITE CONFIGURATION # +###################################################################### +begin rewrite + + + +###################################################################### diff --git a/install/ubuntu/15.10/exim/spam-blocks.conf b/install/ubuntu/15.10/exim/spam-blocks.conf new file mode 100644 index 000000000..e69de29bb diff --git a/install/ubuntu/15.10/fail2ban/action.d/vesta.conf b/install/ubuntu/15.10/fail2ban/action.d/vesta.conf new file mode 100644 index 000000000..0edfc3491 --- /dev/null +++ b/install/ubuntu/15.10/fail2ban/action.d/vesta.conf @@ -0,0 +1,9 @@ +# Fail2Ban configuration file for vesta + +[Definition] + +actionstart = /usr/local/vesta/bin/v-add-firewall-chain +actionstop = /usr/local/vesta/bin/v-delete-firewall-chain +actioncheck = iptables -n -L INPUT | grep -q 'fail2ban-[ \t]' +actionban = /usr/local/vesta/bin/v-add-firewall-ban +actionunban = /usr/local/vesta/bin/v-delete-firewall-ban diff --git a/install/ubuntu/15.10/fail2ban/filter.d/vesta.conf b/install/ubuntu/15.10/fail2ban/filter.d/vesta.conf new file mode 100644 index 000000000..69670a56e --- /dev/null +++ b/install/ubuntu/15.10/fail2ban/filter.d/vesta.conf @@ -0,0 +1,10 @@ +# Fail2Ban filter for unsuccesfull Vesta authentication attempts +# + +[INCLUDES] +before = common.conf + +[Definition] +failregex = .* failed to login +ignoreregex = + diff --git a/install/ubuntu/15.10/fail2ban/jail.local b/install/ubuntu/15.10/fail2ban/jail.local new file mode 100644 index 000000000..eccea0685 --- /dev/null +++ b/install/ubuntu/15.10/fail2ban/jail.local @@ -0,0 +1,39 @@ +[ssh-iptables] +enabled = true +filter = sshd +action = vesta[name=SSH] +logpath = /var/log/auth.log +maxretry = 5 + +[vsftpd-iptables] +enabled = false +filter = vsftpd +action = vesta[name=FTP] +logpath = /var/log/vsftpd.log +maxretry = 5 + +[exim-iptables] +enabled = true +filter = exim +action = vesta[name=MAIL] +logpath = /var/log/exim4/mainlog + +[dovecot-iptables] +enabled = true +filter = dovecot +action = vesta[name=MAIL] +logpath = /var/log/dovecot.log + +[mysqld-iptables] +enabled = false +filter = mysqld-auth +action = vesta[name=DB] +logpath = /var/log/mysql.log +maxretry = 5 + +[vesta-iptables] +enabled = true +filter = vesta +action = vesta[name=VESTA] +logpath = /var/log/vesta/auth.log +maxretry = 5 diff --git a/install/ubuntu/15.10/firewall/ports.conf b/install/ubuntu/15.10/firewall/ports.conf new file mode 100644 index 000000000..a6ef4dae5 --- /dev/null +++ b/install/ubuntu/15.10/firewall/ports.conf @@ -0,0 +1,16 @@ +PROTOCOL='TCP' PORT='20' +PROTOCOL='TCP' PORT='21' +PROTOCOL='TCP' PORT='22' +PROTOCOL='TCP' PORT='25' +PROTOCOL='UDP' PORT='53' +PROTOCOL='TCP' PORT='80' +PROTOCOL='TCP' PORT='443' +PROTOCOL='TCP' PORT='110' +PROTOCOL='UDP' PORT='123' +PROTOCOL='TCP' PORT='143' +PROTOCOL='TCP' PORT='3306' +PROTOCOL='TCP' PORT='5432' +PROTOCOL='TCP' PORT='8080' +PROTOCOL='TCP' PORT='8433' +PROTOCOL='TCP' PORT='8083' +PROTOCOL='TCP' PORT='12000:12100' diff --git a/install/ubuntu/15.10/firewall/rules.conf b/install/ubuntu/15.10/firewall/rules.conf new file mode 100644 index 000000000..956c2e1d9 --- /dev/null +++ b/install/ubuntu/15.10/firewall/rules.conf @@ -0,0 +1,10 @@ +RULE='1' ACTION='ACCEPT' PROTOCOL='ICMP' PORT='0' IP='0.0.0.0/0' COMMENT='PING' SUSPENDED='no' TIME='17:13:48' DATE='2014-09-16' +RULE='2' ACTION='ACCEPT' PROTOCOL='TCP' PORT='8083' IP='0.0.0.0/0' COMMENT='VESTA' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' +RULE='3' ACTION='ACCEPT' PROTOCOL='TCP' PORT='3306,5432' IP='0.0.0.0/0' COMMENT='DB' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' +RULE='4' ACTION='ACCEPT' PROTOCOL='TCP' PORT='143,993' IP='0.0.0.0/0' COMMENT='IMAP' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' +RULE='5' ACTION='ACCEPT' PROTOCOL='TCP' PORT='110,995' IP='0.0.0.0/0' COMMENT='POP3' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' +RULE='6' ACTION='ACCEPT' PROTOCOL='TCP' PORT='25,465,587,2525' IP='0.0.0.0/0' COMMENT='SMTP' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' +RULE='7' ACTION='ACCEPT' PROTOCOL='UDP' PORT='53' IP='0.0.0.0/0' COMMENT='DNS' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' +RULE='8' ACTION='ACCEPT' PROTOCOL='TCP' PORT='21,12000-12100' IP='0.0.0.0/0' COMMENT='FTP' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' +RULE='9' ACTION='ACCEPT' PROTOCOL='TCP' PORT='80,443' IP='0.0.0.0/0' COMMENT='WEB' SUSPENDED='no' TIME='17:04:27' DATE='2014-09-24' +RULE='10' ACTION='ACCEPT' PROTOCOL='TCP' PORT='22' IP='0.0.0.0/0' COMMENT='SSH' SUSPENDED='no' TIME='17:14:41' DATE='2014-09-16' diff --git a/install/ubuntu/15.10/logrotate/apache2 b/install/ubuntu/15.10/logrotate/apache2 new file mode 100644 index 000000000..27629d0dd --- /dev/null +++ b/install/ubuntu/15.10/logrotate/apache2 @@ -0,0 +1,19 @@ +/var/log/apache2/*.log /var/log/apache2/domains/*log { + weekly + missingok + rotate 52 + compress + delaycompress + notifempty + create 640 root adm + sharedscripts + postrotate + /etc/init.d/apache2 reload > /dev/null || true + [ ! -f /var/run/nginx.pid ] || kill -USR1 `cat /var/run/nginx.pid` + endscript + prerotate + if [ -d /etc/logrotate.d/httpd-prerotate ]; then \ + run-parts /etc/logrotate.d/httpd-prerotate; \ + fi; \ + endscript +} diff --git a/install/ubuntu/15.10/logrotate/nginx b/install/ubuntu/15.10/logrotate/nginx new file mode 100644 index 000000000..d667f2135 --- /dev/null +++ b/install/ubuntu/15.10/logrotate/nginx @@ -0,0 +1,13 @@ +/var/log/nginx/*log /var/log/nginx/domains/*log { + daily + missingok + rotate 52 + compress + delaycompress + notifempty + create 640 nginx adm + sharedscripts + postrotate + [ -f /var/run/nginx.pid ] && kill -USR1 `cat /var/run/nginx.pid` + endscript +} diff --git a/install/ubuntu/15.10/logrotate/vesta b/install/ubuntu/15.10/logrotate/vesta new file mode 100644 index 000000000..027a34396 --- /dev/null +++ b/install/ubuntu/15.10/logrotate/vesta @@ -0,0 +1,7 @@ +/usr/local/vesta/log/*.log { + missingok + notifempty + size 30k + yearly + create 0600 root root +} diff --git a/install/ubuntu/15.10/mysql/my-large.cnf b/install/ubuntu/15.10/mysql/my-large.cnf new file mode 100644 index 000000000..d0bab3907 --- /dev/null +++ b/install/ubuntu/15.10/mysql/my-large.cnf @@ -0,0 +1,42 @@ +[client] +port=3306 +socket=/var/run/mysqld/mysqld.sock + +[mysqld_safe] +socket=/var/run/mysqld/mysqld.sock + +[mysqld] +user=mysql +pid-file=/var/run/mysqld/mysqld.pid +socket=/var/run/mysqld/mysqld.sock +port=3306 +basedir=/usr +datadir=/var/lib/mysql +tmpdir=/tmp +lc-messages-dir=/usr/share/mysql +log_error=/var/log/mysql/error.log + +symbolic-links=0 + +skip-external-locking +key_buffer_size = 256M +max_allowed_packet = 32M +table_open_cache = 256 +sort_buffer_size = 1M +read_buffer_size = 1M +read_rnd_buffer_size = 4M +myisam_sort_buffer_size = 64M +thread_cache_size = 8 +query_cache_size= 16M +thread_concurrency = 8 + +#innodb_use_native_aio = 0 +innodb_file_per_table + +max_connections=200 +max_user_connections=50 +wait_timeout=10 +interactive_timeout=50 +long_query_time=5 + +!includedir /etc/mysql/conf.d/ diff --git a/install/ubuntu/15.10/mysql/my-medium.cnf b/install/ubuntu/15.10/mysql/my-medium.cnf new file mode 100644 index 000000000..1c10ab9a6 --- /dev/null +++ b/install/ubuntu/15.10/mysql/my-medium.cnf @@ -0,0 +1,40 @@ +[client] +port=3306 +socket=/var/run/mysqld/mysqld.sock + +[mysqld_safe] +socket=/var/run/mysqld/mysqld.sock + +[mysqld] +user=mysql +pid-file=/var/run/mysqld/mysqld.pid +socket=/var/run/mysqld/mysqld.sock +port=3306 +basedir=/usr +datadir=/var/lib/mysql +tmpdir=/tmp +lc-messages-dir=/usr/share/mysql +log_error=/var/log/mysql/error.log + +symbolic-links=0 + +skip-external-locking +key_buffer_size = 16M +max_allowed_packet = 16M +table_open_cache = 64 +sort_buffer_size = 512K +net_buffer_length = 8K +read_buffer_size = 256K +read_rnd_buffer_size = 512K +myisam_sort_buffer_size = 8M + +#innodb_use_native_aio = 0 +innodb_file_per_table + +max_connections=70 +max_user_connections=30 +wait_timeout=10 +interactive_timeout=50 +long_query_time=5 + +!includedir /etc/mysql/conf.d/ diff --git a/install/ubuntu/15.10/mysql/my-small.cnf b/install/ubuntu/15.10/mysql/my-small.cnf new file mode 100644 index 000000000..26a804781 --- /dev/null +++ b/install/ubuntu/15.10/mysql/my-small.cnf @@ -0,0 +1,40 @@ +[client] +port=3306 +socket=/var/run/mysqld/mysqld.sock + +[mysqld_safe] +socket=/var/run/mysqld/mysqld.sock + +[mysqld] +user=mysql +pid-file=/var/run/mysqld/mysqld.pid +socket=/var/run/mysqld/mysqld.sock +port=3306 +basedir=/usr +datadir=/var/lib/mysql +tmpdir=/tmp +lc-messages-dir=/usr/share/mysql +log_error=/var/log/mysql/error.log + +symbolic-links=0 + +skip-external-locking +key_buffer_size = 16K +max_allowed_packet = 1M +table_open_cache = 4 +sort_buffer_size = 64K +read_buffer_size = 256K +read_rnd_buffer_size = 256K +net_buffer_length = 2K +thread_stack = 240K + +#innodb_use_native_aio = 0 +innodb_file_per_table + +max_connections=30 +max_user_connections=20 +wait_timeout=10 +interactive_timeout=50 +long_query_time=5 + +!includedir /etc/mysql/conf.d/ diff --git a/install/ubuntu/15.10/nginx/nginx.conf b/install/ubuntu/15.10/nginx/nginx.conf new file mode 100644 index 000000000..1e29f1fce --- /dev/null +++ b/install/ubuntu/15.10/nginx/nginx.conf @@ -0,0 +1,124 @@ +# Server globals +user www-data; +worker_processes 2; +error_log /var/log/nginx/error.log; +pid /var/run/nginx.pid; + + +# Worker config +events { + worker_connections 1024; + use epoll; +} + + +http { + # Main settings + sendfile on; + tcp_nopush on; + tcp_nodelay on; + client_header_timeout 1m; + client_body_timeout 1m; + client_header_buffer_size 2k; + client_body_buffer_size 256k; + client_max_body_size 256m; + large_client_header_buffers 4 8k; + send_timeout 30; + keepalive_timeout 60 60; + reset_timedout_connection on; + server_tokens off; + server_name_in_redirect off; + server_names_hash_max_size 512; + server_names_hash_bucket_size 512; + + + # Log format + log_format main '$remote_addr - $remote_user [$time_local] $request ' + '"$status" $body_bytes_sent "$http_referer" ' + '"$http_user_agent" "$http_x_forwarded_for"'; + log_format bytes '$body_bytes_sent'; + #access_log /var/log/nginx/access.log main; + access_log off; + + + # Mime settings + include /etc/nginx/mime.types; + default_type application/octet-stream; + + + # Compression + gzip on; + gzip_comp_level 9; + gzip_min_length 512; + gzip_buffers 8 64k; + gzip_types text/plain text/css text/javascript + application/x-javascript application/javascript; + gzip_proxied any; + + + # Proxy settings + proxy_redirect off; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_pass_header Set-Cookie; + proxy_connect_timeout 90; + proxy_send_timeout 90; + proxy_read_timeout 90; + proxy_buffers 32 4k; + + + # Cloudflare https://www.cloudflare.com/ips + set_real_ip_from 199.27.128.0/21; + set_real_ip_from 173.245.48.0/20; + set_real_ip_from 103.21.244.0/22; + set_real_ip_from 103.22.200.0/22; + set_real_ip_from 103.31.4.0/22; + set_real_ip_from 141.101.64.0/18; + set_real_ip_from 108.162.192.0/18; + set_real_ip_from 190.93.240.0/20; + set_real_ip_from 188.114.96.0/20; + set_real_ip_from 197.234.240.0/22; + set_real_ip_from 198.41.128.0/17; + set_real_ip_from 162.158.0.0/15; + set_real_ip_from 104.16.0.0/12; + set_real_ip_from 172.64.0.0/13; + #set_real_ip_from 2400:cb00::/32; + #set_real_ip_from 2606:4700::/32; + #set_real_ip_from 2803:f800::/32; + #set_real_ip_from 2405:b500::/32; + #set_real_ip_from 2405:8100::/32; + real_ip_header CF-Connecting-IP; + + + # SSL PCI Compliance + ssl_session_cache shared:SSL:10m; + ssl_protocols TLSv1 TLSv1.1 TLSv1.2; + ssl_prefer_server_ciphers on; + ssl_ciphers "ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA:ECDHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES128-SHA256:DHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES256-GCM-SHA384:AES128-GCM-SHA256:AES256-SHA256:AES128-SHA256:AES256-SHA:AES128-SHA:DES-CBC3-SHA:HIGH:!aNULL:!eNULL:!EXPORT:!DES:!MD5:!PSK:!RC4"; + + + # Error pages + error_page 403 /error/403.html; + error_page 404 /error/404.html; + error_page 502 503 504 /error/50x.html; + + + # Cache + proxy_cache_path /var/cache/nginx levels=2 keys_zone=cache:10m inactive=60m max_size=512m; + proxy_cache_key "$host$request_uri $cookie_user"; + proxy_temp_path /var/cache/nginx/temp; + proxy_ignore_headers Expires Cache-Control; + proxy_cache_use_stale error timeout invalid_header http_502; + proxy_cache_valid any 3d; + + map $http_cookie $no_cache { + default 0; + ~SESS 1; + ~wordpress_logged_in 1; + } + + + # Wildcard include + include /etc/nginx/conf.d/*.conf; +} diff --git a/install/ubuntu/15.10/nginx/phpmyadmin.inc b/install/ubuntu/15.10/nginx/phpmyadmin.inc new file mode 100644 index 000000000..d70ca3e3c --- /dev/null +++ b/install/ubuntu/15.10/nginx/phpmyadmin.inc @@ -0,0 +1,15 @@ +location /phpmyadmin { + alias /usr/share/phpmyadmin/; + + location ~ /(libraries|setup) { + return 404; + } + + location ~ ^/phpmyadmin/(.*\.php)$ { + alias /usr/share/phpmyadmin/$1; + fastcgi_pass 127.0.0.1:9000; + fastcgi_index index.php; + include fastcgi_params; + fastcgi_param SCRIPT_FILENAME $request_filename; + } +} diff --git a/install/ubuntu/15.10/nginx/phppgadmin.inc b/install/ubuntu/15.10/nginx/phppgadmin.inc new file mode 100644 index 000000000..cd1e5806b --- /dev/null +++ b/install/ubuntu/15.10/nginx/phppgadmin.inc @@ -0,0 +1,11 @@ +location /phppgadmin { + alias /usr/share/phppgadmin/; + + location ~ ^/phppgadmin/(.*\.php)$ { + alias /usr/share/phppgadmin/$1; + fastcgi_pass 127.0.0.1:9000; + fastcgi_index index.php; + include fastcgi_params; + fastcgi_param SCRIPT_FILENAME $request_filename; + } +} diff --git a/install/ubuntu/15.10/nginx/status.conf b/install/ubuntu/15.10/nginx/status.conf new file mode 100644 index 000000000..c0bcd0691 --- /dev/null +++ b/install/ubuntu/15.10/nginx/status.conf @@ -0,0 +1,9 @@ +server { + listen 127.0.0.1:8084 default; + server_name _; + server_name_in_redirect off; + location / { + stub_status on; + access_log off; + } +} diff --git a/install/ubuntu/15.10/nginx/webmail.inc b/install/ubuntu/15.10/nginx/webmail.inc new file mode 100644 index 000000000..ad66895bc --- /dev/null +++ b/install/ubuntu/15.10/nginx/webmail.inc @@ -0,0 +1,15 @@ +location /webmail { + alias /var/lib/roundcube/; + + location ~ /(config|temp|logs) { + return 404; + } + + location ~ ^/webmail/(.*\.php)$ { + alias /var/lib/roundcube/$1; + fastcgi_pass 127.0.0.1:9000; + fastcgi_index index.php; + include fastcgi_params; + fastcgi_param SCRIPT_FILENAME $request_filename; + } +} diff --git a/install/ubuntu/15.10/packages/default.pkg b/install/ubuntu/15.10/packages/default.pkg new file mode 100644 index 000000000..29585bacb --- /dev/null +++ b/install/ubuntu/15.10/packages/default.pkg @@ -0,0 +1,18 @@ +WEB_TEMPLATE='default' +PROXY_TEMPLATE='default' +DNS_TEMPLATE='default' +WEB_DOMAINS='100' +WEB_ALIASES='100' +DNS_DOMAINS='100' +DNS_RECORDS='100' +MAIL_DOMAINS='100' +MAIL_ACCOUNTS='100' +DATABASES='100' +CRON_JOBS='100' +DISK_QUOTA='10000' +BANDWIDTH='100000' +NS='ns1.localhost.ltd,ns2.localhost.ltd' +SHELL='nologin' +BACKUPS='3' +TIME='11:46:50' +DATE='2012-09-26' diff --git a/install/ubuntu/15.10/packages/gainsboro.pkg b/install/ubuntu/15.10/packages/gainsboro.pkg new file mode 100644 index 000000000..c3df50258 --- /dev/null +++ b/install/ubuntu/15.10/packages/gainsboro.pkg @@ -0,0 +1,18 @@ +WEB_TEMPLATE='default' +PROXY_TEMPLATE='default' +DNS_TEMPLATE='default' +WEB_DOMAINS='10' +WEB_ALIASES='10' +DNS_DOMAINS='10' +DNS_RECORDS='10' +MAIL_DOMAINS='10' +MAIL_ACCOUNTS='10' +DATABASES='10' +CRON_JOBS='10' +DISK_QUOTA='10000' +BANDWIDTH='10000' +NS='ns1.localhost.ltd,ns2.localhost.ltd' +SHELL='nologin' +BACKUPS='1' +TIME='11:31:30' +DATE='2012-07-26' diff --git a/install/ubuntu/15.10/packages/palegreen.pkg b/install/ubuntu/15.10/packages/palegreen.pkg new file mode 100644 index 000000000..d08930f7b --- /dev/null +++ b/install/ubuntu/15.10/packages/palegreen.pkg @@ -0,0 +1,18 @@ +WEB_TEMPLATE='hosting' +PROXY_TEMPLATE='hosting' +DNS_TEMPLATE='default' +WEB_DOMAINS='50' +WEB_ALIASES='50' +DNS_DOMAINS='50' +DNS_RECORDS='50' +MAIL_DOMAINS='50' +MAIL_ACCOUNTS='50' +DATABASES='50' +CRON_JOBS='50' +DISK_QUOTA='50000' +BANDWIDTH='50000' +NS='ns1.localhost.ltd,ns2.localhost.ltd' +SHELL='nologin' +BACKUPS='5' +TIME='07:49:47' +DATE='2013-06-10' diff --git a/install/ubuntu/15.10/packages/slategrey.pkg b/install/ubuntu/15.10/packages/slategrey.pkg new file mode 100644 index 000000000..15a17dcd3 --- /dev/null +++ b/install/ubuntu/15.10/packages/slategrey.pkg @@ -0,0 +1,18 @@ +WEB_TEMPLATE='default' +PROXY_TEMPLATE='default' +DNS_TEMPLATE='default' +WEB_DOMAINS='100' +WEB_ALIASES='100' +DNS_DOMAINS='100' +DNS_RECORDS='100' +MAIL_DOMAINS='100' +MAIL_ACCOUNTS='100' +DATABASES='100' +CRON_JOBS='100' +DISK_QUOTA='10000' +BANDWIDTH='100000' +NS='ns1.localhost.ltd,ns2.localhost.ltd' +SHELL='nologin' +BACKUPS='3' +TIME='12:39:13' +DATE='2012-09-20' diff --git a/install/ubuntu/15.10/pga/config.inc.php b/install/ubuntu/15.10/pga/config.inc.php new file mode 100644 index 000000000..1eec9776c --- /dev/null +++ b/install/ubuntu/15.10/pga/config.inc.php @@ -0,0 +1,159 @@ + diff --git a/install/ubuntu/15.10/pga/phppgadmin.conf b/install/ubuntu/15.10/pga/phppgadmin.conf new file mode 100644 index 000000000..f39247d6f --- /dev/null +++ b/install/ubuntu/15.10/pga/phppgadmin.conf @@ -0,0 +1,31 @@ +Alias /phppgadmin /usr/share/phppgadmin + + + +DirectoryIndex index.php +AllowOverride None + +order deny,allow +deny from all +allow from 127.0.0.0/255.0.0.0 ::1/128 +allow from all + + + php_flag magic_quotes_gpc Off + php_flag track_vars On + php_value include_path . + + + + + AddType application/x-httpd-php .php + Action application/x-httpd-php /cgi-bin/php + + + AddType application/x-httpd-php .php + Action application/x-httpd-php /cgi-bin/php + + + + + diff --git a/install/ubuntu/15.10/php5-fpm/www.conf b/install/ubuntu/15.10/php5-fpm/www.conf new file mode 100644 index 000000000..d046bceef --- /dev/null +++ b/install/ubuntu/15.10/php5-fpm/www.conf @@ -0,0 +1,10 @@ +[www] +listen = 127.0.0.1:9000 +listen.allowed_clients = 127.0.0.1 +user = www-data +group = www-data +pm = dynamic +pm.max_children = 50 +pm.start_servers = 5 +pm.min_spare_servers = 3 +pm.max_spare_servers = 35 diff --git a/install/ubuntu/15.10/pma/apache.conf b/install/ubuntu/15.10/pma/apache.conf new file mode 100644 index 000000000..2a8f69e25 --- /dev/null +++ b/install/ubuntu/15.10/pma/apache.conf @@ -0,0 +1,42 @@ +# phpMyAdmin default Apache configuration + +Alias /phpmyadmin /usr/share/phpmyadmin + + + Options FollowSymLinks + DirectoryIndex index.php + + + AddType application/x-httpd-php .php + + php_flag magic_quotes_gpc Off + php_flag track_vars On + php_flag register_globals Off + php_admin_flag allow_url_fopen Off + php_value include_path . + php_admin_value upload_tmp_dir /var/lib/phpmyadmin/tmp + php_admin_value open_basedir /usr/share/phpmyadmin/:/etc/phpmyadmin/:/var/lib/phpmyadmin/:/usr/share/php/php-gettext + + + + +# Authorize for setup + + + AuthType Basic + AuthName "phpMyAdmin Setup" + AuthUserFile /etc/phpmyadmin/htpasswd.setup + + Require valid-user + + +# Disallow web access to directories that don't need it + + Order Deny,Allow + Deny from All + + + Order Deny,Allow + Deny from All + + diff --git a/install/ubuntu/15.10/pma/config.inc.php b/install/ubuntu/15.10/pma/config.inc.php new file mode 100644 index 000000000..a643a065b --- /dev/null +++ b/install/ubuntu/15.10/pma/config.inc.php @@ -0,0 +1,146 @@ + + VRootEngine on + VRootAlias /etc/security/pam_env.conf etc/security/pam_env.conf + + +AuthPAMConfig proftpd +AuthOrder mod_auth_pam.c* mod_auth_unix.c +UseReverseDNS off +User proftpd +Group nogroup +MaxInstances 20 +UseSendfile off +LogFormat default "%h %l %u %t \"%r\" %s %b" +LogFormat auth "%v [%P] %h %t \"%r\" %s" +ListOptions -a +RequireValidShell off +PassivePorts 12000 12100 + + + Umask 002 + IdentLookups off + AllowOverwrite yes + + AllowAll + + diff --git a/install/ubuntu/15.10/roundcube/apache.conf b/install/ubuntu/15.10/roundcube/apache.conf new file mode 100644 index 000000000..a0c87bcc6 --- /dev/null +++ b/install/ubuntu/15.10/roundcube/apache.conf @@ -0,0 +1,40 @@ +Alias /roundcube/program/js/tiny_mce/ /usr/share/tinymce/www/ +Alias /roundcube /var/lib/roundcube +Alias /webmail /var/lib/roundcube + +# Access to tinymce files + + Options Indexes MultiViews FollowSymLinks + AllowOverride None + Order allow,deny + allow from all + + + + Options +FollowSymLinks + # This is needed to parse /var/lib/roundcube/.htaccess. See its + # content before setting AllowOverride to None. + AllowOverride All + order allow,deny + allow from all + + +# Protecting basic directories: + + Options -FollowSymLinks + AllowOverride None + + + + Options -FollowSymLinks + AllowOverride None + Order allow,deny + Deny from all + + + + Options -FollowSymLinks + AllowOverride None + Order allow,deny + Deny from all + diff --git a/install/ubuntu/15.10/roundcube/config.inc.php b/install/ubuntu/15.10/roundcube/config.inc.php new file mode 100644 index 000000000..0c82b1bc1 --- /dev/null +++ b/install/ubuntu/15.10/roundcube/config.inc.php @@ -0,0 +1,33 @@ + diff --git a/install/ubuntu/15.10/roundcube/main.inc.php b/install/ubuntu/15.10/roundcube/main.inc.php new file mode 100644 index 000000000..97cdbf2df --- /dev/null +++ b/install/ubuntu/15.10/roundcube/main.inc.php @@ -0,0 +1,850 @@ +/sendmail or to syslog +$rcmail_config['smtp_log'] = true; + +// Log successful logins to /userlogins or to syslog +$rcmail_config['log_logins'] = false; + +// Log session authentication errors to /session or to syslog +$rcmail_config['log_session'] = false; + +// Log SQL queries to /sql or to syslog +$rcmail_config['sql_debug'] = false; + +// Log IMAP conversation to /imap or to syslog +$rcmail_config['imap_debug'] = false; + +// Log LDAP conversation to /ldap or to syslog +$rcmail_config['ldap_debug'] = false; + +// Log SMTP conversation to /smtp or to syslog +$rcmail_config['smtp_debug'] = false; + +// ---------------------------------- +// IMAP +// ---------------------------------- + +// the mail host chosen to perform the log-in +// leave blank to show a textbox at login, give a list of hosts +// to display a pulldown menu or set one host as string. +// To use SSL/TLS connection, enter hostname with prefix ssl:// or tls:// +// Supported replacement variables: +// %n - http hostname ($_SERVER['SERVER_NAME']) +// %d - domain (http hostname without the first part) +// %s - domain name after the '@' from e-mail address provided at login screen +// For example %n = mail.domain.tld, %d = domain.tld +$rcmail_config['default_host'] = 'localhost'; + +// TCP port used for IMAP connections +$rcmail_config['default_port'] = 143; + +// IMAP AUTH type (DIGEST-MD5, CRAM-MD5, LOGIN, PLAIN or empty to use +// best server supported one) +$rcmail_config['imap_auth_type'] = null; + +// If you know your imap's folder delimiter, you can specify it here. +// Otherwise it will be determined automatically +$rcmail_config['imap_delimiter'] = null; + +// If IMAP server doesn't support NAMESPACE extension, but you're +// using shared folders or personal root folder is non-empty, you'll need to +// set these options. All can be strings or arrays of strings. +// Folders need to be ended with directory separator, e.g. "INBOX." +// (special directory "~" is an exception to this rule) +// These can be used also to overwrite server's namespaces +$rcmail_config['imap_ns_personal'] = null; +$rcmail_config['imap_ns_other'] = null; +$rcmail_config['imap_ns_shared'] = null; + +// By default IMAP capabilities are readed after connection to IMAP server +// In some cases, e.g. when using IMAP proxy, there's a need to refresh the list +// after login. Set to True if you've got this case. +$rcmail_config['imap_force_caps'] = false; + +// By default list of subscribed folders is determined using LIST-EXTENDED +// extension if available. Some servers (dovecot 1.x) returns wrong results +// for shared namespaces in this case. http://trac.roundcube.net/ticket/1486225 +// Enable this option to force LSUB command usage instead. +$rcmail_config['imap_force_lsub'] = false; + +// Some server configurations (e.g. Courier) doesn't list folders in all namespaces +// Enable this option to force listing of folders in all namespaces +$rcmail_config['imap_force_ns'] = false; + +// IMAP connection timeout, in seconds. Default: 0 (no limit) +$rcmail_config['imap_timeout'] = 0; + +// Optional IMAP authentication identifier to be used as authorization proxy +$rcmail_config['imap_auth_cid'] = null; + +// Optional IMAP authentication password to be used for imap_auth_cid +$rcmail_config['imap_auth_pw'] = null; + +// Type of IMAP indexes cache. Supported values: 'db', 'apc' and 'memcache'. +$rcmail_config['imap_cache'] = null; + +// Enables messages cache. Only 'db' cache is supported. +$rcmail_config['messages_cache'] = false; + + +// ---------------------------------- +// SMTP +// ---------------------------------- + +// SMTP server host (for sending mails). +// To use SSL/TLS connection, enter hostname with prefix ssl:// or tls:// +// If left blank, the PHP mail() function is used +// Supported replacement variables: +// %h - user's IMAP hostname +// %n - http hostname ($_SERVER['SERVER_NAME']) +// %d - domain (http hostname without the first part) +// %z - IMAP domain (IMAP hostname without the first part) +// For example %n = mail.domain.tld, %d = domain.tld +$rcmail_config['smtp_server'] = ''; + +// SMTP port (default is 25; use 587 for STARTTLS or 465 for the +// deprecated SSL over SMTP (aka SMTPS)) +$rcmail_config['smtp_port'] = 25; + +// SMTP username (if required) if you use %u as the username Roundcube +// will use the current username for login +$rcmail_config['smtp_user'] = ''; + +// SMTP password (if required) if you use %p as the password Roundcube +// will use the current user's password for login +$rcmail_config['smtp_pass'] = ''; + +// SMTP AUTH type (DIGEST-MD5, CRAM-MD5, LOGIN, PLAIN or empty to use +// best server supported one) +$rcmail_config['smtp_auth_type'] = ''; + +// Optional SMTP authentication identifier to be used as authorization proxy +$rcmail_config['smtp_auth_cid'] = null; + +// Optional SMTP authentication password to be used for smtp_auth_cid +$rcmail_config['smtp_auth_pw'] = null; + +// SMTP HELO host +// Hostname to give to the remote server for SMTP 'HELO' or 'EHLO' messages +// Leave this blank and you will get the server variable 'server_name' or +// localhost if that isn't defined. +$rcmail_config['smtp_helo_host'] = ''; + +// SMTP connection timeout, in seconds. Default: 0 (no limit) +$rcmail_config['smtp_timeout'] = 0; + +// ---------------------------------- +// SYSTEM +// ---------------------------------- +include_once("/etc/roundcube/debian-db-roundcube.php"); + + +// THIS OPTION WILL ALLOW THE INSTALLER TO RUN AND CAN EXPOSE SENSITIVE CONFIG DATA. +// ONLY ENABLE IT IF YOU'RE REALLY SURE WHAT YOU'RE DOING! +$rcmail_config['enable_installer'] = false; + +// provide an URL where a user can get support for this Roundcube installation +// PLEASE DO NOT LINK TO THE ROUNDCUBE.NET WEBSITE HERE! +$rcmail_config['support_url'] = ''; + +// replace Roundcube logo with this image +// specify an URL relative to the document root of this Roundcube installation +$rcmail_config['skin_logo'] = null; + +// automatically create a new Roundcube user when log-in the first time. +// a new user will be created once the IMAP login succeeds. +// set to false if only registered users can use this service +$rcmail_config['auto_create_user'] = true; + +// use this folder to store log files (must be writeable for apache user) +// This is used by the 'file' log driver. +$rcmail_config['log_dir'] = '/var/log/roundcubemail/'; + +// use this folder to store temp files (must be writeable for apache user) +$rcmail_config['temp_dir'] = '/tmp'; + +// lifetime of message cache +// possible units: s, m, h, d, w +$rcmail_config['message_cache_lifetime'] = '10d'; + +// enforce connections over https +// with this option enabled, all non-secure connections will be redirected. +// set the port for the ssl connection as value of this option if it differs from the default 443 +$rcmail_config['force_https'] = false; + +// tell PHP that it should work as under secure connection +// even if it doesn't recognize it as secure ($_SERVER['HTTPS'] is not set) +// e.g. when you're running Roundcube behind a https proxy +// this option is mutually exclusive to 'force_https' and only either one of them should be set to true. +$rcmail_config['use_https'] = false; + +// Allow browser-autocompletion on login form. +// 0 - disabled, 1 - username and host only, 2 - username, host, password +$rcmail_config['login_autocomplete'] = 0; + +// Forces conversion of logins to lower case. +// 0 - disabled, 1 - only domain part, 2 - domain and local part. +// If users authentication is not case-sensitive this must be enabled. +// After enabling it all user records need to be updated, e.g. with query: +// UPDATE users SET username = LOWER(username); +$rcmail_config['login_lc'] = 0; + +// Includes should be interpreted as PHP files +$rcmail_config['skin_include_php'] = false; + +// display software version on login screen +$rcmail_config['display_version'] = false; + +// Session lifetime in minutes +// must be greater than 'keep_alive'/60 +$rcmail_config['session_lifetime'] = 10; + +// session domain: .example.org +$rcmail_config['session_domain'] = ''; + +// session name. Default: 'roundcube_sessid' +$rcmail_config['session_name'] = null; + +// Backend to use for session storage. Can either be 'db' (default) or 'memcache' +// If set to memcache, a list of servers need to be specified in 'memcache_hosts' +// Make sure the Memcache extension (http://pecl.php.net/package/memcache) version >= 2.0.0 is installed +$rcmail_config['session_storage'] = 'db'; + +// Use these hosts for accessing memcached +// Define any number of hosts in the form of hostname:port or unix:///path/to/sock.file +$rcmail_config['memcache_hosts'] = null; // e.g. array( 'localhost:11211', '192.168.1.12:11211', 'unix:///var/tmp/memcached.sock' ); + +// check client IP in session athorization +$rcmail_config['ip_check'] = false; + +// check referer of incoming requests +$rcmail_config['referer_check'] = false; + +// X-Frame-Options HTTP header value sent to prevent from Clickjacking. +// Possible values: sameorigin|deny. Set to false in order to disable sending them +$rcmail_config['x_frame_options'] = 'sameorigin'; + +// this key is used to encrypt the users imap password which is stored +// in the session record (and the client cookie if remember password is enabled). +// please provide a string of exactly 24 chars. +$rcmail_config['des_key'] = 'vtIOjLZo9kffJoqzpSbm5r1r'; + +// Automatically add this domain to user names for login +// Only for IMAP servers that require full e-mail addresses for login +// Specify an array with 'host' => 'domain' values to support multiple hosts +// Supported replacement variables: +// %h - user's IMAP hostname +// %n - http hostname ($_SERVER['SERVER_NAME']) +// %d - domain (http hostname without the first part) +// %z - IMAP domain (IMAP hostname without the first part) +// For example %n = mail.domain.tld, %d = domain.tld +$rcmail_config['username_domain'] = ''; + +// This domain will be used to form e-mail addresses of new users +// Specify an array with 'host' => 'domain' values to support multiple hosts +// Supported replacement variables: +// %h - user's IMAP hostname +// %n - http hostname ($_SERVER['SERVER_NAME']) +// %d - domain (http hostname without the first part) +// %z - IMAP domain (IMAP hostname without the first part) +// For example %n = mail.domain.tld, %d = domain.tld +$rcmail_config['mail_domain'] = ''; + +// Password charset. +// Use it if your authentication backend doesn't support UTF-8. +// Defaults to ISO-8859-1 for backward compatibility +$rcmail_config['password_charset'] = 'ISO-8859-1'; + +// How many seconds must pass between emails sent by a user +$rcmail_config['sendmail_delay'] = 0; + +// Maximum number of recipients per message. Default: 0 (no limit) +$rcmail_config['max_recipients'] = 0; + +// Maximum allowednumber of members of an address group. Default: 0 (no limit) +// If 'max_recipients' is set this value should be less or equal +$rcmail_config['max_group_members'] = 0; + +// add this user-agent to message headers when sending +$rcmail_config['useragent'] = 'Roundcube Webmail/'.RCMAIL_VERSION; + +// use this name to compose page titles +$rcmail_config['product_name'] = 'Roundcube Webmail'; + +// try to load host-specific configuration +// see http://trac.roundcube.net/wiki/Howto_Config for more details +$rcmail_config['include_host_config'] = false; + +// path to a text file which will be added to each sent message +// paths are relative to the Roundcube root folder +$rcmail_config['generic_message_footer'] = ''; + +// path to a text file which will be added to each sent HTML message +// paths are relative to the Roundcube root folder +$rcmail_config['generic_message_footer_html'] = ''; + +// add a received header to outgoing mails containing the creators IP and hostname +$rcmail_config['http_received_header'] = false; + +// Whether or not to encrypt the IP address and the host name +// these could, in some circles, be considered as sensitive information; +// however, for the administrator, these could be invaluable help +// when tracking down issues. +$rcmail_config['http_received_header_encrypt'] = false; + +// This string is used as a delimiter for message headers when sending +// a message via mail() function. Leave empty for auto-detection +$rcmail_config['mail_header_delimiter'] = NULL; + +// number of chars allowed for line when wrapping text. +// text wrapping is done when composing/sending messages +$rcmail_config['line_length'] = 72; + +// send plaintext messages as format=flowed +$rcmail_config['send_format_flowed'] = true; + +// don't allow these settings to be overriden by the user +$rcmail_config['dont_override'] = array(); + +// Set identities access level: +// 0 - many identities with possibility to edit all params +// 1 - many identities with possibility to edit all params but not email address +// 2 - one identity with possibility to edit all params +// 3 - one identity with possibility to edit all params but not email address +$rcmail_config['identities_level'] = 0; + +// Mimetypes supported by the browser. +// attachments of these types will open in a preview window +// either a comma-separated list or an array: 'text/plain,text/html,text/xml,image/jpeg,image/gif,image/png,application/pdf' +$rcmail_config['client_mimetypes'] = null; # null == default + +// mime magic database +$rcmail_config['mime_magic'] = null; + +// path to imagemagick identify binary +$rcmail_config['im_identify_path'] = null; + +// path to imagemagick convert binary +$rcmail_config['im_convert_path'] = null; + +// maximum size of uploaded contact photos in pixel +$rcmail_config['contact_photo_size'] = 160; + +// Enable DNS checking for e-mail address validation +$rcmail_config['email_dns_check'] = false; + +// ---------------------------------- +// PLUGINS +// ---------------------------------- + +// List of active plugins (in plugins/ directory) +$rcmail_config['plugins'] = array('password'); + +// ---------------------------------- +// USER INTERFACE +// ---------------------------------- + +// default messages sort column. Use empty value for default server's sorting, +// or 'arrival', 'date', 'subject', 'from', 'to', 'fromto', 'size', 'cc' +$rcmail_config['message_sort_col'] = ''; + +// default messages sort order +$rcmail_config['message_sort_order'] = 'DESC'; + +// These cols are shown in the message list. Available cols are: +// subject, from, to, fromto, cc, replyto, date, size, status, flag, attachment, 'priority' +$rcmail_config['list_cols'] = array('subject', 'status', 'fromto', 'date', 'size', 'flag', 'attachment'); + +// the default locale setting (leave empty for auto-detection) +// RFC1766 formatted language name like en_US, de_DE, de_CH, fr_FR, pt_BR +$rcmail_config['language'] = null; + +// use this format for date display (date or strftime format) +$rcmail_config['date_format'] = 'Y-m-d'; + +// give this choice of date formats to the user to select from +$rcmail_config['date_formats'] = array('Y-m-d', 'd-m-Y', 'Y/m/d', 'm/d/Y', 'd/m/Y', 'd.m.Y', 'j.n.Y'); + +// use this format for time display (date or strftime format) +$rcmail_config['time_format'] = 'H:i'; + +// give this choice of time formats to the user to select from +$rcmail_config['time_formats'] = array('G:i', 'H:i', 'g:i a', 'h:i A'); + +// use this format for short date display (derived from date_format and time_format) +$rcmail_config['date_short'] = 'D H:i'; + +// use this format for detailed date/time formatting (derived from date_format and time_format) +$rcmail_config['date_long'] = 'Y-m-d H:i'; + +// store draft message is this mailbox +// leave blank if draft messages should not be stored +// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP) +$rcmail_config['drafts_mbox'] = 'Drafts'; + +// store spam messages in this mailbox +// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP) +$rcmail_config['junk_mbox'] = 'Spam'; + +// store sent message is this mailbox +// leave blank if sent messages should not be stored +// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP) +$rcmail_config['sent_mbox'] = 'Sent'; + +// move messages to this folder when deleting them +// leave blank if they should be deleted directly +// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP) +$rcmail_config['trash_mbox'] = 'Trash'; + +// display these folders separately in the mailbox list. +// these folders will also be displayed with localized names +// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP) +$rcmail_config['default_folders'] = array('INBOX', 'Drafts', 'Sent', 'Spam', 'Trash'); +$rcmail_config['default_imap_folders'] = array('INBOX', 'Drafts', 'Sent', 'Spam', 'Trash'); + +// automatically create the above listed default folders on first login +$rcmail_config['create_default_folders'] = true; + +// protect the default folders from renames, deletes, and subscription changes +$rcmail_config['protect_default_folders'] = true; + +// if in your system 0 quota means no limit set this option to true +$rcmail_config['quota_zero_as_unlimited'] = false; + +// Make use of the built-in spell checker. It is based on GoogieSpell. +// Since Google only accepts connections over https your PHP installatation +// requires to be compiled with Open SSL support +$rcmail_config['enable_spellcheck'] = true; + +// Enables spellchecker exceptions dictionary. +// Setting it to 'shared' will make the dictionary shared by all users. +$rcmail_config['spellcheck_dictionary'] = false; + +// Set the spell checking engine. 'googie' is the default. 'pspell' is also available, +// but requires the Pspell extensions. When using Nox Spell Server, also set 'googie' here. +$rcmail_config['spellcheck_engine'] = 'googie'; + +// For a locally installed Nox Spell Server, please specify the URI to call it. +// Get Nox Spell Server from http://orangoo.com/labs/?page_id=72 +// Leave empty to use the Google spell checking service, what means +// that the message content will be sent to Google in order to check spelling +$rcmail_config['spellcheck_uri'] = ''; + +// These languages can be selected for spell checking. +// Configure as a PHP style hash array: array('en'=>'English', 'de'=>'Deutsch'); +// Leave empty for default set of available language. +$rcmail_config['spellcheck_languages'] = NULL; + +// Makes that words with all letters capitalized will be ignored (e.g. GOOGLE) +$rcmail_config['spellcheck_ignore_caps'] = false; + +// Makes that words with numbers will be ignored (e.g. g00gle) +$rcmail_config['spellcheck_ignore_nums'] = false; + +// Makes that words with symbols will be ignored (e.g. g@@gle) +$rcmail_config['spellcheck_ignore_syms'] = false; + +// Use this char/string to separate recipients when composing a new message +$rcmail_config['recipients_separator'] = ','; + +// don't let users set pagesize to more than this value if set +$rcmail_config['max_pagesize'] = 200; + +// Minimal value of user's 'keep_alive' setting (in seconds) +// Must be less than 'session_lifetime' +$rcmail_config['min_keep_alive'] = 60; + +// Enables files upload indicator. Requires APC installed and enabled apc.rfc1867 option. +// By default refresh time is set to 1 second. You can set this value to true +// or any integer value indicating number of seconds. +$rcmail_config['upload_progress'] = false; + +// Specifies for how many seconds the Undo button will be available +// after object delete action. Currently used with supporting address book sources. +// Setting it to 0, disables the feature. +$rcmail_config['undo_timeout'] = 0; + +// ---------------------------------- +// ADDRESSBOOK SETTINGS +// ---------------------------------- + +// This indicates which type of address book to use. Possible choises: +// 'sql' (default) and 'ldap'. +// If set to 'ldap' then it will look at using the first writable LDAP +// address book as the primary address book and it will not display the +// SQL address book in the 'Address Book' view. +$rcmail_config['address_book_type'] = 'sql'; + +// In order to enable public ldap search, configure an array like the Verisign +// example further below. if you would like to test, simply uncomment the example. +// Array key must contain only safe characters, ie. a-zA-Z0-9_ +$rcmail_config['ldap_public'] = array(); + +// If you are going to use LDAP for individual address books, you will need to +// set 'user_specific' to true and use the variables to generate the appropriate DNs to access it. +// +// The recommended directory structure for LDAP is to store all the address book entries +// under the users main entry, e.g.: +// +// o=root +// ou=people +// uid=user@domain +// mail=contact@contactdomain +// +// So the base_dn would be uid=%fu,ou=people,o=root +// The bind_dn would be the same as based_dn or some super user login. +/* + * example config for Verisign directory + * +$rcmail_config['ldap_public']['Verisign'] = array( + 'name' => 'Verisign.com', + // Replacement variables supported in host names: + // %h - user's IMAP hostname + // %n - http hostname ($_SERVER['SERVER_NAME']) + // %d - domain (http hostname without the first part) + // %z - IMAP domain (IMAP hostname without the first part) + // For example %n = mail.domain.tld, %d = domain.tld + 'hosts' => array('directory.verisign.com'), + 'port' => 389, + 'use_tls' => false, + 'ldap_version' => 3, // using LDAPv3 + 'user_specific' => false, // If true the base_dn, bind_dn and bind_pass default to the user's IMAP login. + // %fu - The full username provided, assumes the username is an email + // address, uses the username_domain value if not an email address. + // %u - The username prior to the '@'. + // %d - The domain name after the '@'. + // %dc - The domain name hierarchal string e.g. "dc=test,dc=domain,dc=com" + // %dn - DN found by ldap search when search_filter/search_base_dn are used + 'base_dn' => '', + 'bind_dn' => '', + 'bind_pass' => '', + // It's possible to bind for an individual address book + // The login name is used to search for the DN to bind with + 'search_base_dn' => '', + 'search_filter' => '', // e.g. '(&(objectClass=posixAccount)(uid=%u))' + // DN and password to bind as before searching for bind DN, if anonymous search is not allowed + 'search_bind_dn' => '', + 'search_bind_pw' => '', + // Default for %dn variable if search doesn't return DN value + 'search_dn_default' => '', + // Optional authentication identifier to be used as SASL authorization proxy + // bind_dn need to be empty + 'auth_cid' => '', + // SASL authentication method (for proxy auth), e.g. DIGEST-MD5 + 'auth_method' => '', + // Indicates if the addressbook shall be hidden from the list. + // With this option enabled you can still search/view contacts. + 'hidden' => false, + // Indicates if the addressbook shall not list contacts but only allows searching. + 'searchonly' => false, + // Indicates if we can write to the LDAP directory or not. + // If writable is true then these fields need to be populated: + // LDAP_Object_Classes, required_fields, LDAP_rdn + 'writable' => false, + // To create a new contact these are the object classes to specify + // (or any other classes you wish to use). + 'LDAP_Object_Classes' => array('top', 'inetOrgPerson'), + // The RDN field that is used for new entries, this field needs + // to be one of the search_fields, the base of base_dn is appended + // to the RDN to insert into the LDAP directory. + 'LDAP_rdn' => 'cn', + // The required fields needed to build a new contact as required by + // the object classes (can include additional fields not required by the object classes). + 'required_fields' => array('cn', 'sn', 'mail'), + 'search_fields' => array('mail', 'cn'), // fields to search in + // mapping of contact fields to directory attributes + // for every attribute one can specify the number of values (limit) allowed. + // default is 1, a wildcard * means unlimited + 'fieldmap' => array( + // Roundcube => LDAP:limit + 'name' => 'cn', + 'surname' => 'sn', + 'firstname' => 'givenName', + 'title' => 'title', + 'email' => 'mail:*', + 'phone:home' => 'homePhone', + 'phone:work' => 'telephoneNumber', + 'phone:mobile' => 'mobile', + 'phone:pager' => 'pager', + 'street' => 'street', + 'zipcode' => 'postalCode', + 'region' => 'st', + 'locality' => 'l', +// if you uncomment country, you need to modify 'sub_fields' above +// 'country' => 'c', + 'department' => 'departmentNumber', + 'notes' => 'description', +// these currently don't work: +// 'phone:workfax' => 'facsimileTelephoneNumber', +// 'photo' => 'jpegPhoto', +// 'organization' => 'o', +// 'manager' => 'manager', +// 'assistant' => 'secretary', + ), + // Map of contact sub-objects (attribute name => objectClass(es)), e.g. 'c' => 'country' + 'sub_fields' => array(), + 'sort' => 'cn', // The field to sort the listing by. + 'scope' => 'sub', // search mode: sub|base|list + 'filter' => '(objectClass=inetOrgPerson)', // used for basic listing (if not empty) and will be &'d with search queries. example: status=act + 'fuzzy_search' => true, // server allows wildcard search + 'vlv' => false, // Enable Virtual List View to more efficiently fetch paginated data (if server supports it) + 'numsub_filter' => '(objectClass=organizationalUnit)', // with VLV, we also use numSubOrdinates to query the total number of records. Set this filter to get all numSubOrdinates attributes for counting + 'sizelimit' => '0', // Enables you to limit the count of entries fetched. Setting this to 0 means no limit. + 'timelimit' => '0', // Sets the number of seconds how long is spend on the search. Setting this to 0 means no limit. + 'referrals' => true|false, // Sets the LDAP_OPT_REFERRALS option. Mostly used in multi-domain Active Directory setups + + // definition for contact groups (uncomment if no groups are supported) + // for the groups base_dn, the user replacements %fu, %u, $d and %dc work as for base_dn (see above) + // if the groups base_dn is empty, the contact base_dn is used for the groups as well + // -> in this case, assure that groups and contacts are separated due to the concernig filters! + 'groups' => array( + 'base_dn' => '', + 'scope' => 'sub', // search mode: sub|base|list + 'filter' => '(objectClass=groupOfNames)', + 'object_classes' => array("top", "groupOfNames"), + 'member_attr' => 'member', // name of the member attribute, e.g. uniqueMember + 'name_attr' => 'cn', // attribute to be used as group name + ), +); +*/ + +// An ordered array of the ids of the addressbooks that should be searched +// when populating address autocomplete fields server-side. ex: array('sql','Verisign'); +$rcmail_config['autocomplete_addressbooks'] = array('sql'); + +// The minimum number of characters required to be typed in an autocomplete field +// before address books will be searched. Most useful for LDAP directories that +// may need to do lengthy results building given overly-broad searches +$rcmail_config['autocomplete_min_length'] = 1; + +// Number of parallel autocomplete requests. +// If there's more than one address book, n parallel (async) requests will be created, +// where each request will search in one address book. By default (0), all address +// books are searched in one request. +$rcmail_config['autocomplete_threads'] = 0; + +// Max. numer of entries in autocomplete popup. Default: 15. +$rcmail_config['autocomplete_max'] = 15; + +// show address fields in this order +// available placeholders: {street}, {locality}, {zipcode}, {country}, {region} +$rcmail_config['address_template'] = '{street}
                {locality} {zipcode}
                {country} {region}'; + +// Matching mode for addressbook search (including autocompletion) +// 0 - partial (*abc*), default +// 1 - strict (abc) +// 2 - prefix (abc*) +// Note: For LDAP sources fuzzy_search must be enabled to use 'partial' or 'prefix' mode +$rcmail_config['addressbook_search_mode'] = 0; + +// ---------------------------------- +// USER PREFERENCES +// ---------------------------------- + +// Use this charset as fallback for message decoding +//$rcmail_config['default_charset'] = 'ISO-8859-1'; +$rcmail_config['default_charset'] = 'UTF-8'; + +// skin name: folder from skins/ +$rcmail_config['skin'] = 'larry'; + +// show up to X items in messages list view +$rcmail_config['mail_pagesize'] = 50; + +// show up to X items in contacts list view +$rcmail_config['addressbook_pagesize'] = 50; + +// sort contacts by this col (preferably either one of name, firstname, surname) +$rcmail_config['addressbook_sort_col'] = 'surname'; + +// the way how contact names are displayed in the list +// 0: display name +// 1: (prefix) firstname middlename surname (suffix) +// 2: (prefix) surname firstname middlename (suffix) +// 3: (prefix) surname, firstname middlename (suffix) +$rcmail_config['addressbook_name_listing'] = 0; + +// use this timezone to display date/time +// valid timezone identifers are listed here: php.net/manual/en/timezones.php +// 'auto' will use the browser's timezone settings +$rcmail_config['timezone'] = 'auto'; + +// prefer displaying HTML messages +$rcmail_config['prefer_html'] = true; + +// display remote inline images +// 0 - Never, always ask +// 1 - Ask if sender is not in address book +// 2 - Always show inline images +$rcmail_config['show_images'] = 0; + +// compose html formatted messages by default +// 0 - never, 1 - always, 2 - on reply to HTML message only +$rcmail_config['htmleditor'] = 0; + +// show pretty dates as standard +$rcmail_config['prettydate'] = true; + +// save compose message every 300 seconds (5min) +$rcmail_config['draft_autosave'] = 300; + +// default setting if preview pane is enabled +$rcmail_config['preview_pane'] = false; + +// Mark as read when viewed in preview pane (delay in seconds) +// Set to -1 if messages in preview pane should not be marked as read +$rcmail_config['preview_pane_mark_read'] = 0; + +// Clear Trash on logout +$rcmail_config['logout_purge'] = false; + +// Compact INBOX on logout +$rcmail_config['logout_expunge'] = false; + +// Display attached images below the message body +$rcmail_config['inline_images'] = true; + +// Encoding of long/non-ascii attachment names: +// 0 - Full RFC 2231 compatible +// 1 - RFC 2047 for 'name' and RFC 2231 for 'filename' parameter (Thunderbird's default) +// 2 - Full 2047 compatible +$rcmail_config['mime_param_folding'] = 1; + +// Set true if deleted messages should not be displayed +// This will make the application run slower +$rcmail_config['skip_deleted'] = false; + +// Set true to Mark deleted messages as read as well as deleted +// False means that a message's read status is not affected by marking it as deleted +$rcmail_config['read_when_deleted'] = true; + +// Set to true to never delete messages immediately +// Use 'Purge' to remove messages marked as deleted +$rcmail_config['flag_for_deletion'] = false; + +// Default interval for keep-alive/check-recent requests (in seconds) +// Must be greater than or equal to 'min_keep_alive' and less than 'session_lifetime' +$rcmail_config['keep_alive'] = 60; + +// If true all folders will be checked for recent messages +$rcmail_config['check_all_folders'] = false; + +// If true, after message delete/move, the next message will be displayed +$rcmail_config['display_next'] = false; + +// 0 - Do not expand threads +// 1 - Expand all threads automatically +// 2 - Expand only threads with unread messages +$rcmail_config['autoexpand_threads'] = 0; + +// When replying place cursor above original message (top posting) +$rcmail_config['top_posting'] = false; + +// When replying strip original signature from message +$rcmail_config['strip_existing_sig'] = true; + +// Show signature: +// 0 - Never +// 1 - Always +// 2 - New messages only +// 3 - Forwards and Replies only +$rcmail_config['show_sig'] = 1; + +// When replying or forwarding place sender's signature above existing message +$rcmail_config['sig_above'] = false; + +// Use MIME encoding (quoted-printable) for 8bit characters in message body +$rcmail_config['force_7bit'] = false; + +// Defaults of the search field configuration. +// The array can contain a per-folder list of header fields which should be considered when searching +// The entry with key '*' stands for all folders which do not have a specific list set. +// Please note that folder names should to be in sync with $rcmail_config['default_folders'] +$rcmail_config['search_mods'] = null; // Example: array('*' => array('subject'=>1, 'from'=>1), 'Sent' => array('subject'=>1, 'to'=>1)); + +// Defaults of the addressbook search field configuration. +$rcmail_config['addressbook_search_mods'] = null; // Example: array('name'=>1, 'firstname'=>1, 'surname'=>1, 'email'=>1, '*'=>1); + +// 'Delete always' +// This setting reflects if mail should be always deleted +// when moving to Trash fails. This is necessary in some setups +// when user is over quota and Trash is included in the quota. +$rcmail_config['delete_always'] = false; + +// Directly delete messages in Junk instead of moving to Trash +$rcmail_config['delete_junk'] = true; + +// Behavior if a received message requests a message delivery notification (read receipt) +// 0 = ask the user, 1 = send automatically, 2 = ignore (never send or ask) +// 3 = send automatically if sender is in addressbook, otherwise ask the user +// 4 = send automatically if sender is in addressbook, otherwise ignore +$rcmail_config['mdn_requests'] = 0; + +// Return receipt checkbox default state +$rcmail_config['mdn_default'] = 0; + +// Delivery Status Notification checkbox default state +$rcmail_config['dsn_default'] = 0; + +// Place replies in the folder of the message being replied to +$rcmail_config['reply_same_folder'] = false; + +// Sets default mode of Forward feature to "forward as attachment" +$rcmail_config['forward_attachment'] = false; + +// Defines address book (internal index) to which new contacts will be added +// By default it is the first writeable addressbook. +// Note: Use '0' for built-in address book. +$rcmail_config['default_addressbook'] = null; + +// Enables spell checking before sending a message. +$rcmail_config['spellcheck_before_send'] = false; + +// Skip alternative email addresses in autocompletion (show one address per contact) +$rcmail_config['autocomplete_single'] = false; + +// Default font for composed HTML message. +// Supported values: Andale Mono, Arial, Arial Black, Book Antiqua, Courier New, +// Georgia, Helvetica, Impact, Tahoma, Terminal, Times New Roman, Trebuchet MS, Verdana +$rcmail_config['default_font'] = ''; + +// end of config file diff --git a/install/ubuntu/15.10/roundcube/vesta.php b/install/ubuntu/15.10/roundcube/vesta.php new file mode 100644 index 000000000..8fb202a44 --- /dev/null +++ b/install/ubuntu/15.10/roundcube/vesta.php @@ -0,0 +1,62 @@ + + */ + + function password_save($curpass, $passwd) + { + $rcmail = rcmail::get_instance(); + $vesta_host = $rcmail->config->get('password_vesta_host'); + + if (empty($vesta_host)) + { + $vesta_host = 'localhost'; + } + + $vesta_port = $rcmail->config->get('password_vesta_port'); + if (empty($vesta_port)) + { + $vesta_port = '8083'; + } + + $postvars = array( + 'email' => $_SESSION['username'], + 'password' => $curpass, + 'new' => $passwd + ); + + $postdata = http_build_query($postvars); + + $send = 'POST /reset/mail/ HTTP/1.1' . PHP_EOL; + $send .= 'Host: ' . $vesta_host . PHP_EOL; + $send .= 'User-Agent: PHP Script' . PHP_EOL; + $send .= 'Content-length: ' . strlen($postdata) . PHP_EOL; + $send .= 'Content-type: application/x-www-form-urlencoded' . PHP_EOL; + $send .= 'Connection: close' . PHP_EOL; + $send .= PHP_EOL; + $send .= $postdata . PHP_EOL . PHP_EOL; + + $fp = fsockopen('ssl://' . $vesta_host, $vesta_port); + fputs($fp, $send); + $result = fread($fp, 2048); + fclose($fp); + + $fp = fopen("/tmp/roundcube.log", 'w'); + fwrite($fp, "test ok"); + fwrite($fp, "\n"); + fclose($fp); + + + if(strpos($result, 'ok') && !strpos($result, 'error')) + { + return PASSWORD_SUCCESS; + } + else { + return PASSWORD_ERROR; + } + + } diff --git a/install/ubuntu/15.10/sudo/admin b/install/ubuntu/15.10/sudo/admin new file mode 100644 index 000000000..47e16098c --- /dev/null +++ b/install/ubuntu/15.10/sudo/admin @@ -0,0 +1,7 @@ +# Created by vesta installer +Defaults env_keep="VESTA" +Defaults:admin !syslog +Defaults:admin !requiretty + +admin ALL=(ALL) ALL +admin ALL=NOPASSWD:/usr/local/vesta/bin/* diff --git a/install/ubuntu/15.10/templates/dns/child-ns.tpl b/install/ubuntu/15.10/templates/dns/child-ns.tpl new file mode 100755 index 000000000..27f9b825b --- /dev/null +++ b/install/ubuntu/15.10/templates/dns/child-ns.tpl @@ -0,0 +1,11 @@ +ID='1' RECORD='@' TYPE='NS' PRIORITY='' VALUE='ns1.%domain%.' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='2' RECORD='@' TYPE='NS' PRIORITY='' VALUE='ns2.%domain%.' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='3' RECORD='@' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='4' RECORD='ns1' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='5' RECORD='ns2' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='6' RECORD='mail' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='7' RECORD='www' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='8' RECORD='pop' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='9' RECORD='ftp' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='10' RECORD='@' TYPE='MX' PRIORITY='10' VALUE='mail.%domain%.' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='11' RECORD='@' TYPE='TXT' PRIORITY='' VALUE='"v=spf1 a mx ip4:%ip% ?all"' SUSPENDED='no' TIME='%time%' DATE='%date%' diff --git a/install/ubuntu/15.10/templates/dns/default.tpl b/install/ubuntu/15.10/templates/dns/default.tpl new file mode 100755 index 000000000..942c15bc8 --- /dev/null +++ b/install/ubuntu/15.10/templates/dns/default.tpl @@ -0,0 +1,15 @@ +ID='1' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns1%.' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='2' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns2%.' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='3' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns3%.' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='4' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns4%.' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='5' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns5%.' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='6' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns6%.' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='7' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns7%.' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='8' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns8%.' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='9' RECORD='@' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='10' RECORD='mail' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='11' RECORD='www' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='12' RECORD='pop' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='13' RECORD='ftp' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='14' RECORD='@' TYPE='MX' PRIORITY='10' VALUE='mail.%domain%.' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='15' RECORD='@' TYPE='TXT' PRIORITY='' VALUE='"v=spf1 a mx ip4:%ip% ?all"' SUSPENDED='no' TIME='%time%' DATE='%date%' diff --git a/install/ubuntu/15.10/templates/dns/gmail.tpl b/install/ubuntu/15.10/templates/dns/gmail.tpl new file mode 100755 index 000000000..950cfa456 --- /dev/null +++ b/install/ubuntu/15.10/templates/dns/gmail.tpl @@ -0,0 +1,14 @@ +ID='1' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns1%.' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='2' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns2%.' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='3' RECORD='@' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='4' RECORD='ftp' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='5' RECORD='localhost' TYPE='A' PRIORITY='' VALUE='127.0.0.1' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='6' RECORD='mail' TYPE='CNAME' PRIORITY='' VALUE='ghs.google.com.' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='7' RECORD='pop' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='8' RECORD='www' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='9' RECORD='@' TYPE='MX' PRIORITY='1' VALUE='ASPMX.L.GOOGLE.COM.' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='10' RECORD='@' TYPE='MX' PRIORITY='5' VALUE='ALT1.ASPMX.L.GOOGLE.COM.' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='11' RECORD='@' TYPE='MX' PRIORITY='5' VALUE='ALT2.ASPMX.L.GOOGLE.COM.' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='12' RECORD='@' TYPE='MX' PRIORITY='10' VALUE='ASPMX2.GOOGLEMAIL.COM.' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='13' RECORD='@' TYPE='MX' PRIORITY='10' VALUE='ASPMX3.GOOGLEMAIL.COM.' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='14' RECORD='@' TYPE='TXT' PRIORITY='' VALUE='"v=spf1 a mx ip4:%ip% ?all"' SUSPENDED='no' TIME='%time%' DATE='%date%' diff --git a/install/ubuntu/15.10/templates/web/apache2/basedir.stpl b/install/ubuntu/15.10/templates/web/apache2/basedir.stpl new file mode 100755 index 000000000..3f71e6999 --- /dev/null +++ b/install/ubuntu/15.10/templates/web/apache2/basedir.stpl @@ -0,0 +1,41 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %sdocroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + #SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + AllowOverride All + SSLRequireSSL + Options +Includes -Indexes +ExecCGI + php_admin_value open_basedir %docroot% + + + AllowOverride All + + SSLEngine on + SSLVerifyClient none + SSLCertificateFile %ssl_crt% + SSLCertificateKeyFile %ssl_key% + %ssl_ca_str%SSLCertificateChainFile %ssl_ca% + + + RMode config + RUidGid %user% %group% + RGroups www-data + + + AssignUserID %user% %group% + + + IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* + + + diff --git a/install/ubuntu/15.10/templates/web/apache2/basedir.tpl b/install/ubuntu/15.10/templates/web/apache2/basedir.tpl new file mode 100755 index 000000000..75daf0e10 --- /dev/null +++ b/install/ubuntu/15.10/templates/web/apache2/basedir.tpl @@ -0,0 +1,35 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %docroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + #SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + AllowOverride All + Options +Includes -Indexes +ExecCGI + php_admin_value open_basedir %docroot% + + + AllowOverride All + + + + RMode config + RUidGid %user% %group% + RGroups www-data + + + AssignUserID %user% %group% + + + IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + + + diff --git a/install/ubuntu/15.10/templates/web/apache2/default.stpl b/install/ubuntu/15.10/templates/web/apache2/default.stpl new file mode 100755 index 000000000..e884a95b9 --- /dev/null +++ b/install/ubuntu/15.10/templates/web/apache2/default.stpl @@ -0,0 +1,40 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %sdocroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + #SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + AllowOverride All + SSLRequireSSL + Options +Includes -Indexes +ExecCGI + + + AllowOverride All + + SSLEngine on + SSLVerifyClient none + SSLCertificateFile %ssl_crt% + SSLCertificateKeyFile %ssl_key% + %ssl_ca_str%SSLCertificateChainFile %ssl_ca% + + + RMode config + RUidGid %user% %group% + RGroups www-data + + + AssignUserID %user% %group% + + + IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* + + + diff --git a/install/ubuntu/15.10/templates/web/apache2/default.tpl b/install/ubuntu/15.10/templates/web/apache2/default.tpl new file mode 100755 index 000000000..073724ce0 --- /dev/null +++ b/install/ubuntu/15.10/templates/web/apache2/default.tpl @@ -0,0 +1,34 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %docroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + #SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + AllowOverride All + Options +Includes -Indexes +ExecCGI + + + AllowOverride All + + + + RMode config + RUidGid %user% %group% + RGroups www-data + + + AssignUserID %user% %group% + + + IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + + + diff --git a/install/ubuntu/15.10/templates/web/apache2/hosting.stpl b/install/ubuntu/15.10/templates/web/apache2/hosting.stpl new file mode 100755 index 000000000..7a5d7787f --- /dev/null +++ b/install/ubuntu/15.10/templates/web/apache2/hosting.stpl @@ -0,0 +1,49 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %sdocroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + #SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + AllowOverride All + SSLRequireSSL + Options +Includes -Indexes +ExecCGI + php_admin_value upload_tmp_dir %home%/%user%/tmp + php_admin_value upload_max_filesize 10M + php_admin_value max_execution_time 20 + php_admin_value post_max_size 8M + php_admin_value memory_limit 32M + php_admin_flag mysql.allow_persistent off + php_admin_flag safe_mode off + php_admin_value session.save_path %home%/%user%/tmp + php_admin_value sendmail_path '/usr/sbin/sendmail -t -i -f %email%' + + + AllowOverride All + + php_admin_value open_basedir %home%/%user%/web:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpMyAdmin:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcubemail:/etc/roundcube:/var/lib/roundcube + SSLEngine on + SSLVerifyClient none + SSLCertificateFile %ssl_crt% + SSLCertificateKeyFile %ssl_key% + %ssl_ca_str%SSLCertificateChainFile %ssl_ca% + + RMode config + RUidGid %user% %group% + RGroups www-data + + + AssignUserID %user% %group% + + + IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* + + + diff --git a/install/ubuntu/15.10/templates/web/apache2/hosting.tpl b/install/ubuntu/15.10/templates/web/apache2/hosting.tpl new file mode 100755 index 000000000..ab844dc74 --- /dev/null +++ b/install/ubuntu/15.10/templates/web/apache2/hosting.tpl @@ -0,0 +1,43 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %docroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + #SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + AllowOverride All + Options +Includes -Indexes +ExecCGI + php_admin_value upload_tmp_dir %home%/%user%/tmp + php_admin_value upload_max_filesize 10M + php_admin_value max_execution_time 20 + php_admin_value post_max_size 8M + php_admin_value memory_limit 32M + php_admin_flag mysql.allow_persistent off + php_admin_flag safe_mode off + php_admin_value session.save_path %home%/%user%/tmp + php_admin_value sendmail_path '/usr/sbin/sendmail -t -i -f %email%' + + + AllowOverride All + + php_admin_value open_basedir %home%/%user%/web:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpMyAdmin:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcubemail:/etc/roundcube:/var/lib/roundcube + + RMode config + RUidGid %user% %group% + RGroups www-data + + + AssignUserID %user% %group% + + + IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + + + diff --git a/install/ubuntu/15.10/templates/web/apache2/phpcgi.sh b/install/ubuntu/15.10/templates/web/apache2/phpcgi.sh new file mode 100755 index 000000000..6565e103d --- /dev/null +++ b/install/ubuntu/15.10/templates/web/apache2/phpcgi.sh @@ -0,0 +1,16 @@ +#!/bin/bash +# Adding php wrapper +user="$1" +domain="$2" +ip="$3" +home_dir="$4" +docroot="$5" + +wrapper_script='#!/usr/bin/php-cgi -cphp5-cgi.ini' +wrapper_file="$home_dir/$user/web/$domain/cgi-bin/php" + +echo "$wrapper_script" > $wrapper_file +chown $user:$user $wrapper_file +chmod -f 751 $wrapper_file + +exit 0 diff --git a/install/ubuntu/15.10/templates/web/apache2/phpcgi.stpl b/install/ubuntu/15.10/templates/web/apache2/phpcgi.stpl new file mode 100755 index 000000000..aa5137308 --- /dev/null +++ b/install/ubuntu/15.10/templates/web/apache2/phpcgi.stpl @@ -0,0 +1,35 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %sdocroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + SSLRequireSSL + AllowOverride All + Options +Includes -Indexes +ExecCGI + Action phpcgi-script /cgi-bin/php + + SetHandler phpcgi-script + + + + AllowOverride All + + SSLEngine on + SSLVerifyClient none + SSLCertificateFile %ssl_crt% + SSLCertificateKeyFile %ssl_key% + %ssl_ca_str%SSLCertificateChainFile %ssl_ca% + + IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* + + + diff --git a/install/ubuntu/15.10/templates/web/apache2/phpcgi.tpl b/install/ubuntu/15.10/templates/web/apache2/phpcgi.tpl new file mode 100755 index 000000000..a05ff252d --- /dev/null +++ b/install/ubuntu/15.10/templates/web/apache2/phpcgi.tpl @@ -0,0 +1,28 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %docroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + AllowOverride All + Options +Includes -Indexes +ExecCGI + Action phpcgi-script /cgi-bin/php + + SetHandler phpcgi-script + + + + AllowOverride All + + IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + + + diff --git a/install/ubuntu/15.10/templates/web/apache2/phpfcgid.sh b/install/ubuntu/15.10/templates/web/apache2/phpfcgid.sh new file mode 100755 index 000000000..e80582492 --- /dev/null +++ b/install/ubuntu/15.10/templates/web/apache2/phpfcgid.sh @@ -0,0 +1,22 @@ +#!/bin/bash +# Adding php wrapper +user="$1" +domain="$2" +ip="$3" +home_dir="$4" +docroot="$5" + +wrapper_script="#!/bin/sh +PHPRC=/usr/local/lib +export PHPRC +export PHP_FCGI_MAX_REQUESTS=1000 +export PHP_FCGI_CHILDREN=20 +exec /usr/bin/php-cgi +" +wrapper_file="$home_dir/$user/web/$domain/cgi-bin/fcgi-starter" + +echo "$wrapper_script" > $wrapper_file +chown $user:$user $wrapper_file +chmod -f 751 $wrapper_file + +exit 0 diff --git a/install/ubuntu/15.10/templates/web/apache2/phpfcgid.stpl b/install/ubuntu/15.10/templates/web/apache2/phpfcgid.stpl new file mode 100755 index 000000000..622495756 --- /dev/null +++ b/install/ubuntu/15.10/templates/web/apache2/phpfcgid.stpl @@ -0,0 +1,36 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %sdocroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + SSLRequireSSL + AllowOverride All + Options +Includes -Indexes +ExecCGI + + SetHandler fcgid-script + + FCGIWrapper %home%/%user%/web/%domain%/cgi-bin/fcgi-starter .php + + + AllowOverride All + + php_admin_value open_basedir none + SSLEngine on + SSLVerifyClient none + SSLCertificateFile %ssl_crt% + SSLCertificateKeyFile %ssl_key% + %ssl_ca_str%SSLCertificateChainFile %ssl_ca% + + IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* + + + diff --git a/install/ubuntu/15.10/templates/web/apache2/phpfcgid.tpl b/install/ubuntu/15.10/templates/web/apache2/phpfcgid.tpl new file mode 100755 index 000000000..5c1f16e20 --- /dev/null +++ b/install/ubuntu/15.10/templates/web/apache2/phpfcgid.tpl @@ -0,0 +1,28 @@ + + + ServerName %domain_idn% + %alias_string% + ServerAdmin %email% + DocumentRoot %docroot% + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ + SuexecUserGroup %user% %group% + CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes + CustomLog /var/log/%web_system%/domains/%domain%.log combined + ErrorLog /var/log/%web_system%/domains/%domain%.error.log + + AllowOverride All + Options +Includes -Indexes +ExecCGI + + SetHandler fcgid-script + + FCGIWrapper %home%/%user%/web/%domain%/cgi-bin/fcgi-starter .php + + + AllowOverride All + + IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + + + diff --git a/install/ubuntu/15.10/templates/web/awstats/awstats.tpl b/install/ubuntu/15.10/templates/web/awstats/awstats.tpl new file mode 100755 index 000000000..9a92e0fd4 --- /dev/null +++ b/install/ubuntu/15.10/templates/web/awstats/awstats.tpl @@ -0,0 +1,133 @@ +LogFile="/var/log/%web_system%/domains/%domain%.log" +LogType=W +LogFormat=1 +LogSeparator=" " +SiteDomain="%domain_idn%" +HostAliases="%alias_idn%" +DirData="%home%/%user%/web/%domain%/stats" +DirCgi="/vstats" +DirIcons="/vstats/icon" +AllowToUpdateStatsFromBrowser=0 +AllowFullYearView=2 +EnableLockForUpdate=1 +DNSStaticCacheFile="dnscache.txt" +DNSLastUpdateCacheFile="dnscachelastupdate.txt" +SkipDNSLookupFor="" +AllowAccessFromWebToAuthenticatedUsersOnly=0 +AllowAccessFromWebToFollowingAuthenticatedUsers="" +AllowAccessFromWebToFollowingIPAddresses="" +CreateDirDataIfNotExists=0 +BuildHistoryFormat=text +BuildReportFormat=html +SaveDatabaseFilesWithPermissionsForEveryone=0 +PurgeLogFile=0 +ArchiveLogRecords=0 +KeepBackupOfHistoricFiles=1 +DefaultFile="index.php index.html" +SkipHosts="127.0.0.1 +SkipUserAgents="" +SkipFiles="" +SkipReferrersBlackList="" +OnlyHosts="" +OnlyUserAgents="" +OnlyUsers="" +OnlyFiles="" +NotPageList="css js class gif jpg jpeg png bmp ico rss xml swf" +ValidHTTPCodes="200 304" +ValidSMTPCodes="1 250" +AuthenticatedUsersNotCaseSensitive=0 +URLNotCaseSensitive=0 +URLWithAnchor=0 +URLQuerySeparators="?;" +URLWithQuery=0 +URLWithQueryWithOnlyFollowingParameters="" +URLWithQueryWithoutFollowingParameters="" +URLReferrerWithQuery=0 +WarningMessages=1 +ErrorMessages="" +DebugMessages=0 +NbOfLinesForCorruptedLog=50 +WrapperScript="" +DecodeUA=0 +MiscTrackerUrl="/js/awstats_misc_tracker.js" +UseFramesWhenCGI=1 +DetailedReportsOnNewWindows=1 +Expires=3600 +MaxRowsInHTMLOutput=1000 +Lang="auto" +DirLang="./lang" +ShowMenu=1 +ShowSummary=UVPHB +ShowMonthStats=UVPHB +ShowDaysOfMonthStats=VPHB +ShowDaysOfWeekStats=PHB +ShowHoursStats=PHB +ShowDomainsStats=PHB +ShowHostsStats=PHBL +ShowAuthenticatedUsers=0 +ShowRobotsStats=HBL +ShowWormsStats=0 +ShowEMailSenders=0 +ShowEMailReceivers=0 +ShowSessionsStats=1 +ShowPagesStats=PBEX +ShowFileTypesStats=HB +ShowFileSizesStats=0 +ShowDownloadsStats=HB +ShowOSStats=1 +ShowBrowsersStats=1 +ShowScreenSizeStats=0 +ShowOriginStats=PH +ShowKeyphrasesStats=1 +ShowKeywordsStats=1 +ShowMiscStats=a +ShowHTTPErrorsStats=1 +ShowSMTPErrorsStats=0 +ShowClusterStats=0 +AddDataArrayMonthStats=1 +AddDataArrayShowDaysOfMonthStats=1 +AddDataArrayShowDaysOfWeekStats=1 +AddDataArrayShowHoursStats=1 +IncludeInternalLinksInOriginSection=0 +MaxNbOfDomain = 10 +MinHitDomain = 1 +MaxNbOfHostsShown = 10 +MinHitHost = 1 +MaxNbOfLoginShown = 10 +MinHitLogin = 1 +MaxNbOfRobotShown = 10 +MinHitRobot = 1 +MaxNbOfDownloadsShown = 10 +MinHitDownloads = 1 +MaxNbOfPageShown = 10 +MinHitFile = 1 +MaxNbOfOsShown = 10 +MinHitOs = 1 +MaxNbOfBrowsersShown = 10 +MinHitBrowser = 1 +MaxNbOfScreenSizesShown = 5 +MinHitScreenSize = 1 +MaxNbOfWindowSizesShown = 5 +MinHitWindowSize = 1 +MaxNbOfRefererShown = 10 +MinHitRefer = 1 +MaxNbOfKeyphrasesShown = 10 +MinHitKeyphrase = 1 +MaxNbOfKeywordsShown = 10 +MinHitKeyword = 1 +MaxNbOfEMailsShown = 20 +MinHitEMail = 1 +FirstDayOfWeek=0 +ShowFlagLinks="" +ShowLinksOnUrl=1 +UseHTTPSLinkForUrl="" +MaxLengthOfShownURL=64 +HTMLHeadSection="" +HTMLEndSection="" +MetaRobot=0 +Logo="awstats_logo6.png" +LogoLink="http://awstats.sourceforge.net" +BarWidth = 260 +BarHeight = 90 +StyleSheet="" +ExtraTrackedRowsLimit=500 diff --git a/install/ubuntu/15.10/templates/web/awstats/index.tpl b/install/ubuntu/15.10/templates/web/awstats/index.tpl new file mode 100755 index 000000000..9df9bb5cb --- /dev/null +++ b/install/ubuntu/15.10/templates/web/awstats/index.tpl @@ -0,0 +1,10 @@ + + + + Awstats log analyzer + + + + + + diff --git a/install/ubuntu/15.10/templates/web/awstats/nav.tpl b/install/ubuntu/15.10/templates/web/awstats/nav.tpl new file mode 100755 index 000000000..f29bed68b --- /dev/null +++ b/install/ubuntu/15.10/templates/web/awstats/nav.tpl @@ -0,0 +1,23 @@ + + + Awstats navigation + + + + + + + + +
                vesta + + +
                + + diff --git a/install/ubuntu/15.10/templates/web/nginx/caching.sh b/install/ubuntu/15.10/templates/web/nginx/caching.sh new file mode 100755 index 000000000..6eb9126db --- /dev/null +++ b/install/ubuntu/15.10/templates/web/nginx/caching.sh @@ -0,0 +1,12 @@ +#!/bin/bash + +user=$1 +domain=$2 +ip=$3 +home=$4 +docroot=$5 + +str="proxy_cache_path /var/cache/nginx/$domain levels=2" +str="$str keys_zone=$domain:10m inactive=60m max_size=512m;" +echo "$str" >> /etc/nginx/conf.d/01_caching_pool.conf + diff --git a/install/ubuntu/15.10/templates/web/nginx/caching.stpl b/install/ubuntu/15.10/templates/web/nginx/caching.stpl new file mode 100755 index 000000000..ca6cffe32 --- /dev/null +++ b/install/ubuntu/15.10/templates/web/nginx/caching.stpl @@ -0,0 +1,44 @@ +server { + listen %ip%:%proxy_ssl_port%; + server_name %domain_idn% %alias_idn%; + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + error_log /var/log/%web_system%/domains/%domain%.error.log error; + + location / { + proxy_pass http://%ip%:%web_port%; + + proxy_cache cache; + proxy_cache_valid 15m; + proxy_cache_valid 404 1m; + proxy_no_cache $no_cache; + proxy_cache_bypass $no_cache; + proxy_cache_bypass $cookie_session $http_x_update; + + location ~* ^.+\.(%proxy_extentions%)$ { + proxy_cache off; + root %docroot%; + access_log /var/log/%web_system%/domains/%domain%.log combined; + access_log /var/log/%web_system%/domains/%domain%.bytes bytes; + expires max; + try_files $uri @fallback; + } + } + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location @fallback { + proxy_pass http://%ip%:%web_port%; + } + + location ~ /\.ht {return 404;} + location ~ /\.svn/ {return 404;} + location ~ /\.git/ {return 404;} + location ~ /\.hg/ {return 404;} + location ~ /\.bzr/ {return 404;} + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/15.10/templates/web/nginx/caching.tpl b/install/ubuntu/15.10/templates/web/nginx/caching.tpl new file mode 100755 index 000000000..36761b65c --- /dev/null +++ b/install/ubuntu/15.10/templates/web/nginx/caching.tpl @@ -0,0 +1,41 @@ +server { + listen %ip%:%proxy_port%; + server_name %domain_idn% %alias_idn%; + error_log /var/log/%web_system%/domains/%domain%.error.log error; + + location / { + proxy_pass http://%ip%:%web_port%; + + proxy_cache cache; + proxy_cache_valid 15m; + proxy_cache_valid 404 1m; + proxy_no_cache $no_cache; + proxy_cache_bypass $no_cache; + proxy_cache_bypass $cookie_session $http_x_update; + + location ~* ^.+\.(%proxy_extentions%)$ { + proxy_cache off; + root %docroot%; + access_log /var/log/%web_system%/domains/%domain%.log combined; + access_log /var/log/%web_system%/domains/%domain%.bytes bytes; + expires max; + try_files $uri @fallback; + } + } + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location @fallback { + proxy_pass http://%ip%:%web_port%; + } + + location ~ /\.ht {return 404;} + location ~ /\.svn/ {return 404;} + location ~ /\.git/ {return 404;} + location ~ /\.hg/ {return 404;} + location ~ /\.bzr/ {return 404;} + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/15.10/templates/web/nginx/default.stpl b/install/ubuntu/15.10/templates/web/nginx/default.stpl new file mode 100755 index 000000000..fa5380606 --- /dev/null +++ b/install/ubuntu/15.10/templates/web/nginx/default.stpl @@ -0,0 +1,36 @@ +server { + listen %ip%:%proxy_ssl_port%; + server_name %domain_idn% %alias_idn%; + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + error_log /var/log/%web_system%/domains/%domain%.error.log error; + + location / { + proxy_pass https://%ip%:%web_ssl_port%; + location ~* ^.+\.(%proxy_extentions%)$ { + root %sdocroot%; + access_log /var/log/%web_system%/domains/%domain%.log combined; + access_log /var/log/%web_system%/domains/%domain%.bytes bytes; + expires max; + try_files $uri @fallback; + } + } + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location @fallback { + proxy_pass https://%ip%:%web_ssl_port%; + } + + location ~ /\.ht {return 404;} + location ~ /\.svn/ {return 404;} + location ~ /\.git/ {return 404;} + location ~ /\.hg/ {return 404;} + location ~ /\.bzr/ {return 404;} + + include %home%/%user%/conf/web/snginx.%domain%.conf*; +} + diff --git a/install/ubuntu/15.10/templates/web/nginx/default.tpl b/install/ubuntu/15.10/templates/web/nginx/default.tpl new file mode 100755 index 000000000..4d5c774bc --- /dev/null +++ b/install/ubuntu/15.10/templates/web/nginx/default.tpl @@ -0,0 +1,33 @@ +server { + listen %ip%:%proxy_port%; + server_name %domain_idn% %alias_idn%; + error_log /var/log/%web_system%/domains/%domain%.error.log error; + + location / { + proxy_pass http://%ip%:%web_port%; + location ~* ^.+\.(%proxy_extentions%)$ { + root %docroot%; + access_log /var/log/%web_system%/domains/%domain%.log combined; + access_log /var/log/%web_system%/domains/%domain%.bytes bytes; + expires max; + try_files $uri @fallback; + } + } + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location @fallback { + proxy_pass http://%ip%:%web_port%; + } + + location ~ /\.ht {return 404;} + location ~ /\.svn/ {return 404;} + location ~ /\.git/ {return 404;} + location ~ /\.hg/ {return 404;} + location ~ /\.bzr/ {return 404;} + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} + diff --git a/install/ubuntu/15.10/templates/web/nginx/hosting.sh b/install/ubuntu/15.10/templates/web/nginx/hosting.sh new file mode 100755 index 000000000..eeed37ef9 --- /dev/null +++ b/install/ubuntu/15.10/templates/web/nginx/hosting.sh @@ -0,0 +1,11 @@ +#!/bin/bash +# Changing public_html permission +user="$1" +domain="$2" +ip="$3" +home_dir="$4" +docroot="$5" + +chmod 755 $docroot + +exit 0 diff --git a/install/ubuntu/15.10/templates/web/nginx/hosting.stpl b/install/ubuntu/15.10/templates/web/nginx/hosting.stpl new file mode 100755 index 000000000..d778d6333 --- /dev/null +++ b/install/ubuntu/15.10/templates/web/nginx/hosting.stpl @@ -0,0 +1,38 @@ +server { + listen %ip%:%proxy_ssl_port%; + server_name %domain_idn% %alias_idn%; + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + error_log /var/log/%web_system%/domains/%domain%.error.log error; + + location / { + proxy_pass https://%ip%:%web_ssl_port%; + location ~* ^.+\.(%proxy_extentions%)$ { + root %sdocroot%; + access_log /var/log/%web_system%/domains/%domain%.log combined; + access_log /var/log/%web_system%/domains/%domain%.bytes bytes; + expires max; + try_files $uri @fallback; + } + } + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location @fallback { + proxy_pass https://%ip%:%web_ssl_port%; + } + + location ~ /\.ht {return 404;} + location ~ /\.svn/ {return 404;} + location ~ /\.git/ {return 404;} + location ~ /\.hg/ {return 404;} + location ~ /\.bzr/ {return 404;} + + disable_symlinks if_not_owner from=%docroot%; + + include %home%/%user%/conf/web/snginx.%domain%.conf*; +} + diff --git a/install/ubuntu/15.10/templates/web/nginx/hosting.tpl b/install/ubuntu/15.10/templates/web/nginx/hosting.tpl new file mode 100755 index 000000000..15961c95c --- /dev/null +++ b/install/ubuntu/15.10/templates/web/nginx/hosting.tpl @@ -0,0 +1,35 @@ +server { + listen %ip%:%proxy_port%; + server_name %domain_idn% %alias_idn%; + error_log /var/log/%web_system%/domains/%domain%.error.log error; + + location / { + proxy_pass http://%ip%:%web_port%; + location ~* ^.+\.(%proxy_extentions%)$ { + root %docroot%; + access_log /var/log/%web_system%/domains/%domain%.log combined; + access_log /var/log/%web_system%/domains/%domain%.bytes bytes; + expires max; + try_files $uri @fallback; + } + } + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location @fallback { + proxy_pass http://%ip%:%web_port%; + } + + location ~ /\.ht {return 404;} + location ~ /\.svn/ {return 404;} + location ~ /\.git/ {return 404;} + location ~ /\.hg/ {return 404;} + location ~ /\.bzr/ {return 404;} + + disable_symlinks if_not_owner from=%docroot%; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} + diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/cms_made_simple.stpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/cms_made_simple.stpl new file mode 100644 index 000000000..01d82b603 --- /dev/null +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/cms_made_simple.stpl @@ -0,0 +1,51 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + try_files $uri $uri/ /index.php?page=$request_uri; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/cms_made_simple.tpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/cms_made_simple.tpl new file mode 100644 index 000000000..af452d19f --- /dev/null +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/cms_made_simple.tpl @@ -0,0 +1,47 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + try_files $uri $uri/ /index.php?page=$request_uri; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/codeigniter2.stpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/codeigniter2.stpl new file mode 100644 index 000000000..a592a652d --- /dev/null +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/codeigniter2.stpl @@ -0,0 +1,56 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + try_files $uri $uri/ /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location = /index.php { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME /var/www/html/ci$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + location ~ \.php$ { + return 444; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/codeigniter2.tpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/codeigniter2.tpl new file mode 100644 index 000000000..9b955aa6a --- /dev/null +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/codeigniter2.tpl @@ -0,0 +1,52 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + try_files $uri $uri/ /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location = /index.php { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME /var/www/html/ci$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + location ~ \.php$ { + return 444; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/codeigniter3.stpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/codeigniter3.stpl new file mode 100644 index 000000000..4d330d34f --- /dev/null +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/codeigniter3.stpl @@ -0,0 +1,51 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + try_files $uri $uri/ /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/codeigniter3.tpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/codeigniter3.tpl new file mode 100644 index 000000000..1f446e5d3 --- /dev/null +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/codeigniter3.tpl @@ -0,0 +1,47 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + try_files $uri $uri/ /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/datalife_engine.stpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/datalife_engine.stpl new file mode 100644 index 000000000..d1b5bcd24 --- /dev/null +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/datalife_engine.stpl @@ -0,0 +1,122 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + rewrite "^/page/([0-9]+)(/?)$" /index.php?cstart=$1 last; + + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page,([0-9]+),([0-9]+),(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&cstart=$5&news_name=$6&seourl=$6 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page,([0-9]+),(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&news_name=$5&seourl=$5 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/print:page,([0-9]+),(.*).html(/?)+$" /engine/print.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&news_name=$5&seourl=$5 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_name=$4&seourl=$4 last; + + rewrite "^/([^.]+)/page,([0-9]+),([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$4&news_page=$2&cstart=$3&seourl=$5&seocat=$1 last; + rewrite "^/([^.]+)/page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$3&news_page=$2&seourl=$4&seocat=$1 last; + rewrite "^/([^.]+)/print:page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /engine/print.php?news_page=$2&newsid=$3&seourl=$4&seocat=$1 last; + rewrite "^/([^.]+)/([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$2&seourl=$3&seocat=$1 last; + + rewrite "^/page,([0-9]+),([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$3&news_page=$1&cstart=$2&seourl=$4 last; + rewrite "^/page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$2&news_page=$1&seourl=$3 last; + rewrite "^/print:page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /engine/print.php?news_page=$1&newsid=$2&seourl=$3 last; + rewrite "^/([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$1&seourl=$2 last; + + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})(/?)+$" /index.php?year=$1&month=$2&day=$3 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page/([0-9]+)(/?)+$" /index.php?year=$1&month=$2&day=$3&cstart=$4 last; + + rewrite "^/([0-9]{4})/([0-9]{2})(/?)+$" /index.php?year=$1&month=$2 last; + rewrite "^/([0-9]{4})/([0-9]{2})/page/([0-9]+)(/?)+$" /index.php?year=$1&month=$2&cstart=$3 last; + + rewrite "^/([0-9]{4})(/?)+$" /index.php?year=$1 last; + rewrite "^/([0-9]{4})/page/([0-9]+)(/?)+$" /index.php?year=$1&cstart=$2 last; + + rewrite "^/tags/([^/]*)(/?)+$" /index.php?do=tags&tag=$1 last; + rewrite "^/tags/([^/]*)/page/([0-9]+)(/?)+$" /index.php?do=tags&tag=$1&cstart=$2 last; + + rewrite "^/xfsearch/([^/]*)(/?)+$" /index.php?do=xfsearch&xf=$1 last; + rewrite "^/xfsearch/([^/]*)/page/([0-9]+)(/?)+$" /index.php?do=xfsearch&xf=$1&cstart=$2 last; + + rewrite "^/user/([^/]*)/rss.xml$" /engine/rss.php?subaction=allnews&user=$1 last; + rewrite "^/user/([^/]*)(/?)+$" /index.php?subaction=userinfo&user=$1 last; + rewrite "^/user/([^/]*)/page/([0-9]+)(/?)+$" /index.php?subaction=userinfo&user=$1&cstart=$2 last; + rewrite "^/user/([^/]*)/news(/?)+$" /index.php?subaction=allnews&user=$1 last; + rewrite "^/user/([^/]*)/news/page/([0-9]+)(/?)+$" /index.php?subaction=allnews&user=$1&cstart=$2 last; + rewrite "^/user/([^/]*)/news/rss.xml(/?)+$" /engine/rss.php?subaction=allnews&user=$1 last; + + rewrite "^/lastnews(/?)+$" /index.php?do=lastnews last; + rewrite "^/lastnews/page/([0-9]+)(/?)+$" /index.php?do=lastnews&cstart=$1 last; + + rewrite "^/catalog/([^/]*)/rss.xml$" /engine/rss.php?catalog=$1 last; + rewrite "^/catalog/([^/]*)(/?)+$" /index.php?catalog=$1 last; + rewrite "^/catalog/([^/]*)/page/([0-9]+)(/?)+$" /index.php?catalog=$1&cstart=$2 last; + + rewrite "^/newposts(/?)+$" /index.php?subaction=newposts last; + rewrite "^/newposts/page/([0-9]+)(/?)+$" /index.php?subaction=newposts&cstart=$1 last; + + rewrite "^/favorites(/?)+$" /index.php?do=favorites last; + rewrite "^/favorites/page/([0-9]+)(/?)+$" /index.php?do=favorites&cstart=$1 last; + + rewrite "^/rules.html$" /index.php?do=rules last; + rewrite "^/statistics.html$" /index.php?do=stats last; + rewrite "^/addnews.html$" /index.php?do=addnews last; + rewrite "^/rss.xml$" /engine/rss.php last; + rewrite "^/sitemap.xml$" /uploads/sitemap.xml last; + + if (!-d $request_filename) { + rewrite "^/([^.]+)/page/([0-9]+)(/?)+$" /index.php?do=cat&category=$1&cstart=$2 last; + rewrite "^/([^.]+)/?$" /index.php?do=cat&category=$1 last; + } + + if (!-f $request_filename) { + rewrite "^/([^.]+)/rss.xml$" /engine/rss.php?do=cat&category=$1 last; + rewrite "^/page,([0-9]+),([^/]+).html$" /index.php?do=static&page=$2&news_page=$1 last; + rewrite "^/print:([^/]+).html$" /engine/print.php?do=static&page=$1 last; + } + + if (!-f $request_filename) { + rewrite "^/([^/]+).html$" /index.php?do=static&page=$1 last; + } + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/datalife_engine.tpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/datalife_engine.tpl new file mode 100644 index 000000000..ff33c2325 --- /dev/null +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/datalife_engine.tpl @@ -0,0 +1,118 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + rewrite "^/page/([0-9]+)(/?)$" /index.php?cstart=$1 last; + + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page,([0-9]+),([0-9]+),(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&cstart=$5&news_name=$6&seourl=$6 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page,([0-9]+),(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&news_name=$5&seourl=$5 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/print:page,([0-9]+),(.*).html(/?)+$" /engine/print.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&news_name=$5&seourl=$5 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_name=$4&seourl=$4 last; + + rewrite "^/([^.]+)/page,([0-9]+),([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$4&news_page=$2&cstart=$3&seourl=$5&seocat=$1 last; + rewrite "^/([^.]+)/page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$3&news_page=$2&seourl=$4&seocat=$1 last; + rewrite "^/([^.]+)/print:page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /engine/print.php?news_page=$2&newsid=$3&seourl=$4&seocat=$1 last; + rewrite "^/([^.]+)/([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$2&seourl=$3&seocat=$1 last; + + rewrite "^/page,([0-9]+),([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$3&news_page=$1&cstart=$2&seourl=$4 last; + rewrite "^/page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$2&news_page=$1&seourl=$3 last; + rewrite "^/print:page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /engine/print.php?news_page=$1&newsid=$2&seourl=$3 last; + rewrite "^/([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$1&seourl=$2 last; + + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})(/?)+$" /index.php?year=$1&month=$2&day=$3 last; + rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page/([0-9]+)(/?)+$" /index.php?year=$1&month=$2&day=$3&cstart=$4 last; + + rewrite "^/([0-9]{4})/([0-9]{2})(/?)+$" /index.php?year=$1&month=$2 last; + rewrite "^/([0-9]{4})/([0-9]{2})/page/([0-9]+)(/?)+$" /index.php?year=$1&month=$2&cstart=$3 last; + + rewrite "^/([0-9]{4})(/?)+$" /index.php?year=$1 last; + rewrite "^/([0-9]{4})/page/([0-9]+)(/?)+$" /index.php?year=$1&cstart=$2 last; + + rewrite "^/tags/([^/]*)(/?)+$" /index.php?do=tags&tag=$1 last; + rewrite "^/tags/([^/]*)/page/([0-9]+)(/?)+$" /index.php?do=tags&tag=$1&cstart=$2 last; + + rewrite "^/xfsearch/([^/]*)(/?)+$" /index.php?do=xfsearch&xf=$1 last; + rewrite "^/xfsearch/([^/]*)/page/([0-9]+)(/?)+$" /index.php?do=xfsearch&xf=$1&cstart=$2 last; + + rewrite "^/user/([^/]*)/rss.xml$" /engine/rss.php?subaction=allnews&user=$1 last; + rewrite "^/user/([^/]*)(/?)+$" /index.php?subaction=userinfo&user=$1 last; + rewrite "^/user/([^/]*)/page/([0-9]+)(/?)+$" /index.php?subaction=userinfo&user=$1&cstart=$2 last; + rewrite "^/user/([^/]*)/news(/?)+$" /index.php?subaction=allnews&user=$1 last; + rewrite "^/user/([^/]*)/news/page/([0-9]+)(/?)+$" /index.php?subaction=allnews&user=$1&cstart=$2 last; + rewrite "^/user/([^/]*)/news/rss.xml(/?)+$" /engine/rss.php?subaction=allnews&user=$1 last; + + rewrite "^/lastnews(/?)+$" /index.php?do=lastnews last; + rewrite "^/lastnews/page/([0-9]+)(/?)+$" /index.php?do=lastnews&cstart=$1 last; + + rewrite "^/catalog/([^/]*)/rss.xml$" /engine/rss.php?catalog=$1 last; + rewrite "^/catalog/([^/]*)(/?)+$" /index.php?catalog=$1 last; + rewrite "^/catalog/([^/]*)/page/([0-9]+)(/?)+$" /index.php?catalog=$1&cstart=$2 last; + + rewrite "^/newposts(/?)+$" /index.php?subaction=newposts last; + rewrite "^/newposts/page/([0-9]+)(/?)+$" /index.php?subaction=newposts&cstart=$1 last; + + rewrite "^/favorites(/?)+$" /index.php?do=favorites last; + rewrite "^/favorites/page/([0-9]+)(/?)+$" /index.php?do=favorites&cstart=$1 last; + + rewrite "^/rules.html$" /index.php?do=rules last; + rewrite "^/statistics.html$" /index.php?do=stats last; + rewrite "^/addnews.html$" /index.php?do=addnews last; + rewrite "^/rss.xml$" /engine/rss.php last; + rewrite "^/sitemap.xml$" /uploads/sitemap.xml last; + + if (!-d $request_filename) { + rewrite "^/([^.]+)/page/([0-9]+)(/?)+$" /index.php?do=cat&category=$1&cstart=$2 last; + rewrite "^/([^.]+)/?$" /index.php?do=cat&category=$1 last; + } + + if (!-f $request_filename) { + rewrite "^/([^.]+)/rss.xml$" /engine/rss.php?do=cat&category=$1 last; + rewrite "^/page,([0-9]+),([^/]+).html$" /index.php?do=static&page=$2&news_page=$1 last; + rewrite "^/print:([^/]+).html$" /engine/print.php?do=static&page=$1 last; + } + + if (!-f $request_filename) { + rewrite "^/([^/]+).html$" /index.php?do=static&page=$1 last; + } + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/default.stpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/default.stpl new file mode 100644 index 000000000..a68c99861 --- /dev/null +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/default.stpl @@ -0,0 +1,50 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %sdocroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/snginx.%domain%.conf*; +} diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/default.tpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/default.tpl new file mode 100644 index 000000000..b143e53ba --- /dev/null +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/default.tpl @@ -0,0 +1,46 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/dokuwiki.stpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/dokuwiki.stpl new file mode 100644 index 000000000..27483cd8c --- /dev/null +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/dokuwiki.stpl @@ -0,0 +1,67 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + index doku.php; + try_files $uri $uri/ @dokuwiki; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + location ^~ /lib/ { + expires 30d; + } + + location ^~ /conf/ { return 403; } + location ^~ /data/ { return 403; } + + location @dokuwiki { + rewrite ^/_media/(.*) /lib/exe/fetch.php?media=$1 last; + rewrite ^/_detail/(.*) /lib/exe/detail.php?media=$1 last; + rewrite ^/_export/([^/]+)/(.*) /doku.php?do=export_$1&id=$2 last; + rewrite ^/(.*) /doku.php?id=$1 last; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/dokuwiki.tpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/dokuwiki.tpl new file mode 100644 index 000000000..31647c9ff --- /dev/null +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/dokuwiki.tpl @@ -0,0 +1,62 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + index doku.php; + try_files $uri $uri/ @dokuwiki; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + location ^~ /lib/ { + expires 30d; + } + + location ^~ /conf/ { return 403; } + location ^~ /data/ { return 403; } + location @dokuwiki { + rewrite ^/_media/(.*) /lib/exe/fetch.php?media=$1 last; + rewrite ^/_detail/(.*) /lib/exe/detail.php?media=$1 last; + rewrite ^/_export/([^/]+)/(.*) /doku.php?do=export_$1&id=$2 last; + rewrite ^/(.*) /doku.php?id=$1 last; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/drupal.stpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/drupal.stpl new file mode 100644 index 000000000..9a5484396 --- /dev/null +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/drupal.stpl @@ -0,0 +1,101 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + + location / { + try_files $uri @rewrite; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # You have 2 options here + # For D7 and above: + # Clean URLs are handled in drupal_environment_initialize(). + rewrite ^ /index.php; + + # For Drupal 6 and bwlow: + # Some modules enforce no slash (/) at the end of the URL + # Else this rewrite block wouldn't be needed (GlobalRedirect) + #rewrite ^/(.*)$ /index.php?q=$1; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/drupal.tpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/drupal.tpl new file mode 100644 index 000000000..417762c18 --- /dev/null +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/drupal.tpl @@ -0,0 +1,98 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + # Very rarely should these ever be accessed outside of your lan + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + + location / { + try_files $uri @rewrite; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # You have 2 options here + # For D7 and above: + # Clean URLs are handled in drupal_environment_initialize(). + rewrite ^ /index.php; + + # For Drupal 6 and bwlow: + # Some modules enforce no slash (/) at the end of the URL + # Else this rewrite block wouldn't be needed (GlobalRedirect) + #rewrite ^/(.*)$ /index.php?q=$1; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/joomla.stpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/joomla.stpl new file mode 100644 index 000000000..235a01216 --- /dev/null +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/joomla.stpl @@ -0,0 +1,58 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + try_files $uri $uri/ /index.php?$args; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + # deny running scripts inside writable directories + location ~* /(images|cache|media|logs|tmp)/.*\.(php|pl|py|jsp|asp|sh|cgi)$ { + return 403; + error_page 403 /403_error.html; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/joomla.tpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/joomla.tpl new file mode 100644 index 000000000..997c268de --- /dev/null +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/joomla.tpl @@ -0,0 +1,54 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + try_files $uri $uri/ /index.php?$args; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + # deny running scripts inside writable directories + location ~* /(images|cache|media|logs|tmp)/.*\.(php|pl|py|jsp|asp|sh|cgi)$ { + return 403; + error_page 403 /403_error.html; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/no-php.stpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/no-php.stpl new file mode 100644 index 000000000..a0234ae3a --- /dev/null +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/no-php.stpl @@ -0,0 +1,42 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %sdocroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + types { + text/html html htm shtml php php5; + } + + location / { + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/snginx.%domain%.conf*; +} diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/no-php.tpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/no-php.tpl new file mode 100644 index 000000000..97d045990 --- /dev/null +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/no-php.tpl @@ -0,0 +1,38 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + types { + text/html html htm shtml php php5; + } + + location / { + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/owncloud.stpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/owncloud.stpl new file mode 100644 index 000000000..8311ca43f --- /dev/null +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/owncloud.stpl @@ -0,0 +1,80 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + rewrite ^/caldav(.*)$ /remote.php/caldav$1 redirect; + rewrite ^/carddav(.*)$ /remote.php/carddav$1 redirect; + rewrite ^/webdav(.*)$ /remote.php/webdav$1 redirect; + + error_page 403 = /core/templates/403.php; + error_page 404 = /core/templates/404.php; + + location ~ ^/(?:\.htaccess|data|config|db_structure\.xml|README){ + deny all; + } + + location / { + # The following 2 rules are only needed with webfinger + rewrite ^/.well-known/host-meta /public.php?service=host-meta last; + rewrite ^/.well-known/host-meta.json /public.php?service=host-meta-json last; + rewrite ^/.well-known/carddav /remote.php/carddav/ redirect; + rewrite ^/.well-known/caldav /remote.php/caldav/ redirect; + rewrite ^(/core/doc/[^\/]+/)$ $1/index.html; + try_files $uri $uri/ /index.php; + + location ~ \.php(?:$|/) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param PATH_INFO $fastcgi_path_info; + #fastcgi_param HTTPS on; + fastcgi_pass %backend_lsnr%; + } + } + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + # Some basic cache-control for static files to be sent to the browser + add_header Pragma public; + add_header Cache-Control "public, must-revalidate, proxy-revalidate"; + } + + #error_page 403 /error/404.html; + #error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/owncloud.tpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/owncloud.tpl new file mode 100644 index 000000000..57cac2f85 --- /dev/null +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/owncloud.tpl @@ -0,0 +1,76 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + rewrite ^/caldav(.*)$ /remote.php/caldav$1 redirect; + rewrite ^/carddav(.*)$ /remote.php/carddav$1 redirect; + rewrite ^/webdav(.*)$ /remote.php/webdav$1 redirect; + + error_page 403 = /core/templates/403.php; + error_page 404 = /core/templates/404.php; + + location ~ ^/(?:\.htaccess|data|config|db_structure\.xml|README){ + deny all; + } + + location / { + # The following 2 rules are only needed with webfinger + rewrite ^/.well-known/host-meta /public.php?service=host-meta last; + rewrite ^/.well-known/host-meta.json /public.php?service=host-meta-json last; + rewrite ^/.well-known/carddav /remote.php/carddav/ redirect; + rewrite ^/.well-known/caldav /remote.php/caldav/ redirect; + rewrite ^(/core/doc/[^\/]+/)$ $1/index.html; + try_files $uri $uri/ /index.php; + + location ~ \.php(?:$|/) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param PATH_INFO $fastcgi_path_info; + #fastcgi_param HTTPS on; + fastcgi_pass %backend_lsnr%; + } + } + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + # Some basic cache-control for static files to be sent to the browser + add_header Pragma public; + add_header Cache-Control "public, must-revalidate, proxy-revalidate"; + } + + #error_page 403 /error/404.html; + #error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/piwik.stpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/piwik.stpl new file mode 100644 index 000000000..c53af4011 --- /dev/null +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/piwik.stpl @@ -0,0 +1,68 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location = /favicon.ico { + try_files /favicon.ico =204; + } + + location / { + try_files $uri /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + valid_referers none blocked %domain_idn% %alias_idn%; + if ($invalid_referer) { + return 444; + } + expires max; + } + + location ~* ^/(?:index|piwik)\.php$ { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + include /etc/nginx/fastcgi_params; + } + } + + # Any other attempt to access PHP files returns a 404. + location ~* ^.+\.php$ { + return 404; + } + + # Return a 404 for all text files. + location ~* ^/(?:README|LICENSE[^.]*|LEGALNOTICE)(?:\.txt)*$ { + return 404; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/piwik.tpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/piwik.tpl new file mode 100644 index 000000000..6b4a94a68 --- /dev/null +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/piwik.tpl @@ -0,0 +1,64 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location = /favicon.ico { + try_files /favicon.ico =204; + } + + location / { + try_files $uri /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + valid_referers none blocked %domain_idn% %alias_idn%; + if ($invalid_referer) { + return 444; + } + expires max; + } + + location ~* ^/(?:index|piwik)\.php$ { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + include /etc/nginx/fastcgi_params; + } + } + + # Any other attempt to access PHP files returns a 404. + location ~* ^.+\.php$ { + return 404; + } + + # Return a 404 for all text files. + location ~* ^/(?:README|LICENSE[^.]*|LEGALNOTICE)(?:\.txt)*$ { + return 404; + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/pyrocms.stpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/pyrocms.stpl new file mode 100644 index 000000000..a6fc67556 --- /dev/null +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/pyrocms.stpl @@ -0,0 +1,61 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location /installer { + try_files $uri $uri/ /installer/index.php; + } + + location / { + try_files $uri $uri/ /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + location = /robots.txt { access_log off; log_not_found off; } + location = /favicon.ico { access_log off; log_not_found off; } + location ~ /\. { access_log off; log_not_found off; deny all; } + location ~ ~$ { access_log off; log_not_found off; deny all; } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/pyrocms.tpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/pyrocms.tpl new file mode 100644 index 000000000..68b378efd --- /dev/null +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/pyrocms.tpl @@ -0,0 +1,57 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location /installer { + try_files $uri $uri/ /installer/index.php; + } + + location / { + try_files $uri $uri/ /index.php; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + } + + location = /robots.txt { access_log off; log_not_found off; } + location = /favicon.ico { access_log off; log_not_found off; } + location ~ /\. { access_log off; log_not_found off; deny all; } + location ~ ~$ { access_log off; log_not_found off; deny all; } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/wordpress.stpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/wordpress.stpl new file mode 100644 index 000000000..910c28b69 --- /dev/null +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/wordpress.stpl @@ -0,0 +1,50 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/wordpress.tpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/wordpress.tpl new file mode 100644 index 000000000..b143e53ba --- /dev/null +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/wordpress.tpl @@ -0,0 +1,46 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location / { + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/wordpress2.stpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/wordpress2.stpl new file mode 100644 index 000000000..2822f8754 --- /dev/null +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/wordpress2.stpl @@ -0,0 +1,62 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + location / { + try_files $uri $uri/ /index.php?$args; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/wordpress2.tpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/wordpress2.tpl new file mode 100644 index 000000000..37b8be305 --- /dev/null +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/wordpress2.tpl @@ -0,0 +1,58 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + location / { + try_files $uri $uri/ /index.php?$args; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} diff --git a/install/ubuntu/15.10/templates/web/nginx/proxy_ip.tpl b/install/ubuntu/15.10/templates/web/nginx/proxy_ip.tpl new file mode 100755 index 000000000..ae1956173 --- /dev/null +++ b/install/ubuntu/15.10/templates/web/nginx/proxy_ip.tpl @@ -0,0 +1,9 @@ +server { + listen %ip%:%proxy_port% default; + server_name _; + #access_log /var/log/nginx/%ip%.log main; + location / { + proxy_pass http://%ip%:%web_port%; + } +} + diff --git a/install/ubuntu/15.10/templates/web/php5-fpm/default.tpl b/install/ubuntu/15.10/templates/web/php5-fpm/default.tpl new file mode 100644 index 000000000..44ccf7a42 --- /dev/null +++ b/install/ubuntu/15.10/templates/web/php5-fpm/default.tpl @@ -0,0 +1,18 @@ +[%backend%] +listen = 127.0.0.1:%backend_port% +listen.allowed_clients = 127.0.0.1 + +user = %user% +group = %user% + +pm = dynamic +pm.max_children = 50 +pm.start_servers = 3 +pm.min_spare_servers = 2 +pm.max_spare_servers = 10 + +env[HOSTNAME] = $HOSTNAME +env[PATH] = /usr/local/bin:/usr/bin:/bin +env[TMP] = /tmp +env[TMPDIR] = /tmp +env[TEMP] = /tmp diff --git a/install/ubuntu/15.10/templates/web/php5-fpm/no-php.tpl b/install/ubuntu/15.10/templates/web/php5-fpm/no-php.tpl new file mode 100644 index 000000000..89487d5f5 --- /dev/null +++ b/install/ubuntu/15.10/templates/web/php5-fpm/no-php.tpl @@ -0,0 +1,13 @@ +#[%backend%] +#user = %user% +#group = %user% +#listen = /dev/null + +#listen.owner = %user% +#listen.group = nginx + +#pm = dynamic +#pm.max_children = 50 +#pm.start_servers = 3 +#pm.min_spare_servers = 2 +#pm.max_spare_servers = 10 diff --git a/install/ubuntu/15.10/templates/web/php5-fpm/socket.tpl b/install/ubuntu/15.10/templates/web/php5-fpm/socket.tpl new file mode 100644 index 000000000..f0513da3e --- /dev/null +++ b/install/ubuntu/15.10/templates/web/php5-fpm/socket.tpl @@ -0,0 +1,21 @@ +[%backend%] +listen = /var/run/php5-%backend%.sock +listen.allowed_clients = 127.0.0.1 + +user = %user% +group = %user% + +listen.owner = %user% +listen.group = nginx + +pm = dynamic +pm.max_children = 50 +pm.start_servers = 3 +pm.min_spare_servers = 2 +pm.max_spare_servers = 10 + +env[HOSTNAME] = $HOSTNAME +env[PATH] = /usr/local/bin:/usr/bin:/bin +env[TMP] = /tmp +env[TMPDIR] = /tmp +env[TEMP] = /tmp diff --git a/install/ubuntu/15.10/templates/web/skel/document_errors/403.html b/install/ubuntu/15.10/templates/web/skel/document_errors/403.html new file mode 100755 index 000000000..9c3f6baab --- /dev/null +++ b/install/ubuntu/15.10/templates/web/skel/document_errors/403.html @@ -0,0 +1,29 @@ + + + 403 — Forbidden + + + + + + +

                delete +
                delete +
                - delete + '.__('delete').'
                - delete + '.__('delete').'
                - delete + '.__('delete').'
                - delete + '.__('delete').'
                - delete + '.__('delete').'
                - delete + '.__('delete').'
                - Add one more Name Server +
                @@ -410,4 +410,4 @@ }) }); - \ No newline at end of file + From 955d076f1e0d59753245b9e8901b7a90b59553d7 Mon Sep 17 00:00:00 2001 From: Ionescu Bogdan Date: Fri, 4 Dec 2015 22:54:55 +0200 Subject: [PATCH 241/264] Update edit_package.html --- web/templates/admin/edit_package.html | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/web/templates/admin/edit_package.html b/web/templates/admin/edit_package.html index 6082af056..bbdcba301 100644 --- a/web/templates/admin/edit_package.html +++ b/web/templates/admin/edit_package.html @@ -42,7 +42,7 @@
                		@@ -305,13 +305,13 @@
                delete +
                delete +
                - delete + '.__('delete').'
                - delete + '.__('delete').'
                - delete + '.__('delete').'
                - delete + '.__('delete').'
                - delete + '.__('delete').'
                - delete + '.__('delete').'
                - Add one more Name Server +
                - () + ()
                -
                \ No newline at end of file +
                From 15334cfd93028995f98cca9a220a9d276c5b55e1 Mon Sep 17 00:00:00 2001 From: Caelish Date: Sun, 6 Dec 2015 14:37:55 +0100 Subject: [PATCH 244/264] Fixed typos and made identical to RHEL version of this page --- install/debian/7/templates/web/suspend/index.html | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/install/debian/7/templates/web/suspend/index.html b/install/debian/7/templates/web/suspend/index.html index 9d4fa67b3..f2d04e1f0 100755 --- a/install/debian/7/templates/web/suspend/index.html +++ b/install/debian/7/templates/web/suspend/index.html @@ -1,12 +1,12 @@ - SUSPEND + Website Suspended - + - -

                SUSPEND

                -

                This site has been suspended

                +

                SUSPENDED

                +

                This website has been suspended.

                - Please contact technical support departament. + Please contact the technical support department.
                - From 5812197fc41c5e9892e5823448a5c1ec1e94d53f Mon Sep 17 00:00:00 2001 From: Caelish Date: Sun, 6 Dec 2015 14:39:27 +0100 Subject: [PATCH 245/264] Fixed typos and made identical to RHEL version of this page --- install/debian/8/templates/web/suspend/index.html | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/install/debian/8/templates/web/suspend/index.html b/install/debian/8/templates/web/suspend/index.html index 9d4fa67b3..f2d04e1f0 100755 --- a/install/debian/8/templates/web/suspend/index.html +++ b/install/debian/8/templates/web/suspend/index.html @@ -1,12 +1,12 @@ - SUSPEND + Website Suspended - + - -

                SUSPEND

                -

                This site has been suspended

                +

                SUSPENDED

                +

                This website has been suspended.

                - Please contact technical support departament. + Please contact the technical support department.
                - From 2afc4eb4158565a4cb035cd4dd5a60ef8decf6be Mon Sep 17 00:00:00 2001 From: Caelish Date: Sun, 6 Dec 2015 14:40:52 +0100 Subject: [PATCH 246/264] Fixed typos and made identical to RHEL version of this page --- .../ubuntu/12.04/templates/web/suspend/index.html | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/install/ubuntu/12.04/templates/web/suspend/index.html b/install/ubuntu/12.04/templates/web/suspend/index.html index 9d4fa67b3..f2d04e1f0 100755 --- a/install/ubuntu/12.04/templates/web/suspend/index.html +++ b/install/ubuntu/12.04/templates/web/suspend/index.html @@ -1,12 +1,12 @@ - SUSPEND + Website Suspended - + - -

                SUSPEND

                -

                This site has been suspended

                +

                SUSPENDED

                +

                This website has been suspended.

                - Please contact technical support departament. + Please contact the technical support department.
                - From 40b06eba8e3b778ec54b1493d8aa81e88d4bcd3d Mon Sep 17 00:00:00 2001 From: Caelish Date: Sun, 6 Dec 2015 14:42:00 +0100 Subject: [PATCH 247/264] Fixed typos and made identical to RHEL version of this page --- .../ubuntu/12.10/templates/web/suspend/index.html | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/install/ubuntu/12.10/templates/web/suspend/index.html b/install/ubuntu/12.10/templates/web/suspend/index.html index 9d4fa67b3..f2d04e1f0 100755 --- a/install/ubuntu/12.10/templates/web/suspend/index.html +++ b/install/ubuntu/12.10/templates/web/suspend/index.html @@ -1,12 +1,12 @@ - SUSPEND + Website Suspended - + - -

                SUSPEND

                -

                This site has been suspended

                +

                SUSPENDED

                +

                This website has been suspended.

                - Please contact technical support departament. + Please contact the technical support department.
                - From d6b1a07ab2e54a79095339f5e3819e7aaebaeed3 Mon Sep 17 00:00:00 2001 From: Caelish Date: Sun, 6 Dec 2015 14:42:41 +0100 Subject: [PATCH 248/264] Fixed typos and made identical to RHEL version of this page --- .../ubuntu/13.04/templates/web/suspend/index.html | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/install/ubuntu/13.04/templates/web/suspend/index.html b/install/ubuntu/13.04/templates/web/suspend/index.html index 9d4fa67b3..f2d04e1f0 100755 --- a/install/ubuntu/13.04/templates/web/suspend/index.html +++ b/install/ubuntu/13.04/templates/web/suspend/index.html @@ -1,12 +1,12 @@ - SUSPEND + Website Suspended - + - -

                SUSPEND

                -

                This site has been suspended

                +

                SUSPENDED

                +

                This website has been suspended.

                - Please contact technical support departament. + Please contact the technical support department.
                - From 2739fcd6f1ee058d814028c9cc35ccafbbfc0ec8 Mon Sep 17 00:00:00 2001 From: Caelish Date: Sun, 6 Dec 2015 14:43:26 +0100 Subject: [PATCH 249/264] Fixed typos and made identical to RHEL version of this page --- .../ubuntu/13.10/templates/web/suspend/index.html | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/install/ubuntu/13.10/templates/web/suspend/index.html b/install/ubuntu/13.10/templates/web/suspend/index.html index 9d4fa67b3..f2d04e1f0 100755 --- a/install/ubuntu/13.10/templates/web/suspend/index.html +++ b/install/ubuntu/13.10/templates/web/suspend/index.html @@ -1,12 +1,12 @@ - SUSPEND + Website Suspended - + - -

                SUSPEND

                -

                This site has been suspended

                +

                SUSPENDED

                +

                This website has been suspended.

                - Please contact technical support departament. + Please contact the technical support department.
                - From b8dee0e593e349b0836046c779a350a3f7e79ed1 Mon Sep 17 00:00:00 2001 From: Caelish Date: Sun, 6 Dec 2015 14:43:58 +0100 Subject: [PATCH 250/264] Fixed typos and made identical to RHEL version of this page --- .../ubuntu/14.04/templates/web/suspend/index.html | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/install/ubuntu/14.04/templates/web/suspend/index.html b/install/ubuntu/14.04/templates/web/suspend/index.html index 9d4fa67b3..f2d04e1f0 100755 --- a/install/ubuntu/14.04/templates/web/suspend/index.html +++ b/install/ubuntu/14.04/templates/web/suspend/index.html @@ -1,12 +1,12 @@ - SUSPEND + Website Suspended - + - -

                SUSPEND

                -

                This site has been suspended

                +

                SUSPENDED

                +

                This website has been suspended.

                - Please contact technical support departament. + Please contact the technical support department.
                - From 1330680a3b87a7234b7ef00f30c3194df3509469 Mon Sep 17 00:00:00 2001 From: Caelish Date: Sun, 6 Dec 2015 14:44:21 +0100 Subject: [PATCH 251/264] Fixed typos and made identical to RHEL version of this page --- .../ubuntu/14.10/templates/web/suspend/index.html | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/install/ubuntu/14.10/templates/web/suspend/index.html b/install/ubuntu/14.10/templates/web/suspend/index.html index 9d4fa67b3..f2d04e1f0 100755 --- a/install/ubuntu/14.10/templates/web/suspend/index.html +++ b/install/ubuntu/14.10/templates/web/suspend/index.html @@ -1,12 +1,12 @@ - SUSPEND + Website Suspended - + - -

                SUSPEND

                -

                This site has been suspended

                +

                SUSPENDED

                +

                This website has been suspended.

                - Please contact technical support departament. + Please contact the technical support department.
                - From ff7d2b04e9c19fb923e4abdd03a9dd365a62939b Mon Sep 17 00:00:00 2001 From: Caelish Date: Sun, 6 Dec 2015 14:44:46 +0100 Subject: [PATCH 252/264] Fixed typos and made identical to RHEL version of this page --- .../ubuntu/15.04/templates/web/suspend/index.html | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/install/ubuntu/15.04/templates/web/suspend/index.html b/install/ubuntu/15.04/templates/web/suspend/index.html index 9d4fa67b3..f2d04e1f0 100755 --- a/install/ubuntu/15.04/templates/web/suspend/index.html +++ b/install/ubuntu/15.04/templates/web/suspend/index.html @@ -1,12 +1,12 @@ - SUSPEND + Website Suspended - + - -

                SUSPEND

                -

                This site has been suspended

                +

                SUSPENDED

                +

                This website has been suspended.

                - Please contact technical support departament. + Please contact the technical support department.
                - From 9ccbf28203bc299ffe1a407e2996217a2dec7577 Mon Sep 17 00:00:00 2001 From: Caelish Date: Sun, 6 Dec 2015 14:45:07 +0100 Subject: [PATCH 253/264] Fixed typos and made identical to RHEL version of this page --- .../ubuntu/15.10/templates/web/suspend/index.html | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/install/ubuntu/15.10/templates/web/suspend/index.html b/install/ubuntu/15.10/templates/web/suspend/index.html index 9d4fa67b3..f2d04e1f0 100755 --- a/install/ubuntu/15.10/templates/web/suspend/index.html +++ b/install/ubuntu/15.10/templates/web/suspend/index.html @@ -1,12 +1,12 @@ - SUSPEND + Website Suspended - + - -

                SUSPEND

                -

                This site has been suspended

                +

                SUSPENDED

                +

                This website has been suspended.

                - Please contact technical support departament. + Please contact the technical support department.
                - From 5ce656f549a06c391df2c32567506b4458525237 Mon Sep 17 00:00:00 2001 From: Sascha Brendel Date: Mon, 7 Dec 2015 09:08:27 +0100 Subject: [PATCH 254/264] Fixed License link --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1dc7f1fac..456e89ae9 100644 --- a/README.md +++ b/README.md @@ -31,5 +31,5 @@ bash vst-install.sh License ---------------------------- -Vesta is licensed under [GPL v3 ](https://github.com/serghey-rodin/vesta/blob/master/LICENSE.txt) license +Vesta is licensed under [GPL v3 ](https://github.com/serghey-rodin/vesta/blob/master/LICENSE) license From 73f0b69372e3e588353bdde7c7293edcf71b0640 Mon Sep 17 00:00:00 2001 From: Ionescu Bogdan Date: Tue, 8 Dec 2015 02:49:59 +0200 Subject: [PATCH 255/264] Update v-list-web-templates 1. Custom web template whith dot: - php-5.5-fcgid - php-5.6-fcgid ... 2. natural sort of numbers within text --- bin/v-list-web-templates | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/v-list-web-templates b/bin/v-list-web-templates index e4e472f17..0072fea6c 100755 --- a/bin/v-list-web-templates +++ b/bin/v-list-web-templates @@ -18,8 +18,8 @@ source $VESTA/conf/vesta.conf # Json function json_list_wtpl() { - templates=$(ls -t $WEBTPL/$WEB_SYSTEM/$WEB_BACKEND/) - templates=$(echo "$templates" | grep "\.tpl" |cut -f 1 -d '.' ) + templates=$(ls -v $WEBTPL/$WEB_SYSTEM/$WEB_BACKEND/) + templates=$(echo "$templates" | grep '\.tpl' | sed 's/\.tpl$//') t_counter=$(echo "$templates" | wc -w) i=1 echo '[' @@ -36,8 +36,8 @@ json_list_wtpl() { # Shell function shell_list_wtpl() { - templates=$(ls -t $WEBTPL/$WEB_SYSTEM/$WEB_BACKEND/) - templates=$(echo "$templates" | grep "\.tpl" |cut -f 1 -d '.' ) + templates=$(ls -v $WEBTPL/$WEB_SYSTEM/$WEB_BACKEND/) + templates=$(echo "$templates" | grep '\.tpl' | sed 's/\.tpl$//') if [ -z "$nohead" ]; then echo "Templates" echo "----------" From 0b48a049ebf2a7dc87b643a5d4b0d91f035be045 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Fri, 11 Dec 2015 18:58:20 +0200 Subject: [PATCH 256/264] keboard navigation support --- web/css/styles.min.css | 103 +++++++++- web/images/sprite.png | Bin 50443 -> 60967 bytes web/images/vesta_logo.png | Bin 5162 -> 5162 bytes web/inc/main.php | 5 + web/js/events.js | 166 +++++++++------ web/templates/admin/add_dns_rec.html | 1 + web/templates/admin/add_mail_acc.html | 1 + web/templates/admin/list_backup.html | 9 +- web/templates/admin/list_backup_detail.html | 21 +- .../admin/list_backup_exclusions.html | 10 + web/templates/admin/list_cron.html | 8 +- web/templates/admin/list_db.html | 8 +- web/templates/admin/list_dns.html | 12 +- web/templates/admin/list_dns_rec.html | 12 +- web/templates/admin/list_firewall.html | 8 +- .../admin/list_firewall_banlist.html | 6 +- web/templates/admin/list_ip.html | 5 +- web/templates/admin/list_mail.html | 12 +- web/templates/admin/list_mail_acc.html | 13 +- web/templates/admin/list_packages.html | 5 +- web/templates/admin/list_search.html | 14 +- web/templates/admin/list_services.html | 6 +- web/templates/admin/list_updates.html | 2 +- web/templates/admin/list_user.html | 12 +- web/templates/admin/list_web.html | 12 +- web/templates/footer.html | 190 ++++++++++++++---- web/templates/user/list_cron.html | 6 +- web/templates/user/list_db.html | 5 +- web/templates/user/list_dns.html | 9 +- web/templates/user/list_dns_rec.html | 10 +- web/templates/user/list_mail.html | 9 +- web/templates/user/list_mail_acc.html | 10 +- web/templates/user/list_search.html | 11 +- web/templates/user/list_user.html | 9 +- web/templates/user/list_web.html | 9 +- 35 files changed, 515 insertions(+), 204 deletions(-) diff --git a/web/css/styles.min.css b/web/css/styles.min.css index c1eddecef..3dae45c82 100644 --- a/web/css/styles.min.css +++ b/web/css/styles.min.css @@ -658,12 +658,14 @@ input[type="checkbox"] { .l-logo { background-image: url("/images/sprite.png?1446554103"); background-position: -117px -7px; +/* background-position: -125px -478px; */ background-repeat: no-repeat; display: inline-block; float: left; height: 22px; margin-top: 4px; width: 73px; +/* width: 42px; */ margin-left: -2px; } @@ -716,6 +718,11 @@ input[type="checkbox"] { text-decoration: underline; color: #5edad0; } +.l-menu.active .l-menu__item.focus a:hover { + background-color: #f79b44; + color: #fff; +} + .lang-ua .l-menu__item a, .lang-nl .l-menu__item a, @@ -1281,13 +1288,25 @@ div.l-content > div.l-separator:nth-of-type(4) { } .units .l-unit { border-bottom: 1px solid #ddd; + border-left: 2px solid #fff; } +.units .l-unit.l-unit--starred { + border-left: 2px solid #ff6701; +} +.units.active .l-unit.focus { + border-left: 2px solid #5edad0; +} +.units.active .l-unit.focus .l-unit__name { + color: #36b3a9; +} +.units.active .l-unit.focus .l-unit-toolbar__col--right { + display: block; +} + .units > div:last-child { border-bottom: none; } - - .l-unit-ftl { color: #929292; padding: 0 0 0 15px; @@ -1296,10 +1315,6 @@ div.l-content > div.l-separator:nth-of-type(4) { .l-unit:hover .l-unit-toolbar__col--right { display: block; } -.l-unit--starred { - border-left: 2px solid #ff6701; - padding-left: 13px; -} .l-unit--blue { border-left: 2px solid #55c9c0; } @@ -1370,8 +1385,9 @@ div.l-content > div.l-separator:nth-of-type(4) { background-color: #d1eddc; } .l-unit-toolbar{ - height: 38px; + height: 39px; } + .l-unit label { margin-bottom: 20px; } @@ -1382,6 +1398,7 @@ div.l-content > div.l-separator:nth-of-type(4) { .l-unit__col { display: table-cell; padding-top: 1px; + vertical-align: top; } .l-unit__col--left { width: 124px; @@ -1395,6 +1412,14 @@ div.l-content > div.l-separator:nth-of-type(4) { padding-left: 30px; } +.l-unit__col--right.total { + padding-left: 16px; +} + +.l-unit__col--right.back { + padding-left: 78px +} + .l-sort-toolbar .step-left { padding-left: 40px; } @@ -1405,7 +1430,7 @@ div.l-content > div.l-separator:nth-of-type(4) { .l-unit__date { font-size: 12px; letter-spacing: 1px; - margin-top: -13px; + margin-top: 10px; padding-bottom: 30px; } @@ -1566,6 +1591,41 @@ div.l-content > div.l-separator:nth-of-type(4) { display: none; } +.l-unit-toolbar .shortcut { + display: none; +} + +.units.active .l-unit.focus .l-unit-toolbar .shortcut { + display: block; + background-color: #c8c7c6; + border-radius: 13px; + color: #fff; + cursor: pointer; + display: block; + font-size: 12px; + font-weight: 700; + line-height: 25px; + padding-left: 7px; + padding-right: 9px; + position: absolute; + right: 3px; + top: 3px; +} +.units.active .l-unit.focus .l-unit-toolbar .shortcut.delete { + font-size: 10px; + padding-left: 2px; + padding-right: 5px; + text-transform: capitalize; +} +.units.active .l-unit.focus .l-unit-toolbar .shortcut.enter { + font-size: 17px; + padding-left: 1px; + padding-right: 7px; +} +.units.active .l-unit.focus .l-unit-toolbar i { + background: none; +} + .l-unit__stat-col.volume { font-size: 12px; line-height: 17px; @@ -2609,6 +2669,26 @@ td.hint { border: 1px solid #D1D70D; background-color: #D1D70D; } + +.ui-dialog button.cancel { + color: #000; + border: 1px solid #555; + background-color: #555; +} +/* +.ui-dialog button.cancel:hover { + color: #fff; + border: 1px solid #999; + background-color: #999; +} +.ui-dialog button.cancel:active { + border: 1px solid #D1D70D; + background-color: #D1D70D; +} +*/ + + + .ui-button span { color: #fff; } @@ -2628,6 +2708,9 @@ td.hint { color: #fff; } +.ui-dialog button.cancel span { + color: #ccc; +} .unlim-trigger { @@ -3045,4 +3128,6 @@ form#vstobjects.suspended { font-size: 12px; } - +.ui-dialog .ui-dialog-content { + padding: 10px 26px 30px !important; +} diff --git a/web/images/sprite.png b/web/images/sprite.png index 05535f56a1f09a88d4cb2cd386d1518aae826456..4a3aeffcbf19013fb8789b6a92c05eb3d6d3fa6a 100644 GIT binary patch literal 60967 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 k>#UPE_5LqTGU({=-0+jZW!1P;45=9%ze*gdg diff --git a/web/images/vesta_logo.png b/web/images/vesta_logo.png index 2e4793bb8f090dff1932a10eaf06dc45fe822476..35eeea85f701a47c9092c0ee2f3f1a698fc64edd 100644 GIT binary patch delta 20 ccmZ3bu}Wh?5GS_~kAe!*!^s{Sqt6Qi0760rsQ>@~ delta 20 ccmZ3bu}Wh?5GRWupNZuijU!VxMxPf307u>jYXATM diff --git a/web/inc/main.php b/web/inc/main.php index 68fbe272a..738c811d6 100644 --- a/web/inc/main.php +++ b/web/inc/main.php @@ -286,6 +286,11 @@ function display_error_block() { Ok: function() { $( this ).dialog( "close" ); } + }, + create:function () { + $(this).closest(".ui-dialog") + .find(".ui-button:first") + .addClass("submit"); } }); }); diff --git a/web/js/events.js b/web/js/events.js index c038e8fdd..405933128 100644 --- a/web/js/events.js +++ b/web/js/events.js @@ -108,10 +108,12 @@ VE.callbacks.click.do_delete = function(evt, elm) { * @param custom_config Custom configuration parameters passed to dialog initialization (optional) */ VE.helpers.createConfirmationDialog = function(elm, dialog_title, confirmed_location_url, custom_config) { + var custom_config = !custom_config ? {} : custom_config; var config = { modal: true, - autoOpen: true, + //autoOpen: true, + resizable: false, width: 360, title: dialog_title, close: function() { @@ -121,15 +123,27 @@ VE.helpers.createConfirmationDialog = function(elm, dialog_title, confirmed_loca "OK": function(event, ui) { location.href = confirmed_location_url; }, - "Cancel": function() { + Cancel: function() { $(this).dialog("close"); - $(this).dialog("destroy"); } + }, + create:function () { + $(this).closest(".ui-dialog") + .find(".ui-button:first") + .addClass("submit"); + $(this).closest(".ui-dialog") + .find(".ui-button") + .eq(1) // the first button + .addClass("cancel"); } } + + + var reference_copied = $(elm[0]).clone(); + console.log(reference_copied); config = $.extend(config, custom_config); - var reference_copied = $(elm).clone(); $(reference_copied).dialog(config); + } /* @@ -141,7 +155,7 @@ VE.helpers.warn = function(msg) { VE.helpers.extendPasswordFields = function() { var references = ['.password']; - + $(document).ready(function() { $(references).each(function(i, ref) { VE.helpers.initAdditionalPasswordFieldElements(ref); @@ -234,70 +248,30 @@ VE.helpers.refresh_timer = { } VE.navigation.enter_focused = function() { - if($(VE.navigation.state.menu_selector + '.focus a').attr('href')){ - location.href=($(VE.navigation.state.menu_selector + '.focus a').attr('href')); - } -} - -/* -VE.navigation.move_focus_left = function(){ - var index = parseInt($(VE.navigation.state.menu_selector).index($(VE.navigation.state.menu_selector+'.focus'))); - if(index == -1) - index = parseInt($(VE.navigation.state.menu_selector).index($(VE.navigation.state.menu_active_selector))); - if(index > 0){ - $(VE.navigation.state.menu_selector).removeClass('focus'); - $($(VE.navigation.state.menu_selector)[index-1]).addClass('focus'); + if($('.units').hasClass('active')){ + location.href=($('.units.active .l-unit.focus .actions-panel__col.actions-panel__edit a').attr('href')); } else { - $($(VE.navigation.state.menu_selector)[0]).addClass('focus'); - } - - -} - -VE.navigation.move_focus_right = function(){ - var max_index = $(VE.navigation.state.menu_selector).length-1; - var index = parseInt($(VE.navigation.state.menu_selector).index($(VE.navigation.state.menu_selector+'.focus'))); - if(index == -1) - index = parseInt($(VE.navigation.state.menu_selector).index($(VE.navigation.state.menu_active_selector))) || 0; - - if(index < max_index){ - $(VE.navigation.state.menu_selector).removeClass('focus'); - $($(VE.navigation.state.menu_selector)[index+1]).addClass('focus'); + if($(VE.navigation.state.menu_selector + '.focus a').attr('href')){ + location.href=($(VE.navigation.state.menu_selector + '.focus a').attr('href')); + } } } -VE.navigation.switch_menu = function(){ - if(VE.navigation.state.active_menu == 0){ - VE.navigation.state.active_menu = 1; - VE.navigation.state.menu_selector = '.l-stat__col'; - VE.navigation.state.menu_active_selector = '.l-stat__col--active'; - $('.l-menu').removeClass('active'); - $('.l-stat').addClass('active'); - } else { - VE.navigation.state.active_menu = 0; - VE.navigation.state.menu_selector = '.l-menu__item'; - VE.navigation.state.menu_active_selector = '.l-menu__item--active'; - $('.l-menu').addClass('active'); - $('.l-stat').removeClass('active'); - } - - - var index = parseInt($(VE.navigation.state.menu_selector).index($(VE.navigation.state.menu_selector+'.focus'))); - if(index == -1){ - index = parseInt($(VE.navigation.state.menu_selector).index($(VE.navigation.state.menu_active_selector))) || 0; - if(index == -1) - index = 0; - $($(VE.navigation.state.menu_selector)[index]).addClass('focus'); - } -} -*/ - - VE.navigation.move_focus_left = function(){ var index = parseInt($(VE.navigation.state.menu_selector).index($(VE.navigation.state.menu_selector+'.focus'))); if(index == -1) index = parseInt($(VE.navigation.state.menu_selector).index($(VE.navigation.state.menu_active_selector))); + if($('.units').hasClass('active')){ + $('.units').removeClass('active'); + if(VE.navigation.state.active_menu == 0){ + $('.l-menu').addClass('active'); + } else { + $('.l-stat').addClass('active'); + } + index++; + } + $(VE.navigation.state.menu_selector).removeClass('focus'); if(index > 0){ @@ -312,9 +286,18 @@ VE.navigation.move_focus_right = function(){ var index = parseInt($(VE.navigation.state.menu_selector).index($(VE.navigation.state.menu_selector+'.focus'))); if(index == -1) index = parseInt($(VE.navigation.state.menu_selector).index($(VE.navigation.state.menu_active_selector))) || 0; - $(VE.navigation.state.menu_selector).removeClass('focus'); + if($('.units').hasClass('active')){ + $('.units').removeClass('active'); + if(VE.navigation.state.active_menu == 0){ + $('.l-menu').addClass('active'); + } else { + $('.l-stat').addClass('active'); + } + index--; + } + if(index < max_index){ $($(VE.navigation.state.menu_selector)[index+1]).addClass('focus'); } else { @@ -322,6 +305,53 @@ VE.navigation.move_focus_right = function(){ } } +VE.navigation.move_focus_down = function(){ + var max_index = $('.units .l-unit:not(.header)').length-1; + var index = parseInt($('.units .l-unit').index($('.units .l-unit.focus'))); + + if($('.l-menu').hasClass('active') || $('.l-stat').hasClass('active')){ + $('.l-menu').removeClass('active'); + $('.l-stat').removeClass('active'); + $('.units').addClass('active'); + index--; + + if(index == -2) + index = -1; + } + + if(index < max_index){ + $('.units .l-unit.focus').removeClass('focus'); + $($('.units .l-unit:not(.header)')[index+1]).addClass('focus'); + + $('html, body').animate({ + scrollTop: $('.units .l-unit.focus').offset().top - 200 + }, 80); + } +} + +VE.navigation.move_focus_up = function(){ + var index = parseInt($('.units .l-unit:not(.header)').index($('.units .l-unit.focus'))); + + if(index == -1) + index = 0; + + if($('.l-menu').hasClass('active') || $('.l-stat').hasClass('active')){ + $('.l-menu').removeClass('active'); + $('.l-stat').removeClass('active'); + $('.units').addClass('active'); + index++; + } + + if(index > 0){ + $('.units .l-unit.focus').removeClass('focus'); + $($('.units .l-unit:not(.header)')[index-1]).addClass('focus'); + + $('html, body').animate({ + scrollTop: $('.units .l-unit.focus').offset().top - 200 + }, 80); + } +} + VE.navigation.switch_menu = function(position){ position = position || 'first'; // last @@ -405,8 +435,6 @@ VE.notifications.mark_seen = function(id){ } - - VE.navigation.init = function(){ if($('.l-menu__item.l-menu__item--active').length){ // VE.navigation.switch_menu(); @@ -420,6 +448,18 @@ VE.navigation.init = function(){ } } +VE.navigation.shortcut = function(elm){ + var action = elm.attr('key-action'); + + if(action == 'js'){ + var e = elm.find('.data-controls'); + VE.core.dispatch(true, e, 'click'); + } + if(action == 'href') { + location.href=elm.find('a').attr('href'); + } +} + VE.helpers.extendPasswordFields(); diff --git a/web/templates/admin/add_dns_rec.html b/web/templates/admin/add_dns_rec.html index af1050418..76964b4c1 100644 --- a/web/templates/admin/add_dns_rec.html +++ b/web/templates/admin/add_dns_rec.html @@ -31,6 +31,7 @@ ?>
                +
                diff --git a/web/templates/admin/add_mail_acc.html b/web/templates/admin/add_mail_acc.html index 9b68b403a..2dd8c78d9 100644 --- a/web/templates/admin/add_mail_acc.html +++ b/web/templates/admin/add_mail_acc.html @@ -31,6 +31,7 @@ ?> +