From e1c36fc72159c3a5632ca174bd0c5f5e3aad7a62 Mon Sep 17 00:00:00 2001 From: Pavel Loginov Date: Thu, 5 Jan 2023 11:51:43 +0300 Subject: [PATCH] v6.3.3.0 Changelog: https://roxy-wi.org/changelog#6_3_3 --- app/modules/service/installation.py | 2 +- app/scripts/ansible/roles/nginx.yml | 22 +++++++++++++------ .../roles/service_common/tasks/main.yml | 2 +- .../vars/apache-AmazonLinux.yml | 3 ++- .../service_common/vars/apache-Debian.yml | 3 ++- .../service_common/vars/apache-RedHat.yml | 3 ++- .../roles/service_common/vars/apache-Suse.yml | 3 ++- .../service_common/vars/nginx-AmazonLinux.yml | 3 ++- .../service_common/vars/nginx-Debian.yml | 3 ++- .../service_common/vars/nginx-RedHat.yml | 3 ++- .../roles/service_common/vars/nginx-Suse.yml | 3 ++- inc/users.js | 3 ++- 12 files changed, 35 insertions(+), 18 deletions(-) diff --git a/app/modules/service/installation.py b/app/modules/service/installation.py index 3c9931dc..ae94d172 100644 --- a/app/modules/service/installation.py +++ b/app/modules/service/installation.py @@ -160,7 +160,7 @@ def install_service(server_ip: str, service: str, docker: str, **kwargs) -> None syn_flood_protect = '1' if form.getvalue('syn_flood') == "1" else '' if service == 'apache': - correct_service_name = service_common.get_correct_apache_service_name(server_ip=server_ip) + correct_service_name = service_common.get_correct_apache_service_name(server_ip=server_ip, server_id=None) if service_dir == '/etc/httpd' and correct_service_name == 'apache2': service_dir = '/etc/apache2' elif service_dir == '/etc/apache2' and correct_service_name == 'httpd': diff --git a/app/scripts/ansible/roles/nginx.yml b/app/scripts/ansible/roles/nginx.yml index 732bf648..24474ea5 100644 --- a/app/scripts/ansible/roles/nginx.yml +++ b/app/scripts/ansible/roles/nginx.yml @@ -60,11 +60,19 @@ - name: "Set {{ ansible_user }} owner to {{ service_dir }}" hosts: "{{ variable_host }}" become: yes + gather_facts: no tasks: - - name: Set - file: - path: "{{ service_dir }}" - owner: "{{ ansible_user }}" - group: "{{ ansible_user }}" - state: directory - recurse: yes + - name: Set SSH port + set_fact: + ansible_port: "{{SSH_PORT}}" + - name: "Set {{ ansible_user }} owner to {{ service_dir }}" + file: + path: "{{ service_dir }}" + owner: "{{ ansible_user }}" + group: "{{ ansible_user }}" + state: directory + recurse: yes + tags: + - system + - docker + diff --git a/app/scripts/ansible/roles/service_common/tasks/main.yml b/app/scripts/ansible/roles/service_common/tasks/main.yml index 0027774d..b685db3b 100644 --- a/app/scripts/ansible/roles/service_common/tasks/main.yml +++ b/app/scripts/ansible/roles/service_common/tasks/main.yml @@ -81,7 +81,7 @@ - name: Copy status page configuration in place template: src: "{{ service }}_status.conf.j2" - dest: "{{ service_dir }}/conf.d/status_page.conf" + dest: "{{ service_dir }}/{{ conf_folder }}/status_page.conf" mode: 0644 force: no when: diff --git a/app/scripts/ansible/roles/service_common/vars/apache-AmazonLinux.yml b/app/scripts/ansible/roles/service_common/vars/apache-AmazonLinux.yml index 21e0f727..0623ddd0 100644 --- a/app/scripts/ansible/roles/service_common/vars/apache-AmazonLinux.yml +++ b/app/scripts/ansible/roles/service_common/vars/apache-AmazonLinux.yml @@ -1,3 +1,4 @@ --- service_user: httpd -service_group: httpd \ No newline at end of file +service_group: httpd +conf_folder: conf.d diff --git a/app/scripts/ansible/roles/service_common/vars/apache-Debian.yml b/app/scripts/ansible/roles/service_common/vars/apache-Debian.yml index e795c26d..5468d843 100644 --- a/app/scripts/ansible/roles/service_common/vars/apache-Debian.yml +++ b/app/scripts/ansible/roles/service_common/vars/apache-Debian.yml @@ -1,3 +1,4 @@ --- service_user: apache2 -service_group: apache2 \ No newline at end of file +service_group: apache2 +conf_folder: sites-available diff --git a/app/scripts/ansible/roles/service_common/vars/apache-RedHat.yml b/app/scripts/ansible/roles/service_common/vars/apache-RedHat.yml index 21e0f727..0623ddd0 100644 --- a/app/scripts/ansible/roles/service_common/vars/apache-RedHat.yml +++ b/app/scripts/ansible/roles/service_common/vars/apache-RedHat.yml @@ -1,3 +1,4 @@ --- service_user: httpd -service_group: httpd \ No newline at end of file +service_group: httpd +conf_folder: conf.d diff --git a/app/scripts/ansible/roles/service_common/vars/apache-Suse.yml b/app/scripts/ansible/roles/service_common/vars/apache-Suse.yml index e795c26d..5468d843 100644 --- a/app/scripts/ansible/roles/service_common/vars/apache-Suse.yml +++ b/app/scripts/ansible/roles/service_common/vars/apache-Suse.yml @@ -1,3 +1,4 @@ --- service_user: apache2 -service_group: apache2 \ No newline at end of file +service_group: apache2 +conf_folder: sites-available diff --git a/app/scripts/ansible/roles/service_common/vars/nginx-AmazonLinux.yml b/app/scripts/ansible/roles/service_common/vars/nginx-AmazonLinux.yml index 62a627e5..263276fb 100644 --- a/app/scripts/ansible/roles/service_common/vars/nginx-AmazonLinux.yml +++ b/app/scripts/ansible/roles/service_common/vars/nginx-AmazonLinux.yml @@ -1,3 +1,4 @@ --- service_user: nginx -service_group: nginx \ No newline at end of file +service_group: nginx +conf_folder: conf.d diff --git a/app/scripts/ansible/roles/service_common/vars/nginx-Debian.yml b/app/scripts/ansible/roles/service_common/vars/nginx-Debian.yml index 62a627e5..263276fb 100644 --- a/app/scripts/ansible/roles/service_common/vars/nginx-Debian.yml +++ b/app/scripts/ansible/roles/service_common/vars/nginx-Debian.yml @@ -1,3 +1,4 @@ --- service_user: nginx -service_group: nginx \ No newline at end of file +service_group: nginx +conf_folder: conf.d diff --git a/app/scripts/ansible/roles/service_common/vars/nginx-RedHat.yml b/app/scripts/ansible/roles/service_common/vars/nginx-RedHat.yml index 62a627e5..263276fb 100644 --- a/app/scripts/ansible/roles/service_common/vars/nginx-RedHat.yml +++ b/app/scripts/ansible/roles/service_common/vars/nginx-RedHat.yml @@ -1,3 +1,4 @@ --- service_user: nginx -service_group: nginx \ No newline at end of file +service_group: nginx +conf_folder: conf.d diff --git a/app/scripts/ansible/roles/service_common/vars/nginx-Suse.yml b/app/scripts/ansible/roles/service_common/vars/nginx-Suse.yml index 62a627e5..263276fb 100644 --- a/app/scripts/ansible/roles/service_common/vars/nginx-Suse.yml +++ b/app/scripts/ansible/roles/service_common/vars/nginx-Suse.yml @@ -1,3 +1,4 @@ --- service_user: nginx -service_group: nginx \ No newline at end of file +service_group: nginx +conf_folder: conf.d diff --git a/inc/users.js b/inc/users.js index c7e789cf..1b3c592f 100644 --- a/inc/users.js +++ b/inc/users.js @@ -1075,6 +1075,7 @@ function addServer(dialog_id) { $('select:regex(id, nginx_exp_addserv)').append('').selectmenu("refresh"); $('select:regex(id, apache_exp_addserv)').append('').selectmenu("refresh"); $('select:regex(id, node_exp_addserv)').append('').selectmenu("refresh"); + $('select:regex(id, geoipserv)').append('').selectmenu("refresh"); } } } ); @@ -2870,7 +2871,7 @@ function checkGeoipInstallation() { type: "POST", success: function( data ) { data = data.replace(/^\s+|\s+$/g,''); - if(data.indexOf('No such file or directory') != '-1') { + if(data.indexOf('No such file or directory') != '-1' || data.indexOf('cannot access') != '-1') { $('#cur_geoip').html('GeoIPLite is not installed'); $('#geoip_install').show(); } else {