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

150 commits

Author SHA1 Message Date
Maxwell Salzberg
a18aa9abf4 to whoever is following along at home. I am sorry. testing travis by pushing is not fun 2012-03-13 19:43:19 -07:00
Maxwell Salzberg
0c11172fb0 bundler ARG :( 2012-03-13 19:38:34 -07:00
Maxwell Salzberg
319812fdcb downgrade bundler :( 2012-03-13 19:34:52 -07:00
Maxwell Salzberg
af6b06ed9b fixes to make travis run? 2012-03-13 19:30:19 -07:00
Maxwell Salzberg
0a75e59c19 remove installing wrong bundler manually 2012-03-09 18:36:14 -08:00
Jonne Haß
5cb8cd789e do not query for socket port in script/server [ci skip] 2012-01-19 22:33:30 +01:00
Jonne Haß
ecc79fb333 bump to rubygems 1.8.15 2012-01-19 14:07:11 +01:00
Jonne Haß
ce0507f9eb move config/ci to script/ci, update rubygems before bundle install 2012-01-19 13:57:47 +01:00
Sarah Mei
dcba59043d Related to #2020 - add note to script/server header telling people to use foreman instead for development 2012-01-12 06:29:29 -08:00
danielgrippi
0e5bb81d66 remove all references to the websocket. bang bang. 2012-01-10 12:28:19 -08:00
Jonne Haß
6859f97145 comment out websocket in script/server 2012-01-04 16:58:01 +01:00
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