From eda790dc2b5c52e04dcc7b05c23a901f01311cd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Guillot?= Date: Thu, 30 Oct 2014 22:01:17 -0400 Subject: [PATCH] Update default config --- config.default.php | 4 ++-- docs/config.markdown | 57 +++++++++++++++++++++++--------------------- 2 files changed, 32 insertions(+), 29 deletions(-) diff --git a/config.default.php b/config.default.php index d839806..e4bb9db 100644 --- a/config.default.php +++ b/config.default.php @@ -4,7 +4,7 @@ define('HTTP_TIMEOUT', '20'); // DATA_DIRECTORY => default is data (writable directory) -define('DATA_DIRECTORY', 'data'); +define('DATA_DIRECTORY', __DIR__.'/data'); // DB_FILENAME => default value is db.sqlite (default database filename) define('DB_FILENAME', 'db.sqlite'); @@ -16,7 +16,7 @@ define('ENABLE_MULTIPLE_DB', true); define('DEBUG', true); // DEBUG_FILENAME => default is data/debug.log -define('DEBUG_FILENAME', DATA_DIRECTORY.DIRECTORY_SEPARATOR.'debug.log'); +define('DEBUG_FILENAME', DATA_DIRECTORY.'/debug.log'); // THEME_DIRECTORY => default is themes define('THEME_DIRECTORY', 'themes'); diff --git a/docs/config.markdown b/docs/config.markdown index 0de9dc3..af68840 100644 --- a/docs/config.markdown +++ b/docs/config.markdown @@ -11,43 +11,46 @@ To override them, rename the file `config.default.php` to `config.php`. Actually, the following constants can be overrided: - default value is 20 seconds (Maximum time to fetch a feed) - define('HTTP_TIMEOUT', '20'); +// HTTP_TIMEOUT => default value is 20 seconds (Maximum time to fetch a feed) +define('HTTP_TIMEOUT', '20'); - // DATA_DIRECTORY => default is data (writable directory) - define('DATA_DIRECTORY', 'data'); +// DATA_DIRECTORY => default is data (writable directory) +define('DATA_DIRECTORY', __DIR__.'/data'); - // DB_FILENAME => default value is db.sqlite (default database filename) - define('DB_FILENAME', 'db.sqlite'); +// DB_FILENAME => default value is db.sqlite (default database filename) +define('DB_FILENAME', 'db.sqlite'); - // ENABLE_MULTIPLE_DB => default value is true (multiple users support) - define('ENABLE_MULTIPLE_DB', true); +// ENABLE_MULTIPLE_DB => default value is true (multiple users support) +define('ENABLE_MULTIPLE_DB', true); - // DEBUG => default is true (enable logging of PicoFeed) - define('DEBUG', true); +// DEBUG => default is true (enable logging of PicoFeed) +define('DEBUG', true); - // DEBUG_FILENAME => default is data/debug.log - define('DEBUG_FILENAME', DATA_DIRECTORY.DIRECTORY_SEPARATOR.'debug.log'); +// DEBUG_FILENAME => default is data/debug.log +define('DEBUG_FILENAME', DATA_DIRECTORY.DIRECTORY_SEPARATOR.'debug.log'); - // THEME_DIRECTORY => default is themes - define('THEME_DIRECTORY', 'themes'); +// THEME_DIRECTORY => default is themes +define('THEME_DIRECTORY', 'themes'); - // SESSION_SAVE_PATH => default is empty (used to store session files in a custom directory) - define('SESSION_SAVE_PATH', ''); +// SESSION_SAVE_PATH => default is empty (used to store session files in a custom directory) +define('SESSION_SAVE_PATH', ''); - // PROXY_HOSTNAME => default is empty (make HTTP requests through a HTTP proxy if set) - define('PROXY_HOSTNAME', ''); +// PROXY_HOSTNAME => default is empty (make HTTP requests through a HTTP proxy if set) +define('PROXY_HOSTNAME', ''); - // PROXY_PORT => default is 3128 (default port of Squid) - define('PROXY_PORT', 3128); +// PROXY_PORT => default is 3128 (default port of Squid) +define('PROXY_PORT', 3128); - // PROXY_USERNAME => default is empty (set the proxy username is needed) - define('PROXY_USERNAME', ''); +// PROXY_USERNAME => default is empty (set the proxy username is needed) +define('PROXY_USERNAME', ''); - // PROXY_PASSWORD => default is empty - define('PROXY_PASSWORD', ''); +// PROXY_PASSWORD => default is empty +define('PROXY_PASSWORD', ''); - // ENABLE_AUTO_UPDATE => default is true (enable Miniflux update from the user interface) - define('ENABLE_AUTO_UPDATE', true); +// ENABLE_AUTO_UPDATE => default is true (enable Miniflux update from the user interface) +define('ENABLE_AUTO_UPDATE', true); + +``` \ No newline at end of file