diff options
| author | Marek Mahut <marek.mahut@gmail.com> | 2019-08-19 13:50:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-19 13:50:14 +0200 |
| commit | f0d1db99db3d9680a74f8630a00b8c2c782d974c (patch) | |
| tree | ed52c8206089d706d7c0a897772d58fde19f25e0 | |
| parent | 09148726a27e63e8e26a88d61170d6ccd676497c (diff) | |
| parent | 98e6c1432ea4b6b2092fb2beead3f43ad1b0510a (diff) | |
| download | nixpkgs-f0d1db99db3d9680a74f8630a00b8c2c782d974c.tar nixpkgs-f0d1db99db3d9680a74f8630a00b8c2c782d974c.tar.gz nixpkgs-f0d1db99db3d9680a74f8630a00b8c2c782d974c.tar.bz2 nixpkgs-f0d1db99db3d9680a74f8630a00b8c2c782d974c.tar.lz nixpkgs-f0d1db99db3d9680a74f8630a00b8c2c782d974c.tar.xz nixpkgs-f0d1db99db3d9680a74f8630a00b8c2c782d974c.tar.zst nixpkgs-f0d1db99db3d9680a74f8630a00b8c2c782d974c.zip | |
Merge pull request #66857 from nrdxp/fix/caddy
caddy: remove 'bin' attribute
| -rw-r--r-- | nixos/modules/services/web-servers/caddy.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/services/web-servers/caddy.nix b/nixos/modules/services/web-servers/caddy.nix index d0b936cb019..6a1db608784 100644 --- a/nixos/modules/services/web-servers/caddy.nix +++ b/nixos/modules/services/web-servers/caddy.nix @@ -70,7 +70,7 @@ in { { CADDYPATH = cfg.dataDir; }; serviceConfig = { ExecStart = '' - ${cfg.package.bin}/bin/caddy -root=/var/tmp -conf=${configFile} \ + ${cfg.package}/bin/caddy -root=/var/tmp -conf=${configFile} \ -ca=${cfg.ca} -email=${cfg.email} ${optionalString cfg.agree "-agree"} ''; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; |