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
Brian Jackson
7ba7a85060
Merge pull request #37 from abednarik/fix_deprecated_iteritems_call
...
Replaced deprecated iteritems() function call with items()
2015-11-24 11:28:59 -08:00
abednarik
e2915b95b1
Replaced deprecated iteritems() function call with items()
2015-11-24 16:11:28 -03:00
Forrest
97ff5641b1
Merge pull request #36 from morsik/master
...
reqadd -> reqadds
2015-11-19 11:08:56 -08:00
Konrad Mosoń
9f3826b7f1
reqadd -> reqadds
...
Template file uses `reqadds`, but `pillar.example` says i's `reqadd`.
2015-11-16 11:20:21 +01:00
Forrest
bcd7756b9d
Merge pull request #35 from morsik/patch-2
...
/etc/default/haproxy exists only on Debian-based distros
2015-11-13 11:47:02 -08: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
Forrest
975a77e17c
Merge pull request #33 from cybacolt/master
...
- added hash-type, monitor and monitor-uri to config template
2015-11-06 10:59:33 -08: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
Forrest
03e3c7beae
Merge pull request #27 from ticosax/reverse-dependency
...
Allow usage of haproxy.service without haproxy.config
2015-10-01 16:10:40 -07:00
Nicolas Delaby
eb9c0c2b34
Allow usage of haproxy.service without haproxy.config
2015-10-02 00:45:56 +02:00
puneet kandhari
a8896cb7bf
Merge pull request #26 from ingben/feature/log-format
...
Adds support for log-format configuration
2015-09-23 10:13:50 -05:00
Ingo Bente
cfdeef62a0
adds support for log-format configuration in frontend, listen and defaults
2015-09-23 15:05:07 +02:00
Forrest
204809d308
Merge pull request #25 from loopline-systems/master
...
Adding new values to global section, typo fix + natural server ordering
2015-09-08 10:42:38 -07: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
puneet kandhari
11a64f07f8
Merge pull request #24 from genuss/fix_typo
...
Fix typo in main template
2015-09-03 06:07:53 -05:00
a.genus
5c35c305f6
Fix typo in option
2015-09-03 13:31:44 +03:00
puneet kandhari
c89edcb27d
Merge pull request #23 from rtuin/patch-1
...
Correct the redirect examples in pillar.example
2015-09-02 05:23:37 -05:00
Richard Tuin
061afecf70
Correct the redirect examples in pillar.example
2015-09-02 09:31:45 +02:00
puneet kandhari
ec6efb55d1
Merge pull request #22 from johnkeates/master
...
Add userlist sample to the example pillar
2015-08-30 15:40:29 -05:00
John Keates
02f9ba1910
Add userlist sample to the example pillar
2015-08-30 22:36:01 +02:00
puneet kandhari
ac1e5e3417
Merge pull request #21 from johnkeates/master
...
Two features added, two gremlins zapped
2015-08-30 15:18:39 -05: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
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
