Merge pull request #313 from jirkafajfr/master

Consul Watch: Ignore owner/group on windows machines
sous-chefs · May 10, 2016 · 0bbc6f5 · 0bbc6f5
2 parents 3bd2179 + 6913f6b
commit 0bbc6f5
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/libraries/consul_config.rb b/libraries/consul_config.rb
@@ -111,7 +111,7 @@ def tls?
         notifying_block do
           directory ::File.dirname(new_resource.path) do
             recursive true
-            if node['os'].eql? 'linux'
+            unless windows?
               owner new_resource.owner
               group new_resource.group
               mode '0755'
@@ -120,7 +120,7 @@ def tls?
           end
 
           file new_resource.path do
-            if node['os'].eql? 'linux'
+            unless windows?
               owner new_resource.owner
               group new_resource.group
               mode '0640'

diff --git a/libraries/consul_definition.rb b/libraries/consul_definition.rb
@@ -45,7 +45,7 @@ def to_json
         notifying_block do
           directory ::File.dirname(new_resource.path) do
             recursive true
-            if node['os'].eql? 'linux'
+            unless windows?
               owner new_resource.user
               group new_resource.group
               mode '0755'
@@ -54,7 +54,7 @@ def to_json
 
           file new_resource.path do
             content new_resource.to_json
-            if node['os'].eql? 'linux'
+            unless windows?
               owner new_resource.user
               group new_resource.group
               mode '0640'

diff --git a/libraries/consul_watch.rb b/libraries/consul_watch.rb
@@ -43,16 +43,20 @@ def to_json
         notifying_block do
           directory ::File.dirname(new_resource.path) do
             recursive true
-            owner new_resource.user
-            group new_resource.group
-            mode '0755'
+            unless windows?
+              owner new_resource.user
+              group new_resource.group
+              mode '0755'
+            end
           end
 
           file new_resource.path do
-            owner new_resource.user
-            group new_resource.group
             content new_resource.to_json
-            mode '0640'
+            unless windows?
+              owner new_resource.user
+              group new_resource.group
+              mode '0640'
+            end
           end
         end
       end