flashii/awaki
1
0
Fork 0
Code Pull requests Releases Activity

Updated config usage in Awaki.

Browse source
This commit is contained in:
flash 2023-12-15 02:19:17 +00:00
parent 67688a8c51
commit de5e84073d
2 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -6,3 +6,4 @@
/config/config.ini /config/config.ini
/public/robots.txt /public/robots.txt
/vendor /vendor
/awaki.cfg

11
awaki.php
View file

@ -11,14 +11,13 @@ define('AWK_ROOT', __DIR__);
define('AWK_DEBUG', is_file(AWK_ROOT . '/.debug')); define('AWK_DEBUG', is_file(AWK_ROOT . '/.debug'));
define('AWK_DIR_SRC', AWK_ROOT . '/src'); define('AWK_DIR_SRC', AWK_ROOT . '/src');
define('AWK_DIR_PUB', AWK_ROOT . '/public'); define('AWK_DIR_PUB', AWK_ROOT . '/public');
define('AWK_DIR_CFG', AWK_ROOT . '/config');
define('AWK_DIR_DBM', AWK_ROOT . '/database'); define('AWK_DIR_DBM', AWK_ROOT . '/database');
require_once AWK_ROOT . '/vendor/autoload.php'; require_once AWK_ROOT . '/vendor/autoload.php';
Environment::setDebug(AWK_DEBUG); Environment::setDebug(AWK_DEBUG);
$config = SharpConfig::fromFile(AWK_DIR_CFG . '/config.cfg'); $config = SharpConfig::fromFile(AWK_ROOT . '/awaki.cfg');
if($config->hasValues('sentry:dsn')) if($config->hasValues('sentry:dsn'))
(function($cfg) { (function($cfg) {
@ -33,11 +32,7 @@ if($config->hasValues('sentry:dsn'))
}); });
})($config->scopeTo('sentry')); })($config->scopeTo('sentry'));
try { $db = DbTools::create($cfg->getString('database:dsn', 'null:'));
$db = DbTools::create($config->getString('dsn')); $db->execute('SET SESSION time_zone = \'+00:00\', sql_mode = \'STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION\';');
} catch(ConnectionFailedException $ex) {
echo '<h3>Unable to connect to database</h3>';
die($ex->getMessage());
}
$awk = new AwakiContext($db, $config->scopeTo('urls')); $awk = new AwakiContext($db, $config->scopeTo('urls'));