teutat3s/os
2
0
Fork 0
forked from pub-solar/os
Code Pull requests Activity

Merge pull request 'modules/networking: Use mkDefault for caddy config' (#220) from networking-mkDefault into main

Browse source 
Reviewed-on: pub-solar/os#220
Reviewed-by: teutat3s <teutates@mailbox.org>
This commit is contained in:
teutat3s 2023-04-17 20:16:48 +02:00
parent 029be00eab 91353938af
commit ed532fa271
Signed by: pub.solar gitea
GPG key ID: F0332B04B7054873
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
modules/core/networking.nix
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
} }
'') '')
]; ]);
}; };
}; };
} }