Commit graph

90 commits

Author SHA1 Message Date
Alec Leamas
d8376b5a84 bugfix, refactor funcs 2010-11-01 05:20:33 +01:00
Alec Leamas
c07771b390 bugfix 2010-10-31 13:55:33 +01:00
Alec Leamas
21772842be bugfixes 2010-10-31 13:20:00 +01:00
Alec Leamas
68d2f4162e bugfix 2010-10-31 01:38:48 +02:00
Alec Leamas
205a0a69f2 Hlding dist dirs in rep 2010-10-31 00:02:06 +02:00
Alec Leamas
50b52af11a bugfix,docs 2010-10-30 21:37:45 +02:00
Alec Leamas
2a3ea8b8e6 bugfix 2010-10-30 21:25:05 +02:00
Alec Leamas
6c25b02216 bugfix 2010-10-30 21:21:10 +02:00
Alec Leamas
42e8c8f11b Raw code 2010-10-30 21:16:37 +02:00
Alec Leamas
04984d576a bugfix 2010-10-30 15:48:33 +02:00
Alec Leamas
625bd428a1 bugfixes. Rewrite http: github path to git: 2010-10-30 13:18:56 +02:00
Alec Leamas
a3625bc399 Merge remote branch 'upstream/master' 2010-10-30 11:35:20 +02:00
Alec Leamas
de06f43d26 bugfix 2010-10-30 06:11:27 +03:00
Alec Leamas
5b6743d677 Bugfixes, non-interactive run possible
Closes remarks in tickets 436 and 437. Still has a nasty bug 440.

A little hesitant to remove the editor invocation for setting
up config file. This is still possible while using parameters for
non-interactive runs. But I was lazy, took the existing code, which
is a little simpler although much less powerful for user.
2010-10-29 15:55:15 +02:00
Alec Leamas
916d488298 New try, outside vendor 2010-10-27 20:21:54 +02:00
Alec Leamas
322faf3cc0 Error recovery 2010-10-27 13:28:48 +02:00
Alec Leamas
88a12ca889 Big cleanup, linking to bundle, removing garbage, git mgmt 2010-10-27 11:54:08 +02:00
Alec Leamas
97940073d7 Works, w ith bit gem file and git repos... 2010-10-27 11:54:08 +02:00
Alec Leamas
fcb88bdba7 Bundle: add licenses, handle git gems
Adding a docs dir collexting README and licenses from contained gems.
git gems, which bundler does not handle well today, are handled
by a hacked parsing of Gemfile.log, gem built into the source
bundle and installed on target system
2010-10-27 11:54:08 +02:00
Alec Leamas
31b3d739c0 Bundle: add licenses, handle git gems
Adding a docs dir collexting README and licenses from contained gems.
git gems, which bundler does not handle well today, are handled
by a hacked parsing of Gemfile.log, gem built into the source
bundle and installed on target system
2010-10-26 00:12:15 +02:00
Alec Leamas
76a8ea0e73 new git gem flow using. 2010-10-25 23:19:28 +02:00
Alec Leamas
66d468c2b2 bugfix 2010-10-25 11:10:00 +02:00
Alec Leamas
1c17069491 bugfix 2010-10-25 10:59:57 +02:00
Alec Leamas
a279bae720 Separate doc dir collecting copyrights and readmes. 2010-10-25 10:34:28 +02:00
Alec Leamas
9b83b07f80 Install from local git gems without download from remote repo. 2010-10-25 10:34:27 +02:00
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
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