nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
13731 commits 4 branches 0 tags 121 MiB
Commit graph

221 commits

Author SHA1 Message Date
Alec Leamas
0541082804 Fixing server when no git files, not on master 
Allows server to run even if on another branch than master and/or
in a production scenario without git files available.
 2010-12-06 13:36:24 +01:00
Philip Champon
47ae57d4dd Issue #650: this closes the netstat on mac problem http://bugs.joindiaspora.com/issues/650 2010-12-04 18:52:07 -08:00
Philip Champon
213f1c5e42 fixed bsd netstat issue 2010-12-04 18:52:07 -08:00
danielvincent
b9dbdd09fa start redis in script/server. removed magent. redis-server does not close on script/server kill 2010-12-03 11:51:04 -08:00
Raphael
8798f05ff7 Revert "Revert redis merge to fix bugs on master" 
This reverts commit 30698d674b.
 2010-12-02 15:33:26 -08:00
Raphael
30698d674b Revert redis merge to fix bugs on master 2010-12-02 15:20:27 -08:00
Raphael
93da0ddd25 Add magent back in, still need to work out environment problems with resque workers 2010-12-02 13:18:35 -08:00
Raphael
cee5e4c26e Bring in resque recipes and rake tasks 2010-12-02 12:35:26 -08:00
Raphael
db0106f13c Rename EMWebfinger to Webfinger, clean up some related things 2010-12-02 12:35:25 -08:00
danielvincent
828635def9 Person#real_name -> Person#name 2010-11-30 13:01:53 -08:00
Alexandre DE DOMMELIN
67d517c24b Fixing Issue #367: Start script could expose sensitive information 2010-11-27 23:23:11 +01:00
Alec Leamas
df31de2898 Generate all content in public/ before server starts. 
Introduces a delay first time the server is started, but makes all resources
available to jammit. Can be disabled by flag in config/server.sh. Hopefully
silences jammit's messages about application.css et. al. not found
 2010-11-25 14:22:21 +01:00
Alec Leamas
b6648cb9e2 Handle jammit by precaching in script/server. 
This introduces some jammit warnings in 'rake spec'. These seem
to be just warnings. To get rid of them, take steps as described in
https://github.com/diaspora/diaspora/wiki/Installing-and-Running-Diaspora
in the "Read-only Installation" (sic!) chapter.
 2010-11-20 18:32:40 +01:00
MrZYX
13ca682734 added locales from the rails-i18n project, removed rails-i18n parts from existing locales, added script to update rails-i18n locales 2010-11-18 15:13:30 -08:00
Alec Leamas
4599f700e6 Show error cause in websocket_server, trailing blanks. 
Related to, but does not solve http://bugs.joindiaspora.com/issues/540.
 2010-11-18 14:51:47 +01:00
danielvincent
b8e04d4888 rescue jammit if java isn't installed on the system. server will continue starting normally if this is the case. 2010-11-17 23:00:40 -08:00
maxwell
31d33054ef added jammit, now js and css compress for production 2010-11-17 21:51:59 -08:00
zhitomirskiyi
c5ae73f96d websocket secure params in app_config 2010-11-15 17:45:52 -08:00
Alec Leamas
4d6295a292 Don't daemonize magent. 
Closes issue http://bugs.joindiaspora.com/issues/532.
 2010-11-13 08:34:12 +01:00
Raphael
64cf82a06b Websocket server no longer fails hard on a bad cookie or a db reset 2010-11-12 16:21:09 -08:00
Raphael
90474d9acb Attempt to fix websocket bug, default pidfile location 2010-11-12 14:59:13 -08:00
Raphael
a6c5c08a9f log to log 2010-11-05 17:55:00 -07:00
maxwell
4154cec28a made mailer query based on ids, rather than making them serialize ruby objects 2010-11-05 11:46:43 -07:00
maxwell
363f76aed9 removing mail worker 2010-11-05 11:46:43 -07:00
maxwell
fef8ee5de3 adding scripts 2010-11-05 11:46:43 -07:00
zhitomirskiyi
d793bdc3c7 inital commit for mailqueue 2010-11-05 11:46:43 -07:00
Raphael
229e202a72 Take httponly off of session cookies so that the websocket works in firefox 3.x. XSS attacks would now be easier to exploit if found. A possible replacement for opening this security hole is to set a new cookie value for Firefox users that stores a randomly generated key which would give a websocket with that key access. 2010-11-04 15:17:28 -07:00
Raphael
fbbb88109b Make cookie finding in ws server a little more robust, put in some debugging 2010-11-04 13:34:27 -07:00
Raphael
ae039442c3 Websocket now uses cookie to authenticate 2010-11-02 17:39:50 -07: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
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
b1423e9e0f Firts try, nothing tested 2010-10-19 20:04:23 +02:00
Raphael
adb559155a Revert change from ps ax to pgrep, pgrep isn't on every computer 2010-10-19 10:29:23 -07:00
Alec Leamas
fcd70ce152 Add a configuration file 
Adds a config file with environment and default thin
options
 2010-10-19 08:26:43 +02:00
