lucas.mathieu/cachet-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1492 from CachetHQ/env

Browse Source 
Fixed env issues in the setup
This commit is contained in:
Joe Cohen
2016-02-12 18:30:25 -06:00
parent c089d9f5a5 62bed608cb
commit 17b7aa1ca7
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/SetupController.php
+8 -4
View File
@@ -221,10 +221,12 @@ class SetupController extends Controller
*/ */
protected function writeEnv($key, $value) protected function writeEnv($key, $value)
{ {
$path = app()->environmentFile(); $dir = app()->environmentPath();
$file = app()->environmentFile();
$path = "{$dir}/{$file}";
try { try {
(new Dotenv(app()->environmentPath(), $path))->load(); (new Dotenv($dir, $file))->load();
file_put_contents($path, str_replace( file_put_contents($path, str_replace(
env(strtoupper($key)), $value, file_get_contents($path) env(strtoupper($key)), $value, file_get_contents($path)
@@ -243,9 +245,11 @@ class SetupController extends Controller
{ {
$key = str_random(32); $key = str_random(32);
$path = app()->environmentFile(); $dir = app()->environmentPath();
$file = app()->environmentFile();
$path = "{$dir}/{$file}";
(new Dotenv(app()->environmentPath(), $path))->load(); (new Dotenv($dir, $file))->load();
file_put_contents($path, str_replace( file_put_contents($path, str_replace(
Config::get('app.key'), $key, file_get_contents($path) Config::get('app.key'), $key, file_get_contents($path)