Граф коммитов

153 Коммитов

Автор SHA1 Сообщение Дата
Jennifer Hickey cc89d6bf18 Allow any whitespace between 'require' and 'sinatra'
in main Sinatra app file

Change-Id: I430575cde67eb30db059b0ece554434ee01d246f
2012-05-24 14:52:08 -07:00
Satoru Chinen a14baf8f6b Merge "[dev_setup] Fix memcached service chef cookbook." 2012-05-23 23:01:37 +00:00
Harshawardhan Gadgil 8e6f144e60 Updated readme explaining exclusion of components on dev setup
- Modified vcap binary to show summary of exclusion and point to documentation
Change-Id: Iee8d5defe6021f2eb5bfcb43de46724731574194
2012-05-23 12:41:35 -07:00
Satoru Chinen 2d4db88764 [dev_setup] Fix memcached service chef cookbook.
- change libevent source url (cf_remote_file does not support download from https and redirect yet).
- add checksums (for cf_remote_file).
- use dev_setup cache.

Change-Id: I3ef634af15d99d44e12287427f8e4dbaf8153509
2012-05-23 07:46:36 +09:00
Jesse Zhang d51e0036e4 Merge changes I8068a506,I7ddc6b07
* changes:
  [dev_setup] Use github for lua-cjson source
  [dev_setup] set owner of mongo tarball
2012-05-22 20:54:34 +00:00
Harshawardhan Gadgil 651f27021c [devsetup] memcached statically linked to libevent, disable sasl
Change-Id: Idb8bfd06276c19f69c3fa7b5f44d9fea5196adce
2012-05-22 11:38:43 -07:00
Harshawardhan Gadgil 1ac418e077 Install libevent locally to have memcached config dependency fulfilled
Change-Id: Ie133e24fc6588285b46fb3dd199e72652b998049
2012-05-21 23:30:12 -07:00
Jesse Zhang 0f4be4814f [dev_setup] Use github for lua-cjson source
This change switches to downloading the source from github to avoid
outage of lua-cjson's author's homepage.

  Test plan:
    Run dev_setup on a vanilla VM and pass BVTs

Change-Id: I8068a5060014b46847cfa288916e282de22fb88a
2012-05-21 16:13:50 -07:00
Jesse Zhang bdca700e92 [dev_setup] set owner of mongo tarball
Correcting my stupidity of commenting out the ownership and permission
attributes in commit 2abb03a9.

Change-Id: I7ddc6b070cb167d3285ece9aba3390a837fe4114
2012-05-21 16:12:55 -07:00
Jesse Zhang 2abb03a932 [dev_setup] Fix Chef regression
This change replaces the use of remote_file with cf_remote_file to
work around two limitations in Chef 0.10:
  - Chef shares its downloading logic of remote_file with its REST
    client.  The REST client decompresses archives when it sees the
    header "Content-Encoding: gzip", which is an undesirable behavior
    for remote_file.
  - Chef only uses the specified checksum to trigger update, but it does
    no validation after new remote files are downloaded.

  Our requirement of cf_remote_file:
  - Don't do content decoding magic
  - checksum required and *always* validates the checksum

  Test plan: remove locally compiled ruby and the cached tarballs, run
dev_setup.

Change-Id: Ifb91188ec7ec2f77fafc671d128625ec0f8f1c77
2012-05-21 12:41:30 -07:00
Harshawardhan Gadgil b31c1af7b0 Merge "Dev setup support for memcached as a service" 2012-05-21 19:21:00 +00:00
Dale Olds 6f4acf0733 update uaa with fix for web authorization approval UI, and tests for the fix
update secoauth, fix uaa devsetup

Change-Id: I9d568830fddcd88701cbe507bca3cbb04174000c
2012-05-18 13:08:57 -07:00
Joel D'sa d0fd9bb06c Deploy the UAA in dev setup exactly like we would in bosh.
Change-Id: I393c3787dc0bb051ce0071e03e08a01a48bce5b5
2012-05-16 10:30:24 -07:00
Dave Syer 97b6af10b6 Merge "CF-29: add vcap_components from command line if present" 2012-05-15 20:05:57 +00:00
Harshawardhan Gadgil b00249e238 Dev setup support for memcached as a service
- Configure sasldb and lib event when going dev setup for memcached
- Addressed CR comments
- Updated vcap to remove couchdb from optional services, this change will be made later
- Cleaned up memcache dev setup recipie (in place edit of saslauthd config file)
- Configured neo4j and memcached to be excluded by default, use environment variable to override
- Config files corrections from CR comments
- Deleted unused file, added default 16M memory for memcached instance

Change-Id: I3f28d4b42989af6dc56ca1757daff93b43b5f6d7
2012-05-14 18:00:35 -07:00
Jesse Zhang 4fc210c762 [dev_setup] Group should be an integer
Newer versions of Chef varies its behavior based on the type of GID.
This patch (kudos to Doug MacEachern) makes both new and old versions
happy.

