Replace *.ini.php by *.config.php in comments
This commit is contained in:
parent
98d90e131d
commit
c964e193b9
|
@ -42,9 +42,14 @@ if ($a->getMode()->isInstall()) {
|
||||||
Config::load();
|
Config::load();
|
||||||
|
|
||||||
if (empty(Config::get('system', 'pidfile'))) {
|
if (empty(Config::get('system', 'pidfile'))) {
|
||||||
die('Please set system.pidfile in config/local.ini.php. For example:'."\n".
|
die(<<<TXT
|
||||||
'[system]'."\n".
|
Please set system.pidfile in config/local.config.php. For example:
|
||||||
'pidfile = /path/to/daemon.pid'."\n");
|
|
||||||
|
'system' => [
|
||||||
|
'pidfile' => '/path/to/daemon.pid',
|
||||||
|
],
|
||||||
|
TXT
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
$pidfile = Config::get('system', 'pidfile');
|
$pidfile = Config::get('system', 'pidfile');
|
||||||
|
|
12
boot.php
12
boot.php
|
@ -56,13 +56,13 @@ define('EOL', "<br />\r\n");
|
||||||
* @brief Image storage quality.
|
* @brief Image storage quality.
|
||||||
*
|
*
|
||||||
* Lower numbers save space at cost of image detail.
|
* Lower numbers save space at cost of image detail.
|
||||||
* For ease of upgrade, please do not change here. Set [system] jpegquality = n in config/local.ini.php,
|
* For ease of upgrade, please do not change here. Set system.jpegquality = n in config/local.config.php,
|
||||||
* where n is between 1 and 100, and with very poor results below about 50
|
* where n is between 1 and 100, and with very poor results below about 50
|
||||||
*/
|
*/
|
||||||
define('JPEG_QUALITY', 100);
|
define('JPEG_QUALITY', 100);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* [system] png_quality = n where is between 0 (uncompressed) to 9
|
* system.png_quality = n where is between 0 (uncompressed) to 9
|
||||||
*/
|
*/
|
||||||
define('PNG_QUALITY', 8);
|
define('PNG_QUALITY', 8);
|
||||||
|
|
||||||
|
@ -73,10 +73,12 @@ define('PNG_QUALITY', 8);
|
||||||
* this length (on the longest side, the other side will be scaled appropriately).
|
* this length (on the longest side, the other side will be scaled appropriately).
|
||||||
* Modify this value using
|
* Modify this value using
|
||||||
*
|
*
|
||||||
* [system]
|
* 'system' => [
|
||||||
* max_image_length = n;
|
* 'max_image_length' => 'n',
|
||||||
|
* ...
|
||||||
|
* ],
|
||||||
*
|
*
|
||||||
* in config/local.ini.php
|
* in config/local.config.php
|
||||||
*
|
*
|
||||||
* If you don't want to set a maximum length, set to -1. The default value is
|
* If you don't want to set a maximum length, set to -1. The default value is
|
||||||
* defined by 'MAX_IMAGE_LENGTH' below.
|
* defined by 'MAX_IMAGE_LENGTH' below.
|
||||||
|
|
|
@ -914,7 +914,7 @@ function admin_page_summary(App $a)
|
||||||
// Legacy config file warning
|
// Legacy config file warning
|
||||||
if (file_exists('.htconfig.php')) {
|
if (file_exists('.htconfig.php')) {
|
||||||
$showwarning = true;
|
$showwarning = true;
|
||||||
$warningtext[] = L10n::t('Friendica\'s configuration now is stored in config/local.ini.php, please copy config/local-sample.ini.php and move your config from <code>.htconfig.php</code>. See <a href="%s">the Config help page</a> for help with the transition.', $a->getBaseURL() . '/help/Config');
|
$warningtext[] = L10n::t('Friendica\'s configuration now is stored in config/local.config.php, please copy config/local-sample.config.php and move your config from <code>.htconfig.php</code>. See <a href="%s">the Config help page</a> for help with the transition.', $a->getBaseURL() . '/help/Config');
|
||||||
}
|
}
|
||||||
|
|
||||||
// Check server vitality
|
// Check server vitality
|
||||||
|
|
|
@ -65,13 +65,13 @@ class JITConfigAdapter extends BaseObject implements IConfigAdapter
|
||||||
$this->in_db[$cat][$k] = true;
|
$this->in_db[$cat][$k] = true;
|
||||||
return $value;
|
return $value;
|
||||||
} elseif (isset($a->config[$cat][$k])) {
|
} elseif (isset($a->config[$cat][$k])) {
|
||||||
// Assign the value (mostly) from config/local.ini.php file to the cache
|
// Assign the value (mostly) from config/local.config.php file to the cache
|
||||||
$this->cache[$cat][$k] = $a->config[$cat][$k];
|
$this->cache[$cat][$k] = $a->config[$cat][$k];
|
||||||
$this->in_db[$cat][$k] = false;
|
$this->in_db[$cat][$k] = false;
|
||||||
|
|
||||||
return $a->config[$cat][$k];
|
return $a->config[$cat][$k];
|
||||||
} elseif (isset($a->config[$k])) {
|
} elseif (isset($a->config[$k])) {
|
||||||
// Assign the value (mostly) from config/local.ini.php file to the cache
|
// Assign the value (mostly) from config/local.config.php file to the cache
|
||||||
$this->cache[$k] = $a->config[$k];
|
$this->cache[$k] = $a->config[$k];
|
||||||
$this->in_db[$k] = false;
|
$this->in_db[$k] = false;
|
||||||
|
|
||||||
|
|
|
@ -59,7 +59,7 @@ Description
|
||||||
Sets the value of the provided key in the category
|
Sets the value of the provided key in the category
|
||||||
|
|
||||||
Notes:
|
Notes:
|
||||||
Setting config entries which are manually set in config/local.ini.php may result in
|
Setting config entries which are manually set in config/local.config.php may result in
|
||||||
conflict between database settings and the manual startup settings.
|
conflict between database settings and the manual startup settings.
|
||||||
|
|
||||||
Options
|
Options
|
||||||
|
|
|
@ -139,7 +139,7 @@ Description
|
||||||
Sets the value of the provided key in the category
|
Sets the value of the provided key in the category
|
||||||
|
|
||||||
Notes:
|
Notes:
|
||||||
Setting config entries which are manually set in config/local.ini.php may result in
|
Setting config entries which are manually set in config/local.config.php may result in
|
||||||
conflict between database settings and the manual startup settings.
|
conflict between database settings and the manual startup settings.
|
||||||
|
|
||||||
Options
|
Options
|
||||||
|
|
Loading…
Reference in a new issue