Merge branch 'develop' into fix/trusted-proxies

This commit is contained in:
Jakob 2017-02-03 00:38:58 +01:00 committed by GitHub
commit 19567ee311
24 changed files with 5449 additions and 56 deletions

View file

@ -61,27 +61,18 @@
],
"post-install-cmd": [
"Illuminate\\Foundation\\ComposerScripts::postInstall",
"php artisan optimize"
"php artisan optimize",
"php artisan config:cache"
],
"post-update-cmd": [
"Illuminate\\Foundation\\ComposerScripts::postUpdate",
"php artisan optimize"
],
"setup-dev": [
"composer install",
"php -r \"copy('.env.example', '.env');\"",
"php vendor/bin/homestead make --ip=192.168.10.32",
"sed -i.bak 's/homestead.app/pterodactyl.local/g' Homestead.yaml",
"rm Homestead.yaml.bak",
"php artisan key:generate"
"php artisan optimize",
"php artisan config:cache"
],
"setup": [
"composer install --ansi --no-dev",
"php -r \"file_exists('.env') || copy('.env.example', '.env');\"",
"php artisan key:generate"
],
"upgrade": [
"composer update --ansi --no-dev"
]
},
"config": {