3 commits

Author	SHA1	Message	Date
MrZYX	1a78c8fca1	whoops lets do a deep merge	2011-05-18 19:22:15 +02:00
MrZYX	e79a6597e6	eliminate config/server.sh; use config/app_config.yml.example as base for configuration, config/app_config.yml is now just an overider. This way we can add new configuration options without checking in the application if it's set and the user has to update his app_config.yml only when he want to change something	2011-05-18 16:11:20 +02:00
MrZYX	00c6631f11	replaced SOCKET_PORT in config/server.sh with the setting from config/app_config.yml; respect single_process_mode setting in app_config.yml in script/server	2011-05-17 16:00:47 +02:00