Alec Leamas
ed8878c72a Allow script to be invoked from anywhere, or symlink target. 2010-10-19 08:26:43 +02:00
Alec Leamas
bb67b1231b Test availability of thin and websocket ports before start. 
Improving cmd line scanning, handling thin options in front of
-p <port>. Also clean up test usage, just use if/then and [].
 2010-10-19 08:26:43 +02:00
Alec Leamas
e7efd5fbf7 Compress source.tar 
Compress source.tar, reducing overall distributed source size with
about 30%. Also, actually push this branch ;)
 2010-10-19 08:26:42 +02:00
Raphael
fd88e24a55 Forgot to commit a line 2010-10-13 16:16:22 -07:00
Raphael
51a02409c8 Another try at script server fix 2010-10-13 15:18:40 -07:00
Raphael
9898c8b158 Typo in script/server 2010-10-13 11:07:26 -07:00
Raphael
9e27c802c3 Got port check in bash script working 2010-10-13 10:47:21 -07:00
Raphael
3f9a51fa3f First attempt at detecting called port with getopts 2010-10-13 10:27:29 -07:00
Alec Leamas
ccdc259838 Comment update 2010-10-13 12:50:29 +02:00
Alec Leamas
49975d7010 Providing better message if port 3000 is in use, closing ticket 287. 2010-10-13 12:26:52 +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
Raphael
e5e812f0d5 Merge remote branch 'maco/master' 
Conflicts:
	script/ubuntu-setup.bash
 2010-10-07 15:10:42 -07:00
Raphael
d7bbb66d27 Run whitespace:cleanup 2010-10-07 10:47:37 -07:00
Alec Leamas
8bea8a98b2 Don't use any scratch dir, handle write-protected installation 2010-10-06 05:05:39 +08:00
danielvincent
f1f7ce338f tar ignores files specified in .gitignore 2010-09-30 13:40:36 -04:00
danielvincent
e145cbab5b tar the app's source and throw it in the public folder on server boot. 2010-09-29 17:42:56 -04:00
Vincent Batts
2aaf16f7db scripts/ubuntu-setup.bash: only count universe as enabled if it's a binary repo and uncommented 
Signed-off-by: maco <maco.m@ubuntu.com>
 2010-09-28 07:50:27 +00:00
Raphael
77356d7a17 Moving ubuntu-setup.bash to script/ 2010-09-27 17:55:04 -07:00
Stephen Caudill
05c2da81e5 Add cucumber and run the generator 2010-09-26 11:35:50 -04:00
Raphael
70a22ae839 Merge branch 'master' into HEAD 
Conflicts:
	app/models/post.rb
	app/models/user.rb
	config/initializers/socket.rb
 2010-09-24 09:15:10 -07:00
MrZYX
5740c72804 made websocket server host configurable 2010-09-19 09:57:57 +08:00
Ethan Bruning
d1c7559c29 Added check to see if Mongod is running 2010-09-18 07:37:35 +08:00
Raphael
511a4487de Make running the websocket server a little easier 2010-09-17 10:44:15 -07:00
Raphael
5c48e81f67 Give a little more feedback on the websocket server 2010-09-17 09:48:01 -07:00
Raphael
7c02200a67 Finish moving out websocket server, add task to start it 2010-09-16 21:42:16 -07:00
Michael Fellinger
c6f5b4ed16 Basic 1.9.2 port 2010-09-16 14:41:33 +09:00
Steve 'Ashcrow' Milner
3945e199eb added Fedora install information to README.md as well as a script for setting up a usable environment. 2010-09-16 13:08:30 +08:00
Raphael
ae968bce90 rechmoded build 2010-07-06 19:24:50 -07:00
Raphael
5e78163df3 added bundler to gemfile 2010-07-06 19:23:34 -07:00
Diaspora
f8e20eca16 2010-07-06 19:18:26 -07:00
Diaspora
f7ce67b768 2010-07-06 19:17:35 -07:00
root
73445c0780 RS MJS Try to change the working directory in a crazy way 2010-07-07 02:11:27 +00:00
root
9cbc963539 RS, MJS build script for integrity 2010-07-07 01:40:11 +00:00
Raphael Sofaer
0390bbde8a Activerecord this time\! 2010-06-11 10:40:49 -07:00