[arch-commits] Commit in salt/repos/community-any (8 files)
Sébastien Luttringer
seblu at nymeria.archlinux.org
Thu Mar 27 00:24:06 UTC 2014
Date: Thursday, March 27, 2014 @ 01:24:05
Author: seblu
Revision: 108336
archrelease: copy trunk to community-any
Added:
salt/repos/community-any/PKGBUILD
(from rev 108335, salt/trunk/PKGBUILD)
salt/repos/community-any/salt.install
(from rev 108335, salt/trunk/salt.install)
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 | 115 ++++++++++++++++++++------------------------------
salt-master.service | 10 ----
salt-minion.service | 11 ----
salt-syndic.service | 11 ----
salt.install | 33 ++++++--------
salt.tmpfiles | 1
6 files changed, 61 insertions(+), 120 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2014-03-27 00:23:54 UTC (rev 108335)
+++ PKGBUILD 2014-03-27 00:24:05 UTC (rev 108336)
@@ -1,69 +0,0 @@
-# $Id$
-# Maintainer: Sébastien Luttringer
-# Contibutor: Christer Edwards <christer.edwards at 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:
Copied: salt/repos/community-any/PKGBUILD (from rev 108335, salt/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2014-03-27 00:24:05 UTC (rev 108336)
@@ -0,0 +1,46 @@
+# $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:
Deleted: salt-master.service
===================================================================
--- salt-master.service 2014-03-27 00:23:54 UTC (rev 108335)
+++ salt-master.service 2014-03-27 00:24:05 UTC (rev 108336)
@@ -1,10 +0,0 @@
-[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-27 00:23:54 UTC (rev 108335)
+++ salt-minion.service 2014-03-27 00:24:05 UTC (rev 108336)
@@ -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
Deleted: salt-syndic.service
===================================================================
--- salt-syndic.service 2014-03-27 00:23:54 UTC (rev 108335)
+++ salt-syndic.service 2014-03-27 00:24:05 UTC (rev 108336)
@@ -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
Deleted: salt.install
===================================================================
--- salt.install 2014-03-27 00:23:54 UTC (rev 108335)
+++ salt.install 2014-03-27 00:24:05 UTC (rev 108336)
@@ -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 108335, salt/trunk/salt.install)
===================================================================
--- salt.install (rev 0)
+++ salt.install 2014-03-27 00:24:05 UTC (rev 108336)
@@ -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:
Deleted: salt.tmpfiles
===================================================================
--- salt.tmpfiles 2014-03-27 00:23:54 UTC (rev 108335)
+++ salt.tmpfiles 2014-03-27 00:24:05 UTC (rev 108336)
@@ -1 +0,0 @@
-d /run/salt 0750 salt salt
More information about the arch-commits
mailing list