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

100 commits

Author SHA1 Message Date
MrZYX
60c0c4dc76 Merge branch '819-checks-for-redis-conf-in-usr-local-etc' of https://github.com/Dorian/diaspora 
Conflicts:
	script/server
 2011-01-27 18:29:18 +01:00
Raphael
7399caa066 Fix require in ws server 2011-01-26 11:05:50 -08:00
Adam McDonald
89d43ef4d7 Updated the server script to support Redis when it has been installed via MacPorts. Also, fixed an echo error with it not being displayed correctly. 2011-01-23 12:47:13 -08:00
Sarah Mei
0b39359d1c Standardize how we're requiring config/environment 2011-01-23 12:42:09 -08:00
MrZYX
c9524e9b3a we don't need to exit if jammit fails 2011-01-22 19:36:10 +01:00
MrZYX
7ba38d80f1 some untested improvments to script/server 2011-01-22 17:55:10 +01:00
Dorian
3976489984 Checks for redis.conf in /usr/local (by justthisguy) 2011-01-19 23:42:23 +01:00
zhitomirskiyi
d0074d0d8a no more mongo check in script server 2011-01-18 11:01:09 -08:00
Dorian
29ec257e14 Typo in script/server : redis.cont → redis.conf 2011-01-18 00:44:21 +01:00
Raphael
3f7b89ac86 Commit horrifying db cleanup script 2011-01-14 10:52:26 -08:00
Raphael
6bb132b25e Revert 'Create a separate webfinger service.' We'll come back to it when we figure out the error. 2011-01-11 14:18:25 -08:00
Sarah Mei
b865c20b2d Backing out sub-uri changes 2011-01-09 18:29:43 -08:00
Alec Leamas
e09771d9b4 Create a separate webfinger service. 2011-01-09 23:38:36 +01:00
Alec Leamas
e01fb62eeb Expose and refer to assets on the sub_uri. 
When using sub-uri, create a symlink in public/ making the assets
available at the sub-uri. Modify environment.rb so that asset paths
refers to this sub-uri path. Closes http://bugs.joindiaspora.com/issues/391
and http://bugs.joindiaspora.com/issues/737 when application mounted
on suburi (i. e., prev patch)
 2011-01-09 23:38:03 +01:00
Sarah Mei
1f67cc2485 Replace APP_CONFIG with lib/app_config.rb so that it's testable. 2010-12-24 12:31:09 -08:00
maxwell
081e85f224 Revert "Extended sub-uri support." for now.... 
This reverts commit 9cd08bac67.
 2010-12-20 18:12:12 -08:00
Alec Leamas
9cd08bac67 Extended sub-uri support. 
Adds new routing in routes.rb based on pod_uri. Assets are handled by a symlink
in public when using sub-uri. Various clean-up, removing thin and socket port
settings from server.sh (these are now taken from pod_uri and socket_port).

Basic functionality when setting a sub_uri like http://example.org/diaspora
now seems OK. Closes .http://joindiaspora.com/issues/737, and partially
http://joindiaspora.com/issues/391. Ports are yet to be defined and handled
in this context.

Conflicts:

	app/views/layouts/application.html.haml
	config/routes.rb
 2010-12-21 01:13:15 +01:00
Alec Leamas
02477ed27a Trying to cope with #722 for the moment. 
Issue warning if there already is a running redis server, typically
the system server installed with the redis[-server] package.

See http://bugs.joindiaspora.com/issues/722
 2010-12-16 12:19:10 +01:00
Raphael
0e77577fbd Websocket now uses redis 2010-12-10 11:25:38 -08:00
Alec Leamas
6b00ca238f Fixing also logfile in redis.conf 
Not tested on BSD/Darwin, might need polish for these.
 2010-12-08 23:26:07 +01:00
MrZYX
9925aba066 Merge branch '676-bsd-sed' of https://github.com/flah00/diaspora into flah00-676-bsd-sed 2010-12-08 19:36:14 +01:00
Alec Leamas
843405116f Redis.conf: handling read-only install... 2010-12-08 16:05:20 +01:00
Philip Champon
ccbf51fdbe Issue 676: allow for correct calling of bsd sed 2010-12-08 01:03:55 -05:00
Alec Leamas
23a5db1013 Creates and maintains a local redis.conf. 
Creates config/redis.conf using mater copy in etc. FTM, disables
daemonizing, which doesn't fit script/server (or upstart/systemd).
 2010-12-07 19:06:25 +01:00
Alec Leamas
818ccf92b0 Bugfix (only visible on Ubuntu) 2010-12-06 18:18:49 +01:00
Alec Leamas
4926e185ef Making jammit tests in server consistent 2010-12-06 15:32:01 +01:00
Alec Leamas
521aa83b0c Create publiuc/source.tar.gz from current branch. 
Also, give slow starters some more time.
 2010-12-06 15:22:43 +01:00
Alec Leamas
36e6c9f68e Revert "Fixing server when no git files, not on master" 
Wrong usecase. The real problem is always using the master branch.
There is no point using a files list, distributions will just
create the tar archive in advance.

This reverts commit 0541082804.
 2010-12-06 14:49:32 +01:00
Alec Leamas
7aa7c29b46 Route redis output to log file, 
On Fedora, logfile/loglevel in configuration file seems to be ignored
as of now.
 2010-12-06 13:38:08 +01:00
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