Date: Sunday, February 9, 2014 @ 15:46:57 Author: dwallace Revision: 105522
move to the new depends for the next release Modified: salt/trunk/PKGBUILD Deleted: salt/trunk/salt-master salt/trunk/salt-master.service salt/trunk/salt-minion salt/trunk/salt-minion.service salt/trunk/salt-syndic salt/trunk/salt-syndic.service salt/trunk/salt.install salt/trunk/salt.tmpfiles ---------------------+ PKGBUILD | 49 +++++++++----------------------- salt-master | 76 -------------------------------------------------- salt-master.service | 11 ------- salt-minion | 75 ------------------------------------------------- salt-minion.service | 11 ------- salt-syndic | 75 ------------------------------------------------- salt-syndic.service | 11 ------- salt.install | 18 ----------- salt.tmpfiles | 1 9 files changed, 15 insertions(+), 312 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2014-02-09 14:40:27 UTC (rev 105521) +++ PKGBUILD 2014-02-09 14:46:57 UTC (rev 105522) @@ -1,20 +1,14 @@ # $Id$ # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> # Contributor: Christer Edwards <christer.edwa...@gmail.com> - pkgname=salt pkgver=0.17.5 -pkgrel=2 +pkgrel=1 pkgdesc="A remote execution and communication system built on zeromq" -arch=(any) +arch=('any') url="https://github.com/saltstack/salt" -license=("APACHE") -optdepends=('apache-libcloud:: salt-cloud') +license=('APACHE') depends=('python2' - 'sshpass' - 'libsodium' - 'python2-ply' - 'python2-cffi' 'python2-yaml' 'python2-jinja' 'python2-pyzmq' @@ -21,40 +15,27 @@ 'python2-crypto' 'python2-psutil' 'python2-msgpack' - 'python2-m2crypto' - 'python2-pycparser') + 'python2-m2crypto') backup=('etc/salt/master' 'etc/salt/minion') -conflicts=('salt-git') +source=('https://pypi.python.org/packages/source/s/${pkgname}/${pkgname}-${pkgver}.tar.gz') -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' - '3a2b032ec37077363c049969105b128e' - 'e4c6adce5087e947c26c5c9d9fc3c9bb' - '833d31ebee69f5c0e2c0b6c8d345b6d7' - '33bb43fa74f67da7675c093664d43159' - 'b4adb3a08871646c345f0050e3d55fae' - 'ce64b6fb207142465bb5e2855e27cd8a') - package() { - cd ${srcdir}/${pkgname}-${pkgver} - + cd "${srcdir}/${_gitname}" + python2 setup.py install --root=${pkgdir}/ --optimize=1 - 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 + install -Dm644 ${srcdir}/salt/pkg/arch/salt-master.service ${pkgdir}/usr/lib/systemd/system/salt-master.service + install -Dm644 ${srcdir}/salt/pkg/arch/salt-syndic.service ${pkgdir}/usr/lib/systemd/system/salt-syndic.service + install -Dm644 ${srcdir}/salt/pkg/arch/salt-minion.service ${pkgdir}/usr/lib/systemd/system/salt-minion.service mkdir -p ${pkgdir}/etc/salt/ - cp ${srcdir}/${pkgname}-${pkgver}/conf/master ${pkgdir}/etc/salt/ - cp ${srcdir}/${pkgname}-${pkgver}/conf/minion ${pkgdir}/etc/salt/ + cp ${srcdir}/salt/conf/master ${pkgdir}/etc/salt/ + cp ${srcdir}/salt/conf/minion ${pkgdir}/etc/salt/ + + # remove vcs leftovers + find "$pkgdir" -type d -name .git -exec rm -r '{}' + } Deleted: salt-master =================================================================== --- salt-master 2014-02-09 14:40:27 UTC (rev 105521) +++ salt-master 2014-02-09 14:46:57 UTC (rev 105522) @@ -1,76 +0,0 @@ -#!/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 Deleted: salt-master.service =================================================================== --- salt-master.service 2014-02-09 14:40:27 UTC (rev 105521) +++ salt-master.service 2014-02-09 14:46:57 UTC (rev 105522) @@ -1,11 +0,0 @@ -[Unit] -Description=The Salt Master Server -After=syslog.target network.target - -[Service] -Type=forking -ExecStart=/usr/bin/salt-master -d -PIDFile=/var/run/salt-master.pid - -[Install] -WantedBy=multi-user.target Deleted: salt-minion =================================================================== --- salt-minion 2014-02-09 14:40:27 UTC (rev 105521) +++ salt-minion 2014-02-09 14:46:57 UTC (rev 105522) @@ -1,75 +0,0 @@ -#!/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 Deleted: salt-minion.service =================================================================== --- salt-minion.service 2014-02-09 14:40:27 UTC (rev 105521) +++ salt-minion.service 2014-02-09 14:46:57 UTC (rev 105522) @@ -1,11 +0,0 @@ -[Unit] -Description=The Salt Minion -After=syslog.target network.target - -[Service] -Type=simple -ExecStart=/usr/bin/salt-minion -PIDFile=/var/run/salt-minion.pid - -[Install] -WantedBy=multi-user.target Deleted: salt-syndic =================================================================== --- salt-syndic 2014-02-09 14:40:27 UTC (rev 105521) +++ salt-syndic 2014-02-09 14:46:57 UTC (rev 105522) @@ -1,75 +0,0 @@ -#!/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 Deleted: salt-syndic.service =================================================================== --- salt-syndic.service 2014-02-09 14:40:27 UTC (rev 105521) +++ salt-syndic.service 2014-02-09 14:46:57 UTC (rev 105522) @@ -1,11 +0,0 @@ -[Unit] -Description=The Salt Master Server -After=syslog.target network.target - -[Service] -Type=simple -ExecStart=/usr/bin/salt-syndic -PIDFile=/var/run/salt-syndic.pid - -[Install] -WantedBy=multi-user.target Deleted: salt.install =================================================================== --- salt.install 2014-02-09 14:40:27 UTC (rev 105521) +++ salt.install 2014-02-09 14:46:57 UTC (rev 105522) @@ -1,18 +0,0 @@ -#/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: Deleted: salt.tmpfiles =================================================================== --- salt.tmpfiles 2014-02-09 14:40:27 UTC (rev 105521) +++ salt.tmpfiles 2014-02-09 14:46:57 UTC (rev 105522) @@ -1 +0,0 @@ -d /run/salt 0750 salt salt