From 6d4b42fa9a516dbe32368ad5a674ec28f3edad8c Mon Sep 17 00:00:00 2001
From: "Christopher C. Wells" <git@chris-wells.net>
Date: Fri, 23 Apr 2021 12:58:43 -0700
Subject: [PATCH] Adjust default configs to use Redis

---
 .env.dev.example        | 44 +++++++++++++++++++++++++++++------
 .env.prod.example       | 51 ++++++++++++++++++++++++++---------------
 docker-compose.dev.yml  |  2 +-
 docker-compose.prod.yml | 14 +++++------
 4 files changed, 78 insertions(+), 33 deletions(-)

diff --git a/.env.dev.example b/.env.dev.example
index 2263aa0..0a7eacd 100644
--- a/.env.dev.example
+++ b/.env.dev.example
@@ -1,4 +1,7 @@
-# Local env file assumes Sail is in use. See docker-compose.yml.
+#
+# Kcal application configuration.
+#
+
 APP_NAME=kcal
 APP_ENV=local
 APP_KEY=
@@ -8,8 +11,9 @@ APP_PORT=8080
 APP_SERVICE=app
 APP_TIMEZONE=UTC
 
-LOG_CHANNEL=stack
-LOG_LEVEL=debug
+#
+# Databases configuration.
+#
 
 DB_CONNECTION=mysql
 DB_HOST=db
@@ -21,14 +25,40 @@ DB_PASSWORD=kcal
 REDIS_HOST=redis
 REDIS_PORT=6379
 
+#
+# Search configuration.
+#
+
+#SCOUT_DRIVER=null
+
+#SCOUT_DRIVER=algolia
+#ALGOLIA_APP_ID=
+#ALGOLIA_SECRET=
+
 SCOUT_DRIVER=elastic
 ELASTIC_HOST=elasticsearch:9200
 ELASTIC_PORT=9200
 
+#
+# Media (image storage) configuration.
+#
+
 MEDIA_DISK=local
 
-BROADCAST_DRIVER=log
-CACHE_DRIVER=file
-QUEUE_CONNECTION=sync
-SESSION_DRIVER=file
+#MEDIA_DISK=s3-public
+#AWS_ACCESS_KEY_ID=
+#AWS_SECRET_ACCESS_KEY=
+#AWS_DEFAULT_REGION=
+#AWS_BUCKET=
+
+#
+# Misc. drivers and configuration.
+#
+
+BROADCAST_DRIVER=redis
+CACHE_DRIVER=redis
+LOG_CHANNEL=stack
+LOG_LEVEL=debug
+QUEUE_CONNECTION=redis
+SESSION_DRIVER=redis
 SESSION_LIFETIME=120
diff --git a/.env.prod.example b/.env.prod.example
index ab1250c..39a6d80 100644
--- a/.env.prod.example
+++ b/.env.prod.example
@@ -1,3 +1,7 @@
+#
+# Kcal application configuration.
+#
+
 APP_NAME=kcal
 APP_ENV=production
 APP_KEY=
@@ -7,30 +11,37 @@ APP_PORT=80
 APP_PORT_SSL=443
 APP_TIMEZONE=UTC
 
-LOG_CHANNEL=stack
-LOG_LEVEL=debug
+#
+# Databases configuration.
+#
 
 DB_CONNECTION=mysql
-DB_HOST=
+DB_HOST=db
 DB_PORT=3306
-DB_DATABASE=
-DB_USERNAME=
-DB_PASSWORD=
+DB_DATABASE=kcal
+DB_USERNAME=kcal
+DB_PASSWORD=kcal
 
-#REDIS_URL=
-#REDIS_HOST=
-#REDIS_PASSWORD=
-#REDIS_PORT=6379
-#REDIS_DB=
+REDIS_HOST=redis
+REDIS_PORT=6379
 
-SCOUT_DRIVER=null
+#
+# Search configuration.
+#
+
+#SCOUT_DRIVER=null
 
 #SCOUT_DRIVER=algolia
 #ALGOLIA_APP_ID=
 #ALGOLIA_SECRET=
 
-#SCOUT_DRIVER=elastic
-#ELASTIC_HOST=
+SCOUT_DRIVER=elastic
+ELASTIC_HOST=elasticsearch:9200
+ELASTIC_PORT=9200
+
+#
+# Media (image storage) configuration.
+#
 
 MEDIA_DISK=local
 
@@ -40,8 +51,12 @@ MEDIA_DISK=local
 #AWS_DEFAULT_REGION=
 #AWS_BUCKET=
 
-BROADCAST_DRIVER=log
-CACHE_DRIVER=file
-QUEUE_CONNECTION=sync
-SESSION_DRIVER=file
+#
+# Misc. drivers and configuration.
+#
+
+BROADCAST_DRIVER=redis
+CACHE_DRIVER=redis
+QUEUE_CONNECTION=redis
+SESSION_DRIVER=redis
 SESSION_LIFETIME=120
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index 79f3fea..02a38c8 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -61,7 +61,7 @@ services:
     cap_add:
       - IPC_LOCK
     volumes:
-      - elasticsearch-data:/usr/share/elasticsearch/data
+      - 'elasticsearch-data:/usr/share/elasticsearch/data'
     ports:
       - '${ELASTIC_PORT:-9200}:9200'
     networks:
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index 9f30ac2..fd1e258 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -7,8 +7,8 @@ services:
     tty: true
     working_dir: /var/www
     volumes:
-      - ./:/var/www
-      - ./etc/php/php.ini:/usr/local/etc/php/conf.d/local.ini
+      - './:/var/www'
+      - './etc/php/php.ini:/usr/local/etc/php/conf.d/local.ini'
     networks:
       - kcal
     depends_on:
@@ -24,8 +24,8 @@ services:
       - '${APP_PORT:-80}:80'
       - '${APP_PORT_SSL:-443}:443'
     volumes:
-      - ./:/var/www
-      - ./etc/nginx/conf.d/:/etc/nginx/conf.d/
+      - './:/var/www'
+      - './etc/nginx/conf.d/:/etc/nginx/conf.d/'
     networks:
       - kcal
   db:
@@ -42,8 +42,8 @@ services:
       MYSQL_PASSWORD: '${DB_PASSWORD:-kcal}'
       MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
     volumes:
-      - db-data:/var/lib/mysql/
-      - ./etc/mysql/my.cnf:/etc/mysql/my.cnf
+      - 'db-data:/var/lib/mysql/'
+      - './etc/mysql/my.cnf:/etc/mysql/my.cnf'
     networks:
       - kcal
   elasticsearch:
@@ -62,7 +62,7 @@ services:
     cap_add:
       - IPC_LOCK
     volumes:
-      - elasticsearch-data:/usr/share/elasticsearch/data
+      - 'elasticsearch-data:/usr/share/elasticsearch/data'
     ports:
       - '${ELASTIC_PORT:-9200}:9200'
     networks: