ae1540a455
- Bugfix: clean up `change` attribute from interface dict (upstream) Issue: https://github.com/saltstack/salt/issues/41461 PR: 1. https://github.com/saltstack/salt/pull/41487 2. https://github.com/saltstack/salt/pull/41533 Added: * clean-up-change-attribute-from-interface-dict.patch - Bugfix: orchestrate and batches returns false failed information https://github.com/saltstack/salt/issues/40635 - speed-up cherrypy by removing sleep call - wrong os_family grains on SUSE - fix unittests (bsc#1038855) - fix setting the language on SUSE systems (bsc#1038855) - Bugfix: unable to use hostname for minion ID as '127' (upstream) - Bugfix: remove sleep call in CheppryPy API handler (upstream) - Fix core grains constants for timezone (bsc#1032931) - Added: * bugfix-unable-to-use-127-as-hostname.patch * fix-grain-for-os_family-on-suse-series.patch * fix-os_family-case-in-unittest.patch * fix-setting-language-on-suse-systems.patch * fixed-issue-with-parsing-of-master-minion-returns-wh.patch * rest_cherrypy-remove-sleep-call.patch * use-correct-grain-constants-for-timezone.patch - Update to 2016.11.4 See https://docs.saltstack.com/en/develop/topics/releases/2016.11.4.html for full changelog - Changed: * add-options-for-dockerng.patch * fix-regression-in-file.get_managed-add-unit-tests.patch OBS-URL: https://build.opensuse.org/request/show/514025 OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:saltstack/salt?expand=0&rev=89
48 lines
1.2 KiB
Diff
48 lines
1.2 KiB
Diff
From 7641133d3d95d1f13116aabe0ec7b280ad7891c4 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@suse.de>
|
|
Date: Wed, 20 Jan 2016 11:01:06 +0100
|
|
Subject: [PATCH] Run salt master as dedicated salt user
|
|
|
|
* Minion runs always as a root
|
|
---
|
|
conf/master | 3 ++-
|
|
pkg/salt-common.logrotate | 2 ++
|
|
2 files changed, 4 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/conf/master b/conf/master
|
|
index d89da74d58..fa29ca5827 100644
|
|
--- a/conf/master
|
|
+++ b/conf/master
|
|
@@ -25,7 +25,8 @@
|
|
# permissions to allow the specified user to run the master. The exception is
|
|
# the job cache, which must be deleted if this user is changed. If the
|
|
# modified files cause conflicts, set verify_env to False.
|
|
-#user: root
|
|
+user: salt
|
|
+syndic_user: salt
|
|
|
|
# The port used by the communication interface. The ret (return) port is the
|
|
# interface used for the file server, authentication, job returns, etc.
|
|
diff --git a/pkg/salt-common.logrotate b/pkg/salt-common.logrotate
|
|
index 3cd002308e..0d99d1b801 100644
|
|
--- a/pkg/salt-common.logrotate
|
|
+++ b/pkg/salt-common.logrotate
|
|
@@ -1,4 +1,5 @@
|
|
/var/log/salt/master {
|
|
+ su salt salt
|
|
weekly
|
|
missingok
|
|
rotate 7
|
|
@@ -15,6 +16,7 @@
|
|
}
|
|
|
|
/var/log/salt/key {
|
|
+ su salt salt
|
|
weekly
|
|
missingok
|
|
rotate 7
|
|
--
|
|
2.11.0
|
|
|
|
|