Andrew Repulo
e7cddfe0e2
added mode selection for stats socket in global definitions
2016-08-11 18:49:06 +03: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
Steven Braverman
aeb1844e2f
Simplifies jinja logic and removes extra lines
2016-06-16 17:25:32 -07:00
abednarik
17c9373098
Updated group wheel when os_family is FreeBSD.
2016-06-07 16:06:56 -03:00
Morten M. Hansen
822db0e338
allow custom options using "extra"
2016-06-01 21:14:12 +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
Troy Germain
119c405fc4
added reqrep to the frontend
2016-02-12 14:44:36 -08:00
Krzysztof Pawłowski
5b7b84d61e
Add missing require to start service after config generation.
2016-01-22 08:14:24 +01: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
david
76b4e81af5
this is no longer needed - haproxy 1.5.x in ubuntu repo
2015-12-27 19:51:14 +01: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
Konrad Mosoń
5b98ce8901
/etc/default/haproxy exists only on Debian-based distros
...
Currently it's not possible to do `haproxy.service` on RedHat-based distros (like CentOS). Initscript doesn't use this file at all, so it's not needed to create it anyway.
Actual result:
```----------
ID: haproxy.service
Function: file.replace
Name: /etc/default/haproxy
Result: False
Comment: /etc/default/haproxy: file not found
Started: 16:16:46.775448
Duration: 2.19 ms
Changes:
```
2015-11-13 16:49:53 +01: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
Nicolas Delaby
eb9c0c2b34
Allow usage of haproxy.service without haproxy.config
2015-10-02 00:45:56 +02: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
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
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
Barrie Campbell
62ee258814
Fix typos
2015-08-12 16:32:10 -04:00
Troy Germain
ac42cac207
fixing order for warnings and adding additional options
2015-08-10 11:13:37 -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
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
