Skip to content

Commit

Permalink
it works!
Browse files Browse the repository at this point in the history
  • Loading branch information
ciur committed Nov 16, 2024
1 parent 35022c3 commit d2f19be
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 10 deletions.
4 changes: 2 additions & 2 deletions docker/standard/bundles/nginx/nginx.default.conf
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ http {

location = /verify {
internal;
proxy_pass http://localhost:4010;
proxy_pass http://127.0.0.1:4010;
proxy_pass_request_body off;
proxy_set_header Content-Length "";

Expand All @@ -86,7 +86,7 @@ http {
location @auth_server {
if ($uri ~ /api/(token|auth)) {
rewrite ^/api/(.*) /$1 break;
proxy_pass http://localhost:4010;
proxy_pass http://127.0.0.1:4010;
}

if ($uri ~ /api) {
Expand Down
4 changes: 2 additions & 2 deletions docker/standard/bundles/supervisor/supervisord.default.conf
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
nodaemon=true

[program:core]
command=poetry run fastapi run papermerge/app.py --workers 4 --host 0.0.0.0 --port 8000
command=poetry run fastapi run papermerge/app.py --workers 2 --host 0.0.0.0 --port 8000
priority=2
directory=/core_app
stdout_logfile=/dev/stdout
Expand All @@ -11,7 +11,7 @@ stderr_logfile=/dev/stderr
stderr_logfile_maxbytes=0

[program:auth_server]
command=poetry run fastapi run auth_server/main.py --workers 3 --host 0.0.0.0 --port 4010
command=poetry run fastapi run auth_server/main.py --workers 1 --host 0.0.0.0 --port 4010
priority=2
directory=/auth_server_app
stdout_logfile=/dev/stdout
Expand Down
3 changes: 1 addition & 2 deletions docker/standard/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,14 @@ exec_perms_sync() {


exec_createsuperuser() {
cd /core_app && poetry run paper-cli users create user --superuser
cd /auth_server_app && poetry run auth-cli users create --superuser
}

exec_index_schema_apply() {
VIRTUAL_ENV=/core_app/.venv && cd /core_app && poetry run ./manage.py index_schema apply
}

exec_init() {
cd /core_app/ && poetry install -E pg
exec_migrate
exec_perms_sync
exec_createsuperuser
Expand Down
4 changes: 0 additions & 4 deletions ui2/vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,5 @@ export default defineConfig({
additionalData: `@import "./src/_mantine";`
}
}
},
base: "/app/",
build: {
outDir: "./dist/app"
}
})

0 comments on commit d2f19be

Please sign in to comment.