diff options
| author |   Patrick McLean <patrick.mclean@sony.com> | 2021-02-17 17:17:46 -0800 |
|---|---|---|
| committer |   Patrick McLean <chutzpah@gentoo.org> | 2021-02-17 17:17:46 -0800 |
| commit | 051badb288c5cbe9140be22ba3fe11844cef306c (patch) | |
| tree | df163eb6697b728287cdedd7e3e56cbca4b93c64 /app-admin/salt | |
| parent | sys-apps/firejail: RESTRICT tests which fail in sandbox (diff) | |
| download | gentoo-051badb288c5cbe9140be22ba3fe11844cef306c.tar.gz gentoo-051badb288c5cbe9140be22ba3fe11844cef306c.tar.bz2 gentoo-051badb288c5cbe9140be22ba3fe11844cef306c.zip | |
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@gentoo.org>
Diffstat (limited to 'app-admin/salt')
| -rw-r--r-- | app-admin/salt/files/api-initd-5 | 5 | ||||
| -rw-r--r-- | app-admin/salt/files/master-initd-5 | 5 | ||||
| -rw-r--r-- | app-admin/salt/files/minion-initd-5 | 5 | ||||
| -rw-r--r-- | app-admin/salt/files/syndic-initd-5 | 5 | ||||
| -rw-r--r-- | app-admin/salt/salt-3002.2-r4.ebuild (renamed from app-admin/salt/salt-3002.2-r3.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 1fecd03275ee..18e06c6fd086 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 13c8ad892284..7313e2b7a701 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 e3a430b77fa4..426ba964dcb3 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 7e43828bda47..992cacb3f0f3 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 index 7c65d1b19803..7c65d1b19803 100644 --- a/app-admin/salt/salt-3002.2-r3.ebuild +++ b/app-admin/salt/salt-3002.2-r4.ebuild |