[mapserver-commits] r12648 - trunk/docs/en/mapcache

[svn at osgeo.org]

Author: tbonfort
Date: 2011-10-08 09:21:41 -0700 (Sat, 08 Oct 2011)
New Revision: 12648

Modified:
   trunk/docs/en/mapcache/index.txt
   trunk/docs/en/mapcache/mapcache_caches.txt
   trunk/docs/en/mapcache/mapcache_install.txt
Log:
add fastcgi instructions, and internal refs


Modified: trunk/docs/en/mapcache/index.txt
===================================================================
--- trunk/docs/en/mapcache/index.txt	2011-10-08 16:05:30 UTC (rev 12647)
+++ trunk/docs/en/mapcache/index.txt	2011-10-08 16:21:41 UTC (rev 12648)
@@ -7,7 +7,7 @@
 :Author: Thomas Bonfort
 :Contact: tbonfort at terriscope.fr
 
-MapCache is an apache module that implements a tile caching solution to speed up
+MapCache is a server that implements tile caching to speed up
 access to WMS layers. The primary objectives are to be fast and easily deployable,
 while offering the essential features (and more!) expected from a tile caching
 solution.
@@ -32,16 +32,11 @@
 * data provided by WMS backends (GDAL supported sources planned)
 * cache types:
   
-  * disk:
-    
-    * by default the same cache structure as TileCache and MapProxy
-    * template based, e.g. /path/to/{tileset}/{z}/{x}/{y}.{ext}
-  * sqlite:
-    
-    * custom sqlite schema
-    * mbtiles
-    * custom sqlite queries (provide your own)
-  * memcached
+  * :ref:`Disk <mapcache_cache_disk>`
+  * :ref:`Sqlite <mapcache_cache_sqlite>`
+  * :ref:`Memcached <mapcache_cache_memcache>`
+  * :ref:`Tiled TIFFs <mapcache_cache_tiff>`
+
 * configurable metatiling
 * on-the-fly tile merging for combining multiple tiles into a single image
 * image post-processing (recompression and quantization) when arriving from a backend

Modified: trunk/docs/en/mapcache/mapcache_caches.txt
===================================================================
--- trunk/docs/en/mapcache/mapcache_caches.txt	2011-10-08 16:05:30 UTC (rev 12647)
+++ trunk/docs/en/mapcache/mapcache_caches.txt	2011-10-08 16:21:41 UTC (rev 12648)
@@ -9,6 +9,8 @@
 
 This document details the different cache backends that can be used to store tiles
 
+.. _mapcache_cache_disk:
+
 Disk Caches
 --------------------------------------------------------------------------------
 
@@ -87,6 +89,8 @@
    </cache>
 
 
+.. _mapcache_cache_sqlite:
+
 Sqlite Caches
 --------------------------------------------------------------------------------
 
@@ -161,6 +165,8 @@
    </cache>
 
 
+.. _mapcache_cache_memcache:
+
 Memcache Caches
 --------------------------------------------------------------------------------
 
@@ -187,6 +193,8 @@
    </cache>
 
 
+.. _mapcache_cache_tiff:
+
 TIFF Caches
 --------------------------------------------------------------------------------
 

Modified: trunk/docs/en/mapcache/mapcache_install.txt
===================================================================
--- trunk/docs/en/mapcache/mapcache_install.txt	2011-10-08 16:05:30 UTC (rev 12647)
+++ trunk/docs/en/mapcache/mapcache_install.txt	2011-10-08 16:21:41 UTC (rev 12648)
@@ -51,12 +51,19 @@
 
   $ ./configure
   $ make
+
+Apache Module Specific Instructions
+================================================================================
+
+.. code-block:: bash
+
   $ sudo make install-module
 
 The installation script takes care of putting the built module in the apache
 module directory.  The process for activating a module is usually distro
 specific, but can be resumed by the following snippet that should be present in
-the apache configuration file(s):
+the apache configuration file ( e.g. /usr/local/httpd/conf/httpd.conf or
+/etc/apache2/sites-available/default ):
 
 .. code-block:: apache
 
@@ -84,7 +91,37 @@
 If you have not disabled the demo service, you should now have access to it on
 http://myserver/mapcache/demo
 
+CGI/FastCGI Specific Instructions
+================================================================================
 
+A binary cgi/fastcgi is located in the src/ subfolder, and is named "mapcache".
+Activating fastcgi for the mapcache program on your web server is not part of
+these instructions, more details may be found on the :ref:`FastCGI <fastcgi>`
+page or on more general web pages across the web.
+
+The MapCache fastcgi program looks for it's configuration file in the environment
+variable called MAPCACHE_CONFIG_FILE, which must be set by the web server before
+spawning the mapcache processes.
+
+
+For apache with mod_cgi:
+
+
+.. code-block:: apache
+
+   SetEnv "MAPCACHE_CONFIG_FILE" "/path/to/mapserver/mapcache/mapcache.xml"
+
+For apache with mod_fcgid:
+
+.. code-block:: apache
+
+   FcgidInitialEnv "MAPCACHE_CONFIG_FILE" "/path/to/mapserver/mapcache/mapcache.xml
+
+If you have not disabled the demo service, you should now have access to it on
+http://myserver/fcgi-bin/mapcache/demo supposing your fcgi processes are accessed
+under the fcgi-bin alias.
+
+
 Customizing the build, or if something went wrong
 -------------------------------------------------