From 27945ace65600ae944ef15c781470dca20cf80c2 Mon Sep 17 00:00:00 2001
From: Andrey Antukh <niwi@niwi.nz>
Date: Mon, 29 Sep 2025 10:41:50 +0200
Subject: [PATCH] :rewind: Revert deprecated storage config cleaning

---
 backend/src/app/config.clj |  7 +++++++
 backend/src/app/main.clj   | 14 ++++++++++----
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/backend/src/app/config.clj b/backend/src/app/config.clj
index fe8daaed7f..272e82caa0 100644
--- a/backend/src/app/config.clj
+++ b/backend/src/app/config.clj
@@ -217,6 +217,13 @@
     [:netty-io-threads {:optional true} ::sm/int]
     [:executor-threads {:optional true} ::sm/int]
 
+    ;; DEPRECATED
+    [:assets-storage-backend {:optional true} :keyword]
+    [:storage-assets-fs-directory {:optional true} :string]
+    [:storage-assets-s3-bucket {:optional true} :string]
+    [:storage-assets-s3-region {:optional true} :keyword]
+    [:storage-assets-s3-endpoint {:optional true} ::sm/uri]
+
     [:objects-storage-backend {:optional true} :keyword]
     [:objects-storage-fs-directory {:optional true} :string]
     [:objects-storage-s3-bucket {:optional true} :string]
diff --git a/backend/src/app/main.clj b/backend/src/app/main.clj
index 0f776b6e0d..64150b42b1 100644
--- a/backend/src/app/main.clj
+++ b/backend/src/app/main.clj
@@ -461,15 +461,21 @@
      :assets-fs (ig/ref :app.storage.fs/backend)}}
 
    :app.storage.s3/backend
-   {::sto.s3/region   (cf/get :objects-storage-s3-region)
-    ::sto.s3/endpoint (cf/get :objects-storage-s3-endpoint)
-    ::sto.s3/bucket   (cf/get :objects-storage-s3-bucket)
+   {::sto.s3/region     (or (cf/get :storage-assets-s3-region)
+                            (cf/get :objects-storage-s3-region))
+    ::sto.s3/endpoint   (or (cf/get :storage-assets-s3-endpoint)
+                            (cf/get :objects-storage-s3-endpoint))
+    ::sto.s3/bucket     (or (cf/get :storage-assets-s3-bucket)
+                            (cf/get :objects-storage-s3-bucket))
+    ::sto.s3/io-threads (or (cf/get :storage-assets-s3-io-threads)
+                            (cf/get :objects-storage-s3-io-threads))
 
     ::wrk/netty-io-executor
     (ig/ref ::wrk/netty-io-executor)}
 
    :app.storage.fs/backend
-   {::sto.fs/directory (cf/get :objects-storage-fs-directory)}})
+   {::sto.fs/directory (or (cf/get :storage-assets-fs-directory)
+                           (cf/get :objects-storage-fs-directory))}})
 
 (def worker-config
   {::wrk/cron