ElyBy-Mirror/accounts
1
0
Fork 0
mirror of https://github.com/elyby/accounts.git synced 2025-05-31 14:11:46 +05:30
Code Issues Packages Projects Releases Wiki Activity

Огромный рефакторинг в пользу отказа от механизма environment и использования .env файла

Browse Source 
Найдено и удалено немного мусора
This commit is contained in:
ErickSkrauch
2016-09-16 01:28:28 +03:00
parent e76a8324fb
commit 54485b2271
56 changed files with 209 additions and 763 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/config/.gitignore vendored
View File

@@ -1,2 +1 @@
main-local.php
params-local.php

19
api/config/main-dev.php Normal file
View File

@@ -0,0 +1,19 @@
<?php
return [
'bootstrap' => ['debug', 'gii'],
'components' => [
'reCaptcha' => [
'public' => '6LfwqCYTAAAAAJlaJpqCdzESCjAXUC81Ca6jBHR7',
'secret' => '6LfwqCYTAAAAAFPjHmgwmnjSMFeAOJh7Lk5xxDMC',
],
],
'modules' => [
'debug' => [
'class' => yii\debug\Module::class,
'allowedIPs' => ['*'],
],
'gii' => [
'class' => yii\gii\Module::class,
],
],
];

30
api/config/main.php
View File

@@ -1,9 +1,7 @@
<?php
$params = array_merge(
require(__DIR__ . '/../../common/config/params.php'),
require(__DIR__ . '/../../common/config/params-local.php'),
require(__DIR__ . '/params.php'),
require(__DIR__ . '/params-local.php')
require(__DIR__ . '/params.php')
);
return [
@@ -14,17 +12,17 @@ return [
'params' => $params,
'components' => [
'user' => [
'class' => \api\components\User\Component::class,
'secret' => $params['userSecret'],
'class' => api\components\User\Component::class,
'secret' => getenv('JWT_USER_SECRET'),
],
'apiUser' => [
'class' => \api\components\ApiUser\Component::class,
'class' => api\components\ApiUser\Component::class,
],
'log' => [
'traceLevel' => YII_DEBUG ? 3 : 0,
'targets' => [
[
'class' => \yii\log\FileTarget::class,
'class' => yii\log\FileTarget::class,
'levels' => ['error', 'warning'],
'except' => [
'legacy-authserver',
@@ -34,13 +32,13 @@ return [
],
],
[
'class' => \yii\log\FileTarget::class,
'class' => yii\log\FileTarget::class,
'levels' => ['error', 'info'],
'categories' => ['legacy-authserver'],
'logFile' => '@runtime/logs/authserver.log',
],
[
'class' => \yii\log\FileTarget::class,
'class' => yii\log\FileTarget::class,
'levels' => ['error', 'info'],
'categories' => ['session'],
'logFile' => '@runtime/logs/session.log',
@@ -56,26 +54,26 @@ return [
'rules' => require __DIR__ . '/routes.php',
],
'reCaptcha' => [
'class' => \api\components\ReCaptcha\Component::class,
'class' => api\components\ReCaptcha\Component::class,
],
'response' => [
'format' => \yii\web\Response::FORMAT_JSON,
'format' => yii\web\Response::FORMAT_JSON,
],
'oauth' => [
'class' => \common\components\oauth\Component::class,
'class' => common\components\oauth\Component::class,
'grantTypes' => ['authorization_code'],
],
'errorHandler' => [
'class' => \api\components\ErrorHandler::class,
'class' => api\components\ErrorHandler::class,
],
],
'modules' => [
'authserver' => [
'class' => \api\modules\authserver\Module::class,
'baseDomain' => $params['authserverDomain'],
'class' => api\modules\authserver\Module::class,
'baseDomain' => getenv('AUTHSERVER_HOST'),
],
'session' => [
'class' => \api\modules\session\Module::class,
'class' => api\modules\session\Module::class,
],
],
];

1
api/config/params.php
View File

@@ -1,4 +1,3 @@
<?php
return [
'adminEmail' => 'admin@example.com',
];