vagrant-digitalocean 0.5.1 → 0.5.2

Sign up to get free protection for your applications and to get access to all the features.
data/README.md CHANGED
@@ -64,7 +64,7 @@ end
64
64
  ```
65
65
 
66
66
  Please note the following:
67
- - You *must* specify the `config.ssh.private_key_path` to enable authentication
67
+ - You *must* specify the `override.ssh.private_key_path` to enable authentication
68
68
  with the droplet. The provider will create a new Digital Ocean SSH key using
69
69
  your public key which is assumed to be the `private_key_path` with a *.pub*
70
70
  extension.
@@ -77,7 +77,7 @@ The following attributes are available to further configure the provider:
77
77
  - `provider.image` - A string representing the image to use when creating a
78
78
  new droplet (e.g. `Debian 6.0 x64`). The available options may
79
79
  be found on Digital Ocean's new droplet [form](https://www.digitalocean.com/droplets/new).
80
- It defaults to `Ubuntu 12.04 x64`.
80
+ It defaults to `Ubuntu 12.04.3 x64`.
81
81
  - `provider.region` - A string representing the region to create the new
82
82
  droplet in. It defaults to `New York 2`.
83
83
  - `provider.size` - A string representing the size to use when creating a
@@ -85,6 +85,8 @@ The following attributes are available to further configure the provider:
85
85
  - `provider.private_networking` - A boolean flag indicating whether to enable
86
86
  a private network interface (if the region supports private networking). It
87
87
  defaults to `false`.
88
+ - `provider.backups_enabled` - A boolean flag indicating whether to enable backups for
89
+ the droplet. It defaults to `false`.
88
90
  - `provider.ssh_key_name` - A string representing the name to use when creating
89
91
  a Digital Ocean SSH key for droplet authentication. It defaults to `Vagrant`.
90
92
  - `provider.setup` - A boolean flag indicating whether to setup a new user
@@ -36,7 +36,8 @@ module VagrantPlugins
36
36
  :image_id => image_id,
37
37
  :name => @machine.config.vm.hostname || @machine.name,
38
38
  :ssh_key_ids => ssh_key_id,
39
- :private_networking => @machine.provider_config.private_networking
39
+ :private_networking => @machine.provider_config.private_networking,
40
+ :backups_enabled => @machine.provider_config.backups_enabled
40
41
  })
41
42
 
42
43
  # wait for request to complete
@@ -14,6 +14,13 @@ module VagrantPlugins
14
14
  def call(env)
15
15
  ssh_info = @machine.ssh_info
16
16
 
17
+ # for CentOS machines that don't have rsync installed
18
+ # attempt to install with yum before giving up
19
+ if (Vagrant::Util::Which.which('rsync') && !Vagrant::Util::Which.which('yum'))
20
+ env[:ui].warn I18n.t('vagrant_digital_ocean.info.trying_rsync_install')
21
+ @machine.communicate.sudo("yum -y install rsync")
22
+ end
23
+
17
24
  @machine.config.vm.synced_folders.each do |id, data|
18
25
  next if data[:disabled]
19
26
 
@@ -7,6 +7,7 @@ module VagrantPlugins
7
7
  attr_accessor :region
8
8
  attr_accessor :size
9
9
  attr_accessor :private_networking
10
+ attr_accessor :backups_enabled
10
11
  attr_accessor :ca_path
11
12
  attr_accessor :ssh_key_name
12
13
  attr_accessor :setup
@@ -20,6 +21,7 @@ module VagrantPlugins
20
21
  @region = UNSET_VALUE
21
22
  @size = UNSET_VALUE
22
23
  @private_networking = UNSET_VALUE
24
+ @backups_enable = UNSET_VALUE
23
25
  @ca_path = UNSET_VALUE
24
26
  @ssh_key_name = UNSET_VALUE
25
27
  @setup = UNSET_VALUE
@@ -28,10 +30,11 @@ module VagrantPlugins
28
30
  def finalize!
29
31
  @client_id = ENV['DO_CLIENT_ID'] if @client_id == UNSET_VALUE
30
32
  @api_key = ENV['DO_API_KEY'] if @api_key == UNSET_VALUE
31
- @image = 'Ubuntu 12.04 x64' if @image == UNSET_VALUE
33
+ @image = 'Ubuntu 12.04.3 x64' if @image == UNSET_VALUE
32
34
  @region = 'New York 2' if @region == UNSET_VALUE
33
35
  @size = '512MB' if @size == UNSET_VALUE
34
36
  @private_networking = false if @private_networking == UNSET_VALUE
37
+ @backups_enabled = false if @backups_enabled == UNSET_VALUE
35
38
  @ca_path = nil if @ca_path == UNSET_VALUE
36
39
  @ssh_key_name = 'Vagrant' if @ssh_key_name == UNSET_VALUE
37
40
  @setup = true if @setup == UNSET_VALUE
@@ -1,5 +1,5 @@
1
1
  module VagrantPlugins
2
2
  module DigitalOcean
3
- VERSION = '0.5.1'
3
+ VERSION = '0.5.2'
4
4
  end
5
5
  end
data/locales/en.yml CHANGED
@@ -17,6 +17,7 @@ en:
17
17
  modifying_sudo: "Modifying sudoers file to remove tty requirement..."
18
18
  using_key: "Using existing SSH key: %{name}"
19
19
  creating_key: "Creating new SSH key: %{name}..."
20
+ trying_rsync_install: "Rsync not found, attempting to install with yum..."
20
21
  rsyncing: "Rsyncing folder: %{hostpath} => %{guestpath}..."
21
22
  config:
22
23
  client_id: "Client ID is required"
data/test/Vagrantfile CHANGED
@@ -26,7 +26,7 @@ Vagrant.configure('2') do |config|
26
26
 
27
27
  config.vm.define :ubuntu do |ubuntu|
28
28
  ubuntu.vm.provider :digital_ocean do |provider|
29
- provider.image = 'Ubuntu 12.04 x64'
29
+ provider.image = 'Ubuntu 12.04.3 x64'
30
30
  end
31
31
  end
32
32
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: vagrant-digitalocean
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.5.1
4
+ version: 0.5.2
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2013-12-12 00:00:00.000000000 Z
12
+ date: 2014-01-27 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: faraday