gentoo (valentine's day) resync : 14.02.2021

6 files changed, 77 insertions, 4 deletions

diff --git a/app-admin/salt/files/api-confd-1 b/app-admin/salt/files/api-confd-1
index c70e8e766da0..84a1c6c71a0e 100644
--- a/app-admin/salt/files/api-confd-1
+++ b/app-admin/salt/files/api-confd-1
@@ -1,5 +1,5 @@
-# /etc/conf.d/salt-master: config file for /etc/init.d/salt-master
+# /etc/conf.d/salt-api: config file for /etc/init.d/salt-api
 
-# see man pages for salt-minion or run `salt-master --help`
+# see man pages for salt-minion or run `salt-api --help`
 # for valid cmdline options
 SALT_OPTS="--log-level=warning"
diff --git a/app-admin/salt/files/api-initd-5 b/app-admin/salt/files/api-initd-5
new file mode 100644
index 000000000000..1fecd03275ee
--- /dev/null
+++ b/app-admin/salt/files/api-initd-5
@@ -0,0 +1,18 @@
+#!/sbin/openrc-run
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/bin/salt-api"
+command_args="${SALT_OPTS}"
+pidfile="/var/run/salt-api.pid"
+command_args_background="--daemon --pid-file=\"${pidfile}\""
+name="SALT API daemon"
+retry="20"
+
+supervisor=supervise-daemon
+output_logger="logger -p daemon.info -t salt-api.stdout --"
+error_logger="logger -p daemon.err -t salt-api.error --"
+
+depend() {
+	use net logger
+}
diff --git a/app-admin/salt/files/master-initd-5 b/app-admin/salt/files/master-initd-5
new file mode 100644
index 000000000000..13c8ad892284
--- /dev/null
+++ b/app-admin/salt/files/master-initd-5
@@ -0,0 +1,18 @@
+#!/sbin/openrc-run
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/bin/salt-master"
+command_args="${SALT_OPTS}"
+command_args_background="--daemon --pid-file=\"${pidfile}\""
+pidfile="/var/run/salt-master.pid"
+name="SALT master daemon"
+retry="20"
+
+supervisor=supervise-daemon
+output_logger="logger -p daemon.info -t salt-master.stdout --"
+error_logger="logger -p daemon.err -t salt-master.error --"
+
+depend() {
+	use net logger
+}
diff --git a/app-admin/salt/files/minion-initd-5 b/app-admin/salt/files/minion-initd-5
new file mode 100644
index 000000000000..e3a430b77fa4
--- /dev/null
+++ b/app-admin/salt/files/minion-initd-5
@@ -0,0 +1,19 @@
+#!/sbin/openrc-run
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/bin/salt-minion"
+command_args="${SALT_OPTS}"
+pidfile="/var/run/salt-minion.pid"
+command_args_background="--daemon --pid-file=\"${pidfile}\""
+name="SALT minion daemon"
+retry="20"
+
+supervisor=supervise-daemon
+output_logger="logger -p daemon.info -t salt-minion.stdout --"
+error_logger="logger -p daemon.err -t salt-minion.error --"
+
+depend() {
+	need net
+	use logger
+}
diff --git a/app-admin/salt/files/syndic-confd-1 b/app-admin/salt/files/syndic-confd-1
index d69d83fcd60d..e9c75b8bc787 100644
--- a/app-admin/salt/files/syndic-confd-1
+++ b/app-admin/salt/files/syndic-confd-1
@@ -1,5 +1,5 @@
-# /etc/conf.d/salt-minion: config file for /etc/init.d/salt-minion
+# /etc/conf.d/salt-syndic: config file for /etc/init.d/salt-syndic
 
-# see man pages for salt-minion or run `salt-minion --help`
+# see man pages for salt-minion or run `salt-syndic --help`
 # for valid cmdline options
 SALT_OPTS="--log-level=warning"
diff --git a/app-admin/salt/files/syndic-initd-5 b/app-admin/salt/files/syndic-initd-5
new file mode 100644
index 000000000000..7e43828bda47
--- /dev/null
+++ b/app-admin/salt/files/syndic-initd-5
@@ -0,0 +1,18 @@
+#!/sbin/openrc-run
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/bin/salt-syndic"
+command_args="${SALT_OPTS}"
+pidfile="/var/run/salt-syndic.pid"
+command_args_background="--daemon --pid-file=\"${pidfile}\""
+name="SALT syndic daemon"
+retry="20"
+
+supervisor=supervise-daemon
+output_logger="logger -p daemon.info -t salt-syndic.stdout --"
+error_logger="logger -p daemon.err -t salt-syndic.error --"
+
+depend() {
+	use net logger
+}