diff --git a/config.php-dist b/config.php-dist index c7da5bde1..f060cc6af 100644 --- a/config.php-dist +++ b/config.php-dist @@ -42,9 +42,6 @@ define('CACHE_DIR', 'cache'); // Local cache directory for RSS feed content. - define('TMP_DIRECTORY', '/tmp'); - // Directory for temporary files - define('ICONS_DIR', "feed-icons"); define('ICONS_URL', "feed-icons"); // Local and URL path to the directory, where feed favicons are stored. diff --git a/debian/config.php-dist-tt-rss-mysql.diff b/debian/config.php-dist-tt-rss-mysql.diff index bc165ab05..5741f287b 100644 --- a/debian/config.php-dist-tt-rss-mysql.diff +++ b/debian/config.php-dist-tt-rss-mysql.diff @@ -31,5 +31,4 @@ - define('CACHE_DIR', 'cache'); + define('CACHE_DIR', '/var/cache/tt-rss'); // Local cache directory for RSS feed content. - - define('TMP_DIRECTORY', '/tmp'); + diff --git a/debian/config.php-dist-tt-rss-pgsql.diff b/debian/config.php-dist-tt-rss-pgsql.diff index 476d84c24..393a7512e 100644 --- a/debian/config.php-dist-tt-rss-pgsql.diff +++ b/debian/config.php-dist-tt-rss-pgsql.diff @@ -31,5 +31,4 @@ - define('CACHE_DIR', 'cache'); + define('CACHE_DIR', '/var/cache/tt-rss'); // Local cache directory for RSS feed content. - - define('TMP_DIRECTORY', '/tmp'); + diff --git a/include/sanity_config.php b/include/sanity_config.php index c42c8035d..dfeffbd6e 100644 --- a/include/sanity_config.php +++ b/include/sanity_config.php @@ -1,3 +1,3 @@ - +$requred_defines = array( 'DB_TYPE', 'DB_HOST', 'DB_USER', 'DB_NAME', 'DB_PASS', 'MYSQL_CHARSET', 'SELF_URL_PATH', 'SINGLE_USER_MODE', 'PHP_EXECUTABLE', 'LOCK_DIRECTORY', 'CACHE_DIR', 'ICONS_DIR', 'ICONS_URL', 'DEFAULT_UPDATE_METHOD', 'FORCE_ARTICLE_PURGE', 'PUBSUBHUBBUB_HUB', 'PUBSUBHUBBUB_ENABLED', 'SPHINX_ENABLED', 'SPHINX_INDEX', 'ALLOW_REMOTE_USER_AUTH', 'AUTO_LOGIN', 'AUTO_CREATE_USER', 'ENABLE_REGISTRATION', 'REG_NOTIFY_ADDRESS', 'REG_MAX_USERS', 'SESSION_COOKIE_LIFETIME', 'SESSION_EXPIRE_TIME', 'SESSION_CHECK_ADDRESS', 'SMTP_FROM_NAME', 'SMTP_FROM_ADDRESS', 'DIGEST_SUBJECT', 'SMTP_HOST', 'SMTP_LOGIN', 'SMTP_PASSWORD', 'CONSUMER_KEY', 'CONSUMER_SECRET', 'CHECK_FOR_NEW_VERSION', 'COUNTERS_MAX_AGE', 'ENABLE_GZIP_OUTPUT', 'FEEDBACK_URL', 'ARTICLE_BUTTON_PLUGINS', 'CONFIG_VERSION'); ?>