nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

piped bin/bundle commands to suppress warnings when run on readonly filesystems

Browse source 
closes #7719
This commit is contained in:
Brad Koehn 2018-02-19 10:17:41 -06:00 committed by Benjamin Neff
parent 3e31b91b11
commit b80eb01f34
No known key found for this signature in database
GPG key ID: 971464C3F1A90194
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -2,6 +2,7 @@
## Refactor ## Refactor
* Don't print a warning when starting the server outside a Git repo [#7712](https://github.com/diaspora/diaspora/pull/7712) * Don't print a warning when starting the server outside a Git repo [#7712](https://github.com/diaspora/diaspora/pull/7712)
* Make script/server work on readonly filesystems [#7719](https://github.com/diaspora/diaspora/pull/7719)
## Bug fixes ## Bug fixes

7
script/server
View file

@ -99,7 +99,7 @@ fi
# Setup environment # Setup environment
if [ -z "$RAILS_ENV" ] if [ -z "$RAILS_ENV" ]
then then
RAILS_ENV=$(bin/bundle exec ruby ./script/get_config.rb server.rails_environment) RAILS_ENV=$(bin/bundle exec ruby ./script/get_config.rb server.rails_environment | grep -vE "is not writable|as your home directory temporarily" )
on_failure "Couldn't parse config/diaspora.yml!" on_failure "Couldn't parse config/diaspora.yml!"
export RAILS_ENV export RAILS_ENV
fi fi
@ -113,7 +113,8 @@ vars=$(bin/bundle exec ruby ./script/get_config.rb \
chat=chat.enabled \ chat=chat.enabled \
chat_server=chat.server.enabled \ chat_server=chat.server.enabled \
chat_bosh_proxy=chat.server.bosh.proxy \ chat_bosh_proxy=chat.server.bosh.proxy \
redis_url=environment.redis redis_url=environment.redis \
| grep -vE "is not writable|as your home directory temporarily"
) )
on_failure "Couldn't parse config/diaspora.yml!" on_failure "Couldn't parse config/diaspora.yml!"
eval "$vars" eval "$vars"
@ -170,7 +171,7 @@ then
then then
redis_param="url: '$redis_url'" redis_param="url: '$redis_url'"
fi fi
if [ "$(bin/bundle exec ruby -e "require 'redis'; puts Redis.new($redis_param).ping" 2> /dev/null)" != "PONG" ] if [ "$(bin/bundle exec ruby -e "require 'redis'; puts Redis.new($redis_param).ping" 2> /dev/null | grep -vE "is not writable|as your home directory temporarily" )" != "PONG" ]
then then
fatal "Can't connect to redis. Please check if it's running and if environment.redis is configured correctly in config/diaspora.yml." fatal "Can't connect to redis. Please check if it's running and if environment.redis is configured correctly in config/diaspora.yml."
fi fi