aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas@loeuillet.org>2015-01-28 13:43:23 +0100
committerNicolas LÅ“uillet <nicolas@loeuillet.org>2015-01-28 13:43:23 +0100
commit80709502c73c83e2c0d362fe9e485029cfc2708e (patch)
tree8ca88075d0319c30dbcf040a6c6a4847e2b26396
parent2cdb0b8f4052f783fad53df3904a236c5edc9134 (diff)
downloadwallabag-80709502c73c83e2c0d362fe9e485029cfc2708e.tar.gz
wallabag-80709502c73c83e2c0d362fe9e485029cfc2708e.tar.zst
wallabag-80709502c73c83e2c0d362fe9e485029cfc2708e.zip
fix parameters config
-rw-r--r--app/config/parameters.yml.dist8
-rwxr-xr-xbin/install2
2 files changed, 2 insertions, 8 deletions
diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist
index 36e3fe7f..977ab1a8 100644
--- a/app/config/parameters.yml.dist
+++ b/app/config/parameters.yml.dist
@@ -1,12 +1,6 @@
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_mysql 3 database_driver: pdo_sqlite
4 database_host: 127.0.0.1
5 database_port: ~
6 database_name: symfony
7 database_user: root
8 database_password: ~
9 # You should uncomment this if you want use pdo_sqlite
10 database_path: "%kernel.root_dir%/data/db/poche.sqlite" 4 database_path: "%kernel.root_dir%/data/db/poche.sqlite"
11 5
12 mailer_transport: smtp 6 mailer_transport: smtp
diff --git a/bin/install b/bin/install
index 61ffcb65..ed2c2d91 100755
--- a/bin/install
+++ b/bin/install
@@ -23,7 +23,7 @@ function executeQuery($handle, $sql, $params) {
23} 23}
24 24
25$configFile = 'app/config/config.inc.php'; 25$configFile = 'app/config/config.inc.php';
26$dbFile = 'app/db/poche.sqlite'; 26$dbFile = 'data/db/poche.sqlite';
27$username = 'wallabag'; 27$username = 'wallabag';
28$password = 'wallabag'; 28$password = 'wallabag';
29$salt = $parameters['parameters']['secret']; 29$salt = $parameters['parameters']['secret'];