Merge branch 'master' into feat/VER-725

cozy · Jul 11, 2024 · 60b50bc · 60b50bc
2 parents 44475e0 + dfc601d
commit 60b50bc
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/assets/mails/new_connection.text b/assets/mails/new_connection.text
@@ -3,7 +3,6 @@
 {{t "Mail New Connection Place"}} {{.Country}}
 {{t "Mail New Connection Time"}} {{.Time}}
 {{t "Mail New Connection Browser"}} {{.Browser}}
-{{t "Mail New Connection OS"}} {{.OS}}
 {{t "Mail New Connection IP"}} {{.IP}}
 
 {{t "Mail New Connection Change Passphrase instruction"}}

diff --git a/web/statik/statik.go b/web/statik/statik.go
diff --git a/worker/archive/common.go b/worker/archive/common.go
@@ -12,15 +12,15 @@ func init() {
 		WorkerType:   "zip",
 		Concurrency:  runtime.NumCPU(),
 		MaxExecCount: 2,
-		Timeout:      30 * time.Second,
+		Timeout:      600 * time.Second,
 		WorkerFunc:   WorkerZip,
 	})
 
 	job.AddWorker(&job.WorkerConfig{
 		WorkerType:   "unzip",
 		Concurrency:  runtime.NumCPU(),
 		MaxExecCount: 2,
-		Timeout:      30 * time.Second,
+		Timeout:      600 * time.Second,
 		WorkerFunc:   WorkerUnzip,
 	})
 }