Commit graph

62 commits

Author SHA1 Message Date
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
53fef63a9a linking 2010-10-19 22:53:38 +02:00
Alec Leamas
2cf2b5f8b7 Linking 2010-10-19 22:44:07 +02:00
Alec Leamas
0096fd11e5 LInking?! 2010-10-19 22:33:53 +02:00
Alec Leamas
10f6a6994c Docs... 2010-10-19 22:29:25 +02:00
Alec Leamas
a0c6c175f6 websocket service cleanup
Complete implementation of the websocket service as a separate
SystemV service. Patch to websocket_server.rb to make it support
a pidfile. Complete rewrite of the /etc/init.d script for
ubuntu. Support in installation scripts.
2010-10-19 22:15:47 +02:00
Alec Leamas
b1423e9e0f Firts try, nothing tested 2010-10-19 20:04:23 +02:00
Alec Leamas
815e846684 Test provisions. 2010-10-19 20:04:23 +02:00
Alec Leamas
a99c15d388 Removing set -x 2010-10-19 20:03:24 +02:00
Alec Leamas
a6300ecbdb Mewrging 2010-10-19 20:03:24 +02:00
Alec Leamas
3a3ad1f053 bugfix 2010-10-19 20:03:24 +02:00
Alec Leamas
f9e5a469e0 bugfixes.. 2010-10-19 20:03: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
656d9387a6 Separate wsd daemon, simpler bundle directories, -f bundle update flag
For fedora, splits off the wsd daemin in separate package. Overall,
tools to handle bad Gemfile.lock README notes, -f option to invoke
'bundle update' in make-dist.sh. Minor bugfixes
2010-10-17 07:01:24 +02:00
Alec Leamas
0c5d197295 README update on Gemfile.lock problem, blocking. 2010-10-13 22:40:49 +02:00
Alec Leamas
d3a6031f88 Merge remote branch 'upstream/master' into port-test 2010-10-13 12:47:49 +02:00
Alec Leamas
8c2ccfc5a8 Updating to reflect new tests on 10.04 desktop. 2010-10-13 10:34:32 +02:00
Alec Leamas
2ffff53d2e Merge branch 'ubuntu' 2010-10-13 10:27:37 +02:00
Alec Leamas
ea185ccf6a Resolving merge conflict... My bad, apologies 2010-10-13 10:23:06 +02:00
Alec Leamas
e922a3be5c Ubuntu 10.10 desktop fixes 2010-10-13 08:29:24 +02:00
Alec Leamas
2a153316ce Not used 2010-10-13 01:41:28 +02:00
Alec Leamas
c818885b6e Fixes after more tests 2010-10-13 00:35:50 +02:00
Alec Leamas
00bcfaf345 Check for universe enabled in diaspora-install-deps 2010-10-12 23:10:29 +02:00
Alec Leamas
fac7629610 Minor bugfixes, discovered after checking in ubuntu stuff. 2010-10-12 23:10:08 +02:00
Alec Leamas
5bc174da15 Well, another gitignore ;) 2010-10-12 21:24:21 +02:00
Alec Leamas
6177362c4a Adding the ubuntu install package, initial version.
T
2010-10-12 21:22:49 +02:00
Alec Leamas
30b24a1079 Use make_relative_symlink scripts to avoid %post ln commands.
Patching .bundle/config to use /usr/lib/diaspora-bundle, to avoid
inter-package linking from diaspora to diaspora-bundle. This also
leaves the content under vendor/bundle untouched. Uses kitchen
script to create relative links within diaspora package.
2010-10-10 16:38:02 +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
075a39cfce A little discipline: locals, better redirect etc. 2010-10-10 16:38:01 +02:00
Alec Leamas
0b305a03e9 Pack static version info and w tarball, remove Fedora stuff.
make-dist now packs config/gitversion info and public/source.tar.
with the tarball.  All Fedora specific files moved out of the
tarball's install area.  'links' command warns for non-existing
targets.  Minor bugfixes.

Overall, at this point the application could be seen as
"packageable". The two main problem has been the included git
files, and that root could not own the files. These are now resolved.
In other words, the overall structure in comptatible with Fedora,
and thus also with most other repos like Ubuntu et al.

The bundle package is another issue. It's a long way before it can
be accepted into Fedora.  First step would be to use already packaged
gems instead of providing our own copy for each and every gem.
2010-10-10 16:38:01 +02:00
Alec Leamas
97f7b4d2ad Symlink tmp-dir to /var/lib,leaving other files to root.
Turns the overall installation to being write-protected.
2010-10-10 16:38:01 +02:00
Alec Leamas
0c30f544d9 Fallback to static version data if git unavailable.
Uses the file config/gitversion if git is unavailable.  This is to
support deployment without git (which will be necessary). Installation
script will generate the file config/gitversion when app is shipped.
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
40dabffacc Formatting & comments 2010-10-08 12:15:30 +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
Raphael
1fd3aeabd9 Add or later to license notice 2010-10-07 16:25:34 -07:00
Raphael
c855a93cbd Move install scripts to /pkg 2010-10-07 16:06:59 -07: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
9c14be8b11 prerequisites 2010-10-06 19:17:35 +02:00
Alec Leamas
e235c6b537 linking 2010-10-06 19:12:56 +02:00
Alec Leamas
7a50d537da README wrapup 2010-10-06 19:09:51 +02:00