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

Merge branch 'master' of github.com:diaspora/diaspora

Browse source
This commit is contained in:
maxwell 2010-12-08 14:34:53 -08:00
commit 69f42667b3
2 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkg

@ -1 +1 @@
Subproject commit a667cc50586f884d16e8621531cba9f7e8505f05 Subproject commit bce52315e63b45635c0b64713f9352fad48577ee

12
script/server
View file

@ -70,15 +70,9 @@ function redis_config
fi fi
cp $redis_conf config/redis.conf cp $redis_conf config/redis.conf
case $OS in sed -i -e '/^[^#]*daemonize/s/yes/no/' \
## bsd sed doesn't seem to handle empty in-place edits correctly -e '/^[^#]*logfile/s|.*|logfile /var/log/diaspora/redis.log|' \
*[Bb][Ss][Dd]*|Darwin) config/redis.conf
sed -i '' '/^[^#]*daemonize/s/yes/no/' config/redis.conf
;;
*)
sed -i '/^[^#]*daemonize/s/yes/no/' config/redis.conf
;;
esac
} }
# Scan for -p, find out what port thin is about to use. # Scan for -p, find out what port thin is about to use.