[arch-commits] Commit in salt/repos (4 files)

[Daniel Wallace]

    Date: Saturday, September 12, 2015 @ 01:07:06
  Author: dwallace
Revision: 139943

archrelease: copy trunk to community-testing-any

Added:
  salt/repos/community-testing-any/
  salt/repos/community-testing-any/PKGBUILD
    (from rev 139942, salt/trunk/PKGBUILD)
  salt/repos/community-testing-any/salt.install
    (from rev 139942, salt/trunk/salt.install)
Deleted:
  salt/repos/testing-any/

--------------+
 PKGBUILD     |   97 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 salt.install |   15 ++++++++
 2 files changed, 112 insertions(+)

Copied: salt/repos/community-testing-any/PKGBUILD (from rev 139942, salt/trunk/PKGBUILD)
===================================================================
--- community-testing-any/PKGBUILD	                        (rev 0)
+++ community-testing-any/PKGBUILD	2015-09-11 23:07:06 UTC (rev 139943)
@@ -0,0 +1,97 @@
+# $Id$
+# Maintainer: Sébastien Luttringer
+# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
+# Contibutor: Christer Edwards <christer.edwards at gmail.com>
+
+pkgbase=salt
+pkgname=(salt-zmq salt-raet)
+pkgver=2015.8.0
+pkgrel=1
+pkgdesc='Central system and configuration manager'
+arch=('any')
+url='http://saltstack.org/'
+license=('Apache')
+makedepends=('python2'
+             'python2-jinja'
+             'python2-msgpack'
+             'python2-yaml'
+             'python2-markupsafe'
+             'python2-requests'
+             'python2-libnacl'
+             'python2-ioflo'
+             'python2-raet'
+             'python2-pyzmq'
+             'python2-crypto'
+             'python2-m2crypto'
+             'python2-systemd'
+             'python2-tornado')
+optdepends=('dmidecode: decode SMBIOS/DMI tables'
+            'python2-pygit2: gitfs support')
+backup=('etc/salt/master'
+        'etc/salt/minion')
+install=salt.install
+conflicts=('salt')
+source=("http://pypi.python.org/packages/source/s/salt/salt-$pkgver.tar.gz")
+md5sums=('a15842ef0582cca9d26143fe0a6180b7')
+
+package_salt-zmq() {
+  cd $pkgbase-$pkgver
+  provides=('salt' 'salt-api')
+  replaces=('salt<=2014.1.13' 'salt-api<2014.7')
+  depends=('python2-jinja'
+           'python2-msgpack'
+           'python2-yaml'
+           'python2-markupsafe'
+           'python2-requests'
+           'python2-pyzmq'
+           'python2-crypto'
+           'python2-m2crypto'
+           'python2-systemd'
+           'python2-tornado')
+  python2 setup.py clean
+  python2 setup.py --salt-pidfile-dir="/run/salt" install --root="$pkgdir" --optimize=1
+
+  # default config
+  install -Dm644 conf/master "$pkgdir/etc/salt/master"
+  install -Dm644 conf/minion "$pkgdir/etc/salt/minion"
+
+  # systemd services
+  for _svc in salt-master.service salt-syndic.service salt-minion.service salt-api.service; do
+    install -Dm644 pkg/$_svc "$pkgdir/usr/lib/systemd/system/$_svc"
+  done
+  install -Dm644 pkg/salt.bash "$pkgdir/usr/share/bash-completion/completions/salt"
+  install -Dm644 pkg/zsh_completion.zsh "$pkgdir/usr/share/zsh/site-functions/_salt"
+}
+
+package_salt-raet() {
+  cd $pkgbase-$pkgver
+  provides=('salt' 'salt-api')
+  depends=('python2-jinja'
+           'python2-msgpack'
+           'python2-yaml'
+           'python2-markupsafe'
+           'python2-requests'
+           'python2-libnacl'
+           'python2-ioflo'
+           'python2-raet'
+           'python2-tornado'
+           'python2-systemd')
+  python2 setup.py clean
+  python2 setup.py --salt-pidfile-dir="/run/salt" --salt-transport=raet install --root="$pkgdir" --optimize=1
+
+  # default config
+  install -Dm644 conf/master "$pkgdir/etc/salt/master"
+  install -Dm644 conf/minion "$pkgdir/etc/salt/minion"
+  install -d "$pkgdir/etc/salt/master.d/" "$pkgdir/etc/salt/minion.d/"
+  echo 'transport: raet' > "$pkgdir/etc/salt/master.d/transport.conf"
+  echo 'transport: raet' > "$pkgdir/etc/salt/minion.d/transport.conf"
+
+  # systemd services
+  for _svc in salt-master.service salt-syndic.service salt-minion.service salt-api.service; do
+    install -Dm644 pkg/$_svc "$pkgdir/usr/lib/systemd/system/$_svc"
+  done
+  install -Dm644 pkg/salt.bash "$pkgdir/usr/share/bash-completion/completions/salt"
+  install -Dm644 pkg/zsh_completion.zsh "$pkgdir/usr/share/zsh/site-functions/_salt"
+}
+
+# vim:set ts=2 sw=2 et:

Copied: salt/repos/community-testing-any/salt.install (from rev 139942, salt/trunk/salt.install)
===================================================================
--- community-testing-any/salt.install	                        (rev 0)
+++ community-testing-any/salt.install	2015-09-11 23:07:06 UTC (rev 139943)
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_upgrade() {
+  if [ "$(vercmp $2 2014.1.1-1)" -le 0 ]; then
+    cat << EOF
+==> Since version 2014.1.1-2, salt-master runs by default as root user.
+==> You need to manually update your configuration and remove the salt user and
+==> group to follow the new default behavior.
+EOF
+    fi
+}
+
+# vim:set ts=2 sw=2 ft=sh et: