--- a/development.ini	Wed Jul 02 19:08:38 2014 -0400
+++ b/development.ini	Wed Jul 02 19:08:38 2014 -0400
@@ -1,13 +1,20 @@
 ################################################################################
 ################################################################################
-# Kallithea - Pylons environment configuration                                 #
+# Kallithea - Development config:                                              #
+# listening on *:5000                                                          #
+# sqlite and kallithea.db                                                      #
+# initial_repo_scan = true                                                     #
+# set debug = true                                                             #
+# verbose and colorful logging                                                 #
 #                                                                              #
 # The %(here)s variable will be replaced with the parent directory of this file#
 ################################################################################
+################################################################################
 
 [DEFAULT]
 debug = true
 pdebug = false
+
 ################################################################################
 ## Uncomment and replace with the address which should receive                ##
 ## any error reports after application crash                                  ##
@@ -58,7 +65,7 @@
 ## type of worker class, one of sync, eventlet, gevent, tornado
 ## recommended for bigger setup is using of of other than sync one
 #worker_class = sync
-#max_requests = 5
+#max_requests = 1000
 ## ammount of time a worker can handle request before it gets killed and
 ## restarted
 #timeout = 3600
@@ -68,7 +75,7 @@
 #[uwsgi]
 #socket = /tmp/uwsgi.sock
 #master = true
-#http = 0.0.0.0:5000
+#http = 127.0.0.1:5000
 
 ## set as deamon and redirect all output to file
 #daemonize = ./uwsgi_kallithea.log
@@ -139,21 +146,22 @@
 
 full_stack = true
 static_files = true
-## Optional Languages
-## en, fr, ja, pt_BR, zh_CN, zh_TW, pl
+## Available Languages:
+## de en fr ja pl pt_BR ru zh_CN zh_TW
 lang = en
 cache_dir = %(here)s/data
 index_dir = %(here)s/data/index
 
 ## perform a full repository scan on each server start, this should be
 ## set to false after first startup, to allow faster server restarts.
+#initial_repo_scan = false
 initial_repo_scan = true
 
 ## uncomment and set this path to use archive download cache
-#archive_cache_dir = /tmp/tarballcache
+archive_cache_dir = %(here)s/tarballcache
 
 ## change this to unique ID for security
-app_instance_uuid = rc-production
+app_instance_uuid = development-not-secret
 
 ## cut off limit for large diffs (size in bytes)
 cut_off_limit = 256000
@@ -178,7 +186,7 @@
 
 ## git rev filter option, --all is the default filter, if you need to
 ## hide all refs in changelog switch this to --branches --tags
-git_rev_filter=--all
+#git_rev_filter = --branches --tags
 
 ## RSS feed options
 rss_cut_off_limit = 256000
@@ -200,7 +208,7 @@
 ## api access to raw_files put `FilesController:raw`, to enable access to patches
 ## add `ChangesetController:changeset_patch`. This list should be "," separated
 ## Syntax is <ControllerClass>:<function>. Check debug logs for generated names
-## Recommended settings bellow are commented out:
+## Recommended settings below are commented out:
 api_access_controllers_whitelist =
 #    ChangesetController:changeset_patch,
 #    ChangesetController:changeset_raw,
@@ -262,7 +270,7 @@
 ## issue_pat, issue_server_link, issue_prefix can have suffixes to specify
 ## multiple patterns, to other issues server, wiki or others
 ## below an example how to create a wiki pattern
-#  #wiki-some-id -> https://mywiki.com/some-id
+# wiki-some-id -> https://mywiki.com/some-id
 
 #issue_pat_wiki = (?:wiki-)(.+)
 #issue_server_link_wiki = https://mywiki.com/{id}
@@ -294,6 +302,7 @@
 ####################################
 ###        CELERY CONFIG        ####
 ####################################
+
 use_celery = false
 broker.host = localhost
 broker.vhost = rabbitmqhost
@@ -321,6 +330,7 @@
 ####################################
 ###         BEAKER CACHE        ####
 ####################################
+
 beaker.cache.data_dir=%(here)s/data/cache/data
 beaker.cache.lock_dir=%(here)s/data/cache/lock
 
@@ -370,7 +380,7 @@
 #beaker.session.type = file
 
 beaker.session.key = kallithea
-beaker.session.secret = develop-rc-uytcxaz
+beaker.session.secret = development-not-secret
 
 ## Secure encrypted cookie. Requires AES and AES python libraries
 ## you must disable beaker.session.secret to use this
@@ -479,10 +489,12 @@
 ## execute malicious code after an exception is raised.                       ##
 ################################################################################
 #set debug = false
+set debug = true
 
 ##################################
 ###       LOGVIEW CONFIG       ###
 ##################################
+
 logview.sqlalchemy = #faa
 logview.pylons.templating = #bfb
 logview.pylons.util = #eee
@@ -490,9 +502,18 @@
 #########################################################
 ### DB CONFIGS - EACH DB WILL HAVE IT'S OWN CONFIG    ###
 #########################################################
-#sqlalchemy.db1.url = sqlite:///%(here)s/kallithea.db?timeout=30
-sqlalchemy.db1.url = postgresql://postgres:qweqwe@localhost/kallithea
-#sqlalchemy.db1.url = mysql://root:qweqwe@localhost/kallithea
+
+# SQLITE [default]
+sqlalchemy.db1.url = sqlite:///%(here)s/kallithea.db?timeout=60
+
+# POSTGRESQL
+# sqlalchemy.db1.url = postgresql://user:pass@localhost/kallithea
+
+# MySQL
+# sqlalchemy.db1.url = mysql://user:pass@localhost/kallithea
+
+# see sqlalchemy docs for others
+
 sqlalchemy.db1.echo = false
 sqlalchemy.db1.pool_recycle = 3600
 sqlalchemy.db1.convert_unicode = true
@@ -500,6 +521,7 @@
 ################################
 ### LOGGING CONFIGURATION   ####
 ################################
+
 [loggers]
 keys = root, routes, kallithea, sqlalchemy, beaker, templates, whoosh_indexer
 
@@ -512,6 +534,7 @@
 #############
 ## LOGGERS ##
 #############
+
 [logger_root]
 level = NOTSET
 handlers = console
@@ -560,12 +583,16 @@
 [handler_console]
 class = StreamHandler
 args = (sys.stderr,)
+#level = INFO
+#formatter = generic
 level = DEBUG
 formatter = color_formatter
 
 [handler_console_sql]
 class = StreamHandler
 args = (sys.stderr,)
+#level = WARN
+#formatter = generic
 level = DEBUG
 formatter = color_formatter_sql