Commit graph

20 commits

Author SHA1 Message Date
Alec Leamas
df8bcdf663 Establish proper workflow w bundle package + bundle install.
make-dist now creates the bundle using 'bundle package', the
rpm files for Fedora ande install scripts for ubuntu installs
using 'bundle install'. This is the way bundler is intended to
work.
2010-10-24 14:55:49 +02:00
Alec Leamas
03f637eca9 Polishing up after git mess... 2010-10-20 22:05:42 +02:00
Raphael
1bd54aba63 Revert "Merge remote branch 'upstream/master'"
This reverts commit 570d0cf104, reversing
changes made to 9da5399425.
2010-10-20 09:52:23 -07:00
Raphael
951c513f39 Revert "socket server update: pidfile, ubuntu upstart, bugfixes"
This reverts commit c08121e6eb.
2010-10-20 09:52:12 -07:00
Raphael
fd8028db33 Revert "Revert "Merge remote branch 'upstream/master'""
This reverts commit 1481056af2.
2010-10-20 09:51:55 -07:00
Alec Leamas
1481056af2 Revert "Merge remote branch 'upstream/master'"
This reverts commit fb70dc8c99, reversing
changes made to 53fef63a9a.

Conflicts:

	pkg/fedora/diaspora-setup
	pkg/ubuntu/diaspora-setup
	public/stylesheets/sass/application.sass
	spec/models/user/attack_vectors_spec.rb
2010-10-20 14:59:55 +02:00
Alec Leamas
c08121e6eb socket server update: pidfile, ubuntu upstart, bugfixes
patching websocket_server.rb to provide a pidfile, important
for SystemV init files. Ubuntu upstart configuration. Bugfixes
2010-10-20 14:08:44 +02:00
Alec Leamas
fb70dc8c99 Merge remote branch 'upstream/master'
Conflicts:
	pkg/ubuntu/diaspora-setup
2010-10-20 08:54:56 +02:00
Alec Leamas
8dbd61f167 Point fix: error in diaspora-setup (x2) blocks build. 2010-10-19 23:39:22 +02:00
Alec Leamas
b1423e9e0f Firts try, nothing tested 2010-10-19 20:04:23 +02:00
Alec Leamas
d8fc7d572e Pkg updates: separate wsd pkg, bad Gemfile.lock mgmt, docs, fixes
For fedora, splits off the wsd daemon in separate package. Overall,
tools to handle bad Gemfile.lock: README notes, -f option to invoke
'bundle update' in make-dist.sh. Handling of missing libmozjs in
Ubuntu 10.04 (https://bugs.launchpad.net/ubuntu/+source/mongodb/+bug/557024)
Various fixes & typos.
2010-10-19 14:29:20 +02:00
Alec Leamas
1c00fc232e Allow make-dist.sh to use an alternative repo.
Adds the -u switch, allowing use of another repository than
http://github.com/diaspora/diaspora.git. This is a dogfood patch.
Renames diaspora-ws->diaspora-wsd; this is indeed a daemon.
Moves all Fedora-related stuff in make-dist.sh to subcommand
'prepare'. The source tarballs are now usable on any OS
2010-10-10 16:38:01 +02:00
Alec Leamas
8b190eb1b4 Updating spec files to new versions, make-dist.sh update, some typos. 2010-10-08 18:12:24 +02:00
Alec Leamas
93a43e09b7 A bunch of typos & such 2010-10-08 12:00:26 +02:00
Alec Leamas
dd1a488be1 Bringing in some very old stuff lost in patch mgmmt. 2010-10-08 03:00:36 +02:00
Alec Leamas
876a32d64b make-dist handles commit arg, links handles all sources 2010-10-07 01:48:44 +02:00
Alec Leamas
5bd5aea484 make-dist handles commit arg OK, make-dist list links all sources. Smaller clean-ups. 2010-10-07 01:42:33 +02:00
Alec Leamas
09a931d4fd Addding uploads directory 2010-10-06 23:15:52 +02:00
Alec Leamas
8ab97fe3f1 apache setup update, new diaspora-init 2010-10-06 21:53:24 +02:00
Alec Leamas
03dbe0bb13 New workflow w 'rake db:seed:dev'. Permissions on logfiles, logrotate conf. README update 2010-10-06 18:53:41 +02:00