Merge branch 'master' of github.com:diaspora/diaspora

config/script_server_config.yml.example

@@ -1,4 +1,7 @@
 script_server:
+  # Choose database. Currently supported: mysql, postgres
+  db: "mysql"
+
   # Enable thin as application server
   enable_thin: true
 

script/server

@@ -9,6 +9,7 @@ OS=`uname -s`
 
 
 export RAILS_ENV=$(./script/get_config.rb rails_env script_server)
+export DB=$(.script/get_config.rb db script_server)
 THIN_PORT=$(./script/get_config.rb thin_port script_server)
 eval "DEFAULT_THIN_ARGS=\"$(./script/get_config.rb default_thin_args script_server)\""
 SOCKET_PORT=$(./script/get_config.rb socket_port $RAILS_ENV)