bbe3fe8f72
- Update patches
- Modified:
* run-salt-master-as-dedicated-salt-user.patch
* run-salt-api-as-user-salt-bsc-1064520.patch
* fix-openscap-push.patch
* fix-cp.push-empty-file.patch
* avoid-excessive-syslogging-by-watchdog-cronjob-58.patch
* feat-add-grain-for-all-fqdns.patch
* fix-bsc-1065792.patch
* move-log_file-option-to-changeable-defaults.patch
* activate-all-beacons-sources-config-pillar-grains.patch
* remove-obsolete-unicode-handling-in-pkg.info_install.patch
- Removed:
* salt-ssh-fix-json-load-of-return-data-when-it-contai.patch
-------------------------------------------------------------------
- Update cp.push patch
- Modified:
* fix-cp.push-empty-file.patch
* salt-ssh-fix-json-load-of-return-data-when-it-contai.patch
- force re-generate a new thin.tgz when an update gets installed
- fix salt-ssh with a different patch
- remove: dumps-should-return-unicode-also-with-py2-to-prevent.patch
- added: salt-ssh-fix-json-load-of-return-data-when-it-contai.patch
- Added:
OBS-URL: https://build.opensuse.org/request/show/586784
OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:saltstack/salt?expand=0&rev=115
48 lines
1.2 KiB
Diff
48 lines
1.2 KiB
Diff
From 1df8d3011ebe645c25be8541cbc40ac2b700dfcf 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.2
|
|
|
|
|