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

232 commits

Author SHA1 Message Date
Florian Staudacher
b71e1a08dc adapt install.sh to the new config files, 
remove some unnecessary stuff
 2012-10-06 12:06:59 +02:00
Florian Staudacher
599d2e9aae minor install script improvements 2012-10-02 22:09:52 +02:00
Jonne Haß
2a4db54db9 New configuration system 
* Throw away old system
* Add new system
* Add new example files
* Replace all calls
* add the most important docs
* Add Specs
* rename disable_ssl_requirement to require_ssl
* cloudfiles isn't used/called in our code
* since community_spotlight.list is only used as enable flag replace it with such one and remove all legacy and irelevant codepaths around it
* die if session secret is unset and on heroku
* First basic infrastructure for version information
 2012-09-26 20:19:37 +02:00
Jonne Haß
1277cf92b2 refactor ci scripts 2012-09-23 19:00:52 +02:00
Jonne Haß
53c77f7efd drop rename notice about script_server.yml [ci skip] 2012-09-10 14:00:02 +02:00
Florian Staudacher
0c340d8056 don't use extended regexp for sed (not needed) 2012-08-05 13:39:30 +02:00
Samuel Fawaz
7844264571 database configuration does not work when choosing PgSQL 2012-08-03 23:39:03 +02:00
Steven Hancock
a8de3a5a3f Rails.root and File.join cleanup 
- `Rails.root` is a `Pathname`, so let's use `Rails.root.join`
- Clean up most of the remaining `File.join`s
 2012-06-11 03:13:20 -07:00
N.S.Devaraj
94e5b4dc7b Update master 2012-06-05 11:17:26 +05:30
David Morley
8be3267d00 remove jammit 2012-05-30 10:22:28 -07:00
Florian Staudacher
b5a53c03d7 when using system ruby, we might need sudo [ci skip] 2012-05-20 22:46:07 +02:00
Florian Staudacher
a49fe03bd8 use schema instead of migrations for installer [ci skip] 2012-05-19 18:24:13 +02:00
Florian Staudacher
bdf7dba42e update ruby version, be more verbose while installing, load .rvmrc the hard way 2012-05-16 16:11:04 +02:00
Florian Staudacher
6661f91e1d make sure bundler is installed, be more specific in 'welcome' message [ci skip] 2012-05-14 13:01:49 +02:00
Florian Staudacher
2d810a0c43 missing quotes... [ci skip] 2012-05-11 21:20:56 +02:00
Florian Staudacher
6cf163766a install script now checks for proper rvm/ruby and js runtime [ci skip] 2012-05-11 21:13:15 +02:00
Florian Staudacher
80511d065b don't block stdin when using install script [ci skip] 2012-05-10 17:54:43 +02:00
Florian Staudacher
3ff94b0312 install script improvements [ci skip] 2012-04-25 15:12:04 +02:00
Florian Staudacher
4075791376 install script - break out of non-interactive shell [ci skip] 2012-04-24 14:59:03 +02:00
Florian Staudacher
ec5289bd3b continue working on install script [ci skip] 2012-04-17 02:21:05 +02:00
Florian Staudacher
4e030c3de8 made install script a little smarter, hope u like it ;) 2012-04-14 20:28:39 +02:00
Maxwell Salzberg
fae883df56 comments for what I want this to be 2012-04-13 10:25:52 -07:00
Maxwell Salzberg
e861357463 change some defaults for the test enviroment, make a basic install script in bash 2012-04-13 09:49:03 -07:00
Jonne Haß
8739d618ba reenable pg on travis but let it use a basic database.yml 2012-04-10 21:53:33 +02:00
Florian Staudacher
d7eb4b242f this seems to be in fact a bug in ruby 1.9.2, disabled for now 
... when running with 1.9.3 everything's peachy :/
 2012-04-06 03:42:37 +02:00
Florian Staudacher
518346deab try setting a higher swappiness, take other val for mem calculation 2012-04-06 01:55:07 +02:00
Florian Staudacher
248e9d9ae7 add more output (swapping), increase swapfile size 
MY FIRST COMMIT <3 (it would be so awesome if this would make travis green)
:P
 2012-04-06 01:16:37 +02:00
Florian Staudacher
b6a56ca52c create a 64MB swafile on travis 2012-04-06 00:24:08 +02:00
Florian Staudacher
62edcb8c21 css should be delivered by asset pipeline(?) 2012-04-01 13:44:00 +02:00
Jonne Haß
e413a6e70a hopefully get rid of cookiejar error at travis by getting rid of diaspora-clients ruby 1.9 dependencies before bundle install. Not sure why it's only needed if DB=postgres 2012-03-17 13:05:29 +01:00
Jonne Haß
3a149d8cc7 rubygems 1.8.17 should be fine 2012-03-15 15:07:22 +01:00
Maxwell Salzberg
94d2292587 dont install bunlder, travis now has the most recent version 2012-03-14 17:57:06 -07:00
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
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