Commit e938bd52955359b543c4ece192dca0d1787e0f67
Merge branch 'master' of gitlab.artweb.com.ua:Alex/analytics
Showing
2 changed files
with
1 additions
and
23 deletions
Show diff stats
app/config/config.ini
@@ -7,6 +7,6 @@ dbname = analytics | @@ -7,6 +7,6 @@ dbname = analytics | ||
7 | 7 | ||
8 | [application] | 8 | [application] |
9 | controllersDir = app/library/App/Controllers/ | 9 | controllersDir = app/library/App/Controllers/ |
10 | -modelsDir = app/library/App/Controllers/ | 10 | +modelsDir = app/library/App/Model/ |
11 | viewsDir = app/views/ | 11 | viewsDir = app/views/ |
12 | baseUri = / | 12 | baseUri = / |
13 | \ No newline at end of file | 13 | \ No newline at end of file |
app/config/config.php deleted
1 | -<?php | ||
2 | - return [ | ||
3 | - 'database' => [ | ||
4 | - | ||
5 | - // Change to your own configuration | ||
6 | - 'adapter' => 'Postgresql', | ||
7 | - 'host' => 'localhost', | ||
8 | - 'username' => 'postgres', | ||
9 | - 'password' => '5cZw3rPC', | ||
10 | - 'dbname' => 'analytics', | ||
11 | - ], | ||
12 | - | ||
13 | - 'phalcon' => [ | ||
14 | - | ||
15 | - // Change to your own configuration | ||
16 | - 'controllersDir' => "../app/library/App/Controllers/", | ||
17 | - 'modelsDir' => "../app/library/App/Controllers/", | ||
18 | - 'viewsDir' => "../app/views/", | ||
19 | - 'baseUri' => "/store/" | ||
20 | - ] | ||
21 | - ]; | ||
22 | -?> |