Change-Id: Ib7f05899d2e2e04ca34385512efcad8509d9cc5d
2012-05-14 12:49:37 -07:00
Jennifer Hickey 16169fa310 Add Play Framework
Change-Id: I57c11bcc01f4ce128f07678be334aa130d9b0460
2012-05-11 15:36:40 -07:00
Dave Syer 678790a0c3 CF-29: add vcap_components from command line if present
Change-Id: I0b85e3f5fd16a4697239bff65a2da3c68788b618
2012-05-09 13:31:05 +01:00
Joel D'sa 0eab3c4124 Fixed the uaa config file to match uaa code changes in
preparation for public key signing of tokens.

Change-Id: I8bcedec23216ce77e3aa0f9738348927a80de087
2012-05-07 16:25:01 -07:00
Jesse Zhang d43adb58fd Merge "[dev_setup][bugfix] Bundle install for UAA" 2012-05-04 23:18:03 +00:00
Jesse Zhang 2c56ec1f79 [dev_setup][bugfix] Bundle install for UAA
This change fixes a bug in Change Id22dbb00 (commit 8e5838b8).
dev_setup will now install the bundle for UAA wrapper script.

Change-Id: I8077709bedaf210904dab519ca8ee200f12ea77d
2012-05-04 16:10:57 -07:00
Jennifer Hickey ceb5772f0e Add Ruby back to Rails path
- Fixes running tasks like "rake" from rails console

Change-Id: Ibe72db81960758f2f97d4ee05f044d6c2224ff8f
2012-05-04 15:40:01 -07:00
Alex Suraci 9fa7c22eb1 chef: rubygems -> 1.8.24, bundler -> 1.1.3
Change-Id: I03585ecc84975c262ceb516495d19b8ec2c1c1be
2012-05-02 13:40:13 -07:00
Anfernee Gui fc47a89739 Merge "Merge branch 'router_v2'" 2012-04-30 02:51:00 +00:00
Dave Syer 4aa42e6980 Normalize maven recipe to match the others
Change-Id: I2b1e3de8becb7e00a82a8d41e750d538d2db5ab3
2012-04-27 11:53:21 +01:00
Anfernee Gui 12a7c9ae88 Merge branch 'router_v2'
Conflicts:
	dev_setup/cookbooks/nginx/templates/default/ubuntu-nginx.conf.erb

Change-Id: Icdfef01b286ae8b37876809fbccac0327f9a7c06
2012-04-26 22:14:59 -07:00
Joel D'sa a1ee8eef81 Bump the submodule pointer for the uaa.
Remove a check for the maven repo so that dev_setup
fetches fresh code every time it runs.

Change-Id: Ie8c96d8c83ee204b5f2da7cf7f035c2a0da1badf
2012-04-24 11:34:48 -07:00
Jesse Zhang e8cf8f2a0a Merge "[dev_setup][bugfix] Include attributes in acmdb" 2012-04-20 20:24:10 +00:00
Jesse Zhang 12398c84ee [dev_setup][bugfix] Include attributes in acmdb
Otherwise attribute availability will depend on the run order of chef.

Change-Id: I8d195efdcaa18375027b60b5e9cce23a213f40fa
2012-04-18 14:37:21 -07:00
Jesse Zhang 031019654f [dev_setup] Do not use rake
This change removes the assumption that Rake is available at the time
of installation and only uses "find" to remove bundler settings.

  Users can use vcap_dev_setup -a to skip the prompt (DANGEROUS)

Change-Id: Ibbf62b739452abc47709d5cb84e9b620ae1e5b1b
2012-04-18 14:07:40 -07:00
Jesse Zhang 3de85f2704 [dev_setup][bugfix] Untar from cache
This fixes a bug in I575c76ff , I3bd5e089 and Id1b8e362 that tried
decompressing the source tarballs from /tmp instead of the cache
location.

  Test plan: run dev_setup with no cached tarball and no built rubies,
node.js or erlang.

Change-Id: I97d0595bdf3e1f85335a5e8841e28433028219f9
2012-04-18 14:07:40 -07:00
Jesse Zhang 96892ce55b [dev_setup] Cache Redis tarballs
Test plan: run dev_setup with a cached tarball, without one, and with
a corrupt tarball.
  And to pass BVTs, without doubt.

Change-Id: Iefd2172c8966cef08838e70e6207dbb6c39a4fd2
2012-04-18 14:07:40 -07:00
Jesse Zhang f539791a32 [dev_setup] Clear bundler config
This change clears all bundler remembered settings before attempting
an installation.
  Probably due to the huge repository size, a lot of users try copying
their repos around, despite the recommended best practice of only
copying the bare repo. This change should solve the problem of a
conflict between the dev / test group of gems and production gems for
components, say the Cloud Controller.

  The installer now prompts the user before purging those .bundle
directories, or if you want to run non-interactively, pass --all or -a
to it.

Change-Id: I04b6b9ad462546b51ab1ee11e7e8de91263372bd
2012-04-18 14:07:40 -07:00
Jesse Zhang 7c2b382887 [dev_setup] Enforce 2-space indentation
Formatting change.

