alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #6512 from bjornfor/nixos-haproxy-cleanup

Browse source 
nixos/haproxy: remove broken default 'config'
This commit is contained in:
lethalman 2015-03-11 16:29:06 +01:00
parent b2000f05d9 ffb4797dd3
commit fe79bf34a5
1 changed files with 7 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
nixos/modules/services/networking/haproxy.nix
View file

@ -18,42 +18,8 @@ with lib;
};
config = mkOption {
type = types.lines;
default =
''
global
log 127.0.0.1 local6
maxconn 24000
daemon
nbproc 1
defaults
mode http
option httpclose
# Remove requests from the queue if people press stop button
option abortonclose
# Try to connect this many times on failure
retries 3
# If a client is bound to a particular backend but it goes down,
# send them to a different one
option redispatch
monitor-uri /haproxy-ping
timeout connect 7s
timeout queue 300s
timeout client 300s
timeout server 300s
# Enable status page at this URL, on the port HAProxy is bound to
stats enable
stats uri /haproxy-status
stats refresh 5s
stats realm Haproxy statistics
'';
type = types.nullOr types.lines;
default = null;
description = ''
Contents of the HAProxy configuration file,
<filename>haproxy.conf</filename>.
@ -66,6 +32,11 @@ with lib;
config = mkIf cfg.enable {
assertions = [{
assertion = cfg.config != null;
message = "You must provide services.haproxy.config.";
}];
systemd.services.haproxy = {
description = "HAProxy";
after = [ "network.target" ];