47 lines
1.2 KiB
Diff
47 lines
1.2 KiB
Diff
|
From 3902fe4183d169808b9d248b9b963926035ba954 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 1/2] 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 abfc1fa808..bd28f6d406 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.14.2
|
||
|
|
|