From b5e3f93e4adb281a65da0bce72fceafd6ab6f509 Mon Sep 17 00:00:00 2001 From: Egorka Date: Mon, 3 Sep 2018 21:45:26 +0300 Subject: [PATCH] Environment fix --- environments/dev/common/config/main-local.php | 5 +++-- environments/dev/common/config/params-local.php | 18 +++++++++++++----- environments/prod/common/config/main-local.php | 5 +++-- environments/prod/common/config/params-local.php | 18 +++++++++++++----- setup.php | 2 +- 5 files changed, 33 insertions(+), 15 deletions(-) diff --git a/environments/dev/common/config/main-local.php b/environments/dev/common/config/main-local.php index ffb40b3..ae52fb9 100644 --- a/environments/dev/common/config/main-local.php +++ b/environments/dev/common/config/main-local.php @@ -3,8 +3,9 @@ return [ 'components' => [ 'db' => [ 'class' => 'yii\db\Connection', - 'dsn' => 'mysql:host=localhost;dbname=database', - 'username' => 'root', + //'dsn' => 'mysql:host=localhost;dbname=database', + 'dsn' => '', + 'username' => '', 'password' => '', 'charset' => 'utf8', ], diff --git a/environments/dev/common/config/params-local.php b/environments/dev/common/config/params-local.php index a2bcdf9..3f7ca93 100644 --- a/environments/dev/common/config/params-local.php +++ b/environments/dev/common/config/params-local.php @@ -1,13 +1,21 @@ '', + 'cookieDomain' => '', + 'staticPath' => dirname(__DIR__, 2) . '/static', + 'frontendHostInfo' => '', + 'backendHostInfo' => '', + 'staticHostInfo' => '', + 'supportEmail' => '', + 'adminEmail' => '', + 'mailChimpKey' => '', + 'mailChimpListId' => '', +]; + +/* 'cookieDomain' => '.morework.local', 'staticPath' => dirname(__DIR__, 2) . '/static', 'frontendHostInfo' => 'http://morework.local', 'backendHostInfo' => 'http://admin.morework.local', 'staticHostInfo' => 'http://static.morework.local', - 'supportEmail' => 'support@morework.local', - 'adminEmail' => 'admin@morework.local', - 'mailChimpKey' => '', - 'mailChimpListId' => '', -]; + */ diff --git a/environments/prod/common/config/main-local.php b/environments/prod/common/config/main-local.php index 03a5ed7..20876b2 100644 --- a/environments/prod/common/config/main-local.php +++ b/environments/prod/common/config/main-local.php @@ -3,8 +3,9 @@ return [ 'components' => [ 'db' => [ 'class' => 'yii\db\Connection', - 'dsn' => 'mysql:host=localhost;dbname=morework', - 'username' => 'root', + //'dsn' => 'mysql:host=localhost;dbname=morework', + 'dsn' => '', + 'username' => '', 'password' => '', 'charset' => 'utf8', ], diff --git a/environments/prod/common/config/params-local.php b/environments/prod/common/config/params-local.php index a2bcdf9..3f7ca93 100644 --- a/environments/prod/common/config/params-local.php +++ b/environments/prod/common/config/params-local.php @@ -1,13 +1,21 @@ '', + 'cookieDomain' => '', + 'staticPath' => dirname(__DIR__, 2) . '/static', + 'frontendHostInfo' => '', + 'backendHostInfo' => '', + 'staticHostInfo' => '', + 'supportEmail' => '', + 'adminEmail' => '', + 'mailChimpKey' => '', + 'mailChimpListId' => '', +]; + +/* 'cookieDomain' => '.morework.local', 'staticPath' => dirname(__DIR__, 2) . '/static', 'frontendHostInfo' => 'http://morework.local', 'backendHostInfo' => 'http://admin.morework.local', 'staticHostInfo' => 'http://static.morework.local', - 'supportEmail' => 'support@morework.local', - 'adminEmail' => 'admin@morework.local', - 'mailChimpKey' => '', - 'mailChimpListId' => '', -]; + */ diff --git a/setup.php b/setup.php index 499e843..23bc398 100644 --- a/setup.php +++ b/setup.php @@ -42,7 +42,7 @@ class Setup 'Database name must be set' => 'Название базы не должно быть пустым', 'User: ' => 'Пользователь: ', 'User must be set' => 'Имя пользователя не должно быть пустым', - 'Password: ' => 'Пароль', + 'Password: ' => 'Пароль: ', 'Set your HTTP protocol (http/https)' => 'Укажите HTTP протокол (http/https)', 'HTTP Protocol [http]: ' => 'HTTP протокол [http]: ', 'Website domain name' => 'Домен сайта',