Date: Wednesday, March 19, 2014 @ 21:27:22
Author: seblu
Revision: 107804
archrelease: copy trunk to community-any
Added:
salt/repos/community-any/PKGBUILD
(from rev 107803, salt/trunk/PKGBUILD)
salt/repos/community-any/salt-master.service
(from rev 107803, salt/trunk/salt-master.service)
salt/repos/community-any/salt-minion.service
(from rev 107803, salt/trunk/salt-minion.service)
salt/repos/community-any/salt-syndic.service
(from rev 107803, salt/trunk/salt-syndic.service)
salt/repos/community-any/salt.install
(from rev 107803, salt/trunk/salt.install)
salt/repos/community-any/salt.tmpfiles
(from rev 107803, salt/trunk/salt.tmpfiles)
Deleted:
salt/repos/community-any/PKGBUILD
salt/repos/community-any/salt-master.service
salt/repos/community-any/salt-minion.service
salt/repos/community-any/salt-syndic.service
salt/repos/community-any/salt.install
salt/repos/community-any/salt.tmpfiles
---------------------+
PKGBUILD | 137 +++++++++++++++++++++++++-------------------------
salt-master.service | 21 +++----
salt-minion.service | 22 ++++----
salt-syndic.service | 22 ++++----
salt.install | 36 ++++++-------
salt.tmpfiles | 2
6 files changed, 120 insertions(+), 120 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2014-03-19 20:26:54 UTC (rev 107803)
+++ PKGBUILD 2014-03-19 20:27:22 UTC (rev 107804)
@@ -1,68 +0,0 @@
-# $Id$
-# Maintainer: Sébastien Luttringer
-# Contibutor: Christer Edwards <christer.edwa...@gmail.com>
-
-pkgname=salt
-pkgver=2014.1.0
-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-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";
- 'salt-master.service'
- 'salt-syndic.service'
- 'salt-minion.service'
- 'salt.tmpfiles')
-
-md5sums=('0d29af68d2996ab22d86f43637775df4'
- 'fbf73ffe2213bf8e6177f7ebde2664a4'
- '1839f3b46e5567a91b4ef0fcf943ddb6'
- 'ac8023a1e2ab9c107cdc20658212caf4'
- '8772c329a5a90aac495d14d5797cc0fd')
-
-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 $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"
-
- # 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"
-}
-
-# vim:set ts=2 sw=2 et:
Copied: salt/repos/community-any/PKGBUILD (from rev 107803, salt/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2014-03-19 20:27:22 UTC (rev 107804)
@@ -0,0 +1,69 @@
+# $Id$
+# Maintainer: Sébastien Luttringer
+# Contibutor: Christer Edwards <christer.edwa...@gmail.com>
+
+pkgname=salt
+pkgver=2014.1.1
+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-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";
+ 'salt-master.service'
+ 'salt-syndic.service'
+ 'salt-minion.service'
+ 'salt.tmpfiles')
+
+md5sums=('c5c3ed043ad81cd71aff067c4e44d596'
+ '22d15fdc9b05c580c2927adf192ec76e'
+ '1839f3b46e5567a91b4ef0fcf943ddb6'
+ 'ac8023a1e2ab9c107cdc20658212caf4'
+ '8772c329a5a90aac495d14d5797cc0fd')
+
+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 $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"
+
+ # 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"
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: salt-master.service
===================================================================
--- salt-master.service 2014-03-19 20:26:54 UTC (rev 107803)
+++ salt-master.service 2014-03-19 20:27:22 UTC (rev 107804)
@@ -1,11 +0,0 @@
-[Unit]
-Description=Salt Master Daemon
-After=network.target
-
-[Service]
-Type=forking
-PIDFile=/run/salt/salt-master.pid
-ExecStart=/usr/bin/salt-master -d
-
-[Install]
-WantedBy=multi-user.target
Copied: salt/repos/community-any/salt-master.service (from rev 107803,
salt/trunk/salt-master.service)
===================================================================
--- salt-master.service (rev 0)
+++ salt-master.service 2014-03-19 20:27:22 UTC (rev 107804)
@@ -0,0 +1,10 @@
+[Unit]
+Description=Salt Master Daemon
+After=network.target
+
+[Service]
+Type=notify
+ExecStart=/usr/bin/salt-master
+
+[Install]
+WantedBy=multi-user.target
Deleted: salt-minion.service
===================================================================
--- salt-minion.service 2014-03-19 20:26:54 UTC (rev 107803)
+++ salt-minion.service 2014-03-19 20:27:22 UTC (rev 107804)
@@ -1,11 +0,0 @@
-[Unit]
-Description=Salt Minion Daemon
-After=network.target
-
-[Service]
-Type=forking
-PIDFile=/run/salt/salt-minion.pid
-ExecStart=/usr/bin/salt-minion -d
-
-[Install]
-WantedBy=multi-user.target
Copied: salt/repos/community-any/salt-minion.service (from rev 107803,
salt/trunk/salt-minion.service)
===================================================================
--- salt-minion.service (rev 0)
+++ salt-minion.service 2014-03-19 20:27:22 UTC (rev 107804)
@@ -0,0 +1,11 @@
+[Unit]
+Description=Salt Minion Daemon
+After=network.target
+
+[Service]
+Type=forking
+PIDFile=/run/salt/salt-minion.pid
+ExecStart=/usr/bin/salt-minion -d
+
+[Install]
+WantedBy=multi-user.target
Deleted: salt-syndic.service
===================================================================
--- salt-syndic.service 2014-03-19 20:26:54 UTC (rev 107803)
+++ salt-syndic.service 2014-03-19 20:27:22 UTC (rev 107804)
@@ -1,11 +0,0 @@
-[Unit]
-Description=Salt Syndic Daemon
-After=network.target
-
-[Service]
-Type=forking
-PIDFile=/run/salt/salt-syndic.pid
-ExecStart=/usr/bin/salt-syndic -d
-
-[Install]
-WantedBy=multi-user.target
Copied: salt/repos/community-any/salt-syndic.service (from rev 107803,
salt/trunk/salt-syndic.service)
===================================================================
--- salt-syndic.service (rev 0)
+++ salt-syndic.service 2014-03-19 20:27:22 UTC (rev 107804)
@@ -0,0 +1,11 @@
+[Unit]
+Description=Salt Syndic Daemon
+After=network.target
+
+[Service]
+Type=forking
+PIDFile=/run/salt/salt-syndic.pid
+ExecStart=/usr/bin/salt-syndic -d
+
+[Install]
+WantedBy=multi-user.target
Deleted: salt.install
===================================================================
--- salt.install 2014-03-19 20:26:54 UTC (rev 107803)
+++ salt.install 2014-03-19 20:27:22 UTC (rev 107804)
@@ -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:
Copied: salt/repos/community-any/salt.install (from rev 107803,
salt/trunk/salt.install)
===================================================================
--- salt.install (rev 0)
+++ salt.install 2014-03-19 20:27:22 UTC (rev 107804)
@@ -0,0 +1,18 @@
+#/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-03-19 20:26:54 UTC (rev 107803)
+++ salt.tmpfiles 2014-03-19 20:27:22 UTC (rev 107804)
@@ -1 +0,0 @@
-d /run/salt 0750 salt salt
Copied: salt/repos/community-any/salt.tmpfiles (from rev 107803,
salt/trunk/salt.tmpfiles)
===================================================================
--- salt.tmpfiles (rev 0)
+++ salt.tmpfiles 2014-03-19 20:27:22 UTC (rev 107804)
@@ -0,0 +1 @@
+d /run/salt 0750 salt salt
