ventriloquist 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8d76d64a1ef2e06ce16e9a187f7a430e7e660d1
-  data.tar.gz: 8dd069f4f7607cae3013c29b43db1337e8d90d2a
+  metadata.gz: bb79b6f3f2aca4996289263b71f00b7c287d2147
+  data.tar.gz: c7fa55870588d8600bebf38e98e34b4afe6ee6e8
 SHA512:
-  metadata.gz: 067d9a0696b62a1ca12149f77e99f41b998662bc0d393c06f03028456175bf966b2437365b85e2d16514079441d56e8b74d1c0ae79caf45c3e847423c376cfe6
-  data.tar.gz: af84540aa5fa5dd611403157f3661fb1b9010ee88f878d23b907299ac4dec12847a15f24fd02e960c84d540422763db193bc300b34986755edd1b8d8b9e56f8b
+  metadata.gz: edf98aed4a75d4c6b8cb77069fc90d5fc358a364950819e509e331f64d41cc70791ac6f0bb640b08fa69f50535c9bc481becdffae3d12d24aa2d6f2e0702a38a
+  data.tar.gz: 96e17b1498023728c600b1e00399d84513141de538072dbde3c159e719dc16d1acf7091878cdf76d88a81c584b404a4bfaaeadf621d505a968b9abec4d1d233c

data/.travis.yml

@@ -1,7 +1,3 @@
 language: ruby
 rvm:
-  - 1.9.3
   - 2.0.0
-matrix:
-  allow_failures:
-    - rvm: 2.0.0

data/CHANGELOG.md

@@ -1,3 +1,34 @@
+## [0.5.0](https://github.com/fgrehm/ventriloquist/compare/v0.4.1...v0.5.0) (Apr 06, 2014)
+
+BACKWARDS INCOMPATIBILITY:
+
+  - Support for Vagrant < 1.5 has been removed, please try to use a previous plugin
+    version if you can't upgrade.
+  - Services / platforms versions are now required to be specified from Vagrantfile
+    to increase reproducibility / reduce the chances of surprises and simplify plugin
+    maintenance.
+  - _All_ of the services images have been rebuilt from scratch and are now
+    trusted builds.
+  - The base image for services was changed from Ubuntu Quantal 12.10 to Debian Jessie.
+
+FEATURES:
+
+  - Added shortcut for installing multiple ruby / nodejs / python versions from `Vagrantfile`
+
+IMPROVEMENTS:
+
+  - core: Bumped docker to 0.9.1
+  - core: Removed dependency on [vocker]
+  - core: Simplified usage with vagrant-lxc
+  - platforms: Improved handling of multiple versions specifications
+  - platforms: Show message when already installed instead of keeping silent
+  - platforms/phantomjs: Leverage vagrant-cachier on installation
+  - platforms/phantomjs: Fix installation of recent versions
+  - platforms/go: Leverage vagrant-cachier on installation
+  - platforms/elixir: Fix installation of recent versions
+  - services/postgres: Rename ventriloquist-pg images to ventriloquist-postgres
+
+
 ## [0.4.1](https://github.com/fgrehm/ventriloquist/compare/v0.4.0...v0.4.1) (December 13, 2013)
 
 BUG FIXES:

data/DEVELOPMENT.md

@@ -0,0 +1,37 @@
+# Development notes
+
+[Vagrantfile for testing](/development/Vagrantfile)
+
+## Testing services
+
+```sh
+redis-cli ping
+psql
+mysql -e 'SHOW DATABASES'
+
+# Memcached: run STATS then QUIT
+telnet localhost 11211
+
+# MailCatcher
+curl localhost:1080
+
+# RethinkDB
+curl localhost:8080
+
+# ElasticSearch
+curl $(docker port $(cat /var/lib/ventriloquist/cids/es) 9200)
+```
+
+## Testing platforms
+
+```sh
+rvm list
+ruby -v
+nvm list
+node -v
+pyenv versions
+python --version
+phantomjs -v
+iex --version
+erl -eval 'erlang:display(erlang:system_info(otp_release)), halt().'  -noshell
+```

data/Gemfile

