[arch-commits] Commit in nginx/trunk (PKGBUILD logrotate nginx.install)

[Evangelos Foutras]

    Date: Friday, March 22, 2013 @ 21:04:36
  Author: foutrelis
Revision: 86845

upgpkg: nginx 1.2.7-5

Change ownership of /var/log/nginx to http so nginx worker processes 
can rotate their logs; set permissions of /var/log/nginx in package() 
and drop post_install() to avoid pacman warning about different 
filesystem permissions.

Modified:
  nginx/trunk/PKGBUILD
  nginx/trunk/logrotate
  nginx/trunk/nginx.install

---------------+
 PKGBUILD      |    9 ++++++---
 logrotate     |    2 +-
 nginx.install |   10 +++-------
 3 files changed, 10 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-03-22 19:37:29 UTC (rev 86844)
+++ PKGBUILD	2013-03-22 20:04:36 UTC (rev 86845)
@@ -8,7 +8,7 @@
 
 pkgname=nginx
 pkgver=1.2.7
-pkgrel=4
+pkgrel=5
 pkgdesc='Lightweight HTTP server and IMAP/POP3 proxy server'
 arch=('i686' 'x86_64')
 depends=('pcre' 'zlib' 'openssl' 'geoip')
@@ -31,7 +31,7 @@
 		logrotate)
 sha256sums=('2457a878943fb409ec4fcb46b43af222d06a584f93228e17a4f02b0e7bfc9de3'
             '77da8ce4d8378048606a25e09270ee187d6b226ee750b6cb4313af5549f5156a'
-            'a21b564eaf83b4b4ce3a436e895bd37e000677fb314b89818f89f30caca6e6d9')
+            '9523a1fdd5eb61bf62f3049f6ee088b198e36d5edcce2d9b08bbeb2930aa5a16')
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
@@ -87,9 +87,12 @@
 	install -d "$pkgdir"/$_tmpdir
 	install -dm700 "$pkgdir"/$_tmpdir/proxy
 
+	chmod 750 "$pkgdir"/var/log/nginx
+	chown http:log "$pkgdir"/var/log/nginx
+
 	install -d "$pkgdir"/usr/share/nginx
 	mv "$pkgdir"/etc/nginx/html/ "$pkgdir"/usr/share/nginx
-	
+
 	install -Dm644 "$srcdir"/logrotate "$pkgdir"/etc/logrotate.d/nginx
 	install -Dm644 "$srcdir"/service "$pkgdir"/usr/lib/systemd/system/nginx.service
 	install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/nginx/LICENSE

Modified: logrotate
===================================================================
--- logrotate	2013-03-22 19:37:29 UTC (rev 86844)
+++ logrotate	2013-03-22 20:04:36 UTC (rev 86845)
@@ -1,6 +1,6 @@
 /var/log/nginx/*log {
 	missingok
-	create 640 root log
+	create 640 http log
 	sharedscripts
 	compress
 	postrotate

Modified: nginx.install
===================================================================
--- nginx.install	2013-03-22 19:37:29 UTC (rev 86844)
+++ nginx.install	2013-03-22 20:04:36 UTC (rev 86845)
@@ -1,12 +1,8 @@
-post_install() {
-    if [[ -e var/log/nginx ]]; then
+post_upgrade() {
+    if [[ $(vercmp $2 1.2.7-4) -le 0 ]]; then
         chmod 750 var/log/nginx
-        chown root:log var/log/nginx
+        chown http:log var/log/nginx
     fi
-}
-
-post_upgrade() {
-    [[ $(vercmp $2 1.2.7-3) -le 0 ]] && post_install
     if [[ $(vercmp $2 1.2.1-2) -le 0 ]]; then
         echo " >>> Since 1.2.1-2 several changes has been made in package:"
         echo "      - *.conf files have been moved to /etc/nginx"