aboutsummaryrefslogtreecommitdiffstats
path: root/community
diff options
context:
space:
mode:
authorChloe Kudryavtsev <toast@toastin.space>2019-05-27 19:56:55 -0400
committerNatanael Copa <ncopa@alpinelinux.org>2019-05-28 07:50:43 +0000
commit44480ccd6a2ef213c11033e8009b76322f1390f9 (patch)
tree1e045c314b420324956f470b058b61b28d40cd49 /community
parent5ee85c4acc6b41728a0dd6408b7e8023a17668a9 (diff)
downloadaports-44480ccd6a2ef213c11033e8009b76322f1390f9.tar.gz
aports-44480ccd6a2ef213c11033e8009b76322f1390f9.tar.bz2
aports-44480ccd6a2ef213c11033e8009b76322f1390f9.tar.xz
community/salt: modernize master and minion init
Diffstat (limited to 'community')
-rw-r--r--community/salt/APKBUILD6
-rw-r--r--community/salt/salt-master.initd15
-rw-r--r--community/salt/salt-minion.initd15
3 files changed, 11 insertions, 25 deletions
diff --git a/community/salt/APKBUILD b/community/salt/APKBUILD
index 11f7ea7c3d..30a3f32173 100644
--- a/community/salt/APKBUILD
+++ b/community/salt/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: Kevin Daudt <kdaudt@alpinelinux.org>
pkgname=salt
pkgver=2019.2.0
-pkgrel=2
+pkgrel=3
pkgdesc="A parallel remote execution system"
url="https://github.com/saltstack/salt"
arch="noarch !s390x"
@@ -153,8 +153,8 @@ sha512sums="de5a976213d011c230e423a172952effddb87168367958b8657eaaaf8fd2a8bec847
975ba2f5e681fbd62045da61cc3dc065b148683a07b5df7eca9f131e47314eb6bfa8660ca1c06a3bd93683c7097d0ff9f8e514273dd24d82fb2de6a255e6b275 salt-api.confd
435d399bfecf431d0c713031e2ae57ce25b5c6edc98b62f33bd7a4ff1c587e3cdeb988445ae0c3e9ffc1911555c3694654d98815f9562b8a14bf0688ec1ebea6 salt-api.initd
cfbbeb8023a383e7c42d84e3346edfd068c9ec7650c4ddc3caa38534da325a67497e1f06ca02cc1f0941b7348a3af6d1dca7cd6f2bcb3612ca10e1ec98997e5a salt-master.confd
-324e687e8b0eaccb799b4a719448341a4e09cda3add102890beddaf371ac42957bbc1622f145b2b86420061655bb27f27879302b5b34c6eee1987d2dcae6b8ef salt-master.initd
+40243f36a44150841ee74878029c011ab59f174640bf6c102b1f93b34d4ad2c12b291201882850ef8a4372c17dd96865cae6631d3b0f59db43c07bfbc1c5b9f6 salt-master.initd
0051e13351cef8db81dc075a194bb384723f07d5591b5b4d3f3adf4180afaf7beced470ab79ceca9d1ec0dae62dbd72084eb76af009fc78411a011050a94a2ed salt-minion.confd
-c6634a592c6f3e65dd2b704cb500486bf8004c5b287d4a4d42b09af36ef129c59d6a89f005af058cf7911e8587d927b3db931186569084f13ebaca56f6ef93a0 salt-minion.initd
+31521a7bf9455a805652ebb2c2a258148d654169caed500dbf1fe0c26baf26b330217117fe84a13706ded75a9eedadc0bbd671ede0957ed4d60d1e766fea6b39 salt-minion.initd
bafc6ea10cdafd0aef868feb35aecbe4ae6a7dff0ae42862bded85715ad763eb89e1ed27437866a7e5f2b9f7064e3c2a3fb59814487744ba4227238d95cf3818 salt-syndic.confd
d71133e834685304e0167554035ebbc861252f972bbe981cc71e45b70f15d94a28a02a369463c9a641372919689f96b62a0408b14f824ad986d536e52b1e5ec0 salt-syndic.initd"
diff --git a/community/salt/salt-master.initd b/community/salt/salt-master.initd
index f224f55bca..accc825f5d 100644
--- a/community/salt/salt-master.initd
+++ b/community/salt/salt-master.initd
@@ -1,14 +1,7 @@
#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/files/master-initd-1,v 1.1 2012/04/24 23:37:27 chutzpah Exp $
+supervisor=supervise-daemon
-command="/usr/bin/salt-master"
-command_args="--daemon ${SALT_OPTS}"
-pidfile="/var/run/salt-master.pid"
-name="SALT master daemon"
-
-depend() {
- use net
-}
+name='SaltStack Master'
+command='/usr/bin/salt-master'
+command_args="${SALT_OPTS}"
diff --git a/community/salt/salt-minion.initd b/community/salt/salt-minion.initd
index 9cfac01e38..b86d824ba8 100644
--- a/community/salt/salt-minion.initd
+++ b/community/salt/salt-minion.initd
@@ -1,13 +1,6 @@
#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/files/minion-initd-1,v 1.1 2012/04/24 23:37:27 chutzpah Exp $
+supervisor=supervise-daemon
-command="/usr/bin/salt-minion"
-command_args="--daemon ${SALT_OPTS}"
-pidfile="/var/run/salt-minion.pid"
-name="SALT minion daemon"
-
-depend() {
- need net
-}
+name='SaltStack Minion'
+command='/usr/bin/salt-minion'
+command_args="${SALT_OPTS}"