From f2172aca710808772151f43bf59780aa3948f2e9 Mon Sep 17 00:00:00 2001
From: Jeroen Smeets <jeroen@jeroensmeets.net>
Date: Mon, 13 Aug 2018 14:42:39 +0200
Subject: [PATCH 1/4] add MySQL version req to README.md

---
 .env.example | 55 ----------------------------------------------------
 README.md    |  2 +-
 2 files changed, 1 insertion(+), 56 deletions(-)
 delete mode 100644 .env.example

diff --git a/.env.example b/.env.example
deleted file mode 100644
index bbad988d2..000000000
--- a/.env.example
+++ /dev/null
@@ -1,55 +0,0 @@
-APP_NAME="PixelFed Test"
-APP_ENV=local
-APP_KEY=
-APP_DEBUG=true
-APP_URL=http://localhost
-
-ADMIN_DOMAIN="localhost"
-APP_DOMAIN="localhost"
-
-LOG_CHANNEL=stack
-
-DB_CONNECTION=mysql
-DB_HOST=127.0.0.1
-DB_PORT=3306
-DB_DATABASE=
-DB_USERNAME=
-DB_PASSWORD=
-
-BROADCAST_DRIVER=log
-CACHE_DRIVER=redis
-SESSION_DRIVER=redis
-SESSION_LIFETIME=120
-QUEUE_DRIVER=redis
-
-REDIS_HOST=127.0.0.1
-REDIS_PASSWORD=null
-REDIS_PORT=6379
-
-MAIL_DRIVER=log
-MAIL_HOST=smtp.mailtrap.io
-MAIL_PORT=2525
-MAIL_USERNAME=null
-MAIL_PASSWORD=null
-MAIL_ENCRYPTION=null
-MAIL_FROM_ADDRESS="pixelfed@example.com"
-MAIL_FROM_NAME="Pixelfed"
-
-SESSION_DOMAIN="${APP_DOMAIN}"
-SESSION_SECURE_COOKIE=true
-API_BASE="/api/1/"
-API_SEARCH="/api/search"
-
-OPEN_REGISTRATION=true
-RECAPTCHA_ENABLED=false
-ENFORCE_EMAIL_VERIFICATION=true
-
-MAX_PHOTO_SIZE=15000
-MAX_CAPTION_LENGTH=150
-MAX_ALBUM_LENGTH=4
-
-MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
-MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
-MIX_APP_URL="${APP_URL}"
-MIX_API_BASE="${API_BASE}"
-MIX_API_SEARCH="${API_SEARCH}"
diff --git a/README.md b/README.md
index fe8ad87a8..561d0e15b 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ testing and development.
 
 ## Requirements
  - PHP >= 7.1.3 (7.2+ recommended for stable version)
- - MySQL, Postgres (MariaDB and sqlite are not supported yet)
+ - MySQL, Postgres (MySQL >= 5.7, MariaDB and sqlite are not supported yet)
  - Redis
  - Composer
  - GD or ImageMagick

From e7a5be75263acc24c14a18a6617125846a39a189 Mon Sep 17 00:00:00 2001
From: Jeroen Smeets <jeroen@jeroensmeets.net>
Date: Mon, 13 Aug 2018 14:50:32 +0200
Subject: [PATCH 2/4] adding back example file, deleted accidentally

---
 .env.example | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)
 create mode 100644 .env.example

diff --git a/.env.example b/.env.example
new file mode 100644
index 000000000..9911a4951
--- /dev/null
+++ b/.env.example
@@ -0,0 +1,56 @@
+APP_NAME="PixelFed Test"
+APP_ENV=local
+APP_KEY=
+APP_DEBUG=true
+APP_URL=http://localhost
+
+ADMIN_DOMAIN="localhost"
+APP_DOMAIN="localhost"
+
+LOG_CHANNEL=stack
+
+DB_CONNECTION=mysql
+DB_HOST=127.0.0.1
+DB_PORT=3306
+DB_DATABASE=
+DB_USERNAME=
+DB_PASSWORD=
+
+BROADCAST_DRIVER=log
+CACHE_DRIVER=redis
+SESSION_DRIVER=redis
+SESSION_LIFETIME=120
+QUEUE_DRIVER=redis
+
+REDIS_HOST=127.0.0.1
+REDIS_PASSWORD=null
+REDIS_PORT=6379
+
+MAIL_DRIVER=log
+MAIL_HOST=smtp.mailtrap.io
+MAIL_PORT=2525
+MAIL_USERNAME=null
+MAIL_PASSWORD=null
+MAIL_ENCRYPTION=null
+MAIL_FROM_ADDRESS="pixelfed@example.com"
+MAIL_FROM_NAME="Pixelfed"
+
+SESSION_DOMAIN="${APP_DOMAIN}"
+SESSION_SECURE_COOKIE=true
+API_BASE="/api/1/"
+API_SEARCH="/api/search"
+
+OPEN_REGISTRATION=true
+RECAPTCHA_ENABLED=false
+ENFORCE_EMAIL_VERIFICATION=true
+
+MAX_PHOTO_SIZE=15000
+MAX_CAPTION_LENGTH=150
+MAX_ALBUM_LENGTH=4
+
+MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
+MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
+MIX_APP_URL="${APP_URL}"
+MIX_API_BASE="${API_BASE}"
+MIX_API_SEARCH="${API_SEARCH}"
+

From 4ae18a3b27a20fccecf00e4bfbb91982dc7c91be Mon Sep 17 00:00:00 2001
From: Jeroen Smeets <jeroen@jeroensmeets.net>
Date: Mon, 13 Aug 2018 14:52:34 +0200
Subject: [PATCH 3/4] and remove extra empty line, no need to cause a change in
 the repo

---
 .env.example | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.env.example b/.env.example
index 9911a4951..bbad988d2 100644
--- a/.env.example
+++ b/.env.example
@@ -53,4 +53,3 @@ MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
 MIX_APP_URL="${APP_URL}"
 MIX_API_BASE="${API_BASE}"
 MIX_API_SEARCH="${API_SEARCH}"
-

From 9fba7017fc99fbd67eec395efbf5fc222952dfc4 Mon Sep 17 00:00:00 2001
From: Jeroen Smeets <jeroen@jeroensmeets.net>
Date: Mon, 13 Aug 2018 16:17:38 +0200
Subject: [PATCH 4/4] make clear which version of MySQL is supported

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 561d0e15b..d2679abce 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ testing and development.
 
 ## Requirements
  - PHP >= 7.1.3 (7.2+ recommended for stable version)
- - MySQL, Postgres (MySQL >= 5.7, MariaDB and sqlite are not supported yet)
+ - MySQL >= 5.7, Postgres (MariaDB and sqlite are not supported yet)
  - Redis
  - Composer
  - GD or ImageMagick