2016-11-06 11:48:16 +00:00
|
|
|
From 7854a6cd0ddc5a7d51f298e69b54eec09ce97c14 Mon Sep 17 00:00:00 2001
|
2016-03-19 13:46:52 +00:00
|
|
|
From: Bo Maryniuk <bo@suse.de>
|
|
|
|
Date: Thu, 17 Mar 2016 12:30:23 +0100
|
2016-11-06 11:48:16 +00:00
|
|
|
Subject: [PATCH 05/17] Use SHA256 hash type by default
|
2016-03-19 13:46:52 +00:00
|
|
|
|
|
|
|
---
|
|
|
|
conf/master | 2 +-
|
|
|
|
conf/minion | 2 +-
|
|
|
|
conf/proxy | 2 +-
|
|
|
|
3 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
|
|
|
|
diff --git a/conf/master b/conf/master
|
2016-11-06 11:48:16 +00:00
|
|
|
index ee98e51..6ef1c10 100644
|
2016-03-19 13:46:52 +00:00
|
|
|
--- a/conf/master
|
|
|
|
+++ b/conf/master
|
2016-09-28 07:49:13 +00:00
|
|
|
@@ -509,7 +509,7 @@ syndic_user: salt
|
2016-03-19 13:46:52 +00:00
|
|
|
#
|
|
|
|
# Prior to changing this value, the master should be stopped and all Salt
|
|
|
|
# caches should be cleared.
|
|
|
|
-#hash_type: md5
|
|
|
|
+hash_type: sha256
|
|
|
|
|
|
|
|
# The buffer size in the file server can be adjusted here:
|
|
|
|
#file_buffer_size: 1048576
|
|
|
|
diff --git a/conf/minion b/conf/minion
|
2016-11-06 11:48:16 +00:00
|
|
|
index 9bc9408..07b706f 100644
|
2016-03-19 13:46:52 +00:00
|
|
|
--- a/conf/minion
|
|
|
|
+++ b/conf/minion
|
2016-11-06 11:48:16 +00:00
|
|
|
@@ -559,7 +559,7 @@
|
2016-03-19 13:46:52 +00:00
|
|
|
#
|
|
|
|
# Warning: Prior to changing this value, the minion should be stopped and all
|
|
|
|
# Salt caches should be cleared.
|
|
|
|
-#hash_type: sha256
|
|
|
|
+hash_type: sha256
|
|
|
|
|
|
|
|
# The Salt pillar is searched for locally if file_client is set to local. If
|
|
|
|
# this is the case, and pillar data is defined, then the pillar_roots need to
|
|
|
|
diff --git a/conf/proxy b/conf/proxy
|
2016-11-06 11:48:16 +00:00
|
|
|
index 4e5cc34..8e5dd2d 100644
|
2016-03-19 13:46:52 +00:00
|
|
|
--- a/conf/proxy
|
|
|
|
+++ b/conf/proxy
|
2016-11-06 11:48:16 +00:00
|
|
|
@@ -445,7 +445,7 @@
|
2016-03-19 13:46:52 +00:00
|
|
|
#
|
|
|
|
# Warning: Prior to changing this value, the minion should be stopped and all
|
|
|
|
# Salt caches should be cleared.
|
|
|
|
-#hash_type: sha256
|
|
|
|
+hash_type: sha256
|
|
|
|
|
|
|
|
# The Salt pillar is searched for locally if file_client is set to local. If
|
|
|
|
# this is the case, and pillar data is defined, then the pillar_roots need to
|
|
|
|
--
|
2016-11-06 11:48:16 +00:00
|
|
|
2.10.1
|
2016-03-19 13:46:52 +00:00
|
|
|
|