Merge branch 'dev' into feature/generate-playbook-api-key

setup/so-functions

@@ -1273,6 +1273,9 @@ manager_global() {
 		"  playbook:"\
 		"    rulesets:"\
 		"      - windows" >> "$global_pillar"
+		"redis_settings:"\
+		"  redis_maxmemory: 812"\
+
 		
 	printf '%s\n'  '----' >> "$setup_log" 2>&1
 }