Skip to content

Commit e53a371

Browse files
committed
Mise en place de DotEnv
1 parent 0164967 commit e53a371

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+277
-247
lines changed

.env

Whitespace-only changes.

.env.test

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
APP_ENV=test
2+
3+
## App configuration
4+
DATABASE_HOST=dbtest
5+
DATABASE_PORT=3306
6+
DATABASE_NAME=web
7+
DATABASE_USER=afup
8+
DATABASE_PASSWORD=afup
9+
10+
SECRET=ThisTokenIsNotSoSecretChangeIt
11+
12+
GITHUB_CLIENT_ID=id
13+
GITHUB_CLIENT_SECRET=secret
14+
15+
ALGOLIA_APP_ID=DVB92YWTPE
16+
ALGOLIA_BACKEND_API_KEY=78e71e5r5c2Rb353f5a03376gb9878779
17+
ALGOLIA_FRONTEND_API_KEY=74e71e5r5c2Rb353f5a03376gb9878777
18+
19+
HOME_ALGOLIA_ENABLED=false
20+
21+
SLACK_URL=http://yolo
22+
23+
BLUESKY_API_IDENTIFIER=xxx
24+
BLUESKY_API_APP_PASSWORD=yyy
25+
26+
MAILCHIMP_API_KEY=xxx-yyyy
27+
MAILCHIMP_MEMBERS_LIST=
28+
MAILCHIMP_SUBSCRIBERS_LIST=
29+
MAILCHIMP_TECHLETTER_LIST=
30+
MAILCHIMP_TECHLETTER_API_KEY=xxx-yyyy
31+
MAILCHIMP_TECHLETTER_WEBHOOK_KEY="abc"
32+
33+
GOOGLE_MAPS_API_KEY=
34+
35+
MEETUP_API_CONSUMER_KEY=
36+
MEETUP_API_CONSUMER_SECRET=
37+
38+
TECHNO_WATCH_CALENDAR_URL=https://docs.google.com/spreadsheets/d/2cUeAk86Ov7BLYyn0Ad9ge3ecbsdboeQH64wIU9a9Zzp/export?format=csv
39+
TECHNO_WATCH_CALENDAR_KEY=9Yt0feebMyMrUWx
40+
41+
SUPER_APERO_CSV_URL=../tests/behat/files/super_apero.csv
42+
43+
GOOGLE_ANALYTICS_ENABLED=false
44+
GOOGLE_ANALYTICS_ID=G-CHPWDR3C1M
45+
46+
TECHLETTER_TEST_EMAIL_ADDRESS=[email protected]
47+
48+
SLACK_MEMBERS_LEGACY_TOKEN=aaaa-90909097
49+
50+
SLACK_API_URL=https://slack.com/api
51+
SLACK_MEMBRE_TOKEN=
52+
53+
RECAPTCHA_PUBLIC_KEY=6LeIxAcTAAAAAJcZVRqyHh71UMIEGNQ_MXjiZKhI
54+
RECAPTCHA_PRIVATE_KEY=6LeIxAcTAAAAAGG-vFI1TnRWxMZNFuojJ4WifJWe
55+
56+
PAYBOX_DOMAIN_SERVER=preprod-tpeweb.paybox.com
57+
PAYBOX_SECRET_KEY=0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF
58+
PAYBOX_SITE=1999888
59+
PAYBOX_RANG=32
60+
PAYBOX_IDENTIFIANT=110647233
61+
62+
BLOG_API_KEY=123456
63+
64+
SMTP_HOST="localhost"
65+
SMTP_PORT=1025
66+
SMTP_TLS=0
67+
SMTP_USERNAME=""
68+
SMTP_PASSWORD=""
69+
70+
QR_CODE_SALT=""
71+
# https://symfony.com/doc/current/reference/configuration/framework.html#ide
72+
IDE_USED="phpstorm"
73+
74+
AFUP_GLOBAL_MENU_EVENT_LABEL="Forum PHP"

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
.env
1+
/.env.local
2+
/.env.local.php
3+
/.env.*.local
24

