commit: 051badb288c5cbe9140be22ba3fe11844cef306c
Author: Patrick McLean <patrick.mclean <AT> sony <DOT> com>
AuthorDate: Thu Feb 18 01:17:46 2021 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Thu Feb 18 01:17:46 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=051badb2
app-admin/salt-3002.2-r4: revbump, fix init scripts
Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>
app-admin/salt/files/api-initd-5 | 5 +++--
app-admin/salt/files/master-initd-5 | 5 +++--
app-admin/salt/files/minion-initd-5 | 5 +++--
app-admin/salt/files/syndic-initd-5 | 5 +++--
app-admin/salt/{salt-3002.2-r3.ebuild => salt-3002.2-r4.ebuild} | 0
5 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/app-admin/salt/files/api-initd-5 b/app-admin/salt/files/api-initd-5
index 1fecd03275e..18e06c6fd08 100644
--- a/app-admin/salt/files/api-initd-5
+++ b/app-admin/salt/files/api-initd-5
@@ -4,8 +4,9 @@
command="/usr/bin/salt-api"
command_args="${SALT_OPTS}"
-pidfile="/var/run/salt-api.pid"
-command_args_background="--daemon --pid-file=\"${pidfile}\""
+pidfile="/var/run/supervisor-salt-api.pid"
+daemon_pidfile="/var/run/salt-api.pid"
+command_args_background="--daemon --pid-file=\"${daemon_pidfile}\""
name="SALT API daemon"
retry="20"
diff --git a/app-admin/salt/files/master-initd-5
b/app-admin/salt/files/master-initd-5
index 13c8ad89228..7313e2b7a70 100644
--- a/app-admin/salt/files/master-initd-5
+++ b/app-admin/salt/files/master-initd-5
@@ -4,8 +4,9 @@
command="/usr/bin/salt-master"
command_args="${SALT_OPTS}"
-command_args_background="--daemon --pid-file=\"${pidfile}\""
-pidfile="/var/run/salt-master.pid"
+pidfile="/var/run/supervisor-salt-master.pid"
+daemon_pidfile="/var/run/salt-master.pid"
+command_args_background="--daemon --pid-file=\"${daemon_pidfile}\""
name="SALT master daemon"
retry="20"
diff --git a/app-admin/salt/files/minion-initd-5
b/app-admin/salt/files/minion-initd-5
index e3a430b77fa..426ba964dcb 100644
--- a/app-admin/salt/files/minion-initd-5
+++ b/app-admin/salt/files/minion-initd-5
@@ -4,8 +4,9 @@
command="/usr/bin/salt-minion"
command_args="${SALT_OPTS}"
-pidfile="/var/run/salt-minion.pid"
-command_args_background="--daemon --pid-file=\"${pidfile}\""
+pidfile="/var/run/supervisor-salt-minion.pid"
+daemon_pidfile="/var/run/salt-minion.pid"
+command_args_background="--daemon --pid-file=\"${daemon_pidfile}\""
name="SALT minion daemon"
retry="20"
diff --git a/app-admin/salt/files/syndic-initd-5
b/app-admin/salt/files/syndic-initd-5
index 7e43828bda4..992cacb3f0f 100644
--- a/app-admin/salt/files/syndic-initd-5
+++ b/app-admin/salt/files/syndic-initd-5
@@ -4,8 +4,9 @@
command="/usr/bin/salt-syndic"
command_args="${SALT_OPTS}"
-pidfile="/var/run/salt-syndic.pid"
-command_args_background="--daemon --pid-file=\"${pidfile}\""
+pidfile="/var/run/supervisor-salt-syndic.pid"
+daemon_pidfile="/var/run/salt-syndic.pid"
+command_args_background="--daemon --pid-file=\"${daemon_pidfile}\""
name="SALT syndic daemon"
retry="20"
diff --git a/app-admin/salt/salt-3002.2-r3.ebuild
b/app-admin/salt/salt-3002.2-r4.ebuild
similarity index 100%
rename from app-admin/salt/salt-3002.2-r3.ebuild
rename to app-admin/salt/salt-3002.2-r4.ebuild
