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

82 commits

Author SHA1 Message Date
Eitan Adler
9b75f1a83e Remove non-portable bashisms from most of the scripts. 
Only install.sh has any bashisms left. However, the bug
which prevented it from running on most systems (using
/bin/bash directly) has been fixed.
 2012-11-04 22:41:01 +01:00
Jonne Haß
e75aa111e3 use foremans formation option and not the alias concurrency, start unicorn_rails instead of unicorn 2012-11-04 17:05:16 +01:00
Jonne Haß
f0ef4a764e refactor script/server and associated stuff 2012-10-19 12:25:15 +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ß
53c77f7efd drop rename notice about script_server.yml [ci skip] 2012-09-10 14:00:02 +02:00
David Morley
8be3267d00 remove jammit 2012-05-30 10:22:28 -07:00
Jonne Haß
5cb8cd789e do not query for socket port in script/server [ci skip] 2012-01-19 22:33:30 +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
Jonne Hass
2cad824c82 remove resque-scheduler from start scripts (resque-retry revert) 2011-11-08 13:40:18 +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
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
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
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
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
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
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
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
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
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
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
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