Skip to content

Commit

Permalink
Merge pull request #38 from cybex-gmbh/main
Browse files Browse the repository at this point in the history
Rename github secrets and provide log folder option
  • Loading branch information
gael-connan-cybex authored Feb 15, 2024
2 parents 7f0dcbe + c146bc3 commit c14441f
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 8 deletions.
1 change: 1 addition & 0 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ SQS_QUEUE=
LOG_CHANNEL=stack
LOG_DEPRECATIONS_CHANNEL=null
LOG_LEVEL=debug
LOG_FOLDER=transmorpher

DB_CONNECTION=mysql
DB_HOST=transmorpher-mysql-1
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pullpreview.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,6 @@ jobs:
instance_type: medium
ports: 80, 443
env:
AWS_ACCESS_KEY_ID: "${{ secrets.AWS_ACCESS_KEY_ID }}"
AWS_SECRET_ACCESS_KEY: "${{ secrets.AWS_SECRET_ACCESS_KEY }}"
AWS_ACCESS_KEY_ID: "${{ secrets.PULLPREVIEW_AWS_ACCESS_KEY_ID }}"
AWS_SECRET_ACCESS_KEY: "${{ secrets.PULLPREVIEW_AWS_SECRET_ACCESS_KEY }}"
AWS_REGION: "eu-central-1"
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -427,8 +427,8 @@ When labeling a pull request with the "pullpreview" label, a staging environment
- APP_KEY
- TRANSMORPHER_SIGNING_KEYPAIR
- PULLPREVIEW_TRANSMORPHER_AUTH_TOKEN_HASH
- AWS_ACCESS_KEY_ID
- AWS_SECRET_ACCESS_KEY
- PULLPREVIEW_AWS_ACCESS_KEY_ID
- PULLPREVIEW_AWS_SECRET_ACCESS_KEY

#### Auth Token Hash

Expand Down
6 changes: 3 additions & 3 deletions config/logging.php
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,13 @@

'single' => [
'driver' => 'single',
'path' => storage_path('logs/laravel.log'),
'path' => storage_path(sprintf('logs/%s/laravel.log', env('LOG_FOLDER'))),
'level' => env('LOG_LEVEL', 'debug'),
],

'daily' => [
'driver' => 'daily',
'path' => storage_path('logs/laravel.log'),
'path' => storage_path(sprintf('logs/%s/laravel.log', env('LOG_FOLDER'))),
'level' => env('LOG_LEVEL', 'debug'),
'days' => 14,
],
Expand Down Expand Up @@ -115,7 +115,7 @@
],

'emergency' => [
'path' => storage_path('logs/laravel.log'),
'path' => storage_path(sprintf('logs/%s/laravel.log', env('LOG_FOLDER'))),
],
],

Expand Down
2 changes: 1 addition & 1 deletion docker-compose.pullpreview.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ services:
TRAEFIK_API: false
TRAEFIK_API_DASHBOARD: false
TRAEFIK_CERTIFICATESRESOLVERS_PRODUCTION: true
TRAEFIK_CERTIFICATESRESOLVERS_PRODUCTION_ACME_EMAIL: 'webdevelopment@cybex-online.com'
TRAEFIK_CERTIFICATESRESOLVERS_PRODUCTION_ACME_EMAIL: 'cloud@cybex-online.com'
TRAEFIK_CERTIFICATESRESOLVERS_PRODUCTION_ACME_CASERVER: 'https://acme-v02.api.letsencrypt.org/directory'
TRAEFIK_CERTIFICATESRESOLVERS_PRODUCTION_ACME_STORAGE: '/letsencrypt/acme.json'
TRAEFIK_CERTIFICATESRESOLVERS_PRODUCTION_ACME_HTTPCHALLENGE: true
Expand Down

0 comments on commit c14441f

Please sign in to comment.