aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas@loeuillet.org>2015-02-04 21:26:15 +0100
committerNicolas LÅ“uillet <nicolas@loeuillet.org>2015-02-04 21:26:15 +0100
commit61b9fdd5e4752ab3b13b161fdf82e1300c3d7deb (patch)
treeb652fec4286130c12297d0fcde775d2137d1a8e4
parenteacaf7f864164e1b8d2bb519e7a3e99695cf9982 (diff)
downloadwallabag-61b9fdd5e4752ab3b13b161fdf82e1300c3d7deb.tar.gz
wallabag-61b9fdd5e4752ab3b13b161fdf82e1300c3d7deb.tar.zst
wallabag-61b9fdd5e4752ab3b13b161fdf82e1300c3d7deb.zip
restore full database settings
-rw-r--r--app/config/config.yml10
-rw-r--r--app/config/parameters.yml.dist4
2 files changed, 9 insertions, 5 deletions
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:
65doctrine: 65doctrine:
66 dbal: 66 dbal:
67 driver: "%database_driver%" 67 driver: "%database_driver%"
68 host: "%database_host%"
69 port: "%database_port%"
70 dbname: "%database_name%"
71 user: "%database_user%"
72 password: "%database_password%"
68 charset: UTF8 73 charset: UTF8
69 # if using pdo_sqlite as your database driver:
70 # 1. add the path in parameters.yml
71 # e.g. database_path: "%kernel.root_dir%/data/data.db3"
72 # 2. Uncomment database_path in parameters.yml.dist
73 # 3. Uncomment next line:
74 path: "%database_path%" 74 path: "%database_path%"
75 75
76 orm: 76 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 @@
1# This file is a "template" of what your parameters.yml file should look like 1# This file is a "template" of what your parameters.yml file should look like
2parameters: 2parameters:
3 database_driver: pdo_sqlite 3 database_driver: pdo_sqlite
4 database_port: ~
5 database_name: symfony
6 database_user: root
7 database_password: ~
4 database_path: "%kernel.root_dir%/../data/db/poche.sqlite" 8 database_path: "%kernel.root_dir%/../data/db/poche.sqlite"
5 9
6 mailer_transport: smtp 10 mailer_transport: smtp