diff --git a/web/templates/header.html b/web/templates/header.html
index 37905032..7f317f94 100644
--- a/web/templates/header.html
+++ b/web/templates/header.html
@@ -4,7 +4,7 @@
myVesta - <?=__($TAB)?>
-
+
diff --git a/web/upload/UploadHandler.php b/web/upload/UploadHandler.php
index ce8863bb..48f40b23 100755
--- a/web/upload/UploadHandler.php
+++ b/web/upload/UploadHandler.php
@@ -1096,7 +1096,7 @@ class UploadHandler
}
if (count($failed_versions)) {
$file->error = $this->get_error_message('image_resize')
- .' ('.implode(', ', $failed_versions).')';
+ .' ('.implode($failed_versions,', ').')';
}
// Free memory:
$this->destroy_image_object($file_path);
{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'] = 'elastic'; - -// 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/debian/13/roundcube/vesta.php b/install/debian/13/roundcube/vesta.php deleted file mode 100644 index b3dd167f..00000000 --- a/install/debian/13/roundcube/vesta.php +++ /dev/null @@ -1,73 +0,0 @@ - - */ -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); - $errno = ""; - $errstr = ""; - $context = stream_context_create(); - - $result = stream_context_set_option($context, 'ssl', 'verify_peer', false); - $result = stream_context_set_option($context, 'ssl', 'verify_peer_name', false); - $result = stream_context_set_option($context, 'ssl', 'verify_host', false); - $result = stream_context_set_option($context, 'ssl', 'allow_self_signed', true); - - $fp = stream_socket_client('ssl://' . $vesta_host . ':'.$vesta_port, $errno, $errstr, 60, STREAM_CLIENT_CONNECT, $context); - 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/debian/13/sudo/admin b/install/debian/13/sudo/admin deleted file mode 100644 index 331fa1f2..00000000 --- a/install/debian/13/sudo/admin +++ /dev/null @@ -1,8 +0,0 @@ -# Created by vesta installer -Defaults env_keep="VESTA" -Defaults:admin !syslog -Defaults:admin !requiretty -Defaults:root !requiretty - -# sudo is limited to vesta scripts -admin ALL=NOPASSWD:/usr/local/vesta/bin/* diff --git a/install/debian/13/templates/dns/child-ns.tpl b/install/debian/13/templates/dns/child-ns.tpl deleted file mode 100644 index 42c046e4..00000000 --- a/install/debian/13/templates/dns/child-ns.tpl +++ /dev/null @@ -1,14 +0,0 @@ -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='www' 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='mail' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='9' RECORD='smtp' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='10' RECORD='pop' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='11' RECORD='imap' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='12' RECORD='@' TYPE='MX' PRIORITY='10' VALUE='mail.%domain%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='13' RECORD='@' TYPE='TXT' PRIORITY='' VALUE='"v=spf1 a mx ip4:%ip% ~all"' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='14' RECORD='_dmarc' TYPE='TXT' PRIORITY='' VALUE='"v=DMARC1; p=none"' SUSPENDED='no' TIME='%time%' DATE='%date%' diff --git a/install/debian/13/templates/dns/default.tpl b/install/debian/13/templates/dns/default.tpl deleted file mode 100644 index e0a37e62..00000000 --- a/install/debian/13/templates/dns/default.tpl +++ /dev/null @@ -1,18 +0,0 @@ -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='www' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='11' RECORD='ftp' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='12' RECORD='mail' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='13' RECORD='smtp' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='14' RECORD='pop' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='15' RECORD='imap' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='16' RECORD='@' TYPE='MX' PRIORITY='10' VALUE='mail.%domain%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='17' RECORD='@' TYPE='TXT' PRIORITY='' VALUE='"v=spf1 a mx ip4:%ip% ~all"' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='18' RECORD='_dmarc' TYPE='TXT' PRIORITY='' VALUE='"v=DMARC1; p=none"' SUSPENDED='no' TIME='%time%' DATE='%date%' diff --git a/install/debian/13/templates/dns/gmail.tpl b/install/debian/13/templates/dns/gmail.tpl deleted file mode 100644 index 219c9d24..00000000 --- a/install/debian/13/templates/dns/gmail.tpl +++ /dev/null @@ -1,12 +0,0 @@ -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='www' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='7' RECORD='@' TYPE='MX' PRIORITY='1' VALUE='ASPMX.L.GOOGLE.COM.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='8' RECORD='@' TYPE='MX' PRIORITY='5' VALUE='ALT1.ASPMX.L.GOOGLE.COM.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='9' RECORD='@' TYPE='MX' PRIORITY='5' VALUE='ALT2.ASPMX.L.GOOGLE.COM.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='10' RECORD='@' TYPE='MX' PRIORITY='10' VALUE='ALT3.ASPMX.L.GOOGLE.COM.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='11' RECORD='@' TYPE='MX' PRIORITY='10' VALUE='ALT4.ASPMX.L.GOOGLE.COM.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='12' RECORD='@' TYPE='TXT' PRIORITY='' VALUE='"v=spf1 a mx ip4:%ip% include:_spf.google.com ~all"' SUSPENDED='no' TIME='%time%' DATE='%date%' diff --git a/install/debian/13/templates/dns/office365.tpl b/install/debian/13/templates/dns/office365.tpl deleted file mode 100644 index dcf556e1..00000000 --- a/install/debian/13/templates/dns/office365.tpl +++ /dev/null @@ -1,22 +0,0 @@ -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='www' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='11' RECORD='ftp' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='12' RECORD='@' TYPE='TXT' PRIORITY='' VALUE='"v=spf1 a mx ip4:%ip% include:spf.protection.outlook.com -all"' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='13' RECORD='_dmarc' TYPE='TXT' PRIORITY='' VALUE='"v=DMARC1; p=none"' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='14' RECORD='@' TYPE='MX' PRIORITY='0' VALUE='XXXXXXX.mail.protection.outlook.com.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='15' RECORD='@' TYPE='TXT' PRIORITY='' VALUE='"MS=msXXXX"' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='16' RECORD='autodiscover' TYPE='CNAME' PRIORITY='' VALUE='autodiscover.outlook.com.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='17' RECORD='sip' TYPE='CNAME' PRIORITY='' VALUE='sipdir.online.lync.com.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='18' RECORD='lyncdiscover' TYPE='CNAME' PRIORITY='' VALUE='webdir.online.lync.com.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='19' RECORD='enterpriseregistration' TYPE='CNAME' PRIORITY='' VALUE='enterpriseregistration.windows.net.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='20' RECORD='enterpriseenrollment' TYPE='CNAME' PRIORITY='' VALUE='enterpriseenrollment.manage.microsoft.com.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='21' RECORD='_sip._tls' TYPE='SRV' PRIORITY='100 1 443' VALUE='sipdir.online.lync.com.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='22' RECORD='_sipfederationtls._tcp' TYPE='SRV' PRIORITY='100 1 5061' VALUE='sipfed.online.lync.com.' SUSPENDED='no' TIME='%time%' DATE='%date%' diff --git a/install/debian/13/templates/dns/yandex.tpl b/install/debian/13/templates/dns/yandex.tpl deleted file mode 100644 index 4ce768fe..00000000 --- a/install/debian/13/templates/dns/yandex.tpl +++ /dev/null @@ -1,16 +0,0 @@ -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='www' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='11' RECORD='ftp' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='12' RECORD='mail' TYPE='CNAME' PRIORITY='' VALUE='domain.mail.yandex.net.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='13' RECORD='@' TYPE='MX' PRIORITY='10' VALUE='mx.yandex.net.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='14' RECORD='@' TYPE='TXT' PRIORITY='' VALUE='"v=spf1 a mx ip4:%ip% include:_spf.yandex.net ~all"' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='15' RECORD='_dmarc' TYPE='TXT' PRIORITY='' VALUE='"v=DMARC1; p=none"' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='16' RECORD='@' TYPE='TXT' PRIORITY='' VALUE='"yandex-verification: XXXXXXXXXXXXXXX"' SUSPENDED='no' TIME='%time%' DATE='%date%' diff --git a/install/debian/13/templates/web/apache2/PHP-FPM-84-public.sh b/install/debian/13/templates/web/apache2/PHP-FPM-84-public.sh deleted file mode 100644 index cbea2de9..00000000 --- a/install/debian/13/templates/web/apache2/PHP-FPM-84-public.sh +++ /dev/null @@ -1,133 +0,0 @@ -#!/bin/bash -# Adding php pool conf -user="$1" -domain="$2" -ip="$3" -home_dir="$4" -docroot="$5" - -pool_conf="[$2] - -listen = /run/php/php8.4-fpm-$2.sock -listen.owner = $1 -listen.group = $1 -listen.mode = 0666 - -user = $1 -group = $1 - -pm = ondemand -pm.max_children = 8 -request_terminate_timeout = 360s -pm.max_requests = 4000 -pm.process_idle_timeout = 10s -pm.status_path = /status - -php_admin_value[upload_tmp_dir] = /home/$1/tmp -php_admin_value[session.save_path] = /home/$1/tmp -php_admin_value[open_basedir] = $5:/home/$1/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcube:/var/log/roundcube:/var/lib/roundcube -php_admin_value[upload_max_filesize] = 800M -php_admin_value[max_execution_time] = 300 -php_admin_value[post_max_size] = 800M -php_admin_value[memory_limit] = 512M -php_admin_value[sendmail_path] = \"/usr/sbin/sendmail -t -i -f info@$2\" -php_admin_flag[mysql.allow_persistent] = off -php_admin_flag[safe_mode] = off - -env[PATH] = /usr/local/bin:/usr/bin:/bin -env[TMP] = /home/$1/tmp -env[TMPDIR] = /home/$1/tmp -env[TEMP] = /home/$1/tmp -" - -pool_file_56="/etc/php/5.6/fpm/pool.d/$2.conf" -pool_file_70="/etc/php/7.0/fpm/pool.d/$2.conf" -pool_file_71="/etc/php/7.1/fpm/pool.d/$2.conf" -pool_file_72="/etc/php/7.2/fpm/pool.d/$2.conf" -pool_file_73="/etc/php/7.3/fpm/pool.d/$2.conf" -pool_file_74="/etc/php/7.4/fpm/pool.d/$2.conf" -pool_file_80="/etc/php/8.0/fpm/pool.d/$2.conf" -pool_file_81="/etc/php/8.1/fpm/pool.d/$2.conf" -pool_file_82="/etc/php/8.2/fpm/pool.d/$2.conf" -pool_file_83="/etc/php/8.3/fpm/pool.d/$2.conf" -pool_file_84="/etc/php/8.4/fpm/pool.d/$2.conf" - -if [ -f "$pool_file_56" ]; then - rm $pool_file_56 - systemctl reset-failed php5.6-fpm - systemctl restart php5.6-fpm -fi - -if [ -f "$pool_file_70" ]; then - rm $pool_file_70 - systemctl reset-failed php7.0-fpm - systemctl restart php7.0-fpm -fi - -if [ -f "$pool_file_71" ]; then - rm $pool_file_71 - systemctl reset-failed php7.1-fpm - systemctl restart php7.1-fpm -fi - -if [ -f "$pool_file_72" ]; then - rm $pool_file_72 - systemctl reset-failed php7.2-fpm - systemctl restart php7.2-fpm -fi - -if [ -f "$pool_file_73" ]; then - rm $pool_file_73 - systemctl reset-failed php7.3-fpm - systemctl restart php7.3-fpm -fi - -if [ -f "$pool_file_74" ]; then - rm $pool_file_74 - systemctl reset-failed php7.4-fpm - systemctl restart php7.4-fpm -fi - -if [ -f "$pool_file_80" ]; then - rm $pool_file_80 - systemctl reset-failed php8.0-fpm - systemctl restart php8.0-fpm -fi - -if [ -f "$pool_file_81" ]; then - rm $pool_file_81 - systemctl reset-failed php8.1-fpm - systemctl restart php8.1-fpm -fi - -if [ -f "$pool_file_82" ]; then - rm $pool_file_82 - systemctl reset-failed php8.2-fpm - systemctl restart php8.2-fpm -fi - -if [ -f "$pool_file_83" ]; then - rm $pool_file_83 - systemctl reset-failed php8.3-fpm - systemctl restart php8.3-fpm -fi - -write_file=0 -if [ ! -f "$pool_file_84" ]; then - write_file=1 -else - user_count=$(grep -c "/home/$1/" $pool_file_84) - if [ $user_count -eq 0 ]; then - write_file=1 - fi -fi -if [ $write_file -eq 1 ]; then - echo "$pool_conf" > $pool_file_84 - systemctl reset-failed php8.4-fpm - systemctl restart php8.4-fpm -fi -if [ -f "/etc/php/8.4/fpm/pool.d/www.conf" ]; then - rm /etc/php/8.4/fpm/pool.d/www.conf -fi - -exit 0 diff --git a/install/debian/13/templates/web/apache2/PHP-FPM-84-public.stpl b/install/debian/13/templates/web/apache2/PHP-FPM-84-public.stpl deleted file mode 100644 index 91e05b17..00000000 --- a/install/debian/13/templates/web/apache2/PHP-FPM-84-public.stpl +++ /dev/null @@ -1,36 +0,0 @@ -
 |
- - | -
403
-Forbidden
-
- Unfortunately, you do not have permission to view this
-
-
-
-
diff --git a/install/debian/13/templates/web/skel/document_errors/404.html b/install/debian/13/templates/web/skel/document_errors/404.html
deleted file mode 100644
index 2cee7708..00000000
--- a/install/debian/13/templates/web/skel/document_errors/404.html
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
- 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/13/templates/web/skel/document_errors/50x.html b/install/debian/13/templates/web/skel/document_errors/50x.html
deleted file mode 100644
index 85ba648b..00000000
--- a/install/debian/13/templates/web/skel/document_errors/50x.html
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
- 500
-Internal Server Error
-
- Sorry, something went wrong :(
-
-
-
-
diff --git a/install/debian/13/templates/web/skel/public_html/index.html b/install/debian/13/templates/web/skel/public_html/index.html
deleted file mode 100644
index c2895cf2..00000000
--- a/install/debian/13/templates/web/skel/public_html/index.html
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
- %domain%
- - - - - diff --git a/install/debian/13/templates/web/skel/public_html/robots.txt b/install/debian/13/templates/web/skel/public_html/robots.txt deleted file mode 100644 index 00ee83dc..00000000 --- a/install/debian/13/templates/web/skel/public_html/robots.txt +++ /dev/null @@ -1,3 +0,0 @@ -# vestacp autogenerated robots.txt -User-agent: * -Crawl-delay: 10 diff --git a/install/debian/13/templates/web/skel/public_shtml/index.html b/install/debian/13/templates/web/skel/public_shtml/index.html deleted file mode 100644 index c2895cf2..00000000 --- a/install/debian/13/templates/web/skel/public_shtml/index.html +++ /dev/null @@ -1,26 +0,0 @@ - - -%domain%
- - - - - diff --git a/install/debian/13/templates/web/skel/public_shtml/robots.txt b/install/debian/13/templates/web/skel/public_shtml/robots.txt deleted file mode 100644 index 00ee83dc..00000000 --- a/install/debian/13/templates/web/skel/public_shtml/robots.txt +++ /dev/null @@ -1,3 +0,0 @@ -# vestacp autogenerated robots.txt -User-agent: * -Crawl-delay: 10 diff --git a/install/debian/13/templates/web/suspend/.htaccess b/install/debian/13/templates/web/suspend/.htaccess deleted file mode 100644 index 5a6df83f..00000000 --- a/install/debian/13/templates/web/suspend/.htaccess +++ /dev/null @@ -1,2 +0,0 @@ -ErrorDocument 403 /index.html -ErrorDocument 404 /index.html diff --git a/install/debian/13/templates/web/suspend/index.html b/install/debian/13/templates/web/suspend/index.html deleted file mode 100644 index 3815354d..00000000 --- a/install/debian/13/templates/web/suspend/index.html +++ /dev/null @@ -1,25 +0,0 @@ - - -Temporary under construction
-This website is temporary under construction.
-
- We will back again soon.
-
-
-
diff --git a/install/debian/13/templates/web/webalizer/webalizer.tpl b/install/debian/13/templates/web/webalizer/webalizer.tpl
deleted file mode 100644
index 068adcfb..00000000
--- a/install/debian/13/templates/web/webalizer/webalizer.tpl
+++ /dev/null
@@ -1,110 +0,0 @@
-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/debian/13/vsftpd/vsftpd.conf b/install/debian/13/vsftpd/vsftpd.conf
deleted file mode 100644
index 1ca1a992..00000000
--- a/install/debian/13/vsftpd/vsftpd.conf
+++ /dev/null
@@ -1,26 +0,0 @@
-anonymous_enable=NO
-local_enable=YES
-write_enable=YES
-local_umask=022
-anon_umask=022
-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
-use_localtime=YES
diff --git a/install/debian/8/exim/dnsbl.conf b/install/debian/8/exim/dnsbl.conf
index 279bafcd..5166b255 100644
--- a/install/debian/8/exim/dnsbl.conf
+++ b/install/debian/8/exim/dnsbl.conf
@@ -1 +1,2 @@
bl.spamcop.net
+zen.spamhaus.org
diff --git a/install/debian/8/templates/web/awstats/awstats.tpl b/install/debian/8/templates/web/awstats/awstats.tpl
index 6bb51c50..9a92e0fd 100755
--- a/install/debian/8/templates/web/awstats/awstats.tpl
+++ b/install/debian/8/templates/web/awstats/awstats.tpl
@@ -24,7 +24,7 @@ PurgeLogFile=0
ArchiveLogRecords=0
KeepBackupOfHistoricFiles=1
DefaultFile="index.php index.html"
-SkipHosts="127.0.0.1"
+SkipHosts="127.0.0.1
SkipUserAgents=""
SkipFiles=""
SkipReferrersBlackList=""
diff --git a/install/debian/9/exim/dnsbl.conf b/install/debian/9/exim/dnsbl.conf
index 279bafcd..5166b255 100644
--- a/install/debian/9/exim/dnsbl.conf
+++ b/install/debian/9/exim/dnsbl.conf
@@ -1 +1,2 @@
bl.spamcop.net
+zen.spamhaus.org
diff --git a/install/debian/9/templates/web/awstats/awstats.tpl b/install/debian/9/templates/web/awstats/awstats.tpl
index 6bb51c50..9a92e0fd 100755
--- a/install/debian/9/templates/web/awstats/awstats.tpl
+++ b/install/debian/9/templates/web/awstats/awstats.tpl
@@ -24,7 +24,7 @@ PurgeLogFile=0
ArchiveLogRecords=0
KeepBackupOfHistoricFiles=1
DefaultFile="index.php index.html"
-SkipHosts="127.0.0.1"
+SkipHosts="127.0.0.1
SkipUserAgents=""
SkipFiles=""
SkipReferrersBlackList=""
diff --git a/install/vst-install-debian.sh b/install/vst-install-debian.sh
index 98887225..4349a56d 100755
--- a/install/vst-install-debian.sh
+++ b/install/vst-install-debian.sh
@@ -18,33 +18,8 @@ os='debian'
release=$(cat /etc/debian_version | tr "." "\n" | head -n1)
codename="$(cat /etc/os-release |grep VERSION= |cut -f 2 -d \(|cut -f 1 -d \))"
vestacp="$VESTA/install/$VERSION/$release"
-ARCH="amd64"
-if [ "$release" -eq 13 ]; then
- software="nginx apache2 apache2-utils
- libapache2-mod-fcgid php-fpm php
- php-common php-cgi php-mysql php-curl php-fpm php-pgsql awstats
- vsftpd proftpd-basic bind9 exim4 exim4-daemon-heavy
- clamav-daemon spamassassin dovecot-imapd dovecot-pop3d roundcube-core
- roundcube-mysql roundcube-plugins mariadb-server mariadb-common
- mariadb-client postgresql postgresql-contrib phpmyadmin mc
- flex whois git idn zip sudo bc ftp lsof ntpdate rrdtool quota
- e2fslibs bsdutils e2fsprogs curl imagemagick fail2ban dnsutils
- bsdmainutils cron vesta vesta-nginx vesta-php expect libmail-dkim-perl
- unrar-free vim-common net-tools unzip iptables xxd spamd"
-elif [ "$release" -eq 12 ]; then
- software="nginx apache2 apache2-utils
- libapache2-mod-fcgid php-fpm php
- php-common php-cgi php-mysql php-curl php-fpm php-pgsql awstats
- vsftpd proftpd-basic bind9 exim4 exim4-daemon-heavy
- clamav-daemon spamassassin dovecot-imapd dovecot-pop3d roundcube-core
- roundcube-mysql roundcube-plugins mariadb-server mariadb-common
- mariadb-client postgresql postgresql-contrib phpmyadmin mc
- flex whois git idn zip sudo bc ftp lsof ntpdate rrdtool quota
- e2fslibs bsdutils e2fsprogs curl imagemagick fail2ban dnsutils
- bsdmainutils cron vesta vesta-nginx vesta-php expect libmail-dkim-perl
- unrar-free vim-common net-tools unzip iptables xxd spamd rsyslog"
-elif [ "$release" -eq 11 ]; then
+if [ "$release" -eq 11 ]; then
software="nginx apache2 apache2-utils
libapache2-mod-fcgid php-fpm php
php-common php-cgi php-mysql php-curl php-fpm php-pgsql awstats
@@ -143,11 +118,7 @@ help() {
# Defining password-gen function
gen_pass() {
MATRIX='0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'
- if [ -z "$1" ]; then
- LENGTH=32
- else
- LENGTH=$1
- fi
+ LENGTH=32
while [ ${n:=1} -le $LENGTH ]; do
PASS="$PASS${MATRIX:$(($RANDOM%${#MATRIX})):1}"
let n+=1
@@ -302,7 +273,7 @@ set_default_value 'postgresql' 'no'
set_default_value 'mongodb' 'no'
set_default_value 'exim' 'yes'
set_default_value 'dovecot' 'yes'
-if [ $memory -lt 2500000 ]; then
+if [ $memory -lt 1500000 ]; then
set_default_value 'clamd' 'no'
set_default_value 'spamd' 'no'
else
@@ -503,16 +474,10 @@ echo -e "\n\n"
# Asking for confirmation to proceed
if [ "$interactive" = 'yes' ]; then
- prompt_to_continue=1;
- if [ ! -z "$email" ] && [ ! -z "$secret_url" ] && [ ! -z "$port" ] && [ ! -z "$servername" ]; then
- prompt_to_continue=0;
- fi
- if [ $prompt_to_continue -eq 1 ]; then
- read -p 'Would you like to continue [y/n]: ' answer
- if [ "$answer" != 'y' ] && [ "$answer" != 'Y' ]; then
- echo 'Goodbye'
- exit 1
- fi
+ read -p 'Would you like to continue [y/n]: ' answer
+ if [ "$answer" != 'y' ] && [ "$answer" != 'Y' ]; then
+ echo 'Goodbye'
+ exit 1
fi
# Asking for contact email
@@ -604,19 +569,15 @@ apt-get -y upgrade
check_result $? 'apt-get upgrade failed'
echo "=== 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
-echo "deb [arch=$ARCH signed-by=/usr/share/keyrings/nginx-keyring.gpg] https://nginx.org/packages/mainline/$VERSION/ $codename nginx" > $apt/nginx.list
-curl -s https://nginx.org/keys/nginx_signing.key | gpg --dearmor | tee /usr/share/keyrings/nginx-keyring.gpg > /dev/null 2>&1
+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
echo "=== Installing myVesta 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
-echo "deb [arch=$ARCH signed-by=/usr/share/keyrings/myvesta-keyring.gpg] https://$RHOST/$codename/ $codename vesta" > $apt/vesta.list
-curl -s $CHOST/deb_signing.key | gpg --dearmor | tee /usr/share/keyrings/myvesta-keyring.gpg > /dev/null 2>&1
+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
# Installing jessie backports
if [ "$release" -eq 8 ]; then
@@ -771,37 +732,31 @@ if [ "$mysql" = 'no' ]; then
fi
if [ "$mysql8" = 'yes' ]; then
echo "=== Preparing MySQL 8 apt repo"
- if [ "$release" -lt 12 ]; then
- software=$(echo "$software" | sed -e 's/exim4-daemon-heavy//')
- software=$(echo "$software" | sed -e 's/exim4//')
- #software="$software php-mysql roundcube-mysql"
- echo "### THIS FILE IS AUTOMATICALLY CONFIGURED ###" > /etc/apt/sources.list.d/mysql.list
- echo "# You may comment out entries below, but any other modifications may be lost." >> /etc/apt/sources.list.d/mysql.list
- echo "# Use command 'dpkg-reconfigure mysql-apt-config' as root for modifications." >> /etc/apt/sources.list.d/mysql.list
- echo "deb http://repo.mysql.com/apt/debian/ $codename mysql-apt-config" >> /etc/apt/sources.list.d/mysql.list
- echo "deb http://repo.mysql.com/apt/debian/ $codename mysql-8.0" >> /etc/apt/sources.list.d/mysql.list
- echo "deb http://repo.mysql.com/apt/debian/ $codename mysql-tools" >> /etc/apt/sources.list.d/mysql.list
- echo "#deb http://repo.mysql.com/apt/debian/ $codename mysql-tools-preview" >> /etc/apt/sources.list.d/mysql.list
- echo "deb-src http://repo.mysql.com/apt/debian/ $codename mysql-8.0" >> /etc/apt/sources.list.d/mysql.list
-
- # apt-key adv --keyserver pgp.mit.edu --recv-keys 3A79BD29
- key="467B942D3A79BD29"
- readonly key
- GNUPGHOME="$(mktemp -d)"
- export GNUPGHOME
- for keyserver in $(shuf -e ha.pool.sks-keyservers.net hkp://p80.pool.sks-keyservers.net:80 keyserver.ubuntu.com hkp://keyserver.ubuntu.com:80)
- do
- gpg --keyserver "${keyserver}" --recv-keys "${key}" 2>&1 && break
- done
- gpg --export "${key}" > /etc/apt/trusted.gpg.d/mysql.gpg
- gpgconf --kill all
- rm -rf "${GNUPGHOME}"
- unset GNUPGHOME
- else
- # check latest on: https://dev.mysql.com/downloads/repo/apt/
- wget https://dev.mysql.com/get/mysql-apt-config_0.8.34-1_all.deb
- dpkg -i mysql-apt-config_0.8.34-1_all.deb
- fi
+ software=$(echo "$software" | sed -e 's/exim4-daemon-heavy//')
+ software=$(echo "$software" | sed -e 's/exim4//')
+ #software="$software php-mysql roundcube-mysql"
+ echo "### THIS FILE IS AUTOMATICALLY CONFIGURED ###" > /etc/apt/sources.list.d/mysql.list
+ echo "# You may comment out entries below, but any other modifications may be lost." >> /etc/apt/sources.list.d/mysql.list
+ echo "# Use command 'dpkg-reconfigure mysql-apt-config' as root for modifications." >> /etc/apt/sources.list.d/mysql.list
+ echo "deb http://repo.mysql.com/apt/debian/ $codename mysql-apt-config" >> /etc/apt/sources.list.d/mysql.list
+ echo "deb http://repo.mysql.com/apt/debian/ $codename mysql-8.0" >> /etc/apt/sources.list.d/mysql.list
+ echo "deb http://repo.mysql.com/apt/debian/ $codename mysql-tools" >> /etc/apt/sources.list.d/mysql.list
+ echo "#deb http://repo.mysql.com/apt/debian/ $codename mysql-tools-preview" >> /etc/apt/sources.list.d/mysql.list
+ echo "deb-src http://repo.mysql.com/apt/debian/ $codename mysql-8.0" >> /etc/apt/sources.list.d/mysql.list
+
+ # apt-key adv --keyserver pgp.mit.edu --recv-keys 3A79BD29
+ key="467B942D3A79BD29"
+ readonly key
+ GNUPGHOME="$(mktemp -d)"
+ export GNUPGHOME
+ for keyserver in $(shuf -e ha.pool.sks-keyservers.net hkp://p80.pool.sks-keyservers.net:80 keyserver.ubuntu.com hkp://keyserver.ubuntu.com:80)
+ do
+ gpg --keyserver "${keyserver}" --recv-keys "${key}" 2>&1 && break
+ done
+ gpg --export "${key}" > /etc/apt/trusted.gpg.d/mysql.gpg
+ gpgconf --kill all
+ rm -rf "${GNUPGHOME}"
+ unset GNUPGHOME
mpass=$(gen_pass)
debconf-set-selections <<< "mysql-community-server mysql-community-server/root-pass password $mpass"
@@ -866,12 +821,6 @@ fi
echo "=== Enabling daemon autostart"
rm -f /usr/sbin/policy-rc.d
-if [ "$release" -gt 11 ]; then
- echo "=== Setting up rsyslog"
- currentservice='rsyslog'
- ensure_startup $currentservice
- ensure_start $currentservice
-fi
#----------------------------------------------------------#
# Configure system #
@@ -973,7 +922,7 @@ if [ "$apache" = 'no' ] && [ "$nginx" = 'yes' ]; then
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 [ "$release" -gt 8 ]; then
+ if [ "$release" -eq 9 ] || [ "$release" -eq 10 ] || [ "$release" -eq 11 ]; then
if [ "$phpfpm" = 'yes' ]; then
echo "WEB_BACKEND='php-fpm'" >> $VESTA/conf/vesta.conf
fi
@@ -1005,11 +954,7 @@ if [ "$exim" = 'yes' ]; then
echo "ANTIVIRUS_SYSTEM='clamav-daemon'" >> $VESTA/conf/vesta.conf
fi
if [ "$spamd" = 'yes' ]; then
- if [ "$release" -lt 12 ]; then
- echo "ANTISPAM_SYSTEM='spamassassin'" >> $VESTA/conf/vesta.conf
- else
- echo "ANTISPAM_SYSTEM='spamd'" >> $VESTA/conf/vesta.conf
- fi
+ echo "ANTISPAM_SYSTEM='spamassassin'" >> $VESTA/conf/vesta.conf
fi
if [ "$dovecot" = 'yes' ]; then
echo "IMAP_SYSTEM='dovecot'" >> $VESTA/conf/vesta.conf
@@ -1079,38 +1024,6 @@ if [ "$release" -eq 11 ]; then
ln -s /usr/local/vesta/data/templates/web/nginx/php-fpm/default.stpl /usr/local/vesta/data/templates/web/nginx/php-fpm/PHP-FPM-74.stpl
ln -s /usr/local/vesta/data/templates/web/nginx/php-fpm/default.tpl /usr/local/vesta/data/templates/web/nginx/php-fpm/PHP-FPM-74.tpl
fi
-if [ "$release" -eq 12 ]; then
- echo "== Symlink missing templates"
- ln -s /usr/local/vesta/data/templates/web/nginx/hosting.sh /usr/local/vesta/data/templates/web/nginx/default.sh
- ln -s /usr/local/vesta/data/templates/web/nginx/hosting.tpl /usr/local/vesta/data/templates/web/nginx/default.tpl
- ln -s /usr/local/vesta/data/templates/web/nginx/hosting.stpl /usr/local/vesta/data/templates/web/nginx/default.stpl
-
- ln -s /usr/local/vesta/data/templates/web/apache2/PHP-FPM-82.sh /usr/local/vesta/data/templates/web/apache2/hosting.sh
- ln -s /usr/local/vesta/data/templates/web/apache2/PHP-FPM-82.tpl /usr/local/vesta/data/templates/web/apache2/hosting.tpl
- ln -s /usr/local/vesta/data/templates/web/apache2/PHP-FPM-82.stpl /usr/local/vesta/data/templates/web/apache2/hosting.stpl
- ln -s /usr/local/vesta/data/templates/web/apache2/PHP-FPM-82.sh /usr/local/vesta/data/templates/web/apache2/default.sh
- ln -s /usr/local/vesta/data/templates/web/apache2/PHP-FPM-82.tpl /usr/local/vesta/data/templates/web/apache2/default.tpl
- ln -s /usr/local/vesta/data/templates/web/apache2/PHP-FPM-82.stpl /usr/local/vesta/data/templates/web/apache2/default.stpl
-
- ln -s /usr/local/vesta/data/templates/web/nginx/php-fpm/default.stpl /usr/local/vesta/data/templates/web/nginx/php-fpm/PHP-FPM-82.stpl
- ln -s /usr/local/vesta/data/templates/web/nginx/php-fpm/default.tpl /usr/local/vesta/data/templates/web/nginx/php-fpm/PHP-FPM-82.tpl
-fi
-if [ "$release" -eq 13 ]; then
- echo "== Symlink missing templates"
- ln -s /usr/local/vesta/data/templates/web/nginx/hosting.sh /usr/local/vesta/data/templates/web/nginx/default.sh
- ln -s /usr/local/vesta/data/templates/web/nginx/hosting.tpl /usr/local/vesta/data/templates/web/nginx/default.tpl
- ln -s /usr/local/vesta/data/templates/web/nginx/hosting.stpl /usr/local/vesta/data/templates/web/nginx/default.stpl
-
- ln -s /usr/local/vesta/data/templates/web/apache2/PHP-FPM-84.sh /usr/local/vesta/data/templates/web/apache2/hosting.sh
- ln -s /usr/local/vesta/data/templates/web/apache2/PHP-FPM-84.tpl /usr/local/vesta/data/templates/web/apache2/hosting.tpl
- ln -s /usr/local/vesta/data/templates/web/apache2/PHP-FPM-84.stpl /usr/local/vesta/data/templates/web/apache2/hosting.stpl
- ln -s /usr/local/vesta/data/templates/web/apache2/PHP-FPM-84.sh /usr/local/vesta/data/templates/web/apache2/default.sh
- ln -s /usr/local/vesta/data/templates/web/apache2/PHP-FPM-84.tpl /usr/local/vesta/data/templates/web/apache2/default.tpl
- ln -s /usr/local/vesta/data/templates/web/apache2/PHP-FPM-84.stpl /usr/local/vesta/data/templates/web/apache2/default.stpl
-
- ln -s /usr/local/vesta/data/templates/web/nginx/php-fpm/default.stpl /usr/local/vesta/data/templates/web/nginx/php-fpm/PHP-FPM-84.stpl
- ln -s /usr/local/vesta/data/templates/web/nginx/php-fpm/default.tpl /usr/local/vesta/data/templates/web/nginx/php-fpm/PHP-FPM-84.tpl
-fi
echo "== Set nameservers address"
sed -i "s/YOURHOSTNAME1/ns1.$servername/" /usr/local/vesta/data/packages/default.pkg
@@ -1132,17 +1045,12 @@ $VESTA/bin/v-change-sys-hostname $servername 2>/dev/null
echo "== Generating myVesta unsigned SSL certificate"
$VESTA/bin/v-generate-ssl-cert $(hostname) $email 'US' 'California' \
- 'San Francisco' 'myVesta Control Panel' 'IT' > /tmp/vst.pem
+ '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:)
-if [ "$release" -lt 12 ]; then
- 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:)
-else
- key_start=$(grep -n "BEGIN PRIVATE KEY" /tmp/vst.pem |cut -f 1 -d:)
- key_end=$(grep -n "END PRIVATE KEY" /tmp/vst.pem |cut -f 1 -d:)
-fi
+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:)
cd $VESTA/ssl
sed -n "1,${crt_end}p" /tmp/vst.pem > certificate.crt
@@ -1162,9 +1070,7 @@ if [ "$nginx" = 'yes' ]; then
cp -f $vestacp/nginx/nginx.conf /etc/nginx/
cp -f $vestacp/nginx/status.conf /etc/nginx/conf.d/
cp -f $vestacp/nginx/phpmyadmin.inc /etc/nginx/conf.d/
- if [ "$release" -lt 12 ]; then
- cp -f $vestacp/nginx/phppgadmin.inc /etc/nginx/conf.d/
- fi
+ cp -f $vestacp/nginx/phppgadmin.inc /etc/nginx/conf.d/
cp -f $vestacp/nginx/webmail.inc /etc/nginx/conf.d/
cp -f $vestacp/logrotate/nginx /etc/logrotate.d/
@@ -1173,13 +1079,6 @@ if [ "$nginx" = 'yes' ]; then
echo > /etc/nginx/conf.d/vesta.conf
mkdir -p /var/log/nginx/domains
-
- if [ "$apache" = 'yes' ]; then
- # SSL fix for Apache 2.4.65+
- echo -e "proxy_ssl_server_name on;\nproxy_ssl_name \$host;\nproxy_ssl_session_reuse off;" > /etc/nginx/conf.d/fixssl.conf
- touch /usr/local/vesta/data/upgrades/fixssl.conf
- fi
-
#update-rc.d nginx defaults
#service nginx start
currentservice='nginx'
@@ -1235,19 +1134,7 @@ fi
if [ "$phpfpm" = 'yes' ]; then
echo "=== Configure PHP-FPM"
- if [ "$release" -eq 13 ]; then
- cp -f $vestacp/php-fpm/www.conf /etc/php/8.4/fpm/pool.d/www.conf
- #update-rc.d php8.4-fpm defaults
- currentservice='php8.4-fpm'
- ensure_startup $currentservice
- ensure_start $currentservice
- elif [ "$release" -eq 12 ]; then
- cp -f $vestacp/php-fpm/www.conf /etc/php/8.2/fpm/pool.d/www.conf
- #update-rc.d php8.2-fpm defaults
- currentservice='php8.2-fpm'
- ensure_startup $currentservice
- ensure_start $currentservice
- elif [ "$release" -eq 11 ]; then
+ if [ "$release" -eq 11 ]; then
cp -f $vestacp/php-fpm/www.conf /etc/php/7.4/fpm/pool.d/www.conf
#update-rc.d php7.4-fpm defaults
currentservice='php7.4-fpm'
@@ -1320,12 +1207,6 @@ if [ "$proftpd" = 'yes' ]; then
currentservice='proftpd'
ensure_startup $currentservice
ensure_start $currentservice
-
- # Temporary ProFTPD fix for Debian12
- if [ "$release" -eq 12 ]; then
- systemctl disable --now proftpd.socket
- systemctl enable --now proftpd.service
- fi
fi
@@ -1423,11 +1304,8 @@ if [ "$mysql" = 'yes' ] || [ "$mysql8" = 'yes' ]; then
bash /root/phpmyadmin/pma.sh
blowfish=$(gen_pass)
echo "\$cfg['blowfish_secret'] = '$blowfish';" >> /etc/phpmyadmin/config.inc.php
-
- # disable root login
- echo "\$cfg['Servers'][\$i]['AllowRoot'] = FALSE;" >> /etc/phpmyadmin/config.inc.php
fi
- if [ "$release" -gt 10 ]; then
+ if [ "$release" -eq 11 ]; then
echo "=== Configure phpMyAdmin (Debian11 custom part)"
# Set config and log directory
sed -i "s|define('CONFIG_DIR', '');|define('CONFIG_DIR', '/etc/phpmyadmin/');|" /usr/share/phpmyadmin/libraries/vendor_config.php
@@ -1443,9 +1321,6 @@ if [ "$mysql" = 'yes' ] || [ "$mysql8" = 'yes' ]; then
bash /root/phpmyadmin/pma.sh
blowfish=$(gen_pass)
echo "\$cfg['blowfish_secret'] = '$blowfish';" >> /etc/phpmyadmin/config.inc.php
-
- # disable root login
- echo "\$cfg['Servers'][\$i]['AllowRoot'] = FALSE;" >> /etc/phpmyadmin/config.inc.php
fi
fi
@@ -1463,12 +1338,10 @@ if [ "$postgresql" = 'yes' ]; then
sudo -u postgres psql -c "ALTER USER postgres WITH PASSWORD '$ppass'"
# Configuring phpPgAdmin
- if [ "$release" -lt 12 ]; then
- if [ "$apache" = 'yes' ]; then
- cp -f $vestacp/pga/phppgadmin.conf /etc/apache2/conf.d/
- fi
- cp -f $vestacp/pga/config.inc.php /etc/phppgadmin/
+ if [ "$apache" = 'yes' ]; then
+ cp -f $vestacp/pga/phppgadmin.conf /etc/apache2/conf.d/
fi
+ cp -f $vestacp/pga/config.inc.php /etc/phppgadmin/
fi
@@ -1489,7 +1362,7 @@ if [ "$named" = 'yes' ]; then
sed -i "s#/etc/bind/\*\* r,#/etc/bind/\*\* rw,\n /home/\*\* rwm,#g" /etc/apparmor.d/usr.sbin.named
# service apparmor status >/dev/null 2>&1
# if [ $? -ne 0 ]; then
- systemctl restart apparmor
+ service apparmor restart
# fi
fi
# update-rc.d bind9 defaults
@@ -1510,10 +1383,6 @@ if [ "$exim" = 'yes' ]; then
cp -f $vestacp/exim/spam-blocks.conf /etc/exim4/
cp -f $vestacp/exim/deny_senders /etc/exim4/
touch /etc/exim4/white-blocks.conf
- touch /etc/exim4/limit_per_email_account_max_sent_emails_per_hour
- touch /etc/exim4/limit_per_email_account_max_recipients
- touch /etc/exim4/limit_per_hosting_account_max_sent_emails_per_hour
- touch /etc/exim4/limit_per_hosting_account_max_recipients
if [ "$spamd" = 'yes' ]; then
sed -i "s/#SPAM/SPAM/g" /etc/exim4/exim4.conf.template
@@ -1522,12 +1391,6 @@ if [ "$exim" = 'yes' ]; then
sed -i "s/#CLAMD/CLAMD/g" /etc/exim4/exim4.conf.template
fi
- # Generating SRS KEY - the code is taken from HestiaCP
- srs=$(gen_pass 16)
- echo $srs > /etc/exim4/srs.conf
- chmod 640 /etc/exim4/srs.conf
- chown root:Debian-exim /etc/exim4/srs.conf
-
chmod 640 /etc/exim4/exim4.conf.template
rm -rf /etc/exim4/domains
mkdir -p /etc/exim4/domains
@@ -1542,8 +1405,7 @@ if [ "$exim" = 'yes' ]; then
#update-rc.d exim4 defaults
currentservice='exim4'
ensure_startup $currentservice
- systemctl restart $currentservice
- # ensure_start $currentservice
+ ensure_start $currentservice
fi
@@ -1613,33 +1475,12 @@ fi
if [ "$spamd" = 'yes' ]; then
echo "=== Configure SpamAssassin"
#update-rc.d spamassassin defaults
- if [ "$release" -lt 12 ]; then
- sed -i "s/ENABLED=0/ENABLED=1/" /etc/default/spamassassin
- currentservice='spamassassin'
- else
- currentservice='spamd'
- fi
-
- echo "=== Creating spamassassin /nonexistent folder"
- mkdir /nonexistent
- mkdir /nonexistent/.spamassassin
- chown -R nobody:debian-spamd /nonexistent
-
- echo "=== Patching spamassassin dns_server"
- sed -i "s/report_safe 1/report_safe 1\n\ndns_server 127.0.0.1/g" /etc/spamassassin/local.cf
-
- echo "== Adding myVesta rules to SpamAssassin"
- cat <$LOGINMESSAGE2
\n\n
$LOGINMESSAGE2
\n\n
' + errorThrown); - }, - success: function(result_data) { - if (btn_el.find('i').hasClass('fa-times')) { - result_el.html(result_data); - } - } - }); - - btn_el.find('i').removeClass('fa-search').addClass('fa-times'); - } - else { - result_el.html(''); - btn_el.find('i').removeClass('fa-times').addClass('fa-search'); - } - }); - }); -})(jQuery); diff --git a/web/list/firewall/banlist/ip_info.php b/web/list/firewall/banlist/ip_info.php deleted file mode 100644 index e7888a75..00000000 --- a/web/list/firewall/banlist/ip_info.php +++ /dev/null @@ -1,164 +0,0 @@ - 'http://lists.blocklist.de/lists/all.txt', - 'BFB' => 'http://danger.rulez.sk/projects/bruteforceblocker/blist.php', - 'CIARMY' => 'http://www.ciarmy.com/list/ci-badguys.txt', - 'GREENSNOW' => 'https://blocklist.greensnow.co/greensnow.txt', - 'SPAMDROP' => 'https://www.spamhaus.org/drop/drop.txt', - 'SPAMEDROP' => 'https://www.spamhaus.org/drop/edrop.txt', - 'TOR' => 'https://check.torproject.org/cgi-bin/TorBulkExitList.py', - ]; - $today = date('Y-m-d'); - - foreach ($lists as $code => $url) { - $cache_tag = 'ip-blacklist-' . $code . '-cache'; - - // init cache - if (!isset($_SESSION[$cache_tag])) $_SESSION[$cache_tag] = ['updated' => '', 'items' => [], 'http_code' => '']; - - // invalidate cache if clear_cache parameter is 1 - if (!empty($_REQUEST['clear_cache']) && $_REQUEST['clear_cache'] == 1) $_SESSION[$cache_tag]['updated'] = '2000-01-01'; - - // if cache is not updated, fetch new data and save to cache - if (strtotime($today) > strtotime($_SESSION[$cache_tag]['updated'])) { - $new_cache_data = fetchURL($url, $url_result); - if ($url_result['http_code'] == '200') $new_cache_items = parseCacheEntries($new_cache_data); - $_SESSION[$cache_tag] = ['updated' => $today, 'items' => $new_cache_items, 'http_code' => $url_result['http_code']]; - } - - // check ip - $matched_ips = array_filter($_SESSION[$cache_tag]['items'], function ($item) use ($ip) { - if (str_contains($item, '/')) return cidrMatch($ip, $item); - if ($ip == $item) return true; - return false; - }); - - $check_results[$code]['found'] = count($matched_ips) > 0 ? true : false; - $check_results[$code]['updated'] = $_SESSION[$cache_tag]['updated']; - $check_results[$code]['http_code'] = $_SESSION[$cache_tag]['http_code']; - } - - return $check_results; -} - -// Check token -if ((!isset($_REQUEST['token'])) || ($_SESSION['token'] != $_REQUEST['token'])) { - die("Wrong token"); -} - -$ip = $_REQUEST['ip']; - -// Validate IP format -if (filter_var($ip, FILTER_VALIDATE_IP) === false) { - die('GENERAL ERROR
BAD_IP_FORMAT'); -} - -// Query host -$host = gethostbyaddr($ip); - -// Query blocklists -$result_blocklists = ''; -$ip_check = checkIP($ip); -if ($ip_check) { - foreach ($ip_check as $list_code => $list_results) { - $result_blocklists .= '
';
- $result_blocklists .= $list_results['found'] ? '' : '';
- $result_blocklists .= ' '.$list_code.' ';
- $result_blocklists .= $list_results['http_code'] == '200' ? '' : '';
- $result_blocklists .= '
';
- }
-}
-
-// Query location
-$url = 'https://api.db-ip.com/v2/free/'.$ip;
-$result = fetchURL($url);
-$result_array = json_decode($result, true);
-if (!is_array($result_array)) {
- die('GENERAL ERRORBAD_JSON'); -} -if (!empty($result_array['errorCode'])) { - die('GENERAL ERROR
'.$result_array['errorCode']); -} - -// Output -echo " -
-
-
- ".__('Host')." -
- ".$host." -
- ".__('Banlist')." -
- ".$result_blocklists." -
- ".__('Continent')." -
- ".$result_array['continentName']." [".$result_array['continentCode']."] -
- ".__('Country')." -
- ".$result_array['countryName']." [".$result_array['countryCode']."] -
- ".__('State / Province')." -
- ".$result_array['stateProv']." [".$result_array['stateProvCode']."] -
- ".__('City / Locality')." -
- ".$result_array['city']." -
-
-
-
+
diff --git a/web/templates/admin/list_user.html b/web/templates/admin/list_user.html
index 0bcbddd7..066513ee 100644
--- a/web/templates/admin/list_user.html
+++ b/web/templates/admin/list_user.html
@@ -81,7 +81,7 @@
Wiki
diff --git a/web/templates/file_manager/main.php b/web/templates/file_manager/main.php
index dd9095f7..2e82f811 100644
--- a/web/templates/file_manager/main.php
+++ b/web/templates/file_manager/main.php
@@ -19,7 +19,6 @@
-
©