From 841211a63a9f65a8694b219aec9e65ed4cc52cc0 Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Wed, 28 Sep 2016 00:25:47 +0200
Subject: [PATCH] README

---
 README.md        | 44 ++++++++++++++++++++++++++++++++++++++++++--
 propel-dist.yaml |  1 -
 2 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index deb8efc..af0722b 100644
--- a/README.md
+++ b/README.md
@@ -40,9 +40,49 @@ Installation
 	$ git clone https://gitnet.fr/deblan/gist
 	$ cd gist
 	$ make
+
+### Database
+
 	$ mv propel-dist.yaml propel.yaml
-	$ # EDIT propel.yaml (dsn)
-	$ make propel
+	
+Edit `propel.yaml`. **Use spaces instead of tabulations**.
+
+**MySQL**
+
+    propel:
+        database:
+            connections:
+                default:
+                    adapter: mysql
+                    # http://www.php.net/manual/en/ref.pdo-mysql.connection.php
+                    dsn: "mysql:host=DATABASE_SERVER;dbname=DATABASE_NAME"
+                    user: DATEBASE_USER
+                    password: DATEBASE_PASSWORD
+                    settings:
+                        charset: utf8
+                        queries:
+                            utf8: "SET NAMES utf8 COLLATE utf8_unicode_ci, COLLATION_CONNECTION = utf8_unicode_ci, COLLATION_DATABASE = utf8_unicode_ci, COLLATION_SERVER = utf8_unicode_ci"
+    
+    [...]
+
+Then `$ make propel`.
+
+
+**SQLITE**
+
+    propel:
+        database:
+            connections:
+                default:
+                    adapter: sqlite
+                    # http://www.php.net/manual/en/ref.pdo-sqlite.connection.php
+                    dsn: "sqlite:/PATH/TO/gist.sqlite"
+                    user: ~
+                    password: ~
+    
+    [...]
+	
+Then `$ make propel`.
 
 Edit `app/bootstrap.php.d/70-security.php` and modify the value of `$app['token']` with a strong secret phrase.
 	
diff --git a/propel-dist.yaml b/propel-dist.yaml
index 6af6edd..dd6f836 100644
--- a/propel-dist.yaml
+++ b/propel-dist.yaml
@@ -7,7 +7,6 @@ propel:
                 dsn: "mysql:host=localhost;dbname=gist"
                 user: root
                 password: root
-                attributes:
                 settings:
                     charset: utf8
                     queries: