From baa2f384f4d827540288bd758fe929ac0258e072 Mon Sep 17 00:00:00 2001
From: Andrey Antukh <niwi@niwi.nz>
Date: Sun, 22 Jan 2017 16:13:47 +0100
Subject: [PATCH] Set a uberjar compatible basedir option.

---
 backend/profiles.clj                              | 2 +-
 backend/resources/{.catacumba.basedir => basedir} | 0
 backend/src/uxbox/config.clj                      | 4 ++--
 backend/src/uxbox/frontend.clj                    | 1 +
 4 files changed, 4 insertions(+), 3 deletions(-)
 rename backend/resources/{.catacumba.basedir => basedir} (100%)

diff --git a/backend/profiles.clj b/backend/profiles.clj
index d37ead0bac..da49a2f799 100644
--- a/backend/profiles.clj
+++ b/backend/profiles.clj
@@ -5,7 +5,7 @@
   :main ^:skip-aot uxbox.main}
 
  :uberjar
- {:jar-exclusions [#"\.swp|\.swo|user\.clj" #"public/media"]
+ {:jar-exclusions [#"\.swp|\.swo|user\.clj" #"^media"]
   :jar-name "uxbox.jar"
   :uberjar-name "uxbox-backend.jar"
   :target-path "dist/"}}
diff --git a/backend/resources/.catacumba.basedir b/backend/resources/basedir
similarity index 100%
rename from backend/resources/.catacumba.basedir
rename to backend/resources/basedir
diff --git a/backend/src/uxbox/config.clj b/backend/src/uxbox/config.clj
index bb2094990b..ffff7cf4b2 100644
--- a/backend/src/uxbox/config.clj
+++ b/backend/src/uxbox/config.clj
@@ -40,9 +40,9 @@
    :database-name (lookup-env env :uxbox-database-name "uxbox")
    :database-server (lookup-env env :uxbox-database-server "localhost")
    :database-port (lookup-env env :uxbox-database-port 5432)
-   :media-directory (lookup-env env :uxbox-media-directory "media")
+   :media-directory (lookup-env env :uxbox-media-directory "resources/media")
    :media-uri (lookup-env env :uxbox-media-uri "http://localhost:6060/media/")
-   :assets-directory (lookup-env env :uxbox-assets-directory "static")
+   :assets-directory (lookup-env env :uxbox-assets-directory "resources/static")
    :assets-uri (lookup-env env :uxbox-assets-uri "http://localhost:6060/static/")
 
    :email-reply-to (lookup-env env :uxbox-email-reply-to "no-reply@uxbox.io")
diff --git a/backend/src/uxbox/frontend.clj b/backend/src/uxbox/frontend.clj
index cb57e4f1aa..b415878ad3 100644
--- a/backend/src/uxbox/frontend.clj
+++ b/backend/src/uxbox/frontend.clj
@@ -153,6 +153,7 @@
   [config]
   (let [config {:port (:http-server-port config)
                 :debug (:http-server-debug config)
+                :marker-file "basedir"
                 :max-body-size 52428800}]
     (ct/run-server (routes config) config)))