@@ -1,20 +1,20 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in ventriloquist.gemspec
-gemspec
-
-group :development, :test do
-  gem 'rake'
-  gem 'vagrant', github: 'mitchellh/vagrant', tag: 'v1.3.5'
-  gem 'rspec'
-  gem 'simplecov', require: false
-  gem 'bogus'
+group :plugins do
+  # Specify your gem's dependencies in ventriloquist.gemspec
+  gemspec
+  gem 'vagrant-lxc',      github: 'fgrehm/vagrant-lxc'
+  gem 'vagrant-pristine', github: 'fgrehm/vagrant-pristine'
+  gem 'vagrant-cachier',  github: 'fgrehm/vagrant-cachier'
 end
 
 group :development do
-  gem 'vagrant-lxc',           github: 'fgrehm/vagrant-lxc'
-  gem 'vagrant-pristine',      github: 'fgrehm/vagrant-pristine'
-  gem 'vagrant-global-status', github: 'fgrehm/vagrant-global-status'
-  gem 'vagrant-cachier',       github: 'fgrehm/vagrant-cachier'
   gem 'guard-rspec'
 end
+
+group :development, :test do
+  gem 'rake'
+  gem 'vagrant', github: 'mitchellh/vagrant', tag: 'v1.5.2'
+  gem 'rspec', '3.0.0.beta2'
+  gem 'simplecov', require: false
+end

data/Gemfile.lock

@@ -1,121 +1,119 @@
 GIT
   remote: git://github.com/fgrehm/vagrant-cachier.git
-  revision: 56b86a0debd6c899e92c10e403c4623b0d304fc1
+  revision: 2df1e319408a7e6f1c6e75d48e36591199e98527
   specs:
-    vagrant-cachier (0.5.1.dev)
-
-GIT
-  remote: git://github.com/fgrehm/vagrant-global-status.git
-  revision: 2f1eb13b35567e04f3b5ee51996960199fc0c3e2
-  specs:
-    vagrant-global-status (0.1.3.dev)
+    vagrant-cachier (0.6.1.dev)
 
 GIT
   remote: git://github.com/fgrehm/vagrant-lxc.git
-  revision: c7fff4d9354b8c8fc4d75625dca3dfc411729032
+  revision: 69ba4d8f7089150a417b53c14b05fdde557cd53c
   specs:
-    vagrant-lxc (0.7.1.dev)
+    vagrant-lxc (1.0.0.beta1.dev)
 
 GIT
   remote: git://github.com/fgrehm/vagrant-pristine.git
-  revision: 4638491786943bfbf6f115b1fc379f069963fe46
+  revision: 503dbc47848c81d0fbfa6840491856f518d244a1
   specs:
     vagrant-pristine (0.3.0)
 
 GIT
   remote: git://github.com/mitchellh/vagrant.git
-  revision: a40522f5fabccb9ddabad03d836e120ff5d14093
-  tag: v1.3.5
+  revision: d19047908cc2d20fe2b954eff5b6ef9e94f8cfbc
+  tag: v1.5.2
   specs:
-    vagrant (1.3.5)
-      childprocess (~> 0.3.7)
+    vagrant (1.5.2)
+      bundler (~> 1.5.2)
+      childprocess (~> 0.5.0)
       erubis (~> 2.7.0)
       i18n (~> 0.6.0)
-      log4r (~> 1.1.9)
+      listen (~> 2.4.0)
+      log4r (~> 1.1.9, < 1.1.11)
       net-scp (~> 1.1.0)
-      net-ssh (~> 2.6.6)
+      net-ssh (>= 2.6.6, < 2.8.0)
+      rb-kqueue (~> 0.2.0)
+      wdm (~> 0.1.0)
 
 PATH
   remote: .
   specs:
