diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2017-06-11 22:04:03 +0200 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2017-06-13 21:21:59 +0200 |
| commit | ac5258edb25814f2b2c70380f24a15625b10fae1 (patch) | |
| tree | dbc20fe497c909375a50cb5708660d9422bbc3f4 /nixos | |
| parent | 071815cb244e2f884552936d245944e4369e81a0 (diff) | |
| download | nixpkgs-ac5258edb25814f2b2c70380f24a15625b10fae1.tar nixpkgs-ac5258edb25814f2b2c70380f24a15625b10fae1.tar.gz nixpkgs-ac5258edb25814f2b2c70380f24a15625b10fae1.tar.bz2 nixpkgs-ac5258edb25814f2b2c70380f24a15625b10fae1.tar.lz nixpkgs-ac5258edb25814f2b2c70380f24a15625b10fae1.tar.xz nixpkgs-ac5258edb25814f2b2c70380f24a15625b10fae1.tar.zst nixpkgs-ac5258edb25814f2b2c70380f24a15625b10fae1.zip | |
caddy service: don't use extra dotdir in dataDir
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/doc/manual/release-notes/rl-1709.xml | 9 | ||||
| -rw-r--r-- | nixos/modules/services/web-servers/caddy.nix | 8 |
2 files changed, 16 insertions, 1 deletions
diff --git a/nixos/doc/manual/release-notes/rl-1709.xml b/nixos/doc/manual/release-notes/rl-1709.xml index 6948c22cc88..c16499a0c1d 100644 --- a/nixos/doc/manual/release-notes/rl-1709.xml +++ b/nixos/doc/manual/release-notes/rl-1709.xml @@ -89,6 +89,15 @@ rmdir /var/lib/ipfs/.ipfs The <literal>postgres</literal> default <literal>dataDir</literal> has changed from <literal>/var/db/postgres</literal> to <literal>/var/lib/postgresql/$psqlSchema</literal> where $psqlSchema is 9.6 for example. </para> </listitem> + <listitem> + <para> + The <literal>caddy</literal> service was previously using an extra + <literal>.caddy</literal> in the data directory specified with the + <literal>dataDir</literal> option. The contents of the + <literal>.caddy</literal> directory are now expected to be in the + <literal>dataDir</literal>. + </para> + </listitem> </itemizedlist> diff --git a/nixos/modules/services/web-servers/caddy.nix b/nixos/modules/services/web-servers/caddy.nix index 9ac1a08bb58..ee32a1c86d4 100644 --- a/nixos/modules/services/web-servers/caddy.nix +++ b/nixos/modules/services/web-servers/caddy.nix @@ -36,7 +36,11 @@ in dataDir = mkOption { default = "/var/lib/caddy"; type = types.path; - description = "The data directory, for storing certificates."; + description = '' + The data directory, for storing certificates. Before 17.09, this + would create a .caddy directory. With 17.09 the contents of the + .caddy directory are in the specified data directory instead. + ''; }; package = mkOption { @@ -52,6 +56,8 @@ in description = "Caddy web server"; after = [ "network-online.target" ]; wantedBy = [ "multi-user.target" ]; + environment = mkIf (versionAtLeast config.system.stateVersion "17.09") + { CADDYPATH = cfg.dataDir; }; serviceConfig = { ExecStart = '' ${cfg.package.bin}/bin/caddy -root=/var/tmp -conf=${configFile} \ |