diff options
| -rw-r--r-- | config.php-dist | 5 | ||||
| -rw-r--r-- | sanity_check.php | 2 | ||||
| -rw-r--r-- | update_daemon.php | 5 |
3 files changed, 9 insertions, 3 deletions
diff --git a/config.php-dist b/config.php-dist index 1694059d5..4bcfc31ba 100644 --- a/config.php-dist +++ b/config.php-dist @@ -184,7 +184,10 @@ // Selectively gzip output to improve wire performance. This requires // 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 // if necessary (after migrating all new options from this file). diff --git a/sanity_check.php b/sanity_check.php index 41fdf983a..383edab4c 100644 --- a/sanity_check.php +++ b/sanity_check.php @@ -1,7 +1,7 @@ <?php require_once "functions.php"; - define('EXPECTED_CONFIG_VERSION', 16); + define('EXPECTED_CONFIG_VERSION', 17); define('SCHEMA_VERSION', 37); if (!file_exists("config.php")) { diff --git a/update_daemon.php b/update_daemon.php index 0e4efd38f..67a8781de 100644 --- a/update_daemon.php +++ b/update_daemon.php @@ -11,7 +11,6 @@ define('MAGPIE_CACHE_DIR', '/var/tmp/magpie-ttrss-cache-daemon'); define('SIMPLEPIE_CACHE_DIR', '/var/tmp/simplepie-ttrss-cache-daemon'); define('DISABLE_SESSIONS', true); - define('PHP_EXECUTABLE', '/usr/bin/php'); require_once "version.php"; @@ -24,6 +23,10 @@ require_once "sanity_check.php"; require_once "config.php"; + if (!defined('PHP_EXECUTABLE')) { + define('PHP_EXECUTABLE', '/usr/bin/php'); + } + if (!ENABLE_UPDATE_DAEMON) { die("Please enable option ENABLE_UPDATE_DAEMON in config.php\n"); } |