diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2017-04-14 10:32:13 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2017-04-14 10:32:13 +0200 |
commit | 24444513fb5cc0cf1f56c6b3b87bcdd36db8b101 (patch) | |
tree | b856f7236de8e12ef201ababecb22e9b32a0e493 /nixos | |
parent | 3085e95a20349f957c793f22547363231fa471a8 (diff) | |
parent | 304d30ce3f22ca8b275236de6e2c2e7f6e0b1934 (diff) |
Merge branch 'staging'
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, 3 insertions, 13 deletions
diff --git a/nixos/doc/manual/release-notes/rl-1709.xml b/nixos/doc/manual/release-notes/rl-1709.xml index 5fba4c34ec82..bd999b600133 100644 --- a/nixos/doc/manual/release-notes/rl-1709.xml +++ b/nixos/doc/manual/release-notes/rl-1709.xml @@ -35,8 +35,6 @@ 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 5301ac14805d..ada198e0e586 100644 --- a/nixos/modules/security/acme.nix +++ b/nixos/modules/security/acme.nix @@ -19,12 +19,6 @@ 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; @@ -163,10 +157,9 @@ 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" domain "--default_root" data.webroot "--valid_min" cfg.validMin ] + cmdline = [ "-v" "-d" cert "--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 c8d9836b0b68..f12cc9734465 100644 --- a/nixos/modules/services/web-servers/lighttpd/gitweb.nix +++ b/nixos/modules/services/web-servers/lighttpd/gitweb.nix @@ -60,8 +60,7 @@ in "/gitweb/" => "${pkgs.git}/share/gitweb/gitweb.cgi" ) setenv.add-environment = ( - "GITWEB_CONFIG" => "${gitwebConfigFile}", - "HOME" => "${cfg.projectroot}" + "GITWEB_CONFIG" => "${gitwebConfigFile}" ) } ''; diff --git a/nixos/modules/system/boot/systemd-lib.nix b/nixos/modules/system/boot/systemd-lib.nix index 7c01f8ea9b7f..7dbf3b25cdb0 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}" |