diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-18 10:54:09 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-18 10:54:09 +0200 |
| commit | d4a02502a9a74a21bc0ca0a0fa9813efe0fe70f4 (patch) | |
| tree | 3e5dfb37d192bd42d9218934800e1f5aeeb0990e /community/nginx | |
| parent | 16d51ac66fa18675d49ef64f4a3c1dbe53b5711a (diff) | |
| parent | 637c1cfdcd258a870ad5367cbf47a8a2799039c7 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/shotwell/PKGBUILD
community/recoll/PKGBUILD
cross/cross-mips64el-unknown-linux-gnu-gcc-core/PKGBUILD
cross/cross-mips64el-unknown-linux-gnu-glibc-headers/PKGBUILD
cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.12.2-ignore-origin-of-privileged-program.patch
cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-__i686.patch
cross/mips64el-unknown-linux-gnu-binutils/PKGBUILD
cross/mips64el-unknown-linux-gnu-glibc/PKGBUILD
cross/mips64el-unknown-linux-gnu-glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch
cross/mips64el-unknown-linux-gnu-glibc/glibc-__i686.patch
staging/nx-common/PKGBUILD
staging/nx/PKGBUILD
testing/devhelp/PKGBUILD
testing/empathy/PKGBUILD
testing/evolution-data-server/PKGBUILD
testing/evolution-ews/PKGBUILD
testing/evolution-exchange/PKGBUILD
testing/evolution/PKGBUILD
testing/folks/PKGBUILD
testing/gcr/PKGBUILD
testing/gnome-control-center/PKGBUILD
testing/gnome-desktop/PKGBUILD
testing/gnome-documents/PKGBUILD
testing/gnome-keyring/PKGBUILD
testing/gnome-panel/PKGBUILD
testing/gnome-session/PKGBUILD
testing/gnome-settings-daemon/PKGBUILD
testing/gnome-terminal/PKGBUILD
testing/gnome-themes-standard/PKGBUILD
testing/gthumb/PKGBUILD
testing/gtkhtml4/PKGBUILD
testing/gtksourceview3/PKGBUILD
testing/gvfs/PKGBUILD
testing/libgnome-keyring/PKGBUILD
testing/librsvg/PKGBUILD
testing/librsvg/librsvg.install
testing/mousetweaks/PKGBUILD
testing/seahorse/PKGBUILD
testing/sushi/PKGBUILD
testing/totem-plparser/PKGBUILD
testing/totem/PKGBUILD
testing/vte3/PKGBUILD
Diffstat (limited to 'community/nginx')
| -rw-r--r-- | community/nginx/PKGBUILD | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/community/nginx/PKGBUILD b/community/nginx/PKGBUILD index a6a7b6939..307397266 100644 --- a/community/nginx/PKGBUILD +++ b/community/nginx/PKGBUILD @@ -1,10 +1,18 @@ -# $Id: PKGBUILD 67860 2012-03-15 15:25:27Z spupykin $ +# $Id: PKGBUILD 69421 2012-04-16 09:40:51Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Bartłomiej Piotrowski <barthalion@gmal.com> # Contributor: Miroslaw Szot <mss@czlug.icis.pcz.pl> +_doc_root=/usr/share/nginx/http +_server_root=/etc/nginx +_conf_path=${_server_root}/conf +_tmp_path=/var/spool/nginx +_log_path=/var/log/nginx +_user=http +_group=http + pkgname=nginx -pkgver=1.0.14 +pkgver=1.0.15 pkgrel=1 pkgdesc="lightweight HTTP server and IMAP/POP3 proxy server" arch=('i686' 'x86_64' 'mips64el') @@ -26,17 +34,7 @@ backup=("etc/nginx/conf/fastcgi.conf" "etc/conf.d/nginx") source=("http://nginx.org/download/nginx-$pkgver.tar.gz" 'nginx') -md5sums=('58360774e4875e8fc4c4286448cb54d0' - '0e8032d3ba26c3276e8c7c30588d375f') - -_doc_root=/usr/share/nginx/http -_server_root=/etc/nginx -_conf_path=${_server_root}/conf -_tmp_path=/var/spool/nginx -_log_path=/var/log/nginx -_user=http -_group=http -md5sums=('019844e48c34952253ca26dd6e28c35c' +md5sums=('17da4802209b83d9bebb0f0edd975dfc' '0e8032d3ba26c3276e8c7c30588d375f') build() { @@ -59,6 +57,7 @@ build() { --with-http_gzip_static_module \ --with-ipv6 \ --add-module=/usr/lib/passenger/ext/nginx \ + --conf-path=${_conf_path}/nginx.conf \ --http-scgi-temp-path=${_tmp_path} \ --http-uwsgi-temp-path=${_tmp_path} #--with-http_mp4_module \ @@ -92,7 +91,7 @@ package() { } EOF - sed -i -e "s/\<user\s\+\w\+;/user $_user;/g" $pkgdir/$_conf_path/nginx.conf + sed -i -e "s/\<user\s\+\w\+;/user $_user;/g" $pkgdir/${_conf_path}/nginx.conf install -d $pkgdir/$_tmp_path |