summaryrefslogtreecommitdiffstats
path: root/application/config
diff options
context:
space:
mode:
Diffstat (limited to 'application/config')
-rw-r--r--application/config/.gitignore2
-rw-r--r--application/config/config.php7
-rw-r--r--application/config/example/memcache.php9
-rw-r--r--application/config/example/memcached.php17
4 files changed, 25 insertions, 10 deletions
diff --git a/application/config/.gitignore b/application/config/.gitignore
index bf68cb2ad..45e1c5158 100644
--- a/application/config/.gitignore
+++ b/application/config/.gitignore
@@ -1,3 +1,3 @@
config-local.php
database.php
-memcache.php
+memcached.php
diff --git a/application/config/config.php b/application/config/config.php
index 3ff8b816b..dda82de97 100644
--- a/application/config/config.php
+++ b/application/config/config.php
@@ -380,6 +380,13 @@ $config['actions_max_age'] = 60*60*24*5; // 5 days
// won't be deleted
$config['small_upload_size'] = 1024*10; // 10KB
+// possible values:
+// - apc: needs the apc module and is only useful on long running php processes
+// - file: you will have to clean up the cache directory yourself (application/cache/)
+// - memcached: config in application/config/memcached.php; you need the memcached module (with the D)
+// - dummy: disables caching
+$config['cache_backend'] = "dummy";
+
// for possible drivers look into ./application/libraries/Duser/drivers/
$config['authentication_driver'] = 'db';
diff --git a/application/config/example/memcache.php b/application/config/example/memcache.php
deleted file mode 100644
index a5bc7e3a8..000000000
--- a/application/config/example/memcache.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-// this file is a config example for the codeigniter-memcache library
-// add this file to the your application's config directory
-$config["MEMCACHE_HOST"] = '127.0.0.1';
-$config["MEMCACHE_PORT"] = 11211;
-
-
-?>
diff --git a/application/config/example/memcached.php b/application/config/example/memcached.php
new file mode 100644
index 000000000..29b145ec8
--- /dev/null
+++ b/application/config/example/memcached.php
@@ -0,0 +1,17 @@
+<?php
+
+$config = array(
+ "default" => array(
+ "hostname" => "127.0.0.1",
+ "port" => 11211,
+ "weight" => 1,
+ ),
+ "socket" => array(
+ "hostname" => FCPATH.'/memcached.sock',
+ "port" => 0,
+ "weight" => 2,
+ ),
+);
+
+
+?>