vagrant-yarrs-and-yamls 1.0.5 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56a27e5be2a3fa276fbbba42596bc74910a255d1
-  data.tar.gz: 03a97984e2db9b80671251f83032fa80d84a7169
+  metadata.gz: 396046b28407cc8957de6a9779e2cf802045088e
+  data.tar.gz: 97f06059b95efd38253577cbcf0e7d8965f0bdb4
 SHA512:
-  metadata.gz: 6cbb96839b6d8806d72b45bb17561efade3da338acab1dfa94feda919e17a41dd0ed218c7dfdb5fdd981f18f2d55ca0bdbcd79f6910a2a8b8d3d9a03edcfe8b3
-  data.tar.gz: d9177a80fcb033fc8505b3b40030eee01ff4af82d6c12fc914c6dfc16bf5e9fe3c8b745b1708806d8361a6e86f77274ce14bbdd5e5c2139202d798c94625acbc
+  metadata.gz: dd373c9aee208cade8131239434e9531032a623108acd39f26985515de091d5986c266275fb7785d6349d563c9f2d418bfe294bfb9d19f9603ffc7698b5c193d
+  data.tar.gz: 0a3483706d64ad60405153760b2adcc944a82b1cc51bdf3679ae2037eb2b2fd965c831bf724e69b5a936151419ecab521946dceb8fa2ad8796cd54e053c5078e

data/README.md

@@ -29,43 +29,61 @@ Create a new file named `Yarrs.yaml`
 # For more information and examples, please see the online documentation at
 # https://github.com/ptahdunbar/yarrs-and-yamls
 ---
-boxes:
-    - hostname: vagrant
-      box: ubuntu/trusty64
-      ip: "10.10.10.100"
-      update: true
-      nodejs: true
-      php:
-        - xdebug
-        - composer
-        - wp
-      databases:
-        - foo
-        - bar
-      synced_folders:
-        - host: "."
-          guest: "/var/www"
-          # type: "nfs"
-          owner: "www-data"
-          group: "www-data"
-          mount_options:
-            - dmode=775
-            - fmode=667
-          rsync__args:
-            - "--verbose"
-            - "--archive"
-            - "--delete"
-            - "-z"
-          rsync__exclude:
-            - ".env.production"
-            - ".env.production_network"
-      provision:
-        - path: provision/apache2.sh
-      variables:
-          - key: FOO
-            value: bar
+hostname: vagrant
+  box: ubuntu/trusty64
+  ip: "10.10.10.100"
+  update: true
+  nodejs: true
+  php:
+    - xdebug
+    - composer
+    - wp
+  databases:
+    - foo
+    - bar
+  synced_folders:
+    - host: "."
+      guest: "/var/www"
+      # type: "nfs"
+      owner: "www-data"
+      group: "www-data"
+      mount_options:
+        - dmode=775
+        - fmode=667
+      rsync__args:
+        - "--verbose"
+        - "--archive"
+        - "--delete"
+        - "-z"
+      rsync__exclude:
+        - ".env.production"
+        - ".env.production_network"
+  provision:
+    - path: provision/apache2.sh
+  variables:
+      - key: FOO
+        value: bar
+
+  digital_ocean:
+    token: secret-token-goes-here
+    private_key_path: ~/.ssh/id_rsa
+    ssh_key_name: do-ssh-key-name
+    username: root
+    size: 512mb
 ```
 
 That's it! Boot up your environment:
 
 ```vagrant up```
+
+
+### Environment variables:
+
+- DIGITAL_OCEAN_TOKEN
+- DIGITAL_OCEAN_PRIVATE_KEY_PATH
+- DIGITAL_OCEAN_SSH_KEY_NAME
+
+- AWS_PRIVATE_KEY_PATH
+- AWS_ACCESS_KEY
+- AWS_SECRET_KEY
+- AWS_SESSION_TOKEN

data/lib/templates/nginx_vhost.erb

@@ -5,15 +5,15 @@ server {
     <% if ssl? %>
 
     listen 443 ssl;
-    ssl_certificate     /etc/nginx/ssl/<% host %>.crt;
-    ssl_certificate_key /etc/nginx/ssl/<% host %>.key;
+    ssl_certificate     /etc/nginx/ssl/<%= host %>.crt;
+    ssl_certificate_key /etc/nginx/ssl/<%= host %>.key;
 
     <% end %>
     root <%= path %>;
     index index.html index.php;
     <% if host? %>
 
-    server_name <% host %>;
+    server_name <%= host %>;
 
     <% end %>
     location / {
@@ -24,7 +24,7 @@ server {
     location = /robots.txt  { access_log off; log_not_found off; }
 
     access_log off;
-    error_log  /var/log/nginx/<% host %>-error.log error;
+    error_log  /var/log/nginx/<%= host %>-error.log error;
     sendfile off;
 
     location ~ \.php\$ {

data/lib/vagrant-yarrs-and-yamls/api.rb

@@ -46,7 +46,13 @@ def yarrs(yamlfile, vagrant_config)
 end
 
 def apply_vagrant_hostupdater(node, settings)
-  if defined? VagrantPlugins::HostsUpdater && settings["hostname"] && settings["ip"]
+  return if ! defined? VagrantPlugins::HostsUpdater
+
+  return if !! ENV['VAGRANT_DEFAULT_PROVIDER'].to_s.index('digital_ocean')
+
+  return if ! get_cli_flag('digital_ocean')
+
+  if settings["hostname"] && settings["ip"]
     sites = get_config_part('sites', settings)
     node.hostsupdater.aliases = sites
   else
@@ -54,6 +60,14 @@ def apply_vagrant_hostupdater(node, settings)
   end
 end
 
+def get_cli_flag(flag)
+    ARGV.each do |arg|
+        return true if arg.index(flag)
+    end
+
+    return false
+end
+
 def apply_vagrant_settings(node, settings)
   node.vm.box = settings["box"]
   node.vm.box_url = settings["box_url"]
@@ -211,7 +225,7 @@ def apply_digitalocean_providier(node, settings)
 
     override.ssh.private_key_path = settings["digital_ocean"]["private_key_path"] || ENV["DIGITAL_OCEAN_PRIVATE_KEY_PATH"]
     override.ssh.username = settings["digital_ocean"]["username"] if settings["digital_ocean"]["username"]
-    digital_ocean.ssh_key_name = settings["digital_ocean"].include?("ssh_key_name") ? settings["digital_ocean"]["ssh_key_name"] : 'Vagrant'
+    digital_ocean.ssh_key_name = settings["digital_ocean"].include?("ssh_key_name") ? settings["digital_ocean"]["ssh_key_name"] : ENV["DIGITAL_OCEAN_SSH_KEY_NAME"]
 
     # Optional
     digital_ocean.image = settings["digital_ocean"].include?("image") ? settings["digital_ocean"]["image"] : "ubuntu-14-04-x64"

data/lib/vagrant-yarrs-and-yamls/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
     module YarrsAndYamls
-        VERSION = '1.0.5'
+        VERSION = '1.0.7'
     end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-yarrs-and-yamls
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.7
 platform: ruby
 authors:
 - Pirate Dunbar