From c87b59ecb233a3c3136049ff89dfa9c639c15dfc Mon Sep 17 00:00:00 2001 From: Neilpang Date: Mon, 22 Jun 2015 22:39:35 +0800 Subject: [PATCH 01/13] a space is needed a space is needed --- bin/v-add-firewall-rule | 2 +- 1 file changed, 1 insertion(+), 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 From f9dc9233435d8647e8649b01eece51c7ed202941 Mon Sep 17 00:00:00 2001 From: Piotr Mamak Date: Thu, 24 Dec 2015 13:52:37 +0100 Subject: [PATCH 02/13] Humanize mail account quota --- web/templates/admin/list_mail_acc.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/templates/admin/list_mail_acc.html b/web/templates/admin/list_mail_acc.html index 10babc2c4..901b94efe 100644 --- a/web/templates/admin/list_mail_acc.html +++ b/web/templates/admin/list_mail_acc.html @@ -158,7 +158,7 @@ sort-star="
:
- +
From 539a248a5077cf29538fff0b02361f588d3220d6 Mon Sep 17 00:00:00 2001 From: Piotr Mamak Date: Fri, 25 Dec 2015 13:31:01 +0100 Subject: [PATCH 03/13] Humanize mail account quota (user) --- web/templates/user/list_mail_acc.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/templates/user/list_mail_acc.html b/web/templates/user/list_mail_acc.html index 5d1956d90..1a3e68d8f 100644 --- a/web/templates/user/list_mail_acc.html +++ b/web/templates/user/list_mail_acc.html @@ -146,7 +146,7 @@ sort-star="
:
- +
From 50b304464f5ab7f533bdc17007fed731d94c3884 Mon Sep 17 00:00:00 2001 From: neil Date: Tue, 29 Dec 2015 14:02:53 +0800 Subject: [PATCH 04/13] add new command v-update-web-domain-ssl, to update the ssl certificate when the certificate is renewed. --- bin/v-update-web-domain-ssl | 91 +++++++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) create mode 100644 bin/v-update-web-domain-ssl diff --git a/bin/v-update-web-domain-ssl b/bin/v-update-web-domain-ssl new file mode 100644 index 000000000..6dffc281b --- /dev/null +++ b/bin/v-update-web-domain-ssl @@ -0,0 +1,91 @@ +#!/bin/bash +# info: updating ssl certificate for domain +# options: USER DOMAIN SSL_DIR [RESTART] +# +# The function updates the SSL certificate for a domain. Parameter ssl_dir is a path +# to directory where 2 or 3 ssl files can be found. Certificate file +# domain.tld.crt and its key domain.tld.key are mandatory. Certificate +# authority domain.tld.ca file is optional. + + +#----------------------------------------------------------# +# Variable&Function # +#----------------------------------------------------------# + +# Argument definition +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 +source $VESTA/func/domain.sh +source $VESTA/func/ip.sh +source $VESTA/conf/vesta.conf + + +#----------------------------------------------------------# +# Verifications # +#----------------------------------------------------------# + +check_args '3' "$#" 'USER DOMAIN SSL_DIR [RESTART]' +validate_format 'user' 'domain' 'ssl_dir' +is_system_enabled "$WEB_SYSTEM" 'WEB_SYSTEM' +is_system_enabled "$WEB_SSL" 'SSL_SUPPORT' +is_object_valid 'user' 'USER' "$user" +is_object_unsuspended 'user' 'USER' "$user" +is_object_valid 'web' 'DOMAIN' "$domain" +is_object_unsuspended 'web' 'DOMAIN' "$domain" +is_object_value_exist 'web' 'DOMAIN' "$domain" '$SSL' +is_web_domain_cert_valid + + +#----------------------------------------------------------# +# Action # +#----------------------------------------------------------# + +# Adding certificate to user data directory +cp -f $ssl_dir/$domain.crt $USER_DATA/ssl/$domain.crt +cp -f $ssl_dir/$domain.key $USER_DATA/ssl/$domain.key +cp -f $ssl_dir/$domain.crt $USER_DATA/ssl/$domain.pem +if [ -e "$ssl_dir/$domain.ca" ]; then + cp -f $ssl_dir/$domain.ca $USER_DATA/ssl/$domain.ca + echo >> $USER_DATA/ssl/$domain.pem + cat $USER_DATA/ssl/$domain.ca >> $USER_DATA/ssl/$domain.pem +fi +chmod 660 $USER_DATA/ssl/$domain.* + + + +# Adding certificate to user dir +cp -f $USER_DATA/ssl/$domain.crt $HOMEDIR/$user/conf/web/ssl.$domain.crt +cp -f $USER_DATA/ssl/$domain.key $HOMEDIR/$user/conf/web/ssl.$domain.key +cp -f $USER_DATA/ssl/$domain.pem $HOMEDIR/$user/conf/web/ssl.$domain.pem +if [ -e "$USER_DATA/ssl/$domain.ca" ]; then + cp -f $USER_DATA/ssl/$domain.ca $HOMEDIR/$user/conf/web/ssl.$domain.ca +fi + + + +#----------------------------------------------------------# +# Vesta # +#----------------------------------------------------------# + +# Restarting web server +if [ "$restart" != 'no' ]; then + $BIN/v-restart-web + check_result $? "Web restart failed" >/dev/null + + if [ ! -z "$PROXY_SYSTEM" ]; then + $BIN/v-restart-proxy + check_result $? "Proxy restart failed" >/dev/null + fi +fi + +# Logging +log_history "update ssl certificate for $domain" +log_event "$OK" "$EVENT" + +exit From 395c47102113031751f95fb2b0e6e541a007efd4 Mon Sep 17 00:00:00 2001 From: Ryan Harvey Date: Thu, 18 Feb 2016 02:12:53 +0000 Subject: [PATCH 05/13] Update v-add-user More stricter permissions, the current setup allows any user on the system to read other users web files as long as they know the path, the only users which should be allow to access $HOMEDIR/$user/web is owner of sites and nginx user to be able to serve static files. I also locked down access $HOMEDIR/$user/tmp to the user, its gets used in the hosting template for tmp files, i don't see why another user would need access to it as apache runs as the user. --- bin/v-add-user | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/bin/v-add-user b/bin/v-add-user index 35424381b..6961760c9 100755 --- a/bin/v-add-user +++ b/bin/v-add-user @@ -67,10 +67,13 @@ echo "$user:$password" | /usr/sbin/chpasswd mkdir $HOMEDIR/$user/conf if [ ! -z "$WEB_SYSTEM" ]; then + nginxuser=$(ps -eo user,comm|grep nginx|uniq|grep -v "root"|awk '{ print $1}') mkdir $HOMEDIR/$user/conf/web $HOMEDIR/$user/web $HOMEDIR/$user/tmp - chmod 751 $HOMEDIR/$user/conf/web $HOMEDIR/$user/web - chmod 771 $HOMEDIR/$user/tmp - chown $user:$user $HOMEDIR/$user/web $HOMEDIR/$user/tmp + chmod 751 $HOMEDIR/$user/conf/web + chmod 710 $HOMEDIR/$user/web + chmod 700 $HOMEDIR/$user/tmp + chown $user:$nginxuser $HOMEDIR/$user/web + chown $user:$user $HOMEDIR/$user/tmp fi if [ ! -z "$MAIL_SYSTEM" ]; then From 93dbc16a8609e30b84376c56816d0ac3c16c031c Mon Sep 17 00:00:00 2001 From: slmcncb Date: Fri, 1 Jul 2016 00:01:16 +0300 Subject: [PATCH 06/13] fix cron template files --- web/templates/admin/add_cron.html | 8 ++++---- web/templates/admin/edit_cron.html | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/web/templates/admin/add_cron.html b/web/templates/admin/add_cron.html index f0ba4f960..6719fa0f0 100644 --- a/web/templates/admin/add_cron.html +++ b/web/templates/admin/add_cron.html @@ -86,7 +86,7 @@

