diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-04-14 19:11:17 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-04-14 19:11:17 +0200 |
| commit | 2090aa4f65e860567af03cb3b7aa042df7168ead (patch) | |
| tree | bdf4623501830af0cbf68f2d22075f70b38157b5 /nixos | |
| parent | eec35cb6bd82cb0eba69c55e83990f3b9f0107dc (diff) | |
| parent | 4aec96b379d3f1b89128297b0943253d6961cf94 (diff) | |
| download | nixpkgs-2090aa4f65e860567af03cb3b7aa042df7168ead.tar nixpkgs-2090aa4f65e860567af03cb3b7aa042df7168ead.tar.gz nixpkgs-2090aa4f65e860567af03cb3b7aa042df7168ead.tar.bz2 nixpkgs-2090aa4f65e860567af03cb3b7aa042df7168ead.tar.lz nixpkgs-2090aa4f65e860567af03cb3b7aa042df7168ead.tar.xz nixpkgs-2090aa4f65e860567af03cb3b7aa042df7168ead.tar.zst nixpkgs-2090aa4f65e860567af03cb3b7aa042df7168ead.zip | |
Merge: fixup a bad merge
For details see: https://github.com/NixOS/nixpkgs/commit/24444513fb5#commitcomment-21767916
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/doc/manual/release-notes/rl-1709.xml | 2 | ||||
| -rw-r--r-- | nixos/modules/security/acme.nix | 9 | ||||
| -rw-r--r-- | nixos/modules/services/web-servers/lighttpd/gitweb.nix | 3 | ||||
| -rw-r--r-- | nixos/modules/system/boot/systemd-lib.nix | 2 |
4 files changed, 13 insertions, 3 deletions
diff --git a/nixos/doc/manual/release-notes/rl-1709.xml b/nixos/doc/manual/release-notes/rl-1709.xml index bd999b60013..5fba4c34ec8 100644 --- a/nixos/doc/manual/release-notes/rl-1709.xml +++ b/nixos/doc/manual/release-notes/rl-1709.xml @@ -35,6 +35,8 @@ following incompatible changes:</para> <itemizedlist> <listitem> <para> + Top-level <literal>idea</literal> package collection was renamed. + All JetBrains IDEs are now at <literal>jetbrains</literal>. </para> </listitem> </itemizedlist> diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix index ada198e0e58..5301ac14805 100644 --- a/nixos/modules/security/acme.nix +++ b/nixos/modules/security/acme.nix @@ -19,6 +19,12 @@ let ''; }; + domain = mkOption { + type = types.nullOr types.str; + default = null; + description = "Domain to fetch certificate for (defaults to the entry name)"; + }; + email = mkOption { type = types.nullOr types.str; default = null; @@ -157,9 +163,10 @@ in servicesLists = mapAttrsToList certToServices cfg.certs; certToServices = cert: data: let + domain = if data.domain != null then data.domain else cert; cpath = "${cfg.directory}/${cert}"; rights = if data.allowKeysForGroup then "750" else "700"; - cmdline = [ "-v" "-d" cert "--default_root" data.webroot "--valid_min" cfg.validMin ] + cmdline = [ "-v" "-d" domain "--default_root" data.webroot "--valid_min" cfg.validMin ] ++ optionals (data.email != null) [ "--email" data.email ] ++ concatMap (p: [ "-f" p ]) data.plugins ++ concatLists (mapAttrsToList (name: root: [ "-d" (if root == null then name else "${name}:${root}")]) data.extraDomains); diff --git a/nixos/modules/services/web-servers/lighttpd/gitweb.nix b/nixos/modules/services/web-servers/lighttpd/gitweb.nix index f12cc973446..c8d9836b0b6 100644 --- a/nixos/modules/services/web-servers/lighttpd/gitweb.nix +++ b/nixos/modules/services/web-servers/lighttpd/gitweb.nix @@ -60,7 +60,8 @@ in "/gitweb/" => "${pkgs.git}/share/gitweb/gitweb.cgi" ) setenv.add-environment = ( - "GITWEB_CONFIG" => "${gitwebConfigFile}" + "GITWEB_CONFIG" => "${gitwebConfigFile}", + "HOME" => "${cfg.projectroot}" ) } ''; diff --git a/nixos/modules/system/boot/systemd-lib.nix b/nixos/modules/system/boot/systemd-lib.nix index 7dbf3b25cdb..7c01f8ea9b7 100644 --- a/nixos/modules/system/boot/systemd-lib.nix +++ b/nixos/modules/system/boot/systemd-lib.nix @@ -10,7 +10,7 @@ rec { makeUnit = name: unit: let - pathSafeName = lib.replaceChars ["@" ":" "\\"] ["-" "-" "-"] name; + pathSafeName = lib.replaceChars ["@" ":" "\\" "[" "]"] ["-" "-" "-" "" ""] name; in if unit.enable then pkgs.runCommand "unit-${pathSafeName}" |