Linux-Help/formula-haproxy
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Commit graph

  • 654fedfeab
         Merge pull request #72 from mymasse/feature/fix_override master Niels Abspoel 2018-03-23 09:22:22 +0100
  • dafe8fd6a5 Fix service state when override are used Mathieu Masse 2018-03-22 20:43:25 -0400
  • 1cbdd4cb79
         Merge pull request #69 from daks/map.jinja N 2017-12-13 22:30:14 +0000
  • 6493d24ad3 info in pillar.example about old and new setting for conf file path Eric Veiras Galisson 2017-11-02 09:40:52 +0100
  • 752c3e5641 moving specific FreeBSD code to map.jinja, updating pillar.example Eric Veiras Galisson 2017-10-31 14:23:53 +0100
  • 2b83ca0860 refactoring code to use map.jinja for config values Eric Veiras Galisson 2017-10-31 14:09:52 +0100
  • 0e697c67c9 Merge pull request #68 from stenstad/master John Keates 2017-10-11 16:05:23 +0200
  • 5a1d62f9ac Add timeouts handling to backend section of template. Dag Stenstad 2017-10-11 15:55:03 +0200
  • 2f2feec25e Merge pull request #65 from kungfu71186/patch-1 John Keates 2017-08-25 17:30:44 +0200
  • 40c7ac8c70 Merge pull request #50 from hoonetorg/feature/modular_log John Keates 2017-08-25 17:29:28 +0200
  • 1c29ef813d Merge pull request #67 from KerkhoffTechnologies/frontend_add_timeouts John Keates 2017-06-21 21:54:57 +0200
  • 2f2e0deca6 Add timeouts handling to frontent. Was only in listen KTI - Richard Clark 2017-06-21 21:38:08 +0200
  • 2d74c71933 Update pillar.example kungfu71186 2017-05-24 16:10:23 -0400
  • d815b4615a Merge pull request #63 from Deltik/master Niels Abspoel 2017-01-20 23:05:33 +0100
  • 4abfac0eec Fixed line break issue if listens.extra is a list Nick Liu 2017-01-20 07:42:33 -0600
  • 7d4313aaf8 Fixed typo "listerner" => "listener" Nick Liu 2017-01-20 07:37:08 -0600
  • f4ce186b37 Merge pull request #61 from davidwalter0/patch-1 Forrest 2016-09-29 10:01:03 -0700
  • 44ec6ddfb5 update haproxy.jinja : spelling correction listner davidwalter0 2016-09-28 20:38:29 -0400
  • 39390e8618 Merge pull request #59 from mikesager/fix_backend_extra_trimming Forrest 2016-09-17 12:04:48 -0700
  • 991a502636 Fixed bug in haproxy.jinja that put all 'extra' lines from an extra array on the same line in the config Mike Sager 2016-09-16 21:41:52 -0700
  • d8d86caa45 Merge pull request #58 from cathode911/master Forrest 2016-08-11 09:21:29 -0700
  • e7cddfe0e2 added mode selection for stats socket in global definitions Andrew Repulo 2016-08-11 18:49:06 +0300
  • b69c7edebd Merge pull request #56 from grobinson-blockchain/master Forrest 2016-06-29 09:52:58 -0700
  • 4e5f7632b9 Add overwrite option to pillar.example George Robinson 2016-06-29 17:40:24 +0100
  • 32a732a8c6 Fix test to use config-file-path from pillar George Robinson 2016-06-29 17:39:37 +0100
  • df3aeb1e4c Support disable overwrite of existing haproxy config file George Robinson 2016-06-29 10:53:27 +0100
  • 0a550b89b9 Add support for maxconn per server in haproxy configuration. abednarik 2016-06-17 17:18:48 -0300
  • dfd7468718 Merge pull request #55 from abednarik/abednarik_maxconn_per_server Forrest 2016-06-17 13:25:14 -0700
  • 533f275d08 Add support for maxconn per server in haproxy configuration. abednarik 2016-06-17 17:18:48 -0300
  • 1b7e1794ef Merge pull request #54 from sbraverman/brave-1 Forrest 2016-06-16 17:36:10 -0700
  • aeb1844e2f Simplifies jinja logic and removes extra lines Steven Braverman 2016-06-16 17:25:32 -0700
  • 4586aea25c Merge pull request #53 from abednarik/abednarik_freebsd_suppoprt Forrest 2016-06-07 12:16:17 -0700
  • 17c9373098 Updated group wheel when os_family is FreeBSD. abednarik 2016-06-07 16:06:56 -0300
  • 52a4e1a0a2 Merge pull request #52 from mmh/feature/allow_custom_options Forrest 2016-06-02 10:22:19 -0700
  • 822db0e338 allow custom options using "extra" Morten M. Hansen 2016-06-01 21:14:12 +0200
  • 2a6d65e8d5 Revert "Feature/more modular template" revert-51-feature/more_modular_template Forrest 2016-04-07 17:43:00 -0700
  • e465b79a59 Merge pull request #51 from hoonetorg/feature/more_modular_template Forrest 2016-04-07 17:42:26 -0700
  • cbcb50ad84 allow to set arbitrary log options in global hoonetorg 2016-04-07 21:17:37 +0200
  • 23dd429084 timeouts for listeners hoonetorg 2015-12-01 18:32:19 +0100
  • 186be19c27 finally fix default section of haproxy.cfg hoonetorg 2015-12-01 13:45:07 +0100
  • 97970baf84 make haproxy.cfg template more modular - fix stripping - 3rd try hoonetorg 2015-12-01 13:27:21 +0100
  • e991e668c8 make haproxy.cfg template more modular - fix stripping - 2nd try hoonetorg 2015-12-01 13:24:01 +0100
  • 3f3250c799 make haproxy.cfg template more modular - fix stripping hoonetorg 2015-12-01 13:21:27 +0100
  • 51b66a91ca make haproxy.cfg template more modular hoonetorg 2015-12-01 13:16:35 +0100
  • 0d2b72c138 Merge pull request #45 from bigbosst/reqrep-frontend Forrest 2016-02-12 14:53:36 -0800
  • 119c405fc4 added reqrep to the frontend Troy Germain 2016-02-12 14:44:36 -0800
  • c3761409e9 Merge pull request #43 from msciciel/fix-service-start-require Forrest 2016-01-22 00:06:20 -0800
  • 5b7b84d61e Add missing require to start service after config generation. Krzysztof Pawłowski 2016-01-13 10:41:39 +0100
  • b0c702b0df Merge pull request #42 from cybacolt/master Forrest 2016-01-15 11:41:20 -0800
  • b707857692 Allow omission of 'port' and 'check' from server params Rowcliffe Browne 2016-01-15 17:34:05 +0800
  • ff4a06b5b0 Merge pull request #40 from davidkarlsen/noPpaForUbuntu Forrest 2015-12-27 11:10:19 -0800
  • 76b4e81af5 this is no longer needed - haproxy 1.5.x in ubuntu repo david 2015-12-27 19:51:14 +0100
  • e1f9df1c1a Merge pull request #39 from bigbosst/stat-level Forrest 2015-12-11 15:11:58 -0800
  • 1995b4b81d adding levels for stat socket Troy Germain 2015-12-11 14:40:42 -0800
  • e0fb756ec4 Merge pull request #38 from bneqld/frontends_block-statements Forrest 2015-12-07 01:58:11 -0800
  • 776751f9b7 Added block statements (not parsed, simply looped and put into the configuration) for frontends Bernd Fischbach 2015-12-07 10:16:04 +0100
  • 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 Bernd Fischbach 2015-12-07 10:11:45 +0100
  • 76bc908e3e Added block statements (not parsed, simply looped and put in to the configuration) for frontends Bernd Fischbach 2015-12-07 10:03:59 +0100
  • a5bae64325 Merge pull request #34 from morsik/patch-1 Forrest 2015-11-24 12:55:23 -0800
  • 1b46ac219a Removed broken conflict lines... Konrad Mosoń 2015-11-24 21:46:02 +0100
  • 78e7fb9d0d Rebased patch morsik 2015-11-24 21:43:07 +0100
  • bf28971bd7 Fixed wrong key getter Konrad Mosoń 2015-11-16 10:32:30 +0100
  • 1002134bc6 Use k,v in template Konrad Mosoń 2015-11-13 15:19:14 +0100
  • 7ba7a85060 Merge pull request #37 from abednarik/fix_deprecated_iteritems_call Brian Jackson 2015-11-24 11:28:59 -0800
  • e2915b95b1 Replaced deprecated iteritems() function call with items() abednarik 2015-11-24 16:11:28 -0300
  • 97ff5641b1 Merge pull request #36 from morsik/master Forrest 2015-11-19 11:08:56 -0800
  • 9f3826b7f1 reqadd -> reqadds Konrad Mosoń 2015-11-16 11:20:21 +0100
  • bcd7756b9d Merge pull request #35 from morsik/patch-2 Forrest 2015-11-13 11:47:02 -0800
  • 5b98ce8901 /etc/default/haproxy exists only on Debian-based distros Konrad Mosoń 2015-11-13 16:49:53 +0100
  • 975a77e17c Merge pull request #33 from cybacolt/master Forrest 2015-11-06 10:59:33 -0800
  • 15759e29d3 - added hash-type, monitor and monitor-uri to config template in respectively relevant sections Rowcliffe Browne 2015-11-06 16:57:13 +0800
  • 03e3c7beae Merge pull request #27 from ticosax/reverse-dependency Forrest 2015-10-01 16:10:40 -0700
  • eb9c0c2b34 Allow usage of haproxy.service without haproxy.config Nicolas Delaby 2015-10-02 00:45:56 +0200
  • a8896cb7bf Merge pull request #26 from ingben/feature/log-format puneet kandhari 2015-09-23 10:13:50 -0500
  • cfdeef62a0 adds support for log-format configuration in frontend, listen and defaults Ingo Bente 2015-09-23 15:05:07 +0200
  • 204809d308 Merge pull request #25 from loopline-systems/master Forrest 2015-09-08 10:42:38 -0700
  • 677d6b2aac add sort filter to listen and backend directives in haproxy.conf Marco Roßdeutscher 2015-09-08 15:41:28 +0200
  • a6545fe434 fix option keyword in frontends section when iterating over frontend options Marco Roßdeutscher 2015-09-07 16:46:56 +0200
  • dd248a23e6 add ca-base, crt-base and tune.ssl.default-dh-param properties to global part Marco Roßdeutscher 2015-09-07 16:30:14 +0200
  • 11a64f07f8 Merge pull request #24 from genuss/fix_typo puneet kandhari 2015-09-03 06:07:53 -0500
  • 5c35c305f6 Fix typo in option a.genus 2015-09-03 13:31:44 +0300
  • c89edcb27d Merge pull request #23 from rtuin/patch-1 puneet kandhari 2015-09-02 05:23:37 -0500
  • 061afecf70 Correct the redirect examples in pillar.example Richard Tuin 2015-09-02 09:31:45 +0200
  • ec6efb55d1 Merge pull request #22 from johnkeates/master puneet kandhari 2015-08-30 15:40:29 -0500
  • 02f9ba1910 Add userlist sample to the example pillar John Keates 2015-08-30 22:36:01 +0200
  • ac1e5e3417 Merge pull request #21 from johnkeates/master puneet kandhari 2015-08-30 15:18:39 -0500
  • 29c60df042 Merge with upstream John Keates 2015-08-30 03:50:10 +0200
  • 7def329f6d Add http and rsp options, include minor gremlim zapping John Keates 2015-08-30 03:48:12 +0200
  • d0bed71f7f Fix template typo John Keates 2015-08-30 01:11:49 +0200
  • 9b3b61485d Add support for rspadd, capture and http-responses John Keates 2015-08-26 18:08:06 +0200
  • 0766007887 Changes in the template John Keates 2015-08-26 01:42:39 +0200
  • d229d41703 Merge pull request #20 from TheEarl1/master puneet kandhari 2015-08-17 15:45:39 -0500
  • 81ab45bed3 Add stats. Add reqrep to backend. Add macro for template simplification. Add example pillars Barrie Campbell 2015-08-17 16:40:55 -0400
  • 8f96ae3256 Merge pull request #19 from TheEarl1/master Forrest 2015-08-12 14:17:03 -0700
  • 62ee258814 Fix typos Barrie Campbell 2015-08-12 16:32:10 -0400
  • 2ae5c149db Merge pull request #18 from bigbosst/ordering-options Forrest 2015-08-10 11:37:31 -0700
  • ac42cac207 fixing order for warnings and adding additional options Troy Germain 2015-08-10 11:09:50 -0700
  • 029ce695b0 Merge pull request #15 from bigbosst/adding-options Forrest 2015-08-10 01:25:00 -0700
  • 05b82326e9 allow for loops to accept single line entries not only dicts and added functions Troy Germain 2015-08-10 00:35:40 -0700
  • 5583754072 Merge pull request #17 from sitepoint/resolvers_support puneet kandhari 2015-08-05 11:10:45 -0500