Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/app-admin/salt
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2013-12-26 10:56:49 +0000
committerPacho Ramos <pacho@gentoo.org>2013-12-26 10:56:49 +0000
commita73c3590b5fd25b8db5d74bf583947807f91ac63 (patch)
treeac80acbdc548dc7ba88fc6fc1df03b509e164c32 /app-admin/salt
parentfix php5.5 support (diff)
downloadgentoo-2-a73c3590b5fd25b8db5d74bf583947807f91ac63.tar.gz
gentoo-2-a73c3590b5fd25b8db5d74bf583947807f91ac63.tar.bz2
gentoo-2-a73c3590b5fd25b8db5d74bf583947807f91ac63.zip
Add unit files (#492382 by Michael Jones)
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)
Diffstat (limited to 'app-admin/salt')
-rw-r--r--app-admin/salt/ChangeLog9
-rw-r--r--app-admin/salt/files/salt-master.service10
-rw-r--r--app-admin/salt/files/salt-minion.service10
-rw-r--r--app-admin/salt/files/salt-syndic.service10
-rw-r--r--app-admin/salt/salt-0.17.4-r1.ebuild80
5 files changed, 118 insertions, 1 deletions
diff --git a/app-admin/salt/ChangeLog b/app-admin/salt/ChangeLog
index 62c481ab135b..46657e7b1628 100644
--- a/app-admin/salt/ChangeLog
+++ b/app-admin/salt/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for app-admin/salt
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/ChangeLog,v 1.29 2013/12/12 23:26:17 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/ChangeLog,v 1.30 2013/12/26 10:56:49 pacho Exp $
+
+*salt-0.17.4-r1 (26 Dec 2013)
+
+ 26 Dec 2013; Pacho Ramos <pacho@gentoo.org> +files/salt-master.service,
+ +files/salt-minion.service, +files/salt-syndic.service,
+ +salt-0.17.4-r1.ebuild:
+ Add unit files (#492382 by Michael Jones)
*salt-0.17.4 (12 Dec 2013)
diff --git a/app-admin/salt/files/salt-master.service b/app-admin/salt/files/salt-master.service
new file mode 100644
index 000000000000..4f3827ede6df
--- /dev/null
+++ b/app-admin/salt/files/salt-master.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=The Salt Master Server
+After=syslog.target network.target
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/salt-master
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-admin/salt/files/salt-minion.service b/app-admin/salt/files/salt-minion.service
new file mode 100644
index 000000000000..2f199f998eca
--- /dev/null
+++ b/app-admin/salt/files/salt-minion.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=The Salt Minion
+After=syslog.target network.target
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/salt-minion
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-admin/salt/files/salt-syndic.service b/app-admin/salt/files/salt-syndic.service
new file mode 100644
index 000000000000..922eef35af8b
--- /dev/null
+++ b/app-admin/salt/files/salt-syndic.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=The Salt Master Server
+After=syslog.target network.target
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/salt-syndic
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-admin/salt/salt-0.17.4-r1.ebuild b/app-admin/salt/salt-0.17.4-r1.ebuild
new file mode 100644
index 000000000000..446407967231
--- /dev/null
+++ b/app-admin/salt/salt-0.17.4-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/salt-0.17.4-r1.ebuild,v 1.1 2013/12/26 10:56:49 pacho Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=(python{2_6,2_7})
+
+inherit eutils distutils-r1 systemd
+
+DESCRIPTION="Salt is a remote execution and configuration manager."
+HOMEPAGE="http://saltstack.org/"
+
+if [[ ${PV} == 9999* ]]; then
+ inherit git-2
+ EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git"
+ EGIT_BRANCH="develop"
+ SRC_URI=""
+ KEYWORDS=""
+else
+ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+ KEYWORDS="~x86 ~amd64"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="ldap libvirt mako mongodb mysql openssl redis test"
+
+RDEPEND=">=dev-python/pyzmq-2.1.9[${PYTHON_USEDEP}]
+ dev-python/msgpack[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/m2crypto[${PYTHON_USEDEP}]
+ dev-python/pycrypto[${PYTHON_USEDEP}]
+ dev-python/pycryptopp[${PYTHON_USEDEP}]
+ dev-python/jinja[${PYTHON_USEDEP}]
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ sys-apps/pciutils
+ mako? ( dev-python/mako[${PYTHON_USEDEP}] )
+ ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
+ openssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )
+ libvirt? ( || (
+ dev-python/libvirt-python[${PYTHON_USEDEP}]
+ app-emulation/libvirt[python,${PYTHON_USEDEP}]
+ )
+ )
+ mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
+ mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
+ redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )"
+DEPEND="test? (
+ dev-python/pip
+ dev-python/virtualenv
+ dev-python/SaltTesting
+ ${RDEPEND}
+ )"
+
+PATCHES=("${FILESDIR}/${PN}-0.17.1-tests-nonroot.patch")
+DOCS=(README.rst AUTHORS)
+
+python_prepare() {
+ sed -i '/install_requires=/ d' setup.py || die "sed failed"
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+
+ for s in minion master syndic; do
+ newinitd "${FILESDIR}"/${s}-initd-1 salt-${s}
+ newconfd "${FILESDIR}"/${s}-confd-1 salt-${s}
+ systemd_dounit "${FILESDIR}"/salt-${s}.service
+ done
+
+ insinto /etc/${PN}
+ doins conf/*
+}
+
+python_test() {
+ # testsuite likes lots of files
+ ulimit -n 3072
+ SHELL="/bin/bash" TMPDIR=/tmp ./tests/runtests.py --unit-tests --no-report || die
+}