merge with 2.4/dev

salt/redis/defaults.yaml

@@ -1,7 +1,7 @@
 redis:
   config:
     bind: '0.0.0.0'
-    protected-mode: 'no'
+    protected-mode: 'yes'
     tls-cert-file: '/certs/redis.crt'
     tls-key-file: '/certs/redis.key'
     tls-ca-cert-file: '/certs/ca.crt'
@@ -29,9 +29,9 @@ redis:
     databases: 16
     always-show-logo: 'yes'
     save:
-      900: 1
-      300: 10
-      60: 1000
+      '900': 1
+      '300': 10
+      '60': 1000
     stop-writes-on-bgsave-error: 'yes'
     rdbcompression: 'yes'
     rdbchecksum: 'yes'

salt/redis/soc_redis.yaml

@@ -10,6 +10,10 @@ redis:
       global: True
       advanced: True
       helpLink: redis.html
+    requirepass:
+      description: Password for accessing Redis.
+      global: True
+      sensitive: True
     tls-cert-file: 
       description: TLS cert file location.
       global: True
@@ -117,15 +121,15 @@ redis:
       advanced: True
       helpLink: redis.html
     save:
-      900:
+      '900':
         description: Set the amount of keys that need to change to save after 15 minutes.
         global: True
         helpLink: redis.html
-      300: 
+      '300': 
         description: Set the amount of keys that need to change to save after 5 minutes.
         global: True
         helpLink: redis.html
-      60: 
+      '60': 
         description: Set the amount of keys that need to change to save after 1 minute
         global: True
         helpLink: redis.html