vagrant-managed-servers 0.1.0 → 0.2.0

data/.gitignore

@@ -7,6 +7,7 @@
 pkg/*
 tags
 Gemfile.lock
+vendor
 
 # Vagrant
 .vagrant
@@ -14,4 +15,4 @@ Gemfile.lock
 
 # Berkshelf
 cookbooks
-Berksfile.lock
+Berksfile.lock

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+  - 1.9.3
+script:
+  - rake spec

data/Berksfile

@@ -1,4 +1,4 @@
-site :opscode
+source "https://api.berkshelf.com"
 
 cookbook 'apt'
 cookbook 'apache2'

data/CHANGELOG.md

@@ -1,4 +1,10 @@
 
-# 0.1.0 (unreleased)
+# 0.2.0 (unreleased)
+
+* fix rsync command for Vagrant 1.4 compatibility ([#15](https://github.com/tknerr/vagrant-managed-servers/issues/15))
+* chown synced dirs recursively ([#13](https://github.com/tknerr/vagrant-managed-servers/issues/13))
+* minor README fixes ([#11](https://github.com/tknerr/vagrant-managed-servers/issues/11), [#12](https://github.com/tknerr/vagrant-managed-servers/issues/12), [#16](https://github.com/tknerr/vagrant-managed-servers/issues/16))
+
+# 0.1.0 (released 2013-06-10)
 
 * Initial release

data/Gemfile

@@ -6,9 +6,13 @@ group :development do
   # We depend on Vagrant for development, but we don't add it as a
   # gem dependency because we expect to be installed within the
   # Vagrant environment itself using `vagrant plugin`.
-  gem "vagrant", "1.2.2",
+  gem "vagrant", "1.4.3",
     :git => "https://github.com/mitchellh/vagrant.git",
-    :ref => "v1.2.2"
-  gem "berkshelf", "2.0.1"
-  gem "vagrant-omnibus", "1.0.2"
+    :ref => "v1.4.3"
+  gem "vagrant-berkshelf", "1.4.0.dev1",
+    :git => "https://github.com/berkshelf/vagrant-berkshelf.git",
+    :ref => "28941db7c2f7d769b979c1d2695ac19b172a6542"
+  gem "vagrant-omnibus", "1.3.0",
+    :git => "https://github.com/schisamo/vagrant-omnibus.git",
+    :ref => "4c91e0f85acdaa88de5e21c5f3f61471a28455d2"
 end

data/README.md

@@ -1,11 +1,13 @@
 # Vagrant ManagedServers Provider
 
+[![Build Status](https://travis-ci.org/tknerr/vagrant-managed-servers.png?branch=master)](https://travis-ci.org/tknerr/vagrant-managed-servers)
+
 This is a [Vagrant](http://www.vagrantup.com) 1.2+ plugin that adds a provider for "managed servers" to Vagrant, i.e. servers for which you have SSH access but no control over their lifecycle.
 
-Since you don't control the lifecylce:
+Since you don't control the lifecycle:
  * `up` and `destroy` are re-interpreted as "linking" / "unlinking" vagrant with a managed server
  * once "linked", the `ssh` and `provision` commands work as expected and `status` shows the managed server as either "running" or "not reachable"
- * `halt`, `destroy`, `reload` and `suspend` and `resume` are no-ops in this provider
+ * `halt`, `reload` and `suspend` and `resume` are no-ops in this provider
 
 Credits: this provider was initially based on the [vagrant-aws](https://github.com/mitchellh/vagrant-aws) provider with the AWS-specific functionality stripped out.
 
@@ -36,7 +38,7 @@ Of course prior to doing this, you'll need to obtain an managed server-compatibl
 After installing the plugin (instructions above), the quickest way to get started is to actually use a managed server dummy box and specify the IP address / hostname of the managed server within a `config.vm.provider` block. So first, add the dummy box using any name you want:
 
 ```
-$ vagrant box add dummy https://github.com/tknerr/vagrant-managed-servers/raw/master/dummy.box
+$ vagrant box add dummy https://github.com/tknerr/vagrant-managed-servers/raw/master/dummy.box --provider=managed
 ...
 ```
 

data/Rakefile

@@ -19,3 +19,14 @@ RSpec::Core::RakeTask.new
 
 # Default task is to run the unit tests
 task :default => "spec"
+
+desc "runs the acceptance \"test\" as described in README"
+task :acceptance do
+  begin
+    sh "vagrant up fake_managed_server"
+    sh "vagrant up my_server --provider=managed"
+    sh "vagrant provision my_server"
+  ensure
+    sh "vagrant destroy -f"
+  end
+end

data/Vagrantfile

@@ -4,11 +4,12 @@
 # require plugin for testing via bundler
 Vagrant.require_plugin "vagrant-managed-servers"
 Vagrant.require_plugin "vagrant-omnibus"
+Vagrant.require_plugin "vagrant-berkshelf"
 
 Vagrant.configure("2") do |config|
 
-  config.omnibus.chef_version = "11.4.4"
-    
+  config.omnibus.chef_version = "11.10.4"
+  config.berkshelf.enabled = true
 
   #
   # fake a managed server by bringing up a virtualbox vm

data/lib/vagrant-managed-servers/action/sync_folders.rb

@@ -54,13 +54,15 @@ module VagrantPlugins
             # Create the guest path
             env[:machine].communicate.sudo("mkdir -p '#{guestpath}'")
             env[:machine].communicate.sudo(
-              "chown #{ssh_info[:username]} '#{guestpath}'")
+              "chown -R #{ssh_info[:username]} '#{guestpath}'")
 
             # Rsync over to the guest path using the SSH info
+            ssh_key_options = Array(ssh_info[:private_key_path]).map { |path| "-i '#{path}' " }.join
+            ssh_proxy_commands = Array(ssh_info[:proxy_command]).map { |command| "-o ProxyCommand='#{command}' "}.join
             command = [
               "rsync", "--verbose", "--archive", "-z",
-              "--exclude", ".vagrant/",
-              "-e", "ssh -p #{ssh_info[:port]} -o StrictHostKeyChecking=no -i '#{ssh_info[:private_key_path]}'",
+              "--exclude", ".vagrant/", "--exclude", "Vagrantfile",
+              "-e", "ssh -p #{ssh_info[:port]} -o StrictHostKeyChecking=no #{ssh_key_options} #{ssh_proxy_commands}",
               hostpath,
               "#{ssh_info[:username]}@#{ssh_info[:host]}:#{guestpath}"]
 

data/lib/vagrant-managed-servers/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module ManagedServers
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
   end
 end

data/vagrant-managed-servers.gemspec

@@ -15,9 +15,9 @@ Gem::Specification.new do |s|
   s.rubyforge_project         = "vagrant-managed-servers"
 
   s.add_development_dependency "rake"
-  s.add_development_dependency "rspec-core", "~> 2.12.2"
-  s.add_development_dependency "rspec-expectations", "~> 2.12.1"
-  s.add_development_dependency "rspec-mocks", "~> 2.12.1"
+  s.add_development_dependency "rspec-core", "~> 2.14.7"
+  s.add_development_dependency "rspec-expectations", "~> 2.14.5"
+  s.add_development_dependency "rspec-mocks", "~> 2.14.6"
 
   # The following block of code determines the files that should be included
   # in the gem. It does this by reading all the files in the directory where

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-managed-servers
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-10 00:00:00.000000000 Z
+date: 2014-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.12.2
+        version: 2.14.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.12.2
+        version: 2.14.7
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.12.1
+        version: 2.14.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.12.1
+        version: 2.14.5
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.12.1
+        version: 2.14.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.12.1
+        version: 2.14.6
 description: Enables Vagrant to ssh into and provision managed servers.
 email: mail@tknerr.de
 executables: []
@@ -83,131 +83,6 @@ extra_rdoc_files: []
 files:
 - Berksfile
 - CHANGELOG.md
-- cookbooks/apache2/attributes/default.rb
-- cookbooks/apache2/attributes/mod_auth_cas.rb
-- cookbooks/apache2/attributes/mod_auth_openid.rb
-- cookbooks/apache2/CHANGELOG.md
-- cookbooks/apache2/CONTRIBUTING.md
-- cookbooks/apache2/definitions/apache_conf.rb
-- cookbooks/apache2/definitions/apache_module.rb
-- cookbooks/apache2/definitions/apache_site.rb
-- cookbooks/apache2/definitions/web_app.rb
-- cookbooks/apache2/files/default/apache2_module_conf_generate.pl
-- cookbooks/apache2/files/default/tests/minitest/default_test.rb
-- cookbooks/apache2/files/default/tests/minitest/god_monitor_test.rb
-- cookbooks/apache2/files/default/tests/minitest/mod_apreq2_test.rb
-- cookbooks/apache2/files/default/tests/minitest/mod_auth_cas_test.rb
-- cookbooks/apache2/files/default/tests/minitest/mod_auth_openid_test.rb
-- cookbooks/apache2/files/default/tests/minitest/mod_cgi_test.rb
-- cookbooks/apache2/files/default/tests/minitest/mod_dav_svn_test.rb
-- cookbooks/apache2/files/default/tests/minitest/mod_fastcgi.rb
-- cookbooks/apache2/files/default/tests/minitest/mod_perl_test.rb
-- cookbooks/apache2/files/default/tests/minitest/mod_php5_test.rb
-- cookbooks/apache2/files/default/tests/minitest/mod_python_test.rb
-- cookbooks/apache2/files/default/tests/minitest/mod_ssl_test.rb
-- cookbooks/apache2/files/default/tests/minitest/support/helpers.rb
-- cookbooks/apache2/Gemfile
-- cookbooks/apache2/LICENSE
-- cookbooks/apache2/metadata.json
-- cookbooks/apache2/metadata.rb
-- cookbooks/apache2/README.md
-- cookbooks/apache2/recipes/default.rb
-- cookbooks/apache2/recipes/god_monitor.rb
-- cookbooks/apache2/recipes/logrotate.rb
-- cookbooks/apache2/recipes/mod_alias.rb
-- cookbooks/apache2/recipes/mod_apreq2.rb
-- cookbooks/apache2/recipes/mod_authnz_ldap.rb
-- cookbooks/apache2/recipes/mod_authn_file.rb
-- cookbooks/apache2/recipes/mod_authz_default.rb
-- cookbooks/apache2/recipes/mod_authz_groupfile.rb
-- cookbooks/apache2/recipes/mod_authz_host.rb
-- cookbooks/apache2/recipes/mod_authz_user.rb
-- cookbooks/apache2/recipes/mod_auth_basic.rb
-- cookbooks/apache2/recipes/mod_auth_cas.rb
-- cookbooks/apache2/recipes/mod_auth_digest.rb
-- cookbooks/apache2/recipes/mod_auth_openid.rb
-- cookbooks/apache2/recipes/mod_autoindex.rb
-- cookbooks/apache2/recipes/mod_cgi.rb
-- cookbooks/apache2/recipes/mod_dav.rb
-- cookbooks/apache2/recipes/mod_dav_fs.rb
-- cookbooks/apache2/recipes/mod_dav_svn.rb
-- cookbooks/apache2/recipes/mod_deflate.rb
-- cookbooks/apache2/recipes/mod_dir.rb
-- cookbooks/apache2/recipes/mod_env.rb
-- cookbooks/apache2/recipes/mod_expires.rb
-- cookbooks/apache2/recipes/mod_fastcgi.rb
-- cookbooks/apache2/recipes/mod_fcgid.rb
-- cookbooks/apache2/recipes/mod_headers.rb
-- cookbooks/apache2/recipes/mod_include.rb
-- cookbooks/apache2/recipes/mod_ldap.rb
-- cookbooks/apache2/recipes/mod_logio.rb
-- cookbooks/apache2/recipes/mod_log_config.rb
-- cookbooks/apache2/recipes/mod_mime.rb
-- cookbooks/apache2/recipes/mod_negotiation.rb
-- cookbooks/apache2/recipes/mod_perl.rb
-- cookbooks/apache2/recipes/mod_php5.rb
-- cookbooks/apache2/recipes/mod_proxy.rb
-- cookbooks/apache2/recipes/mod_proxy_ajp.rb
-- cookbooks/apache2/recipes/mod_proxy_balancer.rb
-- cookbooks/apache2/recipes/mod_proxy_connect.rb
-- cookbooks/apache2/recipes/mod_proxy_http.rb
-- cookbooks/apache2/recipes/mod_python.rb
-- cookbooks/apache2/recipes/mod_rewrite.rb
-- cookbooks/apache2/recipes/mod_setenvif.rb
-- cookbooks/apache2/recipes/mod_ssl.rb
-- cookbooks/apache2/recipes/mod_status.rb
-- cookbooks/apache2/recipes/mod_wsgi.rb
-- cookbooks/apache2/recipes/mod_xsendfile.rb
-- cookbooks/apache2/templates/default/a2dismod.erb
-- cookbooks/apache2/templates/default/a2dissite.erb
-- cookbooks/apache2/templates/default/a2enmod.erb
-- cookbooks/apache2/templates/default/a2ensite.erb
-- cookbooks/apache2/templates/default/apache2.conf.erb
-- cookbooks/apache2/templates/default/apache2.god.erb
-- cookbooks/apache2/templates/default/charset.erb
-- cookbooks/apache2/templates/default/default-site.erb
-- cookbooks/apache2/templates/default/mods/alias.conf.erb
-- cookbooks/apache2/templates/default/mods/authopenid.load.erb
-- cookbooks/apache2/templates/default/mods/auth_cas.conf.erb
-- cookbooks/apache2/templates/default/mods/auth_cas.load.erb
-- cookbooks/apache2/templates/default/mods/autoindex.conf.erb
-- cookbooks/apache2/templates/default/mods/deflate.conf.erb
-- cookbooks/apache2/templates/default/mods/dir.conf.erb
-- cookbooks/apache2/templates/default/mods/fastcgi.conf.erb
-- cookbooks/apache2/templates/default/mods/fcgid.conf.erb
-- cookbooks/apache2/templates/default/mods/mime.conf.erb
-- cookbooks/apache2/templates/default/mods/negotiation.conf.erb
-- cookbooks/apache2/templates/default/mods/php5.conf.erb
-- cookbooks/apache2/templates/default/mods/proxy.conf.erb
-- cookbooks/apache2/templates/default/mods/README
-- cookbooks/apache2/templates/default/mods/setenvif.conf.erb
-- cookbooks/apache2/templates/default/mods/ssl.conf.erb
-- cookbooks/apache2/templates/default/mods/status.conf.erb
-- cookbooks/apache2/templates/default/ports.conf.erb
-- cookbooks/apache2/templates/default/port_apache.erb
-- cookbooks/apache2/templates/default/security.erb
-- cookbooks/apache2/templates/default/web_app.conf.erb
-- cookbooks/apt/attributes/default.rb
-- cookbooks/apt/Berksfile
-- cookbooks/apt/CHANGELOG.md
-- cookbooks/apt/CONTRIBUTING
-- cookbooks/apt/files/default/apt-proxy-v2.conf
-- cookbooks/apt/LICENSE
-- cookbooks/apt/metadata.json
-- cookbooks/apt/metadata.rb
-- cookbooks/apt/providers/preference.rb
-- cookbooks/apt/providers/repository.rb
-- cookbooks/apt/README.md
-- cookbooks/apt/recipes/cacher-client.rb
-- cookbooks/apt/recipes/cacher-ng.rb
-- cookbooks/apt/recipes/default.rb
-- cookbooks/apt/resources/preference.rb
-- cookbooks/apt/resources/repository.rb
-- cookbooks/apt/templates/debian-6.0/acng.conf.erb
-- cookbooks/apt/templates/default/01proxy.erb
-- cookbooks/apt/templates/default/acng.conf.erb
-- cookbooks/apt/templates/ubuntu-10.04/acng.conf.erb
-- cookbooks/apt/TESTING.md
 - dummy.box
 - Gemfile
 - lib/vagrant-managed-servers/action/is_created.rb
@@ -234,6 +109,7 @@ files:
 - vagrant-managed-servers.gemspec
 - Vagrantfile
 - .gitignore
+- .travis.yml
 homepage: https://github.com/tknerr/vagrant-managed-servers
 licenses: []
 post_install_message: 
@@ -248,7 +124,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -107818897
+      hash: 532192833
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/cookbooks/apache2/CHANGELOG.md

@@ -1,95 +0,0 @@
-## v1.2.0:
-
-* [COOK-692] - delete package conf.d files in module recipes, for EL
-* [COOK-1693] - Foodcritic finding for unnecessary string interpolation
-* [COOK-1757] - platform_family and better style / usage practices
-
-## v1.1.16:
-
-re-releasing as .16 due to error on tag 1.1.14
-
-* [COOK-1466] - add `mod_auth_cas` recipe
-* [COOK-1609] - apache2 changes ports.conf twice per run when using
-  apache2::mod_ssl
-
-## v1.1.12:
-
-* [COOK-1436] - restore apache2 web_app definition
-* [COOK-1356] - allow ExtendedStatus via attribute
-* [COOK-1403] - add mod_fastcgi recipe
-
-## v1.1.10:
-
-* [COOK-1315] - allow the default site to not be enabled
-* [COOK-1328] - cookbook tests (minitest, cucumber)
-
-## v1.1.8:
-
-* Some platforms with minimal installations that don't have perl won't
-  have a `node['languages']['perl']` attribute, so remove the
-  conditional and rely on the power of idempotence in the package
-  resource.
-* [COOK-1214] - address foodcritic warnings
-* [COOK-1180] - add `mod_logio` and fix `mod_proxy`
-
-## v1.1.6:
-
-FreeBSD users: This release requires the `freebsd` cookbook. See README.md.
-
-* [COOK-1025] - freebsd support in mod_php5 recipe
-
-## v1.1.4:
-
-* [COOK-1100] - support amazon linux
-
-## v1.1.2:
-
-* [COOK-996] - apache2::mod_php5 can cause PHP and module API mismatches
-* [COOK-1083] - return string for v_f_p and use correct value for
-  default
-
-## v1.1.0:
-
-* [COOK-861] - Add `mod_perl` and apreq2
-* [COOK-941] - fix `mod_auth_openid` on FreeBSD
-* [COOK-1021] - add a commented-out LoadModule directive to keep apxs happy
-* [COOK-1022] - consistency for icondir attribute
-* [COOK-1023] - fix platform test for attributes
-* [COOK-1024] - fix a2enmod script so it runs cleanly on !bash
-* [COOK-1026] - fix `error_log` location on FreeBSD
-
-## v1.0.8:
-
-* COOK-548 - directory resource doesn't have backup parameter
-
-## v1.0.6:
-
-* COOK-915 - update to `mod_auth_openid` version 0.6, see __Recipes/mod_auth_openid__ below.
-* COOK-548 - Add support for FreeBSD.
-
-## v1.0.4:
-
-* COOK-859 - don't hardcode module paths
-
-## v1.0.2
-
-* Tickets resolved in this release: COOK-788, COOK-782, COOK-780
-
-## v1.0.0
-
-* Red Hat family support is greatly improved, all recipes except `god_monitor` converge.
-* Recipe `mod_auth_openid` now works on RHEL family distros
-* Recipe `mod_php5` will now remove config from package on RHEL family so it doesn't conflict with the cookbook's.
-* Added `php5.conf.erb` template for `mod_php5` recipe.
-* Create the run state directory for `mod_fcgid` to prevent a startup error on RHEL version 6.
-* New attribute `node['apache']['lib_dir']` to handle lib vs lib64 on RHEL family distributions.
-* New attribute `node['apache']['group']`.
-* Scientific Linux support added.
-* Use a file resource instead of the generate-module-list executed perl script on RHEL family.
-* "default" site can now be disabled.
-* web_app now has an "enable" parameter.
-* Support for dav_fs apache module.
-* Tickets resolved in this release: COOK-754, COOK-753, COOK-665, COOK-624, COOK-579, COOK-519, COOK-518
-* Fix node references in template for a2dissite
-* Use proper user and group attributes on files and templates.
-* Replace the anemic README.rdoc with this new and improved superpowered README.md :).