Date: Saturday, January 5, 2019 @ 17:29:06 Author: demize Revision: 420686
db-move: moved salt from [community-testing] to [community] (any) Added: salt/repos/community-any/PKGBUILD (from rev 420685, salt/repos/community-testing-any/PKGBUILD) salt/repos/community-any/salt.install (from rev 420685, salt/repos/community-testing-any/salt.install) salt/repos/community-any/salt.logrotate (from rev 420685, salt/repos/community-testing-any/salt.logrotate) Deleted: salt/repos/community-any/PKGBUILD salt/repos/community-any/salt.install salt/repos/community-testing-any/ ------------------------------+ /PKGBUILD | 61 +++++++++++++++++++++++++++++++++++++++++ /salt.install | 22 ++++++++++++++ community-any/PKGBUILD | 56 ------------------------------------- community-any/salt.install | 22 -------------- community-any/salt.logrotate | 7 ++++ 5 files changed, 90 insertions(+), 78 deletions(-) Deleted: community-any/PKGBUILD =================================================================== --- community-any/PKGBUILD 2019-01-05 17:28:22 UTC (rev 420685) +++ community-any/PKGBUILD 2019-01-05 17:29:06 UTC (rev 420686) @@ -1,56 +0,0 @@ -# Maintainer: Johannes Löthberg <johan...@kyriasis.com> -# Contributor: Sébastien Luttringer -# Contributor: Daniel Wallace <danielwallace at gtmanfred dot com> -# Contributor: Christer Edwards <christer.edwa...@gmail.com> - -pkgname=salt -pkgver=2018.3.3 -pkgrel=1 - -pkgdesc='Central system and configuration manager' -arch=('any') -url='http://saltstack.org/' -license=('Apache') - -replaces=('salt-zmq' 'salt-raet') -conflicts=('salt-zmq' 'salt-raet') - -depends=('python2-jinja' - 'python2-msgpack' - 'python2-yaml' - 'python2-markupsafe' - 'python2-requests' - 'python2-pyzmq' - 'python2-crypto' - 'python2-m2crypto' - 'python2-systemd' - 'python2-tornado' - 'python2-futures') -optdepends=('dmidecode: decode SMBIOS/DMI tables' - 'python2-pygit2: gitfs support') - -backup=('etc/salt/master' - 'etc/salt/minion') - -install=salt.install -source=("https://pypi.io/packages/source/s/salt/salt-$pkgver.tar.gz") -md5sums=('13ba421e4bea1f33617b30b1116a9d32') - -package() { - cd salt-$pkgver - 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" -} - -# vim:set ts=2 sw=2 et: Copied: salt/repos/community-any/PKGBUILD (from rev 420685, salt/repos/community-testing-any/PKGBUILD) =================================================================== --- community-any/PKGBUILD (rev 0) +++ community-any/PKGBUILD 2019-01-05 17:29:06 UTC (rev 420686) @@ -0,0 +1,61 @@ +# Maintainer: Johannes Löthberg <johan...@kyriasis.com> +# Contributor: Sébastien Luttringer +# Contributor: Daniel Wallace <danielwallace at gtmanfred dot com> +# Contributor: Christer Edwards <christer.edwa...@gmail.com> + +pkgname=salt +pkgver=2018.3.3 +pkgrel=2 + +pkgdesc='Central system and configuration manager' +arch=('any') +url='http://saltstack.org/' +license=('Apache') + +replaces=('salt-zmq' 'salt-raet') +conflicts=('salt-zmq' 'salt-raet') + +depends=('python2-jinja' + 'python2-msgpack' + 'python2-yaml' + 'python2-markupsafe' + 'python2-requests' + 'python2-pyzmq' + 'python2-crypto' + 'python2-m2crypto' + 'python2-systemd' + 'python2-tornado' + 'python2-futures') +optdepends=('dmidecode: decode SMBIOS/DMI tables' + 'python2-pygit2: gitfs support') + +backup=('etc/logrotate.d/salt' + 'etc/salt/master' + 'etc/salt/minion') + +install=salt.install +source=("https://pypi.io/packages/source/s/salt/salt-$pkgver.tar.gz" + salt.logrotate) +md5sums=('13ba421e4bea1f33617b30b1116a9d32' + '029c0553d023004ca00b0519620a8491') + +package() { + install -Dm644 salt.logrotate "$pkgdir"/etc/logrotate.d/salt + + cd salt-$pkgver + 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" +} + +# vim:set ts=2 sw=2 et: Deleted: community-any/salt.install =================================================================== --- community-any/salt.install 2019-01-05 17:28:22 UTC (rev 420685) +++ community-any/salt.install 2019-01-05 17:29:06 UTC (rev 420686) @@ -1,22 +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 - - if [[ "$(vercmp $2 2016.3.3-1)" -le 0 ]]; then - cat << EOF -==> Since version 2016.3.3-2 RAET is no longer supported. Please switch to either -==> zeromq or tcp for transport instead. -EOF - fi -} - -# vim:set ts=2 sw=2 ft=sh et: Copied: salt/repos/community-any/salt.install (from rev 420685, salt/repos/community-testing-any/salt.install) =================================================================== --- community-any/salt.install (rev 0) +++ community-any/salt.install 2019-01-05 17:29:06 UTC (rev 420686) @@ -0,0 +1,22 @@ +#!/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 + + if [[ "$(vercmp $2 2016.3.3-1)" -le 0 ]]; then + cat << EOF +==> Since version 2016.3.3-2 RAET is no longer supported. Please switch to either +==> zeromq or tcp for transport instead. +EOF + fi +} + +# vim:set ts=2 sw=2 ft=sh et: Copied: salt/repos/community-any/salt.logrotate (from rev 420685, salt/repos/community-testing-any/salt.logrotate) =================================================================== --- community-any/salt.logrotate (rev 0) +++ community-any/salt.logrotate 2019-01-05 17:29:06 UTC (rev 420686) @@ -0,0 +1,7 @@ +/var/log/salt/* { + compress + copytruncate + missingok + notifempty + rotate 7 +}