Commit Graph

156 Commits

Author SHA1 Message Date
Niels Abspoel 654fedfeab
Merge pull request #72 from mymasse/feature/fix_override
Fix service state when override are used
2018-03-23 09:22:22 +01:00
Mathieu Masse dafe8fd6a5 Fix service state when override are used
Service.running now uses correct require pkg id if
haproxy.lookup.package is used
Service.dead now uses correct name when haproxy.lookup.service is used
2018-03-22 20:43:25 -04:00
N 1cbdd4cb79
Merge pull request #69 from daks/map.jinja
Switching to map.jinja to define platform specific values
2017-12-13 22:30:14 +00:00
Eric Veiras Galisson 6493d24ad3 info in pillar.example about old and new setting for conf file path 2017-11-06 16:58:30 +01:00
Eric Veiras Galisson 752c3e5641 moving specific FreeBSD code to map.jinja, updating pillar.example 2017-10-31 14:42:20 +01:00
Eric Veiras Galisson 2b83ca0860 refactoring code to use map.jinja for config values
at the moment only Debian managed, FreeBSD exception still in state
2017-10-31 14:41:54 +01:00
John Keates 0e697c67c9 Merge pull request #68 from stenstad/master
Add timeouts handling to backend section of template.
2017-10-11 16:05:23 +02:00
Dag Stenstad 5a1d62f9ac Add timeouts handling to backend section of template. 2017-10-11 15:55:03 +02:00
John Keates 2f2feec25e Merge pull request #65 from kungfu71186/patch-1
Update pillar.example
2017-08-25 17:30:44 +02:00
John Keates 40c7ac8c70 Merge pull request #50 from hoonetorg/feature/modular_log
allow to set arbitrary log options in global
2017-08-25 17:29:28 +02:00
John Keates 1c29ef813d Merge pull request #67 from KerkhoffTechnologies/frontend_add_timeouts
Add timeouts handling to frontend section of template
2017-06-21 21:54:57 +02:00
KTI - Richard Clark 2f2e0deca6 Add timeouts handling to frontent. Was only in listen 2017-06-21 21:38:08 +02:00
kungfu71186 2d74c71933 Update pillar.example
reqrep should be reqreps and the string is not properly escaped, causes issues when compiling
2017-05-24 16:10:23 -04:00
Niels Abspoel d815b4615a Merge pull request #63 from Deltik/master
Fix listens "extra"
2017-01-20 23:05:33 +01:00
Nick Liu 4abfac0eec Fixed line break issue if listens.extra is a list 2017-01-20 07:42:33 -06:00
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 cbcb50ad84 allow to set arbitrary log options in global 2016-04-07 21:17:37 +02: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