danielvincent
|
fdd3264812
|
proxy buffering enabled and gzip compression for files other than text/html in nginx.conf
|
2010-11-02 12:03:10 -07:00 |
|
Raphael
|
1fd3aeabd9
|
Add or later to license notice
|
2010-10-07 16:25:34 -07:00 |
|
Alec Leamas
|
0d51af0a13
|
Removing shebang on non-script.
|
2010-10-07 16:11:43 +02:00 |
|
Raphael
|
1fa732498b
|
Update sprinkle script
|
2010-10-05 11:55:47 -07:00 |
|
Dorian
|
e792344c0e
|
Use improved whitespace:scrub_gratuitous_newlines
|
2010-09-26 12:52:39 -04:00 |
|
Dorian
|
6ffc03a4c9
|
Big clean up: delete trailing whitespace
|
2010-09-26 12:48:40 -04:00 |
|
Stephen Caudill
|
536cea5e44
|
Remove consecutive empty lines
|
2010-09-25 12:06:39 -04:00 |
|
ilya
|
2b70317677
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-17 15:33:51 -07:00 |
|
Raphael
|
a96a52def7
|
Run 3 thins
|
2010-09-17 11:58:34 -07:00 |
|
Raphael
|
2e8ecceaf7
|
Merge branch 'master' of github.com:diaspora/diaspora into production
|
2010-09-16 21:53:34 -07:00 |
|
ilya
|
fc234390c3
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-16 19:44:29 -07:00 |
|
cryptix
|
c80a79dea5
|
Unified require quotes
|
2010-09-17 07:44:47 +08:00 |
|
ilya
|
41f46c47b1
|
removed the deploy key, not needed now that the repo is public, thx for the heads up Juha @ Enemy & Sons Ltd
|
2010-09-16 11:48:24 -07:00 |
|
Raphael
|
c67a8ea100
|
Merge branch 'master' of github.com:diaspora/diaspora into production
Conflicts:
config/deploy.rb
config/environments/production.rb
spec/models/request_spec.rb
|
2010-09-15 22:37:05 -07:00 |
|
Stephen Caudill
|
5595dc5f48
|
Retab the project
|
2010-09-16 13:16:10 +08:00 |
|
Jamie Wilkinson
|
fbdd50172d
|
Cleanup stray whitespace
|
2010-09-16 10:07:59 +08:00 |
|
Raphael
|
de93fd2818
|
Merge branch 'master' of github.com:diaspora/diaspora into production
|
2010-09-15 18:10:13 -07:00 |
|
Raphael
|
708e9f88a5
|
Spell our own name right
|
2010-09-15 17:56:18 -07:00 |
|
Raphael
|
1006e8a680
|
Merge branch 'master' of github.com:diaspora/diaspora into production
|
2010-09-15 11:01:11 -07:00 |
|
Raphael
|
aa3ebe372c
|
License notices replaced
|
2010-09-15 10:58:48 -07:00 |
|
Daniel Vincent Grippi
|
c1a9a89be7
|
Merge branch 'production' of github.com:diaspora/diaspora into production
Conflicts:
app/models/user.rb
config/deploy.rb
spec/factories.rb
spec/models/request_spec.rb
spec/spec_helper.rb
|
2010-09-14 11:08:18 -07:00 |
|
Daniel Vincent Grippi
|
4c15b1a01c
|
added license to every single goddamn file. also, put one in the root dir.
|
2010-09-13 14:23:50 -07:00 |
|
Raphael
|
a23df47dbc
|
Trying to merge in the pivots changes that we want in master
|
2010-08-18 21:10:42 -07:00 |
|
Raphael
|
b55a99ec09
|
conf changes, kill nginx with go_cold
|
2010-08-17 11:42:59 -07:00 |
|
Raphael
|
2261a0d8a4
|
nginx...
|
2010-08-17 11:28:22 -07:00 |
|
Raphael
|
16f53922c5
|
nginx conf done, comments deleted
|
2010-08-17 11:22:06 -07:00 |
|
Raphael
|
29e3fa4d04
|
sprinkle role
|
2010-08-17 11:04:34 -07:00 |
|
root
|
b6934a55d1
|
the required file permission change for the private key now happens
|
2010-08-09 03:28:55 +00:00 |
|
root
|
41e6fc31a3
|
final sprinkle change
|
2010-08-09 03:11:32 +00:00 |
|
ilya
|
86c43ecbd8
|
moving ssh key relatedstuff around in sprinkle scrip
|
2010-08-08 19:48:55 -07:00 |
|
ilya
|
49544135a1
|
Removing existing ssh key directory
|
2010-08-08 19:16:20 -07:00 |
|
Raphael
|
8356126f8d
|
Added deploy key
|
2010-08-05 15:44:18 -07:00 |
|
Raphael
|
61ffda6bf4
|
re-enabling sprinkle script
|
2010-07-23 11:05:29 -07:00 |
|
ilya
|
d7e546c3b3
|
RS IZ Vim in sprinkle, not too nice
|
2010-07-21 15:26:08 -07:00 |
|
ilya
|
cb67a7fa1b
|
RS IZ sprinkle editing
|
2010-07-21 10:04:55 -07:00 |
|
Raphael
|
de3a08d031
|
Took out putses
|
2010-07-20 10:23:19 -07:00 |
|
Raphael
|
1b2024f5bb
|
Adding imagemagick to sprinkle
|
2010-07-17 18:50:46 -07:00 |
|
ilya
|
5a6fd7c6a0
|
hopefully imagemagic take 2
|
2010-07-16 23:19:33 -07:00 |
|
ilya
|
a34a458ba5
|
hopefully imagemagic will work
|
2010-07-16 23:15:42 -07:00 |
|
maxwell
|
5d0c5dbd86
|
MS kinda hacky webfinger email fix
|
2010-07-16 23:03:59 -07:00 |
|
ilya
|
eb9c6814d6
|
screen in tools, keyring clearing disabled
|
2010-07-09 13:36:24 -04:00 |
|
ilya
|
cdd6e2034e
|
Updated deploy scripts
|
2010-07-09 00:23:37 -04:00 |
|
Raphael
|
5e78163df3
|
added bundler to gemfile
|
2010-07-06 19:23:34 -07:00 |
|
Raphael
|
bfe5769fcb
|
rolled back to development environment
|
2010-06-22 15:47:18 -07:00 |
|
Raphael Sofaer
|
807314d469
|
added htop to sprinkle
|
2010-06-18 23:54:32 -07:00 |
|
Raphael Sofaer
|
fbe8915250
|
IZ uncommented the lines for the rackspace deploy
|
2010-06-18 22:08:17 -07:00 |
|
Raphael Sofaer
|
cd1ed1d164
|
Hopefully final conf changes
|
2010-06-18 19:02:59 -07:00 |
|
Raphael Sofaer
|
c435ba28f9
|
changing configures...
|
2010-06-18 18:09:57 -07:00 |
|
Raphael Sofaer
|
178085b984
|
RS, IZ; A bunch of deploy stuff, including nginx, nginx_conf (maybe), and thin conf
|
2010-06-18 17:33:43 -07:00 |
|
Raphael Sofaer
|
560269ef87
|
cleaning up sprinkle
|
2010-06-17 20:52:51 -07:00 |
|