Merge branch 'tighten-permissions' into more-permissions

sous-chefs · Jun 10, 2016 · 6f54e7a · 6f54e7a
2 parents 8bb5d66 + ab8d631
commit 6f54e7a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/libraries/consul_config.rb b/libraries/consul_config.rb
@@ -20,10 +20,10 @@ class ConsulConfig < Chef::Resource
       attribute(:path, kind_of: String, name_attribute: true)
       # @!attribute owner
       # @return [String]
-      attribute(:owner, kind_of: String, default: lazy { node['consul']['config']['owner'] })
+      attribute(:owner, kind_of: String, default: 'consul')
       # @!attribute group
       # @return [String]
-      attribute(:group, kind_of: String, default: lazy { node['consul']['config']['group'] })
+      attribute(:group, kind_of: String, default: 'consul')
       # @!attribute config_dir
       # @return [String]
       attribute(:config_dir, kind_of: String, default: lazy { node['consul']['service']['config_dir'] })

diff --git a/test/spec/libraries/consul_config_spec.rb b/test/spec/libraries/consul_config_spec.rb
@@ -11,10 +11,6 @@
     default_attributes['consul'] = {
       'service' => {
         'config_dir' => '/etc/consul/conf.d'
-       },
-      'config' => {
-        'owner' => 'root',
-        'group' => 'consul'
        }
       }
   end
@@ -23,6 +19,7 @@
   context 'sets options directly' do
     recipe do
       consul_config '/etc/consul/default.json' do
+        owner 'root'
         options do
           recursor 'foo'
           translate_wan_addrs true