From 3ab1c39b1a420324028bd7e1edca061250844bfe Mon Sep 17 00:00:00 2001 From: scanash00 Date: Sun, 6 Apr 2025 23:30:16 -0800 Subject: [PATCH 1/6] fix: plane template --- blueprints/plane/template.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/blueprints/plane/template.toml b/blueprints/plane/template.toml index 932af511..2a93dbfa 100644 --- a/blueprints/plane/template.toml +++ b/blueprints/plane/template.toml @@ -17,8 +17,8 @@ env = [ "MINIO_ROOT_USER=access-key", "MINIO_ROOT_PASSWORD=password:32", "AWS_REGION=", -"AWS_ACCESS_KEY_ID={username}", -"AWS_SECRET_ACCESS_KEY=${MINIO_ROOT_PASSWORD}", +"AWS_ACCESS_KEY_ID=${MINIO_ROOT_USER}", +"AWS_SECRET_ACCESS_KEY=${minio_password}", "AWS_S3_ENDPOINT_URL=http://plane-minio:9000", "AWS_S3_BUCKET_NAME=uploads", "NGINX_PORT=80", From 8e79d293191329e7f14fc9b7b2f2140c1bcebbcb Mon Sep 17 00:00:00 2001 From: naterfute Date: Sun, 6 Apr 2025 00:33:12 -0700 Subject: [PATCH 2/6] fix: actual random values --- blueprints/plane/template.toml | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/blueprints/plane/template.toml b/blueprints/plane/template.toml index 2a93dbfa..bf427206 100644 --- a/blueprints/plane/template.toml +++ b/blueprints/plane/template.toml @@ -1,13 +1,19 @@ [variables] main_domain = "${domain}" +db_password = "${password:32}" +minio_password = "${password:32}" +rabbitmq_user = "${username}" +rabbitmq_pass = "${password:32}" +secret_key = "${base64:48}" [config] env = [ "Domain=${main_domain}", +"WEB_URL=${main_domain}", "PGHOST=plane-db", "PGDATABASE=plane", -"POSTGRES_USER={username}", -"POSTGRES_PASSWORD={password:32}", +"POSTGRES_USER=${username}", +"POSTGRES_PASSWORD=${db_password}", "POSTGRES_DB=plane", "POSTGRES_PORT=5432", "PGDATA=/var/lib/postgresql/data", @@ -15,7 +21,7 @@ env = [ "REDIS_PORT=6379", "REDIS_URL=redis://plane-redis:6379/", "MINIO_ROOT_USER=access-key", -"MINIO_ROOT_PASSWORD=password:32", +"MINIO_ROOT_PASSWORD=${minio_password}", "AWS_REGION=", "AWS_ACCESS_KEY_ID=${MINIO_ROOT_USER}", "AWS_SECRET_ACCESS_KEY=${minio_password}", @@ -26,12 +32,11 @@ env = [ "FILE_SIZE_LIMIT=5242880", "RABBITMQ_HOST=plane-mq", "RABBITMQ_PORT=5672", -"RABBITMQ_DEFAULT_USER={username}", -"RABBITMQ_DEFAULT_PASS={password:32}", +"RABBITMQ_DEFAULT_USER=rabbitmq_user", +"RABBITMQ_DEFAULT_PASS=${rabbitmq_pass}", "RABBITMQ_DEFAULT_VHOST=plane", "RABBITMQ_VHOST=plane", "API_BASE_URL=http://api:8000", -"WEB_URL=${main_domain}", "DEBUG=0", "SENTRY_DSN=", "SENTRY_ENVIRONMENT=production", @@ -39,7 +44,7 @@ env = [ "GUNICORN_WORKERS=1", "USE_MINIO=1", "DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@plane-db/plane", -"SECRET_KEY={base64:48}", +"SECRET_KEY=${secret_key}", "AMQP_URL=amqp://${RABBITMQ_DEFAULT_USER}:${RABBITMQ_DEFAULT_PASS}@plane-mq:5672/plane", "API_KEY_RATE_LIMIT=60/minute", "MINIO_ENDPOINT_SSL=0" From a66149baaaf96950095bf6228d304999fa3776f2 Mon Sep 17 00:00:00 2001 From: naterfute Date: Mon, 7 Apr 2025 00:56:08 -0700 Subject: [PATCH 3/6] fix: cors error --- blueprints/plane/template.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/blueprints/plane/template.toml b/blueprints/plane/template.toml index bf427206..858e7c83 100644 --- a/blueprints/plane/template.toml +++ b/blueprints/plane/template.toml @@ -8,8 +8,8 @@ secret_key = "${base64:48}" [config] env = [ -"Domain=${main_domain}", -"WEB_URL=${main_domain}", +"Domain=${host}", +"WEB_URL=${host}", "PGHOST=plane-db", "PGDATABASE=plane", "POSTGRES_USER=${username}", @@ -40,7 +40,7 @@ env = [ "DEBUG=0", "SENTRY_DSN=", "SENTRY_ENVIRONMENT=production", -"CORS_ALLOWED_ORIGINS=", +"CORS_ALLOWED_ORIGINS=%{host}%", "GUNICORN_WORKERS=1", "USE_MINIO=1", "DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@plane-db/plane", From b3bb43d4ac3ee919fdee547268439513c1812a28 Mon Sep 17 00:00:00 2001 From: naterfute Date: Mon, 7 Apr 2025 01:22:37 -0700 Subject: [PATCH 4/6] fix: it's $ not %% --- blueprints/plane/template.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/blueprints/plane/template.toml b/blueprints/plane/template.toml index 858e7c83..25cb8775 100644 --- a/blueprints/plane/template.toml +++ b/blueprints/plane/template.toml @@ -8,8 +8,8 @@ secret_key = "${base64:48}" [config] env = [ -"Domain=${host}", -"WEB_URL=${host}", +"Domain=${main_domain}", +"WEB_URL=${main_domain}", "PGHOST=plane-db", "PGDATABASE=plane", "POSTGRES_USER=${username}", @@ -40,7 +40,7 @@ env = [ "DEBUG=0", "SENTRY_DSN=", "SENTRY_ENVIRONMENT=production", -"CORS_ALLOWED_ORIGINS=%{host}%", +"CORS_ALLOWED_ORIGINS=${main_domain}", "GUNICORN_WORKERS=1", "USE_MINIO=1", "DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@plane-db/plane", From d6015f77f0831a5daf557c360f86305890820e76 Mon Sep 17 00:00:00 2001 From: naterfute Date: Mon, 7 Apr 2025 01:34:13 -0700 Subject: [PATCH 5/6] fix: I kinda hate the templating system --- blueprints/plane/template.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/blueprints/plane/template.toml b/blueprints/plane/template.toml index 25cb8775..9e67f39a 100644 --- a/blueprints/plane/template.toml +++ b/blueprints/plane/template.toml @@ -8,8 +8,8 @@ secret_key = "${base64:48}" [config] env = [ -"Domain=${main_domain}", -"WEB_URL=${main_domain}", +"Domain=${domain}", +"WEB_URL=${Domain}", "PGHOST=plane-db", "PGDATABASE=plane", "POSTGRES_USER=${username}", @@ -40,7 +40,7 @@ env = [ "DEBUG=0", "SENTRY_DSN=", "SENTRY_ENVIRONMENT=production", -"CORS_ALLOWED_ORIGINS=${main_domain}", +"CORS_ALLOWED_ORIGINS=${Domain}", "GUNICORN_WORKERS=1", "USE_MINIO=1", "DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@plane-db/plane", From 7e1a136c34cb59d3797e1840462671b694f9afb1 Mon Sep 17 00:00:00 2001 From: naterfute Date: Tue, 8 Apr 2025 10:36:25 -0700 Subject: [PATCH 6/6] fix: CORS_ALLOWED_ORIGINS not being https --- blueprints/plane/template.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blueprints/plane/template.toml b/blueprints/plane/template.toml index 9e67f39a..a12f4564 100644 --- a/blueprints/plane/template.toml +++ b/blueprints/plane/template.toml @@ -40,7 +40,7 @@ env = [ "DEBUG=0", "SENTRY_DSN=", "SENTRY_ENVIRONMENT=production", -"CORS_ALLOWED_ORIGINS=${Domain}", +"CORS_ALLOWED_ORIGINS=https://${Domain}", "GUNICORN_WORKERS=1", "USE_MINIO=1", "DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@plane-db/plane",