move php executable path for old-style daemon to config.php (bump version) (closes...

diff --git a/config.php-dist b/config.php-dist
index 1694059d57765ab73226424150d9f2a96232ff37..4bcfc31bad24c48a21cab9c784d8b5e5bdc0fdbf 100644 (file)
--- 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 41fdf983adc0cb6db5f16499814c3b084a99357d..383edab4cb4eb8bfa83aaf75fd380565e7b27bce 100644 (file)
--- 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 0e4efd38fdede29aa24013f3123fc20f9844a420..67a8781dea697f6a64b0a72301233bd5a617e892 100644 (file)
--- 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");
        }