mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

handle config() call outside of Laravel

Browse Source
This commit is contained in:
Tony Murray
2020-06-21 21:05:49 -05:00
parent 0175872d87
commit de7d0aae97
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
LibreNMS/Util/EnvHelper.php
View File

@@ -26,6 +26,7 @@
namespace LibreNMS\Util; namespace LibreNMS\Util;
use ErrorException; use ErrorException;
use Illuminate\Contracts\Container\BindingResolutionException;
use LibreNMS\Exceptions\FileWriteFailedException; use LibreNMS\Exceptions\FileWriteFailedException;
class EnvHelper class EnvHelper
@@ -116,19 +117,22 @@ class EnvHelper
copy(base_path('.env.example'), $env_file); copy(base_path('.env.example'), $env_file);
$key = trim(exec(PHP_BINDIR . '/php ' . base_path('artisan') . ' key:generate --show')); $key = trim(exec(PHP_BINDIR . '/php ' . base_path('artisan') . ' key:generate --show'));
config(['app.key' => $key]);
self::writeEnv([ self::writeEnv([
'APP_KEY' => $key, 'APP_KEY' => $key,
'INSTALL' => !file_exists(base_path('config.php')) ? 'true' : false, // if both .env and config.php are missing, assume install is needed 'INSTALL' => !file_exists(base_path('config.php')) ? 'true' : false, // if both .env and config.php are missing, assume install is needed
], [], $env_file); ], [], $env_file);
config(['app.key' => $key]);
return $key; return $key;
} }
return false; return false;
} catch (ErrorException $e) { } catch (ErrorException $e) {
throw new FileWriteFailedException($env_file, 0, $e); throw new FileWriteFailedException($env_file, 0, $e);
} catch (BindingResolutionException $e) {
// called outside of Laravel, ignore config() failure
return $key;
} }
} }