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

289 commits

Author SHA1 Message Date
Jonne Haß
f774ceae1b do not handle redis stuff in script/server, let the user do it 2011-12-29 15:45:28 +01:00
danielgrippi
f4c9b548f9 update cucumber and capybara. one failing cuke. 2011-12-07 18:40:39 -08:00
Jonne Hass
2cad824c82 remove resque-scheduler from start scripts (resque-retry revert) 2011-11-08 13:40:18 +01:00
Jonne Hass
74892b33da give warden a failure app 2011-11-06 01:53:27 +01:00
Jonne Hass
80e41f1ebb decode the cookie through rails in the websocket server. Hopefully this is more stable 2011-11-05 23:13:46 +01:00
Jonne Hass
f335c1881b websocket really should stay running so catch TypeError too 2011-11-05 16:05:56 +01:00
Jonne Hass
6b9e7ef3ec ugly thing to prevent crashing websocket for dmorley, hopefully 2011-11-05 15:59:33 +01:00
Jonne Hass
3bbc34600b rescue ArgumentError in websocket server for now to keep it running 2011-11-03 01:51:48 +01:00
Jonne Hass
c4a4516369 hm why do we update gems so rarely? Lets do it for em-websocket 2011-11-03 01:08:53 +01:00
Manuel Schölling
2de3f87c99 Added 'rake resque/scheduler' 2011-10-28 23:24:55 +02:00
Sarah Mei
5dc36b14cc Make script/server work on OS X again - -e is not a valid option to readlink on darwin 2011-10-21 14:41:10 -07:00
Jonne Hass
0a9dc2ee5d get sure present? is available in script/get_config.rb 2011-09-16 15:34:08 +02:00
danielgrippi
91e649977c MS DG update copyright 2011-09-14 11:23:12 -07:00
Jonne Hass
54044067e7 get sure script/get_config is executed with the right environment 2011-09-11 16:46:25 +02:00
Jonne Hass
a614985d83 made single process mode configuration more consistent 
* SINGLE_PROCESS_MODE environment variable takes precedence over
  application.yml setting
* SINGLE_PROCESS environment variable takes precedence over
  SINGLE_PROCESS_MODE environment variable to be backward compatible
 2011-09-11 13:54:14 +02:00
Jonne Hass
dabbeaa792 the warning in script/server should be enough 2011-09-07 17:44:02 +02:00
Jonne Hass
92dcffb253 prefer config/script_server.yml over config/script_server_config.yml until we remove the support for the later completly 2011-09-07 13:26:41 +02:00
Jonne Hass
b38cf47661 rename config/script_server_config.yml to config/script_server.yml to remove redundancy 2011-09-07 03:30:43 +02:00
Jonne Hass
670127a13b improved script/server 
* clean up unneeded stuff
* added moar config checks
 2011-09-07 02:17:40 +02:00
Jonne Hass
292b1e7465 small cleanup 2011-09-06 20:13:56 +02:00
Jonne Hass
3b279d179f use env var to determine single process mode in scritp/server 2011-09-05 17:34:05 +03:00
Jonne Hass
b7b9cf6b6d fixed typo in script/server 2011-09-05 16:41:36 +03:00
Jonne Hass
d1a5e627ba export DB in script/server 2011-09-04 19:51:24 +02:00
MrZYX
4dc4c67edd added scripts to export/import locales to/from xml 2011-08-25 14:51:06 +02:00
MrZYX
2a15a17983 rails-i18n is now a gem 2011-07-12 15:04:48 +02:00
MrZYX
a89b072d61 I always forget that space… 2011-05-29 16:19:20 +02:00
MrZYX
dd607fb47d user can now disable thin and use ./script/server to fire up resque and websocket only 2011-05-29 16:11:29 +02:00
Sarah Mei
31a5ef19de Switching to settingslogic to manage our configuration. THE FILE FORMAT HAS CHANGED. OLD APP.YML AND APP_CONFIG.YML FILES WILL NOT WORK ANYMORE. 
Two important differences:
1. The app only looks in one file for settings: config/application.yml. If you want to override something, do it in that file. It is gitignore'd. If config/application.yml does not exist, or exists but is in the old format, you'll get a nice friendly set of instructions on how to convert your old file.
2. script/server settings are no longer in application.yml. They have their own settings file - copy config/script_server_config.yml.example to config/script_server_config.yml. This is also gitignore'd. script/server will print a message and exit if that file doesn't exist.
 2011-05-28 19:44:40 -07:00
Shane Becker
910cc52387 rename config/app_config.yml to config/app.yml in accordance to The Redundant Rendundacy Act of 2011 2011-05-18 11:46:45 -07:00
MrZYX
1a78c8fca1 whoops lets do a deep merge 2011-05-18 19:22:15 +02:00
MrZYX
e79a6597e6 eliminate config/server.sh; use config/app_config.yml.example as base for configuration, config/app_config.yml is now just an overider. This way we can add new configuration options without checking in the application if it's set and the user has to update his app_config.yml only when he want to change something 2011-05-18 16:11:20 +02:00
danielgrippi
1bdfd770b7 check for redis only if not in single process mode 2011-05-17 10:34:40 -07:00
danielgrippi
934a91e47e no need to run the websocket server if redis isn't running (in single_process_mode) 2011-05-17 10:10:20 -07:00
MrZYX
18859a2fba fixed #1073, websocket should now work again for some people at least 2011-05-17 17:52:59 +02:00
MrZYX
00c6631f11 replaced SOCKET_PORT in config/server.sh with the setting from config/app_config.yml; respect single_process_mode setting in app_config.yml in script/server 2011-05-17 16:00:47 +02:00
danielgrippi
8821043ed7 work in process 2011-05-16 18:27:12 -07:00
MrZYX
5918dbf786 typo in script/server 2011-03-26 18:58:18 +01:00
MrZYX
867a5e143f comment out init_public in script server for now as it's buggy and confuses users 2011-03-26 17:57:13 +01:00
Raphael Sofaer
4b4654a408 Changing message to text, partway done, deleted data conversion 2011-03-14 11:39:31 -07:00
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
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