Commit graph

41 commits

Author SHA1 Message Date
Forrest
2a6d65e8d5 Revert "Feature/more modular template" 2016-04-07 17:43:00 -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
Troy Germain
119c405fc4 added reqrep to the frontend 2016-02-12 14:44:36 -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
Troy Germain
1995b4b81d adding levels for stat socket 2015-12-11 14:42:49 -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
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
abednarik
e2915b95b1 Replaced deprecated iteritems() function call with items() 2015-11-24 16:11:28 -03:00
Rowcliffe Browne
15759e29d3 - added hash-type, monitor and monitor-uri to config template in respectively relevant sections 2015-11-06 16:57:13 +08:00
Ingo Bente
cfdeef62a0 adds support for log-format configuration in frontend, listen and defaults 2015-09-23 15:05:07 +02:00
Marco Roßdeutscher
677d6b2aac add sort filter to listen and backend directives in haproxy.conf 2015-09-08 15:41:28 +02:00
Marco Roßdeutscher
a6545fe434 fix option keyword in frontends section when iterating over frontend options 2015-09-07 16:46:56 +02:00
Marco Roßdeutscher
dd248a23e6 add ca-base, crt-base and tune.ssl.default-dh-param properties to global part 2015-09-07 16:30:14 +02:00
John Keates
7def329f6d Add http and rsp options, include minor gremlim zapping 2015-08-30 03:48:12 +02:00
John Keates
d0bed71f7f Fix template typo 2015-08-30 01:11:49 +02:00
John Keates
9b3b61485d Add support for rspadd, capture and http-responses 2015-08-26 18:08:06 +02:00
John Keates
0766007887 Changes in the template 2015-08-26 01:42:39 +02:00
John Keates
07ef0c2f51 Add tiny indent 2015-07-31 01:56:58 +02:00
John Keates
4e866079f4 Fix indentation 2015-07-31 00:27:36 +02:00
John Keates
eb4175413e Change formatting options, add request handler 2015-07-31 00:24:58 +02:00
John Keates
df2c761cd8 Add more detailed comments 2015-07-31 00:14:36 +02:00
John Keates
86cf6b1a09 Working userlist implementation 2015-06-08 16:14:28 +02:00
John Keates
2019204b01 Add initial userlist support 2015-06-08 15:16:31 +02:00
John Keates
cd237e0109 Fix typo and add some nice indentation 2015-05-23 19:43:21 +02:00
John Keates
1876b5ae35 Merge remote-tracking branch 'saltstack-formulas/master' 2015-05-22 22:49:36 +02:00
jvblasco
fd66f704fd Add support for option, cookie and stats tags in backend instances 2015-05-20 16:12:43 +02:00
John Keates
6c4f312f76 Basic typo fixed 2015-05-17 18:30:15 +02:00
John Keates
b089a7feb4 Trying to fix the nesting mistake 2015-05-17 18:26:08 +02:00
John Keates
454c5ba973 Add redirection capabilities to the frontend 2015-05-17 15:47:47 +02:00
John Keates
ec17df3eea Change bind method so it doesn't always default 2015-02-26 14:34:47 +01:00
John Keates
3bc15512ae Added jinja templated configuration support, a bit of documentation and a rough set of examples 2015-02-24 22:19:02 +01:00