v6.3.3.0

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

app/modules/db/sql.py

@@ -1030,7 +1030,7 @@ def update_backup(server, rserver, rpath, backup_type, time, cred, description,
 		return True
 
 
-def delete_backups(backup_id):
+def delete_backups(backup_id: int) -> bool:
 	query = Backup.delete().where(Backup.id == backup_id)
 	try:
 		query.execute()
@@ -1041,7 +1041,7 @@ def delete_backups(backup_id):
 		return True
 
 
-def check_exists_backup(server):
+def check_exists_backup(server: str) -> bool:
 	try:
 		backup = Backup.get(Backup.server == server)
 	except Exception:
@@ -1053,6 +1053,18 @@ def check_exists_backup(server):
 			return False
 
 
+def check_exists_s3_backup(server_id: int) -> bool:
+	try:
+		backup = S3Backup.get(S3Backup.server_id == server_id)
+	except Exception:
+		pass
+	else:
+		if backup.id is not None:
+			return True
+		else:
+			return False
+
+
 def delete_telegram(telegram_id):
 	query = Telegram.delete().where(Telegram.id == telegram_id)
 	try:
@@ -2296,7 +2308,7 @@ def select_apache(serv):
 		return apache
 
 
-def update_apache(serv):
+def update_apache(serv: str) -> bool:
 	query = Server.update(apache='1').where(Server.ip == serv)
 	try:
 		query.execute()
@@ -2326,16 +2338,6 @@ def update_nginx(serv: str) -> bool:
 		return False
 
 
-def update_apache(serv: str) -> bool:
-	query = Server.update(apache=1).where(Server.ip == serv)
-	try:
-		query.execute()
-		return True
-	except Exception as e:
-		out_error(e)
-		return False
-
-
 def select_haproxy(serv):
 	try:
 		query_res = Server.get(Server.ip == serv).haproxy

app/overview.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-import os
 import sys
 
 from jinja2 import Environment, FileSystemLoader

inc/users.js

@@ -47,7 +47,7 @@ $( function() {
 		} );
 	});
 	$('#nginx_install').click(function() {
-		installService('apache');
+		installService('nginx');
 	});
 	$('#apache_install').click(function() {
 		installService('apache');
@@ -526,6 +526,34 @@ $( function() {
 			}
 		}
 	});
+	$('#add-backup-s3-button').click(function() {
+		addBackupDialog.dialog('open');
+	});
+	var addS3BackupDialog = $( "#s3-backup-add-table" ).dialog({
+		autoOpen: false,
+		resizable: false,
+		height: "auto",
+		width: 600,
+		modal: true,
+		title: "Create a new S3 backup job",
+		show: {
+			effect: "fade",
+			duration: 200
+		},
+		hide: {
+			effect: "fade",
+			duration: 200
+		},
+		buttons: {
+			"Add": function () {
+				addS3Backup(this);
+			},
+			Cancel: function () {
+				$(this).dialog("close");
+				clearTips();
+			}
+		}
+	});
 	$('#add-git-button').click(function() {
 		addGitDialog.dialog('open');
 	});
@@ -2870,7 +2898,8 @@ function installService(service){
 	$.ajax( {
 		url: "options.py",
 		data: {
-			install_service: $('#' + service + 'ddserv').val(),
+			install_service: $('#' + service + 'addserv').val(),
+			service: service,
 			syn_flood: syn_flood,
 			docker: docker,
 			token: $('#token').val()