[arch-commits] Commit in haproxy/repos (7 files)

Johannes Löthberg demize at archlinux.org
Sun Dec 24 14:01:41 UTC 2017


    Date: Sunday, December 24, 2017 @ 14:01:40
  Author: demize
Revision: 275750

db-move: moved haproxy from [community-testing] to [community] (x86_64)

Added:
  haproxy/repos/community-x86_64/PKGBUILD
    (from rev 275749, haproxy/repos/community-testing-x86_64/PKGBUILD)
  haproxy/repos/community-x86_64/haproxy.cfg
    (from rev 275749, haproxy/repos/community-testing-x86_64/haproxy.cfg)
  haproxy/repos/community-x86_64/haproxy.install
    (from rev 275749, haproxy/repos/community-testing-x86_64/haproxy.install)
Deleted:
  haproxy/repos/community-testing-x86_64/
  haproxy/repos/community-x86_64/PKGBUILD
  haproxy/repos/community-x86_64/haproxy.cfg
  haproxy/repos/community-x86_64/haproxy.install

----------------------------------+
 /PKGBUILD                        |   69 ++++++++++++++++++++++++++++++++++++
 /haproxy.cfg                     |   49 +++++++++++++++++++++++++
 /haproxy.install                 |   12 ++++++
 community-x86_64/PKGBUILD        |   70 -------------------------------------
 community-x86_64/haproxy.cfg     |   49 -------------------------
 community-x86_64/haproxy.install |   12 ------
 6 files changed, 130 insertions(+), 131 deletions(-)

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2017-12-24 14:01:18 UTC (rev 275749)
+++ community-x86_64/PKGBUILD	2017-12-24 14:01:40 UTC (rev 275750)
@@ -1,70 +0,0 @@
-# $Id$
-# Maintainer: Johannes Löthberg <johannes at kyriasis.com>
-# Contributor: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
-
-pkgname=haproxy
-pkgver=1.7.9
-pkgrel=1
-
-pkgdesc='Reliable, high performance TCP/HTTP load balancer'
-url='https://haproxy.org/'
-arch=('i686' 'x86_64')
-license=('GPL')
-
-depends=('openssl' 'pcre' 'zlib' 'lua')
-
-backup=('etc/haproxy/haproxy.cfg')
-
-install=haproxy.install
-
-source=(https://haproxy.org/download/${pkgver%.*}/src/haproxy-$pkgver.tar.gz
-        haproxy.cfg)
-
-md5sums=('a2bbbdd45ffe18d99cdcf26aa992f92d'
-         '27941f31d25d5629f4bdef6bc4b2555a')
-
-prepare() {
-  cd haproxy-$pkgver
-  sed -i 's:/usr/sbin/haproxy:/usr/bin/haproxy:' src/haproxy-systemd-wrapper.c
-}
-
-build() {
-  cd haproxy-$pkgver
-
-  make CPU=generic TARGET=linux2628 \
-    USE_GETADDRINFO=1 \
-    USE_OPENSSL=1 \
-    USE_PCRE=1 USE_PCRE_JIT=1 \
-    USE_ZLIB=1 \
-    USE_LUA=1
-
-  for contrib in halog iprange systemd; do
-    make -C contrib/$contrib SBINDIR=/usr/bin
-  done
-}
-
-package() {
-  cd haproxy-$pkgver
-  make \
-    EXTRA=haproxy-systemd-wrapper \
-    PREFIX="$pkgdir"/usr \
-    SBINDIR="$pkgdir"/usr/bin \
-    DOCDIR="$pkgdir"/usr/share/$pkgname \
-    install
-
-  for contrib in halog iprange; do
-    install -Dm755 contrib/$contrib/$contrib "$pkgdir"/usr/bin/$contrib
-  done
-
-  install -Dm644 ../haproxy.cfg "$pkgdir"/etc/haproxy/haproxy.cfg
-  install -Dm644 contrib/systemd/haproxy.service \
-    "$pkgdir"/usr/lib/systemd/system/haproxy.service
-
-  install -d "$pkgdir"/usr/share/haproxy/examples/errorfiles
-  install -m644 examples/*.cfg "$pkgdir"/usr/share/haproxy/examples/
-  install -m644 examples/errorfiles/*.http \
-    "$pkgdir"/usr/share/haproxy/examples/errorfiles/
-
-  install -Dm644 examples/haproxy.vim \
-    "$pkgdir"/usr/share/vim/vimfiles/syntax/haproxy.vim
-}

Copied: haproxy/repos/community-x86_64/PKGBUILD (from rev 275749, haproxy/repos/community-testing-x86_64/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2017-12-24 14:01:40 UTC (rev 275750)
@@ -0,0 +1,69 @@
+# $Id$
+# Maintainer: Johannes Löthberg <johannes at kyriasis.com>
+# Contributor: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+
+pkgname=haproxy
+pkgver=1.8.0
+pkgrel=1
+
+pkgdesc='Reliable, high performance TCP/HTTP load balancer'
+url='https://haproxy.org/'
+arch=('x86_64')
+license=('GPL')
+
+depends=('openssl' 'pcre' 'zlib' 'lua' 'libsystemd')
+
+backup=('etc/haproxy/haproxy.cfg')
+
+install=haproxy.install
+
+source=(https://haproxy.org/download/${pkgver%.*}/src/haproxy-$pkgver.tar.gz
+        haproxy.cfg)
+
+md5sums=('6ccea4619b7183fbcc8c98bae1f9823d'
+         '27941f31d25d5629f4bdef6bc4b2555a')
+
+prepare() {
+  cd haproxy-$pkgver
+}
+
+build() {
+  cd haproxy-$pkgver
+
+  make CPU=generic TARGET=linux2628 \
+    USE_GETADDRINFO=1 \
+    USE_OPENSSL=1 \
+    USE_PCRE=1 USE_PCRE_JIT=1 \
+    USE_ZLIB=1 \
+    USE_LUA=1 \
+    USE_SYSTEMD=1
+
+  for contrib in halog iprange systemd; do
+    make -C contrib/$contrib SBINDIR=/usr/bin
+  done
+}
+
+package() {
+  cd haproxy-$pkgver
+  make \
+    PREFIX="$pkgdir"/usr \
+    SBINDIR="$pkgdir"/usr/bin \
+    DOCDIR="$pkgdir"/usr/share/$pkgname \
+    install
+
+  for contrib in halog iprange; do
+    install -Dm755 contrib/$contrib/$contrib "$pkgdir"/usr/bin/$contrib
+  done
+
+  install -Dm644 ../haproxy.cfg "$pkgdir"/etc/haproxy/haproxy.cfg
+  install -Dm644 contrib/systemd/haproxy.service \
+    "$pkgdir"/usr/lib/systemd/system/haproxy.service
+
+  install -d "$pkgdir"/usr/share/haproxy/examples/errorfiles
+  install -m644 examples/*.cfg "$pkgdir"/usr/share/haproxy/examples/
+  install -m644 examples/errorfiles/*.http \
+    "$pkgdir"/usr/share/haproxy/examples/errorfiles/
+
+  install -Dm644 examples/haproxy.vim \
+    "$pkgdir"/usr/share/vim/vimfiles/syntax/haproxy.vim
+}

Deleted: community-x86_64/haproxy.cfg
===================================================================
--- community-x86_64/haproxy.cfg	2017-12-24 14:01:18 UTC (rev 275749)
+++ community-x86_64/haproxy.cfg	2017-12-24 14:01:40 UTC (rev 275750)
@@ -1,49 +0,0 @@
-#---------------------------------------------------------------------
-# Example configuration.  See the full configuration manual online.
-#
-#   http://www.haproxy.org/download/1.7/doc/configuration.txt
-#
-#---------------------------------------------------------------------
-
-global
-    maxconn     20000
-    log         127.0.0.1 local0
-    user        haproxy
-    chroot      /usr/share/haproxy
-    pidfile     /run/haproxy.pid
-    daemon
-
-frontend  main
-    bind :5000
-    mode                 http
-    log                  global
-    option               httplog
-    option               dontlognull
-    option               http_proxy
-    option forwardfor    except 127.0.0.0/8
-    maxconn              8000
-    timeout              client  30s
-
-    acl url_static       path_beg       -i /static /images /javascript /stylesheets
-    acl url_static       path_end       -i .jpg .gif .png .css .js
-
-    use_backend static          if url_static
-    default_backend             app
-
-backend static
-    mode        http
-    balance     roundrobin
-    timeout     connect 5s
-    timeout     server  5s
-    server      static 127.0.0.1:4331 check
-
-backend app
-    mode        http
-    balance     roundrobin
-    timeout     connect 5s
-    timeout     server  30s
-    timeout     queue   30s
-    server  app1 127.0.0.1:5001 check
-    server  app2 127.0.0.1:5002 check
-    server  app3 127.0.0.1:5003 check
-    server  app4 127.0.0.1:5004 check

Copied: haproxy/repos/community-x86_64/haproxy.cfg (from rev 275749, haproxy/repos/community-testing-x86_64/haproxy.cfg)
===================================================================
--- community-x86_64/haproxy.cfg	                        (rev 0)
+++ community-x86_64/haproxy.cfg	2017-12-24 14:01:40 UTC (rev 275750)
@@ -0,0 +1,49 @@
+#---------------------------------------------------------------------
+# Example configuration.  See the full configuration manual online.
+#
+#   http://www.haproxy.org/download/1.7/doc/configuration.txt
+#
+#---------------------------------------------------------------------
+
+global
+    maxconn     20000
+    log         127.0.0.1 local0
+    user        haproxy
+    chroot      /usr/share/haproxy
+    pidfile     /run/haproxy.pid
+    daemon
+
+frontend  main
+    bind :5000
+    mode                 http
+    log                  global
+    option               httplog
+    option               dontlognull
+    option               http_proxy
+    option forwardfor    except 127.0.0.0/8
+    maxconn              8000
+    timeout              client  30s
+
+    acl url_static       path_beg       -i /static /images /javascript /stylesheets
+    acl url_static       path_end       -i .jpg .gif .png .css .js
+
+    use_backend static          if url_static
+    default_backend             app
+
+backend static
+    mode        http
+    balance     roundrobin
+    timeout     connect 5s
+    timeout     server  5s
+    server      static 127.0.0.1:4331 check
+
+backend app
+    mode        http
+    balance     roundrobin
+    timeout     connect 5s
+    timeout     server  30s
+    timeout     queue   30s
+    server  app1 127.0.0.1:5001 check
+    server  app2 127.0.0.1:5002 check
+    server  app3 127.0.0.1:5003 check
+    server  app4 127.0.0.1:5004 check

Deleted: community-x86_64/haproxy.install
===================================================================
--- community-x86_64/haproxy.install	2017-12-24 14:01:18 UTC (rev 275749)
+++ community-x86_64/haproxy.install	2017-12-24 14:01:40 UTC (rev 275750)
@@ -1,12 +0,0 @@
-post_install() {
-  getent passwd haproxy >/dev/null || useradd -r -M -d / \
-    -s /usr/bin/nologin haproxy >/dev/null
-
-  printf '==> %s\n' "The example config chroots HAProxy, meaning that logging to journald won't work."
-  printf '    %s\n' "Either disable chrooting, use rsyslog, or bind /run/systemd/journal/dev-log into the chroot."
-}
-
-post_upgrade() {
-  printf '==> %s\n' "The example config chroots HAProxy, meaning that logging to journald won't work."
-  printf '    %s\n' "Either disable chrooting, use rsyslog, or bind /run/systemd/journal/dev-log into the chroot."
-}

Copied: haproxy/repos/community-x86_64/haproxy.install (from rev 275749, haproxy/repos/community-testing-x86_64/haproxy.install)
===================================================================
--- community-x86_64/haproxy.install	                        (rev 0)
+++ community-x86_64/haproxy.install	2017-12-24 14:01:40 UTC (rev 275750)
@@ -0,0 +1,12 @@
+post_install() {
+  getent passwd haproxy >/dev/null || useradd -r -M -d / \
+    -s /usr/bin/nologin haproxy >/dev/null
+
+  printf '==> %s\n' "The example config chroots HAProxy, meaning that logging to journald won't work."
+  printf '    %s\n' "Either disable chrooting, use rsyslog, or bind /run/systemd/journal/dev-log into the chroot."
+}
+
+post_upgrade() {
+  printf '==> %s\n' "The example config chroots HAProxy, meaning that logging to journald won't work."
+  printf '    %s\n' "Either disable chrooting, use rsyslog, or bind /run/systemd/journal/dev-log into the chroot."
+}



More information about the arch-commits mailing list