v6.3.8.0

Changelog: https://roxy-wi.org/changelog#6_3_8

app/scripts/ansible/roles/service_common/tasks/main.yml

@@ -36,6 +36,20 @@
     - { path: "{{ service_dir }}/conf.d"}
   when: service not in ansible_facts.packages
 
+- name: Creates directorys for Apache
+  file:
+    path: "{{ item.path }}"
+    state: directory
+    mode: 0775
+    owner: "{{ service_user }}"
+    group: "{{ service_group }}"
+  with_items:
+    - { path: "{{ service_dir }}"}
+    - { path: "{{ service_dir }}/{{ conf_folder }}"}
+  when:
+    - service not in ansible_facts.packages
+    - service = "apache"
+
 
 - name: Set passlib version
   set_fact:

app/scripts/install_keepalived.sh

@@ -37,6 +37,10 @@ PWD=`pwd`
 PWD=$PWD/scripts/ansible/
 echo "$HOST ansible_port=$SSH_PORT" > $PWD/$HOST
 
+if [[ $MASTER == 'BACKUP' ]]; then
+  sleep 5
+fi
+
 if [[ $KEY == "" ]]; then
   ansible-playbook $PWD/roles/keepalived.yml -e "ansible_user=$USER ansible_ssh_pass='$PASS' variable_host=$HOST SYN_FLOOD=$SYN_FLOOD PROXY=$PROXY MASTER=$MASTER ETH=$ETH ETH_SLAVE=$ETH_SLAVE keepalived_path_logs=$keepalived_path_logs IP=$IP RESTART=$RESTART RETURN_TO_MASTER=$RETURN_TO_MASTER ADD_VRRP=$ADD_VRRP router_id=$router_id HAPROXY=$HAPROXY NGINX=$NGINX SSH_PORT=$SSH_PORT" -i $PWD/$HOST
 else

app/statsview.py

@@ -27,13 +27,15 @@ except Exception:
 if service in ('haproxy', 'nginx', 'apache'):
 	service_desc = sql.select_service(service)
 	if roxywi_auth.check_login(user_params['user_uuid'], user_params['token'], service=service_desc.service_id):
-		roxywi_common.get_dick_permit(service=service_desc.slug)
+		servers = roxywi_common.get_dick_permit(service=service_desc.slug)
 else:
 	print('<meta http-equiv="refresh" content="0; url=/app/overview.py">')
 
+
+
 rendered_template = template.render(
 	h2=1, autorefresh=1, role=user_params['role'], user=user_params['user'], onclick="showStats()",
-	selects=user_params['servers'], serv=serv, service=service, user_services=user_params['user_services'],
+	selects=servers, serv=serv, service=service, user_services=user_params['user_services'],
 	token=user_params['token'], select_id="serv", lang=user_params['lang'], service_desc=service_desc
 )
 print(rendered_template)

app/templates/ha.html

@@ -142,7 +142,7 @@
 <div class="add-note alert addName alert-info" style="width: inherit; margin-right: 15px;">
 	{{lang.words.read|title()}} <a href="https://roxy-wi.org/howto.py/ha_cluster" title="How to create high available cluster" target="_blank">{{lang.phrases.howto_ha}}</a>
 </div>
-<div id="server_creating" style="display: none;">
+<div id="server_creating" style="display: none;" title="{{lang.phrases.creating_ha}}">
     <ul style="padding: 20px 20px 0px 20px;font-size: 15px;">
         <li id="creating-master" class="server-creating proccessing">{{lang.words.installing|title()}} {{lang.words.master|title()}} Keepalived...</li>
         <li id="creating-slave" class="server-creating proccessing">{{lang.words.installing|title()}} {{lang.words.slave|title()}} Keepalived...</li>
@@ -163,7 +163,7 @@
         <div id="creating-progress" style="width: 0%;"></div>
     </div>
 </div>
-<div id="address_creating" style="display: none;">
+<div id="address_creating" style="display: none;" title="{{lang.phrases.adding_vrrp}}">
     <ul style="padding: 20px 20px 0px 20px;font-size: 15px;">
         <li id="creating-master-add" class="server-creating proccessing">{{lang.words.creating|title()}} {{lang.words.a}} {{lang.words.new}} {{lang.words.address}} {{lang.words.on}} {{lang.words.master|title()}} Keepalived...</li>
         <li id="creating-slave-add" class="server-creating proccessing">{{lang.words.creating|title()}} {{lang.words.a}} {{lang.words.new}} {{lang.words.address}} {{lang.words.on}} {{lang.words.slave|title()}} Keepalived...</li>

