Leisuretimedock/blessing-skin-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not publish .env file

Browse Source
This commit is contained in:
Pig Fang 2019-04-09 13:21:31 +08:00
parent 7f2d410a0a
commit d86e4c1805
6 changed files with 32 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
app/Http/Controllers/SetupController.php
View File

@ -16,6 +16,17 @@ use App\Exceptions\PrettyPageException;
class SetupController extends Controller class SetupController extends Controller
{ {
public function welcome()
{
// @codeCoverageIgnoreStart
if (! File::exists(base_path('.env'))) {
File::copy(base_path('.env.example'), base_path('.env'));
}
// @codeCoverageIgnoreEnd
return view('setup.wizard.welcome');
}
public function database(Request $request) public function database(Request $request)
{ {
if ($request->isMethod('get')) { if ($request->isMethod('get')) {
@ -35,8 +46,8 @@ class SetupController extends Controller
'database.connections.temp.port' => $request->input('port'), 'database.connections.temp.port' => $request->input('port'),
'database.connections.temp.username' => $request->input('username'), 'database.connections.temp.username' => $request->input('username'),
'database.connections.temp.password' => $request->input('password'), 'database.connections.temp.password' => $request->input('password'),
'database.connections.temp.database' => $request->input('db') == '' ? null : $request->input('db'), 'database.connections.temp.database' => $request->input('db'),
'database.connections.temp.prefix' => $request->input('prefix') == '' ? null : $request->input('prefix'), 'database.connections.temp.prefix' => $request->input('prefix'),
]); ]);
try { try {
@ -52,38 +63,38 @@ class SetupController extends Controller
} }
$content = File::get(base_path('.env')); $content = File::get(base_path('.env'));
$content = str_replace( $content = preg_replace(
'DB_CONNECTION = '.env('DB_CONNECTION'), '/DB_CONNECTION.+/',
'DB_CONNECTION = '.$request->input('type'), 'DB_CONNECTION = '.$request->input('type'),
$content $content
); );
$content = str_replace( $content = preg_replace(
'DB_HOST = '.env('DB_HOST'), '/DB_HOST.+/',
'DB_HOST = '.$request->input('host'), 'DB_HOST = '.$request->input('host'),
$content $content
); );
$content = str_replace( $content = preg_replace(
'DB_PORT = '.env('DB_PORT'), '/DB_PORT.+/',
'DB_PORT = '.$request->input('port'), 'DB_PORT = '.$request->input('port'),
$content $content
); );
$content = str_replace( $content = preg_replace(
'DB_DATABASE = '.env('DB_DATABASE'), '/DB_DATABASE.+/',
'DB_DATABASE = '.$request->input('db'), 'DB_DATABASE = '.$request->input('db'),
$content $content
); );
$content = str_replace( $content = preg_replace(
'DB_USERNAME = '.env('DB_USERNAME'), '/DB_USERNAME.+/',
'DB_USERNAME = '.$request->input('username'), 'DB_USERNAME = '.$request->input('username'),
$content $content
); );
$content = str_replace( $content = preg_replace(
'DB_PASSWORD = '.env('DB_PASSWORD'), '/DB_PASSWORD.+/',
'DB_PASSWORD = '.$request->input('password'), 'DB_PASSWORD = '.$request->input('password'),
$content $content
); );
$content = str_replace( $content = preg_replace(
'DB_PREFIX = '.env('DB_PREFIX'), '/DB_PREFIX.+/',
'DB_PREFIX = '.$request->input('prefix'), 'DB_PREFIX = '.$request->input('prefix'),
$content $content
); );

2
app/Http/Middleware/CheckInstallation.php
View File

@ -8,7 +8,7 @@ class CheckInstallation
{ {
public function handle($request, \Closure $next) public function handle($request, \Closure $next)
{ {
if (env('DB_CONNECTION') == 'dummy') { if (config('database.default') == 'dummy') {
return $next($request); // @codeCoverageIgnore return $next($request); // @codeCoverageIgnore
} }

2
app/Providers/RuntimeCheckServiceProvider.php
View File

@ -33,7 +33,7 @@ class RuntimeCheckServiceProvider extends ServiceProvider
protected function checkInstallation() protected function checkInstallation()
{ {
// Redirect to setup wizard // Redirect to setup wizard
if (env('DB_CONNECTION') == 'dummy' || ! SetupController::checkTablesExist()) { if (config('database.default') == 'dummy' || ! SetupController::checkTablesExist()) {
return redirect('/setup')->send(); return redirect('/setup')->send();
} }

2
config/database.php
View File

@ -26,7 +26,7 @@ return [
| |
*/ */
'default' => env('DB_CONNECTION', 'mysql'), 'default' => env('DB_CONNECTION', 'dummy'),
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------

2
routes/setup.php
View File

@ -16,7 +16,7 @@
*/ */
Route::group(['prefix' => 'setup'], function () { Route::group(['prefix' => 'setup'], function () {
Route::group(['middleware' => 'setup'], function () { Route::group(['middleware' => 'setup'], function () {
Route::view('/', 'setup.wizard.welcome'); Route::any('/', 'SetupController@welcome');
Route::any('/database', 'SetupController@database'); Route::any('/database', 'SetupController@database');
Route::get('/info', 'SetupController@info'); Route::get('/info', 'SetupController@info');
Route::post('/finish', 'SetupController@finish'); Route::post('/finish', 'SetupController@finish');

3
scripts/release.sh
View File

@ -4,7 +4,6 @@ composer install --no-dev
rm -rf vendor/bin rm -rf vendor/bin
yarn yarn
yarn build yarn build
cp .env.example .env
zip -9 -r blessing-skin-server-$RELEASE_TAG.zip \ zip -9 -r blessing-skin-server-$RELEASE_TAG.zip \
app \ app \
bootstrap \ bootstrap \
@ -17,7 +16,7 @@ zip -9 -r blessing-skin-server-$RELEASE_TAG.zip \
routes \ routes \
storage \ storage \
vendor \ vendor \
.env \ .env.example \
artisan \ artisan \
LICENSE \ LICENSE \
README.md \ README.md \