v6.3.3.0

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

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':

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
+

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:

app/scripts/ansible/roles/service_common/vars/apache-AmazonLinux.yml

@@ -1,3 +1,4 @@
 ---
 service_user: httpd
-service_group: httpd
+service_group: httpd
+conf_folder: conf.d

app/scripts/ansible/roles/service_common/vars/apache-Debian.yml

@@ -1,3 +1,4 @@
 ---
 service_user: apache2
-service_group: apache2
+service_group: apache2
+conf_folder: sites-available

app/scripts/ansible/roles/service_common/vars/apache-RedHat.yml

@@ -1,3 +1,4 @@
 ---
 service_user: httpd
-service_group: httpd
+service_group: httpd
+conf_folder: conf.d

app/scripts/ansible/roles/service_common/vars/apache-Suse.yml

@@ -1,3 +1,4 @@
 ---
 service_user: apache2
-service_group: apache2
+service_group: apache2
+conf_folder: sites-available

app/scripts/ansible/roles/service_common/vars/nginx-AmazonLinux.yml

@@ -1,3 +1,4 @@
 ---
 service_user: nginx
-service_group: nginx
+service_group: nginx
+conf_folder: conf.d

app/scripts/ansible/roles/service_common/vars/nginx-Debian.yml

@@ -1,3 +1,4 @@
 ---
 service_user: nginx
-service_group: nginx
+service_group: nginx
+conf_folder: conf.d

app/scripts/ansible/roles/service_common/vars/nginx-RedHat.yml

@@ -1,3 +1,4 @@
 ---
 service_user: nginx
-service_group: nginx
+service_group: nginx
+conf_folder: conf.d

app/scripts/ansible/roles/service_common/vars/nginx-Suse.yml

@@ -1,3 +1,4 @@
 ---
 service_user: nginx
-service_group: nginx
+service_group: nginx
+conf_folder: conf.d

inc/users.js

@@ -1075,6 +1075,7 @@ function addServer(dialog_id) {
 					$('select:regex(id, nginx_exp_addserv)').append('<option value=' + $('#ip-'+id).text() + '>' + $('#hostname-'+id).val() + '</option>').selectmenu("refresh");
 					$('select:regex(id, apache_exp_addserv)').append('<option value=' + $('#ip-'+id).text() + '>' + $('#hostname-'+id).val() + '</option>').selectmenu("refresh");
 					$('select:regex(id, node_exp_addserv)').append('<option value=' + $('#ip-'+id).text() + '>' + $('#hostname-'+id).val() + '</option>').selectmenu("refresh");
+					$('select:regex(id, geoipserv)').append('<option value=' + $('#ip-'+id).text() + '>' + $('#hostname-'+id).val() + '</option>').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('<b style="color: var(--red-color)">GeoIPLite is not installed</b>');
 				$('#geoip_install').show();
 			} else {