35
deps.lock
46
.idea

Makefile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
-include .env
21
default: help
32

43
# Variables
@@ -51,7 +50,7 @@ init: htdocs/uploads
5150
##@ Docker
5251

5352
### Démarrer les containers
54-
docker-up: .env var/logs/.docker-build data compose.override.yml
53+
docker-up: .env.local var/logs/.docker-build data compose.override.yml
5554
$(DOCKER_COMP) up $(DOCKER_UP_OPTIONS)
5655

5756
### Stopper les containers
@@ -154,8 +153,8 @@ var/logs/.docker-build: compose.yml compose.override.yml $(shell find docker -ty
154153
CURRENT_UID=$(CURRENT_UID) ENABLE_XDEBUG=$(ENABLE_XDEBUG) $(DOCKER_COMPOSE_BIN) build
155154
touch var/logs/.docker-build
156155

157-
.env:
158-
cp .env.dist .env
156+
.env.local:
157+
cp .env.dist .env.local
159158

160159
compose.override.yml:
161160
cp compose.override.yml-dist compose.override.yml

app/config/config.php

Lines changed: 0 additions & 32 deletions
This file was deleted.

app/config/config.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
imports:
2-
- { resource: config.php }
32
- { resource: services.yml }
43
- { resource: packages/*.yaml }
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
ewz_recaptcha:
2-
public_key: '%recaptcha_public_key%'
3-
private_key: '%recaptcha_private_key%'
2+
public_key: '%env(RECAPTCHA_PUBLIC_KEY)%'
3+
private_key: '%env(RECAPTCHA_PRIVATE_KEY)%'

app/config/packages/framework.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ framework:
44
fallbacks: ["%locale%"]
55
enabled: true
66
default_path: "%kernel.project_dir%/../translations"
7-
secret: "%secret%"
7+
secret: "%env(SECRET)%"
88
router:
99
resource: "%kernel.project_dir%/config/routing.yml"
1010
strict_requirements: ~

app/config/packages/knpu_oauth2_client.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ knpu_oauth2_client:
33
# will create a service: knpu.oauth2.client.facebook_main
44
github_main:
55
type: github
6-
client_id: "%github_client_id%"
7-
client_secret: "%github_client_secret%"
6+
client_id: "%env(GITHUB_CLIENT_ID)%"
7+
client_secret: "%env(GITHUB_CLIENT_SECRET)%"
88
# see below
99
redirect_route: connection_github_check

app/config/packages/security.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ security:
6767
- { path: ^/admin/(members/reporting|association/relances|talk|slackmembers/check|healthcheck), roles: ROLE_ADMIN}
6868
- { path: ^/member, roles: [ROLE_USER, ROLE_MEMBER_EXPIRED]}
6969
- { path: ^/admin/, roles: ROLE_MEMBER_EXPIRED }
70-
- { path: ^/blog, allow_if: "request.getClientIp() in ['217.70.189.71', '127.0.0.1', '192.168.42.1'] or request.server.get('ALLOW_BLOG_FROM_ALL') == 1 or request.headers.get('x-afup-blog-api-key') == '%blog_api_key%'" }
70+
- { path: ^/blog, allow_if: "request.getClientIp() in ['217.70.189.71', '127.0.0.1', '192.168.42.1'] or request.server.get('ALLOW_BLOG_FROM_ALL') == 1 or request.headers.get('x-afup-blog-api-key') == '%env(BLOG_API_KEY)%'" }
7171
- { path: ^/blog, roles: ROLE_NO_ACCESS }
7272
- { path: ^/(event/\w+/tickets|association)paybox-callback, roles: PUBLIC_ACCESS, ips: "%paybox_ips%" }
7373
- { path: ^/(event/\w+/tickets|association)paybox-callback, roles: ROLE_SUPER_ADMIN }

0 commit comments

Comments
 (0)