From dfcb88999d9ccdf7a211ad284b10cb393d37b5dc Mon Sep 17 00:00:00 2001 From: levipettersen <104788131+levipettersen@users.noreply.github.com> Date: Tue, 12 Jul 2022 08:28:30 +0200 Subject: [PATCH 1/4] Updated Heroku deployment documentation Added a line to recommend WSL for windows users on step 5 of the postgres setup, as that was something that would have saved me some time while following the guide. Also fixed a numbering error --- .../deployment/hosting-guides/heroku.md | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/docs/developer-docs/latest/setup-deployment-guides/deployment/hosting-guides/heroku.md b/docs/developer-docs/latest/setup-deployment-guides/deployment/hosting-guides/heroku.md index e849aa6e98..96c9489ad6 100644 --- a/docs/developer-docs/latest/setup-deployment-guides/deployment/hosting-guides/heroku.md +++ b/docs/developer-docs/latest/setup-deployment-guides/deployment/hosting-guides/heroku.md @@ -256,6 +256,8 @@ heroku config:set ADMIN_JWT_SECRET=$(cat .env | grep ADMIN_JWT_SECRET | cut -d= heroku config:set JWT_SECRET=$(cat .env | grep -w JWT_SECRET | cut -d= -f2) ``` +If you are using Windows, it is recommended to use WSL for this step. + The following `openssl` commands will generate random new secrets (Mac and Linux only): ```bash @@ -292,7 +294,7 @@ yarn add pg :::::: -### 8. Commit your changes +### 7. Commit your changes `Path: ./my-project/` @@ -301,7 +303,7 @@ git add . git commit -m "Update database config" ``` -### 9. Update Yarn lockfile +### 8. Update Yarn lockfile `Path: ./my-project/` @@ -309,7 +311,7 @@ git commit -m "Update database config" yarn install ``` -### 10. Commit your changes +### 9. Commit your changes `Path: ./my-project/` @@ -318,7 +320,7 @@ git add yarn.lock git commit -m "Updated Yarn lockfile" ``` -### 11. Deploy +### 10. Deploy `Path: ./my-project/` From 0d84dbf0cf9505ea7eb78223cd5ae8a215b63b8c Mon Sep 17 00:00:00 2001 From: levipettersen <104788131+levipettersen@users.noreply.github.com> Date: Tue, 12 Jul 2022 17:21:48 +0200 Subject: [PATCH 2/4] Update docs/developer-docs/latest/setup-deployment-guides/deployment/hosting-guides/heroku.md Co-authored-by: Pierre Wizla --- .../setup-deployment-guides/deployment/hosting-guides/heroku.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/developer-docs/latest/setup-deployment-guides/deployment/hosting-guides/heroku.md b/docs/developer-docs/latest/setup-deployment-guides/deployment/hosting-guides/heroku.md index 96c9489ad6..c2386f165e 100644 --- a/docs/developer-docs/latest/setup-deployment-guides/deployment/hosting-guides/heroku.md +++ b/docs/developer-docs/latest/setup-deployment-guides/deployment/hosting-guides/heroku.md @@ -256,7 +256,7 @@ heroku config:set ADMIN_JWT_SECRET=$(cat .env | grep ADMIN_JWT_SECRET | cut -d= heroku config:set JWT_SECRET=$(cat .env | grep -w JWT_SECRET | cut -d= -f2) ``` -If you are using Windows, it is recommended to use WSL for this step. +If you are using Windows, it is recommended to use [WSL](https://docs.microsoft.com/en-us/windows/wsl/about) for this step. The following `openssl` commands will generate random new secrets (Mac and Linux only): From cfd55e3a3f0038d2953bded92d19b2660ed5bf49 Mon Sep 17 00:00:00 2001 From: levipettersen <104788131+levipettersen@users.noreply.github.com> Date: Tue, 12 Jul 2022 23:22:05 +0200 Subject: [PATCH 3/4] Added multiple options for windows users on step 5 --- .../setup-deployment-guides/deployment/hosting-guides/heroku.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/developer-docs/latest/setup-deployment-guides/deployment/hosting-guides/heroku.md b/docs/developer-docs/latest/setup-deployment-guides/deployment/hosting-guides/heroku.md index c2386f165e..c72a38a2ae 100644 --- a/docs/developer-docs/latest/setup-deployment-guides/deployment/hosting-guides/heroku.md +++ b/docs/developer-docs/latest/setup-deployment-guides/deployment/hosting-guides/heroku.md @@ -256,7 +256,7 @@ heroku config:set ADMIN_JWT_SECRET=$(cat .env | grep ADMIN_JWT_SECRET | cut -d= heroku config:set JWT_SECRET=$(cat .env | grep -w JWT_SECRET | cut -d= -f2) ``` -If you are using Windows, it is recommended to use [WSL](https://docs.microsoft.com/en-us/windows/wsl/about) for this step. +If you are using Windows, you can manually set the variables using `heroku config:set VARIABLE=key` for each variable, or use [WSL](https://docs.microsoft.com/en-us/windows/wsl/about). The following `openssl` commands will generate random new secrets (Mac and Linux only): From 17d6a658e0023b6780e7a439847c192ec0e5b7b7 Mon Sep 17 00:00:00 2001 From: Pierre Wizla Date: Fri, 23 Sep 2022 11:28:01 +0200 Subject: [PATCH 4/4] Remove WSL suggestion and format as a tip --- .../deployment/hosting-guides/heroku.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/developer-docs/latest/setup-deployment-guides/deployment/hosting-guides/heroku.md b/docs/developer-docs/latest/setup-deployment-guides/deployment/hosting-guides/heroku.md index c72a38a2ae..cc06b434fd 100644 --- a/docs/developer-docs/latest/setup-deployment-guides/deployment/hosting-guides/heroku.md +++ b/docs/developer-docs/latest/setup-deployment-guides/deployment/hosting-guides/heroku.md @@ -256,7 +256,9 @@ heroku config:set ADMIN_JWT_SECRET=$(cat .env | grep ADMIN_JWT_SECRET | cut -d= heroku config:set JWT_SECRET=$(cat .env | grep -w JWT_SECRET | cut -d= -f2) ``` -If you are using Windows, you can manually set the variables using `heroku config:set VARIABLE=key` for each variable, or use [WSL](https://docs.microsoft.com/en-us/windows/wsl/about). +:::tip +On Windows, variables can be set manually by running the `heroku config:set VARIABLE=your-key-here` for each variable. +::: The following `openssl` commands will generate random new secrets (Mac and Linux only):