Skip to content

Commit 6d4b42f

Browse files
committed
Adjust default configs to use Redis
1 parent 0eba6a4 commit 6d4b42f

File tree

4 files changed

+78
-33
lines changed

4 files changed

+78
-33
lines changed

.env.dev.example

Lines changed: 37 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
# Local env file assumes Sail is in use. See docker-compose.yml.
1+
#
2+
# Kcal application configuration.
3+
#
4+
25
APP_NAME=kcal
36
APP_ENV=local
47
APP_KEY=
@@ -8,8 +11,9 @@ APP_PORT=8080
811
APP_SERVICE=app
912
APP_TIMEZONE=UTC
1013

11-
LOG_CHANNEL=stack
12-
LOG_LEVEL=debug
14+
#
15+
# Databases configuration.
16+
#
1317

1418
DB_CONNECTION=mysql
1519
DB_HOST=db
@@ -21,14 +25,40 @@ DB_PASSWORD=kcal
2125
REDIS_HOST=redis
2226
REDIS_PORT=6379
2327

28+
#
29+
# Search configuration.
30+
#
31+
32+
#SCOUT_DRIVER=null
33+
34+
#SCOUT_DRIVER=algolia
35+
#ALGOLIA_APP_ID=
36+
#ALGOLIA_SECRET=
37+
2438
SCOUT_DRIVER=elastic
2539
ELASTIC_HOST=elasticsearch:9200
2640
ELASTIC_PORT=9200
2741

42+
#
43+
# Media (image storage) configuration.
44+
#
45+
2846
MEDIA_DISK=local
2947

30-
BROADCAST_DRIVER=log
31-
CACHE_DRIVER=file
32-
QUEUE_CONNECTION=sync
33-
SESSION_DRIVER=file
48+
#MEDIA_DISK=s3-public
49+
#AWS_ACCESS_KEY_ID=
50+
#AWS_SECRET_ACCESS_KEY=
51+
#AWS_DEFAULT_REGION=
52+
#AWS_BUCKET=
53+
54+
#
55+
# Misc. drivers and configuration.
56+
#
57+
58+
BROADCAST_DRIVER=redis
59+
CACHE_DRIVER=redis
60+
LOG_CHANNEL=stack
61+
LOG_LEVEL=debug
62+
QUEUE_CONNECTION=redis
63+
SESSION_DRIVER=redis
3464
SESSION_LIFETIME=120

.env.prod.example

Lines changed: 33 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
#
2+
# Kcal application configuration.
3+
#
4+
15
APP_NAME=kcal
26
APP_ENV=production
37
APP_KEY=
@@ -7,30 +11,37 @@ APP_PORT=80
711
APP_PORT_SSL=443
812
APP_TIMEZONE=UTC
913

10-
LOG_CHANNEL=stack
11-
LOG_LEVEL=debug
14+
#
15+
# Databases configuration.
16+
#
1217

1318
DB_CONNECTION=mysql
14-
DB_HOST=
19+
DB_HOST=db
1520
DB_PORT=3306
16-
DB_DATABASE=
17-
DB_USERNAME=
18-
DB_PASSWORD=
21+
DB_DATABASE=kcal
22+
DB_USERNAME=kcal
23+
DB_PASSWORD=kcal
24+
25+
REDIS_HOST=redis
26+
REDIS_PORT=6379
1927

20-
#REDIS_URL=
21-
#REDIS_HOST=
22-
#REDIS_PASSWORD=
23-
#REDIS_PORT=6379
24-
#REDIS_DB=
28+
#
29+
# Search configuration.
30+
#
2531

26-
SCOUT_DRIVER=null
32+
#SCOUT_DRIVER=null
2733

2834
#SCOUT_DRIVER=algolia
2935
#ALGOLIA_APP_ID=
3036
#ALGOLIA_SECRET=
3137

32-
#SCOUT_DRIVER=elastic
33-
#ELASTIC_HOST=
38+
SCOUT_DRIVER=elastic
39+
ELASTIC_HOST=elasticsearch:9200
40+
ELASTIC_PORT=9200
41+
42+
#
43+
# Media (image storage) configuration.
44+
#
3445

3546
MEDIA_DISK=local
3647

@@ -40,8 +51,12 @@ MEDIA_DISK=local
4051
#AWS_DEFAULT_REGION=
4152
#AWS_BUCKET=
4253

43-
BROADCAST_DRIVER=log
44-
CACHE_DRIVER=file
45-
QUEUE_CONNECTION=sync
46-
SESSION_DRIVER=file
54+
#
55+
# Misc. drivers and configuration.
56+
#
57+
58+
BROADCAST_DRIVER=redis
59+
CACHE_DRIVER=redis
60+
QUEUE_CONNECTION=redis
61+
SESSION_DRIVER=redis
4762
SESSION_LIFETIME=120

docker-compose.dev.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ services:
6161
cap_add:
6262
- IPC_LOCK
6363
volumes:
64-
- elasticsearch-data:/usr/share/elasticsearch/data
64+
- 'elasticsearch-data:/usr/share/elasticsearch/data'
6565
ports:
6666
- '${ELASTIC_PORT:-9200}:9200'
6767
networks:

docker-compose.prod.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ services:
77
tty: true
88
working_dir: /var/www
99
volumes:
10-
- ./:/var/www
11-
- ./etc/php/php.ini:/usr/local/etc/php/conf.d/local.ini
10+
- './:/var/www'
11+
- './etc/php/php.ini:/usr/local/etc/php/conf.d/local.ini'
1212
networks:
1313
- kcal
1414
depends_on:
@@ -24,8 +24,8 @@ services:
2424
- '${APP_PORT:-80}:80'
2525
- '${APP_PORT_SSL:-443}:443'
2626
volumes:
27-
- ./:/var/www
28-
- ./etc/nginx/conf.d/:/etc/nginx/conf.d/
27+
- './:/var/www'
28+
- './etc/nginx/conf.d/:/etc/nginx/conf.d/'
2929
networks:
3030
- kcal
3131
db:
@@ -42,8 +42,8 @@ services:
4242
MYSQL_PASSWORD: '${DB_PASSWORD:-kcal}'
4343
MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
4444
volumes:
45-
- db-data:/var/lib/mysql/
46-
- ./etc/mysql/my.cnf:/etc/mysql/my.cnf
45+
- 'db-data:/var/lib/mysql/'
46+
- './etc/mysql/my.cnf:/etc/mysql/my.cnf'
4747
networks:
4848
- kcal
4949
elasticsearch:
@@ -62,7 +62,7 @@ services:
6262
cap_add:
6363
- IPC_LOCK
6464
volumes:
65-
- elasticsearch-data:/usr/share/elasticsearch/data
65+
- 'elasticsearch-data:/usr/share/elasticsearch/data'
6666
ports:
6767
- '${ELASTIC_PORT:-9200}:9200'
6868
networks:

0 commit comments

Comments
 (0)