Commit graph

89 commits

Author SHA1 Message Date
Mathieu Masse
dafe8fd6a5 Fix service state when override are used
Service.running now uses correct require pkg id if
haproxy.lookup.package is used
Service.dead now uses correct name when haproxy.lookup.service is used
2018-03-22 20:43:25 -04:00
Eric Veiras Galisson
6493d24ad3 info in pillar.example about old and new setting for conf file path 2017-11-06 16:58:30 +01:00
Eric Veiras Galisson
752c3e5641 moving specific FreeBSD code to map.jinja, updating pillar.example 2017-10-31 14:42:20 +01:00
Eric Veiras Galisson
2b83ca0860 refactoring code to use map.jinja for config values
at the moment only Debian managed, FreeBSD exception still in state
2017-10-31 14:41:54 +01:00
Dag Stenstad
5a1d62f9ac Add timeouts handling to backend section of template. 2017-10-11 15:55:03 +02:00
John Keates
40c7ac8c70 Merge pull request #50 from hoonetorg/feature/modular_log
allow to set arbitrary log options in global
2017-08-25 17:29:28 +02:00
KTI - Richard Clark
2f2e0deca6 Add timeouts handling to frontent. Was only in listen 2017-06-21 21:38:08 +02:00
Nick Liu
4abfac0eec Fixed line break issue if listens.extra is a list 2017-01-20 07:42:33 -06:00
Nick Liu
7d4313aaf8 Fixed typo "listerner" => "listener" 2017-01-20 07:37:08 -06:00
davidwalter0
44ec6ddfb5 update haproxy.jinja : spelling correction listner 2016-09-28 20:38:29 -04:00
Forrest
39390e8618 Merge pull request #59 from mikesager/fix_backend_extra_trimming
haproxy.jinja bugfix: backend.extra array trimming
2016-09-17 12:04:48 -07:00
Mike Sager
991a502636 Fixed bug in haproxy.jinja that put all 'extra' lines from an extra array on the same line in the config 2016-09-16 21:41:52 -07:00
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
cbcb50ad84 allow to set arbitrary log options in global 2016-04-07 21:17:37 +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