Merge pull request #289 from skillstream/allow-protected-mode-no

Allow protected-mode to be set to 'no'
sous-chefs · Aug 26, 2016 · 48597c1 · 48597c1
2 parents 6dad3ef + 2a0ae38
commit 48597c1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/attributes/default.rb b/attributes/default.rb
@@ -110,7 +110,7 @@
   'rdbchecksum'             => 'yes',
   'dbfilename'              => nil,
   'slaveof'                 => nil,
-  'protected_mode'          => false,
+  'protected_mode'          => nil, # unspecified by default but could be set explicitly to 'yes' or 'no'
   'masterauth'              => nil,
   'slaveservestaledata'     => 'yes',
   'slavereadonly'           => 'yes',

diff --git a/templates/default/redis.conf.erb b/templates/default/redis.conf.erb
@@ -62,8 +62,8 @@ tcp-backlog <%= @tcpbacklog %>
 # you are sure you want clients from other hosts to connect to Redis
 # even if no authentication is configured, nor a specific set of interfaces
 # are explicitly listed using the "bind" directive.
-<% if @protected_mode %>
-protected-mode yes
+<% unless @protected_mode.nil? %>
+protected-mode <%= @protected_mode %>
 <% end %>
 
 # Specify the path for the Unix socket that will be used to listen for