6409c07939
- Remove salt-minion python2 requirement when python3 is default (bsc#1081592) - Remove-obsolete-unicode-handling-in-pkg.info_installed - Added: * remove-obsolete-unicode-handling-in-pkg.info_install.patch - Update to salt-2018.1.99 - Modified: * activate-all-beacons-sources-config-pillar-grains.patch * avoid-excessive-syslogging-by-watchdog-cronjob-58.patch * feat-add-grain-for-all-fqdns.patch * fix-bsc-1065792.patch * list_pkgs-add-parameter-for-returned-attribute-selec.patch * run-salt-api-as-user-salt-bsc-1064520.patch * run-salt-master-as-dedicated-salt-user.patch - Deleted: * python3-compatibility-fix-got-bytes-instead-of-strin.patch * enable-with-salt-version-parameter-for-setup.py-scri.patch * catching-error-when-pidfile-cannot-be-deleted.patch * bugfix-always-return-a-string-list-on-unknown-job-ta.patch * bugfix-the-logic-according-to-the-exact-described-pu.patch * cherrypy-read-reads-bytes-from-the-wire-and-write-th.patch * fix-for-delete_deployment-in-kubernetes-module.patch * fix-salt-master-for-old-psutil.patch * introduce-process_count_max-minion-configuration-par.patch * multiprocessing-minion-option-documentation-fixes.patch * older-logrotate-need-su-directive.patch * return-error-when-gid_from_name-and-group-does-not-e.patch * set-shell-environment-variable-64.patch * split-only-strings-if-they-are-such.patch OBS-URL: https://build.opensuse.org/request/show/581002 OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:saltstack/salt?expand=0&rev=112
48 lines
1.2 KiB
Diff
48 lines
1.2 KiB
Diff
From 73d468c3f7b79b2c13610aa89f549ae4803fe969 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 986898436a..8461101210 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.16.1
|
|
|
|
|