Marcus Rueckert
3d2a7368d4
- drop patches we pulled from upstream git: 0001-BUG-MINOR-log-missing-some-ARGC_-entries-in-fmt_dire.patch 0002-DOC-usesrc-root-privileges-requirements.patch 0003-BUILD-ssl-Allow-building-against-libssl-without-SSLv.patch 0004-DOC-MINOR-fix-OpenBSD-versions-where-haproxy-works.patch 0005-BUG-MINOR-http-sample-gmtime-localtime-can-fail.patch 0006-DOC-typo-in-redirect-302-code-meaning.patch 0007-DOC-mention-that-ms-is-left-padded-with-zeroes.patch 0008-CLEANUP-.gitignore-ignore-more-test-files.patch 0009-CLEANUP-.gitignore-finally-ignore-everything-but-wha.patch 0010-MEDIUM-config-emit-a-warning-on-a-frontend-without-l.patch 0011-BUG-MEDIUM-counters-ensure-that-src_-inc-clr-_gpc0-c.patch 0012-DOC-ssl-missing-LF.patch 0013-DOC-fix-example-of-http-request-using-ssl_fc_session.patch 0014-BUG-MINOR-http-remove-stupid-HTTP_METH_NONE-entry.patch 0015-BUG-MAJOR-http-don-t-call-http_send_name_header-afte.patch - refresh/redo patches to apply cleanly again: old: haproxy-1.2.16_config_haproxy_user.patch new: haproxy-1.6.0_config_haproxy_user.patch old: haproxy-makefile_lib.patch new: haproxy-1.6.0-makefile_lib.patch old: sec-options.patch new: haproxy-1.6.0-sec-options.patch - added new haproxy.cfg to have a minimal config we can actually launch! - drop patch haproxy-1.5.8-fix-bashisms.patch: patched files no longer exist - drop haproxy.vim: we will use the copy which ships with the upstream tarball now. OBS-URL: https://build.opensuse.org/package/show/server:http/haproxy?expand=0&rev=117
96 lines
2.6 KiB
Diff
96 lines
2.6 KiB
Diff
Index: haproxy-1.6.0/examples/acl-content-sw.cfg
|
|
===================================================================
|
|
--- haproxy-1.6.0.orig/examples/acl-content-sw.cfg
|
|
+++ haproxy-1.6.0/examples/acl-content-sw.cfg
|
|
@@ -5,9 +5,9 @@ global
|
|
log loghost local0
|
|
log localhost local0 err
|
|
maxconn 250
|
|
- uid 71
|
|
- gid 71
|
|
- chroot /var/empty
|
|
+ user haproxy
|
|
+ group haproxy
|
|
+ chroot /var/lib/haproxy
|
|
pidfile /var/run/haproxy.pid
|
|
daemon
|
|
quiet
|
|
Index: haproxy-1.6.0/examples/auth.cfg
|
|
===================================================================
|
|
--- haproxy-1.6.0.orig/examples/auth.cfg
|
|
+++ haproxy-1.6.0/examples/auth.cfg
|
|
@@ -1,7 +1,7 @@
|
|
global
|
|
-# chroot /var/empty/
|
|
-# uid 451
|
|
-# gid 451
|
|
+ user haproxy
|
|
+ group haproxy
|
|
+ chroot /var/lib/haproxy
|
|
log 192.168.131.214:8514 local4 debug
|
|
maxconn 8192
|
|
|
|
Index: haproxy-1.6.0/examples/content-sw-sample.cfg
|
|
===================================================================
|
|
--- haproxy-1.6.0.orig/examples/content-sw-sample.cfg
|
|
+++ haproxy-1.6.0/examples/content-sw-sample.cfg
|
|
@@ -11,9 +11,9 @@ global
|
|
maxconn 10000
|
|
stats socket /var/run/haproxy.stat mode 600 level admin
|
|
log 127.0.0.1 local0
|
|
- uid 200
|
|
- gid 200
|
|
- chroot /var/empty
|
|
+ user haproxy
|
|
+ group haproxy
|
|
+ chroot /var/lib/haproxy
|
|
daemon
|
|
|
|
# The public 'www' address in the DMZ
|
|
Index: haproxy-1.6.0/examples/option-http_proxy.cfg
|
|
===================================================================
|
|
--- haproxy-1.6.0.orig/examples/option-http_proxy.cfg
|
|
+++ haproxy-1.6.0/examples/option-http_proxy.cfg
|
|
@@ -6,9 +6,9 @@ global
|
|
maxconn 20000
|
|
ulimit-n 16384
|
|
log 127.0.0.1 local0
|
|
- uid 200
|
|
- gid 200
|
|
- chroot /var/empty
|
|
+ chroot /var/lib/haproxy
|
|
+ user haproxy
|
|
+ group haproxy
|
|
nbproc 4
|
|
daemon
|
|
|
|
Index: haproxy-1.6.0/examples/ssl.cfg
|
|
===================================================================
|
|
--- haproxy-1.6.0.orig/examples/ssl.cfg
|
|
+++ haproxy-1.6.0/examples/ssl.cfg
|
|
@@ -4,6 +4,9 @@
|
|
|
|
global
|
|
maxconn 100
|
|
+ chroot /var/lib/haproxy
|
|
+ user haproxy
|
|
+ group haproxy
|
|
|
|
defaults
|
|
mode http
|
|
Index: haproxy-1.6.0/examples/transparent_proxy.cfg
|
|
===================================================================
|
|
--- haproxy-1.6.0.orig/examples/transparent_proxy.cfg
|
|
+++ haproxy-1.6.0/examples/transparent_proxy.cfg
|
|
@@ -6,6 +6,10 @@
|
|
#
|
|
|
|
global
|
|
+ chroot /var/lib/haproxy
|
|
+ user haproxy
|
|
+ group haproxy
|
|
+
|
|
defaults
|
|
timeout client 30s
|
|
timeout server 30s
|