Skip to content

Commit f438c8b

Browse files
botisSmilebotisSmile
committed
feat(#1340400): Add config for default sender email + configuration to deliver integrations
1 parent 936eaf6 commit f438c8b

File tree

8 files changed

+31
-2
lines changed

8 files changed

+31
-2
lines changed

‎.github/workflows/deploy-2.1.x.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,3 +41,6 @@ jobs:
4141
POSTGRES_PASSWORD: ${{ secrets.POSTGRES_PASSWORD }}
4242
COMPOSER_AUTH: ${{ secrets.COMPOSER_AUTH }}
4343
PACKAGIST_URL: ${{ secrets.PACKAGIST_URL }}
44+
MAILER_DSN: ${{ secrets.MAILER_DSN }}
45+
GALLY_DEFAULT_SENDER_NAME: ${{ secrets.GALLY_DEFAULT_SENDER_NAME_STABLE }}
46+
GALLY_DEFAULT_SENDER_EMAIL: ${{ secrets.GALLY_DEFAULT_SENDER_EMAIL_STABLE }}

‎.github/workflows/deploy-demo-llm.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,6 @@ jobs:
3838
COMPOSER_AUTH: ${{ secrets.COMPOSER_AUTH }}
3939
PACKAGIST_URL: ${{ secrets.PACKAGIST_URL }}
4040
MEDIA_URL: ${{ secrets.MEDIA_URL_DEMO_LLM }}
41+
MAILER_DSN: ${{ secrets.MAILER_DSN }}
42+
GALLY_DEFAULT_SENDER_NAME: ${{ secrets.GALLY_DEFAULT_SENDER_NAME_DEMO_LLM }}
43+
GALLY_DEFAULT_SENDER_EMAIL: ${{ secrets.GALLY_DEFAULT_SENDER_EMAIL_DEMO_LLM }}

‎.github/workflows/deploy-demo-oro.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,3 +39,6 @@ jobs:
3939
COMPOSER_AUTH: ${{ secrets.COMPOSER_AUTH }}
4040
PACKAGIST_URL: ${{ secrets.PACKAGIST_URL }}
4141
MEDIA_URL: ${{ secrets.MEDIA_URL_DEMO_ORO }}
42+
MAILER_DSN: ${{ secrets.MAILER_DSN }}
43+
GALLY_DEFAULT_SENDER_NAME: ${{ secrets.GALLY_DEFAULT_SENDER_NAME_ORO }}
44+
GALLY_DEFAULT_SENDER_EMAIL: ${{ secrets.GALLY_DEFAULT_SENDER_EMAIL_ORO }}

‎.github/workflows/deploy-demo-shopware.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,6 @@ jobs:
3838
COMPOSER_AUTH: ${{ secrets.COMPOSER_AUTH }}
3939
PACKAGIST_URL: ${{ secrets.PACKAGIST_URL }}
4040
MEDIA_URL: ${{ secrets.MEDIA_URL_DEMO_SHOPWARE }}
41+
MAILER_DSN: ${{ secrets.MAILER_DSN }}
42+
GALLY_DEFAULT_SENDER_NAME: ${{ secrets.GALLY_DEFAULT_SENDER_NAME_SHOPWARE }}
43+
GALLY_DEFAULT_SENDER_EMAIL: ${{ secrets.GALLY_DEFAULT_SENDER_EMAIL_SHOPWARE }}

‎.github/workflows/deploy-demo-sylius.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,6 @@ jobs:
3838
COMPOSER_AUTH: ${{ secrets.COMPOSER_AUTH }}
3939
PACKAGIST_URL: ${{ secrets.PACKAGIST_URL }}
4040
MEDIA_URL: ${{ secrets.MEDIA_URL_DEMO_SYLIUS }}
41+
MAILER_DSN: ${{ secrets.MAILER_DSN }}
42+
GALLY_DEFAULT_SENDER_NAME: ${{ secrets.GALLY_DEFAULT_SENDER_NAME_SYLIUS }}
43+
GALLY_DEFAULT_SENDER_EMAIL: ${{ secrets.GALLY_DEFAULT_SENDER_EMAIL_SYLIUS }}

‎.github/workflows/deploy-demo.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,3 +39,6 @@ jobs:
3939
POSTGRES_PASSWORD: ${{ secrets.POSTGRES_PASSWORD }}
4040
COMPOSER_AUTH: ${{ secrets.COMPOSER_AUTH }}
4141
PACKAGIST_URL: ${{ secrets.PACKAGIST_URL }}
42+
MAILER_DSN: ${{ secrets.MAILER_DSN }}
43+
GALLY_DEFAULT_SENDER_NAME: ${{ secrets.GALLY_DEFAULT_SENDER_NAME_DEMO }}
44+
GALLY_DEFAULT_SENDER_EMAIL: ${{ secrets.GALLY_DEFAULT_SENDER_EMAIL_DEMO }}

‎.github/workflows/deploy-int.yml‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,12 @@ on:
3939
required: true
4040
MEDIA_URL:
4141
required: false
42+
MAILER_DSN:
43+
required: true
44+
GALLY_DEFAULT_SENDER_NAME:
45+
required: true
46+
GALLY_DEFAULT_SENDER_EMAIL:
47+
required: true
4248

4349
jobs:
4450
deploy:
@@ -59,6 +65,9 @@ jobs:
5965
COMPOSER_AUTH: ${{ secrets.COMPOSER_AUTH }}
6066
PACKAGIST_URL: ${{ secrets.PACKAGIST_URL }}
6167
MEDIA_URL: ${{ secrets.MEDIA_URL }}
68+
MAILER_DSN: ${{ secrets.MAILER_DSN }}
69+
GALLY_DEFAULT_SENDER_NAME: ${{ secrets.GALLY_DEFAULT_SENDER_NAME }}
70+
GALLY_DEFAULT_SENDER_EMAIL: ${{ secrets.GALLY_DEFAULT_SENDER_EMAIL }}
6271
run: |
6372
echo "$PRIVATE_KEY" > private_key && chmod 600 private_key
6473
ssh -o StrictHostKeyChecking=no -o ServerAliveInterval=30 -i private_key ${USER_NAME}@${HOSTNAME} "
@@ -90,7 +99,7 @@ jobs:
9099
docker compose run --rm php sed -i \"s/NelmioAliceBundle::class => \['dev' => true, 'test' => true]/NelmioAliceBundle::class => ['all' => true]/g\" config/bundles.php &&
91100
docker compose run --rm php sed -i \"s/FidryAliceDataFixturesBundle::class => \['dev' => true, 'test' => true]/FidryAliceDataFixturesBundle::class => ['all' => true]/g\" config/bundles.php &&
92101
docker compose run --rm php sed -i \"s/HautelookAliceBundle::class => \['dev' => true, 'test' => true]/HautelookAliceBundle::class => ['all' => true]/g\" config/bundles.php &&
93-
GALLY_CATALOG_MEDIA_URL=${MEDIA_URL} SERVER_NAME=$HOSTNAME API_ROUTE_PREFIX=api APP_SECRET=$APP_SECRET POSTGRES_PASSWORD=$POSTGRES_PASSWORD COMPOSER_AUTH='$COMPOSER_AUTH' docker compose -f compose.yml -f compose.int.yml up -d --build &&
94-
GALLY_CATALOG_MEDIA_URL=${MEDIA_URL} SERVER_NAME=$HOSTNAME API_ROUTE_PREFIX=api APP_SECRET=$APP_SECRET POSTGRES_PASSWORD=$POSTGRES_PASSWORD COMPOSER_AUTH='$COMPOSER_AUTH' docker compose -f compose.yml -f compose.int.yml exec php bin/console lexik:jwt:generate-keypair --skip-if-exists
102+
GALLY_DEFAULT_SENDER_NAME=${GALLY_DEFAULT_SENDER_NAME} GALLY_DEFAULT_SENDER_EMAIL=${GALLY_DEFAULT_SENDER_EMAIL} MAILER_DSN=${MAILER_DSN} GALLY_CATALOG_MEDIA_URL=${MEDIA_URL} SERVER_NAME=$HOSTNAME API_ROUTE_PREFIX=api APP_SECRET=$APP_SECRET POSTGRES_PASSWORD=$POSTGRES_PASSWORD COMPOSER_AUTH='$COMPOSER_AUTH' docker compose -f compose.yml -f compose.int.yml up -d --build &&
103+
GALLY_DEFAULT_SENDER_NAME=${GALLY_DEFAULT_SENDER_NAME} GALLY_DEFAULT_SENDER_EMAIL=${GALLY_DEFAULT_SENDER_EMAIL} MAILER_DSN=${MAILER_DSN} GALLY_CATALOG_MEDIA_URL=${MEDIA_URL} SERVER_NAME=$HOSTNAME API_ROUTE_PREFIX=api APP_SECRET=$APP_SECRET POSTGRES_PASSWORD=$POSTGRES_PASSWORD COMPOSER_AUTH='$COMPOSER_AUTH' docker compose -f compose.yml -f compose.int.yml exec php bin/console lexik:jwt:generate-keypair --skip-if-exists
95104
"
96105

‎api/.env‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,4 +55,6 @@ JWT_TTL=28800
5555

5656
###> symfony/mailer ###
5757
MAILER_DSN=smtp://mailer:1025
58+
GALLY_DEFAULT_SENDER_NAME=Gally
59+
GALLY_DEFAULT_SENDER_EMAIL=noreply@gally.localhost
5860
###< symfony/mailer ###

0 commit comments

Comments
 (0)