Merge pull request #1 from mikedugan/master

nginx root & asset publish in startup
pull/2/head
Toby Zerner 2014-12-31 13:59:43 +10:30
commit c10031dadc
3 changed files with 5 additions and 4 deletions

2
Vagrantfile vendored
View File

@ -59,7 +59,7 @@ composer_packages = [ # List any global Composer packages that you wa
# Default web server document root
# Symfony's public directory is assumed "web"
# Laravel's public directory is assumed "public"
public_folder = "/vagrant"
public_folder = "/vagrant/public"
laravel_root_folder = "/vagrant/laravel" # Where to install Laravel. Will `composer install` if a composer.json file exists
laravel_version = "latest-stable" # If you need a specific version of Laravel, set it here

View File

@ -121,9 +121,9 @@ return array(
'Illuminate\Validation\ValidationServiceProvider',
'Illuminate\View\ViewServiceProvider',
'Illuminate\Workbench\WorkbenchServiceProvider',
'Flarum\Core\CoreServiceProvider',
'Flarum\Api\ApiServiceProvider',
'Flarum\Web\WebServiceProvider',
'Flarum\Core\CoreServiceProvider',
'Flarum\Api\ApiServiceProvider',
'Flarum\Web\WebServiceProvider',
),

View File

@ -33,3 +33,4 @@ cd /vagrant
composer install
php artisan migrate --bench="flarum/core"
php artisan db:seed --class="Flarum\Core\Support\Seeders\DatabaseSeeder"
php artisan asset:publish --bench="flarum/core"