public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/caddy: remove caddy1

Browse Source
This commit is contained in:
zowoq 2020-10-02 17:46:46 +10:00
parent 9e7e0e9aa1
commit 8f74e9e905
1 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
nixos/modules/services/web-servers/caddy.nix
View File

@ -6,8 +6,6 @@ let
cfg = config.services.caddy; cfg = config.services.caddy;
configFile = pkgs.writeText "Caddyfile" cfg.config; configFile = pkgs.writeText "Caddyfile" cfg.config;
# v2-specific options
isCaddy2 = versionAtLeast cfg.package.version "2.0";
tlsConfig = { tlsConfig = {
apps.tls.automation.policies = [{ apps.tls.automation.policies = [{
issuer = { issuer = {
@ -50,7 +48,7 @@ in {
example = "nginx"; example = "nginx";
type = types.str; type = types.str;
description = '' description = ''
Name of the config adapter to use. Not applicable to Caddy v1. Name of the config adapter to use.
See https://caddyserver.com/docs/config-adapters for the full list. See https://caddyserver.com/docs/config-adapters for the full list.
''; '';
}; };
@ -90,11 +88,10 @@ in {
package = mkOption { package = mkOption {
default = pkgs.caddy; default = pkgs.caddy;
defaultText = "pkgs.caddy"; defaultText = "pkgs.caddy";
example = "pkgs.caddy1"; example = "pkgs.caddy";
type = types.package; type = types.package;
description = '' description = ''
Caddy package to use. Caddy package to use.
To use Caddy v1 (obsolete), set this to <literal>pkgs.caddy1</literal>.
''; '';
}; };
}; };
@ -106,21 +103,9 @@ in {
after = [ "network-online.target" ]; after = [ "network-online.target" ];
wants = [ "network-online.target" ]; # systemd-networkd-wait-online.service wants = [ "network-online.target" ]; # systemd-networkd-wait-online.service
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
environment = mkIf (versionAtLeast config.system.stateVersion "17.09" && !isCaddy2)
{ CADDYPATH = cfg.dataDir; };
serviceConfig = { serviceConfig = {
ExecStart = if isCaddy2 then '' ExecStart = "${cfg.package}/bin/caddy run --config ${configJSON}";
${cfg.package}/bin/caddy run --config ${configJSON} ExecReload = "${cfg.package}/bin/caddy reload --config ${configJSON}";
'' else ''
${cfg.package}/bin/caddy -log stdout -log-timestamps=false \
-root=/var/tmp -conf=${configFile} \
-ca=${cfg.ca} -email=${cfg.email} ${optionalString cfg.agree "-agree"}
'';
ExecReload =
if isCaddy2 then
"${cfg.package}/bin/caddy reload --config ${configJSON}"
else
"${pkgs.coreutils}/bin/kill -USR1 $MAINPID";
Type = "simple"; Type = "simple";
User = "caddy"; User = "caddy";
Group = "caddy"; Group = "caddy";