[arch-commits] Commit in salt/trunk (6 files)

[Sébastien Luttringer]

    Date: Thursday, March 27, 2014 @ 01:23:54
  Author: seblu
Revision: 108335

upgpkg: salt 2014.1.1-2

- fix FS#39559
- Add Daniel as co-maintainer

Modified:
  salt/trunk/PKGBUILD
  salt/trunk/salt.install
Deleted:
  salt/trunk/salt-master.service
  salt/trunk/salt-minion.service
  salt/trunk/salt-syndic.service
  salt/trunk/salt.tmpfiles

---------------------+
 PKGBUILD            |   39 ++++++++-------------------------------
 salt-master.service |   10 ----------
 salt-minion.service |   11 -----------
 salt-syndic.service |   11 -----------
 salt.install        |   23 ++++++++++-------------
 salt.tmpfiles       |    1 -
 6 files changed, 18 insertions(+), 77 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-03-26 21:34:57 UTC (rev 108334)
+++ PKGBUILD	2014-03-27 00:23:54 UTC (rev 108335)
@@ -1,10 +1,11 @@
 # $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=1
+pkgrel=2
 pkgdesc='Central system and configuration manager'
 arch=('any')
 url='http://saltstack.org/'
@@ -24,30 +25,10 @@
 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')
+source=("http://pypi.python.org/packages/source/s/salt/salt-$pkgver.tar.gz")
+md5sums=('c5c3ed043ad81cd71aff067c4e44d596')
 
-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"
@@ -56,14 +37,10 @@
   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"
+  # 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-26 21:34:57 UTC (rev 108334)
+++ salt-master.service	2014-03-27 00:23:54 UTC (rev 108335)
@@ -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-26 21:34:57 UTC (rev 108334)
+++ salt-minion.service	2014-03-27 00:23:54 UTC (rev 108335)
@@ -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-26 21:34:57 UTC (rev 108334)
+++ salt-syndic.service	2014-03-27 00:23:54 UTC (rev 108335)
@@ -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

Modified: salt.install
===================================================================
--- salt.install	2014-03-26 21:34:57 UTC (rev 108334)
+++ salt.install	2014-03-27 00:23:54 UTC (rev 108335)
@@ -1,18 +1,15 @@
-#/bin/bash
+#!/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 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
 }
 
-# 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-26 21:34:57 UTC (rev 108334)
+++ salt.tmpfiles	2014-03-27 00:23:54 UTC (rev 108335)
@@ -1 +0,0 @@
-d /run/salt 0750 salt salt