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

comment out init_public in script server for now as it's buggy and confuses users

Browse source
This commit is contained in:
MrZYX 2011-03-26 17:57:13 +01:00
parent 92d6b618aa
commit 867a5e143f
1 changed files with 22 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
script/server
View file

@ -101,14 +101,14 @@ done
# Is someone listening on the ports already? (ipv4 only test ?) # Is someone listening on the ports already? (ipv4 only test ?)
services=$( chk_service $THIN_PORT ) services=$( chk_service $THIN_PORT )
if [ -n "$services" ]; then if [ -n "$services" ]; then
echo "Error: thin port $THIN_PORT is already in use. Exiting" >&2 echo "FATAL: Error: thin port $THIN_PORT is already in use. Exiting" >&2
echo " $services" echo " $services"
exit 64 exit 64
fi fi
services=$( chk_service $SOCKET_PORT ) services=$( chk_service $SOCKET_PORT )
if [ -n "$services" ]; then if [ -n "$services" ]; then
echo "Error: websocket port $SOCKET_PORT is already in use. Exiting" >&2 echo "FATAL: Error: websocket port $SOCKET_PORT is already in use. Exiting" >&2
echo " $services" echo " $services"
exit 64 exit 64
fi fi
@ -116,7 +116,7 @@ fi
# See http://bugs.joindiaspora.com/issues/722 # See http://bugs.joindiaspora.com/issues/722
services=$( chk_service 5379 ) services=$( chk_service 5379 )
if [ -n "$services" ]; then if [ -n "$services" ]; then
echo "Error: Someone (another redis server?) is using redis port 5379" >&2 echo "FATAL: Error: Someone (another redis server?) is using redis port 5379" >&2
echo " $services" echo " $services"
exit 64 exit 64
fi fi
@ -131,36 +131,43 @@ if [ -w public -a ! -e public/source.tar.gz ]; then
tar czf public/source.tar.gz `git ls-tree -r $branch | awk '{print $4}'` tar czf public/source.tar.gz `git ls-tree -r $branch | awk '{print $4}'`
fi fi
if [ ! -e public/source.tar.gz ]; then if [ ! -e public/source.tar.gz ]; then
echo "Error: Can't find, or even create, public/source.tar.gz. Exiting" >&2 echo "FATAL: Error: Can't find, or even create, public/source.tar.gz. Exiting" >&2
exit 65 exit 65
fi fi
# Check if config files exists # Check if config files exists
if [ ! -e 'config/app_config.yml' ]; then if [ ! -e 'config/app_config.yml' ]; then
echo "config/app_config.yml is missing! Copy over config/app_config.yml.example to config/app_config.yml and edit it properly!" >&2 echo "FATAL: config/app_config.yml is missing! Copy over config/app_config.yml.example to config/app_config.yml and edit it properly!" >&2
exit 67 exit 67
fi fi
if [ ! -e 'config/database.yml' ]; then if [ ! -e 'config/database.yml' ]; then
echo 'config/database.yml is missing! Copy over config/database.yml.example to config/database.yml and edit it properly!' >&2 echo 'FATAL: config/database.yml is missing! Copy over config/database.yml.example to config/database.yml and edit it properly!' >&2
exit 68 exit 68
fi fi
# Precache jammit assets # Precache jammit assets
if [[ -w public && ! -e 'public/stylesheets/application.css' ]]; then #if [[ -w public && ! -e 'public/stylesheets/application.css' ]]; then
if [ "$INIT_PUBLIC" != 'no' ]; then # if [ "$INIT_PUBLIC" != 'no' ]; then
echo "Making first-time server initialization." # echo "Making first-time server initialization."
init_public # init_public
# fi
#fi
#if [ ! -e 'public/stylesheets/application.css' ]; then
# echo 'WARNING: Jammit precache error (now or at install)' >&2
#fi
if [ ! -e 'public/assets/default.css']; then
if ["$RAILS_ENV" == 'production']; then
echo "INFO: If you want further performance improvements," >&2
echo "after the first request to the page after each git pull, run:" >&2
echo "bundle exec jammit" >&2
fi fi
fi fi
if [ ! -e 'public/stylesheets/application.css' ]; then
echo 'Jammit precache error (now or at install)' >&2
fi
mkdir -p -v log/thin/ mkdir -p -v log/thin/
bundle exec ruby ./script/websocket_server.rb& bundle exec ruby ./script/websocket_server.rb&
redis-server config/redis.conf &>log/redis-console.log & redis-server config/redis.conf &>log/redis-console.log &