Date: Friday, February 22, 2013 @ 21:47:11 Author: bpiotrowski Revision: 84707
archrelease: copy trunk to community-i686, community-x86_64 Added: nginx/repos/community-i686/PKGBUILD (from rev 84706, nginx/trunk/PKGBUILD) nginx/repos/community-i686/logrotate (from rev 84706, nginx/trunk/logrotate) nginx/repos/community-i686/nginx.install (from rev 84706, nginx/trunk/nginx.install) nginx/repos/community-i686/service (from rev 84706, nginx/trunk/service) nginx/repos/community-x86_64/PKGBUILD (from rev 84706, nginx/trunk/PKGBUILD) nginx/repos/community-x86_64/logrotate (from rev 84706, nginx/trunk/logrotate) nginx/repos/community-x86_64/nginx.install (from rev 84706, nginx/trunk/nginx.install) nginx/repos/community-x86_64/service (from rev 84706, nginx/trunk/service) Deleted: nginx/repos/community-i686/PKGBUILD nginx/repos/community-i686/nginx.install nginx/repos/community-i686/nginx.logrotate nginx/repos/community-i686/rc.d nginx/repos/community-i686/service nginx/repos/community-x86_64/PKGBUILD nginx/repos/community-x86_64/nginx.install nginx/repos/community-x86_64/nginx.logrotate nginx/repos/community-x86_64/rc.d nginx/repos/community-x86_64/service ----------------------------------+ community-i686/PKGBUILD | 199 ++++++++++++++++++------------------- community-i686/logrotate | 9 + community-i686/nginx.install | 30 +++-- community-i686/nginx.logrotate | 8 - community-i686/rc.d | 68 ------------ community-i686/service | 28 ++--- community-x86_64/PKGBUILD | 199 ++++++++++++++++++------------------- community-x86_64/logrotate | 9 + community-x86_64/nginx.install | 30 +++-- community-x86_64/nginx.logrotate | 8 - community-x86_64/rc.d | 68 ------------ community-x86_64/service | 28 ++--- 12 files changed, 278 insertions(+), 406 deletions(-) Deleted: community-i686/PKGBUILD =================================================================== --- community-i686/PKGBUILD 2013-02-22 20:46:49 UTC (rev 84706) +++ community-i686/PKGBUILD 2013-02-22 20:47:11 UTC (rev 84707) @@ -1,102 +0,0 @@ -# $Id$ -# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> -# Maintainer: Bartłomiej Piotrowski <nos...@bpiotrowski.pl> -# Contributor: Miroslaw Szot <m...@czlug.icis.pcz.pl> - -_cfgdir=/etc/nginx -_tmpdir=/var/lib/nginx - -pkgname=nginx -pkgver=1.2.7 -pkgrel=1 -pkgdesc='Lightweight HTTP server and IMAP/POP3 proxy server' -arch=('i686' 'x86_64') -depends=('pcre' 'zlib' 'openssl' 'geoip') -makedepends=('passenger') -url="http://nginx.org" -license=('custom') -install=nginx.install -backup=(${_cfgdir:1}/fastcgi.conf - ${_cfgdir:1}/fastcgi_params - ${_cfgdir:1}/koi-win - ${_cfgdir:1}/koi-utf - ${_cfgdir:1}/mime.types - ${_cfgdir:1}/nginx.conf - ${_cfgdir:1}/scgi_params - ${_cfgdir:1}/uwsgi_params - ${_cfgdir:1}/win-utf - etc/logrotate.d/nginx) -source=(http://nginx.org/download/nginx-$pkgver.tar.gz - rc.d - service - nginx.logrotate) -sha256sums=('2457a878943fb409ec4fcb46b43af222d06a584f93228e17a4f02b0e7bfc9de3' - '4f6bd31d684956ca143f7dc68dbd3caa67e835fb84dc44d1a94217b9214c6cfd' - '77da8ce4d8378048606a25e09270ee187d6b226ee750b6cb4313af5549f5156a' - '613b0ed3fe4b5ee505ddb5122ee41604f464a5049be81c97601ee93970763a23') - -build() { - cd "$srcdir"/$pkgname-$pkgver - - ./configure \ - --prefix=$_cfgdir \ - --conf-path=$_cfgdir/nginx.conf \ - --sbin-path=/usr/sbin/nginx \ - --pid-path=/var/run/nginx.pid \ - --lock-path=/var/lock/nginx.lock \ - --user=http --group=http \ - --http-log-path=/var/log/nginx/access.log \ - --error-log-path=/var/log/nginx/error.log \ - --http-client-body-temp-path=$_tmpdir/client-body \ - --http-proxy-temp-path=$_tmpdir/proxy \ - --http-fastcgi-temp-path=$_tmpdir/fastcgi \ - --http-scgi-temp-path=$_tmpdir/scgi \ - --http-uwsgi-temp-path=$_tmpdir/uwsgi \ - --with-imap --with-imap_ssl_module \ - --with-ipv6 --with-pcre-jit \ - --with-file-aio \ - --with-http_dav_module \ - --with-http_geoip_module \ - --with-http_gzip_static_module \ - --with-http_realip_module \ - --with-http_ssl_module \ - --with-http_stub_status_module \ - --add-module=/usr/lib/passenger/ext/nginx \ - #--with-http_mp4_module \ - #--with-http_addition_module \ - #--with-http_xslt_module \ - #--with-http_image_filter_module \ - #--with-http_sub_module \ - #--with-http_flv_module \ - #--with-http_random_index_module \ - #--with-http_secure_link_module \ - #--with-http_degradation_module \ - #--with-http_perl_module \ - - make -} - -package() { - cd "$srcdir"/$pkgname-$pkgver - make DESTDIR="$pkgdir" install - - install -d "$pkgdir"/etc/logrotate.d - install -m644 "$srcdir"/nginx.logrotate "$pkgdir"/etc/logrotate.d/nginx - - sed -e 's|\<user\s\+\w\+;|user html;|g' \ - -e '44s|html|/usr/share/nginx/html|' \ - -e '54s|html|/usr/share/nginx/html|' \ - -i "$pkgdir"/etc/nginx/nginx.conf - rm "$pkgdir"/etc/nginx/*.default - - install -d "$pkgdir"/$_tmpdir - install -dm700 "$pkgdir"/$_tmpdir/proxy - - install -d "$pkgdir"/usr/share/nginx - mv "$pkgdir"/etc/nginx/html/ "$pkgdir"/usr/share/nginx - - install -D -m755 "$srcdir"/rc.d "$pkgdir"/etc/rc.d/nginx - install -Dm644 "$srcdir"/service "$pkgdir"/usr/lib/systemd/system/nginx.service - install -D -m644 LICENSE "$pkgdir"/usr/share/licenses/nginx/LICENSE - rm -rf "$pkgdir"/var/run -} Copied: nginx/repos/community-i686/PKGBUILD (from rev 84706, nginx/trunk/PKGBUILD) =================================================================== --- community-i686/PKGBUILD (rev 0) +++ community-i686/PKGBUILD 2013-02-22 20:47:11 UTC (rev 84707) @@ -0,0 +1,97 @@ +# $Id$ +# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> +# Maintainer: Bartłomiej Piotrowski <nos...@bpiotrowski.pl> +# Contributor: Miroslaw Szot <m...@czlug.icis.pcz.pl> + +_cfgdir=/etc/nginx +_tmpdir=/var/lib/nginx + +pkgname=nginx +pkgver=1.2.7 +pkgrel=2 +pkgdesc='Lightweight HTTP server and IMAP/POP3 proxy server' +arch=('i686' 'x86_64') +depends=('pcre' 'zlib' 'openssl' 'geoip') +makedepends=('passenger') +url="http://nginx.org" +license=('custom') +install=nginx.install +backup=(${_cfgdir:1}/fastcgi.conf + ${_cfgdir:1}/fastcgi_params + ${_cfgdir:1}/koi-win + ${_cfgdir:1}/koi-utf + ${_cfgdir:1}/mime.types + ${_cfgdir:1}/nginx.conf + ${_cfgdir:1}/scgi_params + ${_cfgdir:1}/uwsgi_params + ${_cfgdir:1}/win-utf + etc/logrotate.d/nginx) +source=(http://nginx.org/download/nginx-$pkgver.tar.gz + service + logrotate) +sha256sums=('2457a878943fb409ec4fcb46b43af222d06a584f93228e17a4f02b0e7bfc9de3' + '77da8ce4d8378048606a25e09270ee187d6b226ee750b6cb4313af5549f5156a' + 'b0ef6c00e0e94926588242ed910b387922e513d5152fcdb651dc06e2b84e7d85') + +build() { + cd "$srcdir"/$pkgname-$pkgver + + ./configure \ + --prefix=$_cfgdir \ + --conf-path=$_cfgdir/nginx.conf \ + --sbin-path=/usr/sbin/nginx \ + --pid-path=/var/run/nginx.pid \ + --lock-path=/var/lock/nginx.lock \ + --user=http --group=http \ + --http-log-path=/var/log/nginx/access.log \ + --error-log-path=/var/log/nginx/error.log \ + --http-client-body-temp-path=$_tmpdir/client-body \ + --http-proxy-temp-path=$_tmpdir/proxy \ + --http-fastcgi-temp-path=$_tmpdir/fastcgi \ + --http-scgi-temp-path=$_tmpdir/scgi \ + --http-uwsgi-temp-path=$_tmpdir/uwsgi \ + --with-imap --with-imap_ssl_module \ + --with-ipv6 --with-pcre-jit \ + --with-file-aio \ + --with-http_dav_module \ + --with-http_geoip_module \ + --with-http_gzip_static_module \ + --with-http_realip_module \ + --with-http_ssl_module \ + --with-http_stub_status_module \ + --add-module=/usr/lib/passenger/ext/nginx \ + #--with-http_mp4_module \ + #--with-http_addition_module \ + #--with-http_xslt_module \ + #--with-http_image_filter_module \ + #--with-http_sub_module \ + #--with-http_flv_module \ + #--with-http_random_index_module \ + #--with-http_secure_link_module \ + #--with-http_degradation_module \ + #--with-http_perl_module \ + + make +} + +package() { + cd "$srcdir"/$pkgname-$pkgver + make DESTDIR="$pkgdir" install + + sed -e 's|\<user\s\+\w\+;|user html;|g' \ + -e '44s|html|/usr/share/nginx/html|' \ + -e '54s|html|/usr/share/nginx/html|' \ + -i "$pkgdir"/etc/nginx/nginx.conf + rm "$pkgdir"/etc/nginx/*.default + + install -d "$pkgdir"/$_tmpdir + install -dm700 "$pkgdir"/$_tmpdir/proxy + + 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 + rm -rf "$pkgdir"/var/run +} Copied: nginx/repos/community-i686/logrotate (from rev 84706, nginx/trunk/logrotate) =================================================================== --- community-i686/logrotate (rev 0) +++ community-i686/logrotate 2013-02-22 20:47:11 UTC (rev 84707) @@ -0,0 +1,9 @@ +/var/log/nginx/*log { + missingok + create 750 root log + sharedscripts + compress + postrotate + test -r /var/run/nginx.pid && kill -USR1 `cat /var/run/nginx.pid` + endscript +} Deleted: community-i686/nginx.install =================================================================== --- community-i686/nginx.install 2013-02-22 20:46:49 UTC (rev 84706) +++ community-i686/nginx.install 2013-02-22 20:47:11 UTC (rev 84707) @@ -1,11 +0,0 @@ -post_upgrade() { - 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" - echo " - /etc/conf.d/nginx has been removed" - echo " Main configuration file is set to /etc/nginx/nginx.conf" - echo " - access.log and error.log can be found in /var/log/nginx by default" - echo " - bundled *.html files have been moved to /usr/share/nginx/html" - echo " - /etc/nginx/{html,logs} symbolic links and *.default files have been removed" - fi -} Copied: nginx/repos/community-i686/nginx.install (from rev 84706, nginx/trunk/nginx.install) =================================================================== --- community-i686/nginx.install (rev 0) +++ community-i686/nginx.install 2013-02-22 20:47:11 UTC (rev 84707) @@ -0,0 +1,19 @@ +post_install() { + if [[ -e var/log/nginx ]]; then + chmod 750 var/log/nginx + chown root:log var/log/nginx + fi +} + +post_upgrade() { + [[ $(vercmp $2 1.2.7-1) -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" + echo " - /etc/conf.d/nginx has been removed" + echo " Main configuration file is set to /etc/nginx/nginx.conf" + echo " - access.log and error.log can be found in /var/log/nginx by default" + echo " - bundled *.html files have been moved to /usr/share/nginx/html" + echo " - /etc/nginx/{html,logs} symbolic links and *.default files have been removed" + fi +} Deleted: community-i686/nginx.logrotate =================================================================== --- community-i686/nginx.logrotate 2013-02-22 20:46:49 UTC (rev 84706) +++ community-i686/nginx.logrotate 2013-02-22 20:47:11 UTC (rev 84707) @@ -1,8 +0,0 @@ -/var/log/nginx/*.log { - missingok - sharedscripts - compress - postrotate - test -r /var/run/nginx.pid && kill -USR1 `cat /var/run/nginx.pid` - endscript -} Deleted: community-i686/rc.d =================================================================== --- community-i686/rc.d 2013-02-22 20:46:49 UTC (rev 84706) +++ community-i686/rc.d 2013-02-22 20:47:11 UTC (rev 84707) @@ -1,68 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -function check_config { - stat_busy "Checking nginx configuration" - /usr/sbin/nginx -t -q -c /etc/nginx/nginx.conf - if [ $? -ne 0 ]; then - stat_die - else - stat_done - fi -} - -case "$1" in - start) - check_config - $0 careless_start - ;; - careless_start) - stat_busy "Starting nginx" - if [ -s /var/run/nginx.pid ]; then - stat_fail - # probably ;) - stat_busy "Nginx is already running" - stat_die - fi - /usr/sbin/nginx -c /etc/nginx/nginx.conf &>/dev/null - if [ $? -ne 0 ]; then - stat_fail - else - add_daemon nginx - stat_done - fi - ;; - stop) - stat_busy "Stopping nginx" - PID=$(cat /var/run/nginx.pid) - kill -QUIT $PID &>/dev/null - if [ $? -ne 0 ]; then - stat_fail - else - for i in {1..10}; do - [ -d /proc/$PID ] || { stat_done; rm_daemon nginx; exit 0; } - sleep 1 - done - stat_fail - fi - ;; - restart) - check_config - $0 stop - sleep 1 - $0 careless_start - ;; - reload) - check_config - if [ -s /var/run/nginx.pid ]; then - status "Reloading nginx configuration" kill -HUP $(cat /var/run/nginx.pid) - fi - ;; - check) - check_config - ;; - *) - echo "usage: $0 {start|stop|restart|reload|check|careless_start}" -esac Deleted: community-i686/service =================================================================== --- community-i686/service 2013-02-22 20:46:49 UTC (rev 84706) +++ community-i686/service 2013-02-22 20:47:11 UTC (rev 84707) @@ -1,14 +0,0 @@ -[Unit] -Description=A high performance web server and a reverse proxy server -After=syslog.target network.target - -[Service] -Type=forking -PIDFile=/run/nginx.pid -ExecStartPre=/usr/sbin/nginx -t -q -g 'pid /run/nginx.pid; daemon on; master_process on;' -ExecStart=/usr/sbin/nginx -g 'pid /run/nginx.pid; daemon on; master_process on;' -ExecReload=/usr/sbin/nginx -g 'pid /run/nginx.pid; daemon on; master_process on;' -s reload -ExecStop=/usr/sbin/nginx -g 'pid /run/nginx.pid;' -s quit - -[Install] -WantedBy=multi-user.target Copied: nginx/repos/community-i686/service (from rev 84706, nginx/trunk/service) =================================================================== --- community-i686/service (rev 0) +++ community-i686/service 2013-02-22 20:47:11 UTC (rev 84707) @@ -0,0 +1,14 @@ +[Unit] +Description=A high performance web server and a reverse proxy server +After=syslog.target network.target + +[Service] +Type=forking +PIDFile=/run/nginx.pid +ExecStartPre=/usr/sbin/nginx -t -q -g 'pid /run/nginx.pid; daemon on; master_process on;' +ExecStart=/usr/sbin/nginx -g 'pid /run/nginx.pid; daemon on; master_process on;' +ExecReload=/usr/sbin/nginx -g 'pid /run/nginx.pid; daemon on; master_process on;' -s reload +ExecStop=/usr/sbin/nginx -g 'pid /run/nginx.pid;' -s quit + +[Install] +WantedBy=multi-user.target Deleted: community-x86_64/PKGBUILD =================================================================== --- community-x86_64/PKGBUILD 2013-02-22 20:46:49 UTC (rev 84706) +++ community-x86_64/PKGBUILD 2013-02-22 20:47:11 UTC (rev 84707) @@ -1,102 +0,0 @@ -# $Id$ -# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> -# Maintainer: Bartłomiej Piotrowski <nos...@bpiotrowski.pl> -# Contributor: Miroslaw Szot <m...@czlug.icis.pcz.pl> - -_cfgdir=/etc/nginx -_tmpdir=/var/lib/nginx - -pkgname=nginx -pkgver=1.2.7 -pkgrel=1 -pkgdesc='Lightweight HTTP server and IMAP/POP3 proxy server' -arch=('i686' 'x86_64') -depends=('pcre' 'zlib' 'openssl' 'geoip') -makedepends=('passenger') -url="http://nginx.org" -license=('custom') -install=nginx.install -backup=(${_cfgdir:1}/fastcgi.conf - ${_cfgdir:1}/fastcgi_params - ${_cfgdir:1}/koi-win - ${_cfgdir:1}/koi-utf - ${_cfgdir:1}/mime.types - ${_cfgdir:1}/nginx.conf - ${_cfgdir:1}/scgi_params - ${_cfgdir:1}/uwsgi_params - ${_cfgdir:1}/win-utf - etc/logrotate.d/nginx) -source=(http://nginx.org/download/nginx-$pkgver.tar.gz - rc.d - service - nginx.logrotate) -sha256sums=('2457a878943fb409ec4fcb46b43af222d06a584f93228e17a4f02b0e7bfc9de3' - '4f6bd31d684956ca143f7dc68dbd3caa67e835fb84dc44d1a94217b9214c6cfd' - '77da8ce4d8378048606a25e09270ee187d6b226ee750b6cb4313af5549f5156a' - '613b0ed3fe4b5ee505ddb5122ee41604f464a5049be81c97601ee93970763a23') - -build() { - cd "$srcdir"/$pkgname-$pkgver - - ./configure \ - --prefix=$_cfgdir \ - --conf-path=$_cfgdir/nginx.conf \ - --sbin-path=/usr/sbin/nginx \ - --pid-path=/var/run/nginx.pid \ - --lock-path=/var/lock/nginx.lock \ - --user=http --group=http \ - --http-log-path=/var/log/nginx/access.log \ - --error-log-path=/var/log/nginx/error.log \ - --http-client-body-temp-path=$_tmpdir/client-body \ - --http-proxy-temp-path=$_tmpdir/proxy \ - --http-fastcgi-temp-path=$_tmpdir/fastcgi \ - --http-scgi-temp-path=$_tmpdir/scgi \ - --http-uwsgi-temp-path=$_tmpdir/uwsgi \ - --with-imap --with-imap_ssl_module \ - --with-ipv6 --with-pcre-jit \ - --with-file-aio \ - --with-http_dav_module \ - --with-http_geoip_module \ - --with-http_gzip_static_module \ - --with-http_realip_module \ - --with-http_ssl_module \ - --with-http_stub_status_module \ - --add-module=/usr/lib/passenger/ext/nginx \ - #--with-http_mp4_module \ - #--with-http_addition_module \ - #--with-http_xslt_module \ - #--with-http_image_filter_module \ - #--with-http_sub_module \ - #--with-http_flv_module \ - #--with-http_random_index_module \ - #--with-http_secure_link_module \ - #--with-http_degradation_module \ - #--with-http_perl_module \ - - make -} - -package() { - cd "$srcdir"/$pkgname-$pkgver - make DESTDIR="$pkgdir" install - - install -d "$pkgdir"/etc/logrotate.d - install -m644 "$srcdir"/nginx.logrotate "$pkgdir"/etc/logrotate.d/nginx - - sed -e 's|\<user\s\+\w\+;|user html;|g' \ - -e '44s|html|/usr/share/nginx/html|' \ - -e '54s|html|/usr/share/nginx/html|' \ - -i "$pkgdir"/etc/nginx/nginx.conf - rm "$pkgdir"/etc/nginx/*.default - - install -d "$pkgdir"/$_tmpdir - install -dm700 "$pkgdir"/$_tmpdir/proxy - - install -d "$pkgdir"/usr/share/nginx - mv "$pkgdir"/etc/nginx/html/ "$pkgdir"/usr/share/nginx - - install -D -m755 "$srcdir"/rc.d "$pkgdir"/etc/rc.d/nginx - install -Dm644 "$srcdir"/service "$pkgdir"/usr/lib/systemd/system/nginx.service - install -D -m644 LICENSE "$pkgdir"/usr/share/licenses/nginx/LICENSE - rm -rf "$pkgdir"/var/run -} Copied: nginx/repos/community-x86_64/PKGBUILD (from rev 84706, nginx/trunk/PKGBUILD) =================================================================== --- community-x86_64/PKGBUILD (rev 0) +++ community-x86_64/PKGBUILD 2013-02-22 20:47:11 UTC (rev 84707) @@ -0,0 +1,97 @@ +# $Id$ +# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> +# Maintainer: Bartłomiej Piotrowski <nos...@bpiotrowski.pl> +# Contributor: Miroslaw Szot <m...@czlug.icis.pcz.pl> + +_cfgdir=/etc/nginx +_tmpdir=/var/lib/nginx + +pkgname=nginx +pkgver=1.2.7 +pkgrel=2 +pkgdesc='Lightweight HTTP server and IMAP/POP3 proxy server' +arch=('i686' 'x86_64') +depends=('pcre' 'zlib' 'openssl' 'geoip') +makedepends=('passenger') +url="http://nginx.org" +license=('custom') +install=nginx.install +backup=(${_cfgdir:1}/fastcgi.conf + ${_cfgdir:1}/fastcgi_params + ${_cfgdir:1}/koi-win + ${_cfgdir:1}/koi-utf + ${_cfgdir:1}/mime.types + ${_cfgdir:1}/nginx.conf + ${_cfgdir:1}/scgi_params + ${_cfgdir:1}/uwsgi_params + ${_cfgdir:1}/win-utf + etc/logrotate.d/nginx) +source=(http://nginx.org/download/nginx-$pkgver.tar.gz + service + logrotate) +sha256sums=('2457a878943fb409ec4fcb46b43af222d06a584f93228e17a4f02b0e7bfc9de3' + '77da8ce4d8378048606a25e09270ee187d6b226ee750b6cb4313af5549f5156a' + 'b0ef6c00e0e94926588242ed910b387922e513d5152fcdb651dc06e2b84e7d85') + +build() { + cd "$srcdir"/$pkgname-$pkgver + + ./configure \ + --prefix=$_cfgdir \ + --conf-path=$_cfgdir/nginx.conf \ + --sbin-path=/usr/sbin/nginx \ + --pid-path=/var/run/nginx.pid \ + --lock-path=/var/lock/nginx.lock \ + --user=http --group=http \ + --http-log-path=/var/log/nginx/access.log \ + --error-log-path=/var/log/nginx/error.log \ + --http-client-body-temp-path=$_tmpdir/client-body \ + --http-proxy-temp-path=$_tmpdir/proxy \ + --http-fastcgi-temp-path=$_tmpdir/fastcgi \ + --http-scgi-temp-path=$_tmpdir/scgi \ + --http-uwsgi-temp-path=$_tmpdir/uwsgi \ + --with-imap --with-imap_ssl_module \ + --with-ipv6 --with-pcre-jit \ + --with-file-aio \ + --with-http_dav_module \ + --with-http_geoip_module \ + --with-http_gzip_static_module \ + --with-http_realip_module \ + --with-http_ssl_module \ + --with-http_stub_status_module \ + --add-module=/usr/lib/passenger/ext/nginx \ + #--with-http_mp4_module \ + #--with-http_addition_module \ + #--with-http_xslt_module \ + #--with-http_image_filter_module \ + #--with-http_sub_module \ + #--with-http_flv_module \ + #--with-http_random_index_module \ + #--with-http_secure_link_module \ + #--with-http_degradation_module \ + #--with-http_perl_module \ + + make +} + +package() { + cd "$srcdir"/$pkgname-$pkgver + make DESTDIR="$pkgdir" install + + sed -e 's|\<user\s\+\w\+;|user html;|g' \ + -e '44s|html|/usr/share/nginx/html|' \ + -e '54s|html|/usr/share/nginx/html|' \ + -i "$pkgdir"/etc/nginx/nginx.conf + rm "$pkgdir"/etc/nginx/*.default + + install -d "$pkgdir"/$_tmpdir + install -dm700 "$pkgdir"/$_tmpdir/proxy + + 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 + rm -rf "$pkgdir"/var/run +} Copied: nginx/repos/community-x86_64/logrotate (from rev 84706, nginx/trunk/logrotate) =================================================================== --- community-x86_64/logrotate (rev 0) +++ community-x86_64/logrotate 2013-02-22 20:47:11 UTC (rev 84707) @@ -0,0 +1,9 @@ +/var/log/nginx/*log { + missingok + create 750 root log + sharedscripts + compress + postrotate + test -r /var/run/nginx.pid && kill -USR1 `cat /var/run/nginx.pid` + endscript +} Deleted: community-x86_64/nginx.install =================================================================== --- community-x86_64/nginx.install 2013-02-22 20:46:49 UTC (rev 84706) +++ community-x86_64/nginx.install 2013-02-22 20:47:11 UTC (rev 84707) @@ -1,11 +0,0 @@ -post_upgrade() { - 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" - echo " - /etc/conf.d/nginx has been removed" - echo " Main configuration file is set to /etc/nginx/nginx.conf" - echo " - access.log and error.log can be found in /var/log/nginx by default" - echo " - bundled *.html files have been moved to /usr/share/nginx/html" - echo " - /etc/nginx/{html,logs} symbolic links and *.default files have been removed" - fi -} Copied: nginx/repos/community-x86_64/nginx.install (from rev 84706, nginx/trunk/nginx.install) =================================================================== --- community-x86_64/nginx.install (rev 0) +++ community-x86_64/nginx.install 2013-02-22 20:47:11 UTC (rev 84707) @@ -0,0 +1,19 @@ +post_install() { + if [[ -e var/log/nginx ]]; then + chmod 750 var/log/nginx + chown root:log var/log/nginx + fi +} + +post_upgrade() { + [[ $(vercmp $2 1.2.7-1) -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" + echo " - /etc/conf.d/nginx has been removed" + echo " Main configuration file is set to /etc/nginx/nginx.conf" + echo " - access.log and error.log can be found in /var/log/nginx by default" + echo " - bundled *.html files have been moved to /usr/share/nginx/html" + echo " - /etc/nginx/{html,logs} symbolic links and *.default files have been removed" + fi +} Deleted: community-x86_64/nginx.logrotate =================================================================== --- community-x86_64/nginx.logrotate 2013-02-22 20:46:49 UTC (rev 84706) +++ community-x86_64/nginx.logrotate 2013-02-22 20:47:11 UTC (rev 84707) @@ -1,8 +0,0 @@ -/var/log/nginx/*.log { - missingok - sharedscripts - compress - postrotate - test -r /var/run/nginx.pid && kill -USR1 `cat /var/run/nginx.pid` - endscript -} Deleted: community-x86_64/rc.d =================================================================== --- community-x86_64/rc.d 2013-02-22 20:46:49 UTC (rev 84706) +++ community-x86_64/rc.d 2013-02-22 20:47:11 UTC (rev 84707) @@ -1,68 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -function check_config { - stat_busy "Checking nginx configuration" - /usr/sbin/nginx -t -q -c /etc/nginx/nginx.conf - if [ $? -ne 0 ]; then - stat_die - else - stat_done - fi -} - -case "$1" in - start) - check_config - $0 careless_start - ;; - careless_start) - stat_busy "Starting nginx" - if [ -s /var/run/nginx.pid ]; then - stat_fail - # probably ;) - stat_busy "Nginx is already running" - stat_die - fi - /usr/sbin/nginx -c /etc/nginx/nginx.conf &>/dev/null - if [ $? -ne 0 ]; then - stat_fail - else - add_daemon nginx - stat_done - fi - ;; - stop) - stat_busy "Stopping nginx" - PID=$(cat /var/run/nginx.pid) - kill -QUIT $PID &>/dev/null - if [ $? -ne 0 ]; then - stat_fail - else - for i in {1..10}; do - [ -d /proc/$PID ] || { stat_done; rm_daemon nginx; exit 0; } - sleep 1 - done - stat_fail - fi - ;; - restart) - check_config - $0 stop - sleep 1 - $0 careless_start - ;; - reload) - check_config - if [ -s /var/run/nginx.pid ]; then - status "Reloading nginx configuration" kill -HUP $(cat /var/run/nginx.pid) - fi - ;; - check) - check_config - ;; - *) - echo "usage: $0 {start|stop|restart|reload|check|careless_start}" -esac Deleted: community-x86_64/service =================================================================== --- community-x86_64/service 2013-02-22 20:46:49 UTC (rev 84706) +++ community-x86_64/service 2013-02-22 20:47:11 UTC (rev 84707) @@ -1,14 +0,0 @@ -[Unit] -Description=A high performance web server and a reverse proxy server -After=syslog.target network.target - -[Service] -Type=forking -PIDFile=/run/nginx.pid -ExecStartPre=/usr/sbin/nginx -t -q -g 'pid /run/nginx.pid; daemon on; master_process on;' -ExecStart=/usr/sbin/nginx -g 'pid /run/nginx.pid; daemon on; master_process on;' -ExecReload=/usr/sbin/nginx -g 'pid /run/nginx.pid; daemon on; master_process on;' -s reload -ExecStop=/usr/sbin/nginx -g 'pid /run/nginx.pid;' -s quit - -[Install] -WantedBy=multi-user.target Copied: nginx/repos/community-x86_64/service (from rev 84706, nginx/trunk/service) =================================================================== --- community-x86_64/service (rev 0) +++ community-x86_64/service 2013-02-22 20:47:11 UTC (rev 84707) @@ -0,0 +1,14 @@ +[Unit] +Description=A high performance web server and a reverse proxy server +After=syslog.target network.target + +[Service] +Type=forking +PIDFile=/run/nginx.pid +ExecStartPre=/usr/sbin/nginx -t -q -g 'pid /run/nginx.pid; daemon on; master_process on;' +ExecStart=/usr/sbin/nginx -g 'pid /run/nginx.pid; daemon on; master_process on;' +ExecReload=/usr/sbin/nginx -g 'pid /run/nginx.pid; daemon on; master_process on;' -s reload +ExecStop=/usr/sbin/nginx -g 'pid /run/nginx.pid;' -s quit + +[Install] +WantedBy=multi-user.target