diff options
Diffstat (limited to 'community/nginx')
| -rw-r--r-- | community/nginx/PKGBUILD | 11 | ||||
| -rw-r--r-- | community/nginx/logrotate | 2 | ||||
| -rw-r--r-- | community/nginx/nginx.install | 10 |
3 files changed, 11 insertions, 12 deletions
diff --git a/community/nginx/PKGBUILD b/community/nginx/PKGBUILD index b36b88ca2..e889eb458 100644 --- a/community/nginx/PKGBUILD +++ b/community/nginx/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 84738 2013-02-24 00:14:35Z foutrelis $ +# $Id: PKGBUILD 86846 2013-03-22 20:04:56Z foutrelis $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Miroslaw Szot <mss@czlug.icis.pcz.pl> @@ -8,7 +8,7 @@ _tmpdir=/var/lib/nginx 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 @@ source=(http://nginx.org/download/nginx-$pkgver.tar.gz logrotate) sha256sums=('2457a878943fb409ec4fcb46b43af222d06a584f93228e17a4f02b0e7bfc9de3' '77da8ce4d8378048606a25e09270ee187d6b226ee750b6cb4313af5549f5156a' - 'a21b564eaf83b4b4ce3a436e895bd37e000677fb314b89818f89f30caca6e6d9') + '9523a1fdd5eb61bf62f3049f6ee088b198e36d5edcce2d9b08bbeb2930aa5a16') build() { cd "$srcdir"/$pkgname-$pkgver @@ -87,9 +87,12 @@ package() { 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 diff --git a/community/nginx/logrotate b/community/nginx/logrotate index 1a5bd6441..3d082bcf8 100644 --- a/community/nginx/logrotate +++ b/community/nginx/logrotate @@ -1,6 +1,6 @@ /var/log/nginx/*log { missingok - create 640 root log + create 640 http log sharedscripts compress postrotate diff --git a/community/nginx/nginx.install b/community/nginx/nginx.install index efc155556..0daccc639 100644 --- a/community/nginx/nginx.install +++ b/community/nginx/nginx.install @@ -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" |