diff --git a/.gitignore b/.gitignore index fdad56268..f848ed7cc 100644 --- a/.gitignore +++ b/.gitignore @@ -15,6 +15,7 @@ node_modules /backend/target/ /backend/resources/public/media /backend/resources/public/assets +/backend/assets/ /backend/dist/ /backend/logs/ /backend/- diff --git a/backend/resources/basedir b/backend/resources/basedir deleted file mode 100644 index e69de29bb..000000000 diff --git a/backend/resources/builtin.edn b/backend/resources/builtin.edn deleted file mode 100644 index 7e3216732..000000000 --- a/backend/resources/builtin.edn +++ /dev/null @@ -1,11 +0,0 @@ -{:icons - [{:name "Material Design (Action)" - :path "./material/action/svg/production" - :regex #"^.*_48px\.svg$"}] - - :images - [{:name "Generic Collection 1" - :path "./my-images/collection1/" - :regex #"^.*\.(png|jpg|webp)$"}]} - - diff --git a/backend/resources/config/default.edn b/backend/resources/config/default.edn deleted file mode 100644 index 452d7503b..000000000 --- a/backend/resources/config/default.edn +++ /dev/null @@ -1,44 +0,0 @@ -{;; A secret key used for create tokens - ;; WARNING: this is a default secret key and - ;; it should be overwritten in production env. - :secret "5qjiAn-QUpawUNqGP10UZKklSqbLKcdGY3sJpq0UUACpVXGg2HOFJCBejDWVHskhRyp7iHb4rjOLXX2ZjF-5cw" - - :registration - { - :enabled true} - - :smtp - {:host "localhost" ;; Hostname of the desired SMTP server. - :port 25 ;; Port of SMTP server. - :user nil ;; Username to authenticate with (if authenticating). - :pass nil ;; Password to authenticate with (if authenticating). - :ssl false ;; Enables SSL encryption if value is truthy. - :tls false ;; Enables TLS encryption if value is truthy. - :enabled false ;; Enables SMTP if value is truthy. - :noop true} - - :auth-options {:alg :a256kw :enc :a128cbc-hs256} - - :email {:reply-to "no-reply@uxbox.io" - :from "no-reply@uxbox.io" - :support "support@uxbox.io"} - - :http {:port 6060 - :max-body-size 52428800 - :debug true} - - :media - {:directory "resources/public/media" - :uri "http://localhost:6060/media/"} - - :static - {:directory "resources/public/static" - :uri "http://localhost:6060/static/"} - - :database - {:adapter "postgresql" - :username nil - :password nil - :database-name "uxbox" - :server-name "localhost" - :port-number 5432}} diff --git a/backend/resources/config/test.edn b/backend/resources/config/test.edn deleted file mode 100644 index 31bc83242..000000000 --- a/backend/resources/config/test.edn +++ /dev/null @@ -1,18 +0,0 @@ -{:migrations - {:verbose false} - - :media - {:directory "/tmp/uxbox/media" - :uri "http://localhost:6060/media/"} - - :static - {:directory "/tmp/uxbox/static" - :uri "http://localhost:6060/static/"} - - :database - {:adapter "postgresql" - :username nil - :password nil - :database-name "test" - :server-name "localhost" - :port-number 5432}} diff --git a/backend/src/app/config.clj b/backend/src/app/config.clj index ebb33d417..0ec523446 100644 --- a/backend/src/app/config.clj +++ b/backend/src/app/config.clj @@ -42,7 +42,7 @@ :storage-backend :fs - :storage-fs-directory "resources/public/assets" + :storage-fs-directory "assets" :storage-s3-region :eu-central-1 :storage-s3-bucket "penpot-devenv-assets-pre" diff --git a/docker/devenv/files/nginx.conf b/docker/devenv/files/nginx.conf index a4b13cb73..6fa8e666b 100644 --- a/docker/devenv/files/nginx.conf +++ b/docker/devenv/files/nginx.conf @@ -91,7 +91,7 @@ http { location /internal/assets { internal; - alias /home/penpot/penpot/backend/resources/public/assets; + alias /home/penpot/penpot/backend/assets; add_header x-internal-redirect "$upstream_http_x_accel_redirect"; }