[arch-commits] Commit in nginx/repos (16 files)

Sébastien Luttringer seblu at nymeria.archlinux.org
Thu Oct 10 07:58:09 UTC 2013


    Date: Thursday, October 10, 2013 @ 09:58:09
  Author: seblu
Revision: 98429

archrelease: copy trunk to community-i686, community-x86_64

Added:
  nginx/repos/community-i686/PKGBUILD
    (from rev 98428, nginx/trunk/PKGBUILD)
  nginx/repos/community-i686/install
    (from rev 98428, nginx/trunk/install)
  nginx/repos/community-i686/logrotate
    (from rev 98428, nginx/trunk/logrotate)
  nginx/repos/community-i686/service
    (from rev 98428, nginx/trunk/service)
  nginx/repos/community-x86_64/PKGBUILD
    (from rev 98428, nginx/trunk/PKGBUILD)
  nginx/repos/community-x86_64/install
    (from rev 98428, nginx/trunk/install)
  nginx/repos/community-x86_64/logrotate
    (from rev 98428, nginx/trunk/logrotate)
  nginx/repos/community-x86_64/service
    (from rev 98428, nginx/trunk/service)
Deleted:
  nginx/repos/community-i686/PKGBUILD
  nginx/repos/community-i686/install
  nginx/repos/community-i686/logrotate
  nginx/repos/community-i686/service
  nginx/repos/community-x86_64/PKGBUILD
  nginx/repos/community-x86_64/install
  nginx/repos/community-x86_64/logrotate
  nginx/repos/community-x86_64/service

----------------------------+
 /PKGBUILD                  |  192 +++++++++++++++++++++++++++++++++++++++++++
 /install                   |   42 +++++++++
 /logrotate                 |   18 ++++
 /service                   |   28 ++++++
 community-i686/PKGBUILD    |   96 ---------------------
 community-i686/install     |   21 ----
 community-i686/logrotate   |    9 --
 community-i686/service     |   14 ---
 community-x86_64/PKGBUILD  |   96 ---------------------
 community-x86_64/install   |   21 ----
 community-x86_64/logrotate |    9 --
 community-x86_64/service   |   14 ---
 12 files changed, 280 insertions(+), 280 deletions(-)

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2013-10-10 07:57:57 UTC (rev 98428)
+++ community-i686/PKGBUILD	2013-10-10 07:58:09 UTC (rev 98429)
@@ -1,96 +0,0 @@
-# $Id$
-# Maintainer: Bartłomiej Piotrowski <nospam at bpiotrowski.pl>
-# Maintainer: Sébastien Luttringer
-# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: Miroslaw Szot <mss at czlug.icis.pcz.pl>
-
-pkgname=nginx
-pkgver=1.4.2
-pkgrel=4
-pkgdesc='Lightweight HTTP server and IMAP/POP3 proxy server'
-arch=('i686' 'x86_64')
-url='http://nginx.org'
-license=('custom')
-depends=('pcre' 'zlib' 'openssl')
-backup=('etc/nginx/fastcgi.conf'
-        'etc/nginx/fastcgi_params'
-        'etc/nginx/koi-win'
-        'etc/nginx/koi-utf'
-        'etc/nginx/mime.types'
-        'etc/nginx/nginx.conf'
-        'etc/nginx/scgi_params'
-        'etc/nginx/uwsgi_params'
-        'etc/nginx/win-utf'
-        'etc/logrotate.d/nginx')
-install=install
-source=("http://nginx.org/download/nginx-$pkgver.tar.gz"
-        'service'
-        'logrotate')
-sha256sums=('5361ffb7b0ebf8b1a04369bc3d1295eaed091680c1c58115f88d56c8e51f3611'
-            '05fdc0c0483410944b988d7f4beabb00bec4a44a41bd13ebc9b78585da7d3f9b'
-            '272907d3213d69dac3bd6024d6d150caa23cb67d4f121e4171f34ba5581f9e98')
-
-build() {
-    cd $pkgname-$pkgver
-    ./configure \
-        --prefix=/etc/nginx \
-        --conf-path=/etc/nginx/nginx.conf \
-        --sbin-path=/usr/bin/nginx \
-        --pid-path=/run/nginx.pid \
-        --lock-path=/run/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=/var/lib/nginx/client-body \
-        --http-proxy-temp-path=/var/lib/nginx/proxy \
-        --http-fastcgi-temp-path=/var/lib/nginx/fastcgi \
-        --http-scgi-temp-path=/var/lib/nginx/scgi \
-        --http-uwsgi-temp-path=/var/lib/nginx/uwsgi \
-        --with-imap \
-        --with-imap_ssl_module \
-        --with-ipv6 \
-        --with-pcre-jit \
-        --with-file-aio \
-        --with-http_dav_module \
-        --with-http_gunzip_module \
-        --with-http_gzip_static_module \
-        --with-http_realip_module \
-        --with-http_spdy_module \
-        --with-http_ssl_module \
-        --with-http_stub_status_module \
-        --with-http_addition_module \
-        --with-http_degradation_module \
-        --with-http_flv_module \
-        --with-http_mp4_module \
-        --with-http_secure_link_module \
-        --with-http_sub_module
-    make
-}
-
-package() {
-    cd $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"/var/lib/nginx
-    install -dm700 "$pkgdir"/var/lib/nginx/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/$pkgname/LICENSE
-    rmdir "$pkgdir/run"
-}
-
-# vim:set ts=4 sw=4 et:

Copied: nginx/repos/community-i686/PKGBUILD (from rev 98428, nginx/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2013-10-10 07:58:09 UTC (rev 98429)
@@ -0,0 +1,96 @@
+# $Id$
+# Maintainer: Bartłomiej Piotrowski <nospam at bpiotrowski.pl>
+# Maintainer: Sébastien Luttringer
+# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Miroslaw Szot <mss at czlug.icis.pcz.pl>
+
+pkgname=nginx
+pkgver=1.4.3
+pkgrel=1
+pkgdesc='Lightweight HTTP server and IMAP/POP3 proxy server'
+arch=('i686' 'x86_64')
+url='http://nginx.org'
+license=('custom')
+depends=('pcre' 'zlib' 'openssl')
+backup=('etc/nginx/fastcgi.conf'
+        'etc/nginx/fastcgi_params'
+        'etc/nginx/koi-win'
+        'etc/nginx/koi-utf'
+        'etc/nginx/mime.types'
+        'etc/nginx/nginx.conf'
+        'etc/nginx/scgi_params'
+        'etc/nginx/uwsgi_params'
+        'etc/nginx/win-utf'
+        'etc/logrotate.d/nginx')
+install=install
+source=("http://nginx.org/download/nginx-$pkgver.tar.gz"
+        'service'
+        'logrotate')
+sha256sums=('ae123885c923a6c3f5bab0a8b7296ef21c4fdf6087834667ebbc16338177de84'
+            '05fdc0c0483410944b988d7f4beabb00bec4a44a41bd13ebc9b78585da7d3f9b'
+            '272907d3213d69dac3bd6024d6d150caa23cb67d4f121e4171f34ba5581f9e98')
+
+build() {
+    cd $pkgname-$pkgver
+    ./configure \
+        --prefix=/etc/nginx \
+        --conf-path=/etc/nginx/nginx.conf \
+        --sbin-path=/usr/bin/nginx \
+        --pid-path=/run/nginx.pid \
+        --lock-path=/run/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=/var/lib/nginx/client-body \
+        --http-proxy-temp-path=/var/lib/nginx/proxy \
+        --http-fastcgi-temp-path=/var/lib/nginx/fastcgi \
+        --http-scgi-temp-path=/var/lib/nginx/scgi \
+        --http-uwsgi-temp-path=/var/lib/nginx/uwsgi \
+        --with-imap \
+        --with-imap_ssl_module \
+        --with-ipv6 \
+        --with-pcre-jit \
+        --with-file-aio \
+        --with-http_dav_module \
+        --with-http_gunzip_module \
+        --with-http_gzip_static_module \
+        --with-http_realip_module \
+        --with-http_spdy_module \
+        --with-http_ssl_module \
+        --with-http_stub_status_module \
+        --with-http_addition_module \
+        --with-http_degradation_module \
+        --with-http_flv_module \
+        --with-http_mp4_module \
+        --with-http_secure_link_module \
+        --with-http_sub_module
+    make
+}
+
+package() {
+    cd $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"/var/lib/nginx
+    install -dm700 "$pkgdir"/var/lib/nginx/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/$pkgname/LICENSE
+    rmdir "$pkgdir/run"
+}
+
+# vim:set ts=4 sw=4 et:

Deleted: community-i686/install
===================================================================
--- community-i686/install	2013-10-10 07:57:57 UTC (rev 98428)
+++ community-i686/install	2013-10-10 07:58:09 UTC (rev 98429)
@@ -1,21 +0,0 @@
-post_upgrade() {
-    if (( $(vercmp $2 1.2.7-4) <= 0 )); then
-        chmod 750 var/log/nginx
-        chown http:log var/log/nginx
-    fi
-    if (( $(vercmp $2 1.2.1-2) <= 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
-    if (( $(vercmp $2 1.4.2-4) < 0 )); then
-        echo 'Nginx now includes only upstream bundled modules.'
-        echo 'Thus, passenger module support was dropped.'
-    fi
-}
-
-# vim:set ts=4 sw=4 et:

Copied: nginx/repos/community-i686/install (from rev 98428, nginx/trunk/install)
===================================================================
--- community-i686/install	                        (rev 0)
+++ community-i686/install	2013-10-10 07:58:09 UTC (rev 98429)
@@ -0,0 +1,21 @@
+post_upgrade() {
+    if (( $(vercmp $2 1.2.7-4) <= 0 )); then
+        chmod 750 var/log/nginx
+        chown http:log var/log/nginx
+    fi
+    if (( $(vercmp $2 1.2.1-2) <= 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
+    if (( $(vercmp $2 1.4.2-4) < 0 )); then
+        echo 'Nginx now includes only upstream bundled modules.'
+        echo 'Thus, passenger module support was dropped.'
+    fi
+}
+
+# vim:set ts=4 sw=4 et:

Deleted: community-i686/logrotate
===================================================================
--- community-i686/logrotate	2013-10-10 07:57:57 UTC (rev 98428)
+++ community-i686/logrotate	2013-10-10 07:58:09 UTC (rev 98429)
@@ -1,9 +0,0 @@
-/var/log/nginx/*log {
-	missingok
-	create 640 http log
-	sharedscripts
-	compress
-	postrotate
-		test ! -r /var/run/nginx.pid || kill -USR1 `cat /var/run/nginx.pid`
-	endscript
-}

Copied: nginx/repos/community-i686/logrotate (from rev 98428, nginx/trunk/logrotate)
===================================================================
--- community-i686/logrotate	                        (rev 0)
+++ community-i686/logrotate	2013-10-10 07:58:09 UTC (rev 98429)
@@ -0,0 +1,9 @@
+/var/log/nginx/*log {
+	missingok
+	create 640 http log
+	sharedscripts
+	compress
+	postrotate
+		test ! -r /var/run/nginx.pid || kill -USR1 `cat /var/run/nginx.pid`
+	endscript
+}

Deleted: community-i686/service
===================================================================
--- community-i686/service	2013-10-10 07:57:57 UTC (rev 98428)
+++ community-i686/service	2013-10-10 07:58:09 UTC (rev 98429)
@@ -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/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
-
-[Install]
-WantedBy=multi-user.target

Copied: nginx/repos/community-i686/service (from rev 98428, nginx/trunk/service)
===================================================================
--- community-i686/service	                        (rev 0)
+++ community-i686/service	2013-10-10 07:58:09 UTC (rev 98429)
@@ -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/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
+
+[Install]
+WantedBy=multi-user.target

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2013-10-10 07:57:57 UTC (rev 98428)
+++ community-x86_64/PKGBUILD	2013-10-10 07:58:09 UTC (rev 98429)
@@ -1,96 +0,0 @@
-# $Id$
-# Maintainer: Bartłomiej Piotrowski <nospam at bpiotrowski.pl>
-# Maintainer: Sébastien Luttringer
-# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: Miroslaw Szot <mss at czlug.icis.pcz.pl>
-
-pkgname=nginx
-pkgver=1.4.2
-pkgrel=4
-pkgdesc='Lightweight HTTP server and IMAP/POP3 proxy server'
-arch=('i686' 'x86_64')
-url='http://nginx.org'
-license=('custom')
-depends=('pcre' 'zlib' 'openssl')
-backup=('etc/nginx/fastcgi.conf'
-        'etc/nginx/fastcgi_params'
-        'etc/nginx/koi-win'
-        'etc/nginx/koi-utf'
-        'etc/nginx/mime.types'
-        'etc/nginx/nginx.conf'
-        'etc/nginx/scgi_params'
-        'etc/nginx/uwsgi_params'
-        'etc/nginx/win-utf'
-        'etc/logrotate.d/nginx')
-install=install
-source=("http://nginx.org/download/nginx-$pkgver.tar.gz"
-        'service'
-        'logrotate')
-sha256sums=('5361ffb7b0ebf8b1a04369bc3d1295eaed091680c1c58115f88d56c8e51f3611'
-            '05fdc0c0483410944b988d7f4beabb00bec4a44a41bd13ebc9b78585da7d3f9b'
-            '272907d3213d69dac3bd6024d6d150caa23cb67d4f121e4171f34ba5581f9e98')
-
-build() {
-    cd $pkgname-$pkgver
-    ./configure \
-        --prefix=/etc/nginx \
-        --conf-path=/etc/nginx/nginx.conf \
-        --sbin-path=/usr/bin/nginx \
-        --pid-path=/run/nginx.pid \
-        --lock-path=/run/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=/var/lib/nginx/client-body \
-        --http-proxy-temp-path=/var/lib/nginx/proxy \
-        --http-fastcgi-temp-path=/var/lib/nginx/fastcgi \
-        --http-scgi-temp-path=/var/lib/nginx/scgi \
-        --http-uwsgi-temp-path=/var/lib/nginx/uwsgi \
-        --with-imap \
-        --with-imap_ssl_module \
-        --with-ipv6 \
-        --with-pcre-jit \
-        --with-file-aio \
-        --with-http_dav_module \
-        --with-http_gunzip_module \
-        --with-http_gzip_static_module \
-        --with-http_realip_module \
-        --with-http_spdy_module \
-        --with-http_ssl_module \
-        --with-http_stub_status_module \
-        --with-http_addition_module \
-        --with-http_degradation_module \
-        --with-http_flv_module \
-        --with-http_mp4_module \
-        --with-http_secure_link_module \
-        --with-http_sub_module
-    make
-}
-
-package() {
-    cd $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"/var/lib/nginx
-    install -dm700 "$pkgdir"/var/lib/nginx/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/$pkgname/LICENSE
-    rmdir "$pkgdir/run"
-}
-
-# vim:set ts=4 sw=4 et:

Copied: nginx/repos/community-x86_64/PKGBUILD (from rev 98428, nginx/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2013-10-10 07:58:09 UTC (rev 98429)
@@ -0,0 +1,96 @@
+# $Id$
+# Maintainer: Bartłomiej Piotrowski <nospam at bpiotrowski.pl>
+# Maintainer: Sébastien Luttringer
+# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Miroslaw Szot <mss at czlug.icis.pcz.pl>
+
+pkgname=nginx
+pkgver=1.4.3
+pkgrel=1
+pkgdesc='Lightweight HTTP server and IMAP/POP3 proxy server'
+arch=('i686' 'x86_64')
+url='http://nginx.org'
+license=('custom')
+depends=('pcre' 'zlib' 'openssl')
+backup=('etc/nginx/fastcgi.conf'
+        'etc/nginx/fastcgi_params'
+        'etc/nginx/koi-win'
+        'etc/nginx/koi-utf'
+        'etc/nginx/mime.types'
+        'etc/nginx/nginx.conf'
+        'etc/nginx/scgi_params'
+        'etc/nginx/uwsgi_params'
+        'etc/nginx/win-utf'
+        'etc/logrotate.d/nginx')
+install=install
+source=("http://nginx.org/download/nginx-$pkgver.tar.gz"
+        'service'
+        'logrotate')
+sha256sums=('ae123885c923a6c3f5bab0a8b7296ef21c4fdf6087834667ebbc16338177de84'
+            '05fdc0c0483410944b988d7f4beabb00bec4a44a41bd13ebc9b78585da7d3f9b'
+            '272907d3213d69dac3bd6024d6d150caa23cb67d4f121e4171f34ba5581f9e98')
+
+build() {
+    cd $pkgname-$pkgver
+    ./configure \
+        --prefix=/etc/nginx \
+        --conf-path=/etc/nginx/nginx.conf \
+        --sbin-path=/usr/bin/nginx \
+        --pid-path=/run/nginx.pid \
+        --lock-path=/run/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=/var/lib/nginx/client-body \
+        --http-proxy-temp-path=/var/lib/nginx/proxy \
+        --http-fastcgi-temp-path=/var/lib/nginx/fastcgi \
+        --http-scgi-temp-path=/var/lib/nginx/scgi \
+        --http-uwsgi-temp-path=/var/lib/nginx/uwsgi \
+        --with-imap \
+        --with-imap_ssl_module \
+        --with-ipv6 \
+        --with-pcre-jit \
+        --with-file-aio \
+        --with-http_dav_module \
+        --with-http_gunzip_module \
+        --with-http_gzip_static_module \
+        --with-http_realip_module \
+        --with-http_spdy_module \
+        --with-http_ssl_module \
+        --with-http_stub_status_module \
+        --with-http_addition_module \
+        --with-http_degradation_module \
+        --with-http_flv_module \
+        --with-http_mp4_module \
+        --with-http_secure_link_module \
+        --with-http_sub_module
+    make
+}
+
+package() {
+    cd $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"/var/lib/nginx
+    install -dm700 "$pkgdir"/var/lib/nginx/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/$pkgname/LICENSE
+    rmdir "$pkgdir/run"
+}
+
+# vim:set ts=4 sw=4 et:

Deleted: community-x86_64/install
===================================================================
--- community-x86_64/install	2013-10-10 07:57:57 UTC (rev 98428)
+++ community-x86_64/install	2013-10-10 07:58:09 UTC (rev 98429)
@@ -1,21 +0,0 @@
-post_upgrade() {
-    if (( $(vercmp $2 1.2.7-4) <= 0 )); then
-        chmod 750 var/log/nginx
-        chown http:log var/log/nginx
-    fi
-    if (( $(vercmp $2 1.2.1-2) <= 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
-    if (( $(vercmp $2 1.4.2-4) < 0 )); then
-        echo 'Nginx now includes only upstream bundled modules.'
-        echo 'Thus, passenger module support was dropped.'
-    fi
-}
-
-# vim:set ts=4 sw=4 et:

Copied: nginx/repos/community-x86_64/install (from rev 98428, nginx/trunk/install)
===================================================================
--- community-x86_64/install	                        (rev 0)
+++ community-x86_64/install	2013-10-10 07:58:09 UTC (rev 98429)
@@ -0,0 +1,21 @@
+post_upgrade() {
+    if (( $(vercmp $2 1.2.7-4) <= 0 )); then
+        chmod 750 var/log/nginx
+        chown http:log var/log/nginx
+    fi
+    if (( $(vercmp $2 1.2.1-2) <= 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
+    if (( $(vercmp $2 1.4.2-4) < 0 )); then
+        echo 'Nginx now includes only upstream bundled modules.'
+        echo 'Thus, passenger module support was dropped.'
+    fi
+}
+
+# vim:set ts=4 sw=4 et:

Deleted: community-x86_64/logrotate
===================================================================
--- community-x86_64/logrotate	2013-10-10 07:57:57 UTC (rev 98428)
+++ community-x86_64/logrotate	2013-10-10 07:58:09 UTC (rev 98429)
@@ -1,9 +0,0 @@
-/var/log/nginx/*log {
-	missingok
-	create 640 http log
-	sharedscripts
-	compress
-	postrotate
-		test ! -r /var/run/nginx.pid || kill -USR1 `cat /var/run/nginx.pid`
-	endscript
-}

Copied: nginx/repos/community-x86_64/logrotate (from rev 98428, nginx/trunk/logrotate)
===================================================================
--- community-x86_64/logrotate	                        (rev 0)
+++ community-x86_64/logrotate	2013-10-10 07:58:09 UTC (rev 98429)
@@ -0,0 +1,9 @@
+/var/log/nginx/*log {
+	missingok
+	create 640 http log
+	sharedscripts
+	compress
+	postrotate
+		test ! -r /var/run/nginx.pid || kill -USR1 `cat /var/run/nginx.pid`
+	endscript
+}

Deleted: community-x86_64/service
===================================================================
--- community-x86_64/service	2013-10-10 07:57:57 UTC (rev 98428)
+++ community-x86_64/service	2013-10-10 07:58:09 UTC (rev 98429)
@@ -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/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
-
-[Install]
-WantedBy=multi-user.target

Copied: nginx/repos/community-x86_64/service (from rev 98428, nginx/trunk/service)
===================================================================
--- community-x86_64/service	                        (rev 0)
+++ community-x86_64/service	2013-10-10 07:58:09 UTC (rev 98429)
@@ -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/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
+
+[Install]
+WantedBy=multi-user.target




More information about the arch-commits mailing list