Date: Sunday, February 9, 2014 @ 07:59:54 Author: dwallace Revision: 105494
move ansible and salt into the repos Added: ansible/ ansible/repos/ ansible/trunk/ ansible/trunk/PKGBUILD python2-cffi/ python2-cffi/repos/ python2-cffi/trunk/ python2-cffi/trunk/PKGBUILD python2-ply/ python2-ply/repos/ python2-ply/trunk/ python2-ply/trunk/PKGBUILD python2-pycparser/ python2-pycparser/repos/ python2-pycparser/trunk/ python2-pycparser/trunk/PKGBUILD salt/trunk/salt-master salt/trunk/salt-minion salt/trunk/salt-syndic Modified: salt/trunk/PKGBUILD salt/trunk/salt-master.service salt/trunk/salt-minion.service salt/trunk/salt-syndic.service ----------------------------------+ ansible/trunk/PKGBUILD | 56 ++++++++++++++++++++++ python2-cffi/trunk/PKGBUILD | 32 ++++++++++++ python2-ply/trunk/PKGBUILD | 27 ++++++++++ python2-pycparser/trunk/PKGBUILD | 28 +++++++++++ salt/trunk/PKGBUILD | 92 ++++++++++++++++--------------------- salt/trunk/salt-master | 76 ++++++++++++++++++++++++++++++ salt/trunk/salt-master.service | 6 +- salt/trunk/salt-minion | 75 ++++++++++++++++++++++++++++++ salt/trunk/salt-minion.service | 10 ++-- salt/trunk/salt-syndic | 75 ++++++++++++++++++++++++++++++ salt/trunk/salt-syndic.service | 10 ++-- 11 files changed, 424 insertions(+), 63 deletions(-) Added: ansible/trunk/PKGBUILD =================================================================== --- ansible/trunk/PKGBUILD (rev 0) +++ ansible/trunk/PKGBUILD 2014-02-09 06:59:54 UTC (rev 105494) @@ -0,0 +1,56 @@ +# $Id$ +# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> +# Contributors: Chris <seitz.christ...@gmail.com> +# Contributors: m0ikz <ndelato...@moikz.com.ar> +# Contributors: atweiden <archb...@gmail.com> + +pkgname=ansible +pkgver=1.4.4 +pkgrel=3 +pkgdesc='A radically simple deployment, model-driven configuration management, and command execution framework' +arch=('any') +url='http://www.ansibleworks.com' +license=('GPL3') +depends=('python2' 'python2-yaml' 'python2-paramiko>=1.7.7' 'python2-jinja') +makedepends=('git' 'asciidoc' 'fakeroot') +conflicts=('ansible-git') +source=("http://releases.ansible.com/ansible/$pkgname-$pkgver.tar.gz") +sha256sums=('1b62fd1c4b26c0c7b7215b11308c5b981e7af0e3d78119680d9248f5c229180b') +backup=('etc/ansible/ansible.cfg') + +prepare() { + cd "$srcdir/$pkgname-$pkgver" + + msg 'Fixing Python version...' + find ./bin/ -type f -print0 | xargs -0 sed -i 's#/usr/bin/python#/usr/bin/python2#g' + find ./bin/ -type f -print0 | xargs -0 sed -i 's#/usr/bin/env python#/usr/bin/env python2#g' +} + + +build() { + cd "$srcdir/$pkgname-$pkgver" + + python2 setup.py build +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + mkdir -p "${pkgdir}/usr/share/ansible" + cp -dpr --no-preserve=ownership library/* "${pkgdir}/usr/share/ansible" + cp -dpr --no-preserve=ownership examples "${pkgdir}/usr/share/ansible" + + python2 setup.py install --root="${pkgdir}/" --optimize=1 + + install -D examples/ansible.cfg "${pkgdir}/etc/ansible/ansible.cfg" + + install -D README.md "${pkgdir}/usr/share/doc/ansible/README.md" + install -D COPYING "${pkgdir}/usr/share/doc/ansible/COPYING" + + mkdir -p "${pkgdir}/usr/share/man/man1" + cp -dpr --no-preserve=ownership docs/man/man1/*.1 "${pkgdir}/usr/share/man/man1" + mkdir -p "${pkgdir}/usr/share/man/man3" + cp -dpr --no-preserve=ownership docs/man/man3/*.3 "${pkgdir}/usr/share/man/man3" +} + +# vim:set ts=2 sw=2 et: Property changes on: ansible/trunk/PKGBUILD ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Added: python2-cffi/trunk/PKGBUILD =================================================================== --- python2-cffi/trunk/PKGBUILD (rev 0) +++ python2-cffi/trunk/PKGBUILD 2014-02-09 06:59:54 UTC (rev 105494) @@ -0,0 +1,32 @@ +# $Id$ +# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> +# Contributor: Andy Weidenbaum <archb...@gmail.com> + +pkgname=python2-cffi +pkgver=0.8.1 +pkgrel=3 +pkgdesc="Foreign Function Interface for Python calling C code" +arch=('i686' 'x86_64') +depends=('python2' 'python2-pycparser') +makedepends=('python2-setuptools') +url="http://cffi.readthedocs.org/" +license=('MIT') +options=(!emptydirs) +source=(https://pypi.python.org/packages/source/c/${pkgname#python2-}/${pkgname#python2-}-$pkgver.tar.gz) +md5sums=('1a877bf113bfe90fdefedbf9e39310d2') +sha256sums=('1db1eff2093e31eaaa83b274f8c6d5d2dad2908d43a301185d205e5d256d6818') +provides=('python2-cffi') + +build() { + cd $srcdir/${pkgname#python2-}-$pkgver + + msg 'Building...' + python2 setup.py build +} + +package() { + cd $srcdir/${pkgname#python2-}-$pkgver + + msg 'Installing...' + python2 setup.py install --root="$pkgdir" --optimize=1 +} Property changes on: python2-cffi/trunk/PKGBUILD ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Added: python2-ply/trunk/PKGBUILD =================================================================== --- python2-ply/trunk/PKGBUILD (rev 0) +++ python2-ply/trunk/PKGBUILD 2014-02-09 06:59:54 UTC (rev 105494) @@ -0,0 +1,27 @@ +# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> +# Contributor: Gustavo Alvarez <sl1pk...@gmail.com> +# Contributor: Marcin "avalan" Falkiewicz <avalat...@gmail.com> +# Contributor: C Anthony Risinger <anth...@xtfx.me> + +pkgname=python2-ply +pkgver=3.4 +pkgrel=3 +pkgdesc='Implementation of lex and yacc parsing tools for Python2.' +arch=('any') +url='http://www.dabeaz.com/ply/' +license=('BSD') +depends=('python2') +makedepends=('python2-setuptools') +source=("${url}ply-${pkgver}.tar.gz") +md5sums=('ffdc95858819347bf92d7c2acc074894') + + +build() { + cd "ply-$pkgver" + python2 setup.py build +} + +package() { + cd "ply-$pkgver" + python2 setup.py install --root="${pkgdir}" +} Property changes on: python2-ply/trunk/PKGBUILD ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Added: python2-pycparser/trunk/PKGBUILD =================================================================== --- python2-pycparser/trunk/PKGBUILD (rev 0) +++ python2-pycparser/trunk/PKGBUILD 2014-02-09 06:59:54 UTC (rev 105494) @@ -0,0 +1,28 @@ +# $Id# +# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> +# Contributor: Yaron de Leeuw <jdlmail at gmail > +# Contributor: Andy Weidenbaum <archb...@gmail.com> + +pkgname=python2-pycparser +_realname=pycparser +pkgver=2.10 +pkgrel=3 +pkgdesc="Complete C99 parser in pure Python" +arch=('any') +depends=('python2' 'python2-ply') +makedepends=('python2-setuptools') +url="https://github.com/eliben/pycparser" +license=('BSD') +options=(!emptydirs) +source=("http://pypi.python.org/packages/source/p/$_realname/$_realname-$pkgver.tar.gz") +md5sums=('d87aed98c8a9f386aa56d365fe4d515f') +sha256sums=('957d98b661c0b64b580ab6f94b125e09b6714154ee51de40bca16d3f0076b86c') + + +package() { + cd $srcdir/$_realname-$pkgver + + install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + python2 setup.py install --root="$pkgdir" --optimize=1 +} + Property changes on: python2-pycparser/trunk/PKGBUILD ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Modified: salt/trunk/PKGBUILD =================================================================== --- salt/trunk/PKGBUILD 2014-02-09 06:38:44 UTC (rev 105493) +++ salt/trunk/PKGBUILD 2014-02-09 06:59:54 UTC (rev 105494) @@ -1,67 +1,59 @@ # $Id$ -# Maintainer: Sébastien Luttringer -# Contibutor: Christer Edwards <christer.edwa...@gmail.com> +# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> +# Contributor: Christer Edwards <christer.edwa...@gmail.com> pkgname=salt pkgver=0.17.5 -pkgrel=0.4 -pkgdesc='Central system and configuration manager' -arch=('any') -url='http://saltstack.org/' -license=('Apache') +pkgrel=2 +pkgdesc="A remote execution and communication system built on zeromq" +arch=(any) +url="https://github.com/saltstack/salt" +license=("APACHE") depends=('python2' + 'sshpass' + 'libsodium' + 'python2-ply' + 'python2-cffi' + 'python2-yaml' + 'python2-jinja' + 'python2-pyzmq' 'python2-crypto' - 'python2-jinja' + 'python2-psutil' + 'python2-msgpack' 'python2-m2crypto' - 'python2-msgpack' - 'python2-psutil' - 'python2-pyzmq' - 'python2-yaml' - 'sshpass') -optdepends=('dmidecode: decode SMBIOS/DMI tables') + 'python2-pycparser') + 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') +conflicts=('salt-git') + +source=("http://pypi.python.org/packages/source/s/${pkgname}/${pkgname}-${pkgver}.tar.gz" + "salt-master.service" + "salt-syndic.service" + "salt-minion.service" + "salt-master" + "salt-syndic" + "salt-minion") + md5sums=('1c9647b743c83b73572206e029f1a43f' - 'fbf73ffe2213bf8e6177f7ebde2664a4' - '1839f3b46e5567a91b4ef0fcf943ddb6' - 'ac8023a1e2ab9c107cdc20658212caf4' - '8772c329a5a90aac495d14d5797cc0fd') + '3a2b032ec37077363c049969105b128e' + 'e4c6adce5087e947c26c5c9d9fc3c9bb' + '833d31ebee69f5c0e2c0b6c8d345b6d7' + '33bb43fa74f67da7675c093664d43159' + 'b4adb3a08871646c345f0050e3d55fae' + 'ce64b6fb207142465bb5e2855e27cd8a') -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 ${srcdir}/${pkgname}-${pkgver} - cd $pkgname-$pkgver - python2 setup.py install --root="$pkgdir" --optimize=1 \ - --salt-pidfile-dir="/run/salt" + python2 setup.py install --root=${pkgdir}/ --optimize=1 - # default config - install -Dm644 conf/master "$pkgdir/etc/salt/master" - install -Dm644 conf/minion "$pkgdir/etc/salt/minion" + install -Dm644 ${srcdir}/salt-master.service ${pkgdir}/usr/lib/systemd/system/salt-master.service + install -Dm644 ${srcdir}/salt-syndic.service ${pkgdir}/usr/lib/systemd/system/salt-syndic.service + install -Dm644 ${srcdir}/salt-minion.service ${pkgdir}/usr/lib/systemd/system/salt-minion.service - # 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" + mkdir -p ${pkgdir}/etc/salt/ + cp ${srcdir}/${pkgname}-${pkgver}/conf/master ${pkgdir}/etc/salt/ + cp ${srcdir}/${pkgname}-${pkgver}/conf/minion ${pkgdir}/etc/salt/ } - -# vim:set ts=2 sw=2 et: Added: salt/trunk/salt-master =================================================================== --- salt/trunk/salt-master (rev 0) +++ salt/trunk/salt-master 2014-02-09 06:59:54 UTC (rev 105494) @@ -0,0 +1,76 @@ +#!/bin/bash + +daemon_name='salt-master' + +. /etc/rc.conf +. /etc/rc.d/functions +[ -f /etc/conf.d/$daemon_name ] && . /etc/conf.d/$daemon_name + +get_pid() { + ps aux | grep -v grep | grep '/usr/bin/python2 /usr/bin/salt-master' | awk '{print $2}' +} + +case "$1" in + start) + stat_busy "Starting Salt Master" + + PID=$(get_pid) + if [ -z "$PID" ]; then + [ -f /var/run/$daemon_name.pid ] && rm -f /var/run/$daemon_name.pid + # RUN + /usr/bin/$daemon_name -d + # + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + echo $(get_pid) > /var/run/$daemon_name.pid + add_daemon $daemon_name + stat_done + fi + else + stat_fail + exit 1 + fi + ;; + + stop) + stat_busy "Stopping Salt Master" + PID=$(get_pid) + # KILL + [ ! -z "$PID" ] && kill $PID &> /dev/null + # + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + rm -f /var/run/$daemon_name.pid &> /dev/null + rm_daemon $daemon_name + stat_done + fi + ;; + + restart) + $0 stop + sleep 1 + $0 start + ;; + + status) + stat_busy "Checking $daemon_name status"; + PID=$(get_pid) + if [ -n "$PID" ]; then + status_started + exit 0 + else + status_stopped + exit 3 + fi + ;; + + + *) + echo "usage: $0 {start|stop|restart|status}" +esac + +exit 0 Modified: salt/trunk/salt-master.service =================================================================== --- salt/trunk/salt-master.service 2014-02-09 06:38:44 UTC (rev 105493) +++ salt/trunk/salt-master.service 2014-02-09 06:59:54 UTC (rev 105494) @@ -1,11 +1,11 @@ [Unit] -Description=Salt Master Daemon -After=network.target +Description=The Salt Master Server +After=syslog.target network.target [Service] Type=forking -PIDFile=/run/salt/salt-master.pid ExecStart=/usr/bin/salt-master -d +PIDFile=/var/run/salt-master.pid [Install] WantedBy=multi-user.target Added: salt/trunk/salt-minion =================================================================== --- salt/trunk/salt-minion (rev 0) +++ salt/trunk/salt-minion 2014-02-09 06:59:54 UTC (rev 105494) @@ -0,0 +1,75 @@ +#!/bin/bash + +daemon_name='salt-minion' + +. /etc/rc.conf +. /etc/rc.d/functions +[ -f /etc/conf.d/$daemon_name ] && . /etc/conf.d/$daemon_name + +get_pid() { + ps aux | grep -v grep | grep '/usr/bin/python2 /usr/bin/salt-minion' | awk '{print $2}' +} + +case "$1" in + start) + stat_busy "Starting Salt Minion" + + PID=$(get_pid) + if [ -z "$PID" ]; then + [ -f /var/run/$daemon_name.pid ] && rm -f /var/run/$daemon_name.pid + # RUN + /usr/bin/$daemon_name -d + # + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + echo $(get_pid) > /var/run/$daemon_name.pid + add_daemon $daemon_name + stat_done + fi + else + stat_fail + exit 1 + fi + ;; + + stop) + stat_busy "Stopping Salt Minion" + PID=$(get_pid) + # KILL + [ ! -z "$PID" ] && kill $PID &> /dev/null + # + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + rm -f /var/run/$daemon_name.pid &> /dev/null + rm_daemon $daemon_name + stat_done + fi + ;; + + restart) + $0 stop + sleep 1 + $0 start + ;; + + status) + stat_busy "Checking $daemon_name status"; + PID=$(get_pid) + if [ -n "$PID" ]; then + status_started + exit 0 + else + status_stopped + exit 3 + fi + ;; + + *) + echo "usage: $0 {start|stop|restart|status}" +esac + +exit 0 Modified: salt/trunk/salt-minion.service =================================================================== --- salt/trunk/salt-minion.service 2014-02-09 06:38:44 UTC (rev 105493) +++ salt/trunk/salt-minion.service 2014-02-09 06:59:54 UTC (rev 105494) @@ -1,11 +1,11 @@ [Unit] -Description=Salt Minion Daemon -After=network.target +Description=The Salt Minion +After=syslog.target network.target [Service] -Type=forking -PIDFile=/run/salt/salt-minion.pid -ExecStart=/usr/bin/salt-minion -d +Type=simple +ExecStart=/usr/bin/salt-minion +PIDFile=/var/run/salt-minion.pid [Install] WantedBy=multi-user.target Added: salt/trunk/salt-syndic =================================================================== --- salt/trunk/salt-syndic (rev 0) +++ salt/trunk/salt-syndic 2014-02-09 06:59:54 UTC (rev 105494) @@ -0,0 +1,75 @@ +#!/bin/bash + +daemon_name='salt-syndic' + +. /etc/rc.conf +. /etc/rc.d/functions +[ -f /etc/conf.d/$daemon_name ] && . /etc/conf.d/$daemon_name + +get_pid() { + ps aux | grep -v grep | grep '/usr/bin/python2 /usr/bin/salt-syndic' | awk '{print $2}' +} + +case "$1" in + start) + stat_busy "Starting Salt Syndic" + + PID=$(get_pid) + if [ -z "$PID" ]; then + [ -f /var/run/$daemon_name.pid ] && rm -f /var/run/$daemon_name.pid + # RUN + /usr/bin/$daemon_name -d + # + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + echo $(get_pid) > /var/run/$daemon_name.pid + add_daemon $daemon_name + stat_done + fi + else + stat_fail + exit 1 + fi + ;; + + stop) + stat_busy "Stopping Salt Syndic" + PID=$(get_pid) + # KILL + [ ! -z "$PID" ] && kill $PID &> /dev/null + # + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + rm -f /var/run/$daemon_name.pid &> /dev/null + rm_daemon $daemon_name + stat_done + fi + ;; + + restart) + $0 stop + sleep 1 + $0 start + ;; + + status) + stat_busy "Checking $daemon_name status"; + PID=$(get_pid) + if [ -n "$PID" ]; then + status_started + exit 0 + else + status_stopped + exit 3 + fi + ;; + + *) + echo "usage: $0 {start|stop|restart|status}" +esac + +exit 0 Modified: salt/trunk/salt-syndic.service =================================================================== --- salt/trunk/salt-syndic.service 2014-02-09 06:38:44 UTC (rev 105493) +++ salt/trunk/salt-syndic.service 2014-02-09 06:59:54 UTC (rev 105494) @@ -1,11 +1,11 @@ [Unit] -Description=Salt Syndic Daemon -After=network.target +Description=The Salt Master Server +After=syslog.target network.target [Service] -Type=forking -PIDFile=/run/salt/salt-syndic.pid -ExecStart=/usr/bin/salt-syndic -d +Type=simple +ExecStart=/usr/bin/salt-syndic +PIDFile=/var/run/salt-syndic.pid [Install] WantedBy=multi-user.target