Linux-Help/formula-haproxy
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
121 commits 2 branches 0 tags 220 KiB
Commit graph

121 commits

This branch
This branch
All branches
Author SHA1 Message Date
John Keates 29c60df042 Merge with upstream 2015-08-30 03:50:10 +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
puneet kandhari d229d41703 Merge pull request #20 from TheEarl1/master 
Add macro for template simplification
 2015-08-17 15:45:39 -05:00
Barrie Campbell 81ab45bed3 Add stats. Add reqrep to backend. Add macro for template simplification. Add example pillars 2015-08-17 16:40:55 -04:00
Forrest 8f96ae3256 Merge pull request #19 from TheEarl1/master 
Fix typos
 2015-08-12 14:17:03 -07:00
Barrie Campbell 62ee258814 Fix typos 2015-08-12 16:32:10 -04:00
Forrest 2ae5c149db Merge pull request #18 from bigbosst/ordering-options 
fixing order for warnings and adding additional options
 2015-08-10 11:37:31 -07:00
Troy Germain ac42cac207 fixing order for warnings and adding additional options 2015-08-10 11:13:37 -07:00
Forrest 029ce695b0 Merge pull request #15 from bigbosst/adding-options 
allow for loops to accept single line entries not only dicts and added functions
 2015-08-10 01:25:00 -07:00
Troy Germain 05b82326e9 allow for loops to accept single line entries not only dicts and added functions 2015-08-10 00:35:40 -07:00
puneet kandhari 5583754072 Merge pull request #17 from sitepoint/resolvers_support 
Add support for a resolvers section (new to 1.6).
 2015-08-05 11:10:45 -05:00
Adam Bolte 310c49f1ed Add support for a resolvers section (new to 1.6). 2015-08-05 20:02:51 +10: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
Forrest ada3f793a4 Merge pull request #13 from MrMarvin/fix/adds_default_values_to_template 
adds some default values for essential params
 2015-07-29 11:03:26 -07:00
Forrest 3efc2f8d81 Merge pull request #14 from MrMarvin/feature/ssl-default-bind 
adds ssl-default-bind options to template
 2015-07-29 11:02:44 -07:00
Marvin Frick 267e27680a adds some default values for essential params 
With this PR the haproxy.config state will actually render a valid
haproxy.cfg from default values, even when the values are not
explicitely passed via the pillar. Right now, an invalid cfg is
generated which breaks haproxy on startup.
 2015-07-29 12:25:43 +02:00
Marvin Frick 62981b47ad adds ssl-default-bind options to template 2015-07-29 12:16:37 +02:00
Forrest b83deb4f28 Merge pull request #10 from sitepoint/various_qa_fixes 
Minor improvements
 2015-07-23 10:28:28 -07:00
Adam Bolte 1ffa423bfc Additional cleanup for haproxy.jinja whitespace. 2015-07-23 18:46:44 +10:00
Adam Bolte 1bbf7fd182 haproxy to optionally depend on a custom state. 2015-07-23 13:46:56 +10:00
Adam Bolte 672fe36551 If not enabled in pillar, kill the service. 2015-07-23 13:46:56 +10:00
Adam Bolte eb6b073ad2 Adjust ENABLED value based on pillar value. 2015-07-23 13:46:56 +10:00
Adam Bolte b4ee8e891d Cleanup haproxy.jinja comments and whitespace. 2015-07-23 13:46:56 +10:00
Nitin Madhok 6f0609ee2e Merge pull request #12 from bigbosst/add-listeners 
Add listeners
 2015-07-22 05:07:54 -04:00
Troy Germain c00502a596 fixed bug for single line bind statements 2015-07-21 08:42:56 -07:00
Troy Germain 2641edecc1 updated pillar example for defaultserver setting 2015-07-17 21:28:24 -07:00
Troy Germain ef5ff9c9ea added default-server configuration 2015-07-17 20:36:15 -07:00
Troy Germain 0275485194 Adding Listeners, Multiple (optional) Binds per Listener/frontend 2015-07-17 19:00:32 -07:00
Forrest c351a70e00 Merge pull request #11 from bigbosst/defaults-and-naming 
Defaults, Naming, and Multiple Binds
 2015-07-13 20:24:24 -07:00
Troy 9ca7d936e8 Update pillar.example 
Showing some options for naming and multiple binds and leaving out the balance and using the configuration default
 2015-07-13 17:21:58 -07:00
Troy 32e148d232 added default for name attribute 
name attribute will default to the identifier given in the pillar, but can be overridden by the name attribute
 2015-07-13 17:06:24 -07:00
Troy 7e31bee197 Allowed for default balance 
balance with default of roundrobin, and allowed for lack of balance in the backends
 2015-07-13 16:17:06 -07: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
Nitin Madhok e00b5907d0 Merge pull request #8 from johnkeates/master 
Better redirect support, now without typo's! (yes, that is an intended pun)
 2015-05-25 12:42:00 -04: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
puneet kandhari 46993506cb Merge pull request #7 from onestic/master 
Add support for option, cookie and stats tags in backend instances
 2015-05-20 09:29:14 -05: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
Nitin Madhok 5afcfd5820 Update LICENSE 2015-03-20 20:11:06 -04:00
Nitin Madhok 10cc452f18 Merge pull request #5 from lock8/reload-not-restart 
Use reload instead of restart to prevent downtime during config updates
 2015-03-17 14:25:51 -04:00