- +

@@ -155,7 +155,7 @@

- +

@@ -229,7 +229,7 @@

- +

@@ -344,7 +344,7 @@

- +

diff --git a/web/templates/admin/edit_cron.html b/web/templates/admin/edit_cron.html index 9eb7f1064..ffd388bb8 100644 --- a/web/templates/admin/edit_cron.html +++ b/web/templates/admin/edit_cron.html @@ -86,7 +86,7 @@

- +

@@ -155,7 +155,7 @@

- +

@@ -227,7 +227,7 @@

- +

@@ -341,7 +341,7 @@

- +

From de44c2baafa240a6e33a80400fa954f75e53f972 Mon Sep 17 00:00:00 2001 From: danjol Date: Wed, 6 Jul 2016 22:11:25 +0200 Subject: [PATCH 07/13] Update nl.php Currently translating the rest of the text :) --- web/inc/i18n/nl.php | 76 ++++++++++++++++++++++----------------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/web/inc/i18n/nl.php b/web/inc/i18n/nl.php index 5eff2d3e7..cdba3a5d7 100644 --- a/web/inc/i18n/nl.php +++ b/web/inc/i18n/nl.php @@ -241,13 +241,13 @@ $LANG['nl'] = array( 'Users' => 'Gebruikers', 'Load Average' => 'Gemiddelde Belasting', 'Memory Usage' => 'Geheugengebruik', - 'APACHE2 Usage' => 'APACHE2 Usage', + 'APACHE2 Usage' => 'APACHE2 Gebruik', 'HTTPD Usage' => 'HTTPD Gebruik', 'NGINX Usage' => 'NGINX Gebruik', 'MySQL Usage on localhost' => 'MySQL Gebruik op localhost', 'PostgreSQL Usage on localhost' => 'PostgreSQL Gebruik op localhost', 'Bandwidth Usage eth0' => 'Bandbreedtegebruik eth0', - 'Exim Usage' => 'Exim Usage', + 'Exim Usage' => 'Exim Gebruik', 'FTP Usage' => 'FTP Gebruik', 'SSH Usage' => 'SSH Gebruik', 'reverse proxy' => 'reverse proxy', @@ -365,10 +365,10 @@ $LANG['nl'] = array( 'ftp user password' => 'FTP gebruikerswachtwoord', 'ftp user' => 'FTP gebruiker', 'Last 70 lines of %s.%s.log' => 'Laatste 70 lijnen van %s.%s.log', - 'AccessLog' => 'AccessLog', - 'ErrorLog' => 'ErrorLog', - 'Download AccessLog' => 'Download Access Log', - 'Download ErrorLog' => 'Download Error Log', + 'AccessLog' => 'ToegangLog', + 'ErrorLog' => 'FoutenLog', + 'Download AccessLog' => 'Download Toegang Log', + 'Download ErrorLog' => 'Download Fout Log', 'Country' => 'Land', '2 letter code' => '2 letterige landcode', 'State / Province' => 'Staat / Provincie', @@ -389,19 +389,19 @@ $LANG['nl'] = array( 'SSH' => 'SSH', 'FTP' => 'FTP', 'VESTA' => 'VESTA', - 'Add one more Name Server' => 'Add one more Name Server', + 'Add one more Name Server' => 'Voeg nog een Name Server toe', - 'web domain' => 'web domain', - 'dns domain' => 'dns domain', + 'web domain' => 'web domein', + 'dns domain' => 'dns domein', 'dns record' => 'dns record', - 'mail domain' => 'mail domain', + 'mail domain' => 'mail domein', 'mail account' => 'mail account', 'cron job' => 'cron job', 'cron' => 'cron', 'user dir' => 'user dir', - 'unlimited' => 'unlimited', + 'unlimited' => 'oneindig', '1 account' => '1 account', '%s accounts' => '%s accounts', '1 domain' => '1 domein', @@ -539,14 +539,14 @@ $LANG['nl'] = array( 'Nov' => 'Nov', 'Dec' => 'Dec', - 'Configuring Server' => 'Configuring Server', + 'Configuring Server' => 'Server Instellen', 'Hostname' => 'Hostname', - 'Time Zone' => 'Time Zone', - 'Default Language' => 'Default Language', + 'Time Zone' => 'Tijdzone', + 'Default Language' => 'Standaard Taal', 'Proxy Server' => 'Proxy Server', 'Web Server' => 'Web Server', 'Backend Server' => 'Backend Server', - 'Backend Pool Mode' => 'Backend Pool Mode', + 'Backend Pool Mode' => 'Backend Pool Stand', 'DNS Server' => 'DNS Server', 'DNS Cluster' => 'DNS Cluster', 'MAIL Server' => 'MAIL Server', @@ -559,19 +559,19 @@ $LANG['nl'] = array( 'phpPgAdmin URL' => 'phpPgAdmin URL', 'Maximum Number Of Databases' => 'Maximum Number Of Databases', 'Current Number Of Databases' => 'Current Number Of Databases', - 'Local backup' => 'Local backup', + 'Local backup' => 'Lokale backup', 'Compression level' => 'Compression level', 'Directory' => 'Directory', - 'Remote backup' => 'Remote backup', + 'Remote backup' => 'Afstand backup', 'ftp' => 'FTP', 'sftp' => 'SFTP', 'SFTP Chroot' => 'SFTP Chroot', - 'FileSystem Disk Quota' => 'FileSystem Disk Quota', + 'FileSystem Disk Quota' => 'BestandenSystem Schijf Quotum', 'Vesta Control Panel Plugins' => 'Vesta Control Panel Plugins', - 'preview' => 'preview', + 'preview' => 'Voorbeeld', 'Reseller Role' => 'Reseller Role', - 'Web Config Editor' => 'Web Config Editor', - 'Template Manager' => 'Template Manager', + 'Web Config Editor' => 'Web Configuratie Bewerker', + 'Template Manager' => 'Voorbeeld Manager', 'Backup Migration Manager' => 'Backup Migration Manager', 'FileManager' => 'FileManager', 'show: CPU / MEM / NET / DISK' => 'show: CPU / MEM / NET / DISK', @@ -694,10 +694,10 @@ $LANG['nl'] = 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.', - 'Minutes' => 'Minutes', - 'Hourly' => 'Hourly', - 'Run Command' => 'Run Command', - 'every month' => 'every month', + 'Minutes' => 'Minuten', + 'Hourly' => 'Ieder Uur', + 'Run Command' => 'Voer commando uit', + 'every month' => 'elke maand', 'every odd month' => 'every odd month', 'every even month' => 'every even month', 'every day' => 'every day', @@ -705,19 +705,19 @@ $LANG['nl'] = array( 'every even day' => 'every even day', 'weekdays (5 days)' => 'weekdays (5 days)', 'weekend (2 days)' => 'weekend (2 days)', - 'Monday' => 'Monday', - 'Tuesday' => 'Tuesday', - 'Wednesday' => 'Wednesday', - 'Thursday' => 'Thursday', - 'Friday' => 'Friday', - 'Saturday' => 'Saturday', - 'Sunday' => 'Sunday', - 'every hour' => 'every hour', - 'every two hours' => 'every two hours', - 'every minute' => 'every minute', - 'every two minutes' => 'every two minutes', - 'every' => 'every', - 'Generate' => 'Generate', + 'Monday' => 'Maandag', + 'Tuesday' => 'Dinsdag', + 'Wednesday' => 'Woensdag', + 'Thursday' => 'Donderdag', + 'Friday' => 'Vrijdag', + 'Saturday' => 'Zaterdag', + 'Sunday' => 'Zondag', + 'every hour' => 'elk uur', + 'every two hours' => 'elke twee uur', + 'every minute' => 'elke minuut', + 'every two minutes' => 'elke twee minuten', + 'every' => 'alle', + 'Generate' => 'Genereer', 'webalizer' => 'webalizer', 'awstats' => 'awstats', From aff5e9066ffbeaa539ebd7fef55263ee9c0a1a8a Mon Sep 17 00:00:00 2001 From: Skamasle Date: Thu, 7 Jul 2016 15:28:20 +0200 Subject: [PATCH 08/13] Update main.sh --- func/main.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/func/main.sh b/func/main.sh index b6c408bb4..5446482e3 100644 --- a/func/main.sh +++ b/func/main.sh @@ -602,10 +602,10 @@ is_dns_record_format_valid() { is_ip_format_valid "$1" fi if [ "$rtype" = 'NS' ]; then - is_domain_format_valid "$1" 'ns_record' + is_domain_format_valid "${1::-1}" 'ns_record' fi if [ "$rtype" = 'MX' ]; then - is_domain_format_valid "$1" 'mx_record' + is_domain_format_valid "${1::-1}" 'mx_record' is_int_format_valid "$priority" 'priority_record' fi From 7417899396b4b3bbfccd9d2c1cf2527d8e8b3665 Mon Sep 17 00:00:00 2001 From: Skamasle Date: Sat, 9 Jul 2016 11:52:22 +0200 Subject: [PATCH 09/13] Update domain.sh --- func/domain.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/func/domain.sh b/func/domain.sh index f345bcf71..dcbd1f7d5 100644 --- a/func/domain.sh +++ b/func/domain.sh @@ -223,7 +223,7 @@ add_web_config() { trigger="${2/.*pl/.sh}" if [ -x "$WEBTPL/$1/$WEB_BACKEND/$trigger" ]; then $WEBTPL/$1/$WEB_BACKEND/$trigger \ - $user $domain $ip $HOMEDIR $HOMEDIR/$user/web/$domain/public_html + $user $domain $local_ip $HOMEDIR $HOMEDIR/$user/web/$domain/public_html fi } From 8481061da0d38c00b67b42335a2caa02067a36c9 Mon Sep 17 00:00:00 2001 From: Flat Date: Sat, 9 Jul 2016 21:02:50 +0900 Subject: [PATCH 10/13] Fix v-list-user-log not containing TIME with JSON format --- bin/v-list-user-log | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/v-list-user-log b/bin/v-list-user-log index 2b4557f41..5f0b9004b 100755 --- a/bin/v-list-user-log +++ b/bin/v-list-user-log @@ -27,7 +27,7 @@ json_list() { echo -n ' "'$ID'": { "CMD": "'$CMD'", "UNDO": "'$UNDO'", - "DATE": "'$DATE'", + "TIME": "'$TIME'", "DATE": "'$DATE'" }' if [ "$i" -lt "$objects" ]; then From 7cc00677e444c2eb0011ca4a554a606ddc3afff0 Mon Sep 17 00:00:00 2001 From: dpeca Date: Wed, 7 Sep 2016 02:49:17 +0200 Subject: [PATCH 11/13] Debian fix for ClamAV /var/run/clamav permission On default Debian8 installation /var/run/clamav has wrong permissions. ERROR: Can't save PID in file /var/run/clamav/clamd.pid Owner was a root. This is a fix for it. --- install/vst-install-debian.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/install/vst-install-debian.sh b/install/vst-install-debian.sh index df6f2eb93..3b1b8803e 100755 --- a/install/vst-install-debian.sh +++ b/install/vst-install-debian.sh @@ -1037,6 +1037,10 @@ if [ "$clamd" = 'yes' ]; then wget $vestacp/clamav/clamd.conf -O /etc/clamav/clamd.conf /usr/bin/freshclam update-rc.d clamav-daemon defaults + if [ ! -d "/var/run/clamav" ]; then + mkdir /var/run/clamav + fi + chown -R clamav:clamav /var/run/clamav service clamav-daemon start check_result $? "clamav-daeom start failed" fi From d70a936792f9715becba5364dcebbd16f435878f Mon Sep 17 00:00:00 2001 From: Alexandr Loskutov Date: Wed, 7 Sep 2016 09:22:20 +0300 Subject: [PATCH 12/13] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B2?= =?UTF-8?q?=D0=BE=D0=B4=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Исправление перевода для правильного отображения текста (подписей) в панели --- web/inc/i18n/ua.php | 100 ++++++++++++++++++++++---------------------- 1 file changed, 50 insertions(+), 50 deletions(-) diff --git a/web/inc/i18n/ua.php b/web/inc/i18n/ua.php index 113e863d6..85bcaaa84 100644 --- a/web/inc/i18n/ua.php +++ b/web/inc/i18n/ua.php @@ -39,7 +39,7 @@ $LANG['ua'] = array( 'MEMORY' => "ПАМ'ЯТЬ", 'DISK' => 'ДИСК', 'NETWORK' => 'МЕРЕЖА', - 'Web Log Manager' => 'Web Log Manager', + 'Web Log Manager' => 'Менеджер Web журналу', 'Add User' => 'Додати користувача', 'Add Domain' => 'Додати домен', @@ -48,7 +48,7 @@ $LANG['ua'] = array( 'Add DNS Record' => 'Додати DNS запис', 'Add Mail Domain' => 'Додати поштовий домен', 'Add Mail Account' => 'Додати поштовий акаунт', - 'Add Database' => 'Додати Базу даних', + 'Add Database' => 'Додати базу даних', 'Add Cron Job' => 'Додати завдання', 'Create Backup' => 'Створити архів', 'Configure' => 'Налаштувати', @@ -182,8 +182,8 @@ $LANG['ua'] = array( 'Mail Domains' => 'Поштові домени', 'Mail Accounts' => 'Поштові акаунти', 'Cron Jobs' => 'Cron завдання', - 'SSH Access' => 'SSH Доступ', - 'IP Address' => 'IP Address', + 'SSH Access' => 'SSH доступ', + 'IP Address' => 'IP адреса', 'IP Addresses' => 'IP адреси', 'Backups' => 'Архіви', 'Backup System' => 'Система резервного копіювання', @@ -210,16 +210,16 @@ $LANG['ua'] = array( 'Autoreply' => 'Автовідповідач', 'Forward to' => 'Перенаправлення', 'Do not store forwarded mail' => 'Не зберігати перенаправлені письма', - 'IMAP hostname' => 'IMAP hostname', - 'IMAP port' => 'IMAP port', - 'IMAP security' => 'IMAP security', - 'IMAP auth method' => 'IMAP auth method', - 'SMTP hostname' => 'SMTP hostname', - 'SMTP port' => 'SMTP port', - 'SMTP security' => 'SMTP security', - 'SMTP auth method' => 'SMTP auth method', + 'IMAP hostname' => "Ім'я IMAP хоста", + 'IMAP port' => 'Порт IMAP', + 'IMAP security' => 'Безпека IMAP', + 'IMAP auth method' => 'Метод аутентифікації IMAP', + 'SMTP hostname' => "Ім'я SMTP хоста", + 'SMTP port' => ' Порт SMTP', + 'SMTP security' => 'Безпека SMTP', + 'SMTP auth method' => 'Метод аутентифікації SMTP', 'STARTTLS' => 'STARTTLS', - 'Normal password' => 'Normal password', + 'Normal password' => 'Нормальний пароль', 'database' => 'база даних', 'User' => 'Користувач', 'Host' => 'Сервер', @@ -239,19 +239,19 @@ $LANG['ua'] = array( 'dedicated' => 'виділений', 'Owner' => 'Власник', 'Users' => 'Користувачі', - 'Load Average' => 'Загальне Навантаження', - 'Memory Usage' => "Використання Пам'яті", - 'APACHE2 Usage' => 'APACHE2 Usage', + 'Load Average' => 'Загальне навантаження', + 'Memory Usage' => "Використання пам'яті", + 'APACHE2 Usage' => 'Використання APACHE2', 'HTTPD Usage' => 'Використання HTTPd', 'NGINX Usage' => 'Використання Proxy', - 'MySQL Usage on localhost' => 'Локальний сервер бази даних MySQL', - 'PostgreSQL Usage on localhost' => 'Локальний сервер бази даних PostgreSQL', + 'MySQL Usage on localhost' => 'Використання локальної MySQL', + 'PostgreSQL Usage on localhost' => 'Використання локальної PostgreSQL', 'Bandwidth Usage eth0' => 'Використання мережі eth0', - 'Exim Usage' => 'Exim Usage', + 'Exim Usage' => 'Використання Exim', 'FTP Usage' => 'Використання FTP', 'SSH Usage' => 'Використання SSH', - 'reverse proxy' => 'зворотній проксі', - 'web server' => 'Web сервер', + 'reverse proxy' => 'зворотній proxy', + 'web server' => 'web сервер', 'dns server' => 'DNS сервер ', 'mail server' => 'поштовий сервер', 'pop/imap server' => 'POP/IMAP сервер', @@ -261,10 +261,10 @@ $LANG['ua'] = array( 'ftp server' => 'FTP сервер', 'job scheduler' => 'планувальник завдань', 'firewall' => 'firewall', - 'brute-force monitor' => 'brute-force monitor', + 'brute-force monitor' => 'брутфорс монітор', 'CPU' => 'Процесор', 'Memory' => "Пам'ять", - 'Uptime' => 'Запущений', + 'Uptime' => 'Працює', 'core package' => 'головний пакет', 'php interpreter' => 'PHP інтерпретатор', 'internal web server' => 'внутрішній веб сервер', @@ -286,7 +286,7 @@ $LANG['ua'] = array( 'DNS Support' => 'Підтримка DNS', 'Mail Support' => 'Підтримка пошти', 'Advanced options' => 'Додаткові опції', - 'Basic options' => 'Basic options', + 'Basic options' => 'Основні параметри', 'Aliases' => 'Аліаси', 'SSL Certificate' => 'SSL сертификат', 'SSL Key' => 'Ключ SSL сертифікату', @@ -351,8 +351,8 @@ $LANG['ua'] = array( 'netmask' => 'маска підмережі', 'interface' => 'інтерфейс', 'assigned user' => 'призначений користувач', - 'ns1' => 'сервер імен #1', - 'ns2' => 'сервер імен #2', + 'ns1' => 'сервер імен №1', + 'ns2' => 'сервер імен №2', 'user' => 'користувач', 'email' => 'пошта', 'first name' => "Ім'я", @@ -390,17 +390,17 @@ $LANG['ua'] = array( 'SSH' => 'SSH', 'FTP' => 'FTP', 'VESTA' => 'VESTA', - 'Add one more Name Server' => 'Add one more Name Server', + 'Add one more Name Server' => 'Додати ще один сервер імен', - 'web domain' => 'web domain', - 'dns domain' => 'dns domain', - 'dns record' => 'dns record', - 'mail domain' => 'mail domain', - 'mail account' => 'mail account', - 'cron job' => 'cron job', + 'web domain' => 'web домен', + 'dns domain' => 'dns домен', + 'dns record' => 'dns запис', + 'mail domain' => 'mail домен', + 'mail account' => 'mail акаунт', + 'cron job' => 'cron завдання', 'cron' => 'cron', - 'user dir' => 'user dir', + 'user dir' => 'тека користувача', 'unlimited' => 'безлімітний', '1 account' => ' 1 акаунт', @@ -446,7 +446,7 @@ $LANG['ua'] = array( 'PACKAGE_CREATED_OK' => 'Пакет %s успішно створено.', 'SSL_GENERATED_OK' => 'SSL cертификат успішно згенеровано.', 'RULE_CREATED_OK' => 'Правило успішно створено.', - 'BANLIST_CREATED_OK' => 'IP address has been banned successfully', // I'm not sure about this text + 'BANLIST_CREATED_OK' => 'IP адреса успішно заблокована', // I'm not sure about this text 'Autoupdate has been successfully enabled' => 'Aвтооновлення було успішно увімкнено', 'Autoupdate has been successfully disabled' => 'Aвтооновлення було успішно вимкнено', 'Cronjob email reporting has been successfully enabled' => 'Cronjob звітування було успішно увімкнено', @@ -478,7 +478,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', @@ -522,7 +522,7 @@ $LANG['ua'] = array( 'Confirm Password' => 'Підтвердження паролю', 'Reset' => 'Скинути', 'Reset Code' => 'Код скидання', - 'RESET_NOTICE' => '', // should we add something here? + 'RESET_NOTICE' => 'Скинути сповіщення', // should we add something here? '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--\nПанель керування Vesta\n", @@ -540,17 +540,17 @@ $LANG['ua'] = array( 'Nov' => 'Лист', 'Dec' => 'Груд', - 'Configuring Server' => 'Налаштування Серверу', + 'Configuring Server' => 'Налаштування серверу', 'Hostname' => "Ім'я хоста", - 'Time Zone' => 'Часовий Пояс', + 'Time Zone' => 'Часовий пояс', 'Default Language' => 'Мова за замовчуванням', - 'Proxy Server' => 'Proxy Server', - 'Web Server' => 'Web Server', - 'Backend Server' => 'Backend Server', + 'Proxy Server' => 'Proxy сервер', + 'Web Server' => 'Web сервер', + 'Backend Server' => 'Backend сервер', 'Backend Pool Mode' => 'Backend Pool Mode', - 'DNS Server' => 'DNS Сервер', - 'DNS Cluster' => 'DNS Кластер', - 'MAIL Server' => 'MAIL Сервер', + 'DNS Server' => 'DNS сервер', + 'DNS Cluster' => 'DNS кластер', + 'MAIL Server' => 'MAIL сервер', 'Antivirus' => 'Антивірус', 'AntiSpam' => 'АнтиСпам', 'Webmail URL' => 'Webmail URL', @@ -571,10 +571,10 @@ $LANG['ua'] = array( 'Vesta Control Panel Plugins' => 'Плагіни Vesta Control Panel', 'preview' => "прев'ю", 'Reseller Role' => 'Реселлер', - 'Web Config Editor' => 'Редактор Веб Конфігів', - 'Template Manager' => 'Менеджер Шаблонів', - 'Backup Migration Manager' => 'Менеджер Міграції Архівів', - 'FileManager' => 'Файл Менеджер', + 'Web Config Editor' => 'Редактор Web конфігів', + 'Template Manager' => 'Менеджер шаблонів', + 'Backup Migration Manager' => 'Менеджер міграції архівів', + 'FileManager' => 'Файл менеджер', 'show: CPU / MEM / NET / DISK' => 'show: CPU / MEM / NET / DISK', 'sort by' => 'сортувати за', @@ -583,7 +583,7 @@ $LANG['ua'] = array( 'Name' => "Ім'я", - 'File Manager' => 'Файловий Менеджер', + 'File Manager' => 'Файловий менеджер', 'size' => 'розмір', 'date' => 'дата', 'name' => "ім'я", From 26146998a6453cba9139cac7d711cd371b868a0a Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Wed, 7 Sep 2016 14:21:07 +0300 Subject: [PATCH 13/13] php5-fpm config for debian 7 --- install/debian/7/php5-fpm/www.conf | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 install/debian/7/php5-fpm/www.conf diff --git a/install/debian/7/php5-fpm/www.conf b/install/debian/7/php5-fpm/www.conf new file mode 100644 index 000000000..d046bceef --- /dev/null +++ b/install/debian/7/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