From b80eb01f34115a58a65d44b39df51f499a945f41 Mon Sep 17 00:00:00 2001
From: Brad Koehn <brad.koehn@target.com>
Date: Mon, 19 Feb 2018 10:17:41 -0600
Subject: [PATCH] piped bin/bundle commands to suppress warnings when run on
readonly filesystems
closes #7719
---
Changelog.md | 1 +
script/server | 7 ++++---
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/Changelog.md b/Changelog.md
index d10638702e..40a66b6630 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 2143776946..eb8b92294e 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
--
GitLab