6fe4934941
see https://docs.saltstack.com/en/latest/topics/releases/2016.3.0.html * backwards-incompatible changes: - The default path for the extension_modules master config option has been changed. - add 0014-Fix-crashing-Maintenence-process.patch see release notes OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:saltstack/salt?expand=0&rev=71
54 lines
1.6 KiB
Diff
54 lines
1.6 KiB
Diff
From 31010aabce9bb75d3aaabe396c3aadf558e3fee8 Mon Sep 17 00:00:00 2001
|
|
From: Bo Maryniuk <bo@suse.de>
|
|
Date: Thu, 17 Mar 2016 12:30:23 +0100
|
|
Subject: [PATCH 05/13] 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 54d5f8f3ca75..b0ddf5043187 100644
|
|
--- a/conf/master
|
|
+++ b/conf/master
|
|
@@ -491,7 +491,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 52443204cb4c..f5d1f2284cfe 100644
|
|
--- a/conf/minion
|
|
+++ b/conf/minion
|
|
@@ -538,7 +538,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 7b835e25ea52..ab500f9c7cfe 100644
|
|
--- a/conf/proxy
|
|
+++ b/conf/proxy
|
|
@@ -435,7 +435,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.8.3
|
|
|