Merge branch 'master' of github.com:diaspora/diaspora
This commit is contained in:
ilya
commit
c00a70dde1
21 changed files with 505 additions and 52 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -17,6 +17,7 @@ nbproject
|
||||||
gpg/diaspora-development/*.gpg
|
gpg/diaspora-development/*.gpg
|
||||||
gpg/diaspora-production/*.gpg
|
gpg/diaspora-production/*.gpg
|
||||||
gpg/*/random_seed
|
gpg/*/random_seed
|
||||||
|
patches-*
|
||||||
public/uploads/*
|
public/uploads/*
|
||||||
public/source.tar
|
public/source.tar
|
||||||
tmp/**/*
|
tmp/**/*
|
||||||
|
|
|
||||||
4
Gemfile
4
Gemfile
|
|
@ -8,7 +8,7 @@ gem 'devise', '1.1.3'
|
||||||
gem 'devise-mongo_mapper', :git => 'git://github.com/collectiveidea/devise-mongo_mapper'
|
gem 'devise-mongo_mapper', :git => 'git://github.com/collectiveidea/devise-mongo_mapper'
|
||||||
gem 'devise_invitable', '~> 0.3.4'
|
gem 'devise_invitable', '~> 0.3.4'
|
||||||
#Mongo
|
#Mongo
|
||||||
gem 'mongo_mapper', :branch => 'rails3', :git => 'http://github.com/jnunemaker/mongomapper.git'
|
gem 'mongo_mapper', :branch => 'rails3', :git => 'git://github.com/jnunemaker/mongomapper.git'
|
||||||
gem 'bson_ext', '1.1'
|
gem 'bson_ext', '1.1'
|
||||||
gem 'bson', '1.1'
|
gem 'bson', '1.1'
|
||||||
|
|
||||||
|
|
@ -32,7 +32,7 @@ gem 'thin'
|
||||||
|
|
||||||
#Websocket
|
#Websocket
|
||||||
gem 'em-websocket'
|
gem 'em-websocket'
|
||||||
gem 'magent', :git => 'http://github.com/dcu/magent.git'
|
gem 'magent', :git => 'git://github.com/dcu/magent.git'
|
||||||
|
|
||||||
#File uploading
|
#File uploading
|
||||||
gem 'carrierwave', :git => 'git://github.com/rsofaer/carrierwave.git' , :branch => 'master' #Untested mongomapper branch
|
gem 'carrierwave', :git => 'git://github.com/rsofaer/carrierwave.git' , :branch => 'master' #Untested mongomapper branch
|
||||||
|
|
|
||||||
38
Gemfile.lock
38
Gemfile.lock
|
|
@ -13,6 +13,15 @@ GIT
|
||||||
devise-mongo_mapper (0.0.1)
|
devise-mongo_mapper (0.0.1)
|
||||||
devise (~> 1.1.0)
|
devise (~> 1.1.0)
|
||||||
|
|
||||||
|
GIT
|
||||||
|
remote: git://github.com/dcu/magent.git
|
||||||
|
revision: fe08cc6e9d4c1772035f84bcfb665d17b00ac625
|
||||||
|
specs:
|
||||||
|
magent (1.0.0)
|
||||||
|
em-websocket
|
||||||
|
mongo
|
||||||
|
uuidtools
|
||||||
|
|
||||||
GIT
|
GIT
|
||||||
remote: git://github.com/igrigorik/em-http-request.git
|
remote: git://github.com/igrigorik/em-http-request.git
|
||||||
revision: bf62d67fc72d6e701be5037e239dd470194b8e45
|
revision: bf62d67fc72d6e701be5037e239dd470194b8e45
|
||||||
|
|
@ -22,6 +31,16 @@ GIT
|
||||||
addressable (>= 2.0.0)
|
addressable (>= 2.0.0)
|
||||||
eventmachine (>= 0.12.9)
|
eventmachine (>= 0.12.9)
|
||||||
|
|
||||||
|
GIT
|
||||||
|
remote: git://github.com/jnunemaker/mongomapper.git
|
||||||
|
revision: fd59b0ab068be7321f8e84b9dc12fb4fa6b8535d
|
||||||
|
branch: rails3
|
||||||
|
specs:
|
||||||
|
mongo_mapper (0.8.4)
|
||||||
|
activemodel (~> 3.0.0)
|
||||||
|
activesupport (~> 3.0.0)
|
||||||
|
plucky (~> 0.3.6)
|
||||||
|
|
||||||
GIT
|
GIT
|
||||||
remote: git://github.com/rsofaer/carrierwave.git
|
remote: git://github.com/rsofaer/carrierwave.git
|
||||||
revision: 9edb8bdddd2236742a85bfd7b260387498d01f88
|
revision: 9edb8bdddd2236742a85bfd7b260387498d01f88
|
||||||
|
|
@ -47,25 +66,6 @@ GIT
|
||||||
capistrano (>= 2.5.5)
|
capistrano (>= 2.5.5)
|
||||||
highline (>= 1.4.0)
|
highline (>= 1.4.0)
|
||||||
|
|
||||||
GIT
|
|
||||||
remote: http://github.com/dcu/magent.git
|
|
||||||
revision: 5d664351b305141158fc69fc495456414821adb3
|
|
||||||
specs:
|
|
||||||
magent (1.0.0)
|
|
||||||
em-websocket
|
|
||||||
mongo
|
|
||||||
uuidtools
|
|
||||||
|
|
||||||
GIT
|
|
||||||
remote: http://github.com/jnunemaker/mongomapper.git
|
|
||||||
revision: fd59b0ab068be7321f8e84b9dc12fb4fa6b8535d
|
|
||||||
branch: rails3
|
|
||||||
specs:
|
|
||||||
mongo_mapper (0.8.4)
|
|
||||||
activemodel (~> 3.0.0)
|
|
||||||
activesupport (~> 3.0.0)
|
|
||||||
plucky (~> 0.3.6)
|
|
||||||
|
|
||||||
GEM
|
GEM
|
||||||
remote: http://rubygems.org/
|
remote: http://rubygems.org/
|
||||||
specs:
|
specs:
|
||||||
|
|
|
||||||
38
README.md
38
README.md
|
|
@ -3,37 +3,39 @@
|
||||||
The privacy aware, personally controlled, do-it-all, open source social
|
The privacy aware, personally controlled, do-it-all, open source social
|
||||||
network.
|
network.
|
||||||
|
|
||||||
**DISCLAIMER: THIS IS PRE-ALPHA SOFTWARE AND SHOULD BE TREATED ACCORDINGLY.**
|
**THIS IS PRE-ALPHA SOFTWARE AND SHOULD BE TREATED ACCORDINGLY.**
|
||||||
**PLEASE, DO NOT RUN IN PRODUCTION. IT IS FUN TO GET RUNNING, BUT EXPECT THINGS
|
**PLEASE, DO NOT RUN IN PRODUCTION. IT IS FUN TO GET RUNNING, BUT EXPECT THINGS
|
||||||
TO BE BROKEN**
|
TO BE BROKEN**
|
||||||
|
|
||||||
Initial installation instructions are [here](http://github.com/diaspora/diaspora/wiki/Installing-and-Running-Diaspora).
|
Installation instructions are [here](http://github.com/diaspora/diaspora/wiki/Installing-and-Running-Diaspora).
|
||||||
|
|
||||||
We are continuing to build features and improve the code base.
|
Please report any bugs you see. Issue tracking is at [bugs.joindiaspora.com](http://bugs.joindiaspora.com).
|
||||||
When we think it is ready for general use, we will post more final
|
|
||||||
instructions. Issue tracking is at [bugs.joindiaspora.com](bugs.joindiaspora.com).
|
|
||||||
|
|
||||||
## Commit Guidelines
|
## Contributing to Diaspora
|
||||||
|
|
||||||
You are welcome to contribute, add to and extend Diaspora however you see fit. We
|
You can find an introduction to the source code [here](http://github.com/diaspora/diaspora/wiki/An-Introduction-to-the-Diaspora-Source).
|
||||||
will do our best to incorporate everything that meets our guidelines.
|
Bugs and pending features are on our [issue tracker](http://bugs.joindiaspora.com). Here are a few good places to start:
|
||||||
|
|
||||||
You can find an introduction to the source code [here](http://github.com/diaspora/diaspora/wiki/An-Introduction-to-the-Diaspora-Source). For an idea of where to start, look at our [issue tracker](bugs.joindiaspora.com).
|
- Run "rake spec" to run our [Rspec](http://blog.davidchelimsky.net/2007/05/14/an-introduction-to-rspec-part-i/)
|
||||||
|
unit test suite. Take a look at the pending specs, make one pass!
|
||||||
|
|
||||||
Make a topic branch. By making your changes in a topic branch, you ensure that new commits to your master are not included in the pull request, and it's easier for us to merge your commits.
|
- Run "rake cucumber" to run our [Cucumber](http://rubylearning.com/blog/2010/10/05/outside-in-development/)
|
||||||
|
integration test suite. As you can see, we need more integration tests. Pick a feature and write one!
|
||||||
|
|
||||||
|
- Take a look at the [issue tracker](http://bugs.joindiaspora.com) and pick a bug.
|
||||||
|
Write a spec for it, so it's easy for another developer to fix it.
|
||||||
|
|
||||||
|
Patches must be tested, and all your tests should be green,
|
||||||
|
unless you're marking an existing bug, before a pull request is sent.
|
||||||
|
Unit tests should be in Rspec, and integration tests should be in Cucumber.
|
||||||
|
|
||||||
|
Please make your changes in a branch to ensure that new commits to your master are
|
||||||
|
not included in the pull request, and to make it easier for us to merge your commits.
|
||||||
|
|
||||||
Please do not rebase our tree into yours.
|
Please do not rebase our tree into yours.
|
||||||
See [here](http://www.mail-archive.com/dri-devel@lists.sourceforge.net/msg39091.html)
|
See [here](http://www.mail-archive.com/dri-devel@lists.sourceforge.net/msg39091.html)
|
||||||
for when to rebase.
|
for when to rebase.
|
||||||
|
|
||||||
Patches must be tested, and all your tests should be green
|
|
||||||
before a pull request is sent. Please write your tests in Rspec.
|
|
||||||
|
|
||||||
GEMS: We would like to keep external dependencies unduplicated. We're using
|
|
||||||
Nokogiri, Mongomapper, and EM::HttpRequest as much as possible. We have a few
|
|
||||||
gems in the project we'd rather not use, but if you can, use dependencies we
|
|
||||||
already have.
|
|
||||||
|
|
||||||
We need you to fill out a
|
We need you to fill out a
|
||||||
[contributor agreement form](https://spreadsheets.google.com/a/joindiaspora.com/viewform?formkey=dGI2cHA3ZnNHLTJvbm10LUhXRTJjR0E6MQ&theme=0AX42CRMsmRFbUy1iOGYwN2U2Mi1hNWU0LTRlNjEtYWMyOC1lZmU4ODg1ODc1ODI&ifq)
|
[contributor agreement form](https://spreadsheets.google.com/a/joindiaspora.com/viewform?formkey=dGI2cHA3ZnNHLTJvbm10LUhXRTJjR0E6MQ&theme=0AX42CRMsmRFbUy1iOGYwN2U2Mi1hNWU0LTRlNjEtYWMyOC1lZmU4ODg1ODc1ODI&ifq)
|
||||||
before we can accept your patches. The agreement gives Diaspora joint
|
before we can accept your patches. The agreement gives Diaspora joint
|
||||||
|
|
|
||||||
20
ci.sh
Executable file
20
ci.sh
Executable file
|
|
@ -0,0 +1,20 @@
|
||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
echo "*************************************************************************************************" &&
|
||||||
|
echo "* ruby 1.8.7-p249 build *" &&
|
||||||
|
echo "*************************************************************************************************" &&
|
||||||
|
echo "" &&
|
||||||
|
source /usr/local/rvm/scripts/rvm &&
|
||||||
|
rvm use ruby-1.8.7-p249 &&
|
||||||
|
bundle install &&
|
||||||
|
bundle exec rake ci &&
|
||||||
|
echo "" &&
|
||||||
|
echo "*************************************************************************************************" &&
|
||||||
|
echo "* ruby 1.9.2-p0 build *" &&
|
||||||
|
echo "*************************************************************************************************" &&
|
||||||
|
echo "" &&
|
||||||
|
source /usr/local/rvm/scripts/rvm &&
|
||||||
|
rvm use ruby-1.9.2-p0 &&
|
||||||
|
bundle install &&
|
||||||
|
bundle exec rake ci &&
|
||||||
|
rm Gemfile.lock
|
||||||
|
|
@ -67,13 +67,14 @@ namespace :db do
|
||||||
end
|
end
|
||||||
|
|
||||||
task :move_private_key do
|
task :move_private_key do
|
||||||
|
require File.dirname(__FILE__) + '/../../config/environment'
|
||||||
User.all.each do |user|
|
User.all.each do |user|
|
||||||
if user.private_key.nil?
|
if user.serialized_private_key.nil?
|
||||||
user.private_key = user.person.serialized_key
|
user.serialized_private_key = user.person.serialized_key
|
||||||
user.save
|
user.save
|
||||||
person = user.person
|
person = user.person
|
||||||
person.serialized_key = nil
|
person.serialized_key = nil
|
||||||
person.serialized_public_key = user.encryption_key.public_key
|
person.serialized_public_key = user.encryption_key.public_key.to_s
|
||||||
person.save
|
person.save
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -34,6 +34,10 @@ find . -perm /u+x -type f -exec \
|
||||||
|
|
||||||
%build
|
%build
|
||||||
rm -rf master/vendor/bundle
|
rm -rf master/vendor/bundle
|
||||||
|
<<<<<<< HEAD
|
||||||
|
mkdir master/tmp || :
|
||||||
|
=======
|
||||||
|
>>>>>>> upstream/master
|
||||||
|
|
||||||
%install
|
%install
|
||||||
rm -fr $RPM_BUILD_ROOT
|
rm -fr $RPM_BUILD_ROOT
|
||||||
|
|
@ -55,7 +59,14 @@ cp %SOURCE3 $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d/diaspora
|
||||||
|
|
||||||
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/diaspora
|
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/diaspora
|
||||||
cp -ar master $RPM_BUILD_ROOT/%{_datadir}/diaspora
|
cp -ar master $RPM_BUILD_ROOT/%{_datadir}/diaspora
|
||||||
|
<<<<<<< HEAD
|
||||||
|
cp -ar master/.bundle $RPM_BUILD_ROOT/%{_datadir}/diaspora/master
|
||||||
|
cp diaspora-setup $RPM_BUILD_ROOT/%{_datadir}/diaspora
|
||||||
|
mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/lib/diaspora/uploads
|
||||||
|
mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/lib/diaspora/tmp
|
||||||
|
=======
|
||||||
cp %SOURCE2 $RPM_BUILD_ROOT/%{_datadir}/diaspora
|
cp %SOURCE2 $RPM_BUILD_ROOT/%{_datadir}/diaspora
|
||||||
|
>>>>>>> upstream/master
|
||||||
|
|
||||||
mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/log/diaspora
|
mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/log/diaspora
|
||||||
mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/lib/diaspora/uploads
|
mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/lib/diaspora/uploads
|
||||||
|
|
@ -80,8 +91,25 @@ sed -i -e '\|.*/master/config.ru"$|d' \
|
||||||
|
|
||||||
|
|
||||||
%post
|
%post
|
||||||
|
<<<<<<< HEAD
|
||||||
|
rm -f %{_datadir}/diaspora/master/vendor/bundle
|
||||||
|
rm -f %{_datadir}/diaspora/master/log
|
||||||
|
rm -f %{_datadir}/diaspora/master/public/uploads
|
||||||
|
rm -rf %{_datadir}/diaspora/master/tmp
|
||||||
|
|
||||||
|
ln -s %{_localstatedir}/log/diaspora \
|
||||||
|
%{_datadir}/diaspora/master/log || :
|
||||||
|
ln -s %{_libdir}/diaspora-bundle/master/vendor/bundle \
|
||||||
|
%{_datadir}/diaspora/master/vendor || :
|
||||||
|
ln -s %{_localstatedir}/lib/diaspora/uploads \
|
||||||
|
%{_datadir}/diaspora/master/public/uploads || :
|
||||||
|
ln -s %{_localstatedir}/lib/diaspora/tmp \
|
||||||
|
%{_datadir}/diaspora/master/tmp || :
|
||||||
|
/sbin/chkconfig --add diaspora-ws || :
|
||||||
|
=======
|
||||||
/sbin/chkconfig --add diaspora-wsd
|
/sbin/chkconfig --add diaspora-wsd
|
||||||
|
|
||||||
|
>>>>>>> upstream/master
|
||||||
|
|
||||||
%preun
|
%preun
|
||||||
if [ $1 -eq 0 ] ; then
|
if [ $1 -eq 0 ] ; then
|
||||||
|
|
@ -96,15 +124,22 @@ rm -fr $RPM_BUILD_ROOT
|
||||||
|
|
||||||
%files -f files
|
%files -f files
|
||||||
%defattr(-, root, root, 0755)
|
%defattr(-, root, root, 0755)
|
||||||
|
<<<<<<< HEAD
|
||||||
|
%doc README.md GNU-AGPL-3.0
|
||||||
|
=======
|
||||||
%doc AUTHORS README.md GNU-AGPL-3.0 COPYRIGHT README-Fedora.md
|
%doc AUTHORS README.md GNU-AGPL-3.0 COPYRIGHT README-Fedora.md
|
||||||
|
>>>>>>> upstream/master
|
||||||
%attr(-, diaspora, diaspora) %{_datadir}/diaspora/master/config.ru
|
%attr(-, diaspora, diaspora) %{_datadir}/diaspora/master/config.ru
|
||||||
%attr(-, diaspora, diaspora) %{_datadir}/diaspora/master/config/environment.rb
|
%attr(-, diaspora, diaspora) %{_datadir}/diaspora/master/config/environment.rb
|
||||||
%attr(-, diaspora, diaspora) %{_localstatedir}/log/diaspora
|
%attr(-, diaspora, diaspora) %{_localstatedir}/log/diaspora
|
||||||
%attr(-, diaspora, diaspora) %{_localstatedir}/lib/diaspora/uploads
|
%attr(-, diaspora, diaspora) %{_localstatedir}/lib/diaspora/uploads
|
||||||
%attr(-, diaspora, diaspora) %{_localstatedir}/lib/diaspora/tmp
|
%attr(-, diaspora, diaspora) %{_localstatedir}/lib/diaspora/tmp
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
%{_datadir}/diaspora/master/tmp
|
%{_datadir}/diaspora/master/tmp
|
||||||
%{_datadir}/diaspora/master/public/uploads
|
%{_datadir}/diaspora/master/public/uploads
|
||||||
%{_datadir}/diaspora/master/log
|
%{_datadir}/diaspora/master/log
|
||||||
|
>>>>>>> upstream/master
|
||||||
%config(noreplace) %{_sysconfdir}/logrotate.d/diaspora
|
%config(noreplace) %{_sysconfdir}/logrotate.d/diaspora
|
||||||
%{_sysconfdir}/init.d/diaspora-wsd
|
%{_sysconfdir}/init.d/diaspora-wsd
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -126,8 +126,7 @@ function checkout()
|
||||||
git clone --quiet $GIT_REPO;
|
git clone --quiet $GIT_REPO;
|
||||||
(
|
(
|
||||||
cd diaspora;
|
cd diaspora;
|
||||||
git remote add upstream \
|
git remote add upstream $GIT_REPO
|
||||||
git://github.com/diaspora/diaspora.git
|
|
||||||
for p in ../../*.patch; do
|
for p in ../../*.patch; do
|
||||||
git apply --whitespace=fix $p > /dev/null
|
git apply --whitespace=fix $p > /dev/null
|
||||||
done &> /dev/null || :
|
done &> /dev/null || :
|
||||||
|
|
@ -159,7 +158,6 @@ function make_src
|
||||||
cd dist
|
cd dist
|
||||||
mkdir ${RELEASE_DIR}/master
|
mkdir ${RELEASE_DIR}/master
|
||||||
cp -ar diaspora/* diaspora/.git* ${RELEASE_DIR}/master
|
cp -ar diaspora/* diaspora/.git* ${RELEASE_DIR}/master
|
||||||
mv ${RELEASE_DIR}/master/diaspora.spec ${RELEASE_DIR}
|
|
||||||
(
|
(
|
||||||
cd ${RELEASE_DIR}/master
|
cd ${RELEASE_DIR}/master
|
||||||
git show --name-only > config/gitversion
|
git show --name-only > config/gitversion
|
||||||
|
|
@ -168,6 +166,9 @@ function make_src
|
||||||
find $PWD -name .git\* | xargs rm -rf
|
find $PWD -name .git\* | xargs rm -rf
|
||||||
rm -rf .bundle
|
rm -rf .bundle
|
||||||
/usr/bin/patch -p1 -s <../../../add-bundle.diff
|
/usr/bin/patch -p1 -s <../../../add-bundle.diff
|
||||||
|
for p in ../../../*.patch; do
|
||||||
|
/usr/bin/patch -p1 -s < $p
|
||||||
|
done &> /dev/null || :
|
||||||
)
|
)
|
||||||
tar czf ${RELEASE_DIR}.tar.gz ${RELEASE_DIR} && \
|
tar czf ${RELEASE_DIR}.tar.gz ${RELEASE_DIR} && \
|
||||||
rm -rf ${RELEASE_DIR}
|
rm -rf ${RELEASE_DIR}
|
||||||
|
|
@ -203,7 +204,8 @@ function make_bundle()
|
||||||
cd ..
|
cd ..
|
||||||
}
|
}
|
||||||
echo
|
echo
|
||||||
echo "Bundle: dist/$bundle_name.tar.gz"
|
echo "Repo: $GIT_REPO"
|
||||||
|
echo "Bundle: dist/$bundle_name.tar.gz"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -278,9 +280,8 @@ function usage()
|
||||||
EOF
|
EOF
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
commit='HEAD'
|
commit='HEAD'
|
||||||
while getopts ":r:c:h" opt
|
while getopts ":r:c:u:h" opt
|
||||||
do
|
do
|
||||||
case $opt in
|
case $opt in
|
||||||
u) GIT_REPO="$OPTARG"
|
u) GIT_REPO="$OPTARG"
|
||||||
|
|
|
||||||
3
pkg/ubuntu/.gitignore
vendored
Normal file
3
pkg/ubuntu/.gitignore
vendored
Normal file
|
|
@ -0,0 +1,3 @@
|
||||||
|
patches-*
|
||||||
|
dist
|
||||||
|
series
|
||||||
80
pkg/ubuntu/README.md
Normal file
80
pkg/ubuntu/README.md
Normal file
|
|
@ -0,0 +1,80 @@
|
||||||
|
## Package-oriented install for ubuntu.
|
||||||
|
|
||||||
|
Here are somediaspora-installdiaspora-install scripts to install diaspora on Ubuntu. They are designed to
|
||||||
|
work as a first step towards packaging, but should be usable as is.
|
||||||
|
|
||||||
|
### Synopsis
|
||||||
|
|
||||||
|
Bootstrap the distribution from git:
|
||||||
|
sudo apt-get install git
|
||||||
|
git clone git://github.com/diaspora/diaspora.git
|
||||||
|
cd diaspora/pkg/ubuntu
|
||||||
|
|
||||||
|
Install the dependencies (a good time for a coffe break)
|
||||||
|
./diaspora-install-deps
|
||||||
|
|
||||||
|
Create and install the diaspora bundle and application:
|
||||||
|
./make-dist.sh bundle
|
||||||
|
sudo ./diaspora-bundle-install dist/diaspora-bundle-*.tar.gz
|
||||||
|
|
||||||
|
./make-dist.sh source
|
||||||
|
sudo ./diaspora-install dist/diaspora-0.0*.tar.gz
|
||||||
|
|
||||||
|
Initiate and start the server;
|
||||||
|
sudo ./diaspora-setup
|
||||||
|
sudo su - diaspora
|
||||||
|
cd /usr/share/diaspora/master
|
||||||
|
./script/server
|
||||||
|
|
||||||
|
### Upgrading
|
||||||
|
Once diaspora ins installed ,makedist.sh et. al. are available in
|
||||||
|
/usr/share/diaspora/master/pkg/ubuntu, so there's no need to checkout
|
||||||
|
the stuff using git in this case.
|
||||||
|
|
||||||
|
The normal procedure to update is to just
|
||||||
|
$ sudo su - diaspora
|
||||||
|
$ cd /usr/share/diaspora/master/pkg/ubuntu
|
||||||
|
$ ./make-dist.sh bundle
|
||||||
|
$ ./make-dist.sh source
|
||||||
|
|
||||||
|
And then use diaspore-install and diaspora-install-bundle as above.
|
||||||
|
|
||||||
|
It's necessary to always have the correct bundle. The easy way is to just
|
||||||
|
$ ./make-dist.sh bundle
|
||||||
|
|
||||||
|
Repo: http://github.com/diaspora/diaspora.git
|
||||||
|
Bundle: dist/diaspora-bundle-0.0-1010111342_afad554.tar.gz
|
||||||
|
|
||||||
|
The command will return the last built bundle (which is cached) if it's
|
||||||
|
OK to use. If it's not, it will build a new.
|
||||||
|
|
||||||
|
### Notes
|
||||||
|
|
||||||
|
The application lives in /usr/share/diaspora/master. All writable areas
|
||||||
|
(log, uploads, tmp) are links to /var/lib/diaspora. The config file lives
|
||||||
|
in /etc/diaspora. All files in /usr/share are read-only, owned by root.
|
||||||
|
|
||||||
|
The bundle lives in /usr/lib/diaspora-bundle, readonly, owned by root.
|
||||||
|
Application finds it through the patched .bundle/config in root dir.
|
||||||
|
|
||||||
|
Once diaspora ins installed ,makedist.sh et. al. are available in
|
||||||
|
/usr/share/diaspora/master/pkg/ubuntu, so there's no need to checkout
|
||||||
|
the stuff using git in this case.
|
||||||
|
|
||||||
|
The user diaspora is added during install.
|
||||||
|
|
||||||
|
make-dist.sh accepts arguments to get a specified commit and/or use another
|
||||||
|
repo.
|
||||||
|
|
||||||
|
This has been tested on a Ubuntu 32-bit 10.10 , clean server. Since this
|
||||||
|
is a very small dist, the dependencies should possibly be complete.
|
||||||
|
|
||||||
|
The diaspora-wsd is just placeholder FTM, it does **not** work.
|
||||||
|
|
||||||
|
Please, report any problems!
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
11
pkg/ubuntu/add-bundle.diff
Normal file
11
pkg/ubuntu/add-bundle.diff
Normal file
|
|
@ -0,0 +1,11 @@
|
||||||
|
diff --git a/.bundle/config b/.bundle/config
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000..1c3e2ce
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/.bundle/config
|
||||||
|
@@ -0,0 +1,5 @@
|
||||||
|
+---
|
||||||
|
+BUNDLE_FROZEN: "1"
|
||||||
|
+BUNDLE_DISABLE_SHARED_GEMS: "1"
|
||||||
|
+BUNDLE_WITHOUT: test:rdoc
|
||||||
|
+BUNDLE_PATH: vendor/bundle
|
||||||
26
pkg/ubuntu/diaspora-bundle-install
Executable file
26
pkg/ubuntu/diaspora-bundle-install
Executable file
|
|
@ -0,0 +1,26 @@
|
||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
test "$(perl -e 'print $>')" = "0" || {
|
||||||
|
echo "You need to be root to do this, giving up"
|
||||||
|
exit 2
|
||||||
|
}
|
||||||
|
|
||||||
|
test $# = "1" || {
|
||||||
|
echo "Usage: diaspora-bundle-install <diaspora-bundle-VERSION-RELEASE.tar.gz>"
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
|
|
||||||
|
test -r "$1" || {
|
||||||
|
echo "Cannot open $1"
|
||||||
|
exit 2
|
||||||
|
}
|
||||||
|
|
||||||
|
rm -rf /usr/lib/diaspora-bundle
|
||||||
|
tar xf $1 -C /usr/lib
|
||||||
|
|
||||||
|
cd /usr/lib
|
||||||
|
mv $(basename $1 .tar.gz) diaspora-bundle
|
||||||
|
mkdir -p /usr/share/doc/diaspora-bundle || :
|
||||||
|
cd /usr/lib/diaspora-bundle
|
||||||
|
|
||||||
|
cp AUTHORS GNU-AGPL-3.0 COPYRIGHT /usr/share/doc/diaspora-bundle
|
||||||
71
pkg/ubuntu/diaspora-install
Executable file
71
pkg/ubuntu/diaspora-install
Executable file
|
|
@ -0,0 +1,71 @@
|
||||||
|
#!/bin/bash
|
||||||
|
#
|
||||||
|
# Install a fedora source package
|
||||||
|
#
|
||||||
|
# Usage diaspora-install <tar package>
|
||||||
|
|
||||||
|
test "$(perl -e 'print $>')" = "0" || {
|
||||||
|
echo "You need to be root to do this, giving up"
|
||||||
|
exit 2
|
||||||
|
}
|
||||||
|
|
||||||
|
set -x
|
||||||
|
|
||||||
|
getent group diaspora >/dev/null || groupadd -r diaspora
|
||||||
|
getent passwd diaspora >/dev/null || \
|
||||||
|
useradd -r -g diaspora \
|
||||||
|
-md /var/lib/diaspora \
|
||||||
|
-s /bin/bash \
|
||||||
|
-c "Diaspora daemon" diaspora
|
||||||
|
|
||||||
|
sudo tar -C /usr/share -xzf $1
|
||||||
|
|
||||||
|
cd /usr/share;
|
||||||
|
rm -rf /usr/share/diaspora
|
||||||
|
mv $( basename $1 .tar.gz) diaspora
|
||||||
|
cd /usr/share/diaspora
|
||||||
|
find . -perm /u+x -type f -exec \
|
||||||
|
sed -i 's|^#!/usr/local/bin/ruby|#!/usr/bin/ruby|' {} \; > /dev/null
|
||||||
|
rm -rf master/vendor/bundle master/public/uploads master/tmp master/log
|
||||||
|
sed -i '/BUNDLE_PATH/s|:.*|: /usr/lib/diaspora-bundle/bundle|' \
|
||||||
|
master/.bundle/config
|
||||||
|
|
||||||
|
cp master/GNU-AGPL-3.0 master/COPYRIGHT master/README.md master/AUTHORS .
|
||||||
|
cp master/config/app_config.yml.example ./app_config.yml
|
||||||
|
cp master/pkg/ubuntu/diaspora-wsd /etc/init.d
|
||||||
|
|
||||||
|
sed -i '/^cd /s|.*|cd /usr/share/diaspora/master|' /etc/init.d/diaspora-wsd
|
||||||
|
|
||||||
|
cp master/pkg/ubuntu/diaspora.logrotate /etc/logrotate.d/diaspora
|
||||||
|
|
||||||
|
cp master/pkg/ubuntu/diaspora-setup .
|
||||||
|
|
||||||
|
mkdir -p /var/log/diaspora
|
||||||
|
mkdir -p /var/lib/diaspora/uploads
|
||||||
|
mkdir -p /var/lib/diaspora/tmp
|
||||||
|
mkdir -p /etc/diaspora
|
||||||
|
mkdir -p /usr/share/diaspora/master/pkg/ubuntu/dist
|
||||||
|
|
||||||
|
ln -sf /var/log/diaspora ./master/log
|
||||||
|
cp master/config/app_config.yml.example /etc/diaspora/app_config.yml
|
||||||
|
ln -sf /etc/diaspora/app_config.yml master/config/app_config.yml
|
||||||
|
ln -sf /var/lib/diaspora/uploads master/public/
|
||||||
|
ln -sf /var/lib/diaspora/tmp master
|
||||||
|
ln -sf /usr/lib/diaspora-bundle/bundle master/vendor
|
||||||
|
|
||||||
|
rm -rf /usr/share/doc/diaspora
|
||||||
|
mkdir -p /usr/share/doc/diaspora
|
||||||
|
mv AUTHORS README.md GNU-AGPL-3.0 COPYRIGHT /usr/share/doc/diaspora
|
||||||
|
|
||||||
|
find ./ -print | xargs chown root:root
|
||||||
|
rm -rf /usr/share/doc/diaspora
|
||||||
|
mkdir /usr/share/doc/diaspora
|
||||||
|
|
||||||
|
chown diaspora:diaspora /usr/share/diaspora/master/config.ru
|
||||||
|
chown diaspora:diaspora /usr/share/diaspora/master/config/environment.rb
|
||||||
|
chown diaspora:diaspora /var/log/diaspora
|
||||||
|
chown diaspora:diaspora /var/lib/diaspora/uploads
|
||||||
|
chown diaspora:diaspora /var/lib/diaspora/tmp
|
||||||
|
chown diaspora:diaspora /var/lib/diaspora
|
||||||
|
chown diaspora:diaspora /usr/share/diaspora/master/pkg/ubuntu/dist
|
||||||
|
|
||||||
21
pkg/ubuntu/diaspora-install-deps
Executable file
21
pkg/ubuntu/diaspora-install-deps
Executable file
|
|
@ -0,0 +1,21 @@
|
||||||
|
#!/bin/bash
|
||||||
|
#
|
||||||
|
# Install diaspora dependencies i. e., what apt-get will do
|
||||||
|
#
|
||||||
|
|
||||||
|
grep -v '^#' /etc/apt/sources.list | grep -q universe || {
|
||||||
|
cat <<- EOF
|
||||||
|
"Warning: it looks like you have not enabled universe in your
|
||||||
|
/etc/apt/sources.list. Most likely, this means trouble.
|
||||||
|
But I will try anyway.
|
||||||
|
EOF
|
||||||
|
sleep 2
|
||||||
|
}
|
||||||
|
|
||||||
|
sudo apt-get update
|
||||||
|
sudo apt-get install -qy build-essential libxslt1-dev libxml2 ruby-full mongodb \
|
||||||
|
rake python-software-properties git imagemagick libmagick9-dev
|
||||||
|
sudo add-apt-repository ppa:maco.m/ruby
|
||||||
|
sudo apt-get update
|
||||||
|
sudo apt-get install -qy rubygems
|
||||||
|
sudo gem install bundler --bindir /usr/local/bin
|
||||||
12
pkg/ubuntu/diaspora-reset
Executable file
12
pkg/ubuntu/diaspora-reset
Executable file
|
|
@ -0,0 +1,12 @@
|
||||||
|
#!/bin/sh
|
||||||
|
#
|
||||||
|
# Try to revert to pristine state, deleting all users and
|
||||||
|
# configuration
|
||||||
|
#
|
||||||
|
|
||||||
|
set -x
|
||||||
|
service mongodb stop
|
||||||
|
rm -rf /var/lib/mongodb/*
|
||||||
|
cp /usr/share/diaspora/master/config/app_config.yml.example \
|
||||||
|
/usr/share/diaspora/master/config/app_config.yml
|
||||||
|
service mongodb start
|
||||||
53
pkg/ubuntu/diaspora-setup
Executable file
53
pkg/ubuntu/diaspora-setup
Executable file
|
|
@ -0,0 +1,53 @@
|
||||||
|
#!/bin/bash
|
||||||
|
#
|
||||||
|
# Do what's needed to initiate diaspora.
|
||||||
|
#
|
||||||
|
|
||||||
|
test "$( perl -e 'print $<')" = "0" || {
|
||||||
|
echo "You need to be root to do this, giving up"
|
||||||
|
exit 2
|
||||||
|
}
|
||||||
|
|
||||||
|
services=$( netstat -nl | grep '[^:]:3000[ \t]')
|
||||||
|
test -n "$services" && {
|
||||||
|
echo "Warning: something is already using port 3000"
|
||||||
|
echo " $services"
|
||||||
|
}
|
||||||
|
|
||||||
|
/usr/sbin/service mongodb start || :
|
||||||
|
|
||||||
|
cd /usr/share/diaspora/master
|
||||||
|
|
||||||
|
test -e config/app_config.yml ||
|
||||||
|
cp config/app_config.yml.example config/app_config.yml
|
||||||
|
|
||||||
|
if rake db:seed:dev; then
|
||||||
|
echo "Database config OK, new user tom/evankorth in place"
|
||||||
|
else
|
||||||
|
cat <<- EOF
|
||||||
|
|
||||||
|
Database config failed. You might want to remove all db files with
|
||||||
|
'rm -rf /var/lib/mongodb/*' and/or resetting the config file by
|
||||||
|
'cp config/app_config.yml.example config/app_config.yml' before
|
||||||
|
making a new try. Also, make sure the mongodb server is running
|
||||||
|
e. g., using '/sbin/service mongod status'.
|
||||||
|
EOF
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
chmod 777 /var/lib/diaspora/uploads
|
||||||
|
chown -R diaspora /var/log/diaspora
|
||||||
|
|
||||||
|
hostname=$( awk '/pod_url:/ { print $2; exit }' <config/app_config.yml)
|
||||||
|
while : ; do
|
||||||
|
echo "Current hostname is \"$hostname\""
|
||||||
|
echo -n "Enter new hostname [$hostname] :"
|
||||||
|
read new_hostname garbage
|
||||||
|
echo -n "Use hostname \"$new_hostname\" as pod_url (Yes/No) [Yes]? :"
|
||||||
|
read yesno garbage
|
||||||
|
test "${yesno:0:1}" = 'y' -o "${yesno:0:1}" = 'Y' -o -z "$yesno" && {
|
||||||
|
sed -i "/pod_url:/s/$hostname/$new_hostname/g" config/app_config.yml &&
|
||||||
|
echo "config/app_config.yml updated."
|
||||||
|
break
|
||||||
|
}
|
||||||
|
done
|
||||||
102
pkg/ubuntu/diaspora-wsd
Executable file
102
pkg/ubuntu/diaspora-wsd
Executable file
|
|
@ -0,0 +1,102 @@
|
||||||
|
#!/bin/bash
|
||||||
|
#
|
||||||
|
# /etc/rc.d/init.d/diaspora-wsd
|
||||||
|
#
|
||||||
|
# SHOULD start the diaspora websocket daemon, but it doesn't. No way.
|
||||||
|
#
|
||||||
|
# chkconfig: - 80 80
|
||||||
|
# description: Diaspora websocket daemon
|
||||||
|
|
||||||
|
### BEGIN INIT INFO
|
||||||
|
# Provides: diaspora-wsd
|
||||||
|
# Required-Start: $local_fs $network
|
||||||
|
# Required-Stop: $local_fs $network
|
||||||
|
# Should-Start: $remote_fs
|
||||||
|
# Should-Stop: $remote_fs
|
||||||
|
# Default-Start:
|
||||||
|
# Default-Stop: 0 1 2 3 4 5 6
|
||||||
|
# Short-Description: start and stop Diaspora websocket server
|
||||||
|
# Description: The websocket server provides websocket services for
|
||||||
|
# diaspora.
|
||||||
|
### END INIT INFO
|
||||||
|
|
||||||
|
# Source function library.
|
||||||
|
. /etc/init.d/functions
|
||||||
|
|
||||||
|
if [ -f /etc/sysconfig/diaspora-wsd -a $UID -eq 0 ]; then
|
||||||
|
. /etc/sysconfig/diaspora-wsd
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Note: this line is patched by installation scripts.
|
||||||
|
cd /usr/share/diaspora
|
||||||
|
|
||||||
|
RETVAL=0
|
||||||
|
prog="Diaspora websocket server"
|
||||||
|
exec="script/websocket_server.rb"
|
||||||
|
pidfile="/var/run/diaspora-wsd"
|
||||||
|
lockfile="/var/lock/subsys/diaspora-wsd"
|
||||||
|
logfile=/var/log/diaspora-wsd.log
|
||||||
|
|
||||||
|
[ -n "$OPTIONS" ] && OPTIONS=" $OPTIONS"
|
||||||
|
ruby_cmd="ruby -C $PWD $exec$OPTIONS"
|
||||||
|
|
||||||
|
start() {
|
||||||
|
[ $UID -eq 0 ] || exit 4
|
||||||
|
[ -f $exec ] || exit 5
|
||||||
|
|
||||||
|
echo -n $"Starting $prog: "
|
||||||
|
daemon --pidfile $pidfile "$ruby_cmd >>$logfile 2>&1 &"
|
||||||
|
RETVAL=$?
|
||||||
|
echo
|
||||||
|
if test $RETVAL = 0; then
|
||||||
|
touch $lockfile
|
||||||
|
pgrep -f "$ruby_cmd" > $pidfile || {
|
||||||
|
echo "Warning: cannot find running diaspora-webserver"
|
||||||
|
exit 7
|
||||||
|
}
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
stop() {
|
||||||
|
[ $UID -eq 0 ] || exit 4
|
||||||
|
echo -n $"Stopping $prog: "
|
||||||
|
killproc -p $pidfile $exec
|
||||||
|
RETVAL=$?
|
||||||
|
[ $RETVAL -eq 0 ] && rm -f $lockfile
|
||||||
|
echo
|
||||||
|
}
|
||||||
|
|
||||||
|
#
|
||||||
|
# See how we were called.
|
||||||
|
#
|
||||||
|
case "$1" in
|
||||||
|
start)
|
||||||
|
start
|
||||||
|
;;
|
||||||
|
stop)
|
||||||
|
stop
|
||||||
|
;;
|
||||||
|
force-reload|restart)
|
||||||
|
stop
|
||||||
|
sleep 1
|
||||||
|
start
|
||||||
|
RETVAL=$?
|
||||||
|
;;
|
||||||
|
condrestart|try-restart)
|
||||||
|
if [ -f $lockfile ]; then
|
||||||
|
stop
|
||||||
|
sleep 3
|
||||||
|
start
|
||||||
|
fi
|
||||||
|
;;
|
||||||
|
status)
|
||||||
|
status -p $pidfile $exec
|
||||||
|
RETVAL=$?
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
echo $"Usage: $0 {condrestart|try-restart|start|stop|restart|force-reload|status}"
|
||||||
|
RETVAL=2
|
||||||
|
[ "$1" = 'usage' ] && RETVAL=0
|
||||||
|
esac
|
||||||
|
|
||||||
|
exit $RETVAL
|
||||||
13
pkg/ubuntu/diaspora.logrotate
Normal file
13
pkg/ubuntu/diaspora.logrotate
Normal file
|
|
@ -0,0 +1,13 @@
|
||||||
|
/var/log/diaspora/*.log {
|
||||||
|
create 755 diaspora diaspora
|
||||||
|
weekly
|
||||||
|
rotate 10
|
||||||
|
copytruncate
|
||||||
|
delaycompress
|
||||||
|
compress
|
||||||
|
notifempty
|
||||||
|
missingok
|
||||||
|
postrotate
|
||||||
|
( /sbin/service diaspora-wsd condrestart ) >/dev/null 2>&1
|
||||||
|
endscript
|
||||||
|
}
|
||||||
1
pkg/ubuntu/make-dist.sh
Symbolic link
1
pkg/ubuntu/make-dist.sh
Symbolic link
|
|
@ -0,0 +1 @@
|
||||||
|
../fedora/make-dist.sh
|
||||||
|
|
@ -195,8 +195,8 @@ li.message {
|
||||||
li.message .content .from a {
|
li.message .content .from a {
|
||||||
font-weight: bold; }
|
font-weight: bold; }
|
||||||
li.message .content div.info {
|
li.message .content div.info {
|
||||||
color: #eeeeee;
|
color: #444444;
|
||||||
font-size: 11px; }
|
font-size: 14px; }
|
||||||
li.message .content div.info a {
|
li.message .content div.info a {
|
||||||
color: #cccccc; }
|
color: #cccccc; }
|
||||||
li.message .content div.info .time {
|
li.message .content div.info .time {
|
||||||
|
|
|
||||||
|
|
@ -266,8 +266,8 @@ li.message
|
||||||
:size 14px
|
:size 14px
|
||||||
|
|
||||||
div.info
|
div.info
|
||||||
:color #eee
|
:color #444
|
||||||
:font-size 11px
|
:font-size 14px
|
||||||
a
|
a
|
||||||
:color #ccc
|
:color #ccc
|
||||||
.time
|
.time
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue