Mirrors/sysPass
2
0
Fork 0
mirror of https://github.com/nuxsmin/sysPass.git synced 2026-03-06 08:34:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

* [ADD] Use phpdotenv for loading variables from environment files

Browse Source 
Signed-off-by: Rubén D <nuxsmin@syspass.org>
This commit is contained in:
Rubén D
2020-01-08 14:00:30 +01:00
parent bec1d21d8c
commit 342bcab99e
4 changed files with 936 additions and 531 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
.env Normal file
View File

@@ -0,0 +1,9 @@
# CONFIG_PATH="/var/www/html/syspass/app/config"
# BACKUP_PATH="/var/www/html/syspass/app/backup"
# CACHE_PATH="/var/www/html/syspass/app/cache"
# TMP_PATH="/var/www/html/syspass/app/temp"
# CONFIG_FILE="config.xml"
# ACTIONS_FILE="actions.xml"
# MIMETYPES_FILE="mime.xml"
# LOG_FILE="syspass.log"
# DEBUG=true

1
composer.json
View File

@@ -30,6 +30,7 @@
"guzzlehttp/guzzle": "~6.3",
"monolog/monolog": "^1.23",
"symfony/debug" : "~v3.4",
"vlucas/phpdotenv" : "~v4.1",
"ext-pdo": "*",
"ext-dom": "*",
"ext-gd": "*",

1395
composer.lock generated
View File

File diff suppressed because it is too large Load Diff

62
lib/Base.php
View File

@@ -23,48 +23,58 @@
*/
use DI\ContainerBuilder;
use Dotenv\Dotenv;
use SP\Bootstrap;
require __DIR__ . DIRECTORY_SEPARATOR . 'BaseFunctions.php';
defined('APP_ROOT') || die();
defined('APP_MODULE') || define('APP_MODULE', 'web');
// Core PATHS
define('BASE_PATH', __DIR__);
define('APP_PATH', APP_ROOT . DIRECTORY_SEPARATOR . 'app');
define('VENDOR_PATH', APP_ROOT . DIRECTORY_SEPARATOR . 'vendor');
define('SQL_PATH', APP_ROOT . DIRECTORY_SEPARATOR . 'schemas');
define('PUBLIC_PATH', APP_ROOT . DIRECTORY_SEPARATOR . 'public');
define('XML_SCHEMA', SQL_PATH . DIRECTORY_SEPARATOR . 'syspass.xsd');
// Start tracking the memory used
$memInit = memory_get_usage();
require __DIR__ . DIRECTORY_SEPARATOR . 'BaseFunctions.php';
require VENDOR_PATH . DIRECTORY_SEPARATOR . 'autoload.php';
require __DIR__ . DIRECTORY_SEPARATOR . 'SplClassLoader.php';
$dotenv = Dotenv::createImmutable(APP_ROOT);
$dotenv->load();
defined('APP_MODULE') || define('APP_MODULE', 'web');
define('DEBUG', getenv('DEBUG') || false);
// Please, notice that this file should be outside the webserver root. You can move it and then update this path
define('CONFIG_PATH', APP_PATH . DIRECTORY_SEPARATOR . 'config');
define('CONFIG_PATH', getenv('CONFIG_PATH')
?: APP_PATH . DIRECTORY_SEPARATOR . 'config');
define('RESOURCES_PATH', APP_PATH . DIRECTORY_SEPARATOR . 'resources');
// Setup config files
define('CONFIG_FILE', CONFIG_PATH . DIRECTORY_SEPARATOR . 'config.xml');
define('ACTIONS_FILE', RESOURCES_PATH . DIRECTORY_SEPARATOR . 'actions.xml');
define('MIMETYPES_FILE', RESOURCES_PATH . DIRECTORY_SEPARATOR . 'mime.xml');
define('CONFIG_FILE', getenv('CONFIG_FILE')
?: CONFIG_PATH . DIRECTORY_SEPARATOR . 'config.xml');
define('ACTIONS_FILE', getenv('ACTIONS_FILE')
?: RESOURCES_PATH . DIRECTORY_SEPARATOR . 'actions.xml');
define('MIMETYPES_FILE', getenv('MIMETYPES_FILE')
?: RESOURCES_PATH . DIRECTORY_SEPARATOR . 'mime.xml');
define('OLD_CONFIG_FILE', CONFIG_PATH . DIRECTORY_SEPARATOR . 'config.php');
define('LOG_FILE', CONFIG_PATH . DIRECTORY_SEPARATOR . 'syspass.log');
define('LOG_FILE', getenv('LOG_FILE')
?: CONFIG_PATH . DIRECTORY_SEPARATOR . 'syspass.log');
define('LOCK_FILE', CONFIG_PATH . DIRECTORY_SEPARATOR . '.lock');
// Setup application paths
define('MODULES_PATH', APP_PATH . DIRECTORY_SEPARATOR . 'modules');
define('LOCALES_PATH', APP_PATH . DIRECTORY_SEPARATOR . 'locales');
define('BACKUP_PATH', APP_PATH . DIRECTORY_SEPARATOR . 'backup');
define('CACHE_PATH', APP_PATH . DIRECTORY_SEPARATOR . 'cache');
define('TMP_PATH', APP_PATH . DIRECTORY_SEPARATOR . 'temp');
// Setup other paths
define('VENDOR_PATH', APP_ROOT . DIRECTORY_SEPARATOR . 'vendor');
define('SQL_PATH', APP_ROOT . DIRECTORY_SEPARATOR . 'schemas');
define('PUBLIC_PATH', APP_ROOT . DIRECTORY_SEPARATOR . 'public');
define('XML_SCHEMA', BASE_PATH . DIRECTORY_SEPARATOR . 'schemas' . DIRECTORY_SEPARATOR . 'syspass.xsd');
define('DEBUG', false);
// Empezar a calcular la memoria utilizada
$memInit = memory_get_usage();
require VENDOR_PATH . DIRECTORY_SEPARATOR . 'autoload.php';
require __DIR__ . DIRECTORY_SEPARATOR . 'SplClassLoader.php';
define('BACKUP_PATH', getenv('BACKUP_PATH')
?: APP_PATH . DIRECTORY_SEPARATOR . 'backup');
define('CACHE_PATH', getenv('CACHE_PATH')
?: APP_PATH . DIRECTORY_SEPARATOR . 'cache');
define('TMP_PATH', getenv('TMP_PATH')
?: APP_PATH . DIRECTORY_SEPARATOR . 'temp');
initModule(APP_MODULE);
@@ -74,7 +84,7 @@ try {
$builder->addDefinitions(BASE_PATH . DIRECTORY_SEPARATOR . 'Definitions.php');
Bootstrap::run($builder->build());
} catch (\Exception $e) {
} catch (Exception $e) {
processException($e);
die($e->getMessage());