diff --git a/.env.local.example b/.env.local.example index 16cad3cd2..0cff2a734 100644 --- a/.env.local.example +++ b/.env.local.example @@ -19,3 +19,6 @@ S3_UPLOAD_BUCKET=trassenscout S3_UPLOAD_KEY=AAAAAAAAAAAAAAAAAAAA S3_UPLOAD_REGION=eu-central-1 S3_UPLOAD_SECRET=AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + +# Get from https://felt.com/ => Settings + FELT_TOKEN=felt_pat_AAAAAAAAAAAAAAAAAAAAAA diff --git a/.github/workflows/deploy-app-production.yml b/.github/workflows/deploy-app-production.yml index 8b7c6049c..06df97e50 100644 --- a/.github/workflows/deploy-app-production.yml +++ b/.github/workflows/deploy-app-production.yml @@ -15,12 +15,13 @@ jobs: secrets: AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - DATABASE_URL: ${{ secrets.DATABASE_URL_PRODUCTION }} + DATABASE_URL: ${{ secrets.DATABASE_URL_PRODUCTION }} SESSION_SECRET_KEY: ${{ secrets.SESSION_SECRET_KEY_PRODUCTION }} NGINX_HTPASSWD: ${{ secrets.NGINX_HTPASSWD }} MAILJET_APIKEY_PUBLIC: ${{ secrets.MAILJET_APIKEY_PUBLIC }} MAILJET_APIKEY_PRIVATE: ${{ secrets.MAILJET_APIKEY_PRIVATE }} S3_UPLOAD_KEY: ${{ secrets.S3_UPLOAD_KEY }} S3_UPLOAD_SECRET: ${{ secrets.S3_UPLOAD_SECRET }} + FELT_TOKEN: ${{ secrets.FELT_TOKEN }} ASSETS_BUCKET_HOST: ${{ secrets.ASSETS_BUCKET_HOST }} ASSETS_BUCKET_PATH: ${{ secrets.ASSETS_BUCKET_PATH_PRODUCTION }} diff --git a/.github/workflows/deploy-app-staging.yml b/.github/workflows/deploy-app-staging.yml index 728bd9755..442bb33cf 100644 --- a/.github/workflows/deploy-app-staging.yml +++ b/.github/workflows/deploy-app-staging.yml @@ -15,12 +15,13 @@ jobs: secrets: AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - DATABASE_URL: ${{ secrets.DATABASE_URL_STAGING }} + DATABASE_URL: ${{ secrets.DATABASE_URL_STAGING }} SESSION_SECRET_KEY: ${{ secrets.SESSION_SECRET_KEY_STAGING }} NGINX_HTPASSWD: ${{ secrets.NGINX_HTPASSWD }} MAILJET_APIKEY_PUBLIC: ${{ secrets.MAILJET_APIKEY_PUBLIC }} MAILJET_APIKEY_PRIVATE: ${{ secrets.MAILJET_APIKEY_PRIVATE }} S3_UPLOAD_KEY: ${{ secrets.S3_UPLOAD_KEY }} + FELT_TOKEN: ${{ secrets.FELT_TOKEN }} S3_UPLOAD_SECRET: ${{ secrets.S3_UPLOAD_SECRET }} ASSETS_BUCKET_HOST: ${{ secrets.ASSETS_BUCKET_HOST }} ASSETS_BUCKET_PATH: ${{ secrets.ASSETS_BUCKET_PATH_STAGING }} diff --git a/.github/workflows/deploy-app-tinkering.yml b/.github/workflows/deploy-app-tinkering.yml index 5cb5ec984..241fd2557 100644 --- a/.github/workflows/deploy-app-tinkering.yml +++ b/.github/workflows/deploy-app-tinkering.yml @@ -15,12 +15,13 @@ jobs: secrets: AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - DATABASE_URL: ${{ secrets.DATABASE_URL_TINKERING }} + DATABASE_URL: ${{ secrets.DATABASE_URL_TINKERING }} SESSION_SECRET_KEY: ${{ secrets.SESSION_SECRET_KEY_TINKERING }} NGINX_HTPASSWD: ${{ secrets.NGINX_HTPASSWD }} MAILJET_APIKEY_PUBLIC: ${{ secrets.MAILJET_APIKEY_PUBLIC }} MAILJET_APIKEY_PRIVATE: ${{ secrets.MAILJET_APIKEY_PRIVATE }} S3_UPLOAD_KEY: ${{ secrets.S3_UPLOAD_KEY }} S3_UPLOAD_SECRET: ${{ secrets.S3_UPLOAD_SECRET }} + FELT_TOKEN: ${{ secrets.FELT_TOKEN }} ASSETS_BUCKET_HOST: ${{ secrets.ASSETS_BUCKET_HOST }} ASSETS_BUCKET_PATH: ${{ secrets.ASSETS_BUCKET_PATH_TINKERING }} diff --git a/.github/workflows/deploy-app.yml b/.github/workflows/deploy-app.yml index f358e3a66..0218a75c1 100644 --- a/.github/workflows/deploy-app.yml +++ b/.github/workflows/deploy-app.yml @@ -36,6 +36,8 @@ on: required: true S3_UPLOAD_SECRET: required: true + FELT_TOKEN: + required: true ASSETS_BUCKET_HOST: required: true ASSETS_BUCKET_PATH: @@ -45,7 +47,6 @@ jobs: build-push-deploy-docker-images: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - name: Upgrade AWS CLI version and setup lightsailctl @@ -115,6 +116,7 @@ jobs: S3_UPLOAD_BUCKET: ${{ inputs.S3_UPLOAD_BUCKET }} S3_UPLOAD_REGION: ${{ inputs.S3_UPLOAD_REGION }} S3_UPLOAD_ROOTFOLDER: ${{ inputs.S3_UPLOAD_ROOTFOLDER }} + FELT_TOKEN: ${{ secrets.FELT_TOKEN }} ASSETS_BUCKET_HOST: ${{ secrets.ASSETS_BUCKET_HOST }} ASSETS_BUCKET_PATH: ${{ secrets.ASSETS_BUCKET_PATH }} diff --git a/.github/workflows/deployment-config.yml.tpl b/.github/workflows/deployment-config.yml.tpl index 8e3a0b045..b55334448 100644 --- a/.github/workflows/deployment-config.yml.tpl +++ b/.github/workflows/deployment-config.yml.tpl @@ -21,6 +21,7 @@ containers: S3_UPLOAD_BUCKET: ${S3_UPLOAD_BUCKET} S3_UPLOAD_REGION: ${S3_UPLOAD_REGION} S3_UPLOAD_ROOTFOLDER: ${S3_UPLOAD_ROOTFOLDER} + FELT_TOKEN: ${{ secrets.FELT_TOKEN }} image: public.ecr.aws/n0p8j4k5/trassenscout/app:${GITHUB_SHA} ports: "3000": HTTP