momo/main: merge main branch #219

Merged
b12f merged 13 commits from momo-merge-main into momo/main 2023-04-24 10:50:48 +00:00
Showing only changes of commit ed532fa271 - Show all commits

View file

@ -56,12 +56,12 @@ in {
# Caddy reverse proxy for local services like cups # Caddy reverse proxy for local services like cups
services.caddy = { services.caddy = {
enable = cfg.enableCaddy; enable = lib.mkDefault cfg.enableCaddy;
globalConfig = '' globalConfig = lib.mkDefault ''
default_bind 127.0.0.1 default_bind 127.0.0.1
auto_https off auto_https off
''; '';
extraConfig = concatStringsSep "\n" [ extraConfig = lib.mkDefault (concatStringsSep "\n" [
(lib.optionalString (lib.optionalString
config.pub-solar.printing.enable config.pub-solar.printing.enable
'' ''
@ -79,7 +79,7 @@ in {
file_server file_server
} }
'') '')
]; ]);
}; };
}; };
} }