app/templates/languages/en.html

@@ -251,6 +251,7 @@
     "how_to_install_metrics": "how to install Metrics service",
     "checker_not_installed": "You do not have the Checker service installed",
     "how_to_install_checker": "how to install checker service",
+    "auto_start_not_installed": "You do not have the Auto start service installed",
     "enable_avg_table": "Enable display of the table of averages",
     "disable_avg_table": "Disable display of the table of averages",
     "protected_title": "If protection is enabled, then the server is inaccessible for editing by everyone except the admin role",
@@ -300,6 +301,14 @@
     "select_newer_config": "Select a newer config",
     "not_checked": "Without check",
     "show_not_checked": "Show servers without checking",
+    "read_desc_runtime_api": "You can read the description of all Run Time API parameters",
+    "read_desc_statuses": "You can read the description about statuses",
+    "login_or_pass_incorrect": "Login or password is incorrect",
+    "can_try_again": "You can try again in",
+    "is_not_installed": "is not installed",
+    "server_is_inaccessible_for_editing": "This server is inaccessible for editing by everyone except the admin role",
+    "creating_ha": "Creating a new High Availability cluster",
+    "adding_vrrp": "Adding a new VRRP address",
     }
 %}
 {% set roles = {
@@ -550,6 +559,7 @@
     "interval": "interval",
     "desc": "description",
     "login": "login",
+    "login2": "login",
     "role": "role",
     "roles": "roles",
     "subs": "subscription",
@@ -557,6 +567,7 @@
     "plan": "plan",
     "pay_method": "pay method",
     "active": "active",
+    "actives": "actives",
     "open": "open",
     "opened": "opened",
     "edit": "edit",
@@ -574,6 +585,7 @@
     "show": "show",
     "run": "run",
     "running": "running",
+    "running2": "running",
     "statistics": "statistics",
     "rollback": "rollback",
     "previous": "previous",
@@ -585,6 +597,7 @@
     "backend": "backend",
     "maintain": "maintain",
     "drain": "drain",
+    "drains": "drains",
     "number": "number",
     "rows": "rows",
     "row": "row",
@@ -665,6 +678,7 @@
     "connections2": "connections",
     "enable": "enable",
     "enabled": "enabled",
+    "enabled2": "enabled",
     "virt": "virt",
     "virtual": "virtual",
     "check": "check",
@@ -833,5 +847,9 @@
     "recent": "recent",
     "already": "already",
     "disable": "disable",
+    "worker": "worker",
+    "worker2": "worker",
+    "processes": "processes",
+    "position": "position",
     }
 %}

app/templates/languages/fr.html

@@ -247,10 +247,11 @@
     "howto_user": "Comment utilser",
     "select_file": "Selectionner un fichier",
     "read_how_it_works": "Vous pouvez lire comment cela fonctionne",
-    "metrics_not_installed": "Vous n\'avez pas installer le service Metrics.",
+    "metrics_not_installed": "Vous n\'avez pas installer le service Metrics",
     "how_to_install_metrics": "Comment installer le service Metrics",
     "checker_not_installed": "Vous n'avez pas installé le service Checker",
     "how_to_install_checker": "comment installer le service de vérification",
+    "auto_start_not_installed": "Vous n'avez pas installé le service de démarrage automatique",
     "enable_avg_table": "Activer l\'affichage du tableau des moyennes",
     "disable_avg_table": "Désactiver l\'affichage du tableau des moyennes",
     "protected_title": "Si la protection est activée, le serveur est inaccessible pour modification par tout le monde, sauf par le rôle d\'administrateur.",
@@ -300,6 +301,14 @@
     "select_newer_config": "Sélectionnez une configuration plus récente",
     "not_checked": "Sans chèque",
     "show_not_checked": "Afficher les serveurs sans vérifier",