-    ventriloquist (0.4.1)
-      vocker (~> 0.4.1)
+    ventriloquist (0.5.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    bogus (0.1.4)
-      dependor (>= 0.0.4)
     celluloid (0.15.2)
       timers (~> 1.1.0)
-    childprocess (0.3.9)
+    childprocess (0.5.2)
       ffi (~> 1.0, >= 1.0.11)
     coderay (1.1.0)
-    dependor (1.0.1)
     diff-lcs (1.2.5)
-    docile (1.1.1)
+    docile (1.1.3)
     erubis (2.7.0)
     ffi (1.9.3)
     formatador (0.2.4)
-    guard (2.2.4)
+    guard (2.4.0)
       formatador (>= 0.2.4)
       listen (~> 2.1)
       lumberjack (~> 1.0)
       pry (>= 0.9.12)
       thor (>= 0.18.1)
-    guard-rspec (4.1.0)
-      guard (>= 2.1.1)
-      rspec (~> 2.14)
+    guard-rspec (4.2.8)
+      guard (~> 2.1)
+      rspec (>= 2.14, < 4.0)
     i18n (0.6.9)
-    listen (2.3.1)
+    listen (2.4.1)
       celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
     log4r (1.1.10)
-    lumberjack (1.0.4)
+    lumberjack (1.0.5)
     method_source (0.8.2)
-    multi_json (1.8.2)
+    multi_json (1.9.2)
     net-scp (1.1.2)
       net-ssh (>= 2.6.5)
-    net-ssh (2.6.8)
-    pry (0.9.12.4)
+    net-ssh (2.7.0)
+    pry (0.9.12.6)
       coderay (~> 1.0)
       method_source (~> 0.8)
       slop (~> 3.4)
-    rake (10.1.0)
-    rb-fsevent (0.9.3)
-    rb-inotify (0.9.2)
+    rake (10.2.2)
+    rb-fsevent (0.9.4)
+    rb-inotify (0.9.3)
+      ffi (>= 0.5.0)
+    rb-kqueue (0.2.2)
       ffi (>= 0.5.0)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.7)
