44f6a131de
- Update to 2016.3.4 see https://docs.saltstack.com/en/latest/topics/releases/2016.3.4.html - Removed Patches, applied upstream * 0008-checksum-validation-when-zypper-pkg.download.patch * 0009-unit-tests-for-rpm.checksum-and-zypper.download.patch * 0010-snapper-execution-module.patch * 0011-fix-salt-summary-to-count-not-responding-minions-cor.patch * 0012-Run-salt-api-as-user-salt-bsc-990029.patch * 0013-Deprecate-status.uptime-one-version-later.patch * 0014-Add-ignore_repo_failure-option-to-suppress-zypper-s-.patch * 0015-Remove-zypper-s-raise-exception-if-mod_repo-has-no-a.patch * 0016-Improve-Mock-to-be-flexible-and-able-to-mock-methods.patch * 0017-Check-for-single-quote-before-splitting-on-single-qu.patch * 0018-Unit-tests-fixes-for-2016.3.2.patch * 0019-Fix-snapper_test-for-python26.patch * 0020-Integration-tests-fixes-for-2016.3.2.patch * 0021-Fix-pkg.upgrade-for-zypper.patch * 0022-Setting-up-OS-grains-for-SLES-Expanded-Support-SUSE-.patch * 0023-acl.delfacl-fix-position-of-X-option-to-setfacl.patch * 0024-Change-travis-configuration-file-to-use-salt-toaster.patch * 0025-Adding-dist-upgrade-support-to-zypper-module.patch * 0026-Fix-pkg.latest_version-when-latest-already-installed.patch * 0027-Including-resolver-params-for-Zypper-debug-solver.patch - Added patches * 0008-snapper-execution-module.patch * 0009-fix-salt-summary-to-count-not-responding-minions-cor.patch * 0010-Run-salt-api-as-user-salt-bsc-990029.patch * 0011-Fix-snapper_test-for-python26.patch * 0012-Fix-pkg.upgrade-for-zypper.patch * 0013-Setting-up-OS-grains-for-SLES-Expanded-Support-SUSE-.patch OBS-URL: https://build.opensuse.org/request/show/438684 OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:saltstack/salt?expand=0&rev=81
54 lines
1.3 KiB
Diff
54 lines
1.3 KiB
Diff
From e5db5dcfecab4f1d2e93386ad8c7e579393280d7 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 02/17] Run salt master as dedicated salt user
|
|
|
|
---
|
|
conf/master | 3 ++-
|
|
pkg/salt-common.logrotate | 3 +++
|
|
2 files changed, 5 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/conf/master b/conf/master
|
|
index ed09126..ee98e51 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 3cd0023..8d970c0 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
|
|
@@ -7,6 +8,7 @@
|
|
}
|
|
|
|
/var/log/salt/minion {
|
|
+ su salt salt
|
|
weekly
|
|
missingok
|
|
rotate 7
|
|
@@ -15,6 +17,7 @@
|
|
}
|
|
|
|
/var/log/salt/key {
|
|
+ su salt salt
|
|
weekly
|
|
missingok
|
|
rotate 7
|
|
--
|
|
2.10.1
|
|
|