+    "read_desc_runtime_api": "Vous pouvez lire la description de tous les paramètres de l'API RunTime",
+    "read_desc_statuses": "Vous pouvez lire la description des statuts",
+    "login_or_pass_incorrect": "L'identifiant ou le mot de passe est incorrect",
+    "can_try_again": "Vous pouvez réessayer dans",
+    "is_not_installed": "n'est pas installé",
+    "server_is_inaccessible_for_editing": "Ce serveur est inaccessible pour modification par tout le monde sauf le rôle d'administrateur",
+    "creating_ha": "Créer un nouveau cluster haute disponibilité",
+    "adding_vrrp": "Ajout d'une nouvelle adresse VRRP",
     }
 %}
 {% set roles = {
@@ -550,6 +559,7 @@
     "interval": "interval",
     "desc": "déscription",
     "login": "connexion",
+    "login2": "connexion",
     "role": "rôle",
     "roles": "rôles",
     "subs": "abonnement",
@@ -557,6 +567,7 @@
     "plan": "plan",
     "pay_method": "méthode de paiement",
     "active": "actif",
+    "actives": "actifs",
     "open": "ouvert",
     "opened": "ouvert",
     "edit": "éditer",
@@ -574,6 +585,7 @@
     "show": "afficher",
     "run": "exécuter",
     "running": "exécution en cours",
+    "running2": "lancés",
     "statistics": "statistiques",
     "rollback": "retour en arrière",
     "previous": "précédent",
@@ -585,6 +597,7 @@
     "backend": "backend",
     "maintain": "maintain",
     "drain": "drain",
+    "drains": "draine",
     "number": "nombre",
     "rows": "lignes",
     "row": "ligne",
@@ -665,6 +678,7 @@
     "connections2": "connections",
     "enable": "activer",
     "enabled": "activé",
+    "enabled2": "activé",
     "virt": "virt",
     "virtual": "virtuel",
     "check": "check",
@@ -833,5 +847,9 @@
     "recent": "récent",
     "already": "déjà",
     "disable": "désactiver",
+    "worker": "ouvrier",
+    "worker2": "ouvrier",
+    "processes": "processus",
+    "position": "position",
     }
 %}

app/templates/languages/pt-br.html

@@ -247,10 +247,11 @@
     "howto_user": "Como utilizar",
     "select_file": "Escolhe um arquivo",
     "read_how_it_works": "Você pode ler como isso funciona",
-    "metrics_not_installed": "Você não instalou o serviço Métricas.",
+    "metrics_not_installed": "Você não instalou o serviço Métricas",
     "how_to_install_metrics": "Como instalar o serviço Métricas",
     "checker_not_installed": "Você não tem o serviço Checker instalado",
     "how_to_install_checker": "como instalar o serviço verificador",
+    "auto_start_not_installed": "Você não tem o serviço de início automático instalado",
     "enable_avg_table": "Ativar exibição da tabela de médias",
     "disable_avg_table": "Desativar exibição da tabela de médiasDisable display of the table of averages",
     "protected_title": "Se a proteção estiver ativada, o servidor ficará inacessível para edição por todos, exceto administradores",
@@ -300,6 +301,14 @@
     "select_newer_config": "Selecione uma configuração mais nova",
     "not_checked": "Sem cheque",
     "show_not_checked": "Mostrar servidores sem verificar",
+    "read_desc_runtime_api": "Você pode ler a descrição de todos os parâmetros da API RunTime",
+    "read_desc_statuses": "Você pode ler a descrição sobre os status",
+    "login_or_pass_incorrect": "Login ou senha está incorreto",
+    "can_try_again": "Você pode tentar novamente em",
+    "is_not_installed": "não está instalado",
+    "server_is_inaccessible_for_editing": "Este servidor está inacessível para edição por todos, exceto a função de administrador",
+    "creating_ha": "Criando um novo cluster de alta disponibilidade",
+    "adding_vrrp": "Adicionando um novo endereço VRRP",
     }
 %}
 {% set roles = {
@@ -550,6 +559,7 @@
     "interval": "interval",
     "desc": "descrição",
     "login": "login",
+    "login2": "login",
     "role": "função",
     "roles": "funções",
     "subs": "inscrição",
@@ -557,6 +567,7 @@
     "plan": "plan",
     "pay_method": "método de pagamento.",
     "active": "ativo",
+    "actives": "ativos",
     "open": "abrir",
     "opened": "aberto",
     "edit": "editar",
@@ -574,6 +585,7 @@
     "show": "mostrar",
     "run": "executar",
     "running": "executando",
+    "running2": "iniciados",
     "statistics": "estatisticas",
     "rollback": "rollback",
     "previous": "anterior",
@@ -585,6 +597,7 @@
     "backend": "backend",
     "maintain": "manter",
     "drain": "desativado",
+    "drains": "drenos",
     "number": "número",
     "rows": "linhas",
     "row": "linha",
@@ -665,6 +678,7 @@
     "connections2": "conexões",
     "enable": "ativar",
     "enabled": "desativar",
+    "enabled2": "desativar",
     "virt": "virt",
     "virtual": "virtual",
     "check": "verificar",
@@ -833,5 +847,9 @@
     "recent": "recente",
     "already": "já",
     "disable": "desabilitar",
+    "worker": "trabalhador",
+    "worker2": "trabalhador",
+    "processes": "processos",
+    "position": "posição",
     }
 %}

