merge upstream

This commit is contained in:
naterfute
2025-04-09 02:21:53 -07:00
5 changed files with 28 additions and 27 deletions

View File

@@ -8,8 +8,13 @@ secret_key = "${base64:48}"
[config]
env = [
<<<<<<< HEAD
"Domain=${main_domain}",
"WEB_URL=${main_domain}",
=======
"Domain=${domain}",
"WEB_URL=${Domain}",
>>>>>>> upstream/main
"PGHOST=plane-db",
"PGDATABASE=plane",
"POSTGRES_USER=${username}",
@@ -40,7 +45,7 @@ env = [
"DEBUG=0",
"SENTRY_DSN=",
"SENTRY_ENVIRONMENT=production",
"CORS_ALLOWED_ORIGINS=",
"CORS_ALLOWED_ORIGINS=https://${Domain}",
"GUNICORN_WORKERS=1",
"USE_MINIO=1",
"DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@plane-db/plane",