54 lines
1.5 KiB
Diff
54 lines
1.5 KiB
Diff
|
From eea48a283a184a02223fc440fec54a47a5b47b62 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Bo Maryniuk <bo@suse.de>
|
||
|
|
Date: Thu, 17 Mar 2016 12:30:23 +0100
|
||
|
|
Subject: [PATCH 36/36] Use SHA256 hash type by default
|
||
|
|
|
||
|
|
---
|
||
|
|
conf/master | 2 +-
|
||
|
|
conf/minion | 2 +-
|
||
|
|
conf/proxy | 2 +-
|
||
|
|
3 files changed, 3 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/conf/master b/conf/master
|
||
|
|
index cf05ec4..5f6beaa 100644
|
||
|
|
--- a/conf/master
|
||
|
|
+++ b/conf/master
|
||
|
|
@@ -474,7 +474,7 @@ syndic_user: salt
|
||
|
|
#
|
||
|
|
# 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
|
||
|
|
index e17ec61..ba4111a 100644
|
||
|
|
--- a/conf/minion
|
||
|
|
+++ b/conf/minion
|
||
|
|
@@ -447,7 +447,7 @@
|
||
|
|
#
|
||
|
|
# 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
|
||
|
|
index 0de6af8..77ecf3b 100644
|
||
|
|
--- a/conf/proxy
|
||
|
|
+++ b/conf/proxy
|
||
|
|
@@ -427,7 +427,7 @@
|
||
|
|
#
|
||
|
|
# 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
|
||
|
|
--
|
||
|
|
2.7.3
|
||
|
|
|