diff options
| author | Brad Koehn <brad.koehn@target.com> | 2018-02-19 19:17:41 +0300 |
|---|---|---|
| committer | Benjamin Neff <benjamin@coding4coffee.ch> | 2018-02-22 02:45:45 +0300 |
| commit | b80eb01f34115a58a65d44b39df51f499a945f41 (patch) | |
| tree | d71f3a629985aeac01b133a1d136d8346d2fd291 | |
| parent | 3e31b91b1123fcace22736a737e17457372e6092 (diff) | |
piped bin/bundle commands to suppress warnings when run on readonly filesystems
closes #7719
| -rw-r--r-- | Changelog.md | 1 | ||||
| -rwxr-xr-x | script/server | 7 |
2 files changed, 5 insertions, 3 deletions
diff --git a/Changelog.md b/Changelog.md index d10638702..40a66b663 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,7 @@ ## Refactor * 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 diff --git a/script/server b/script/server index 214377694..eb8b92294 100755 --- a/script/server +++ b/script/server @@ -99,7 +99,7 @@ fi # Setup environment if [ -z "$RAILS_ENV" ] 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!" export RAILS_ENV fi @@ -113,7 +113,8 @@ vars=$(bin/bundle exec ruby ./script/get_config.rb \ chat=chat.enabled \ chat_server=chat.server.enabled \ 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!" eval "$vars" @@ -170,7 +171,7 @@ then then redis_param="url: '$redis_url'" 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 fatal "Can't connect to redis. Please check if it's running and if environment.redis is configured correctly in config/diaspora.yml." fi |