app/templates/languages/ru.html

@@ -251,6 +251,7 @@
     "how_to_install_metrics": "как установить сервис Metrics",
     "checker_not_installed": "У вас не установлен сервис Checker",
     "how_to_install_checker": "как установить сервис Checker",
+    "auto_start_not_installed": " вас не установлен сервис Auto start",
     "enable_avg_table": "Включить отображение таблицы средних значений",
     "disable_avg_table": "Выключить отображение таблицы средних значений",
     "protected_title": "Защищенный сервер может редактировать только пользователь с ролью admin",
@@ -300,6 +301,14 @@
     "select_newer_config": "Выберите более новую конфигурацию",
     "not_checked": "Без проверки",
     "show_not_checked": "Показать сервера без проверки",
+    "read_desc_runtime_api": "Вы можете прочитать описание всех параметров RunTime API",
+    "read_desc_statuses": "Вы можете прочитать описание статусов",
+    "login_or_pass_incorrect": "Логин или пароль неверный",
+    "can_try_again": "Вы можете попробовать еще раз через",
+    "is_not_installed": "не установлен",
+    "server_is_inaccessible_for_editing": "Этот сервер недоступен для редактирования всеми, кроме роли администратора",
+    "creating_ha": "Создание нового кластера высокой доступности",
+    "adding_vrrp": "Добавление нового адреса VRRP",
     }
 %}
 {% set roles = {
@@ -550,6 +559,7 @@
     "interval": "интервал",
     "desc": "описание",
     "login": "логин",
+    "login2": "войти",
     "role": "роль",
     "roles": "роли",
     "subs": "подписка",
@@ -557,6 +567,7 @@
     "plan": "план",
     "pay_method": "платежный метод",
     "active": "активный",
+    "actives": "активные",
     "open": "открыть",
     "opened": "открытые",
     "edit": "редактировать",
@@ -574,6 +585,7 @@
     "show": "показать",
     "run": "запустить",
     "running": "запущенный",
+    "running2": "запущенно",
     "statistics": "статистики",
     "rollback": "откатить",
     "previous": "предыдущий",
@@ -585,6 +597,7 @@
     "backend": "бэкенд",
     "maintain": "в обслуживание",
     "drain": "отключенный",
+    "drains": "отключенные",
     "number": "количество",
     "rows": "строк",
     "row": "строка",
@@ -665,6 +678,7 @@
     "connections2": "соединения",
     "enable": "активировать",
     "enabled": "активный",
+    "enabled2": "включен",
     "virt": "вирт",
     "virtual": "виртуальный",
     "check": "проверить",
@@ -833,5 +847,9 @@
     "recent": "недавние",
     "already": "уже",
     "disable": "отключить",
+    "worker": "рабочий",
+    "worker2": "рабочих",
+    "processes": "процессов",
+    "position": "позицию",
     }
 %}

inc/ha.js

@@ -105,11 +105,12 @@ $( function() {
 		autoFocus: true,
 		minLength: -1
 	});
+	var server_creating_title = $( "#server_creating" ).attr('title');
 	var server_creating = $( "#server_creating" ).dialog({
 		autoOpen: false,
 		width: 574,
 		modal: true,
-		title: "Creating a new HA cluster",
+		title: server_creating_title,
 		buttons: {
 			Close: function() {
 				$( this ).dialog( "close" );
@@ -118,11 +119,12 @@ $( function() {
 			}
 		}
 	});
+	var address_creating_title = $( "#server_creating" ).attr('title');
 	var address_add = $( "#address_creating" ).dialog({
 		autoOpen: false,
 		width: 574,
 		modal: true,
-		title: "Adding a new VRRP address",
+		title: address_creating_title,
 		buttons: {
 			Close: function() {
 				$( this ).dialog( "close" );