[arch-commits] Commit in salt/repos (5 files)
Sébastien Luttringer
seblu at nymeria.archlinux.org
Sat Apr 19 22:25:04 UTC 2014
Date: Sunday, April 20, 2014 @ 00:25:04
Author: seblu
Revision: 109865
db-move: moved salt from [community-testing] to [community] (any)
Added:
salt/repos/community-any/PKGBUILD
(from rev 109864, salt/repos/community-testing-any/PKGBUILD)
salt/repos/community-any/salt.install
(from rev 109864, salt/repos/community-testing-any/salt.install)
Deleted:
salt/repos/community-any/PKGBUILD
salt/repos/community-any/salt.install
salt/repos/community-testing-any/
----------------------------+
/PKGBUILD | 47 +++++++++++++++++++++++++++++++++++++++++++
/salt.install | 15 +++++++++++++
community-any/PKGBUILD | 46 ------------------------------------------
community-any/salt.install | 15 -------------
4 files changed, 62 insertions(+), 61 deletions(-)
Deleted: community-any/PKGBUILD
===================================================================
--- community-any/PKGBUILD 2014-04-19 20:35:54 UTC (rev 109864)
+++ community-any/PKGBUILD 2014-04-19 22:25:04 UTC (rev 109865)
@@ -1,46 +0,0 @@
-# $Id$
-# Maintainer: Sébastien Luttringer
-# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
-# Contibutor: Christer Edwards <christer.edwards at gmail.com>
-
-pkgname=salt
-pkgver=2014.1.1
-pkgrel=2
-pkgdesc='Central system and configuration manager'
-arch=('any')
-url='http://saltstack.org/'
-license=('Apache')
-depends=('python2'
- 'python2-crypto'
- 'python2-jinja'
- 'python2-m2crypto'
- 'python2-msgpack'
- 'python2-psutil'
- 'python2-pyzmq'
- 'python2-systemd'
- 'python2-yaml'
- 'apache-libcloud'
- '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")
-md5sums=('c5c3ed043ad81cd71aff067c4e44d596')
-
-package() {
- 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"
-
- # systemd services
- for _svc in salt-master.service salt-syndic.service salt-minion.service; do
- install -Dm644 pkg/$_svc "$pkgdir/usr/lib/systemd/system/$_svc"
- done
-}
-
-# vim:set ts=2 sw=2 et:
Copied: salt/repos/community-any/PKGBUILD (from rev 109864, salt/repos/community-testing-any/PKGBUILD)
===================================================================
--- community-any/PKGBUILD (rev 0)
+++ community-any/PKGBUILD 2014-04-19 22:25:04 UTC (rev 109865)
@@ -0,0 +1,47 @@
+# $Id$
+# Maintainer: Sébastien Luttringer
+# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
+# Contibutor: Christer Edwards <christer.edwards at gmail.com>
+
+pkgname=salt
+pkgver=2014.1.3
+pkgrel=1
+pkgdesc='Central system and configuration manager'
+arch=('any')
+url='http://saltstack.org/'
+license=('Apache')
+depends=('python2'
+ 'python2-crypto'
+ 'python2-jinja'
+ 'python2-m2crypto'
+ 'python2-msgpack'
+ 'python2-psutil'
+ 'python2-pyzmq'
+ 'python2-systemd'
+ 'python2-requests'
+ 'python2-yaml'
+ 'apache-libcloud'
+ '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")
+md5sums=('e9d0e19b6a326f99c210f86ae72a7c3d')
+
+package() {
+ 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"
+
+ # systemd services
+ for _svc in salt-master.service salt-syndic.service salt-minion.service; do
+ install -Dm644 pkg/$_svc "$pkgdir/usr/lib/systemd/system/$_svc"
+ done
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: community-any/salt.install
===================================================================
--- community-any/salt.install 2014-04-19 20:35:54 UTC (rev 109864)
+++ community-any/salt.install 2014-04-19 22:25:04 UTC (rev 109865)
@@ -1,15 +0,0 @@
-#!/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:
Copied: salt/repos/community-any/salt.install (from rev 109864, salt/repos/community-testing-any/salt.install)
===================================================================
--- community-any/salt.install (rev 0)
+++ community-any/salt.install 2014-04-19 22:25:04 UTC (rev 109865)
@@ -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:
More information about the arch-commits
mailing list