Github messages for voidlinux
 help / color / mirror / Atom feed
From: zdykstra <zdykstra@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] haproxy: fix default configuration
Date: Fri, 24 Feb 2023 18:26:23 +0100	[thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-42428@inbox.vuxu.org> (raw)

[-- Attachment #1: Type: text/plain, Size: 502 bytes --]

There is a new pull request by zdykstra against master on the void-packages repository

https://github.com/zdykstra/void-packages haproxy-config-bump
https://github.com/void-linux/void-packages/pull/42428

haproxy: fix default configuration
#### Testing the changes
- I tested the changes in this PR: **YES**

I missed updating the default configuration file when a configuration verb was retired in 2.6.x. 

A patch file from https://github.com/void-linux/void-packages/pull/42428.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-haproxy-config-bump-42428.patch --]
[-- Type: text/x-diff, Size: 1258 bytes --]

From da98678622ff454101503277a469fd66cb5b770d Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Fri, 24 Feb 2023 11:24:24 -0600
Subject: [PATCH] haproxy: fix default configuration

---
 srcpkgs/haproxy/files/haproxy.cfg | 2 +-
 srcpkgs/haproxy/template          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/haproxy/files/haproxy.cfg b/srcpkgs/haproxy/files/haproxy.cfg
index 3706f7eb3ca3..a8631a779051 100644
--- a/srcpkgs/haproxy/files/haproxy.cfg
+++ b/srcpkgs/haproxy/files/haproxy.cfg
@@ -2,7 +2,7 @@ global
   chroot /var/lib/haproxy
   user haproxy
   group haproxy
-  stats socket /var/run/haproxy.sock mode 0600 level admin expose-fd listeners process 1/1
+  stats socket /var/run/haproxy.sock mode 0600 level admin expose-fd listeners thread 1
 
 defaults
   mode http
diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template
index 43c4fb1f8b50..40833cfb9eea 100644
--- a/srcpkgs/haproxy/template
+++ b/srcpkgs/haproxy/template
@@ -1,7 +1,7 @@
 # Template file for 'haproxy'
 pkgname=haproxy
 version=2.6.9
-revision=1
+revision=2
 build_style=gnu-makefile
 make_install_args="SBINDIR=${DESTDIR}/usr/bin DOCDIR=${DESTDIR}/usr/share/doc/${pkgname}"
 hostmakedepends="lua53-devel"

             reply	other threads:[~2023-02-24 17:26 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-02-24 17:26 zdykstra [this message]
2023-02-24 17:30 ` [PR PATCH] [Merged]: " ahesford

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-42428@inbox.vuxu.org \
    --to=zdykstra@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).