Morten M. Hansen
822db0e338
allow custom options using "extra"
2016-06-01 21:14:12 +02:00
Forrest
e465b79a59
Merge pull request #51 from hoonetorg/feature/more_modular_template
...
Feature/more modular template
2016-04-07 17:42:26 -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
Forrest
0d2b72c138
Merge pull request #45 from bigbosst/reqrep-frontend
...
added reqrep to the frontend
2016-02-12 14:53:36 -08:00
Troy Germain
119c405fc4
added reqrep to the frontend
2016-02-12 14:44:36 -08:00
Forrest
c3761409e9
Merge pull request #43 from msciciel/fix-service-start-require
...
Add missing require to start service after config generation.
2016-01-22 00:06:20 -08:00
Krzysztof Pawłowski
5b7b84d61e
Add missing require to start service after config generation.
2016-01-22 08:14:24 +01:00
Forrest
b0c702b0df
Merge pull request #42 from cybacolt/master
...
Allow omission of 'port' and 'check' from server params
2016-01-15 11:41:20 -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
Forrest
ff4a06b5b0
Merge pull request #40 from davidkarlsen/noPpaForUbuntu
...
this is no longer needed - haproxy 1.5.x in ubuntu repo
2015-12-27 11:10:19 -08:00
david
76b4e81af5
this is no longer needed - haproxy 1.5.x in ubuntu repo
2015-12-27 19:51:14 +01:00
Forrest
e1f9df1c1a
Merge pull request #39 from bigbosst/stat-level
...
adding levels for stat socket
2015-12-11 15:11:58 -08:00
Troy Germain
1995b4b81d
adding levels for stat socket
2015-12-11 14:42:49 -08:00
Forrest
e0fb756ec4
Merge pull request #38 from bneqld/frontends_block-statements
...
Frontends block statements
2015-12-07 01:58:11 -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
Forrest
a5bae64325
Merge pull request #34 from morsik/patch-1
...
Use k,v in template
2015-11-24 12:55:23 -08: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
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
