[arch-commits] Commit in salt/trunk (6 files)
Sébastien Luttringer
seblu at nymeria.archlinux.org
Tue Feb 11 00:12:05 UTC 2014
Date: Tuesday, February 11, 2014 @ 01:12:05
Author: seblu
Revision: 105592
Reverted to previous seblu version
Please check existance before package inclusion.
Added:
salt/trunk/salt-master.service
(from rev 105481, salt/trunk/salt-master.service)
salt/trunk/salt-minion.service
(from rev 105481, salt/trunk/salt-minion.service)
salt/trunk/salt-syndic.service
(from rev 105481, salt/trunk/salt-syndic.service)
salt/trunk/salt.install
(from rev 105481, salt/trunk/salt.install)
salt/trunk/salt.tmpfiles
(from rev 105481, salt/trunk/salt.tmpfiles)
Modified:
salt/trunk/PKGBUILD
---------------------+
PKGBUILD | 74 +++++++++++++++++++++++++++++++++-----------------
salt-master.service | 11 +++++++
salt-minion.service | 11 +++++++
salt-syndic.service | 11 +++++++
salt.install | 18 ++++++++++++
salt.tmpfiles | 1
6 files changed, 102 insertions(+), 24 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2014-02-10 18:05:32 UTC (rev 105591)
+++ PKGBUILD 2014-02-11 00:12:05 UTC (rev 105592)
@@ -1,41 +1,67 @@
# $Id$
-# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
-# Contributor: Christer Edwards <christer.edwards at gmail.com>
+# Maintainer: Sébastien Luttringer
+# Contibutor: Christer Edwards <christer.edwards at gmail.com>
+
pkgname=salt
pkgver=0.17.5
-pkgrel=1
-pkgdesc="A remote execution and communication system built on zeromq"
+pkgrel=0.4
+pkgdesc='Central system and configuration manager'
arch=('any')
-url="https://github.com/saltstack/salt"
-license=('APACHE')
+url='http://saltstack.org/'
+license=('Apache')
depends=('python2'
- 'python2-yaml'
+ 'python2-crypto'
'python2-jinja'
+ 'python2-m2crypto'
+ 'python2-msgpack'
+ 'python2-psutil'
'python2-pyzmq'
- 'python2-crypto'
- 'python2-psutil'
- 'python2-msgpack'
- 'python2-m2crypto')
-
+ 'python2-yaml'
+ 'sshpass')
+optdepends=('dmidecode: decode SMBIOS/DMI tables')
backup=('etc/salt/master'
'etc/salt/minion')
+install=salt.install
+source=("http://pypi.python.org/packages/source/s/salt/salt-$pkgver.tar.gz"
+ 'salt-master.service'
+ 'salt-syndic.service'
+ 'salt-minion.service'
+ 'salt.tmpfiles')
-source=('https://pypi.python.org/packages/source/s/${pkgname}/${pkgname}-${pkgver}.tar.gz')
+md5sums=('1c9647b743c83b73572206e029f1a43f'
+ 'fbf73ffe2213bf8e6177f7ebde2664a4'
+ '1839f3b46e5567a91b4ef0fcf943ddb6'
+ 'ac8023a1e2ab9c107cdc20658212caf4'
+ '8772c329a5a90aac495d14d5797cc0fd')
+prepare() {
+ # we run master as user salt
+ sed -ri 's|^#user: root|user: salt|' $pkgname-$pkgver/conf/master
+}
package() {
- cd "${srcdir}/${_gitname}"
-
- python2 setup.py install --root=${pkgdir}/ --optimize=1
+ # systemd
+ install -Dm644 salt-master.service "$pkgdir/usr/lib/systemd/system/salt-master.service"
+ install -Dm644 salt-syndic.service "$pkgdir/usr/lib/systemd/system/salt-syndic.service"
+ install -Dm644 salt-minion.service "$pkgdir/usr/lib/systemd/system/salt-minion.service"
+ install -Dm644 salt.tmpfiles "$pkgdir/usr/lib/tmpfiles.d/salt.conf"
- install -Dm644 ${srcdir}/salt/pkg/arch/salt-master.service ${pkgdir}/usr/lib/systemd/system/salt-master.service
- install -Dm644 ${srcdir}/salt/pkg/arch/salt-syndic.service ${pkgdir}/usr/lib/systemd/system/salt-syndic.service
- install -Dm644 ${srcdir}/salt/pkg/arch/salt-minion.service ${pkgdir}/usr/lib/systemd/system/salt-minion.service
+ cd $pkgname-$pkgver
+ python2 setup.py install --root="$pkgdir" --optimize=1 \
+ --salt-pidfile-dir="/run/salt"
- mkdir -p ${pkgdir}/etc/salt/
- cp ${srcdir}/salt/conf/master ${pkgdir}/etc/salt/
- cp ${srcdir}/salt/conf/minion ${pkgdir}/etc/salt/
+ # default config
+ install -Dm644 conf/master "$pkgdir/etc/salt/master"
+ install -Dm644 conf/minion "$pkgdir/etc/salt/minion"
- # remove vcs leftovers
- find "$pkgdir" -type d -name .git -exec rm -r '{}' +
+ # salt directories (cache must be owned by salt)
+ install -dm750 -o 141 -g 141 "$pkgdir/var/cache/salt"
+ install -dm750 -o 141 -g 141 "$pkgdir/var/log/salt"
+ install -dm750 -o 141 -g 141 "$pkgdir/srv/salt"
+
+ # salt config editable by salt user
+ chown -R 141:141 "$pkgdir/etc/salt"
+ chmod 750 "$pkgdir/etc/salt"
}
+
+# vim:set ts=2 sw=2 et:
Copied: salt/trunk/salt-master.service (from rev 105481, salt/trunk/salt-master.service)
===================================================================
--- salt-master.service (rev 0)
+++ salt-master.service 2014-02-11 00:12:05 UTC (rev 105592)
@@ -0,0 +1,11 @@
+[Unit]
+Description=Salt Master Daemon
+After=network.target
+
+[Service]
+Type=forking
+PIDFile=/run/salt/salt-master.pid
+ExecStart=/usr/bin/salt-master -d
+
+[Install]
+WantedBy=multi-user.target
Copied: salt/trunk/salt-minion.service (from rev 105481, salt/trunk/salt-minion.service)
===================================================================
--- salt-minion.service (rev 0)
+++ salt-minion.service 2014-02-11 00:12:05 UTC (rev 105592)
@@ -0,0 +1,11 @@
+[Unit]
+Description=Salt Minion Daemon
+After=network.target
+
+[Service]
+Type=forking
+PIDFile=/run/salt/salt-minion.pid
+ExecStart=/usr/bin/salt-minion -d
+
+[Install]
+WantedBy=multi-user.target
Copied: salt/trunk/salt-syndic.service (from rev 105481, salt/trunk/salt-syndic.service)
===================================================================
--- salt-syndic.service (rev 0)
+++ salt-syndic.service 2014-02-11 00:12:05 UTC (rev 105592)
@@ -0,0 +1,11 @@
+[Unit]
+Description=Salt Syndic Daemon
+After=network.target
+
+[Service]
+Type=forking
+PIDFile=/run/salt/salt-syndic.pid
+ExecStart=/usr/bin/salt-syndic -d
+
+[Install]
+WantedBy=multi-user.target
Copied: salt/trunk/salt.install (from rev 105481, salt/trunk/salt.install)
===================================================================
--- salt.install (rev 0)
+++ salt.install 2014-02-11 00:12:05 UTC (rev 105592)
@@ -0,0 +1,18 @@
+#/bin/bash
+
+# arg 1: the new package version
+post_install() {
+ getent group salt >/dev/null || groupadd -g 141 salt
+ getent passwd salt >/dev/null || useradd -d /srv/salt -u 141 -g 141 salt
+ systemd-tmpfiles --create salt.conf
+ true
+}
+
+# arg 1: the old package version
+post_remove() {
+ userdel -f salt &>/dev/null
+ groupdel salt &>/dev/null
+ true
+}
+
+# vim:set ts=2 sw=2 ft=sh et:
Copied: salt/trunk/salt.tmpfiles (from rev 105481, salt/trunk/salt.tmpfiles)
===================================================================
--- salt.tmpfiles (rev 0)
+++ salt.tmpfiles 2014-02-11 00:12:05 UTC (rev 105592)
@@ -0,0 +1 @@
+d /run/salt 0750 salt salt
More information about the arch-commits
mailing list