From 6bd321a1da5222a8d2f19db9bf56da406de73f55 Mon Sep 17 00:00:00 2001 From: Alexey Berezhok Date: Mon, 30 Dec 2024 00:16:14 +0300 Subject: [PATCH] Added passeneg manager. Part 12 --- bin/v-add-web-domain | 1 + func/domain.sh | 6 +- func_ruby/ext-modules/passenger_manager.mod | 30 +- .../payload/passenger_manager/passenger.stpl | 3 +- .../payload/passenger_manager/passenger.tpl | 3 +- web/edit/web/index.php | 5 +- web/locale/hestiacp.pot | 326 +++++++++++------ web/locale/hst_convert_pure_po_pot.rb | 13 +- web/locale/ru/LC_MESSAGES/hestiacp.mo | Bin 60445 -> 62280 bytes web/locale/ru/LC_MESSAGES/hestiacp.po | 329 ++++++++++++------ web/templates/pages/edit_web.php | 11 + 11 files changed, 487 insertions(+), 240 deletions(-) diff --git a/bin/v-add-web-domain b/bin/v-add-web-domain index b565828..0d1bcb6 100755 --- a/bin/v-add-web-domain +++ b/bin/v-add-web-domain @@ -111,6 +111,7 @@ $BIN/v-add-fs-directory "$user" "$HOMEDIR/$user/web/$domain/cgi-bin" $BIN/v-add-fs-directory "$user" "$HOMEDIR/$user/web/$domain/private" $BIN/v-add-fs-directory "$user" "$HOMEDIR/$user/web/$domain/stats" $BIN/v-add-fs-directory "$user" "$HOMEDIR/$user/web/$domain/logs" +$BIN/v-add-fs-directory "$user" "$HOMEDIR/$user/web/$domain/private/tmp" # Creating domain logs touch /var/log/$WEB_SYSTEM/domains/$domain.bytes \ diff --git a/func/domain.sh b/func/domain.sh index d65210c..e84d6f3 100644 --- a/func/domain.sh +++ b/func/domain.sh @@ -193,6 +193,7 @@ prepare_web_domain_values() { fi group="$user" docroot="$HOMEDIR/$user/web/$domain/public_html" + docrtpriv="$HOMEDIR/$user/web/$domain/private" sdocroot="$docroot" if [ "$SSL_HOME" = 'single' ]; then sdocroot="$HOMEDIR/$user/web/$domain/public_shtml" @@ -290,7 +291,8 @@ add_web_config() { if [ -n "$res" ]; then enabled=$(echo "$res" | grep enabled) if [ -n "$enabled" ]; then - RUBY_RES=$(/usr/local/hestia/bin/v-ext-modules-run passenger_manager get_user_ruby "$domain" | tail -n1 | /usr/bin/xargs) + RUBY_RES=$(/usr/local/hestia/bin/v-ext-modules-run passenger_manager get_user_ruby "$domain" csv | tail -n1 | /usr/bin/xargs | cut -d"," -f1) + RUBY_RES_LOG=$(/usr/local/hestia/bin/v-ext-modules-run passenger_manager get_user_ruby "$domain" csv | tail -n1 | /usr/bin/xargs | cut -d"," -f2) if [ -n "$RUBY_RES" ]; then pass_tpl_dir=$(/usr/local/hestia/bin/v-ext-modules-run passenger_manager get_tpl_path | tail -n1 | /usr/bin/xargs) if [ -n "$pass_tpl_dir" ]; then @@ -355,6 +357,7 @@ add_web_config() { -e "s|%ssl_pem%|$ssl_pem|g" \ -e "s|%ssl_ca_str%|$ssl_ca_str|g" \ -e "s|%ssl_ca%|$ssl_ca|g" \ + -e "s|%docrtpriv%|$docrtpriv|g" \ > $conf if [ "$TPLNM" == "srvproxy.tpl" -o "$TPLNM" == "srvproxy.stpl" ];then @@ -368,6 +371,7 @@ add_web_config() { if [[ "$TPLNM" =~ ^passenger ]] && [ -n "$PASS_TPL" ]; then cat "$conf" \ | sed -e "s|%rubypath%|$RUBY_RES|g" \ + -e "s|%rubylog%|$RUBY_RES_LOG|g" \ > $conf.tmp mv -f ${conf}.tmp $conf fi diff --git a/func_ruby/ext-modules/passenger_manager.mod b/func_ruby/ext-modules/passenger_manager.mod index 5f0f6b3..8704658 100644 --- a/func_ruby/ext-modules/passenger_manager.mod +++ b/func_ruby/ext-modules/passenger_manager.mod @@ -140,11 +140,15 @@ class PassengerWorker < Kernel::ModuleCoreWorker when "set_user_ruby" domain = args[1] ruby_ver = args[2] + log_mod = args[3] if domain.nil? || ruby_ver.nil? log_return("Domain or ruby version should be specified. #{args}") else if File.exist?(ruby_ver) dom_file = get_module_conf("domains.conf") + if !log_mod.nil? && log_mod.to_s.strip == "on" + ruby_ver = "#{ruby_ver}|on" + end hestia_save_file_key_pair(dom_file, domain, ruby_ver) ACTION_OK else @@ -168,11 +172,13 @@ class PassengerWorker < Kernel::ModuleCoreWorker dom_file = get_module_conf("domains.conf") format = (args[2].nil? ? "shell" : args[2].strip) val = hestia_get_file_key_pair(dom_file, domain) + val_spl = val.split("|", 2) result = Hash.new - result["RUBY"] = val + result["RUBY"] = val_spl[0] + result["LOG"] = (val_spl.length > 1 ? val_spl[1] : "off") a_result = [] a_result << result - hestia_print_array_of_hashes(a_result, format, "RUBY") + hestia_print_array_of_hashes(a_result, format, "RUBY,LOG") ACTION_OK end when "list_users_ruby" @@ -181,17 +187,31 @@ class PassengerWorker < Kernel::ModuleCoreWorker val = hestia_get_file_keys_value(dom_file) result = Array.new val.each do |key, value| - result << { "DOMAIN" => key, "RUBY" => value } + vv = value.split("|", 2) + result << { "DOMAIN" => key, "RUBY" => vv[0], "LOG" => (vv.length > 1 ? vv[1] : "off") } end - hestia_print_array_of_hashes(result, format, "DOMAIN,RUBY") + hestia_print_array_of_hashes(result, format, "DOMAIN,RUBY,LOG") ACTION_OK when "get_tpl_path" result = [{ "RUBY_TPL" => get_module_paydata_dir }] format = (args[1].nil? ? "shell" : args[1].strip) hestia_print_array_of_hashes(result, format, "RUBY_TPL") ACTION_OK + when "help" + puts "#{$0} passenger_manager COMMAND [OPTIONS] [json|csv|plain]" + puts "COMMANDS:" + puts " get_rubys - list all available rubys pathes" + puts " add_ruby [full_path_to_ruby_binary] - add ruby to list" + puts " del_ruby [full_path_to_ruby] - delete ruby from list" + puts " set_user_ruby [domain] [full_path_to_ruby_binary] [logging on or mpty] - set ruby for domain" + puts " disable_user [domain] - delete ruby for domain" + puts " get_user_ruby [domain] - show ruby path for domain or empty if not set" + puts " list_users_ruby - show rubys for all domains" + puts " get_tpl_path - show path for module's templates" + puts " help - help" + ACTION_OK else - log_return("Unknown commands. #{args}") + log_return("Unknown command. #{args}") end end diff --git a/func_ruby/ext-modules/payload/passenger_manager/passenger.stpl b/func_ruby/ext-modules/payload/passenger_manager/passenger.stpl index 415f671..c4abce3 100644 --- a/func_ruby/ext-modules/payload/passenger_manager/passenger.stpl +++ b/func_ruby/ext-modules/payload/passenger_manager/passenger.stpl @@ -28,10 +28,11 @@ server { passenger_user %user%; passenger_group %user%; passenger_ruby %rubypath%; + passenger_friendly_error_pages %rubylog%; location / { passenger_base_uri /; - passenger_app_root %docroot%; + passenger_app_root %docrtpriv%; passenger_document_root %docroot%; passenger_startup_file config.rb; passenger_app_type rack; diff --git a/func_ruby/ext-modules/payload/passenger_manager/passenger.tpl b/func_ruby/ext-modules/payload/passenger_manager/passenger.tpl index f6e248d..6444e04 100644 --- a/func_ruby/ext-modules/payload/passenger_manager/passenger.tpl +++ b/func_ruby/ext-modules/payload/passenger_manager/passenger.tpl @@ -19,10 +19,11 @@ server { passenger_user %user%; passenger_group %user%; passenger_ruby %rubypath%; + passenger_friendly_error_pages %rubylog%; location / { passenger_base_uri /; - passenger_app_root %docroot%; + passenger_app_root %docrtpriv%; passenger_document_root %docroot%; passenger_startup_file config.rb; passenger_app_type rack; diff --git a/web/edit/web/index.php b/web/edit/web/index.php index f17a5c7..caa9d10 100644 --- a/web/edit/web/index.php +++ b/web/edit/web/index.php @@ -230,8 +230,9 @@ if (!empty($_POST["save"])) { // Save ruby setting for domain if (!empty($_POST["v_passenger_enabled"])){ $v_ruby_path = $_POST["v_ruby_path"]; - if ($v_ruby_path != $domain_ruby[0]["RUBY"]){ - exec(HESTIA_CMD . "v-ext-modules-run passenger_manager set_user_ruby " . quoteshellarg($v_domain) . " ". quoteshellarg($v_ruby_path), $output, $return_var); + $v_ruby_log = !empty($_POST["v_passenger_logging"])?"on":"off"; + if ($v_ruby_path != $domain_ruby[0]["RUBY"] || $v_ruby_log != $domain_ruby[0]["LOG"]){ + exec(HESTIA_CMD . "v-ext-modules-run passenger_manager set_user_ruby " . quoteshellarg($v_domain) . " ". quoteshellarg($v_ruby_path) . " ". $v_ruby_log, $output, $return_var); check_return_code($return_var, $output); $restart_web = "yes"; $restart_proxy = "yes"; diff --git a/web/locale/hestiacp.pot b/web/locale/hestiacp.pot index bd6566c..081433b 100644 --- a/web/locale/hestiacp.pot +++ b/web/locale/hestiacp.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-08-30 21:41+0300\n" +"POT-Creation-Date: 2024-12-30 00:03+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -33,9 +33,9 @@ msgstr "" #: ../../web/add/mail/index.php:233 ../../web/add/package/index.php:103 #: ../../web/add/user/index.php:45 ../../web/add/web/index.php:31 #: ../../web/edit/firewall/index.php:89 ../../web/edit/mail/index.php:598 -#: ../../web/edit/package/index.php:213 ../../web/edit/web/index.php:863 -#: ../../web/edit/web/index.php:1084 ../../web/edit/web/index.php:1124 -#: ../../web/edit/web/index.php:1186 ../../web/edit/web/index.php:1340 +#: ../../web/edit/package/index.php:213 ../../web/edit/web/index.php:949 +#: ../../web/edit/web/index.php:1170 ../../web/edit/web/index.php:1210 +#: ../../web/edit/web/index.php:1272 ../../web/edit/web/index.php:1426 #: ../../web/generate/ssl/index.php:69 #, php-format msgid "Field \"%s\" can not be blank." @@ -117,8 +117,8 @@ msgid "Database" msgstr "" #: ../../web/add/db/index.php:20 ../../web/add/user/index.php:23 -#: ../../web/edit/web/index.php:1074 ../../web/edit/web/index.php:1114 -#: ../../web/edit/web/index.php:1330 ../../web/templates/pages/add_db.php:71 +#: ../../web/edit/web/index.php:1160 ../../web/edit/web/index.php:1200 +#: ../../web/edit/web/index.php:1416 ../../web/templates/pages/add_db.php:71 #: ../../web/templates/pages/add_mail.php:113 #: ../../web/templates/pages/add_mail_acc.php:123 #: ../../web/templates/pages/add_user.php:35 @@ -128,9 +128,9 @@ msgstr "" #: ../../web/templates/pages/edit_server.php:470 #: ../../web/templates/pages/edit_server.php:817 #: ../../web/templates/pages/edit_user.php:64 -#: ../../web/templates/pages/edit_web.php:107 -#: ../../web/templates/pages/edit_web.php:409 -#: ../../web/templates/pages/edit_web.php:463 +#: ../../web/templates/pages/edit_web.php:114 +#: ../../web/templates/pages/edit_web.php:429 +#: ../../web/templates/pages/edit_web.php:536 #: ../../web/templates/pages/list_db.php:65 #: ../../web/templates/pages/list_db.php:113 #: ../../web/templates/pages/list_db.php:247 @@ -155,9 +155,9 @@ msgstr "" #: ../../web/templates/pages/edit_server.php:577 #: ../../web/templates/pages/edit_server.php:829 #: ../../web/templates/pages/edit_user.php:84 -#: ../../web/templates/pages/edit_web.php:112 -#: ../../web/templates/pages/edit_web.php:418 -#: ../../web/templates/pages/edit_web.php:471 +#: ../../web/templates/pages/edit_web.php:119 +#: ../../web/templates/pages/edit_web.php:438 +#: ../../web/templates/pages/edit_web.php:544 #: ../../web/templates/pages/login/login_1.php:12 #: ../../web/templates/pages/login/login_a.php:19 msgid "Password" @@ -220,7 +220,7 @@ msgstr "" #: ../../web/add/db/index.php:48 ../../web/add/mail/index.php:239 #: ../../web/add/user/index.php:50 ../../web/edit/mail/index.php:748 -#: ../../web/edit/user/index.php:411 ../../web/edit/web/index.php:1173 +#: ../../web/edit/user/index.php:411 ../../web/edit/web/index.php:1259 msgid "Please enter a valid email address." msgstr "" @@ -266,7 +266,7 @@ msgstr "" #: ../../web/templates/pages/edit_dns.php:28 #: ../../web/templates/pages/edit_dns_rec.php:28 #: ../../web/templates/pages/edit_mail.php:38 -#: ../../web/templates/pages/edit_web.php:52 +#: ../../web/templates/pages/edit_web.php:59 #: ../../web/templates/pages/generate_ssl.php:18 msgid "Domain" msgstr "" @@ -280,7 +280,7 @@ msgstr "" #: ../../web/templates/pages/add_web.php:47 #: ../../web/templates/pages/edit_dns.php:33 #: ../../web/templates/pages/edit_ip.php:35 -#: ../../web/templates/pages/edit_web.php:69 +#: ../../web/templates/pages/edit_web.php:76 #: ../../web/templates/pages/list_dns.php:28 #: ../../web/templates/pages/list_firewall.php:39 #: ../../web/templates/pages/list_firewall.php:75 @@ -569,21 +569,21 @@ msgstr "" #: ../../web/add/package/index.php:26 ../../web/edit/package/index.php:140 #: ../../web/templates/pages/add_package.php:98 #: ../../web/templates/pages/edit_package.php:100 -#: ../../web/templates/pages/edit_web.php:266 +#: ../../web/templates/pages/edit_web.php:273 msgid "Web Template" msgstr "" #: ../../web/add/package/index.php:30 ../../web/edit/package/index.php:144 #: ../../web/templates/pages/add_package.php:115 #: ../../web/templates/pages/edit_package.php:117 -#: ../../web/templates/pages/edit_web.php:303 +#: ../../web/templates/pages/edit_web.php:310 msgid "Backend Template" msgstr "" #: ../../web/add/package/index.php:38 ../../web/edit/package/index.php:149 #: ../../web/templates/pages/add_package.php:134 #: ../../web/templates/pages/edit_package.php:135 -#: ../../web/templates/pages/edit_web.php:333 +#: ../../web/templates/pages/edit_web.php:340 msgid "Proxy Template" msgstr "" @@ -919,7 +919,7 @@ msgstr "" #: ../../web/edit/server/exim4/index.php:44 #: ../../web/edit/server/fail2ban/index.php:44 #: ../../web/edit/server/httpd/index.php:44 -#: ../../web/edit/server/index.php:1765 ../../web/edit/server/index.php:1769 +#: ../../web/edit/server/index.php:1762 ../../web/edit/server/index.php:1766 #: ../../web/edit/server/mariadb/index.php:44 #: ../../web/edit/server/mysql/index.php:44 #: ../../web/edit/server/mysqld/index.php:44 @@ -934,7 +934,7 @@ msgstr "" #: ../../web/edit/server/spamd/index.php:44 #: ../../web/edit/server/ssh/index.php:44 #: ../../web/edit/server/vsftpd/index.php:44 ../../web/edit/user/index.php:558 -#: ../../web/edit/web/index.php:1603 +#: ../../web/edit/web/index.php:1689 msgid "Changes have been saved." msgstr "" @@ -947,7 +947,7 @@ msgstr "" msgid "Info (read-only mode): Crontab can only be edited via SSH." msgstr "" -#: ../../web/edit/server/index.php:1242 +#: ../../web/edit/server/index.php:1239 msgid "Inactive session timeout can not lower than 1 minute." msgstr "" @@ -955,7 +955,7 @@ msgstr "" msgid "Please enter a valid contact name." msgstr "" -#: ../../web/edit/web/index.php:1245 ../../web/edit/web/index.php:1393 +#: ../../web/edit/web/index.php:1331 ../../web/edit/web/index.php:1479 msgid "" "FTP account has been created and ready to use.\n" "\n" @@ -969,7 +969,7 @@ msgid "" "{{appname}}" msgstr "" -#: ../../web/edit/web/index.php:1262 ../../web/edit/web/index.php:1410 +#: ../../web/edit/web/index.php:1348 ../../web/edit/web/index.php:1496 #, php-format msgid "FTP Account Credentials: %s" msgstr "" @@ -1400,7 +1400,7 @@ msgstr "" #: ../../web/templates/includes/panel.php:294 #: ../../web/templates/pages/add_mail_acc.php:82 #: ../../web/templates/pages/edit_mail_acc.php:82 -#: ../../web/templates/pages/edit_web.php:57 +#: ../../web/templates/pages/edit_web.php:64 #: ../../web/templates/pages/generate_ssl.php:22 #: ../../web/templates/pages/list_mail_acc.php:89 #: ../../web/templates/pages/list_mail_acc.php:268 @@ -1553,6 +1553,8 @@ msgstr "" #: ../../web/templates/pages/login/reset_2.php:27 #: ../../web/templates/pages/login/reset_3.php:29 #: ../../web/templates/pages/setup_webapp.php:6 +#: ../../web/templates/pages/extmodules.php:6 +#: ../../web/templates/pages/extmodules_passenger_manager.php:6 msgid "Back" msgstr "" @@ -1594,6 +1596,7 @@ msgstr "" #: ../../web/templates/pages/edit_web.php:19 #: ../../web/templates/pages/edit_whitelabel.php:11 #: ../../web/templates/pages/setup_webapp.php:11 +#: ../../web/templates/pages/extmodules_passenger_manager.php:11 msgid "Save" msgstr "" @@ -1629,8 +1632,8 @@ msgstr "" #: ../../web/templates/pages/edit_ip.php:69 #: ../../web/templates/pages/edit_ip.php:75 #: ../../web/templates/pages/edit_mail.php:132 -#: ../../web/templates/pages/edit_web.php:208 -#: ../../web/templates/pages/edit_web.php:378 +#: ../../web/templates/pages/edit_web.php:215 +#: ../../web/templates/pages/edit_web.php:398 #: ../../web/templates/pages/generate_ssl.php:28 msgid "Optional" msgstr "" @@ -1717,9 +1720,9 @@ msgstr "" #: ../../web/templates/pages/edit_db.php:43 #: ../../web/templates/pages/edit_mail_acc.php:46 #: ../../web/templates/pages/edit_user.php:85 -#: ../../web/templates/pages/edit_web.php:113 -#: ../../web/templates/pages/edit_web.php:419 -#: ../../web/templates/pages/edit_web.php:472 +#: ../../web/templates/pages/edit_web.php:120 +#: ../../web/templates/pages/edit_web.php:439 +#: ../../web/templates/pages/edit_web.php:545 #: ../../web/templates/pages/generate_ssl.php:59 #: ../../web/templates/pages/setup_webapp.php:63 msgid "Generate" @@ -1995,7 +1998,7 @@ msgstr "" #: ../../web/templates/pages/edit_server_nginx.php:73 #: ../../web/templates/pages/edit_server_php.php:58 #: ../../web/templates/pages/edit_user.php:210 -#: ../../web/templates/pages/edit_web.php:259 +#: ../../web/templates/pages/edit_web.php:266 msgid "Advanced Options" msgstr "" @@ -2062,8 +2065,8 @@ msgstr "" #: ../../web/templates/pages/add_dns.php:140 #: ../../web/templates/pages/add_dns.php:146 #: ../../web/templates/pages/add_dns.php:152 -#: ../../web/templates/pages/edit_web.php:403 -#: ../../web/templates/pages/edit_web.php:457 +#: ../../web/templates/pages/edit_web.php:423 +#: ../../web/templates/pages/edit_web.php:530 #: ../../web/templates/pages/list_access_keys.php:41 #: ../../web/templates/pages/list_access_keys.php:101 #: ../../web/templates/pages/list_access_keys.php:102 @@ -2211,8 +2214,8 @@ msgid "SSH" msgstr "" #: ../../web/templates/pages/add_firewall_banlist.php:38 -#: ../../web/templates/pages/edit_web.php:402 -#: ../../web/templates/pages/edit_web.php:456 +#: ../../web/templates/pages/edit_web.php:422 +#: ../../web/templates/pages/edit_web.php:529 msgid "FTP" msgstr "" @@ -2701,12 +2704,12 @@ msgid "email / hour / account" msgstr "" #: ../../web/templates/pages/edit_mail.php:99 -#: ../../web/templates/pages/edit_web.php:169 +#: ../../web/templates/pages/edit_web.php:176 msgid "Enable SSL for this domain" msgstr "" #: ../../web/templates/pages/edit_mail.php:106 -#: ../../web/templates/pages/edit_web.php:176 +#: ../../web/templates/pages/edit_web.php:183 msgid "Use Let's Encrypt to obtain SSL certificate" msgstr "" @@ -2719,14 +2722,14 @@ msgstr "" #: ../../web/templates/pages/edit_mail.php:121 #: ../../web/templates/pages/edit_server.php:930 -#: ../../web/templates/pages/edit_web.php:197 +#: ../../web/templates/pages/edit_web.php:204 #: ../../web/templates/pages/list_ssl.php:28 msgid "SSL Certificate" msgstr "" #: ../../web/templates/pages/edit_mail.php:122 #: ../../web/templates/pages/edit_server.php:938 -#: ../../web/templates/pages/edit_web.php:198 +#: ../../web/templates/pages/edit_web.php:205 #: ../../web/templates/pages/generate_ssl.php:16 #: ../../web/templates/pages/list_ssl.php:16 msgid "Generate Self-Signed SSL Certificate" @@ -2734,55 +2737,55 @@ msgstr "" #: ../../web/templates/pages/edit_mail.php:127 #: ../../web/templates/pages/edit_server.php:950 -#: ../../web/templates/pages/edit_web.php:203 +#: ../../web/templates/pages/edit_web.php:210 #: ../../web/templates/pages/list_ssl.php:55 msgid "SSL Private Key" msgstr "" #: ../../web/templates/pages/edit_mail.php:132 -#: ../../web/templates/pages/edit_web.php:208 +#: ../../web/templates/pages/edit_web.php:215 msgid "SSL Certificate Authority / Intermediate" msgstr "" #: ../../web/templates/pages/edit_mail.php:140 #: ../../web/templates/pages/edit_server.php:960 -#: ../../web/templates/pages/edit_web.php:216 +#: ../../web/templates/pages/edit_web.php:223 msgid "Issued To" msgstr "" #: ../../web/templates/pages/edit_mail.php:145 #: ../../web/templates/pages/edit_server.php:965 -#: ../../web/templates/pages/edit_web.php:221 +#: ../../web/templates/pages/edit_web.php:228 msgid "Alternate" msgstr "" #: ../../web/templates/pages/edit_mail.php:150 #: ../../web/templates/pages/edit_server.php:970 -#: ../../web/templates/pages/edit_web.php:226 +#: ../../web/templates/pages/edit_web.php:233 msgid "Not Before" msgstr "" #: ../../web/templates/pages/edit_mail.php:154 #: ../../web/templates/pages/edit_server.php:974 -#: ../../web/templates/pages/edit_web.php:230 +#: ../../web/templates/pages/edit_web.php:237 msgid "Not After" msgstr "" #: ../../web/templates/pages/edit_mail.php:158 #: ../../web/templates/pages/edit_server.php:978 -#: ../../web/templates/pages/edit_web.php:234 +#: ../../web/templates/pages/edit_web.php:241 msgid "Signature" msgstr "" #: ../../web/templates/pages/edit_mail.php:162 #: ../../web/templates/pages/edit_server.php:982 -#: ../../web/templates/pages/edit_web.php:238 +#: ../../web/templates/pages/edit_web.php:245 msgid "Key Size" msgstr "" #: ../../web/templates/pages/edit_mail.php:166 #: ../../web/templates/pages/edit_server.php:986 -#: ../../web/templates/pages/edit_web.php:242 +#: ../../web/templates/pages/edit_web.php:249 msgid "Issued By" msgstr "" @@ -3041,7 +3044,7 @@ msgstr "" #: ../../web/templates/pages/edit_server.php:728 #: ../../web/templates/pages/edit_server.php:843 #: ../../web/templates/pages/edit_server.php:907 -#: ../../web/templates/pages/edit_web.php:378 +#: ../../web/templates/pages/edit_web.php:398 msgid "Directory" msgstr "" @@ -3222,10 +3225,10 @@ msgstr "" #: ../../web/templates/pages/edit_server_service.php:34 #: ../../web/templates/pages/list_services.php:25 #: ../../web/templates/pages/list_services.php:28 -#: ../../web/templates/pages/list_services.php:38 -#: ../../web/templates/pages/list_services.php:175 -#: ../../web/templates/pages/list_services.php:176 -#: ../../web/templates/pages/list_services.php:180 +#: ../../web/templates/pages/list_services.php:41 +#: ../../web/templates/pages/list_services.php:178 +#: ../../web/templates/pages/list_services.php:179 +#: ../../web/templates/pages/list_services.php:183 msgid "Restart" msgstr "" @@ -3274,7 +3277,7 @@ msgid "Use IP address allow list for login attempts" msgstr "" #: ../../web/templates/pages/edit_user.php:135 -#: ../../web/templates/pages/edit_web.php:294 +#: ../../web/templates/pages/edit_web.php:301 msgid "For example" msgstr "" @@ -3341,110 +3344,131 @@ msgstr "" msgid "Quick Install App" msgstr "" -#: ../../web/templates/pages/edit_web.php:49 +#: ../../web/templates/pages/edit_web.php:56 msgid "Edit Web Domain" msgstr "" -#: ../../web/templates/pages/edit_web.php:64 +#: ../../web/templates/pages/edit_web.php:71 msgid "" "If the aliases changes, Let's Encrypt will obtain a new SSL certificate." msgstr "" -#: ../../web/templates/pages/edit_web.php:81 +#: ../../web/templates/pages/edit_web.php:88 msgid "Web Statistics" msgstr "" -#: ../../web/templates/pages/edit_web.php:100 +#: ../../web/templates/pages/edit_web.php:107 msgid "Statistics Authorization" msgstr "" -#: ../../web/templates/pages/edit_web.php:126 +#: ../../web/templates/pages/edit_web.php:133 msgid "Enable domain redirection" msgstr "" -#: ../../web/templates/pages/edit_web.php:133 -#: ../../web/templates/pages/edit_web.php:139 +#: ../../web/templates/pages/edit_web.php:140 +#: ../../web/templates/pages/edit_web.php:146 #, php-format msgid "Redirect visitors to %s" msgstr "" -#: ../../web/templates/pages/edit_web.php:145 +#: ../../web/templates/pages/edit_web.php:152 msgid "Redirect visitors to a custom domain or web address" msgstr "" -#: ../../web/templates/pages/edit_web.php:150 +#: ../../web/templates/pages/edit_web.php:157 msgid "Target domain or URL" msgstr "" -#: ../../web/templates/pages/edit_web.php:154 +#: ../../web/templates/pages/edit_web.php:161 msgid "Status code" msgstr "" -#: ../../web/templates/pages/edit_web.php:182 +#: ../../web/templates/pages/edit_web.php:189 msgid "Enable automatic HTTPS redirection" msgstr "" -#: ../../web/templates/pages/edit_web.php:188 +#: ../../web/templates/pages/edit_web.php:195 msgid "Enable HTTP Strict Transport Security (HSTS)" msgstr "" -#: ../../web/templates/pages/edit_web.php:250 +#: ../../web/templates/pages/edit_web.php:257 msgid "Hide Certificate" msgstr "" -#: ../../web/templates/pages/edit_web.php:250 -#: ../../web/templates/pages/edit_web.php:251 +#: ../../web/templates/pages/edit_web.php:257 +#: ../../web/templates/pages/edit_web.php:258 msgid "Show Certificate" msgstr "" -#: ../../web/templates/pages/edit_web.php:285 +#: ../../web/templates/pages/edit_web.php:292 msgid "Enable FastCGI cache" msgstr "" -#: ../../web/templates/pages/edit_web.php:294 +#: ../../web/templates/pages/edit_web.php:301 msgid "Cache Duration" msgstr "" -#: ../../web/templates/pages/edit_web.php:327 +#: ../../web/templates/pages/edit_web.php:334 msgid "Proxy Support" msgstr "" -#: ../../web/templates/pages/edit_web.php:351 +#: ../../web/templates/pages/edit_web.php:365 +msgid "Set port for internal service" +msgstr "" + +#: ../../web/templates/pages/edit_web.php:371 msgid "Proxy Extensions" msgstr "" -#: ../../web/templates/pages/edit_web.php:360 +#: ../../web/templates/pages/edit_web.php:380 msgid "Custom document root" msgstr "" -#: ../../web/templates/pages/edit_web.php:365 +#: ../../web/templates/pages/edit_web.php:385 msgid "Point to" msgstr "" -#: ../../web/templates/pages/edit_web.php:388 +#: ../../web/templates/pages/edit_web.php:408 msgid "Additional FTP account(s)" msgstr "" -#: ../../web/templates/pages/edit_web.php:410 -#: ../../web/templates/pages/edit_web.php:464 +#: ../../web/templates/pages/edit_web.php:430 +#: ../../web/templates/pages/edit_web.php:537 #, php-format msgid "Prefix %s will be added to username automatically" msgstr "" -#: ../../web/templates/pages/edit_web.php:426 -#: ../../web/templates/pages/edit_web.php:479 +#: ../../web/templates/pages/edit_web.php:446 +#: ../../web/templates/pages/edit_web.php:552 +#: ../../web/templates/pages/extmodules_passenger_manager.php:43 msgid "Path" msgstr "" -#: ../../web/templates/pages/edit_web.php:434 -#: ../../web/templates/pages/edit_web.php:485 +#: ../../web/templates/pages/edit_web.php:454 +#: ../../web/templates/pages/edit_web.php:558 msgid "Send FTP credentials to email" msgstr "" -#: ../../web/templates/pages/edit_web.php:443 +#: ../../web/templates/pages/edit_web.php:463 msgid "Add FTP account" msgstr "" +#: ../../web/templates/pages/edit_web.php:472 +msgid "Passenger options" +msgstr "" + +#: ../../web/templates/pages/edit_web.php:485 +msgid "Enable passenger for domain" +msgstr "" + +#: ../../web/templates/pages/edit_web.php:490 +msgid "Set ruby path for domain" +msgstr "" + +#: ../../web/templates/pages/edit_web.php:512 +msgid "Enable logging to browser for domain" +msgstr "" + #: ../../web/templates/pages/edit_whitelabel.php:33 msgid "White Label Options" msgstr "" @@ -3591,8 +3615,8 @@ msgstr "" #: ../../web/templates/pages/list_mail_acc.php:56 #: ../../web/templates/pages/list_packages.php:32 #: ../../web/templates/pages/list_packages.php:35 -#: ../../web/templates/pages/list_services.php:35 -#: ../../web/templates/pages/list_services.php:40 +#: ../../web/templates/pages/list_services.php:38 +#: ../../web/templates/pages/list_services.php:43 #: ../../web/templates/pages/list_stats.php:29 #: ../../web/templates/pages/list_user.php:41 #: ../../web/templates/pages/list_user.php:54 @@ -3615,7 +3639,7 @@ msgstr "" #: ../../web/templates/pages/list_mail.php:73 #: ../../web/templates/pages/list_mail_acc.php:83 #: ../../web/templates/pages/list_packages.php:52 -#: ../../web/templates/pages/list_services.php:97 +#: ../../web/templates/pages/list_services.php:100 #: ../../web/templates/pages/list_user.php:80 #: ../../web/templates/pages/list_web.php:76 msgid "Select all" @@ -3666,8 +3690,8 @@ msgstr "" #: ../../web/templates/pages/list_mail_acc.php:164 #: ../../web/templates/pages/list_packages.php:118 #: ../../web/templates/pages/list_packages.php:119 -#: ../../web/templates/pages/list_services.php:148 -#: ../../web/templates/pages/list_services.php:149 +#: ../../web/templates/pages/list_services.php:151 +#: ../../web/templates/pages/list_services.php:152 #: ../../web/templates/pages/list_user.php:144 #: ../../web/templates/pages/list_user.php:145 #: ../../web/templates/pages/list_web.php:194 @@ -3891,9 +3915,10 @@ msgstr "" #: ../../web/templates/pages/list_cron.php:133 #: ../../web/templates/pages/list_cron.php:136 -#: ../../web/templates/pages/list_services.php:155 -#: ../../web/templates/pages/list_services.php:165 +#: ../../web/templates/pages/list_services.php:158 #: ../../web/templates/pages/list_services.php:168 +#: ../../web/templates/pages/list_services.php:171 +#: ../../web/templates/pages/extmodules.php:95 msgid "Edit" msgstr "" @@ -4378,8 +4403,8 @@ msgid "Hestia Control Panel" msgstr "" #: ../../web/templates/pages/list_server_info.php:42 -#: ../../web/templates/pages/list_services.php:103 -#: ../../web/templates/pages/list_services.php:205 +#: ../../web/templates/pages/list_services.php:106 +#: ../../web/templates/pages/list_services.php:208 msgid "CPU" msgstr "" @@ -4414,71 +4439,75 @@ msgid "Task Monitor" msgstr "" #: ../../web/templates/pages/list_services.php:26 -#: ../../web/templates/pages/list_services.php:177 +#: ../../web/templates/pages/list_services.php:180 #, php-format msgid "Are you sure you want to restart %s?" msgstr "" -#: ../../web/templates/pages/list_services.php:36 -#: ../../web/templates/pages/list_services.php:114 +#: ../../web/templates/pages/list_services.php:31 +msgid "ExtModules" +msgstr "" + +#: ../../web/templates/pages/list_services.php:39 +#: ../../web/templates/pages/list_services.php:117 msgid "Stop" msgstr "" -#: ../../web/templates/pages/list_services.php:37 -#: ../../web/templates/pages/list_services.php:121 +#: ../../web/templates/pages/list_services.php:40 +#: ../../web/templates/pages/list_services.php:124 msgid "Start" msgstr "" -#: ../../web/templates/pages/list_services.php:65 +#: ../../web/templates/pages/list_services.php:68 msgid "Production Release" msgstr "" -#: ../../web/templates/pages/list_services.php:71 +#: ../../web/templates/pages/list_services.php:74 msgid "Operating System" msgstr "" -#: ../../web/templates/pages/list_services.php:77 +#: ../../web/templates/pages/list_services.php:80 msgid "Load Average" msgstr "" -#: ../../web/templates/pages/list_services.php:83 -#: ../../web/templates/pages/list_services.php:102 -#: ../../web/templates/pages/list_services.php:201 +#: ../../web/templates/pages/list_services.php:86 +#: ../../web/templates/pages/list_services.php:105 +#: ../../web/templates/pages/list_services.php:204 msgid "Uptime" msgstr "" -#: ../../web/templates/pages/list_services.php:92 +#: ../../web/templates/pages/list_services.php:95 msgid "Services" msgstr "" -#: ../../web/templates/pages/list_services.php:99 -#: ../../web/templates/pages/list_services.php:153 +#: ../../web/templates/pages/list_services.php:102 +#: ../../web/templates/pages/list_services.php:156 msgid "Service" msgstr "" -#: ../../web/templates/pages/list_services.php:101 -#: ../../web/templates/pages/list_services.php:197 +#: ../../web/templates/pages/list_services.php:104 +#: ../../web/templates/pages/list_services.php:200 #: ../../web/templates/pages/list_updates.php:34 #: ../../web/templates/pages/list_updates.php:58 msgid "Description" msgstr "" -#: ../../web/templates/pages/list_services.php:104 -#: ../../web/templates/pages/list_services.php:209 +#: ../../web/templates/pages/list_services.php:107 +#: ../../web/templates/pages/list_services.php:212 msgid "Memory" msgstr "" -#: ../../web/templates/pages/list_services.php:188 +#: ../../web/templates/pages/list_services.php:191 #, php-format msgid "Are you sure you want to stop service %s?" msgstr "" -#: ../../web/templates/pages/list_services.php:188 +#: ../../web/templates/pages/list_services.php:191 #, php-format msgid "Are you sure you want to start service %s?" msgstr "" -#: ../../web/templates/pages/list_services.php:210 +#: ../../web/templates/pages/list_services.php:213 msgid "MB" msgstr "" @@ -4718,6 +4747,78 @@ msgstr "" msgid "Please make sure ~/web/%s/public_html is empty!" msgstr "" +#: ../../web/templates/pages/extmodules.php:15 +msgid "List modules" +msgstr "" + +#: ../../web/templates/pages/extmodules.php:19 +#: ../../web/templates/pages/extmodules.php:50 +msgid "Module ID" +msgstr "" + +#: ../../web/templates/pages/extmodules.php:20 +#: ../../web/templates/pages/extmodules.php:54 +msgid "Module name" +msgstr "" + +#: ../../web/templates/pages/extmodules.php:22 +#: ../../web/templates/pages/extmodules.php:78 +msgid "Module description" +msgstr "" + +#: ../../web/templates/pages/extmodules.php:23 +#: ../../web/templates/pages/extmodules.php:82 +msgid "Module state" +msgstr "" + +#: ../../web/templates/pages/extmodules.php:24 +#: ../../web/templates/pages/extmodules.php:86 +msgid "Requirements" +msgstr "" + +#: ../../web/templates/pages/extmodules.php:25 +#: ../../web/templates/pages/extmodules.php:90 +msgid "Configuration" +msgstr "" + +#: ../../web/templates/pages/extmodules.php:35 +msgid "Enable module" +msgstr "" + +#: ../../web/templates/pages/extmodules.php:38 +#, php-format +msgid "Are you sure you want to enable module %s?" +msgstr "" + +#: ../../web/templates/pages/extmodules.php:42 +msgid "Disable module" +msgstr "" + +#: ../../web/templates/pages/extmodules.php:45 +#, php-format +msgid "Are you sure you want to disable module %s?" +msgstr "" + +#: ../../web/templates/pages/extmodules.php:114 +msgid "Extended modules list" +msgstr "" + +#: ../../web/templates/pages/extmodules_passenger_manager.php:31 +msgid "Passenger manager" +msgstr "" + +#: ../../web/templates/pages/extmodules_passenger_manager.php:38 +msgid "Add new ruby path" +msgstr "" + +#: ../../web/templates/pages/extmodules_passenger_manager.php:60 +msgid "Are you sure you want to delete item?" +msgstr "" + +#: ../../web/templates/pages/extmodules_passenger_manager.php:71 +msgid "Ruby available list" +msgstr "" + #: ../../web/update/hestia/index.php:20 #, php-format msgid "Error: %s update failed." @@ -4740,6 +4841,7 @@ msgid "web server" msgstr "" #: ../../bin/v-list-sys-services:183 +192 msgid "php interpreter" msgstr "" diff --git a/web/locale/hst_convert_pure_po_pot.rb b/web/locale/hst_convert_pure_po_pot.rb index 77bb4bf..b0ac1a2 100755 --- a/web/locale/hst_convert_pure_po_pot.rb +++ b/web/locale/hst_convert_pure_po_pot.rb @@ -103,6 +103,13 @@ else else if msgid_id == "" msgid_tmp += line + else + if line.strip != "" + post_msgid[msgid_id] << line + else + msgid_id = "" + msgid_tmp = "" + end end end end @@ -132,8 +139,10 @@ else if post_msgid[msgid_id].nil? f.puts line else - post_msgid[msgid_id].each do |item| - f.puts item + if msgid_id.strip.gsub("\n", "") != "\"\"" + post_msgid[msgid_id].each do |item| + f.puts item + end end end end diff --git a/web/locale/ru/LC_MESSAGES/hestiacp.mo b/web/locale/ru/LC_MESSAGES/hestiacp.mo index 908fab9f47f4f69d21d4761ce5f33d077689dd2e..09b48005637c040f474c4931729f4d8d503b98ed 100644 GIT binary patch delta 16520 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 delta 14992 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 D^BLPw diff --git a/web/locale/ru/LC_MESSAGES/hestiacp.po b/web/locale/ru/LC_MESSAGES/hestiacp.po index e61a6a4..e383215 100644 --- a/web/locale/ru/LC_MESSAGES/hestiacp.po +++ b/web/locale/ru/LC_MESSAGES/hestiacp.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: hestiacp\n" "Report-Msgid-Bugs-To: a@bayrepo.ru\n" -"PO-Revision-Date: 2024-08-29 11:26\n" +"PO-Revision-Date: 2024-12-30 11:26\n" "Last-Translator: \n" "Language-Team: Russian\n" "Language: ru_RU\n" @@ -28,9 +28,9 @@ msgstr "Разрешения" #: ../../web/add/mail/index.php:233 ../../web/add/package/index.php:103 #: ../../web/add/user/index.php:45 ../../web/add/web/index.php:31 #: ../../web/edit/firewall/index.php:89 ../../web/edit/mail/index.php:598 -#: ../../web/edit/package/index.php:213 ../../web/edit/web/index.php:863 -#: ../../web/edit/web/index.php:1084 ../../web/edit/web/index.php:1124 -#: ../../web/edit/web/index.php:1186 ../../web/edit/web/index.php:1340 +#: ../../web/edit/package/index.php:213 ../../web/edit/web/index.php:949 +#: ../../web/edit/web/index.php:1170 ../../web/edit/web/index.php:1210 +#: ../../web/edit/web/index.php:1272 ../../web/edit/web/index.php:1426 #: ../../web/generate/ssl/index.php:69 #, php-format msgid "Field \"%s\" can not be blank." @@ -112,8 +112,8 @@ msgid "Database" msgstr "База данных" #: ../../web/add/db/index.php:20 ../../web/add/user/index.php:23 -#: ../../web/edit/web/index.php:1074 ../../web/edit/web/index.php:1114 -#: ../../web/edit/web/index.php:1330 ../../web/templates/pages/add_db.php:71 +#: ../../web/edit/web/index.php:1160 ../../web/edit/web/index.php:1200 +#: ../../web/edit/web/index.php:1416 ../../web/templates/pages/add_db.php:71 #: ../../web/templates/pages/add_mail.php:113 #: ../../web/templates/pages/add_mail_acc.php:123 #: ../../web/templates/pages/add_user.php:35 @@ -123,9 +123,9 @@ msgstr "База данных" #: ../../web/templates/pages/edit_server.php:470 #: ../../web/templates/pages/edit_server.php:817 #: ../../web/templates/pages/edit_user.php:64 -#: ../../web/templates/pages/edit_web.php:107 -#: ../../web/templates/pages/edit_web.php:409 -#: ../../web/templates/pages/edit_web.php:463 +#: ../../web/templates/pages/edit_web.php:114 +#: ../../web/templates/pages/edit_web.php:429 +#: ../../web/templates/pages/edit_web.php:536 #: ../../web/templates/pages/list_db.php:65 #: ../../web/templates/pages/list_db.php:113 #: ../../web/templates/pages/list_db.php:247 @@ -150,9 +150,9 @@ msgstr "Аккаунт" #: ../../web/templates/pages/edit_server.php:577 #: ../../web/templates/pages/edit_server.php:829 #: ../../web/templates/pages/edit_user.php:84 -#: ../../web/templates/pages/edit_web.php:112 -#: ../../web/templates/pages/edit_web.php:418 -#: ../../web/templates/pages/edit_web.php:471 +#: ../../web/templates/pages/edit_web.php:119 +#: ../../web/templates/pages/edit_web.php:438 +#: ../../web/templates/pages/edit_web.php:544 #: ../../web/templates/pages/login/login_1.php:12 #: ../../web/templates/pages/login/login_a.php:19 msgid "Password" @@ -215,7 +215,7 @@ msgstr "Кодировка" #: ../../web/add/db/index.php:48 ../../web/add/mail/index.php:239 #: ../../web/add/user/index.php:50 ../../web/edit/mail/index.php:748 -#: ../../web/edit/user/index.php:411 ../../web/edit/web/index.php:1173 +#: ../../web/edit/user/index.php:411 ../../web/edit/web/index.php:1259 msgid "Please enter a valid email address." msgstr "Пожалуйста, введите правильный адрес электронной почты." @@ -272,7 +272,7 @@ msgstr "База данных {%s} успешно создана. / {Откры #: ../../web/templates/pages/edit_dns.php:28 #: ../../web/templates/pages/edit_dns_rec.php:28 #: ../../web/templates/pages/edit_mail.php:38 -#: ../../web/templates/pages/edit_web.php:52 +#: ../../web/templates/pages/edit_web.php:59 #: ../../web/templates/pages/generate_ssl.php:18 msgid "Domain" msgstr "Домен" @@ -286,7 +286,7 @@ msgstr "Домен" #: ../../web/templates/pages/add_web.php:47 #: ../../web/templates/pages/edit_dns.php:33 #: ../../web/templates/pages/edit_ip.php:35 -#: ../../web/templates/pages/edit_web.php:69 +#: ../../web/templates/pages/edit_web.php:76 #: ../../web/templates/pages/list_dns.php:28 #: ../../web/templates/pages/list_firewall.php:39 #: ../../web/templates/pages/list_firewall.php:75 @@ -605,21 +605,21 @@ msgstr "Пакет" #: ../../web/add/package/index.php:26 ../../web/edit/package/index.php:140 #: ../../web/templates/pages/add_package.php:98 #: ../../web/templates/pages/edit_package.php:100 -#: ../../web/templates/pages/edit_web.php:266 +#: ../../web/templates/pages/edit_web.php:273 msgid "Web Template" msgstr "Шаблон Web" #: ../../web/add/package/index.php:30 ../../web/edit/package/index.php:144 #: ../../web/templates/pages/add_package.php:115 #: ../../web/templates/pages/edit_package.php:117 -#: ../../web/templates/pages/edit_web.php:303 +#: ../../web/templates/pages/edit_web.php:310 msgid "Backend Template" msgstr "Шаблон Backend" #: ../../web/add/package/index.php:38 ../../web/edit/package/index.php:149 #: ../../web/templates/pages/add_package.php:134 #: ../../web/templates/pages/edit_package.php:135 -#: ../../web/templates/pages/edit_web.php:333 +#: ../../web/templates/pages/edit_web.php:340 msgid "Proxy Template" msgstr "Шаблон Proxy" @@ -971,7 +971,7 @@ msgstr "Загрузка файла удаленной резервной коп #: ../../web/edit/server/exim4/index.php:44 #: ../../web/edit/server/fail2ban/index.php:44 #: ../../web/edit/server/httpd/index.php:44 -#: ../../web/edit/server/index.php:1765 ../../web/edit/server/index.php:1769 +#: ../../web/edit/server/index.php:1762 ../../web/edit/server/index.php:1766 #: ../../web/edit/server/mariadb/index.php:44 #: ../../web/edit/server/mysql/index.php:44 #: ../../web/edit/server/mysqld/index.php:44 @@ -986,7 +986,7 @@ msgstr "Загрузка файла удаленной резервной коп #: ../../web/edit/server/spamd/index.php:44 #: ../../web/edit/server/ssh/index.php:44 #: ../../web/edit/server/vsftpd/index.php:44 ../../web/edit/user/index.php:558 -#: ../../web/edit/web/index.php:1603 +#: ../../web/edit/web/index.php:1689 msgid "Changes have been saved." msgstr "Изменения были сохранены." @@ -999,7 +999,7 @@ msgstr "Ошибка: неизвестный идентификатор запи msgid "Info (read-only mode): Crontab can only be edited via SSH." msgstr "Информация (read-only режим): Crontab может быть отредактирован только через SSH." -#: ../../web/edit/server/index.php:1242 +#: ../../web/edit/server/index.php:1239 msgid "Inactive session timeout can not lower than 1 minute." msgstr "Длительность неактивной сессии не может быть меньше 1 минуты." @@ -1007,7 +1007,7 @@ msgstr "Длительность неактивной сессии не може msgid "Please enter a valid contact name." msgstr "Пожалуйста, введите корректное имя контакта" -#: ../../web/edit/web/index.php:1245 ../../web/edit/web/index.php:1393 +#: ../../web/edit/web/index.php:1331 ../../web/edit/web/index.php:1479 msgid "" "FTP account has been created and ready to use.\n" "\n" @@ -1031,7 +1031,7 @@ msgstr "" "--\n" "{{appname}}" -#: ../../web/edit/web/index.php:1262 ../../web/edit/web/index.php:1410 +#: ../../web/edit/web/index.php:1348 ../../web/edit/web/index.php:1496 #, php-format msgid "FTP Account Credentials: %s" msgstr "Учетные данные FTP-аккаунта: %s" @@ -1480,7 +1480,7 @@ msgstr "Домены" #: ../../web/templates/includes/panel.php:294 #: ../../web/templates/pages/add_mail_acc.php:82 #: ../../web/templates/pages/edit_mail_acc.php:82 -#: ../../web/templates/pages/edit_web.php:57 +#: ../../web/templates/pages/edit_web.php:64 #: ../../web/templates/pages/generate_ssl.php:22 #: ../../web/templates/pages/list_mail_acc.php:89 #: ../../web/templates/pages/list_mail_acc.php:268 @@ -1633,6 +1633,8 @@ msgstr "РЕЗЕРВНОЕ КОПИРОВАНИЕ" #: ../../web/templates/pages/login/reset_2.php:27 #: ../../web/templates/pages/login/reset_3.php:29 #: ../../web/templates/pages/setup_webapp.php:6 +#: ../../web/templates/pages/extmodules.php:6 +#: ../../web/templates/pages/extmodules_passenger_manager.php:6 msgid "Back" msgstr "Назад" @@ -1674,6 +1676,7 @@ msgstr "Назад" #: ../../web/templates/pages/edit_web.php:19 #: ../../web/templates/pages/edit_whitelabel.php:11 #: ../../web/templates/pages/setup_webapp.php:11 +#: ../../web/templates/pages/extmodules_passenger_manager.php:11 msgid "Save" msgstr "Сохранить" @@ -1709,8 +1712,8 @@ msgstr "Коментарий" #: ../../web/templates/pages/edit_ip.php:69 #: ../../web/templates/pages/edit_ip.php:75 #: ../../web/templates/pages/edit_mail.php:132 -#: ../../web/templates/pages/edit_web.php:208 -#: ../../web/templates/pages/edit_web.php:378 +#: ../../web/templates/pages/edit_web.php:215 +#: ../../web/templates/pages/edit_web.php:398 #: ../../web/templates/pages/generate_ssl.php:28 msgid "Optional" msgstr "Опционально" @@ -1797,9 +1800,9 @@ msgstr "Каждые %s минут" #: ../../web/templates/pages/edit_db.php:43 #: ../../web/templates/pages/edit_mail_acc.php:46 #: ../../web/templates/pages/edit_user.php:85 -#: ../../web/templates/pages/edit_web.php:113 -#: ../../web/templates/pages/edit_web.php:419 -#: ../../web/templates/pages/edit_web.php:472 +#: ../../web/templates/pages/edit_web.php:120 +#: ../../web/templates/pages/edit_web.php:439 +#: ../../web/templates/pages/edit_web.php:545 #: ../../web/templates/pages/generate_ssl.php:59 #: ../../web/templates/pages/setup_webapp.php:63 msgid "Generate" @@ -2078,7 +2081,7 @@ msgstr "Отправить учетные данные для входа на а #: ../../web/templates/pages/edit_server_nginx.php:73 #: ../../web/templates/pages/edit_server_php.php:58 #: ../../web/templates/pages/edit_user.php:210 -#: ../../web/templates/pages/edit_web.php:259 +#: ../../web/templates/pages/edit_web.php:266 msgid "Advanced Options" msgstr "Расширенные настройки" @@ -2145,8 +2148,8 @@ msgstr "Серверы имен" #: ../../web/templates/pages/add_dns.php:140 #: ../../web/templates/pages/add_dns.php:146 #: ../../web/templates/pages/add_dns.php:152 -#: ../../web/templates/pages/edit_web.php:403 -#: ../../web/templates/pages/edit_web.php:457 +#: ../../web/templates/pages/edit_web.php:423 +#: ../../web/templates/pages/edit_web.php:530 #: ../../web/templates/pages/list_access_keys.php:41 #: ../../web/templates/pages/list_access_keys.php:101 #: ../../web/templates/pages/list_access_keys.php:102 @@ -2294,8 +2297,8 @@ msgid "SSH" msgstr "SSH" #: ../../web/templates/pages/add_firewall_banlist.php:38 -#: ../../web/templates/pages/edit_web.php:402 -#: ../../web/templates/pages/edit_web.php:456 +#: ../../web/templates/pages/edit_web.php:422 +#: ../../web/templates/pages/edit_web.php:529 msgid "FTP" msgstr "FTP" @@ -2789,12 +2792,12 @@ msgid "email / hour / account" msgstr "почта / час / учётная запись" #: ../../web/templates/pages/edit_mail.php:99 -#: ../../web/templates/pages/edit_web.php:169 +#: ../../web/templates/pages/edit_web.php:176 msgid "Enable SSL for this domain" msgstr "Включить SSL для этого домена" #: ../../web/templates/pages/edit_mail.php:106 -#: ../../web/templates/pages/edit_web.php:176 +#: ../../web/templates/pages/edit_web.php:183 msgid "Use Let's Encrypt to obtain SSL certificate" msgstr "Использовать Let’s Encrypt для получения SSL-сертификата" @@ -2809,14 +2812,14 @@ msgstr "" #: ../../web/templates/pages/edit_mail.php:121 #: ../../web/templates/pages/edit_server.php:930 -#: ../../web/templates/pages/edit_web.php:197 +#: ../../web/templates/pages/edit_web.php:204 #: ../../web/templates/pages/list_ssl.php:28 msgid "SSL Certificate" msgstr "SSL сертификат" #: ../../web/templates/pages/edit_mail.php:122 #: ../../web/templates/pages/edit_server.php:938 -#: ../../web/templates/pages/edit_web.php:198 +#: ../../web/templates/pages/edit_web.php:205 #: ../../web/templates/pages/generate_ssl.php:16 #: ../../web/templates/pages/list_ssl.php:16 msgid "Generate Self-Signed SSL Certificate" @@ -2824,55 +2827,55 @@ msgstr "Создать самозаверяющий SSL-сертификат" #: ../../web/templates/pages/edit_mail.php:127 #: ../../web/templates/pages/edit_server.php:950 -#: ../../web/templates/pages/edit_web.php:203 +#: ../../web/templates/pages/edit_web.php:210 #: ../../web/templates/pages/list_ssl.php:55 msgid "SSL Private Key" msgstr "Закрытый ключ SSL" #: ../../web/templates/pages/edit_mail.php:132 -#: ../../web/templates/pages/edit_web.php:208 +#: ../../web/templates/pages/edit_web.php:215 msgid "SSL Certificate Authority / Intermediate" msgstr "Центр сертификации SSL / Промежуточный" #: ../../web/templates/pages/edit_mail.php:140 #: ../../web/templates/pages/edit_server.php:960 -#: ../../web/templates/pages/edit_web.php:216 +#: ../../web/templates/pages/edit_web.php:223 msgid "Issued To" msgstr "Адресован к" #: ../../web/templates/pages/edit_mail.php:145 #: ../../web/templates/pages/edit_server.php:965 -#: ../../web/templates/pages/edit_web.php:221 +#: ../../web/templates/pages/edit_web.php:228 msgid "Alternate" msgstr "Альтернативный" #: ../../web/templates/pages/edit_mail.php:150 #: ../../web/templates/pages/edit_server.php:970 -#: ../../web/templates/pages/edit_web.php:226 +#: ../../web/templates/pages/edit_web.php:233 msgid "Not Before" msgstr "действителен от" #: ../../web/templates/pages/edit_mail.php:154 #: ../../web/templates/pages/edit_server.php:974 -#: ../../web/templates/pages/edit_web.php:230 +#: ../../web/templates/pages/edit_web.php:237 msgid "Not After" msgstr "действителен до" #: ../../web/templates/pages/edit_mail.php:158 #: ../../web/templates/pages/edit_server.php:978 -#: ../../web/templates/pages/edit_web.php:234 +#: ../../web/templates/pages/edit_web.php:241 msgid "Signature" msgstr "Сигнатура" #: ../../web/templates/pages/edit_mail.php:162 #: ../../web/templates/pages/edit_server.php:982 -#: ../../web/templates/pages/edit_web.php:238 +#: ../../web/templates/pages/edit_web.php:245 msgid "Key Size" msgstr "Размер ключа" #: ../../web/templates/pages/edit_mail.php:166 #: ../../web/templates/pages/edit_server.php:986 -#: ../../web/templates/pages/edit_web.php:242 +#: ../../web/templates/pages/edit_web.php:249 msgid "Issued By" msgstr "Адресован от" @@ -3133,7 +3136,7 @@ msgstr "только zstd " #: ../../web/templates/pages/edit_server.php:728 #: ../../web/templates/pages/edit_server.php:843 #: ../../web/templates/pages/edit_server.php:907 -#: ../../web/templates/pages/edit_web.php:378 +#: ../../web/templates/pages/edit_web.php:398 msgid "Directory" msgstr "Каталог" @@ -3304,10 +3307,6 @@ msgstr "Квота размера памяти файловой системы" msgid "Firewall" msgstr "Файрвол" -#: ../../web/templates/pages/list_services.php:31 -msgid "ExtModules" -msgstr "Доп. модули" - #: ../../web/templates/pages/edit_server_bind9.php:38 #: ../../web/templates/pages/edit_server_dovecot.php:68 #: ../../web/templates/pages/edit_server_httpd.php:37 @@ -3318,10 +3317,10 @@ msgstr "Доп. модули" #: ../../web/templates/pages/edit_server_service.php:34 #: ../../web/templates/pages/list_services.php:25 #: ../../web/templates/pages/list_services.php:28 -#: ../../web/templates/pages/list_services.php:38 -#: ../../web/templates/pages/list_services.php:175 -#: ../../web/templates/pages/list_services.php:176 -#: ../../web/templates/pages/list_services.php:180 +#: ../../web/templates/pages/list_services.php:41 +#: ../../web/templates/pages/list_services.php:178 +#: ../../web/templates/pages/list_services.php:179 +#: ../../web/templates/pages/list_services.php:183 msgid "Restart" msgstr "Перезапуск" @@ -3370,7 +3369,7 @@ msgid "Use IP address allow list for login attempts" msgstr "Использовать список IP, разрешенных для входа " #: ../../web/templates/pages/edit_user.php:135 -#: ../../web/templates/pages/edit_web.php:294 +#: ../../web/templates/pages/edit_web.php:301 msgid "For example" msgstr "Например" @@ -3437,111 +3436,132 @@ msgstr "Очистить кэш памяти NGINX" msgid "Quick Install App" msgstr "Установить приложение" -#: ../../web/templates/pages/edit_web.php:49 +#: ../../web/templates/pages/edit_web.php:56 msgid "Edit Web Domain" msgstr "Изменить веб-домен" -#: ../../web/templates/pages/edit_web.php:64 +#: ../../web/templates/pages/edit_web.php:71 msgid "" "If the aliases changes, Let's Encrypt will obtain a new SSL certificate." msgstr "" "Если алиасы изменяются, Let's Encrypt запросит новый SSL сертификат." -#: ../../web/templates/pages/edit_web.php:81 +#: ../../web/templates/pages/edit_web.php:88 msgid "Web Statistics" msgstr "Статистика сайта" -#: ../../web/templates/pages/edit_web.php:100 +#: ../../web/templates/pages/edit_web.php:107 msgid "Statistics Authorization" msgstr "Ограниченный доступ к статистике" -#: ../../web/templates/pages/edit_web.php:126 +#: ../../web/templates/pages/edit_web.php:133 msgid "Enable domain redirection" msgstr "Включить редирект для домена" -#: ../../web/templates/pages/edit_web.php:133 -#: ../../web/templates/pages/edit_web.php:139 +#: ../../web/templates/pages/edit_web.php:140 +#: ../../web/templates/pages/edit_web.php:146 #, php-format msgid "Redirect visitors to %s" msgstr "Перенаправлять посетителей на %s" -#: ../../web/templates/pages/edit_web.php:145 +#: ../../web/templates/pages/edit_web.php:152 msgid "Redirect visitors to a custom domain or web address" msgstr "Перенаправлять посетителей на домен или веб адрес" -#: ../../web/templates/pages/edit_web.php:150 +#: ../../web/templates/pages/edit_web.php:157 msgid "Target domain or URL" msgstr "Целевой домен или URL" -#: ../../web/templates/pages/edit_web.php:154 +#: ../../web/templates/pages/edit_web.php:161 msgid "Status code" msgstr "Код редиректа" -#: ../../web/templates/pages/edit_web.php:182 +#: ../../web/templates/pages/edit_web.php:189 msgid "Enable automatic HTTPS redirection" msgstr "Включить автоматическое перенаправление на HTTPS" -#: ../../web/templates/pages/edit_web.php:188 +#: ../../web/templates/pages/edit_web.php:195 msgid "Enable HTTP Strict Transport Security (HSTS)" msgstr "Включить строгую транспортную безопасность HTTP (HSTS)" -#: ../../web/templates/pages/edit_web.php:250 +#: ../../web/templates/pages/edit_web.php:257 msgid "Hide Certificate" msgstr "Скрыть сертификат" -#: ../../web/templates/pages/edit_web.php:250 -#: ../../web/templates/pages/edit_web.php:251 +#: ../../web/templates/pages/edit_web.php:257 +#: ../../web/templates/pages/edit_web.php:258 msgid "Show Certificate" msgstr "Показать сертификат" -#: ../../web/templates/pages/edit_web.php:285 +#: ../../web/templates/pages/edit_web.php:292 msgid "Enable FastCGI cache" msgstr "Включить кеш FastCGI" -#: ../../web/templates/pages/edit_web.php:294 +#: ../../web/templates/pages/edit_web.php:301 msgid "Cache Duration" msgstr "Время жизни кеша" -#: ../../web/templates/pages/edit_web.php:327 +#: ../../web/templates/pages/edit_web.php:334 msgid "Proxy Support" msgstr "Поддержка Proxy" -#: ../../web/templates/pages/edit_web.php:351 +#: ../../web/templates/pages/edit_web.php:365 +msgid "Set port for internal service" +msgstr "Установить порт для локального сервиса" + +#: ../../web/templates/pages/edit_web.php:371 msgid "Proxy Extensions" msgstr "Обработка Proxy" -#: ../../web/templates/pages/edit_web.php:360 +#: ../../web/templates/pages/edit_web.php:380 msgid "Custom document root" msgstr "Пользовательский document root" -#: ../../web/templates/pages/edit_web.php:365 +#: ../../web/templates/pages/edit_web.php:385 msgid "Point to" msgstr "Указывает на " -#: ../../web/templates/pages/edit_web.php:388 +#: ../../web/templates/pages/edit_web.php:408 msgid "Additional FTP account(s)" msgstr "Дополнительные учетные записи FTP" -#: ../../web/templates/pages/edit_web.php:410 -#: ../../web/templates/pages/edit_web.php:464 +#: ../../web/templates/pages/edit_web.php:430 +#: ../../web/templates/pages/edit_web.php:537 #, php-format msgid "Prefix %s will be added to username automatically" msgstr "Префикс %s будет добавлен к имени пользователя автоматически" -#: ../../web/templates/pages/edit_web.php:426 -#: ../../web/templates/pages/edit_web.php:479 +#: ../../web/templates/pages/edit_web.php:446 +#: ../../web/templates/pages/edit_web.php:552 +#: ../../web/templates/pages/extmodules_passenger_manager.php:43 msgid "Path" msgstr "Путь" -#: ../../web/templates/pages/edit_web.php:434 -#: ../../web/templates/pages/edit_web.php:485 +#: ../../web/templates/pages/edit_web.php:454 +#: ../../web/templates/pages/edit_web.php:558 msgid "Send FTP credentials to email" msgstr "Отправить данные FTP аккаунта на почту" -#: ../../web/templates/pages/edit_web.php:443 +#: ../../web/templates/pages/edit_web.php:463 msgid "Add FTP account" msgstr "Добавить учетную запись FTP" +#: ../../web/templates/pages/edit_web.php:472 +msgid "Passenger options" +msgstr "Настройки passenger" + +#: ../../web/templates/pages/edit_web.php:485 +msgid "Enable passenger for domain" +msgstr "Включить passenger для домена" + +#: ../../web/templates/pages/edit_web.php:490 +msgid "Set ruby path for domain" +msgstr "Учтановить используемый ruby" + +#: ../../web/templates/pages/edit_web.php:512 +msgid "Enable logging to browser for domain" +msgstr "Включить логирование в браузер" + #: ../../web/templates/pages/edit_whitelabel.php:33 msgid "White Label Options" msgstr "Настройки \"Белой Этикетки\"" @@ -3688,8 +3708,8 @@ msgstr "Сортировать по" #: ../../web/templates/pages/list_mail_acc.php:56 #: ../../web/templates/pages/list_packages.php:32 #: ../../web/templates/pages/list_packages.php:35 -#: ../../web/templates/pages/list_services.php:35 -#: ../../web/templates/pages/list_services.php:40 +#: ../../web/templates/pages/list_services.php:38 +#: ../../web/templates/pages/list_services.php:43 #: ../../web/templates/pages/list_stats.php:29 #: ../../web/templates/pages/list_user.php:41 #: ../../web/templates/pages/list_user.php:54 @@ -3712,7 +3732,7 @@ msgstr "Применить к выбранному" #: ../../web/templates/pages/list_mail.php:73 #: ../../web/templates/pages/list_mail_acc.php:83 #: ../../web/templates/pages/list_packages.php:52 -#: ../../web/templates/pages/list_services.php:97 +#: ../../web/templates/pages/list_services.php:100 #: ../../web/templates/pages/list_user.php:80 #: ../../web/templates/pages/list_web.php:76 msgid "Select all" @@ -3763,8 +3783,8 @@ msgstr "Время" #: ../../web/templates/pages/list_mail_acc.php:164 #: ../../web/templates/pages/list_packages.php:118 #: ../../web/templates/pages/list_packages.php:119 -#: ../../web/templates/pages/list_services.php:148 -#: ../../web/templates/pages/list_services.php:149 +#: ../../web/templates/pages/list_services.php:151 +#: ../../web/templates/pages/list_services.php:152 #: ../../web/templates/pages/list_user.php:144 #: ../../web/templates/pages/list_user.php:145 #: ../../web/templates/pages/list_web.php:194 @@ -3985,9 +4005,10 @@ msgstr "Вы уверены, что хотите заморозить дейст #: ../../web/templates/pages/list_cron.php:133 #: ../../web/templates/pages/list_cron.php:136 -#: ../../web/templates/pages/list_services.php:155 -#: ../../web/templates/pages/list_services.php:165 +#: ../../web/templates/pages/list_services.php:158 #: ../../web/templates/pages/list_services.php:168 +#: ../../web/templates/pages/list_services.php:171 +#: ../../web/templates/pages/extmodules.php:95 msgid "Edit" msgstr "Изменить" @@ -4458,8 +4479,8 @@ msgid "Hestia Control Panel" msgstr "Панель управления Hestia" #: ../../web/templates/pages/list_server_info.php:42 -#: ../../web/templates/pages/list_services.php:103 -#: ../../web/templates/pages/list_services.php:205 +#: ../../web/templates/pages/list_services.php:106 +#: ../../web/templates/pages/list_services.php:208 msgid "CPU" msgstr "Процессор" @@ -4494,71 +4515,75 @@ msgid "Task Monitor" msgstr "Монитор задач" #: ../../web/templates/pages/list_services.php:26 -#: ../../web/templates/pages/list_services.php:177 +#: ../../web/templates/pages/list_services.php:180 #, php-format msgid "Are you sure you want to restart %s?" msgstr "Вы уверены, что хотите перезапустить %s?" -#: ../../web/templates/pages/list_services.php:36 -#: ../../web/templates/pages/list_services.php:114 +#: ../../web/templates/pages/list_services.php:31 +msgid "ExtModules" +msgstr "Доп. модули" + +#: ../../web/templates/pages/list_services.php:39 +#: ../../web/templates/pages/list_services.php:117 msgid "Stop" msgstr "Остановить" -#: ../../web/templates/pages/list_services.php:37 -#: ../../web/templates/pages/list_services.php:121 +#: ../../web/templates/pages/list_services.php:40 +#: ../../web/templates/pages/list_services.php:124 msgid "Start" msgstr "Запустить" -#: ../../web/templates/pages/list_services.php:65 +#: ../../web/templates/pages/list_services.php:68 msgid "Production Release" msgstr "Версия продукта" -#: ../../web/templates/pages/list_services.php:71 +#: ../../web/templates/pages/list_services.php:74 msgid "Operating System" msgstr "Операционная система" -#: ../../web/templates/pages/list_services.php:77 +#: ../../web/templates/pages/list_services.php:80 msgid "Load Average" msgstr "Общая нагрузка" -#: ../../web/templates/pages/list_services.php:83 -#: ../../web/templates/pages/list_services.php:102 -#: ../../web/templates/pages/list_services.php:201 +#: ../../web/templates/pages/list_services.php:86 +#: ../../web/templates/pages/list_services.php:105 +#: ../../web/templates/pages/list_services.php:204 msgid "Uptime" msgstr "Запущен" -#: ../../web/templates/pages/list_services.php:92 +#: ../../web/templates/pages/list_services.php:95 msgid "Services" msgstr "Службы" -#: ../../web/templates/pages/list_services.php:99 -#: ../../web/templates/pages/list_services.php:153 +#: ../../web/templates/pages/list_services.php:102 +#: ../../web/templates/pages/list_services.php:156 msgid "Service" msgstr "Службы" -#: ../../web/templates/pages/list_services.php:101 -#: ../../web/templates/pages/list_services.php:197 +#: ../../web/templates/pages/list_services.php:104 +#: ../../web/templates/pages/list_services.php:200 #: ../../web/templates/pages/list_updates.php:34 #: ../../web/templates/pages/list_updates.php:58 msgid "Description" msgstr "Описание" -#: ../../web/templates/pages/list_services.php:104 -#: ../../web/templates/pages/list_services.php:209 +#: ../../web/templates/pages/list_services.php:107 +#: ../../web/templates/pages/list_services.php:212 msgid "Memory" msgstr "Память" -#: ../../web/templates/pages/list_services.php:188 +#: ../../web/templates/pages/list_services.php:191 #, php-format msgid "Are you sure you want to stop service %s?" msgstr "Вы уверены, что хотите остановить службу %s?" -#: ../../web/templates/pages/list_services.php:188 +#: ../../web/templates/pages/list_services.php:191 #, php-format msgid "Are you sure you want to start service %s?" msgstr "Вы уверены, что хотите запустить службу %s?" -#: ../../web/templates/pages/list_services.php:210 +#: ../../web/templates/pages/list_services.php:213 msgid "MB" msgstr "МБ" @@ -4799,6 +4824,78 @@ msgstr "" msgid "Please make sure ~/web/%s/public_html is empty!" msgstr "Убедитесь, что ~/web/%s/public_html пуста!" +#: ../../web/templates/pages/extmodules.php:15 +msgid "List modules" +msgstr "Список модулей" + +#: ../../web/templates/pages/extmodules.php:19 +#: ../../web/templates/pages/extmodules.php:50 +msgid "Module ID" +msgstr "ID модуля" + +#: ../../web/templates/pages/extmodules.php:20 +#: ../../web/templates/pages/extmodules.php:54 +msgid "Module name" +msgstr "Имя модуля" + +#: ../../web/templates/pages/extmodules.php:22 +#: ../../web/templates/pages/extmodules.php:78 +msgid "Module description" +msgstr "Описание модуля" + +#: ../../web/templates/pages/extmodules.php:23 +#: ../../web/templates/pages/extmodules.php:82 +msgid "Module state" +msgstr "Состояние" + +#: ../../web/templates/pages/extmodules.php:24 +#: ../../web/templates/pages/extmodules.php:86 +msgid "Requirements" +msgstr "Зависимости" + +#: ../../web/templates/pages/extmodules.php:25 +#: ../../web/templates/pages/extmodules.php:90 +msgid "Configuration" +msgstr "Конфигурация" + +#: ../../web/templates/pages/extmodules.php:35 +msgid "Enable module" +msgstr "Включить модуль" + +#: ../../web/templates/pages/extmodules.php:38 +#, php-format +msgid "Are you sure you want to enable module %s?" +msgstr "Вы уверены, что хотите включить модуль %s?" + +#: ../../web/templates/pages/extmodules.php:42 +msgid "Disable module" +msgstr "Отключить модуль" + +#: ../../web/templates/pages/extmodules.php:45 +#, php-format +msgid "Are you sure you want to disable module %s?" +msgstr "Вы уверены, что хотите отключить модуль %s?" + +#: ../../web/templates/pages/extmodules.php:114 +msgid "Extended modules list" +msgstr "Список расширенных модулей" + +#: ../../web/templates/pages/extmodules_passenger_manager.php:31 +msgid "Passenger manager" +msgstr "Passenger manager" + +#: ../../web/templates/pages/extmodules_passenger_manager.php:38 +msgid "Add new ruby path" +msgstr "Добавить новый путь ruby" + +#: ../../web/templates/pages/extmodules_passenger_manager.php:60 +msgid "Are you sure you want to delete item?" +msgstr "Вы уверены, что хотите удалить запись?" + +#: ../../web/templates/pages/extmodules_passenger_manager.php:71 +msgid "Ruby available list" +msgstr "Список доступных ruby" + #: ../../web/update/hestia/index.php:20 #, php-format msgid "Error: %s update failed." diff --git a/web/templates/pages/edit_web.php b/web/templates/pages/edit_web.php index 33f866d..0063885 100644 --- a/web/templates/pages/edit_web.php +++ b/web/templates/pages/edit_web.php @@ -501,6 +501,17 @@ if ($passenger_state == "enabled") { ?> +
+ > + +