[arch-commits] Commit in lighttpd/trunk (5 files)

[Pierre Schmitz]

    Date: Sunday, May 27, 2012 @ 21:47:45
  Author: pierre
Revision: 160013

upgpkg: lighttpd 1.4.30-4

add systemd support

Added:
  lighttpd/trunk/lighttpd.service
  lighttpd/trunk/lighttpd.tmpfiles
Modified:
  lighttpd/trunk/PKGBUILD
  lighttpd/trunk/lighttpd.logrotate.d
  lighttpd/trunk/lighttpd.rc.d

----------------------+
 PKGBUILD             |   16 ++++++++++------
 lighttpd.logrotate.d |    2 +-
 lighttpd.rc.d        |    5 -----
 lighttpd.service     |   11 +++++++++++
 lighttpd.tmpfiles    |    1 +
 5 files changed, 23 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-05-28 00:49:21 UTC (rev 160012)
+++ PKGBUILD	2012-05-28 01:47:45 UTC (rev 160013)
@@ -3,8 +3,8 @@
 
 pkgname=lighttpd
 pkgver=1.4.30
-pkgrel=3
-pkgdesc='a secure, fast, compliant and very flexible web-server'
+pkgrel=4
+pkgdesc='A secure, fast, compliant and very flexible web-server'
 license=('custom')
 arch=('i686' 'x86_64')
 url="http://www.lighttpd.net/"
@@ -18,12 +18,14 @@
 options=('!libtool' 'emptydirs')
 source=("http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.xz"
         "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.xz.asc"
-        'lighttpd.rc.d' 'lighttpd.logrotate.d' 'lighttpd.conf')
+        'lighttpd.rc.d' 'lighttpd.logrotate.d' 'lighttpd.conf' 'lighttpd.tmpfiles' 'lighttpd.service')
 sha256sums=('c237692366935b19ef8a6a600b2f3c9b259a9c3107271594c081a45902bd9c9b'
             '941ab747aeb97ca111fb670d21eefecdf745debc5e139bc5bd6881ee66b2742a'
-            'ceff3a88e876f6104c094379d507b89bc504777d0f98a0930406a70624fcf024'
-            '550aa1abaced6bc9e8d65c2b069bfc96bf4d06734b17eeb140c5d00705de1230'
-            'ee56422fe48f2683ccb5ca2e3dc6bad79ea8e1cbd043b21d2ea73b87018e35aa')
+            'dacfa1d748e5ac38c2d51d8310acad76d85ba5c1fe02a93534cf032400429257'
+            '6df18675691384c48b9137c8f18ca238055001f1077baf05cb8322247b475a77'
+            'ee56422fe48f2683ccb5ca2e3dc6bad79ea8e1cbd043b21d2ea73b87018e35aa'
+            'ce214a5fdf81085c35cce0faa2e2b5712a70ba15896ef5fa90e6d674d5bdcd89'
+            'd6c302d190b53c85f69b48ce7ca15cab5f6a097af5f3af495bd3dc3ef52a5776')
 
 build() {
 	cd $srcdir/$pkgname-$pkgver
@@ -58,6 +60,8 @@
 	install -D -m644 $srcdir/lighttpd.logrotate.d $pkgdir/etc/logrotate.d/lighttpd
 	install -D -m644 $srcdir/lighttpd.conf $pkgdir/etc/lighttpd/lighttpd.conf
 	install -d -m755 -o http -g http $pkgdir/var/{log,cache}/lighttpd/
+	install -D -m644 ${srcdir}/lighttpd.tmpfiles ${pkgdir}/etc/tmpfiles.d/lighttpd.tmpfiles
+	install -D -m644 ${srcdir}/lighttpd.service ${pkgdir}/usr/lib/systemd/system/lighttpd.service
 
 	pushd doc/config >/dev/null
 	find . -type f ! -name 'Makefile*' -exec install -D -m644 {} ${pkgdir}/usr/share/doc/lighttpd/config/{} \;

Modified: lighttpd.logrotate.d
===================================================================
--- lighttpd.logrotate.d	2012-05-28 00:49:21 UTC (rev 160012)
+++ lighttpd.logrotate.d	2012-05-28 01:47:45 UTC (rev 160013)
@@ -4,6 +4,6 @@
 	notifempty
 	sharedscripts
 	postrotate
-	/etc/rc.d/lighttpd reload >/dev/null || true
+		/usr/bin/killall -HUP lighttpd-angel &>/dev/null || true
 	endscript
 }

Modified: lighttpd.rc.d
===================================================================
--- lighttpd.rc.d	2012-05-28 00:49:21 UTC (rev 160012)
+++ lighttpd.rc.d	2012-05-28 01:47:45 UTC (rev 160013)
@@ -32,11 +32,6 @@
 		stat_die
 	fi
 
-	local piddir=$(dirname "${pid_file}")
-	if [ ! -d "${piddir}" ]; then
-		install -d -m755 -o http -g http "${piddir}"
-	fi
-
 	stat_done
 }
 

Added: lighttpd.service
===================================================================
--- lighttpd.service	                        (rev 0)
+++ lighttpd.service	2012-05-28 01:47:45 UTC (rev 160013)
@@ -0,0 +1,11 @@
+[Unit]
+Description=A secure, fast, compliant and very flexible web-server
+After=syslog.target network.target
+
+[Service]
+ExecStart=/usr/sbin/lighttpd-angel -D -f /etc/lighttpd/lighttpd.conf
+ExecReload=/bin/kill -HUP $MAINPID
+KillSignal=SIGINT
+
+[Install]
+WantedBy=multi-user.target

Added: lighttpd.tmpfiles
===================================================================
--- lighttpd.tmpfiles	                        (rev 0)
+++ lighttpd.tmpfiles	2012-05-28 01:47:45 UTC (rev 160013)
@@ -0,0 +1 @@
+d /var/run/lighttpd 755 http http