From 9aafa7ff5242e841a1c42a7895429d659343a181 Mon Sep 17 00:00:00 2001 From: Hendrik Sokolowski Date: Sun, 1 May 2022 00:05:53 +0200 Subject: [PATCH] Switch from caddy to haproxy --- modules/x-os/networking.nix | 62 ++++++++++++++++++++++++++++--------- 1 file changed, 47 insertions(+), 15 deletions(-) diff --git a/modules/x-os/networking.nix b/modules/x-os/networking.nix index 1e981290..476460a8 100644 --- a/modules/x-os/networking.nix +++ b/modules/x-os/networking.nix @@ -2,7 +2,9 @@ with lib; -let cfg = config.pub-solar.x-os; +let + psCfg = config.pub-solar; + cfg = psCfg.x-os; in { options.pub-solar.x-os = { @@ -34,21 +36,51 @@ in # These entries get added to /etc/hosts networking.hosts = { - "127.0.0.1" = [ "cups.local" ]; + "127.0.0.1" = mkIf psCfg.printing.enable [ "cups.local" ]; }; - # Caddy reverse proxy for local services like cups - services.caddy = { - enable = true; - config = '' - { - auto_https off - } - cups.local:80 - bind 127.0.0.1 - request_header Host localhost:631 - reverse_proxy unix//run/cups/cups.sock - ''; - }; + # ha reverse proxy for local services like cups + services.haproxy.enable = true; + services.haproxy.config = '' + global + maxconn 4096 +# user http +# group http + daemon + + defaults + log global + mode http + option httplog + option dontlognull + retries 3 + option redispatch + maxconn 2000 + timeout connect 5000 + timeout client 50000 + timeout server 50000 + log 127.0.0.1 local0 + log 127.0.0.1 local7 debug + option httpchk + + frontend http + bind 0.0.0.0:80 + + acl is_cups hdr_end(host) -i cups.local + acl is_local dst 127.0.0.1 + + use_backend cups if is_cups is_local + + frontend vnc + bind 0.0.0.0:5901 + mode tcp + use_backend vnc + + backend cups + server cups unix@/run/cups/cups.sock + + backend vnc + server vnc unix@/run/wayvnc.sock + ''; }; }