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
Marvin Frick
62981b47ad
adds ssl-default-bind options to template
2015-07-29 12:16:37 +02: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
Troy Germain
c00502a596
fixed bug for single line bind statements
2015-07-21 08:42:56 -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
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
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
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
Nicolas Delaby
1c541bd43d
Use reload instead of restart to prevent downtime during config updates
2015-03-17 17:35:21 +01:00
