diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-02-24 10:07:23 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-02-24 10:07:23 +0100 |
| commit | 7de52b3e0af5b0e3937ecee5db3f2d046c8f6cc8 (patch) | |
| tree | 7b4a19f9b0d57d70a7c2903d74b4985d5a48e02b /community/nginx | |
| parent | cd43f33594087073804af089c7860ec4001d84dc (diff) | |
| parent | 90f97c6f30af5c30599fab0b6d6c1f474ad15fe0 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
extra/xorg-server/PKGBUILD
libre/cdrkit-libre/PKGBUILD
Diffstat (limited to 'community/nginx')
| -rw-r--r-- | community/nginx/PKGBUILD | 6 | ||||
| -rw-r--r-- | community/nginx/logrotate | 2 | ||||
| -rw-r--r-- | community/nginx/nginx.install | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/community/nginx/PKGBUILD b/community/nginx/PKGBUILD index 15f2a549b..c901f766e 100644 --- a/community/nginx/PKGBUILD +++ b/community/nginx/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 84707 2013-02-22 20:47:11Z bpiotrowski $ +# $Id: PKGBUILD 84730 2013-02-23 20:47:41Z bpiotrowski $ # 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=2 +pkgrel=3 pkgdesc='Lightweight HTTP server and IMAP/POP3 proxy server' arch=('i686' 'x86_64' 'mips64el') depends=('pcre' 'zlib' 'openssl' 'geoip') @@ -31,7 +31,7 @@ source=(http://nginx.org/download/nginx-$pkgver.tar.gz logrotate) sha256sums=('2457a878943fb409ec4fcb46b43af222d06a584f93228e17a4f02b0e7bfc9de3' '77da8ce4d8378048606a25e09270ee187d6b226ee750b6cb4313af5549f5156a' - 'b0ef6c00e0e94926588242ed910b387922e513d5152fcdb651dc06e2b84e7d85') + 'a21b564eaf83b4b4ce3a436e895bd37e000677fb314b89818f89f30caca6e6d9') build() { cd "$srcdir"/$pkgname-$pkgver diff --git a/community/nginx/logrotate b/community/nginx/logrotate index 8773578b5..1a5bd6441 100644 --- a/community/nginx/logrotate +++ b/community/nginx/logrotate @@ -1,6 +1,6 @@ /var/log/nginx/*log { missingok - create 750 root log + create 640 root log sharedscripts compress postrotate diff --git a/community/nginx/nginx.install b/community/nginx/nginx.install index 00a7b9cac..242766abd 100644 --- a/community/nginx/nginx.install +++ b/community/nginx/nginx.install @@ -1,12 +1,12 @@ post_install() { if [[ -e var/log/nginx ]]; then - chmod 750 var/log/nginx + chmod 640 var/log/nginx chown root:log var/log/nginx fi } post_upgrade() { - [[ $(vercmp $2 1.2.7-1) -le 0 ]] && post_install + [[ $(vercmp $2 1.2.7-2) -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" |