update docs. fix 'install_version' attribute to not conflict with oha…

…i plugin
zerotier · Apr 4, 2017 · e2f2689 · e2f2689
1 parent b2c4e9a
commit e2f2689
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -31,7 +31,7 @@ Shortcut to automatically join networks stored in attributes (See example in the
 
 Attributes
 ---------------------
-`node['zerotier']['version']` 
+`node['zerotier']['install_version']` 
 
 Version of ZeroTier to install.  Empty by default and defaults to the latest version available.
 
@@ -65,3 +65,4 @@ Attributes:
 - node_name - Name of the node to put in https://my.zerotier.com (only applicable when joining a private network)
 - auth_token - API access token generated in your account at https://my.zerotier.com. Required if you wish to automatically authorize the node to join the network.
 - central_url - URL to the instance of ZeroTier Central.  Defaults to https://my.zerotier.com.
+- action - `:join` or `:leave`.  Defaults to `:join`
diff --git a/attributes/default.rb b/attributes/default.rb
@@ -1,6 +1,6 @@
 
 # Not set by default.
-# default['zerotier']['version']
+# default['zerotier']['install_version']
 #
 
 default['zerotier']['central_url'] = 'https://my.zerotier.com'

diff --git a/files/default/zerotier_ohai.rb b/files/default/zerotier_ohai.rb
@@ -69,4 +69,4 @@ def find_zerotier
             Ohai::Log.warn("Cannot find zerotier-cli")
         end
     end
-end
+end
diff --git a/metadata.rb b/metadata.rb
@@ -4,7 +4,7 @@
 license 'GPL v3'
 description 'Installs/Configures ZeroTier'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version '1.0.0'
+version '1.0.1'
 issues_url 'https://github.com/zerotier/chef-zerotier/issues' if respond_to?(:issues_url)
 source_url 'https://github.com/zerotier/chef-zerotier' if respond_to?(:source_url)
 

diff --git a/recipes/install.rb b/recipes/install.rb
@@ -36,7 +36,7 @@
 
 package 'zerotier-one' do
     if node['zerotier']['version']
-        version node['zerotier']['version']
+        version node['zerotier']['install_version']
     end
 end
-Original file line number
+Diff line change
@@ Expand Up / @@ -69,4 +69,4 @@ def find_zerotier @@
                 Ohai::Log.warn("Cannot find zerotier-cli")
             end
         end
-    end
+    end