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

Ubuntu 10.10 desktop fixes

Browse source
This commit is contained in:
Alec Leamas 2010-10-13 08:29:24 +02:00
parent c818885b6e
commit e922a3be5c
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkg/ubuntu/diaspora-install-deps
View file

@ -15,7 +15,7 @@ grep -v '^#' /etc/apt/sources.list | grep -q universe || {
sudo apt-get update sudo apt-get update
sudo apt-get install -qy --ignore-missing build-essential libxslt1-dev \ sudo apt-get install -qy --ignore-missing build-essential libxslt1-dev \
libxml2 ruby-full mongodb rake python-software-properties git-core \ libxml2 ruby-full mongodb rake python-software-properties git-core \
imagemagick libmagick9-dev imagemagick libmagick9-dev xulrunner-1.9
sudo add-apt-repository ppa:maco.m/ruby sudo add-apt-repository ppa:maco.m/ruby
sudo apt-get update sudo apt-get update
sudo apt-get install -qy rubygems sudo apt-get install -qy rubygems

16
pkg/ubuntu/diaspora-setup
View file

@ -14,7 +14,9 @@ test -n "$services" && {
echo " $services" echo " $services"
} }
/usr/sbin/service mongodb start || : service mongodb stop || :
rm -f /var/lib/mongodb/mongod.lock
service mongodb start || :
cd /usr/share/diaspora/master cd /usr/share/diaspora/master
@ -26,11 +28,13 @@ if rake db:seed:dev; then
else else
cat <<- EOF cat <<- EOF
Database config failed. You might want to remove all db files with Database config failed. You might want to
'rm -rf /var/lib/mongodb/*' and/or resetting the config file by - Just remove the db lock file: rm /var/lib/mongodb/mongod.lock
'cp config/app_config.yml.example config/app_config.yml' before - Remove all db files: rm -rf /var/lib/mongodb/*
making a new try. Also, make sure the mongodb server is running - Reset the config file by
e. g., using '/sbin/service mongod status'. cp config/app_config.yml.example config/app_config.yml
Also, make sure the mongodb server is running e. g., using
'service mongod status'.
EOF EOF
exit 1 exit 1
fi fi