mirror of
https://git.tt-rss.org/git/tt-rss.git
synced 2025-12-17 23:41:30 +00:00
move php executable path for old-style daemon to config.php (bump version) (closes #212)
This commit is contained in:
@@ -184,7 +184,10 @@
|
|||||||
// Selectively gzip output to improve wire performance. This requires
|
// Selectively gzip output to improve wire performance. This requires
|
||||||
// PHP Zlib extension on the server.
|
// PHP Zlib extension on the server.
|
||||||
|
|
||||||
define('CONFIG_VERSION', 16);
|
define('PHP_EXECUTABLE', '/usr/bin/php');
|
||||||
|
// Path to PHP executable
|
||||||
|
|
||||||
|
define('CONFIG_VERSION', 17);
|
||||||
// Expected config version. Please update this option in config.php
|
// Expected config version. Please update this option in config.php
|
||||||
// if necessary (after migrating all new options from this file).
|
// if necessary (after migrating all new options from this file).
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
<?php
|
<?php
|
||||||
require_once "functions.php";
|
require_once "functions.php";
|
||||||
|
|
||||||
define('EXPECTED_CONFIG_VERSION', 16);
|
define('EXPECTED_CONFIG_VERSION', 17);
|
||||||
define('SCHEMA_VERSION', 37);
|
define('SCHEMA_VERSION', 37);
|
||||||
|
|
||||||
if (!file_exists("config.php")) {
|
if (!file_exists("config.php")) {
|
||||||
|
|||||||
@@ -11,7 +11,6 @@
|
|||||||
define('MAGPIE_CACHE_DIR', '/var/tmp/magpie-ttrss-cache-daemon');
|
define('MAGPIE_CACHE_DIR', '/var/tmp/magpie-ttrss-cache-daemon');
|
||||||
define('SIMPLEPIE_CACHE_DIR', '/var/tmp/simplepie-ttrss-cache-daemon');
|
define('SIMPLEPIE_CACHE_DIR', '/var/tmp/simplepie-ttrss-cache-daemon');
|
||||||
define('DISABLE_SESSIONS', true);
|
define('DISABLE_SESSIONS', true);
|
||||||
define('PHP_EXECUTABLE', '/usr/bin/php');
|
|
||||||
|
|
||||||
require_once "version.php";
|
require_once "version.php";
|
||||||
|
|
||||||
@@ -24,6 +23,10 @@
|
|||||||
require_once "sanity_check.php";
|
require_once "sanity_check.php";
|
||||||
require_once "config.php";
|
require_once "config.php";
|
||||||
|
|
||||||
|
if (!defined('PHP_EXECUTABLE')) {
|
||||||
|
define('PHP_EXECUTABLE', '/usr/bin/php');
|
||||||
|
}
|
||||||
|
|
||||||
if (!ENABLE_UPDATE_DAEMON) {
|
if (!ENABLE_UPDATE_DAEMON) {
|
||||||
die("Please enable option ENABLE_UPDATE_DAEMON in config.php\n");
|
die("Please enable option ENABLE_UPDATE_DAEMON in config.php\n");
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user