[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [websites/reservoir/develop] /: switch from multidomain setup to single point of entry
From: Ingo Malchow <imalchow () kde ! org>
Date: 2014-11-01 13:19:49
Message-ID: E1XkYar-0001tA-RK () scm ! kde ! org
[Download RAW message or body]
Git commit b6acfa740119ae4a505df140aa79ac98651453b2 by Ingo Malchow.
Committed on 01/11/2014 at 13:18.
Pushed by imalchow into branch 'develop'.
switch from multidomain setup to single point of entry
After some discussion with ben this makes more sense.
Each site using reservoir/capacity then only needs to be cloned into a subdir of a reservoir instance.
M +1 -1 app/config/app.php
D +0 -197 app/config/kde1/app.php
D +0 -12 app/config/kde1/reservoir.php
D +0 -34 app/config/kde1/view.php
M +1 -2 app/config/reservoir.php
M +51 -52 bootstrap/paths.php
M +5 -4 bootstrap/start.php
http://commits.kde.org/websites/reservoir/b6acfa740119ae4a505df140aa79ac98651453b2
diff --git a/app/config/app.php b/app/config/app.php
index 9c50cfe..2f8663d 100644
--- a/app/config/app.php
+++ b/app/config/app.php
@@ -137,7 +137,7 @@ return array(
|
*/
- 'manifest' => __DIR__.'/../storage/meta',
+ 'manifest' => storage_path().'/meta',
/*
|--------------------------------------------------------------------------
diff --git a/app/config/kde1/app.php b/app/config/kde1/app.php
deleted file mode 100644
index 760ad22..0000000
--- a/app/config/kde1/app.php
+++ /dev/null
@@ -1,197 +0,0 @@
-<?php
-
-return array(
-
- /*
- |--------------------------------------------------------------------------
- | Application Debug Mode
- |--------------------------------------------------------------------------
- |
- | When your application is in debug mode, detailed error messages with
- | stack traces will be shown on every error that occurs within your
- | application. If disabled, a simple generic error page is shown.
- |
- */
-
- 'debug' => true,
-
- /*
- |--------------------------------------------------------------------------
- | Application URL
- |--------------------------------------------------------------------------
- |
- | This URL is used by the console to properly generate URLs when using
- | the Artisan command line tool. You should set this to the root of
- | your application so that it is used when running Artisan tasks.
- |
- */
-
- 'url' => 'http://kde1.laravel',
-
- /*
- |--------------------------------------------------------------------------
- | Application Timezone
- |--------------------------------------------------------------------------
- |
- | Here you may specify the default timezone for your application, which
- | will be used by the PHP date and date-time functions. We have gone
- | ahead and set this to a sensible default for you out of the box.
- |
- */
-
- 'timezone' => 'UTC',
-
- /*
- |--------------------------------------------------------------------------
- | Application Locale Configuration
- |--------------------------------------------------------------------------
- |
- | The application locale determines the default locale that will be used
- | by the translation service provider. You are free to set this value
- | to any of the locales which will be supported by the application.
- |
- */
-
- 'locale' => 'en',
-
- /*
- |--------------------------------------------------------------------------
- | Application Fallback Locale
- |--------------------------------------------------------------------------
- |
- | The fallback locale determines the locale to use when the current one
- | is not available. You may change the value to correspond to any of
- | the language folders that are provided through your application.
- |
- */
-
- 'fallback_locale' => 'en',
-
- /*
- |--------------------------------------------------------------------------
- | Encryption Key
- |--------------------------------------------------------------------------
- |
- | This key is used by the Illuminate encrypter service and should be set
- | to a random, 32 character string, otherwise these encrypted strings
- | will not be safe. Please do this before deploying an application!
- |
- */
-
- 'key' => 'YourSecretKey!!!',
-
- 'cipher' => MCRYPT_RIJNDAEL_128,
-
- /*
- |--------------------------------------------------------------------------
- | Autoloaded Service Providers
- |--------------------------------------------------------------------------
- |
- | The service providers listed here will be automatically loaded on the
- | request to your application. Feel free to add your own services to
- | this array to grant expanded functionality to your applications.
- |
- */
-
- 'providers' => array(
-
- 'Illuminate\Foundation\Providers\ArtisanServiceProvider',
- 'Illuminate\Auth\AuthServiceProvider',
- 'Illuminate\Cache\CacheServiceProvider',
- 'Illuminate\Session\CommandsServiceProvider',
- 'Illuminate\Foundation\Providers\ConsoleSupportServiceProvider',
- 'Illuminate\Routing\ControllerServiceProvider',
- 'Illuminate\Cookie\CookieServiceProvider',
- 'Illuminate\Database\DatabaseServiceProvider',
- 'Illuminate\Encryption\EncryptionServiceProvider',
- 'Illuminate\Filesystem\FilesystemServiceProvider',
- 'Illuminate\Hashing\HashServiceProvider',
- 'Illuminate\Html\HtmlServiceProvider',
- 'Illuminate\Log\LogServiceProvider',
- 'Illuminate\Mail\MailServiceProvider',
- 'Illuminate\Database\MigrationServiceProvider',
- 'Illuminate\Pagination\PaginationServiceProvider',
- 'Illuminate\Queue\QueueServiceProvider',
- 'Illuminate\Redis\RedisServiceProvider',
- 'Illuminate\Remote\RemoteServiceProvider',
- 'Illuminate\Auth\Reminders\ReminderServiceProvider',
- 'Illuminate\Database\SeedServiceProvider',
- 'Illuminate\Session\SessionServiceProvider',
- 'Illuminate\Translation\TranslationServiceProvider',
- 'Illuminate\Validation\ValidationServiceProvider',
- 'Illuminate\View\ViewServiceProvider',
- 'Illuminate\Workbench\WorkbenchServiceProvider',
- 'Teepluss\Theme\ThemeServiceProvider',
- 'Xinax\LaravelGettext\LaravelGettextServiceProvider',
-
- ),
-
- /*
- |--------------------------------------------------------------------------
- | Service Provider Manifest
- |--------------------------------------------------------------------------
- |
- | The service provider manifest is used by Laravel to lazy load service
- | providers which are not needed for each request, as well to keep a
- | list of all of the services. Here, you may set its storage spot.
- |
- */
-
- 'manifest' => __DIR__.'/../../storage/meta',
-
- /*
- |--------------------------------------------------------------------------
- | Class Aliases
- |--------------------------------------------------------------------------
- |
- | This array of class aliases will be registered when this application
- | is started. However, feel free to register as many as you wish as
- | the aliases are "lazy" loaded so they don't hinder performance.
- |
- */
-
- 'aliases' => array(
-
- 'App' => 'Illuminate\Support\Facades\App',
- 'Artisan' => 'Illuminate\Support\Facades\Artisan',
- 'Auth' => 'Illuminate\Support\Facades\Auth',
- 'Blade' => 'Illuminate\Support\Facades\Blade',
- 'Cache' => 'Illuminate\Support\Facades\Cache',
- 'ClassLoader' => 'Illuminate\Support\ClassLoader',
- 'Config' => 'Illuminate\Support\Facades\Config',
- 'Controller' => 'Illuminate\Routing\Controller',
- 'Cookie' => 'Illuminate\Support\Facades\Cookie',
- 'Crypt' => 'Illuminate\Support\Facades\Crypt',
- 'DB' => 'Illuminate\Support\Facades\DB',
- 'Eloquent' => 'Illuminate\Database\Eloquent\Model',
- 'Event' => 'Illuminate\Support\Facades\Event',
- 'File' => 'Illuminate\Support\Facades\File',
- 'Form' => 'Illuminate\Support\Facades\Form',
- 'Hash' => 'Illuminate\Support\Facades\Hash',
- 'HTML' => 'Illuminate\Support\Facades\HTML',
- 'Input' => 'Illuminate\Support\Facades\Input',
- 'Lang' => 'Illuminate\Support\Facades\Lang',
- 'Log' => 'Illuminate\Support\Facades\Log',
- 'Mail' => 'Illuminate\Support\Facades\Mail',
- 'Paginator' => 'Illuminate\Support\Facades\Paginator',
- 'Password' => 'Illuminate\Support\Facades\Password',
- 'Queue' => 'Illuminate\Support\Facades\Queue',
- 'Redirect' => 'Illuminate\Support\Facades\Redirect',
- 'Redis' => 'Illuminate\Support\Facades\Redis',
- 'Request' => 'Illuminate\Support\Facades\Request',
- 'Response' => 'Illuminate\Support\Facades\Response',
- 'Route' => 'Illuminate\Support\Facades\Route',
- 'Schema' => 'Illuminate\Support\Facades\Schema',
- 'Seeder' => 'Illuminate\Database\Seeder',
- 'Session' => 'Illuminate\Support\Facades\Session',
- 'SoftDeletingTrait' => 'Illuminate\Database\Eloquent\SoftDeletingTrait',
- 'SSH' => 'Illuminate\Support\Facades\SSH',
- 'Str' => 'Illuminate\Support\Str',
- 'URL' => 'Illuminate\Support\Facades\URL',
- 'Validator' => 'Illuminate\Support\Facades\Validator',
- 'View' => 'Illuminate\Support\Facades\View',
- 'Theme' => 'Teepluss\Theme\Facades\Theme',
-
- ),
-
-);
diff --git a/app/config/kde1/reservoir.php b/app/config/kde1/reservoir.php
deleted file mode 100644
index 5cbd1da..0000000
--- a/app/config/kde1/reservoir.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-return array(
-
- 'theme' => 'neverland',
-
- 'description' => 'a sample description',
-
- 'pages' => array(
- ),
-
-
-);
\ No newline at end of file
diff --git a/app/config/kde1/view.php b/app/config/kde1/view.php
deleted file mode 100644
index 18cfbbf..0000000
--- a/app/config/kde1/view.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-return array(
-
- /*
- |--------------------------------------------------------------------------
- | View Storage Paths
- |--------------------------------------------------------------------------
- |
- | Most templating systems load templates from disk. Here you may specify
- | an array of paths that should be checked for your views. Of course
- | the usual Laravel view path has already been registered for you.
- |
- */
-
- 'paths' => array(
- __DIR__.'/../../../sites/kde1',
- __DIR__.'/../../views'
- ),
-
- /*
- |--------------------------------------------------------------------------
- | Pagination View
- |--------------------------------------------------------------------------
- |
- | This view will be used to render the pagination link output, and can
- | be easily customized here to show any view you like. A clean view
- | compatible with Twitter's Bootstrap is given to you by default.
- |
- */
-
- 'pagination' => 'pagination::slider-3',
-
-);
diff --git a/app/config/reservoir.php b/app/config/reservoir.php
index 1aa360a..5cbd1da 100644
--- a/app/config/reservoir.php
+++ b/app/config/reservoir.php
@@ -1,12 +1,11 @@
<?php
return array(
- 'theme' => 'default',
+ 'theme' => 'neverland',
'description' => 'a sample description',
'pages' => array(
- 'index'
),
diff --git a/bootstrap/paths.php b/bootstrap/paths.php
index 3bbef94..896d4b8 100644
--- a/bootstrap/paths.php
+++ b/bootstrap/paths.php
@@ -2,57 +2,56 @@
return array(
- /*
- |--------------------------------------------------------------------------
- | Application Path
- |--------------------------------------------------------------------------
- |
- | Here we just defined the path to the application directory. Most likely
- | you will never need to change this value as the default setup should
- | work perfectly fine for the vast majority of all our applications.
- |
- */
-
- 'app' => __DIR__.'/../app',
-
- /*
- |--------------------------------------------------------------------------
- | Public Path
- |--------------------------------------------------------------------------
- |
- | The public path contains the assets for your web application, such as
- | your JavaScript and CSS files, and also contains the primary entry
- | point for web requests into these applications from the outside.
- |
- */
-
- 'public' => __DIR__.'/../public',
-
- /*
- |--------------------------------------------------------------------------
- | Base Path
- |--------------------------------------------------------------------------
- |
- | The base path is the root of the Laravel installation. Most likely you
- | will not need to change this value. But, if for some wild reason it
- | is necessary you will do so here, just proceed with some caution.
- |
- */
-
- 'base' => __DIR__.'/..',
-
- /*
- |--------------------------------------------------------------------------
- | Storage Path
- |--------------------------------------------------------------------------
- |
- | The storage path is used by Laravel to store cached Blade views, logs
- | and other pieces of information. You may modify the path here when
- | you want to change the location of this directory for your apps.
- |
- */
-
- 'storage' => __DIR__.'/../app/storage/sites/'.(isset($_SERVER['LARAVEL_ENV']) ? $_SERVER['LARAVEL_ENV'] : 'local'),
-
+ /*
+ |--------------------------------------------------------------------------
+ | Application Path
+ |--------------------------------------------------------------------------
+ |
+ | Here we just defined the path to the application directory. Most likely
+ | you will never need to change this value as the default setup should
+ | work perfectly fine for the vast majority of all our applications.
+ |
+ */
+
+ 'app' => __DIR__.'/../app',
+
+ /*
+ |--------------------------------------------------------------------------
+ | Public Path
+ |--------------------------------------------------------------------------
+ |
+ | The public path contains the assets for your web application, such as
+ | your JavaScript and CSS files, and also contains the primary entry
+ | point for web requests into these applications from the outside.
+ |
+ */
+
+ 'public' => __DIR__.'/../public',
+
+ /*
+ |--------------------------------------------------------------------------
+ | Base Path
+ |--------------------------------------------------------------------------
+ |
+ | The base path is the root of the Laravel installation. Most likely you
+ | will not need to change this value. But, if for some wild reason it
+ | is necessary you will do so here, just proceed with some caution.
+ |
+ */
+
+ 'base' => __DIR__.'/..',
+
+ /*
+ |--------------------------------------------------------------------------
+ | Storage Path
+ |--------------------------------------------------------------------------
+ |
+ | The storage path is used by Laravel to store cached Blade views, logs
+ | and other pieces of information. You may modify the path here when
+ | you want to change the location of this directory for your apps.
+ |
+ */
+
+ 'storage' => __DIR__.'/../app/storage',
);
diff --git a/bootstrap/start.php b/bootstrap/start.php
index c4d348c..5f5fff0 100644
--- a/bootstrap/start.php
+++ b/bootstrap/start.php
@@ -24,10 +24,11 @@ $app = new Illuminate\Foundation\Application;
|
*/
-$env = $app->detectEnvironment(function ()
-{
- return require __DIR__.'/environment.php';
-});
+$env = $app->detectEnvironment(array(
+
+ 'local' => array('homestead'),
+
+));
/*
|--------------------------------------------------------------------------
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic