From: Nicolas Lœuillet <nicolas@loeuillet.org>
Date: Wed, 4 Feb 2015 20:26:15 +0000 (+0100)
Subject: restore full database settings
X-Git-Tag: 2.0.0-alpha.0~101
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=61b9fdd5e4752ab3b13b161fdf82e1300c3d7deb;p=github%2Fwallabag%2Fwallabag.git

restore full database settings
---

diff --git a/app/config/config.yml b/app/config/config.yml
index f2f5f9f3..7dc1bf51 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -65,12 +65,12 @@ assetic:
 doctrine:
     dbal:
         driver:   "%database_driver%"
+        host: "%database_host%"
+        port: "%database_port%"
+        dbname: "%database_name%"
+        user: "%database_user%"
+        password: "%database_password%"
         charset:  UTF8
-        # if using pdo_sqlite as your database driver:
-        #   1. add the path in parameters.yml
-        #     e.g. database_path: "%kernel.root_dir%/data/data.db3"
-        #   2. Uncomment database_path in parameters.yml.dist
-        #   3. Uncomment next line:
         path:     "%database_path%"
 
     orm:
diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist
index 1c72b9a3..9c12150d 100644
--- a/app/config/parameters.yml.dist
+++ b/app/config/parameters.yml.dist
@@ -1,6 +1,10 @@
 # This file is a "template" of what your parameters.yml file should look like
 parameters:
     database_driver:   pdo_sqlite
+    database_port: ~
+    database_name: symfony
+    database_user: root
+    database_password: ~
     database_path: "%kernel.root_dir%/../data/db/poche.sqlite"
 
     mailer_transport:  smtp