-    rspec-expectations (2.14.4)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.4)
+    rspec (3.0.0.beta2)
+      rspec-core (= 3.0.0.beta2)
+      rspec-expectations (= 3.0.0.beta2)
+      rspec-mocks (= 3.0.0.beta2)
+    rspec-core (3.0.0.beta2)
+      rspec-support (= 3.0.0.beta2)
+    rspec-expectations (3.0.0.beta2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (= 3.0.0.beta2)
+    rspec-mocks (3.0.0.beta2)
+      rspec-support (= 3.0.0.beta2)
+    rspec-support (3.0.0.beta2)
     simplecov (0.8.2)
       docile (~> 1.1.0)
       multi_json
       simplecov-html (~> 0.8.0)
     simplecov-html (0.8.0)
-    slop (3.4.7)
-    thor (0.18.1)
+    slop (3.5.0)
+    thor (0.19.1)
     timers (1.1.0)
-    vocker (0.4.1)
+    wdm (0.1.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bogus
   guard-rspec
   rake
-  rspec
+  rspec (= 3.0.0.beta2)
   simplecov
   vagrant!
   vagrant-cachier!
-  vagrant-global-status!
   vagrant-lxc!
   vagrant-pristine!
   ventriloquist!

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2013 Fabio Rehm
+Copyright (c) 2013-2014 Fabio Rehm
 
 MIT License
 

data/README.md

@@ -1,5 +1,7 @@
 # Ventriloquist
 
+[![Build Status](https://travis-ci.org/fgrehm/ventriloquist.png?branch=master)](https://travis-ci.org/fgrehm/ventriloquist) [![Gem Version](https://badge.fury.io/rb/ventriloquist.png)](http://badge.fury.io/rb/ventriloquist) [![Code Climate](https://codeclimate.com/github/fgrehm/ventriloquist.png)](https://codeclimate.com/github/fgrehm/ventriloquist) [![Gittip](http://img.shields.io/gittip/fgrehm.svg)](https://www.gittip.com/fgrehm/)
+
 > **ven·tril·o·quist**: _(noun)_ a person who can speak or utter sounds so that
   they seem to come from somewhere else, esp. an entertainer who makes their voice
   appear to come from a dummy of a person or animal.
@@ -23,8 +25,8 @@ for development on [Discourse](http://www.discourse.org/):
 Vagrant.configure("2") do |config|
   config.vm.box = "quantal64"
   config.vm.provision :ventriloquist do |env|
-    env.services  << %w( redis pg:9.1 mailcatcher )
-    env.platforms << %w( nodejs ruby:1.9.3 )
+    env.services  << %w( redis-2.8 postgres-9.1 mailcatcher-0.5 )
+    env.platforms << %w( nodejs-0.10 ruby-1.9.3 )
   end
 end
 ```
@@ -40,22 +42,9 @@ end
   to legacy projects.
 
 
-## Status
-
-Basically a "stable experiment", I've been using VMs configured with the plugin
-for the last 3 months and I tested it against the following Ubuntu VMs using
-Docker 0.6.5+ and Vagrant 1.3.0+:
-
-* http://bit.ly/vagrant-lxc-raring64-2013-10-23 (yes! LXC inception :)
-* http://cloud-images.ubuntu.com/vagrant/raring/current/raring-server-cloudimg-amd64-vagrant-disk1.box
-
-_Please note that in order to use the plugin on [vagrant-lxc](https://github.com/fgrehm/vagrant-lxc)
-containers you need some [extra steps](#usage-with-vagrant-lxc) described below_
-
-
 ## Installation
 
-Make sure you have Vagrant 1.2+ and run:
+Make sure you have Vagrant 1.5+ and run:
 
 ```
 vagrant plugin install ventriloquist
@@ -69,15 +58,15 @@ Add the provisioner block to your Vagrantfile and `vagrant up` it:
 ```ruby
 Vagrant.configure("2") do |config|
   config.vm.provision :ventriloquist do |env|
-    # Pick the Docker version you want to use (defaults to 0.7.0)
+    # Pick the Docker version you want to use (defaults to 0.9.1)
     # or use :latest to install the latest version available
-    env.docker_version = '0.6.7'
+    env.docker_version = '0.9.1'
 
     # Pick the services you need to have around
-    env.services << %w( redis pg:9.1 memcached elasticsearch )
+    env.services << %w( redis-2.8 postgres-9.1 memcached-1.4 elasticsearch-1.1 )
 
     # Configure your development environment
-    env.platforms << %w( nodejs ruby:2.0.0 go )
+    env.platforms << %w( nodejs-0.10 ruby-2.0.0 go-1.2 )
 
     # Install random packages
     env.packages << %w( imagemagick htop sqlite3 )
@@ -100,18 +89,18 @@ end
 
 ## Available services
 
-| Name          | Provides       | Notes |
-| ------------- | -------------- | ----- |
-| elasticsearch | 0.90.7         | Runs on port 9200 |
-| memcached     | 1.4.15         | Runs on port 11211 |
-| pg            | PostgreSQL 9.3 | Runs on port 5432 and adds an `export PGHOST=localhost` to the guest's `/etc/profile.d/ventriloquist`. It will also install the `postgresql-client` and `libpq-dev` packages on the guest. |
-| pg:9.2        | PostgreSQL 9.2 | Same as above |
-| pg:9.1        | PostgreSQL 9.1 | Same as above |
-| mysql         | 5.6            | Runs on port 3306 and creates a `/home/vagrant/.my.conf`. It will also install the `mysql-client` and `libmysqlclient-dev` packages on the guest. |
-| mysql:5.5     | 5.5            | Same as above |
-| redis         | 2.8.2          | Runs on port 6379 and installs / compiles the `redis-cli` excutable |
-| mailcatcher   | 0.5.12         | SMPT server runs on 1025 and web interface on 1080 |
-| rethinkdb     | 1.11.0         | Uses the 28015 port for the client driver, 29015 for the intracluster connections and 8080 for the administrative web UI |
+| Name              | Notes |
+| ----------------- | ----- |
+| elasticsearch-1.1 | Runs on port 9200 |
+| memcached-1.4     | Runs on port 11211 |
+| postgres-9.3      | Runs on port 5432 and adds an `export PGHOST=localhost` to the guest's `/etc/profile.d/ventriloquist`. It will also install the `postgresql-client` and `libpq-dev` packages on the guest. |
+| postgres-9.2      | Same as above |
+| postgres-9.1      | Same as above |
+| mysql-5.6         | Runs on port 3306 and creates a `/home/vagrant/.my.conf`. It will also install the `mysql-client` and `libmysqlclient-dev` packages on the guest. |
+| mysql-5.5         | Same as above |
+| redis-2.8         | Runs on port 6379 and installs / compiles the `redis-cli` excutable |
+| mailcatcher-0.5   | SMPT server runs on 1025 and web interface on 1080 |
+| rethinkdb-1.12    | Uses the 28015 port for the client driver, 29015 for the intracluster connections and 8080 for the administrative web UI |
 
 The `services` parameter passed in on the Vagrantfile are the ones built with the
 Dockerfiles available under [_/services_](services) that are configured to require
@@ -125,59 +114,52 @@ PostgreSQL will involve installing the `postgresql-client` package and adding an
 `export PGHOST=localhost` to the guest's `/etc/profiles.d/ventriloquist.sh` so that
 the `psql` client works without any extra params.
 
-Please note that all of the builtin images are available on the [Docker index](https://index.docker.io/)
-with the `fgrehm/ventriloquist-` prefix that is ommited on the table above.
+Please note that all of the builtin images are available as trusted builds on the
+[Docker index](https://index.docker.io/) with the `fgrehm/ventriloquist-` prefix
+that is ommited on the table above.
 
-Since services are just Docker images, you can build your own image, push to the
-registry and use it on your Vagrantfile, you'll just need to specify its fully
-qualified name and the corresponding Ventriloquist service:
+For fine grained control over how Ventriloquist runs images:
 
 ```ruby
 Vagrant.configure("2") do |config|
   config.vm.provision :ventriloquist do |env|
     env.services << {
-      redis: { image: 'username/redis' },
-      pg:    { image: 'otheruser/pg', tag: 'latest' }
+      redis:    { image: 'username/redis' },
+      postgres: { image: 'otheruser/postgres' }
     }
 
     # If you need more instances of a service, you'll need to give it a unique
     # name and fine tune it at will, for example:
     env.services << {
-      # This is basically a Vocker container definition
-      api_db: { image: 'otheruser/pg', ports: [':5432'] },
+      # This is simple Vagrant Docker provisioner container
+      api_db: { image: 'otheruser/postgres', args: '-p :5432' },
 
-      # The 'vimage' saves you from typing in `image: 'fgrehm/ventriloquist-redis'`
-      worker_redis: { vimage: 'redis' },
+      # The 'vimage' saves you from typing in `image: 'fgrehm/ventriloquist-redis-2.8'`
+      worker_redis: { vimage: 'redis-2.8', type: 'redis', args: '-P' },
 
       # The 'type' parameter tells Ventriloquist to configure the service with
       # its defaults and does some extra work (like installing additional packages)
       # if the service requires it
-      worker_db: { image: 'your-user/your-pg', type: 'pg' },
+      worker_db: { image: 'your-user/your-postgres', type: 'postgres' },
     }
   end
 end
 ```
 
-For more information on creating / running Docker containers please have a look
-at [Vocker](https://github.com/fgrehm/vocker)'s documentation.
-
-If you want to build your own service and don't have plans to deploy your
-containers to production, make sure you "[inherit](services/redis/Dockerfile#L5)"
-your services from the [`fgrehm/ventriloquist-base`](services/base/Dockerfile)
-image in order to save on some disk space.
+_See http://docs.vagrantup.com/v2/provisioning/docker.html for other arguments_
 
 
 ## Available platforms
 
-| Name      | Provides          |
+| Name      | Notes             |
 | --------- | ----------------- |
-| ruby      | rvm + Ruby 2.0.0  |
-| go        | 1.2               |
-| nodejs    | nvm + Nodejs 0.10 |
-| phantomjs | 1.9.2             |
-| erlang    | The latest version available at https://packages.erlang-solutions.com/erlang/ (currently R16B02) |
-| elixir    | 0.11.2            |
-| python    | pyenv + 3.3.2     |
+| ruby      | Uses rvm for installing rubies |
+| go        | Downloads from https://code.google.com/p/go/downloads/list |
+| nodejs    | Uses nvm for installing node versions |
+| phantomjs | Downloads from https://bitbucket.org/ariya/phantomjs/downloads or https://code.google.com/p/phantomjs/downloads/list |
+| erlang    | The latest version available at https://packages.erlang-solutions.com/erlang/ (currently R16B03-1) |
+| elixir    | Downloads from https://github.com/elixir-lang/elixir/releases |
+| python    | Uses pyenv for installing python versions |
 
 In order to configure the VM for usage with the programming language that your
 app is written on, the plugin leverages Vagrant's [guest capabilities](http://docs.vagrantup.com/v2/plugins/guest-capabilities.html)
@@ -185,10 +167,27 @@ to deal with distribution specifics. Right now things should work just fine on
 Ubuntu VMs and you'll be warned in case you specify a something that is not supported
 on your guest machine.
 
-Unless you specify the version to use (like in `ruby:1.9.3` from the Discourse
-example above), the latest version of the available platforms will be installed.
-For example, if you omit the Ruby version you want to use, Ventriloquist will
-install 2.0.0 with the latest path level.
+Platforms like `ruby`, `nodejs` and `python` also support installing multiple
+versions since we rely on tools that take care of that for us:
+
+```ruby
+Vagrant.configure("2") do |config|
+  config.vm.provision :ventriloquist do |env|
+    env.platforms << {
+      # The first version provided will be set as the default
+      nodejs: { versions: ['0.10', '0.9']    },
+      ruby:   { versions: ['2.1.1', '2.1.0'] }
+
+      # The code above is the same as
+      env.platforms << %w( nodejs-0.9 nodejs-0.10 ruby-2.1.1 ruby-2.1.0 )
+    }
+  end
+end
+```
+
+_NOTICE: Previous versions of the plugin allowed users to omit the platform version
+to be installed, but starting with 0.5.0 you need to set it explicitly on your
+`Vagrantfile` (ex: `env.platforms << 'ruby'` becomes `env.platforms << 'ruby-2.1.1`)_
 
 
 ## System packages
@@ -227,70 +226,24 @@ you run a `apt-get upgrade` or the equivalent.
 * Use a Docker container as the dev environment within the Vagrant VM, maybe using
   [Buildstep](https://github.com/progrium/buildstep) or something like it to
   configure it.
-* Allow services configuration from the Vagrantfile (like setting the max memory
-  used by memcached for example)
-* Saner defaults for services (none of the provided services have memory / connection
-  limits or the like)
-* Make use of Docker data volumes for services to avoid loosing data
-* Introduce "profiles" - `heroku:free` for example would limit postgresql / memcached
-  / etc resources (like max memory / connections) to what people will get there.
 * Support for installing "random" tools / packages from within the Vagrantfile
   (like git / sqlite3 / heroku toolbelt / ruby gems / npm packages)
-* Leverage [vagrant-cachier](https://github.com/fgrehm/vagrant-cachier) during
-  provisioning
-* Convert provisioning code to a set of bash scripts so that it can be reused
-  outside of Vagrant environments as well (maybe use them for building [Packer](http://www.packer.io/)
-  images)
 
 
 ### Usage with [vagrant-lxc](https://github.com/fgrehm/vagrant-lxc)
 
-If you are on a Linux machine, you can use vagrant-lxc to avoid messing up with
-your working environment. While developing this plugin I was able to recreate
-containers that were capable of using Docker without issues multiple times on
-an up to date Ubuntu 13.04 host and guest.
-
-In order to allow a vagrant-lxc container to boot nested Docker containers you'll
-just need to `apt-get install apparmor-utils && aa-complain /usr/bin/lxc-start`
-and add the code below to your Vagrantfile:
+If you are on a Linux machine and want to use vagrant-lxc you'll need to enable
+container nesting by adding the code below to your Vagrantfile:
 
 ```ruby
 Vagrant.configure("2") do |config|
+  # vagrant-lxc specific tweaks for getting docker to run inside the container
   config.vm.provider :lxc do |lxc|
     lxc.customize 'aa_profile', 'unconfined'
   end
-
-  config.vm.provision :shell, inline: %[
-    if ! [ -f /etc/default/lxc ]; then
-      cat <<STR > /etc/default/lxc
-LXC_AUTO="true"
-USE_LXC_BRIDGE="true"
-LXC_BRIDGE="lxcbr0"
-LXC_ADDR="10.0.252.1"
-LXC_NETMASK="255.255.255.0"
-LXC_NETWORK="10.0.252.0/24"
-LXC_DHCP_RANGE="10.0.252.2,10.0.252.254"
-LXC_DHCP_MAX="253"
-LXC_SHUTDOWN_TIMEOUT=120
-STR
-    fi
-  ]
 end
 ```
 
-The LXC networking configs are only required if you are on an Ubuntu host as
-it automatically creates the `lxcbr0` bridge for you on the host machine and
-if you don't do that the vagrant-lxc container will end up crashing as it
-will collide with the host's `lxcbr0`.
-
-
-## Support
-
-Support this project and [others by fgrehm](https://github.com/fgrehm)
-via [gittip](https://www.gittip.com/fgrehm/).
-
-[![Support via Gittip](https://rawgithub.com/twolfson/gittip-badge/0.1.0/dist/gittip.png)](https://www.gittip.com/fgrehm/)
-
 
 ## Contributing
 
@@ -299,5 +252,3 @@ via [gittip](https://www.gittip.com/fgrehm/).
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
-
-[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/fgrehm/ventriloquist/trend.png)](https://bitdeli.com/free "Bitdeli Badge")