Nick Liu
|
7d4313aaf8
|
Fixed typo "listerner" => "listener"
|
2017-01-20 07:37:08 -06:00 |
|
Forrest
|
f4ce186b37
|
Merge pull request #61 from davidwalter0/patch-1
update haproxy.jinja : spelling correction listner
|
2016-09-29 10:01:03 -07:00 |
|
davidwalter0
|
44ec6ddfb5
|
update haproxy.jinja : spelling correction listner
|
2016-09-28 20:38:29 -04:00 |
|
Forrest
|
39390e8618
|
Merge pull request #59 from mikesager/fix_backend_extra_trimming
haproxy.jinja bugfix: backend.extra array trimming
|
2016-09-17 12:04:48 -07:00 |
|
Mike Sager
|
991a502636
|
Fixed bug in haproxy.jinja that put all 'extra' lines from an extra array on the same line in the config
|
2016-09-16 21:41:52 -07:00 |
|
Forrest
|
d8d86caa45
|
Merge pull request #58 from cathode911/master
added mode selection for stats socket in global definitions
|
2016-08-11 09:21:29 -07:00 |
|
Andrew Repulo
|
e7cddfe0e2
|
added mode selection for stats socket in global definitions
|
2016-08-11 18:49:06 +03:00 |
|
Forrest
|
b69c7edebd
|
Merge pull request #56 from grobinson-blockchain/master
Support optional overwrite of existing configuration files
|
2016-06-29 09:52:58 -07:00 |
|
George Robinson
|
4e5f7632b9
|
Add overwrite option to pillar.example
|
2016-06-29 17:40:24 +01:00 |
|
George Robinson
|
32a732a8c6
|
Fix test to use config-file-path from pillar
|
2016-06-29 17:39:37 +01:00 |
|
George Robinson
|
df3aeb1e4c
|
Support disable overwrite of existing haproxy config file
|
2016-06-29 11:21:42 +01:00 |
|
abednarik
|
0a550b89b9
|
Add support for maxconn per server in haproxy configuration.
|
2016-06-29 11:21:42 +01:00 |
|
Forrest
|
dfd7468718
|
Merge pull request #55 from abednarik/abednarik_maxconn_per_server
Add support for maxconn per server in haproxy configuration.
|
2016-06-17 13:25:14 -07:00 |
|
abednarik
|
533f275d08
|
Add support for maxconn per server in haproxy configuration.
|
2016-06-17 17:18:48 -03:00 |
|
Forrest
|
1b7e1794ef
|
Merge pull request #54 from sbraverman/brave-1
Simplifies jinja logic and removes extra lines
|
2016-06-16 17:36:10 -07:00 |
|
Steven Braverman
|
aeb1844e2f
|
Simplifies jinja logic and removes extra lines
|
2016-06-16 17:25:32 -07:00 |
|
Forrest
|
4586aea25c
|
Merge pull request #53 from abednarik/abednarik_freebsd_suppoprt
Updated group wheel when os_family is FreeBSD.
|
2016-06-07 12:16:17 -07:00 |
|
abednarik
|
17c9373098
|
Updated group wheel when os_family is FreeBSD.
|
2016-06-07 16:06:56 -03:00 |
|
Forrest
|
52a4e1a0a2
|
Merge pull request #52 from mmh/feature/allow_custom_options
allow custom options using "extra"
|
2016-06-02 10:22:19 -07:00 |
|
Morten M. Hansen
|
822db0e338
|
allow custom options using "extra"
|
2016-06-01 21:14:12 +02:00 |
|
Forrest
|
e465b79a59
|
Merge pull request #51 from hoonetorg/feature/more_modular_template
Feature/more modular template
|
2016-04-07 17:42:26 -07:00 |
|
hoonetorg
|
23dd429084
|
timeouts for listeners
|
2016-04-05 08:23:27 +02:00 |
|
hoonetorg
|
186be19c27
|
finally fix default section of haproxy.cfg
|
2016-04-05 08:23:27 +02:00 |
|
hoonetorg
|
97970baf84
|
make haproxy.cfg template more modular - fix stripping - 3rd try
|
2016-04-05 08:23:26 +02:00 |
|
hoonetorg
|
e991e668c8
|
make haproxy.cfg template more modular - fix stripping - 2nd try
|
2016-04-05 08:23:26 +02:00 |
|
hoonetorg
|
3f3250c799
|
make haproxy.cfg template more modular - fix stripping
|
2016-04-05 08:23:25 +02:00 |
|
hoonetorg
|
51b66a91ca
|
make haproxy.cfg template more modular
|
2016-04-05 08:23:25 +02:00 |
|
Forrest
|
0d2b72c138
|
Merge pull request #45 from bigbosst/reqrep-frontend
added reqrep to the frontend
|
2016-02-12 14:53:36 -08:00 |
|
Troy Germain
|
119c405fc4
|
added reqrep to the frontend
|
2016-02-12 14:44:36 -08:00 |
|
Forrest
|
c3761409e9
|
Merge pull request #43 from msciciel/fix-service-start-require
Add missing require to start service after config generation.
|
2016-01-22 00:06:20 -08:00 |
|
Krzysztof Pawłowski
|
5b7b84d61e
|
Add missing require to start service after config generation.
|
2016-01-22 08:14:24 +01:00 |
|
Forrest
|
b0c702b0df
|
Merge pull request #42 from cybacolt/master
Allow omission of 'port' and 'check' from server params
|
2016-01-15 11:41:20 -08:00 |
|
Rowcliffe Browne
|
b707857692
|
Allow omission of 'port' and 'check' from server params
useful for services that require more than 1 port mapped through (eg passive ftp)
|
2016-01-15 17:34:05 +08:00 |
|
Forrest
|
ff4a06b5b0
|
Merge pull request #40 from davidkarlsen/noPpaForUbuntu
this is no longer needed - haproxy 1.5.x in ubuntu repo
|
2015-12-27 11:10:19 -08:00 |
|
david
|
76b4e81af5
|
this is no longer needed - haproxy 1.5.x in ubuntu repo
|
2015-12-27 19:51:14 +01:00 |
|
Forrest
|
e1f9df1c1a
|
Merge pull request #39 from bigbosst/stat-level
adding levels for stat socket
|
2015-12-11 15:11:58 -08:00 |
|
Troy Germain
|
1995b4b81d
|
adding levels for stat socket
|
2015-12-11 14:42:49 -08:00 |
|
Forrest
|
e0fb756ec4
|
Merge pull request #38 from bneqld/frontends_block-statements
Frontends block statements
|
2015-12-07 01:58:11 -08:00 |
|
Bernd Fischbach
|
776751f9b7
|
Added block statements (not parsed, simply looped and put into the configuration) for frontends
|
2015-12-07 10:16:04 +01:00 |
|
Bernd Fischbach
|
b485501fcb
|
Revert "Added block statements (not parsed, simply looped and put in to the configuration) for frontends"
in order to move that into a branch
This reverts commit 76bc908e3e.
|
2015-12-07 10:11:45 +01:00 |
|
Bernd Fischbach
|
76bc908e3e
|
Added block statements (not parsed, simply looped and put in to the configuration) for frontends
|
2015-12-07 10:03:59 +01:00 |
|
Forrest
|
a5bae64325
|
Merge pull request #34 from morsik/patch-1
Use k,v in template
|
2015-11-24 12:55:23 -08:00 |
|
Konrad Mosoń
|
1b46ac219a
|
Removed broken conflict lines...
|
2015-11-24 21:46:02 +01:00 |
|
morsik
|
78e7fb9d0d
|
Rebased patch
|
2015-11-24 21:43:07 +01:00 |
|
Konrad Mosoń
|
bf28971bd7
|
Fixed wrong key getter
|
2015-11-24 21:38:12 +01:00 |
|
Konrad Mosoń
|
1002134bc6
|
Use k,v in template
You had fantasy for using list in `.iteritems()`… :D
Not tested. Changed "on fly" when I looked into template file.
|
2015-11-24 21:38:12 +01:00 |
|
Brian Jackson
|
7ba7a85060
|
Merge pull request #37 from abednarik/fix_deprecated_iteritems_call
Replaced deprecated iteritems() function call with items()
|
2015-11-24 11:28:59 -08:00 |
|
abednarik
|
e2915b95b1
|
Replaced deprecated iteritems() function call with items()
|
2015-11-24 16:11:28 -03:00 |
|
Forrest
|
97ff5641b1
|
Merge pull request #36 from morsik/master
reqadd -> reqadds
|
2015-11-19 11:08:56 -08:00 |
|
Konrad Mosoń
|
9f3826b7f1
|
reqadd -> reqadds
Template file uses `reqadds`, but `pillar.example` says i's `reqadd`.
|
2015-11-16 11:20:21 +01:00 |
|