Remove automatic setting of the DB variable from script/server
* It's broken for those that would benefit from it (postgres users) * It's broken in the design: Reading it from the config requires bundle exec ruby, which requires it being set properly
This commit is contained in:
parent
0cdfc7cfbd
commit
58e8df4455
3 changed files with 1 additions and 8 deletions
|
|
@ -36,7 +36,6 @@ defaults:
|
|||
rails_environment: 'development'
|
||||
stderr_log:
|
||||
stdout_log:
|
||||
database: 'mysql'
|
||||
unicorn_worker: 2
|
||||
unicorn_timeout: 90
|
||||
embed_sidekiq_worker: false
|
||||
|
|
|
|||
|
|
@ -148,10 +148,6 @@ configuration: ## Section
|
|||
#stderr_log: '/usr/local/app/diaspora/log/unicorn-stderr.log'
|
||||
#stdout_log: '/usr/local/app/diaspora/log/unicorn-stdout.log'
|
||||
|
||||
## The database type the server should use by default.
|
||||
## Valid choices are 'mysql' and 'postgres'
|
||||
#database: 'mysql'
|
||||
|
||||
## Number of Unicorn worker processes, increase this if
|
||||
## you have many users
|
||||
#unicorn_worker: 2
|
||||
|
|
|
|||
|
|
@ -73,7 +73,6 @@ fi
|
|||
os=$(uname -s)
|
||||
vars=$(bundle exec ruby ./script/get_config.rb \
|
||||
port=server.port \
|
||||
db=server.database \
|
||||
single_process_mode=environment.single_process_mode? \
|
||||
embed_sidekiq_worker=server.embed_sidekiq_worker \
|
||||
workers=server.sidekiq_workers
|
||||
|
|
@ -81,9 +80,8 @@ vars=$(bundle exec ruby ./script/get_config.rb \
|
|||
on_failure "Couldn't parse config/diaspora.yml!"
|
||||
eval "$vars"
|
||||
|
||||
if [ -z "$DB" ]
|
||||
if [ -n "$DB" ]
|
||||
then
|
||||
DB=$db
|
||||
export DB
|
||||
fi
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue