From bfaf29393f42c6f5f360c321206b6c21c821c700 Mon Sep 17 00:00:00 2001 From: Franz Liedke Date: Wed, 1 Jul 2015 22:48:15 +0200 Subject: [PATCH] Hardcode even more config in bootstrap.php --- system/bootstrap.php | 20 +++++++++ system/config/cache.php | 79 ----------------------------------- system/config/compile.php | 35 ---------------- system/config/filesystems.php | 53 ----------------------- system/config/services.php | 37 ---------------- 5 files changed, 20 insertions(+), 204 deletions(-) delete mode 100644 system/config/cache.php delete mode 100644 system/config/compile.php delete mode 100644 system/config/filesystems.php delete mode 100644 system/config/services.php diff --git a/system/bootstrap.php b/system/bootstrap.php index 364c0a8..bb94937 100644 --- a/system/bootstrap.php +++ b/system/bootstrap.php @@ -59,6 +59,26 @@ $app->instance('config', new \Illuminate\Config\Repository([ 'domain' => null, 'secure' => false, ], + 'cache' => [ + 'default' => 'file', + 'stores' => [ + 'file' => [ + 'driver' => 'file', + 'path' => storage_path().'/framework/cache', + ], + ], + 'prefix' => 'flarum', + ], + 'filesystems' => [ + 'default' => 'local', + 'cloud' => 's3', + 'disks' => [ + 'flarum-avatars' => [ + 'driver' => 'local', + 'root' => public_path('assets/avatars') + ], + ], + ], ])); // ConfigureLogging diff --git a/system/config/cache.php b/system/config/cache.php deleted file mode 100644 index 9ddd5f3..0000000 --- a/system/config/cache.php +++ /dev/null @@ -1,79 +0,0 @@ - env('CACHE_DRIVER', 'file'), - - /* - |-------------------------------------------------------------------------- - | Cache Stores - |-------------------------------------------------------------------------- - | - | Here you may define all of the cache "stores" for your application as - | well as their drivers. You may even define multiple stores for the - | same cache driver to group types of items stored in your caches. - | - */ - - 'stores' => [ - - 'apc' => [ - 'driver' => 'apc' - ], - - 'array' => [ - 'driver' => 'array' - ], - - 'database' => [ - 'driver' => 'database', - 'table' => 'cache', - 'connection' => null, - ], - - 'file' => [ - 'driver' => 'file', - 'path' => storage_path().'/framework/cache', - ], - - 'memcached' => [ - 'driver' => 'memcached', - 'servers' => [ - [ - 'host' => '127.0.0.1', 'port' => 11211, 'weight' => 100 - ], - ], - ], - - 'redis' => [ - 'driver' => 'redis', - 'connection' => 'default', - ], - - ], - - /* - |-------------------------------------------------------------------------- - | Cache Key Prefix - |-------------------------------------------------------------------------- - | - | When utilizing a RAM based store such as APC or Memcached, there might - | be other applications utilizing the same cache. So, we'll specify a - | value to get prefixed to all our keys so we can avoid collisions. - | - */ - - 'prefix' => 'laravel', - -]; diff --git a/system/config/compile.php b/system/config/compile.php deleted file mode 100644 index 1753ea9..0000000 --- a/system/config/compile.php +++ /dev/null @@ -1,35 +0,0 @@ - [ - - ], - - /* - |-------------------------------------------------------------------------- - | Compiled File Providers - |-------------------------------------------------------------------------- - | - | Here you may list service providers which define a "compiles" function - | that returns additional files that should be compiled, providing an - | easy way to get common files from any packages you are utilizing. - | - */ - - 'providers' => [ - // - ], - -]; diff --git a/system/config/filesystems.php b/system/config/filesystems.php deleted file mode 100644 index 719a907..0000000 --- a/system/config/filesystems.php +++ /dev/null @@ -1,53 +0,0 @@ - 'local', - - /* - |-------------------------------------------------------------------------- - | Default Cloud Filesystem Disk - |-------------------------------------------------------------------------- - | - | Many applications store files both locally and in the cloud. For this - | reason, you may specify a default "cloud" driver here. This driver - | will be bound as the Cloud disk implementation in the container. - | - */ - - 'cloud' => 's3', - - /* - |-------------------------------------------------------------------------- - | Filesystem Disks - |-------------------------------------------------------------------------- - | - | Here you may configure as many filesystem "disks" as you wish, and you - | may even configure multiple disks of the same driver. Defaults have - | been setup for each driver as an example of the required options. - | - */ - - 'disks' => [ - - 'flarum-avatars' => [ - 'driver' => 'local', - 'root' => public_path('assets/avatars') - ], - - ], - -]; diff --git a/system/config/services.php b/system/config/services.php deleted file mode 100644 index dddc986..0000000 --- a/system/config/services.php +++ /dev/null @@ -1,37 +0,0 @@ - [ - 'domain' => '', - 'secret' => '', - ], - - 'mandrill' => [ - 'secret' => '', - ], - - 'ses' => [ - 'key' => '', - 'secret' => '', - 'region' => 'us-east-1', - ], - - 'stripe' => [ - 'model' => 'User', - 'secret' => '', - ], - -];