16 files changed, 21 insertions, 2 deletions
diff --git a/application/config/.gitignore b/application/config/.gitignore
index cde8069e1..bf68cb2ad 100644
--- a/application/config/.gitignore
+++ b/application/config/.gitignore
@@ -1 +1,3 @@
-*.php
+config-local.php
+database.php
+memcache.php
diff --git a/application/config/example/autoload.php b/application/config/autoload.php
index a471f3ab2..a471f3ab2 100755..100644
--- a/application/config/example/autoload.php
+++ b/application/config/autoload.php
diff --git a/application/config/example/config.php b/application/config/config.php
index 000af65fc..3ffc367ca 100755..100644
--- a/application/config/example/config.php
+++ b/application/config/config.php
@@ -224,7 +224,7 @@ $config['cache_path'] = '';
 | MUST set an encryption key.  See the user guide for info.
 |
 */
-$config['encryption_key'] = ''; # set this to a 32char random string
+$config['encryption_key'] = '';
 
 /*
 |--------------------------------------------------------------------------
@@ -382,5 +382,9 @@ $config['small_upload_size'] = 1024*10; // 10KB
 
 $config['contact_me_url'] = ''; // ommiting this will remove the "contact me" line.
 
+if (file_exists(FCPATH.'application/config/config-local.php')) {
+        include FCPATH.'application/config/config-local.php';
+}
+
 /* End of file config.php */
 /* Location: ./application/config/config.php */
diff --git a/application/config/example/constants.php b/application/config/constants.php
index 1185dbca0..1185dbca0 100755..100644
--- a/application/config/example/constants.php
+++ b/application/config/constants.php
diff --git a/application/config/example/doctypes.php b/application/config/doctypes.php
index f7e1d19a2..f7e1d19a2 100755..100644
--- a/application/config/example/doctypes.php
+++ b/application/config/doctypes.php
diff --git a/application/config/example/config-local.php b/application/config/example/config-local.php
new file mode 100644
index 000000000..d092d4206
--- /dev/null
+++ b/application/config/example/config-local.php
@@ -0,0 +1,13 @@
+<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+
+/*
+ * Use this file to override any settings from config.php
+ */
+
+// set this to a 32char random string
+$config['encryption_key'] = '';
+
+// shouldn't be served by the webserver
+$config['upload_path'] = FCPATH.'data/uploads';
+
+$config['contact_me_url'] = '';
diff --git a/application/config/example/database.php b/application/config/example/database.php
index 51b666b38..51b666b38 100755..100644
--- a/application/config/example/database.php
+++ b/application/config/example/database.php
diff --git a/application/config/example/index.html b/application/config/example/index.html
index c942a79ce..c942a79ce 100755..100644
--- a/application/config/example/index.html
+++ b/application/config/example/index.html
diff --git a/application/config/example/foreign_chars.php b/application/config/foreign_chars.php
index 14b0d7373..14b0d7373 100755..100644
--- a/application/config/example/foreign_chars.php
+++ b/application/config/foreign_chars.php
diff --git a/application/config/example/hooks.php b/application/config/hooks.php
index a4ad2be6d..a4ad2be6d 100755..100644
--- a/application/config/example/hooks.php
+++ b/application/config/hooks.php
diff --git a/application/config/index.html b/application/config/index.html
index c942a79ce..c942a79ce 100755..100644
--- a/application/config/index.html
+++ b/application/config/index.html
diff --git a/application/config/example/mimes.php b/application/config/mimes.php
index 100f7d442..100f7d442 100755..100644
--- a/application/config/example/mimes.php
+++ b/application/config/mimes.php
diff --git a/application/config/example/profiler.php b/application/config/profiler.php
index f8a5b1a1e..f8a5b1a1e 100755..100644
--- a/application/config/example/profiler.php
+++ b/application/config/profiler.php
diff --git a/application/config/example/routes.php b/application/config/routes.php
index 3ae891bfd..3ae891bfd 100755..100644
--- a/application/config/example/routes.php
+++ b/application/config/routes.php
diff --git a/application/config/example/smileys.php b/application/config/smileys.php
index 25d28b2c4..25d28b2c4 100755..100644
--- a/application/config/example/smileys.php
+++ b/application/config/smileys.php
diff --git a/application/config/example/user_agents.php b/application/config/user_agents.php
index e2d3c3af0..e2d3c3af0 100755..100644
--- a/application/config/example/user_agents.php
+++ b/application/config/user_agents.php