|
|
7d0f27e |
diff -ru xcache-3.0.0/htdocs.old/cacher/config.example.php xcache-3.0.0/htdocs/cacher/config.example.php
|
|
|
7d0f27e |
--- xcache-3.0.0/htdocs.old/cacher/config.example.php 2012-08-01 18:49:57.000000000 +0200
|
|
|
7d0f27e |
+++ xcache-3.0.0/htdocs/cacher/config.example.php 2012-10-31 08:35:32.000000000 +0100
|
|
|
7d0f27e |
@@ -5,10 +5,10 @@
|
|
|
7d0f27e |
// 1. copy config.example.php config.php; edit config.php
|
|
|
7d0f27e |
// 2. upgrading your config.php when config.example.php were upgraded
|
|
|
7d0f27e |
// XCache will load
|
|
|
7d0f27e |
-// 1. ../config.default.php
|
|
|
7d0f27e |
-// 2. ./config.default.php
|
|
|
7d0f27e |
-// 3. ../config.php
|
|
|
7d0f27e |
-// 4. ./config.php
|
|
|
7d0f27e |
+// 1. /usr/share/xcache/config.default.php
|
|
|
7d0f27e |
+// 2. /usr/share/xcache/cacher/config.default.php
|
|
|
7d0f27e |
+// 3. /etc/xcache/config.php
|
|
|
7d0f27e |
+// 4. /etc/xcache/cacher/config.php
|
|
|
7d0f27e |
|
|
|
7d0f27e |
// width of graph for free or usage blocks
|
|
|
7d0f27e |
$config['percent_graph_width'] = 120;
|
|
|
7d0f27e |
Seulement dans xcache-3.0.0/htdocs/cacher: config.example.php~
|
|
|
7d0f27e |
diff -ru xcache-3.0.0/htdocs.old/common/common.php xcache-3.0.0/htdocs/common/common.php
|
|
|
7d0f27e |
--- xcache-3.0.0/htdocs.old/common/common.php 2012-08-01 18:49:59.000000000 +0200
|
|
|
7d0f27e |
+++ xcache-3.0.0/htdocs/common/common.php 2012-10-31 08:32:34.000000000 +0100
|
|
|
7d0f27e |
@@ -252,11 +252,13 @@
|
|
|
7d0f27e |
include "./config.default.php";
|
|
|
7d0f27e |
}
|
|
|
7d0f27e |
include "../config.default.php";
|
|
|
7d0f27e |
-if (file_exists("../config.php")) {
|
|
|
7d0f27e |
- include "../config.php";
|
|
|
7d0f27e |
+
|
|
|
7d0f27e |
+$mod=basename(getcwd());
|
|
|
7d0f27e |
+if (file_exists("/etc/xcache/config.php")) {
|
|
|
7d0f27e |
+ include "/etc/xcache/config.php";
|
|
|
7d0f27e |
}
|
|
|
7d0f27e |
-if (file_exists("./config.php")) {
|
|
|
7d0f27e |
- include "./config.php";
|
|
|
7d0f27e |
+if (file_exists("/etc/xcache/$mod/config.php")) {
|
|
|
7d0f27e |
+ include "/etc/xcache/$mod/config.php";
|
|
|
7d0f27e |
}
|
|
|
7d0f27e |
|
|
|
7d0f27e |
$strings = array();
|
|
|
7d0f27e |
diff -ru xcache-3.0.0/htdocs.old/coverager/config.example.php xcache-3.0.0/htdocs/coverager/config.example.php
|
|
|
7d0f27e |
--- xcache-3.0.0/htdocs.old/coverager/config.example.php 2012-10-10 14:01:55.000000000 +0200
|
|
|
7d0f27e |
+++ xcache-3.0.0/htdocs/coverager/config.example.php 2012-10-31 08:35:34.000000000 +0100
|
|
|
7d0f27e |
@@ -5,10 +5,10 @@
|
|
|
7d0f27e |
// 1. copy config.example.php config.php; edit config.php
|
|
|
7d0f27e |
// 2. upgrading your config.php when config.example.php were upgraded
|
|
|
7d0f27e |
// XCache will load
|
|
|
7d0f27e |
-// 1. ../config.default.php
|
|
|
7d0f27e |
-// 2. ./config.default.php
|
|
|
7d0f27e |
-// 3. ../config.php
|
|
|
7d0f27e |
-// 4. ./config.php
|
|
|
7d0f27e |
+// 1. /usr/share/xcache/config.default.php
|
|
|
7d0f27e |
+// 2. /usr/share/xcache/coverager/config.default.php
|
|
|
7d0f27e |
+// 3. /etc/xcache/config.php
|
|
|
7d0f27e |
+// 4. /etc/xcache/coverager/config.php
|
|
|
7d0f27e |
|
|
|
7d0f27e |
// $config['include_paths'] = array("/www/my-php-project/");
|
|
|
7d0f27e |
// $config['exclude_paths'] = array("/www/my-php-project/tmp/");
|
|
|
7d0f27e |
Seulement dans xcache-3.0.0/htdocs/coverager: config.example.php~
|