Fri Mar 28 03:32:00 UTC 2014

5 files changed, 43 insertions, 6 deletions

diff --git a/community/uwsgi/PKGBUILD b/community/uwsgi/PKGBUILD
index deeb14481..fac2c1761 100644
--- a/community/uwsgi/PKGBUILD
+++ b/community/uwsgi/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 106429 2014-03-03 02:41:19Z dwallace $
+# $Id: PKGBUILD 108516 2014-03-27 14:48:39Z fyan $
 # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
 # Contributor: Valentin Hăloiu <vially.ichb+aur@gmail.com>
 # Contributor: Angel Velasquez <angvp@archlinux.org>  
@@ -24,10 +24,11 @@ pkgname=(uwsgi
         #uwsgi-plugin-erlang
         #uwsgi-plugin-admin
 pkgver=2.0.2
-pkgrel=1
+pkgrel=4
 arch=(i686 x86_64)
 url="http://projects.unbit.it/$pkgbase"
 license=(GPL2)
+backup=('etc/uwsgi/emperor.ini')
 conflicts=(python-$pkgbase)
 makedepends=(gcc python python2 ruby python2-greenlet php-embed curl libxml2 libyaml
              perl lua51 pcre libedit openssl bzip2 gmp pam java-environment=7
@@ -39,16 +40,22 @@ source=(http://projects.unbit.it/downloads/$pkgbase-$pkgver.tar.gz
         uwsgi@.socket
         uwsgi_fix_rpath.patch
         uwsgi_ruby20_compatibility.patch
-        uwsgi_trick_chroot.patch)
+        uwsgi_trick_chroot.patch
+        emperor.ini
+        emperor.uwsgi.service
+        emperor.uwsgi.socket)
 
 md5sums=('297578b2e3ef2102faeadaa0fb8aac6b'
          'a0749da07b545efcbb0276f52be22652'
-         'b05ba1d796e1ea608a40635bc4f3ec67'
+         '752475ee32286acfbafa49b898616817'
          '740a7718bd341b03d916a13ddbbbe694'
          'db70315bbc8cb886a278ba59d5fd8d57'
          '1a4516d5cdcf5b95b036f4eae2d0c152'
          '4d09535ce379c8acd76160f35d5d6b55'
-         '0c09a52fdb88f08c36a8b380f451ce6d')
+         '0c09a52fdb88f08c36a8b380f451ce6d'
+         '5fa14ddea9a3dae17b5be28468d47b80'
+         '69ab06670656b4ea8f8a91ebe33c38e4'
+         '3ab4486e02f5c217566fb6c8d469c246')
 
 prepare(){
     cd $srcdir/$pkgbase-$pkgver
@@ -79,6 +86,9 @@ package_uwsgi() {
   install -Dm755 uwsgi $pkgdir/usr/bin/uwsgi
   install -Dm644 $srcdir/uwsgi@.service $pkgdir/usr/lib/systemd/system/uwsgi@.service
   install -Dm644 $srcdir/uwsgi@.socket $pkgdir/usr/lib/systemd/system/uwsgi@.socket
+  install -Dm644 $srcdir/emperor.uwsgi.service $pkgdir/usr/lib/systemd/system/emperor.uwsgi.service
+  install -Dm644 $srcdir/emperor.uwsgi.socket $pkgdir/usr/lib/systemd/system/emperor.uwsgi.socket
+  install -Dm644 $srcdir/emperor.ini $pkgdir/etc/uwsgi/emperor.ini
   install -Dm755 systemd_logger_plugin.so $pkgdir/usr/lib/uwsgi/systemd_logger_plugin.so
   install -Dm644 $srcdir/tmpfilesd $pkgdir/usr/lib/tmpfiles.d/uwsgi.conf
 }
diff --git a/community/uwsgi/emperor.ini b/community/uwsgi/emperor.ini
new file mode 100644
index 000000000..27c9120bd
--- /dev/null
+++ b/community/uwsgi/emperor.ini
@@ -0,0 +1,4 @@
+[uwsgi]
+emperor = /etc/uwsgi/vassals
+uid = http
+gid = http
diff --git a/community/uwsgi/emperor.uwsgi.service b/community/uwsgi/emperor.uwsgi.service
new file mode 100644
index 000000000..f21720e63
--- /dev/null
+++ b/community/uwsgi/emperor.uwsgi.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=uWSGI Emperor
+After=syslog.target
+
+[Service]
+ExecStart=/usr/bin/uwsgi --ini /etc/uwsgi/emperor.ini
+Restart=always
+KillSignal=SIGQUIT
+Type=notify
+StandardError=syslog
+NotifyAccess=main
+
+[Install]
+WantedBy=multi-user.target
diff --git a/community/uwsgi/emperor.uwsgi.socket b/community/uwsgi/emperor.uwsgi.socket
new file mode 100644
index 000000000..3ef78a25c
--- /dev/null
+++ b/community/uwsgi/emperor.uwsgi.socket
@@ -0,0 +1,9 @@
+[Unit]
+Description=Socket for uWSGI Emperor
+
+[Socket]
+# Change this to your uwsgi application port or unix socket location
+ListenStream=/run/uwsgi/emperor.sock
+
+[Install]
+WantedBy=sockets.target
diff --git a/community/uwsgi/tmpfilesd b/community/uwsgi/tmpfilesd
index 8609b38f0..e1c5b0423 100644
--- a/community/uwsgi/tmpfilesd
+++ b/community/uwsgi/tmpfilesd
@@ -1 +1 @@
-d /run/uwsgi 0755 - - - - 
+d /run/uwsgi 0775 root http - -