From bb853ec32133da0147618382c031cd09e4512c50 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sun, 8 Jul 2012 13:10:08 +0100
Subject: added farms to the core

* extracted most farm code into inc/farm.php
* by default farm.php is nowhere included
* added preload.php.dist as an example farm setup
* farm.php can be included in preload.php to activate farming
---
 inc/preload.php.dist | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 inc/preload.php.dist

(limited to 'inc/preload.php.dist')

diff --git a/inc/preload.php.dist b/inc/preload.php.dist
new file mode 100644
index 000000000..f4eab2dae
--- /dev/null
+++ b/inc/preload.php.dist
@@ -0,0 +1,17 @@
+<?php
+/**
+ * This is an example for a farm setup. Simply copy this file to preload.php and
+ * uncomment what you need. See http://dokuwiki.org/farms for more information.
+ * You can also use preload.php for other things than farming, e.g. for moving
+ * local configuration files out of the main ./conf directory.
+ */
+
+// set this to your farm directory
+//if(!defined('DOKU_FARMDIR')) define('DOKU_FARMDIR', '/var/www/farm');
+
+// include this after DOKU_FARMDIR if you want to use farms
+//include(fullpath(dirname(__FILE__)).'/farm.php');
+
+// you can overwrite the $config_cascade to your liking
+//$config_cascade = array(
+//);
-- 
cgit v1.2.3


From d22be2c028a00f1d2117588941c27cfe49dd9ee2 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sun, 8 Jul 2012 15:14:53 +0100
Subject: improved comments, added link to farm.php

---
 inc/preload.php.dist | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'inc/preload.php.dist')

diff --git a/inc/preload.php.dist b/inc/preload.php.dist
index f4eab2dae..7acda0e3d 100644
--- a/inc/preload.php.dist
+++ b/inc/preload.php.dist
@@ -1,7 +1,7 @@
 <?php
 /**
  * This is an example for a farm setup. Simply copy this file to preload.php and
- * uncomment what you need. See http://dokuwiki.org/farms for more information.
+ * uncomment what you need. See http://www.dokuwiki.org/farms for more information.
  * You can also use preload.php for other things than farming, e.g. for moving
  * local configuration files out of the main ./conf directory.
  */
-- 
cgit v1.2.3