summaryrefslogtreecommitdiff
path: root/pcr/nginx-passenger
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2014-09-28 00:28:29 -0400
committerLuke Shumaker <lukeshu@sbcglobal.net>2014-09-28 00:28:29 -0400
commit77b540c3dd5583081493304a0481808cd5cb0c03 (patch)
tree5cd49e3047dc0f6551ac8ca659ac6fb2929e2cef /pcr/nginx-passenger
parent680eb08892d1e6f49e7f5dad41908075fd943156 (diff)
downloadabslibre-77b540c3dd5583081493304a0481808cd5cb0c03.tar.gz
abslibre-77b540c3dd5583081493304a0481808cd5cb0c03.tar.bz2
abslibre-77b540c3dd5583081493304a0481808cd5cb0c03.zip
Update pcr/nginx-passenger
Diffstat (limited to 'pcr/nginx-passenger')
-rw-r--r--pcr/nginx-passenger/PKGBUILD24
-rw-r--r--pcr/nginx-passenger/service13
2 files changed, 26 insertions, 11 deletions
diff --git a/pcr/nginx-passenger/PKGBUILD b/pcr/nginx-passenger/PKGBUILD
index ea297b7da..1a823fd55 100644
--- a/pcr/nginx-passenger/PKGBUILD
+++ b/pcr/nginx-passenger/PKGBUILD
@@ -1,3 +1,4 @@
+# $Id$
# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
# Maintainer (AUR): Tom Richards <tom@tomrichards.net>
# Maintainer (Arch): Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
@@ -7,20 +8,21 @@
# Contributor (Arch): Daniel Micay <danielmicay@gmail.com>
pkgname=nginx-passenger
-_nginxver=1.6.0
+_nginxver=1.6.2
_passengerver=4.0.45
pkgver=$_nginxver.passenger.$_passengerver
pkgrel=1
pkgdesc='Lightweight HTTP server and IMAP/POP3 proxy server'
pkgdesc+=" (with Passenger module)"
-arch=('i686' 'x86_64' 'mips64el')
+conflicts=('nginx')
+provides=("nginx=$_nginxver")
+arch=('i686' 'x86_64')
url='http://nginx.org'
license=('custom')
depends=('pcre' 'zlib' 'openssl')
depends+=("passenger=$_passengerver")
depends+=('ruby' 'ruby-rack' 'curl')
-conflicts=('nginx')
-provides=("nginx=$_nginxver")
+makedepends=('hardening-wrapper')
backup=('etc/nginx/fastcgi.conf'
'etc/nginx/fastcgi_params'
'etc/nginx/koi-win'
@@ -36,9 +38,9 @@ source=($url/download/nginx-$_nginxver.tar.gz
passenger-$_passengerver.tar.gz::https://github.com/phusion/passenger/archive/release-$_passengerver.tar.gz
service
logrotate)
-md5sums=('8efa354f1c3c2ccf434a50d3fbe82340'
+md5sums=('d1b55031ae6e4bce37f8776b94d8b930'
'ce85ed506a084112eaa015a3642007d9'
- 'ce9a06bcaf66ec4a3c4eb59b636e0dfd'
+ '5dd4d09914a4403b9df778ec1d66167c'
'3441ce77cdd1aab6f0ab7e212698a8a7')
build() {
@@ -88,6 +90,13 @@ package() {
cd "$srcdir/nginx-$_nginxver"
make DESTDIR="$pkgdir" install
+ install -Dm644 contrib/vim/ftdetect/nginx.vim \
+ "$pkgdir"/usr/share/vim/vimfiles/ftdetect/nginx.vim
+ install -Dm644 contrib/vim/syntax/nginx.vim \
+ "$pkgdir"/usr/share/vim/vimfiles/syntax/nginx.vim
+ install -Dm644 contrib/vim/indent/nginx.vim \
+ "$pkgdir"/usr/share/vim/vimfiles/indent/nginx.vim
+
sed -e 's|\<user\s\+\w\+;|user html;|g' \
-e '44s|html|/usr/share/nginx/html|' \
-e '54s|html|/usr/share/nginx/html|' \
@@ -109,6 +118,9 @@ package() {
install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
rmdir "$pkgdir"/run
+
+ install -d "$pkgdir"/usr/share/man/man8/
+ gzip -9c man/nginx.8 > "$pkgdir"/usr/share/man/man8/nginx.8.gz
}
# vim:set ts=2 sw=2 et:
diff --git a/pcr/nginx-passenger/service b/pcr/nginx-passenger/service
index 29d3aa877..adfe6c0ab 100644
--- a/pcr/nginx-passenger/service
+++ b/pcr/nginx-passenger/service
@@ -1,14 +1,17 @@
[Unit]
Description=A high performance web server and a reverse proxy server
-After=syslog.target network.target
+After=network.target
[Service]
Type=forking
PIDFile=/run/nginx.pid
-ExecStartPre=/usr/bin/nginx -t -q -g 'pid /run/nginx.pid; daemon on; master_process on;'
-ExecStart=/usr/bin/nginx -g 'pid /run/nginx.pid; daemon on; master_process on;'
-ExecReload=/usr/bin/nginx -g 'pid /run/nginx.pid; daemon on; master_process on;' -s reload
-ExecStop=/usr/bin/nginx -g 'pid /run/nginx.pid;' -s quit
+PrivateDevices=yes
+SyslogLevel=err
+
+ExecStart=/usr/bin/nginx -g 'pid /run/nginx.pid; error_log stderr;'
+ExecReload=/usr/bin/kill -HUP $MAINPID
+KillSignal=SIGQUIT
+KillMode=mixed
[Install]
WantedBy=multi-user.target