Date: Tuesday, January 28, 2014 @ 04:05:41 Author: seblu Revision: 104881
Preliminary work to add salt Added: salt/ salt/repos/ salt/trunk/ salt/trunk/PKGBUILD salt/trunk/salt-master.service salt/trunk/salt-minion.service salt/trunk/salt-syndic.service salt/trunk/salt.install salt/trunk/salt.tmpfiles ---------------------+ PKGBUILD | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++ salt-master.service | 11 ++++++++ salt-minion.service | 11 ++++++++ salt-syndic.service | 11 ++++++++ salt.install | 18 +++++++++++++ salt.tmpfiles | 1 6 files changed, 118 insertions(+) Added: salt/trunk/PKGBUILD =================================================================== --- salt/trunk/PKGBUILD (rev 0) +++ salt/trunk/PKGBUILD 2014-01-28 03:05:41 UTC (rev 104881) @@ -0,0 +1,66 @@ +# $Id$ +# Maintainer: Sébastien Luttringer +# Contibutor: Christer Edwards <[email protected]> + +pkgname=salt +pkgver=0.17.5 +pkgrel=0 +pkgdesc='Central system and configuration manager' +arch=('any') +url='http://saltstack.org/' +license=('Apache') +depends=('libsodium' + 'python2' + 'python2-cffi' + 'python2-crypto' + 'python2-jinja' + 'python2-m2crypto' + 'python2-msgpack' + 'python2-ply' + 'python2-psutil' + 'python2-pycparser' + 'python2-pyzmq' + 'python2-yaml' + 'sshpass') +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') + +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() { + # 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" + + cd $pkgname-$pkgver + python2 setup.py install --root="$pkgdir" --optimize=1 \ + --salt-pidfile-dir="/run/salt" + + # default config + install -Dm644 conf/master "$pkgdir/etc/salt/master" + install -Dm644 conf/minion "$pkgdir/etc/salt/minion" + + # 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" +} + +# vim:set ts=2 sw=2 et: Property changes on: salt/trunk/PKGBUILD ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Added: salt/trunk/salt-master.service =================================================================== --- salt/trunk/salt-master.service (rev 0) +++ salt/trunk/salt-master.service 2014-01-28 03:05:41 UTC (rev 104881) @@ -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 Added: salt/trunk/salt-minion.service =================================================================== --- salt/trunk/salt-minion.service (rev 0) +++ salt/trunk/salt-minion.service 2014-01-28 03:05:41 UTC (rev 104881) @@ -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 Added: salt/trunk/salt-syndic.service =================================================================== --- salt/trunk/salt-syndic.service (rev 0) +++ salt/trunk/salt-syndic.service 2014-01-28 03:05:41 UTC (rev 104881) @@ -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 Added: salt/trunk/salt.install =================================================================== --- salt/trunk/salt.install (rev 0) +++ salt/trunk/salt.install 2014-01-28 03:05:41 UTC (rev 104881) @@ -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: Added: salt/trunk/salt.tmpfiles =================================================================== --- salt/trunk/salt.tmpfiles (rev 0) +++ salt/trunk/salt.tmpfiles 2014-01-28 03:05:41 UTC (rev 104881) @@ -0,0 +1 @@ +d /run/salt 0750 salt salt
