Date: Wednesday, July 31, 2013 @ 00:29:29 Author: dwallace Revision: 94831
upgpkg: uwsgi 1.9.14-1 upgpkg: uwsgi 1.9.14-1 Added: uwsgi/trunk/uwsgi@.service uwsgi/trunk/uwsgi@.socket Modified: uwsgi/trunk/PKGBUILD uwsgi/trunk/uwsgi.install Deleted: uwsgi/trunk/uwsgi.service uwsgi/trunk/uwsgi.socket ----------------+ PKGBUILD | 27 ++++++++++++++------------- uwsgi.install | 8 ++++++++ uwsgi.service | 13 ------------- uwsgi.socket | 9 --------- uwsgi@.service | 13 +++++++++++++ uwsgi@.socket | 9 +++++++++ 6 files changed, 44 insertions(+), 35 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-07-30 22:18:20 UTC (rev 94830) +++ PKGBUILD 2013-07-30 22:29:29 UTC (rev 94831) @@ -24,8 +24,8 @@ uwsgi-plugin-jvm uwsgi-plugin-zergpool ) -pkgver=1.9.13 -pkgrel=2 +pkgver=1.9.14 +pkgrel=1 arch=(i686 x86_64) url="http://projects.unbit.it/$pkgbase" license=(GPL2) @@ -36,19 +36,11 @@ source=(http://projects.unbit.it/downloads/$pkgbase-$pkgver.tar.gz archlinux.ini tmpfilesd - uwsgi.service - uwsgi.socket + uwsgi@.service + uwsgi@.socket uwsgi_fix_rpath.patch uwsgi_ruby20_compatibility.patch uwsgi_trick_chroot.patch) -md5sums=('e331f96469166520a0e3d02296199cbd' - '1816524eb13705c20f6abc00557f4ea9' - 'b05ba1d796e1ea608a40635bc4f3ec67' - 'dabbff4138be30d21bd7b625c51cc01b' - 'fa2e4d7f503246a53d7906142e875768' - '1a4516d5cdcf5b95b036f4eae2d0c152' - '4d09535ce379c8acd76160f35d5d6b55' - '0c09a52fdb88f08c36a8b380f451ce6d') prepare(){ cd $srcdir/$pkgbase-$pkgver @@ -76,7 +68,8 @@ cd $srcdir/$pkgbase-$pkgver install -Dm755 uwsgi $pkgdir/usr/bin/uwsgi install -Dm644 $srcdir/archlinux.ini $pkgdir/etc/uwsgi/archlinux.ini - install -Dm644 $srcdir/uwsgi.service $pkgdir/usr/lib/systemd/system/uwsgi.service + 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 -Dm755 systemd_logger_plugin.so $pkgdir/usr/lib/uwsgi/systemd_logger_plugin.so install -Dm644 $srcdir/archlinux.ini $pkgdir/etc/uwsgi/archlinux.ini install -Dm644 $srcdir/tmpfilesd $pkgdir/usr/lib/tmpfiles.d/uwsgi.conf @@ -232,3 +225,11 @@ ln -s uwsgi $pkgdir/usr/bin/uwsgi_zergpool install -Dm755 $pkgbase-$pkgver/zergpool_plugin.so $pkgdir/usr/lib/uwsgi/zergpool_plugin.so } +md5sums=('ec9cf333534604f17ef4e24051d9d65d' + '1816524eb13705c20f6abc00557f4ea9' + 'b05ba1d796e1ea608a40635bc4f3ec67' + '0b79320fbae92715c96086cf51e60bc8' + 'db70315bbc8cb886a278ba59d5fd8d57' + '1a4516d5cdcf5b95b036f4eae2d0c152' + '4d09535ce379c8acd76160f35d5d6b55' + '0c09a52fdb88f08c36a8b380f451ce6d') Modified: uwsgi.install =================================================================== --- uwsgi.install 2013-07-30 22:18:20 UTC (rev 94830) +++ uwsgi.install 2013-07-30 22:29:29 UTC (rev 94831) @@ -1,3 +1,11 @@ post_install(){ systemd-tmpfiles --create /usr/lib/tmpfiles.d/uwsgi.conf } +post_update(){ + echo "To use uwsgi@.socket and uwsgi@.service:" + echo "\tAll you need to do is put the name of your .ini file after the @ sign" + echo "\tYou can use either the .socket or .service, but if you use the .socket" + echo "\tuwsgi@<sameinifile>.service won't be started until the first time your http" + echo "\tserver touches the socket. You will also not need to specify the socket in" + echo "\tthe .ini file or in the .service file. Systemd will handle listening to" + echo "\tthe socket for you." Deleted: uwsgi.service =================================================================== --- uwsgi.service 2013-07-30 22:18:20 UTC (rev 94830) +++ uwsgi.service 2013-07-30 22:29:29 UTC (rev 94831) @@ -1,13 +0,0 @@ -[Unit] -Description=uWSGI Emperor -After=syslog.target - -[Service] -ExecStart=/usr/bin/uwsgi --ini /etc/uwsgi/archlinux.ini -Restart=always -Type=notify -StandardError=syslog -NotifyAccess=main - -[Install] -WantedBy=multi-user.target Deleted: uwsgi.socket =================================================================== --- uwsgi.socket 2013-07-30 22:18:20 UTC (rev 94830) +++ uwsgi.socket 2013-07-30 22:29:29 UTC (rev 94831) @@ -1,9 +0,0 @@ -[Unit] -Description=Socket for uWSGI Emperor - -[Socket] -# Change this to your uwsgi application port or unix socket location -ListenStream=/run/uwsgi/uwsgid.sock - -[Install] -WantedBy=sockets.target Added: uwsgi@.service =================================================================== --- uwsgi@.service (rev 0) +++ uwsgi@.service 2013-07-30 22:29:29 UTC (rev 94831) @@ -0,0 +1,13 @@ +[Unit] +Description=uWSGI Emperor +After=syslog.target + +[Service] +ExecStart=/usr/bin/uwsgi --ini /etc/uwsgi/%I.ini +Restart=always +Type=notify +StandardError=syslog +NotifyAccess=main + +[Install] +WantedBy=multi-user.target Added: uwsgi@.socket =================================================================== --- uwsgi@.socket (rev 0) +++ uwsgi@.socket 2013-07-30 22:29:29 UTC (rev 94831) @@ -0,0 +1,9 @@ +[Unit] +Description=Socket for uWSGI Cgit + +[Socket] +# Change this to your uwsgi application port or unix socket location +ListenStream=/run/uwsgi/%I.sock + +[Install] +WantedBy=sockets.target