diff --git a/config/auth.php b/config/auth.php old mode 100644 new mode 100755 index 685437114c..46cc20e0eb --- a/config/auth.php +++ b/config/auth.php @@ -4,65 +4,104 @@ return [ /* |-------------------------------------------------------------------------- - | Default Authentication Driver + | Authentication Defaults |-------------------------------------------------------------------------- | - | This option controls the authentication driver that will be utilized. - | This driver manages the retrieval and authentication of the users - | attempting to get access to protected areas of your application. + | This option controls the default authentication "guard" and password + | reset options for your application. You may change these defaults + | as required, but they're a perfect start for most applications. + | + */ + + 'defaults' => [ + 'guard' => 'web', + 'passwords' => 'users', + ], + + /* + |-------------------------------------------------------------------------- + | Authentication Guards + |-------------------------------------------------------------------------- + | + | Next, you may define every authentication guard for your application. + | Of course, a great default configuration has been defined for you + | here which uses session storage and the Eloquent user provider. + | + | All authentication drivers have a user provider. This defines how the + | users are actually retrieved out of your database or other storage + | mechanisms used by this application to persist your user's data. + | + | Supported: "session", "token" + | + */ + + 'guards' => [ + 'web' => [ + 'driver' => 'session', + 'provider' => 'users', + ], + + 'api' => [ + 'driver' => 'token', + 'provider' => 'users', + ], + ], + + /* + |-------------------------------------------------------------------------- + | User Providers + |-------------------------------------------------------------------------- + | + | All authentication drivers have a user provider. This defines how the + | users are actually retrieved out of your database or other storage + | mechanisms used by this application to persist your user's data. + | + | If you have multiple user tables or models you may configure multiple + | sources which represent each model / table. These sources may then + | be assigned to any extra authentication guards you have defined. | | Supported: "database", "eloquent" | */ - 'driver' => 'eloquent', + 'providers' => [ + 'users' => [ + 'driver' => 'eloquent', + 'model' => FireflyIII\User::class, + ], + + // 'users' => [ + // 'driver' => 'database', + // 'table' => 'users', + // ], + ], /* |-------------------------------------------------------------------------- - | Authentication Model - |-------------------------------------------------------------------------- - | - | When using the "Eloquent" authentication driver, we need to know which - | Eloquent model should be used to retrieve your users. Of course, it - | is often just the "User" model but you may use whatever you like. - | - */ - - 'model' => 'FireflyIII\User', - - /* - |-------------------------------------------------------------------------- - | Authentication Table - |-------------------------------------------------------------------------- - | - | When using the "Database" authentication driver, we need to know which - | table should be used to retrieve your users. We have chosen a basic - | default value but you may easily change it to any table you like. - | - */ - - 'table' => 'users', - - /* - |-------------------------------------------------------------------------- - | Password Reset Settings + | Resetting Passwords |-------------------------------------------------------------------------- | | Here you may set the options for resetting passwords including the view - | that is your password reset e-mail. You can also set the name of the + | that is your password reset e-mail. You may also set the name of the | table that maintains all of the reset tokens for your application. | + | You may specify multiple password reset configurations if you have more + | than one user table or model in the application and you want to have + | separate password reset settings based on the specific user types. + | | The expire time is the number of minutes that the reset token should be | considered valid. This security feature keeps tokens short-lived so | they have less time to be guessed. You may change this as needed. | */ - 'password' => [ - 'email' => 'emails.password', - 'table' => 'password_resets', - 'expire' => 60, + 'passwords' => [ + 'users' => [ + 'provider' => 'users', + 'email' => 'auth.emails.password', + 'table' => 'password_resets', + 'expire' => 60, + ], ], - 'allow_register' => true ]; diff --git a/config/breadcrumbs.php b/config/breadcrumbs.php deleted file mode 100644 index aa133d355c..0000000000 --- a/config/breadcrumbs.php +++ /dev/null @@ -1,7 +0,0 @@ - 'breadcrumbs::bootstrap3', - -]; diff --git a/config/broadcasting.php b/config/broadcasting.php new file mode 100755 index 0000000000..abaaac32a7 --- /dev/null +++ b/config/broadcasting.php @@ -0,0 +1,52 @@ + env('BROADCAST_DRIVER', 'pusher'), + + /* + |-------------------------------------------------------------------------- + | Broadcast Connections + |-------------------------------------------------------------------------- + | + | Here you may define all of the broadcast connections that will be used + | to broadcast events to other systems or over websockets. Samples of + | each available type of connection are provided inside this array. + | + */ + + 'connections' => [ + + 'pusher' => [ + 'driver' => 'pusher', + 'key' => env('PUSHER_KEY'), + 'secret' => env('PUSHER_SECRET'), + 'app_id' => env('PUSHER_APP_ID'), + 'options' => [ + // + ], + ], + + 'redis' => [ + 'driver' => 'redis', + 'connection' => 'default', + ], + + 'log' => [ + 'driver' => 'log', + ], + + ], + +]; diff --git a/config/cache.php b/config/cache.php old mode 100644 new mode 100755 index 0a2d218517..379135b0eb --- a/config/cache.php +++ b/config/cache.php @@ -26,38 +26,38 @@ return [ | */ - 'stores' => [ + 'stores' => [ - 'apc' => [ - 'driver' => 'apc' + 'apc' => [ + 'driver' => 'apc', ], - 'array' => [ - 'driver' => 'array' + 'array' => [ + 'driver' => 'array', ], - 'database' => [ - 'driver' => 'database', - 'table' => 'cache', + 'database' => [ + 'driver' => 'database', + 'table' => 'cache', 'connection' => null, ], - 'file' => [ + 'file' => [ 'driver' => 'file', - 'path' => storage_path() . '/framework/cache', + 'path' => storage_path('framework/cache'), ], 'memcached' => [ 'driver' => 'memcached', 'servers' => [ [ - 'host' => '127.0.0.1', 'port' => 11211, 'weight' => 100 + 'host' => '127.0.0.1', 'port' => 11211, 'weight' => 100, ], ], ], - 'redis' => [ - 'driver' => 'redis', + 'redis' => [ + 'driver' => 'redis', 'connection' => 'default', ], @@ -74,6 +74,6 @@ return [ | */ - 'prefix' => 'laravel', + 'prefix' => 'laravel', ]; diff --git a/config/compile.php b/config/compile.php old mode 100644 new mode 100755 index 317efeb092..04807eac45 --- a/config/compile.php +++ b/config/compile.php @@ -13,14 +13,8 @@ return [ | */ - 'files' => [ - - realpath(__DIR__ . '/../app/Providers/AppServiceProvider.php'), - realpath(__DIR__ . '/../app/Providers/BusServiceProvider.php'), - realpath(__DIR__ . '/../app/Providers/ConfigServiceProvider.php'), - realpath(__DIR__ . '/../app/Providers/EventServiceProvider.php'), - realpath(__DIR__ . '/../app/Providers/RouteServiceProvider.php'), - + 'files' => [ + // ], /* diff --git a/config/database.php b/config/database.php old mode 100644 new mode 100755 index f1a98b129b..66e88a9090 --- a/config/database.php +++ b/config/database.php @@ -13,7 +13,7 @@ return [ | */ - 'fetch' => PDO::FETCH_CLASS, + 'fetch' => PDO::FETCH_CLASS, /* |-------------------------------------------------------------------------- @@ -26,8 +26,7 @@ return [ | */ - 'default' => env('DB_CONNECTION', 'mysql'), - + 'default' => env('DB_CONNECTION', 'mysql'), /* |-------------------------------------------------------------------------- @@ -49,11 +48,11 @@ return [ 'sqlite' => [ 'driver' => 'sqlite', - 'database' => storage_path('database/testing.db'), + 'database' => database_path('database.sqlite'), 'prefix' => '', ], - 'mysql' => [ + 'mysql' => [ 'driver' => 'mysql', 'host' => env('DB_HOST', 'localhost'), 'database' => env('DB_DATABASE', 'forge'), @@ -65,7 +64,7 @@ return [ 'strict' => false, ], - 'pgsql' => [ + 'pgsql' => [ 'driver' => 'pgsql', 'host' => env('DB_HOST', 'localhost'), 'database' => env('DB_DATABASE', 'forge'), @@ -82,6 +81,7 @@ return [ 'database' => env('DB_DATABASE', 'forge'), 'username' => env('DB_USERNAME', 'forge'), 'password' => env('DB_PASSWORD', ''), + 'charset' => 'utf8', 'prefix' => '', ], @@ -98,7 +98,7 @@ return [ | */ - 'migrations' => 'migrations', + 'migrations' => 'migrations', /* |-------------------------------------------------------------------------- @@ -111,13 +111,14 @@ return [ | */ - 'redis' => [ + 'redis' => [ 'cluster' => false, 'default' => [ - 'host' => '127.0.0.1', - 'port' => 6379, + 'host' => env('REDIS_HOST', 'localhost'), + 'password' => env('REDIS_PASSWORD', null), + 'port' => env('REDIS_PORT', 6379), 'database' => 0, ], diff --git a/config/filesystems.php b/config/filesystems.php old mode 100644 new mode 100755 index 9765bd1016..3fffcf0a2f --- a/config/filesystems.php +++ b/config/filesystems.php @@ -11,7 +11,7 @@ return [ | by the framework. A "local" driver, as well as a variety of cloud | based drivers are available for your choosing. Just store away! | - | Supported: "local", "s3", "rackspace" + | Supported: "local", "ftp", "s3", "rackspace" | */ @@ -28,7 +28,7 @@ return [ | */ - 'cloud' => 's3', + 'cloud' => 's3', /* |-------------------------------------------------------------------------- @@ -41,14 +41,28 @@ return [ | */ - 'disks' => [ + 'disks' => [ - 'local' => [ + 'local' => [ 'driver' => 'local', - 'root' => storage_path() . '/app', + 'root' => storage_path('app'), ], - 's3' => [ + 'ftp' => [ + 'driver' => 'ftp', + 'host' => 'ftp.example.com', + 'username' => 'your-username', + 'password' => 'your-password', + + // Optional FTP Settings... + // 'port' => 21, + // 'root' => '', + // 'passive' => true, + // 'ssl' => true, + // 'timeout' => 30, + ], + + 's3' => [ 'driver' => 's3', 'key' => 'your-key', 'secret' => 'your-secret', @@ -63,6 +77,7 @@ return [ 'container' => 'your-container', 'endpoint' => 'https://identity.api.rackspacecloud.com/v2.0/', 'region' => 'IAD', + 'url_type' => 'publicURL', ], ], diff --git a/config/mail.php b/config/mail.php old mode 100644 new mode 100755 index a89c2eaad6..fa74f98ae8 --- a/config/mail.php +++ b/config/mail.php @@ -11,12 +11,11 @@ return [ | sending of e-mail. You may specify which one you're using throughout | your application here. By default, Laravel is setup for SMTP mail. | - | Supported: "smtp", "mail", "sendmail", "mailgun", "mandrill", "log" + | Supported: "smtp", "mail", "sendmail", "mailgun", "mandrill", "ses", "log" | */ - 'blocked_domains' => explode(',', env('BLOCKED_DOMAINS')), - 'driver' => env('EMAIL_DRIVER', 'smtp'), + 'driver' => env('MAIL_DRIVER', 'smtp'), /* |-------------------------------------------------------------------------- @@ -29,7 +28,7 @@ return [ | */ - 'host' => env('EMAIL_SMTP', 'smtp.mailgun.org'), + 'host' => env('MAIL_HOST', 'smtp.mailgun.org'), /* |-------------------------------------------------------------------------- @@ -42,7 +41,7 @@ return [ | */ - 'port' => 587, + 'port' => env('MAIL_PORT', 587), /* |-------------------------------------------------------------------------- @@ -68,7 +67,7 @@ return [ | */ - 'encryption' => 'tls', + 'encryption' => env('MAIL_ENCRYPTION', 'tls'), /* |-------------------------------------------------------------------------- @@ -81,7 +80,7 @@ return [ | */ - 'username' => env('EMAIL_USERNAME', null), + 'username' => env('MAIL_USERNAME'), /* |-------------------------------------------------------------------------- @@ -94,7 +93,7 @@ return [ | */ - 'password' => env('EMAIL_PASSWORD', null), + 'password' => env('MAIL_PASSWORD'), /* |-------------------------------------------------------------------------- @@ -109,17 +108,4 @@ return [ 'sendmail' => '/usr/sbin/sendmail -bs', - /* - |-------------------------------------------------------------------------- - | Mail "Pretend" - |-------------------------------------------------------------------------- - | - | When this option is enabled, e-mail will not actually be sent over the - | web and will instead be written to your application's logs files so - | you may inspect the message. This is great for local development. - | - */ - - 'pretend' => env('EMAIL_PRETEND', false), - ]; diff --git a/config/queue.php b/config/queue.php old mode 100644 new mode 100755 index 5be8d63bf3..6c2b7d2e17 --- a/config/queue.php +++ b/config/queue.php @@ -12,11 +12,11 @@ return [ | syntax for each one. Here you may set the default queue driver. | | Supported: "null", "sync", "database", "beanstalkd", - | "sqs", "iron", "redis" + | "sqs", "redis" | */ - 'default' => env('QUEUE_DRIVER', 'sync'), + 'default' => env('QUEUE_DRIVER', 'sync'), /* |-------------------------------------------------------------------------- @@ -31,11 +31,11 @@ return [ 'connections' => [ - 'sync' => [ + 'sync' => [ 'driver' => 'sync', ], - 'database' => [ + 'database' => [ 'driver' => 'database', 'table' => 'jobs', 'queue' => 'default', @@ -49,27 +49,20 @@ return [ 'ttr' => 60, ], - 'sqs' => [ + 'sqs' => [ 'driver' => 'sqs', 'key' => 'your-public-key', 'secret' => 'your-secret-key', - 'queue' => 'your-queue-url', + 'prefix' => 'https://sqs.us-east-1.amazonaws.com/your-account-id', + 'queue' => 'your-queue-name', 'region' => 'us-east-1', ], - 'iron' => [ - 'driver' => 'iron', - 'host' => 'mq-aws-us-east-1.iron.io', - 'token' => 'your-token', - 'project' => 'your-project-id', - 'queue' => 'your-queue-name', - 'encrypt' => true, - ], - - 'redis' => [ - 'driver' => 'redis', - 'queue' => 'default', - 'expire' => 60, + 'redis' => [ + 'driver' => 'redis', + 'connection' => 'default', + 'queue' => 'default', + 'expire' => 60, ], ], @@ -85,8 +78,9 @@ return [ | */ - 'failed' => [ - 'database' => 'mysql', 'table' => 'failed_jobs', + 'failed' => [ + 'database' => env('DB_CONNECTION', 'mysql'), + 'table' => 'failed_jobs', ], ]; diff --git a/config/services.php b/config/services.php old mode 100644 new mode 100755 index 3ee3eed75e..9fbb81549e --- a/config/services.php +++ b/config/services.php @@ -14,24 +14,25 @@ return [ | */ - 'mailgun' => [ - 'domain' => '', - 'secret' => '', + 'mailgun' => [ + 'domain' => env('MAILGUN_DOMAIN'), + 'secret' => env('MAILGUN_SECRET'), ], 'mandrill' => [ - 'secret' => '', + 'secret' => env('MANDRILL_SECRET'), ], - 'ses' => [ - 'key' => '', - 'secret' => '', + 'ses' => [ + 'key' => env('SES_KEY'), + 'secret' => env('SES_SECRET'), 'region' => 'us-east-1', ], - 'stripe' => [ - 'model' => 'User', - 'secret' => '', + 'stripe' => [ + 'model' => FireflyIII\User::class, + 'key' => env('STRIPE_KEY'), + 'secret' => env('STRIPE_SECRET'), ], ]; diff --git a/config/session.php b/config/session.php old mode 100644 new mode 100755 index 17aed45faf..69aac40867 --- a/config/session.php +++ b/config/session.php @@ -2,6 +2,22 @@ return [ + /* + |-------------------------------------------------------------------------- + | Default Session Driver + |-------------------------------------------------------------------------- + | + | This option controls the default session "driver" that will be used on + | requests. By default, we will use the lightweight native driver but + | you may specify any of the other wonderful drivers provided here. + | + | Supported: "file", "cookie", "database", "apc", + | "memcached", "redis", "array" + | + */ + + 'driver' => env('SESSION_DRIVER', 'file'), + /* |-------------------------------------------------------------------------- | Session Lifetime @@ -13,10 +29,22 @@ return [ | */ - 'lifetime' => 120, + 'lifetime' => 120, 'expire_on_close' => false, + /* + |-------------------------------------------------------------------------- + | Session Encryption + |-------------------------------------------------------------------------- + | + | This option allows you to easily specify that all of your session data + | should be encrypted before it is stored. All encryption will be run + | automatically by Laravel and you can use the Session like normal. + | + */ + + 'encrypt' => true, /* |-------------------------------------------------------------------------- @@ -29,8 +57,20 @@ return [ | */ - 'files' => storage_path() . '/framework/sessions', + 'files' => storage_path('framework/sessions'), + /* + |-------------------------------------------------------------------------- + | Session Database Connection + |-------------------------------------------------------------------------- + | + | When using the "database" or "redis" session drivers, you may specify a + | connection that should be used to manage these sessions. This should + | correspond to a connection in your database configuration options. + | + */ + + 'connection' => null, /* |-------------------------------------------------------------------------- @@ -43,7 +83,7 @@ return [ | */ - 'table' => 'sessions', + 'table' => 'sessions', /* |-------------------------------------------------------------------------- @@ -56,15 +96,20 @@ return [ | */ - 'lottery' => [2, 100], + 'lottery' => [2, 100], - 'driver' => env('SESSION_DRIVER', 'database'), - 'cookie' => 'firefly_session', + /* + |-------------------------------------------------------------------------- + | Session Cookie Name + |-------------------------------------------------------------------------- + | + | Here you may change the name of the cookie used to identify a session + | instance by ID. The name specified here will get used every time a + | new session cookie is created by the framework for every driver. + | + */ - 'connection' => env('DB_CONNECTION', 'mysql'), - - - 'encrypt' => true, + 'cookie' => 'firefly_session', /* |-------------------------------------------------------------------------- @@ -77,7 +122,7 @@ return [ | */ - 'path' => '/', + 'path' => '/', /* |-------------------------------------------------------------------------- @@ -90,7 +135,7 @@ return [ | */ - 'domain' => null, + 'domain' => null, /* |-------------------------------------------------------------------------- @@ -103,6 +148,6 @@ return [ | */ - 'secure' => false, + 'secure' => true, ]; diff --git a/config/view.php b/config/view.php old mode 100644 new mode 100755 index 3ea032617f..e193ab61d9 --- a/config/view.php +++ b/config/view.php @@ -13,8 +13,8 @@ return [ | */ - 'paths' => [ - realpath(base_path('resources/twig')) + 'paths' => [ + realpath(base_path('resources/views')), ], /* @@ -28,6 +28,6 @@ return [ | */ - 'compiled' => realpath(storage_path() . '/framework/views'), + 'compiled' => realpath(storage_path('framework/views')), ];