Change-Id: Id222e7b3d125c0313dd922378aa3bc20dd78b2cb
2012-04-18 14:07:40 -07:00
Jesse Zhang c5119dc6df [dev_setup] Add key from keyserver
This removes the dependency of wget on adding Opscode packaging PGP
key.
  This also fixes a bug in previous commit of omitting a space before
the closing bracket.

  Test plan: manually remove the key and apt source and run dev_setup.

Change-Id: I445c62b718373f6da61ca9270b9ee1a04544a53f
2012-04-18 14:07:40 -07:00
Jesse Zhang c7682028a6 [dev_setup] Install wget
Wget is not included in `ubuntu-minimal'. Installing wget before
proceeding enables us to run dev_setup in a debootstrap chroot / jail.

Change-Id: Iff012208f58f9946c64ce27448294af42e558a57
2012-04-18 14:07:40 -07:00
Jesse Zhang 9ca1a2b697 [dev_setup] Use -eq for arithmetic comparison
Double equal sign is Bashism for String pattern matching. Bang equal
is also for string pattern matching.

Change-Id: Ic5196a098e0cf44c1ed38ddf0ca6f1260bd8a76e
2012-04-18 14:07:40 -07:00
Jesse Zhang 35afa2b424 [dev_setup] Cache Node.js tarballs
Node.js source tarballs are now cached to speed up repeated
installations.
  Test plan: run dev_setup without cache, with cache, and with a
corrupted cached tarball.

Change-Id: Id1b8e3626cd9491cfd26e9b338dbbc75eca742cc
2012-04-18 14:07:40 -07:00
Jesse Zhang f8b05c3634 [dev_setup] Cache ruby tarballs
Ruby source tarballs are now cached to speed up repeated
installations.
  Test plan: run dev_setup without cache, with cache, and with a
corrupted cached tarball.

Change-Id: I3bd5e089d60ac9b51193f80efffa916d63fdba36
2012-04-18 14:04:46 -07:00
Jesse Zhang 8b0a9b9bcd [dev_setup] Accept -l for log levels
Tune out the debug noise when we are allowed.

Change-Id: I9c841ff72127c1b3cc89e562b204ed6ba9b0502a
2012-04-18 14:04:46 -07:00
Jesse Zhang 122bdc9460 [dev_setup] Prettify list of dirs
Confine the list to column limit of 100.

Change-Id: I0b544f967fcd275f49eb0d531a7ca48e054405f4
2012-04-18 14:04:46 -07:00
Jesse Zhang 5835c95969 [dev_setup] Cache Erlang tarballs
To speed up repeated installation on slow links.

Change-Id: I575c76ff167a07c7174d4893c65a6bbc7b9e559d
2012-04-18 14:04:46 -07:00
Maria Shaldybina 92d7f606e7 Add npm support
- run npm install on stager to recompile native modules
- provide modules based on package.json dependencies
- install npm on dev setup

Change-Id: I3e95aaf0982aea77fc280b58fcf965d1342b2ecf
2012-04-16 13:48:48 -07:00
Joel D'sa 2d9be87a6d Updated cloud_controller that returns UAA tokens
for filtered email addresses
Updated gem md5: fed9927968957574e8002ac9b8f67997
Bumped the uaa submodule pointer

Tested on dev_setup and bosh.

Change-Id: I95765c7a969c8ad1efb9fb40e24b70591ec6c984
2012-04-13 11:17:23 -07:00
Anfernee Gui aed8fafea2 Merge branch 'master' into router_v2
Conflicts:
	router/Gemfile.lock
	router/Rakefile
	router/spec/Rakefile
	router/spec/functional/router_spec.rb
	router/spec/functional/spec_helper.rb

Change-Id: I5c91bf1bab78855b05350948dfdfd4e13557432e
2012-04-13 01:13:12 -07:00
Joel D'sa 7b08f0a438 Bump acm submodule pointer and minor updates to dev_setup.
Change-Id: I1f0b4321007e98775dddd3599d828997e436fbbc
2012-04-07 15:50:32 -07:00
Patrick Bozeman 3d0af19613 extend nginx timeout in dev_setup
Change-Id: Ic00e1a682cf66fcedc7fdeba0f0172f447d3179c
2012-04-10 19:14:46 -07:00
Patrick Bozeman ff0fe04a04 temporarily remove acm/acmdb from dev_setup
Change-Id: Ifc49132e0eb9a59257c359ba8eb3b6b332d8c674
2012-04-10 13:03:15 -07:00
Dave Syer 488f5aa76a CFID-228: chef change to install maven 3 in dev_setup
Change-Id: I3def500755e20539cd10eec35a7630eb64007cc0
2012-04-03 09:39:34 +01:00
Dale Olds 8c6bf37b82 update uaa: uaa client gem, dev_setup, submodule
Change-Id: Iac958a2b0ab19d5816288c6ceb4b51735ef5266c
2012-03-30 19:05:06 -07:00