Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] haproxy: fix default configuration
@ 2023-02-24 17:26 zdykstra
  2023-02-24 17:30 ` [PR PATCH] [Merged]: " ahesford
  0 siblings, 1 reply; 2+ messages in thread
From: zdykstra @ 2023-02-24 17:26 UTC (permalink / raw)
  To: ml

[-- 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"

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PR PATCH] [Merged]: haproxy: fix default configuration
  2023-02-24 17:26 [PR PATCH] haproxy: fix default configuration zdykstra
@ 2023-02-24 17:30 ` ahesford
  0 siblings, 0 replies; 2+ messages in thread
From: ahesford @ 2023-02-24 17:30 UTC (permalink / raw)
  To: ml

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

There's a merged pull request on the void-packages repository

haproxy: fix default configuration
https://github.com/void-linux/void-packages/pull/42428

Description:
#### 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. 

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2023-02-24 17:30 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-02-24 17:26 [PR PATCH] haproxy: fix default configuration zdykstra
2023-02-24 17:30 ` [PR PATCH] [Merged]: " ahesford

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).