diff --git a/backend/scripts/repl b/backend/scripts/repl index 86eaccb80..73f4d9704 100755 --- a/backend/scripts/repl +++ b/backend/scripts/repl @@ -13,11 +13,15 @@ export PENPOT_FLAGS="$PENPOT_FLAGS enable-backend-asserts enable-secure-session- # export PENPOT_DATABASE_USERNAME="penpot_pre" # export PENPOT_DATABASE_PASSWORD="penpot_pre" +# export PENPOT_LOGGERS_LOKI_URI="http://172.17.0.1:3100/loki/api/v1/push" +# export PENPOT_AUDIT_LOG_ARCHIVE_URI="http://localhost:6070/api/audit" + # Initialize MINIO config -# mc alias set penpot-s3/ http://minio:9000 minioadmin minioadmin -# mc admin user add penpot-s3 penpot-devenv penpot-devenv -# mc admin policy set penpot-s3 readwrite user=penpot-devenv -# mc mb penpot-s3/penpot -p +mc alias set penpot-s3/ http://minio:9000 minioadmin minioadmin +mc admin user add penpot-s3 penpot-devenv penpot-devenv +mc admin policy set penpot-s3 readwrite user=penpot-devenv +mc mb penpot-s3/penpot -p + export AWS_ACCESS_KEY_ID=penpot-devenv export AWS_SECRET_ACCESS_KEY=penpot-devenv export PENPOT_ASSETS_STORAGE_BACKEND=assets-fs diff --git a/backend/src/app/config.clj b/backend/src/app/config.clj index 26f65c6ec..6acb96cf4 100644 --- a/backend/src/app/config.clj +++ b/backend/src/app/config.clj @@ -41,8 +41,7 @@ data)) (def defaults - {:host "devenv" - :tenant "dev" + { :database-uri "postgresql://postgres/penpot" :database-username "penpot" :database-password "penpot" @@ -54,8 +53,10 @@ :file-change-snapshot-timeout "3h" :public-uri "http://localhost:3449" - :redis-uri "redis://redis/0" + :host "localhost" + :tenant "main" + :redis-uri "redis://redis/0" :srepl-host "127.0.0.1" :srepl-port 6062 diff --git a/backend/src/app/http/middleware.clj b/backend/src/app/http/middleware.clj index 125d75e5e..bdc997c05 100644 --- a/backend/src/app/http/middleware.clj +++ b/backend/src/app/http/middleware.clj @@ -99,7 +99,10 @@ (let [body (yrs/body response)] (if (coll? body) (let [qs (yrq/query request) - opts {:type (if (str/includes? qs "verbose") :json-verbose :json)}] + opts (if (or (contains? cf/flags :transit-readable-response) + (str/includes? qs "transit_verbose")) + {:type :json-verbose} + {:type :json})] (-> response (update :headers assoc "content-type" "application/transit+json") (assoc :body (transit-streamable-body body opts)))) diff --git a/backend/src/app/http/websocket.clj b/backend/src/app/http/websocket.clj index 4b896e22c..f39a89891 100644 --- a/backend/src/app/http/websocket.clj +++ b/backend/src/app/http/websocket.clj @@ -166,11 +166,9 @@ (a/go ;; Only allow receive pointer updates when active subscription (when-let [{:keys [topic]} (get-in @wsp [::subscriptions subs-id])] - (l/trace :fn "handle-message" :event :pointer-update :message message) (let [msgbus-fn (:msgbus @wsp) profile-id (::profile-id @wsp) session-id (::session-id @wsp) - message (-> message (dissoc :subs-id) (assoc :profile-id profile-id) diff --git a/docker/images/config.env b/docker/images/config.env index 484b900e4..e77b85d68 100644 --- a/docker/images/config.env +++ b/docker/images/config.env @@ -1,5 +1,6 @@ # Should be set to the public domain where penpot is going to be served. PENPOT_PUBLIC_URI=http://localhost:9001 +PENPOT_TENANT=pro # Temporal workaround because of bad builtin default PENPOT_HTTP_SERVER_HOST=0.0.0.0